X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/493e032a9dcccb19dca87c542a067d759213f566..32a32d7501ace2859ba097ef8fb7ef665ca2f0ed:/po/zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index bbce1a3ea..0f74079aa 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,14 +4,14 @@
 # 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, 2015.
+# Zhou Mo <cdluminate@gmail.com>, 2014, 2015, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.8.0~pre1\n"
+"Project-Id-Version: apt 1.2.x\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-12-14 16:56+0100\n"
-"PO-Revision-Date: 2014-12-04 04:42+0000\n"
+"POT-Creation-Date: 2016-08-04 10:25+0200\n"
+"PO-Revision-Date: 2016-06-27 08:00+0000\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -50,26 +50,26 @@ msgstr "错误:%lu %s"
 #: apt-private/acqprogress.cc
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "下载 %sB，耗时 %s (%sB/s)\n"
+msgstr "已下载 %sB，耗时 %s (%sB/s)\n"
 
 #: apt-private/acqprogress.cc
 msgid " [Working]"
 msgstr " [执行中]"
 
 #: apt-private/acqprogress.cc
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press [Enter]\n"
 msgstr ""
 "更换介质：请把标有\n"
-"“%s”\n"
-"的盘片插入驱动器“%s”再按回车键\n"
+" “%s”\n"
+"的盘片插入驱动器“%s”再按「回车」键\n"
 
 #: apt-private/private-cachefile.cc
 msgid "Correcting dependencies..."
-msgstr "正在更正依赖关系..."
+msgstr "正在修复依赖关系..."
 
 #: apt-private/private-cachefile.cc
 msgid " failed."
@@ -77,11 +77,11 @@ msgstr " 失败。"
 
 #: apt-private/private-cachefile.cc
 msgid "Unable to correct dependencies"
-msgstr "无法更正依赖关系"
+msgstr "无法修复依赖关系"
 
 #: apt-private/private-cachefile.cc
 msgid "Unable to minimize the upgrade set"
-msgstr "无法最小化要升级的软件包集合"
+msgstr "无法最小化待升级软件包集合"
 
 #: apt-private/private-cachefile.cc
 msgid " Done"
@@ -102,35 +102,34 @@ msgstr "正在排序"
 #: apt-private/private-cacheset.cc
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "注意，为任务 %2$s 选中了 %1$s\n"
+msgstr "注意，根据任务 '%2$s' 选中了 '%1$s'\n"
 
 #: apt-private/private-cacheset.cc
-#, fuzzy, c-format
+#, c-format
 msgid "Note, selecting '%s' for glob '%s'\n"
-msgstr "注意，根据正则表达式 %2$s 选中了 %1$s\n"
+msgstr "注意，根据Glob '%2$s' 选中了 '%1$s'\n"
 
 #: apt-private/private-cacheset.cc
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "注意，根据正则表达式 %2$s 选中了 %1$s\n"
+msgstr "注意，根据正则表达式 '%2$s' 选中了 '%1$s'\n"
 
 #: apt-private/private-cacheset.cc
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
-msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
+msgstr "虚拟软件包 %s 由下面的软件包提供：\n"
 
 #: apt-private/private-cacheset.cc
-#, fuzzy
 msgid " [Installed]"
 msgstr "[已安装]"
 
 #: apt-private/private-cacheset.cc
 msgid " [Not candidate version]"
-msgstr " [无候选版本]"
+msgstr " [无候选]"
 
 #: apt-private/private-cacheset.cc
 msgid "You should explicitly select one to install."
-msgstr "请您明确地选择一个来进行安装。"
+msgstr "请您明确地选择安装其中一个。"
 
 #: apt-private/private-cacheset.cc
 #, c-format
@@ -139,48 +138,48 @@ msgid ""
 "This may mean that the package is missing, has been obsoleted, or\n"
 "is only available from another source\n"
 msgstr ""
-"现在没有可用的软件包 %s，但是它被其它的软件包引用了。\n"
+"没有可用的软件包 %s，但是它被其它的软件包引用了。\n"
 "这可能意味着这个缺失的软件包可能已被废弃，\n"
 "或者只能在其他发布源中找到\n"
 
 #: apt-private/private-cacheset.cc
 msgid "However the following packages replace it:"
-msgstr "可是下列软件包取代了它："
+msgstr "然而下列软件包会取代它："
 
 #: apt-private/private-cacheset.cc
 #, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "软件包 %s 没有可供安装的候选者"
+msgstr "软件包 %s 没有可安装候选"
 
 #: apt-private/private-cacheset.cc
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "类似 %s 的虚拟软件包可以卸载\n"
+msgstr "类似 '%s' 的虚拟软件包「不」可以卸载\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: apt-private/private-cacheset.cc apt-private/private-install.cc
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "软件包 %s 还未安装，因而不会被卸载。您的意思是 ‘%s’ 吗？\n"
+msgstr "软件包 %s 未安装，所以不会被卸载。您的意思是 ‘%s’ 吗？\n"
 
 #: apt-private/private-cacheset.cc apt-private/private-install.cc
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr "软件包 %s 还未安装，因而不会被卸载\n"
+msgstr "软件包 %s 未安装，所以不会被卸载\n"
 
 #: apt-private/private-cacheset.cc
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "注意，选取 %s 而非 %s\n"
+msgstr "注意，选中 '%s' 而非 '%s'\n"
 
 #: apt-private/private-cmndline.cc
 msgid "Most used commands:"
-msgstr ""
+msgstr "常用命令："
 
 #: apt-private/private-cmndline.cc
 #, c-format
 msgid "See %s for more information about the available commands."
-msgstr ""
+msgstr "参见 %s 以获取更多关于可用命令的信息。"
 
 #: apt-private/private-cmndline.cc
 msgid ""
@@ -189,6 +188,10 @@ msgid ""
 "Package and version choices can be expressed via apt_preferences(5).\n"
 "Security details are available in apt-secure(8).\n"
 msgstr ""
+"程序配置选项及语法都已经在 apt.conf(5) 中阐明。\n"
+"欲知如何配置软件源，请参阅 sources.list(5)。\n"
+"软件包及其版本偏好可以通过 apt_preferences(5) 来设置。\n"
+"关于安全方面的细节可以参考 apt-secure(8).\n"
 
 #: apt-private/private-cmndline.cc
 msgid "This APT has Super Cow Powers."
@@ -205,11 +208,11 @@ msgstr "没有发现匹配的软件包"
 
 #: apt-private/private-download.cc
 msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "【警告】：下列软件包不能通过验证！"
+msgstr "【警告】：下列软件包不能通过认证！"
 
 #: apt-private/private-download.cc
 msgid "Authentication warning overridden.\n"
-msgstr "忽略了认证警告。\n"
+msgstr "已忽略认证警告。\n"
 
 #: apt-private/private-download.cc
 msgid "Some packages could not be authenticated"
@@ -217,25 +220,25 @@ msgstr "有些软件包不能通过验证"
 
 #: apt-private/private-download.cc
 msgid "Install these packages without verification?"
-msgstr "不经验证就安装这些软件包吗？"
+msgstr "没有验证的情况下就安装这些软件包吗？"
 
 #: apt-private/private-download.cc apt-private/private-install.cc
 msgid ""
 "--force-yes is deprecated, use one of the options starting with --allow "
 "instead."
-msgstr ""
+msgstr "--force-yes 已经被废弃，请使用以 --allow 开头的选项来代替。"
 
 #: apt-private/private-download.cc
-#, fuzzy
 msgid ""
 "There were unauthenticated packages and -y was used without --allow-"
 "unauthenticated"
-msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
+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
@@ -251,60 +254,90 @@ msgstr "您在 %s 上没有足够的可用空间。"
 msgid "Unable to lock the download directory"
 msgstr "无法锁定下载目录"
 
+#: apt-private/private-install.cc
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"有一些软件包无法被安装。如果您用的是 unstable 发行版，这也许是\n"
+"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
+"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc
+msgid "The following information may help to resolve the situation:"
+msgstr "下列信息可能会对解决问题有所帮助："
+
+#: apt-private/private-install.cc
+msgid "Broken packages"
+msgstr "破损的软件包"
+
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
+msgstr "内部错误，InstallPackages 被用在了损坏的软件包上！"
 
 #: apt-private/private-install.cc
 msgid "Packages need to be removed but remove is disabled."
-msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
+msgstr "有软件包需要被卸载，但是卸载被设置为禁止。"
 
 #: apt-private/private-install.cc
-#, fuzzy
 msgid ""
 "Essential packages were removed and -y was used without --allow-remove-"
 "essential."
-msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
+msgstr ""
+"关键软件包被移除同时使用了 -y 选项，但是没有搭配 --allow-remove-essential。"
 
 #: apt-private/private-install.cc
-#, fuzzy
 msgid "Packages were downgraded and -y was used without --allow-downgrades."
-msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
+msgstr "降级软件包同时使用了 -y 选项，但是没有用 --allow-downgrades."
 
 #: apt-private/private-install.cc
 msgid ""
 "Held packages were changed and -y was used without --allow-change-held-"
 "packages."
 msgstr ""
+"在更改保留软件包的同时使用了 -y 选项，但没有搭配 --allow-change-held-"
+"packages."
 
 #: apt-private/private-install.cc
 msgid "Internal error, Ordering didn't finish"
-msgstr "内部错误，Ordering 未能完成"
+msgstr "内部错误，排序未完成"
 
 #: apt-private/private-install.cc
 msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧"
+msgstr "怪了……文件大小不符，请发邮件给 apt@packages.debian.org 吧"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
 #: apt-private/private-install.cc
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
-msgstr "需要下载 %sB/%sB 的软件包。\n"
+msgstr "需要下载 %sB/%sB 的归档。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: apt-private/private-install.cc
 #, c-format
 msgid "Need to get %sB of archives.\n"
-msgstr "需要下载 %sB 的软件包。\n"
+msgstr "需要下载 %sB 的归档。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: apt-private/private-install.cc
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
+msgstr "解压缩后会消耗 %sB 的额外空间。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
@@ -315,7 +348,7 @@ msgstr "解压缩后将会空出 %sB 的空间。\n"
 
 #: apt-private/private-install.cc
 msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。"
+msgstr "虽然您指定了仅执行常规操作，但这并不是常规操作。"
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
@@ -330,13 +363,13 @@ msgid ""
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
-"您的操作会导致潜在的危害。\n"
-"若还想继续的话，就输入下面的短句“%s”\n"
+"您的操作有潜在的危害性。\n"
+"若要继续，请输入下面的短句“%s”\n"
 " ?] "
 
 #: apt-private/private-install.cc
 msgid "Abort."
-msgstr "中止执行。"
+msgstr "中止。"
 
 #: apt-private/private-install.cc
 msgid "Do you want to continue?"
@@ -344,27 +377,27 @@ msgstr "您希望继续执行吗？"
 
 #: apt-private/private-install.cc
 msgid "Some files failed to download"
-msgstr "有一些文件无法下载"
+msgstr "有一些文件下载失败"
 
 #: apt-private/private-install.cc apt-private/private-source.cc
 msgid "Download complete and in download only mode"
-msgstr "下载完毕，目前是“仅下载”模式"
+msgstr "于“仅下载”模式中下载完毕"
 
 #: apt-private/private-install.cc
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
-"有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
-"再试试？"
+"有几个软件包无法下载，要不运行 apt-get update 或者加上 --fix-missing 的选项再"
+"试试？"
 
 #: apt-private/private-install.cc
 msgid "--fix-missing and media swapping is not currently supported"
-msgstr "目前还不支持 --fix-missing 和介质交换"
+msgstr "目前不支持 --fix-missing 和介质交换"
 
 #: apt-private/private-install.cc
 msgid "Unable to correct missing packages."
-msgstr "无法更正缺少的软件包。"
+msgstr "无法修复缺失的软件包。"
 
 #: apt-private/private-install.cc
 msgid "Aborting install."
@@ -393,20 +426,6 @@ msgid ""
 "shouldn't happen. Please file a bug report against apt."
 msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc
-msgid "The following information may help to resolve the situation:"
-msgstr "下列信息可能会对解决问题有所帮助："
-
 #: apt-private/private-install.cc
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部错误，自动卸载工具坏事了"
@@ -445,32 +464,16 @@ msgstr ""
 "以指定一个解决办法)。"
 
 #: apt-private/private-install.cc
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"有一些软件包无法被安装。如果您用的是 unstable 发行版，这也许是\n"
-"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
-"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
-
-#: apt-private/private-install.cc
-msgid "Broken packages"
-msgstr "破损的软件包"
-
-#: apt-private/private-install.cc
-#, fuzzy
 msgid "The following additional packages will be installed:"
-msgstr "将会安装下列额外的软件包："
+msgstr "将会同时安装下列软件："
 
 #: apt-private/private-install.cc
 msgid "Suggested packages:"
-msgstr "建议安装的软件包："
+msgstr "建议安装："
 
 #: apt-private/private-install.cc
 msgid "Recommended packages:"
-msgstr "推荐安装的软件包："
+msgstr "推荐安装："
 
 #: apt-private/private-install.cc
 #, c-format
@@ -489,9 +492,9 @@ msgstr "不能重新安装 %s，因为无法下载它。\n"
 
 #. TRANSLATORS: First string is package name, second is version
 #: apt-private/private-install.cc
-#, fuzzy, c-format
+#, c-format
 msgid "%s is already the newest version (%s).\n"
-msgstr "%s 已经是最新的版本。\n"
+msgstr "%s 已经是最新版 (%s)。\n"
 
 #: apt-private/private-install.cc cmdline/apt-get.cc cmdline/apt-mark.cc
 #, c-format
@@ -519,16 +522,18 @@ msgid_plural ""
 "There are %i additional versions. Please use the '-a' switch to see them."
 msgstr[0] "还有 %i 个版本。请使用 -a 选项来查看它(他们)。"
 
+#. TRANSLATORS: placeholder is a binary name like apt or apt-get
 #: apt-private/private-main.cc
+#, c-format
 msgid ""
 "NOTE: This is only a simulation!\n"
-"      apt-get needs root privileges for real execution.\n"
+"      %s needs root privileges for real execution.\n"
 "      Keep also in mind that locking is deactivated,\n"
-"      so don't depend on the relevance to the real current situation!"
+"      so don't depend on the relevance to the real current situation!\n"
 msgstr ""
 "注意：这只是模拟！\n"
-"　　　apt-get 需要 root 特权进行实际的执行。\n"
-"　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！"
+"　　　%s 需要 root 特权进行实际的执行。\n"
+"　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！\n"
 
 #: apt-private/private-output.cc apt-private/private-show.cc
 msgid "unknown"
@@ -733,15 +738,11 @@ 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
 msgid "%s -> %s with priority %d\n"
-msgstr ""
+msgstr "%s -> %s ，其优先级为 %d\n"
 
 #: apt-private/private-show.cc
 msgid "  Installed: "
@@ -755,10 +756,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:"
@@ -866,51 +863,6 @@ msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s”失败。\n"
 
-#: apt-private/private-source.cc
-#, c-format
-msgid ""
-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr ""
-"由于 %3$s 不被软件包 %4$s 所允许，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"软件包 %3$s 的候选版本不能满足版本要求，因此 %2$s 软件包的 %1$s 依赖无法满足"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "软件包 %3$s 没有可用的候选版本，因此 %2$s 的 %1$s 依赖无法满足"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
-
-#: apt-private/private-source.cc
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-
 #: apt-private/private-source.cc
 #, c-format
 msgid "Unable to get build-dependency information for %s"
@@ -937,12 +889,12 @@ msgstr ""
 #: apt-private/private-source.cc
 #, c-format
 msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
+msgstr "注意，正使用 '%s' 目录下载编译依赖\n"
 
 #: apt-private/private-source.cc
-#, fuzzy, c-format
+#, c-format
 msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "无法处理构建依赖关系"
+msgstr "注意，正使用 '%s' 文件来获取编译依赖\n"
 
 #: apt-private/private-source.cc
 msgid "Failed to process build dependencies"
@@ -980,9 +932,8 @@ msgid "All packages are up to date."
 msgstr "所有软件包均为最新。"
 
 #: cmdline/apt-cache.cc
-#, fuzzy
 msgid "apt-cache stats does not take any arguments"
-msgstr " update 命令不需要参数"
+msgstr "apt-cache stats 命令不需要参数"
 
 #: cmdline/apt-cache.cc
 msgid "Total package names: "
@@ -998,7 +949,7 @@ msgstr "  普通软件包："
 
 #: cmdline/apt-cache.cc
 msgid "  Pure virtual packages: "
-msgstr "  完全虚拟软件包："
+msgstr "  纯虚拟软件包："
 
 #: cmdline/apt-cache.cc
 msgid "  Single virtual packages: "
@@ -1064,6 +1015,14 @@ msgid ""
 "too long ago, but in exchange apt-cache works independently of the\n"
 "availability of the configured sources (e.g. offline).\n"
 msgstr ""
+"用法： apt-cache [选项] 命令\n"
+"       apt-cache [选项] show 软件包1 [软件包2 ...]\n"
+"\n"
+"apt-cache 可以查询和显示已安装和可安装软件包的可用信息。\n"
+"它专门工作在本地的数据缓存上，而这些缓存可以通过比如\n"
+"apt-get 的 'update' 命令来更新。如果距离上一次更新的时间太久，\n"
+"那么它显示的信息可能就会过时。不过作为交换，apt-cache 不依赖\n"
+"当前软件源的可用性（比如：离线状态）。\n"
 
 #: cmdline/apt-cache.cc
 msgid "Show source records"
@@ -1098,14 +1057,13 @@ msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”"
 
 #: cmdline/apt-cdrom.cc
-#, fuzzy
 msgid "Please insert a Disc in the drive and press [Enter]"
-msgstr "请把盘片插入驱动器再按回车键"
+msgstr "请把盘片插入驱动器再按「回车键」"
 
 #: cmdline/apt-cdrom.cc
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr "无法将 %s 挂载到 %s"
+msgstr "无法将 ‘%s’ 挂载到 ‘%s’"
 
 #: cmdline/apt-cdrom.cc
 msgid ""
@@ -1130,13 +1088,16 @@ msgid ""
 "media types as package sources to APT. The mount point and device\n"
 "information is taken from apt.conf(5), udev(7) and fstab(5).\n"
 msgstr ""
+"用法： apt-cdrom [选项] 命令\n"
+"\n"
+"apt-cdrom 用于添加CDROM, USB存储器和其他可移动媒介作为 APT 软件源。\n"
+"关于挂载点和设备的详细信息参见 apt.conf(5), udev(7) 和 fstab(5)。\n"
 
 #: cmdline/apt-config.cc
 msgid "Arguments not in pairs"
 msgstr "参数不成对"
 
 #: cmdline/apt-config.cc
-#, fuzzy
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -1145,15 +1106,15 @@ msgid ""
 msgstr ""
 "用法：apt-config [选项] 命令\n"
 "\n"
-"apt-config 是一个用于读取APT 配置文件的简单工具\n"
+"apt-config 是所有 APT 工具的配置接口，主要用于Debug和编写Shell脚本。\n"
 
 #: cmdline/apt-config.cc
 msgid "get configuration values via shell evaluation"
-msgstr ""
+msgstr "通过shell求值来获取设置值"
 
 #: cmdline/apt-config.cc
 msgid "show the active configuration setting"
-msgstr ""
+msgstr "显示活动的设置选项"
 
 #: cmdline/apt-get.cc
 #, c-format
@@ -1180,7 +1141,6 @@ msgid "Supported modules:"
 msgstr "支持的模块："
 
 #: cmdline/apt-get.cc
-#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1195,8 +1155,8 @@ msgstr ""
 "　　　 apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
 "　　　 apt-get [选项] source 软件包1 [软件包2 ...]\n"
 "\n"
-"apt-get 是一个用于下载和安装软件包的简易命令行界面。\n"
-"最常用命令是 update 和 install。\n"
+"apt-get 可以从认证软件源下载软件包及相关信息，以便安装和升级软件包，\n"
+"或者用于移除软件包。在这些过程中，软件包依赖会被妥善处理。\n"
 
 #: cmdline/apt-get.cc
 msgid "Retrieve new lists of packages"
@@ -1264,7 +1224,7 @@ msgstr "需要一个 URL 作为参数"
 
 #: cmdline/apt-helper.cc
 msgid "Must specify at least one pair url/filename"
-msgstr "必须指定至少一对URL或者文件名"
+msgstr "必须指定至少一对URL或文件名"
 
 #: cmdline/apt-helper.cc
 msgid "Download Failed"
@@ -1273,12 +1233,12 @@ msgstr "下载失败"
 #: cmdline/apt-helper.cc
 #, c-format
 msgid "GetSrvRec failed for %s"
-msgstr ""
+msgstr "GetSrvRec 失败，因为 %s"
 
 #: cmdline/apt-helper.cc
-#, fuzzy
 msgid ""
 "Usage: apt-helper [options] command\n"
+"       apt-helper [options] cat-file file ...\n"
 "       apt-helper [options] download-file uri target-path\n"
 "\n"
 "apt-helper bundles a variety of commands for shell scripts to use\n"
@@ -1287,7 +1247,8 @@ msgstr ""
 "用法： apt-helper [选项] 命令\n"
 "       apt-helper [选项] download-file URI 目标路径\n"
 "\n"
-"apt-helper 是一个 apt 的内部助手\n"
+"apt-helper 汇集了各种各样的功能来供shell脚本调用，比如\n"
+"使用与APT相同的代理设置，或者相同的捕获系统。\n"
 
 #: cmdline/apt-helper.cc
 msgid "download the given uri to the target-path"
@@ -1295,7 +1256,11 @@ msgstr "将 URI 指定的文件下载到目标路径"
 
 #: cmdline/apt-helper.cc
 msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
-msgstr ""
+msgstr "查阅一个 SRV 记录 (如： _http._tcp.ftp.debian.org)"
+
+#: cmdline/apt-helper.cc
+msgid "concatenate files, with automatic decompression"
+msgstr "自动解压并连接文件"
 
 #: cmdline/apt-helper.cc
 msgid "detect proxy using apt.conf"
@@ -1343,20 +1308,19 @@ msgstr "取消保留 %s 的设置。\n"
 #: cmdline/apt-mark.cc
 #, c-format
 msgid "Selected %s for purge.\n"
-msgstr ""
+msgstr "选中 %s 以待彻底卸载。\n"
 
 #: cmdline/apt-mark.cc
 #, c-format
 msgid "Selected %s for removal.\n"
-msgstr ""
+msgstr "选中 %s 以待卸载。\n"
 
 #: cmdline/apt-mark.cc
 #, c-format
 msgid "Selected %s for installation.\n"
-msgstr ""
+msgstr "选中 %s 以待安装。\n"
 
 #: cmdline/apt-mark.cc
-#, fuzzy
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1367,8 +1331,8 @@ msgid ""
 msgstr ""
 "用法：apt-mark [选项] {auto|manual} 软件包1 [软件包2 ...]\n"
 "\n"
-"apt-mark 是一个可以对软件包进行 手动/自动 安装标记的简单命令行界面。\n"
-"它也能列出标记。\n"
+"apt-mark 可以对软件包进行 手动/自动 安装标记，也可以用来处理软件\n"
+"包的 dpkg(1) 选中状态，以及列出或过滤拥有某个标记的软件包。\n"
 
 #: cmdline/apt-mark.cc
 msgid "Mark the given packages as automatically installed"
@@ -1408,6 +1372,11 @@ msgid ""
 "like apt-get and apt-cache, but enables options more suitable for\n"
 "interactive use by default.\n"
 msgstr ""
+"用法： apt [选项] 命令\n"
+"\n"
+"命令行软件包管理器 apt 提供软件包搜索，管理和信息查询等功能。\n"
+"它提供的功能与其他 APT 工具相同（像 apt-get 和 apt-cache），\n"
+"但是默认情况下被设置得更适合交互。\n"
 
 #. query
 #: cmdline/apt.cc
@@ -1459,8 +1428,8 @@ msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
-"请使用 apt-cdrom，通过它就可以让 APT 能识别该盘片。apt-get upgdate 不能被用来"
-"加入新的盘片。"
+"请使用 apt-cdrom，通过它可以让 APT 识别该盘片。apt-get upgdate 不能被用来加入"
+"新的盘片。"
 
 #: methods/cdrom.cc
 msgid "Wrong CD-ROM"
@@ -1469,7 +1438,7 @@ msgstr "错误的 CD-ROM"
 #: methods/cdrom.cc
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。"
+msgstr "无法卸载挂载于 %s 的 CD-ROM，它可能正被使用。"
 
 #: methods/cdrom.cc
 msgid "Disk not found."
@@ -1477,7 +1446,7 @@ msgstr "找不到盘片。"
 
 #: methods/cdrom.cc methods/file.cc methods/rsh.cc
 msgid "File not found"
-msgstr "无法找到该文件"
+msgstr "无法找到文件"
 
 #: methods/connect.cc
 #, c-format
@@ -1545,17 +1514,13 @@ msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "不能连接到 %s：%s："
 
-#: methods/copy.cc methods/gzip.cc methods/rred.cc
+#: methods/copy.cc
 msgid "Failed to stat"
 msgstr "无法读取状态"
 
-#: methods/copy.cc methods/gzip.cc methods/rred.cc
-msgid "Failed to set modification time"
-msgstr "无法设置文件的修改日期"
-
 #: methods/file.cc
 msgid "Invalid URI, local URIS must not start with //"
-msgstr "无效的 URI，本地的 URI 不能以 // 开头"
+msgstr "无效的 URI，本地 URI 不能以 // 开头"
 
 #. Login must be before getpeername otherwise dante won't work.
 #: methods/ftp.cc
@@ -1632,7 +1597,7 @@ msgstr "无法创建套接字"
 
 #: methods/ftp.cc
 msgid "Could not connect data socket, connection timed out"
-msgstr "无法连接上数据套接字，连接超时"
+msgstr "无法连接数据套接字，连接超时"
 
 #: methods/ftp.cc
 msgid "Could not connect passive socket."
@@ -1666,7 +1631,7 @@ msgstr "无法识别的地址族 %u (AF_*)"
 #: methods/ftp.cc
 #, c-format
 msgid "EPRT failed, server said: %s"
-msgstr "EPRT 指令出错，服务器响应信息为：%s"
+msgstr "EPRT 指令失败，服务器响应为：%s"
 
 #: methods/ftp.cc
 msgid "Data socket connect timed out"
@@ -1683,7 +1648,7 @@ msgstr "把文件加入哈希表时出错"
 #: methods/ftp.cc
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
-msgstr "无法获取文件，服务器响应信息为“%s”"
+msgstr "无法获取文件，服务器响应为“%s”"
 
 #: methods/ftp.cc methods/rsh.cc
 msgid "Data socket timed out"
@@ -1692,7 +1657,7 @@ msgstr "数据套接字超时"
 #: methods/ftp.cc
 #, c-format
 msgid "Data transfer failed, server said '%s'"
-msgstr "数据传送出错，服务器响应信息为“%s”"
+msgstr "数据传送出错，服务器响应为“%s”"
 
 #. Get the files information
 #: methods/ftp.cc
@@ -1703,6 +1668,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 "至少发现一个无效的签名。"
@@ -1716,18 +1696,16 @@ 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 时发生未知错误"
 
+#. TRANSLATORS: The second %s is the reason and is untranslated for repository owners.
+#: methods/gpgv.cc
+#, c-format
+msgid "Signature by key %s uses weak digest algorithm (%s)"
+msgstr "密钥 %s 生成的数字签名使用了弱安全性摘要算法(%s)"
+
 #: methods/gpgv.cc
 msgid "The following signatures were invalid:\n"
 msgstr "下列签名无效：\n"
@@ -1738,10 +1716,6 @@ msgid ""
 "available:\n"
 msgstr "由于没有公钥，无法验证下列签名：\n"
 
-#: methods/gzip.cc
-msgid "Empty files can't be valid archives"
-msgstr "空文件不能当作有效归档"
-
 #: methods/http.cc
 msgid "Error writing to the file"
 msgstr "写入文件出错"
@@ -1809,6 +1783,16 @@ msgstr "在镜像文件 %s 中未找到所需条目"
 msgid "[Mirror: %s]"
 msgstr "[镜像：%s]"
 
+#: methods/rred.cc ftparchive/cachedb.cc apt-inst/extract.cc
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid "Failed to stat %s"
+msgstr "无法获得 %s 的状态"
+
+#: methods/rred.cc
+msgid "Failed to set modification time"
+msgstr "无法设置文件的修改日期"
+
 #: methods/rsh.cc ftparchive/multicompress.cc
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "无法为子进程创建 IPC 管道"
@@ -1858,21 +1842,24 @@ msgstr "连接失败"
 msgid ""
 "Automatically disabled %s due to incorrect response from server/proxy. (man "
 "5 apt.conf)"
-msgstr ""
+msgstr "由于服务器或代理的响应错误，因此自动禁止 %s。（参见 man 5 apt.conf）"
 
 #: methods/server.cc
 msgid "Internal error"
 msgstr "内部错误"
 
+#: methods/store.cc
+msgid "Empty files can't be valid archives"
+msgstr "空文件不是有效归档"
+
 #: dselect/install:33
 msgid "Bad default setting!"
 msgstr "错误的默认设置！"
 
 #: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
 #: dselect/install:106 dselect/update:45
-#, fuzzy
 msgid "Press [Enter] to continue."
-msgstr "按回车键继续。"
+msgstr "按「回车键」继续。"
 
 #: dselect/install:92
 msgid "Do you want to erase any previously downloaded .deb files?"
@@ -1880,7 +1867,7 @@ msgstr "您想要删除之前下载的所有 .deb 文件吗？"
 
 #: dselect/install:102
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "在解包时发生了一些错误。已经安装的软件包"
+msgstr "在解压时发生了一些错误。已经安装的软件包"
 
 #: dselect/install:103
 msgid "will be configured. This may result in duplicate errors"
@@ -1899,8 +1886,25 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们，
 msgid "Merging available information"
 msgstr "正在合并可用信息"
 
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"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
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "等待子进程 %s 的退出，但是它并不存在"
+
 #: cmdline/apt-extracttemplates.cc
-#, fuzzy
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -1908,16 +1912,10 @@ msgid ""
 "from debian packages. It is used mainly by debconf(1) to prompt for\n"
 "configuration questions before installation of packages.\n"
 msgstr ""
-"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
+"用法： apt-extracttemplates 文件1 [文件2 ...]\n"
 "\n"
-"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
-"信息的工具\n"
-"\n"
-"选项：\n"
-"  -h   本帮助文本\n"
-"  -t   设置 temp 目录\n"
-"  -c=? 读指定的配置文件\n"
-"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
+"apt-extracttemplates 可以从 debian 软件包中解压出配置文件和模板\n"
+"信息。它主要被 debconf(1) 用于在安装软件包前询问用户配置问题。\n"
 
 #: cmdline/apt-extracttemplates.cc apt-pkg/contrib/fileutl.cc
 #, c-format
@@ -1933,9 +1931,22 @@ msgstr "无法写入 %s"
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
 
-#: cmdline/apt-internal-solver.cc
+#: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
+"Usage: apt-internal-planner\n"
+"\n"
+"apt-internal-planner is an interface to use the current internal\n"
+"installation planner for the APT family like an external one,\n"
+"for debugging or the like.\n"
+msgstr ""
+"用法： apt-internal-solver\n"
+"\n"
+"apt-internal-solver 可以像外部解析器那样使用当前的APT家族内部解析器，\n"
+"以便调试等用途。\n"
+
+#: cmdline/apt-internal-solver.cc
+msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
 "apt-internal-solver is an interface to use the current internal\n"
@@ -1944,14 +1955,8 @@ msgid ""
 msgstr ""
 "用法： apt-internal-solver\n"
 "\n"
-"apt-internal-solver 是个用于调试及类似用途的接口，它可以\n"
-"像 APT 家族外部解决器(resolver)那样使用当前的内部解决器。\n"
-"\n"
-"选项：\n"
-"  -h  显示本帮助。\n"
-"  -q  日志型输出 - 无进度指示\n"
-"  -c=? 读取指定配置文件\n"
-"  -o=? 设置任意配置项，比如 -o dir::cache=/tmp\n"
+"apt-internal-solver 可以像外部解析器那样使用当前的APT家族内部解析器，\n"
+"以便调试等用途。\n"
 
 #: cmdline/apt-sortpkgs.cc
 msgid "Unknown package record!"
@@ -1965,6 +1970,11 @@ msgid ""
 "By default it sorts by binary package information, but the -s option\n"
 "can be used to switch to source package ordering instead.\n"
 msgstr ""
+"用法： apt-sortpkgs [选项] 文件1 [文件2 ...]\n"
+"\n"
+"简易工具 apt-sortpkgs 用于排序软件包信息。\n"
+"它默认对二进制包信息排序，但是 -s 选项可以将其切换为\n"
+"对源码包排序。\n"
 
 #: ftparchive/apt-ftparchive.cc
 msgid "Package extension list is too long"
@@ -2099,11 +2109,6 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "无法打开数据库文件 %s：%s"
 
-#: ftparchive/cachedb.cc apt-inst/extract.cc
-#, c-format
-msgid "Failed to stat %s"
-msgstr "无法获得 %s 的状态"
-
 #: ftparchive/cachedb.cc
 msgid "Failed to read .dsc"
 msgstr "读取 .dsc 文件失败"
@@ -2229,7 +2234,7 @@ msgstr "无法打开 %s"
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc
+#: ftparchive/writer.cc apt-pkg/acquire-item.cc
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "无法读取符号链接 %s"
@@ -2294,9 +2299,9 @@ msgid "Failed to read the archive headers"
 msgstr "无法读取归档文件的数据头"
 
 #: apt-inst/contrib/extracttar.cc
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot find a configured compressor for '%s'"
-msgstr "无法找到认证记录：%s"
+msgstr "找不到对应于 '%s' 的已配置压缩工具"
 
 #: apt-inst/contrib/extracttar.cc
 msgid "Corrupted archive"
@@ -2343,7 +2348,7 @@ msgstr "路径名 %s 太长"
 #: apt-inst/extract.cc
 #, c-format
 msgid "Unpacking %s more than once"
-msgstr "%s 被解包了不只一次"
+msgstr "%s 被解压了不只一次"
 
 #: apt-inst/extract.cc
 #, c-format
@@ -2422,29 +2427,66 @@ msgstr "重复的配置文件 %s/%s"
 msgid ""
 "Updating from such a repository can't be done securely, and is therefore "
 "disabled by default."
-msgstr ""
+msgstr "无法安全地用该源进行更新，所以默认禁用该源。"
 
 #: apt-pkg/acquire-item.cc
 msgid ""
 "Data from such a repository can't be authenticated and is therefore "
 "potentially dangerous to use."
-msgstr ""
+msgstr "无法认证来自该源的数据，所以使用它会带来潜在风险。"
 
 #: apt-pkg/acquire-item.cc
 msgid ""
 "See apt-secure(8) manpage for repository creation and user configuration "
 "details."
+msgstr "参见 apt-secure(8) 手册以了解仓库创建和用户配置方面的细节。"
+
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "仓库 “%s” 的签名不再生效。"
+
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid "The repository '%s' does no longer have a Release file."
+msgstr "仓库 “%s” 不再含有 Release 文件。"
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
 msgstr ""
+"一般不可以这样做，但选项 Acquire:: AllowDowngradeToInsecureRepositories 可以"
+"用于覆盖默认设置。"
 
-#: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "无法重命名文件，%s (%s -> %s)。"
+msgid "The repository '%s' is not signed."
+msgstr "仓库 “%s” 没有数字签名。"
+
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "仓库 “%s” 没有 Release 文件。"
+
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid "The repository '%s' provides only weak security information."
+msgstr "仓库 '%s' 只提供了低强度的安全信息。"
 
 #: apt-pkg/acquire-item.cc
 msgid "Hash Sum mismatch"
 msgstr "Hash 校验和不符"
 
+#: apt-pkg/acquire-item.cc
+msgid "Insufficient information available to perform this download securely"
+msgstr "可用信息不足，不能安全执行本次下载"
+
+#: 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 "Size mismatch"
 msgstr "大小不符"
@@ -2454,17 +2496,17 @@ msgid "Invalid file format"
 msgstr "无效的文件格式 %s"
 
 #: apt-pkg/acquire-item.cc
-#, fuzzy
 msgid "Signature error"
-msgstr "写出错"
+msgstr "数字签名错误"
 
 #: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s"
 msgstr ""
-"校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
+"校验数字签名时出错。此仓库未被更新，所以仍然使用此前的索引文件。GPG 错误："
+"%s: %s"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
 #: apt-pkg/acquire-item.cc
@@ -2477,7 +2519,7 @@ msgstr "GPG 错误：%s: %s"
 msgid ""
 "Skipping acquire of configured file '%s' as repository '%s' doesn't support "
 "architecture '%s'"
-msgstr ""
+msgstr "鉴于仓库 '%2$s' 不支持 '%3$s' 体系结构，跳过配置文件 '%1$s' 的捕获。"
 
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -2492,11 +2534,7 @@ msgstr ""
 msgid ""
 "Skipping acquire of configured file '%s' as repository '%s' provides only "
 "weak security information for it"
-msgstr ""
-
-#: 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,33 +2552,6 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
 
-#. No Release file was present, or verification failed, so fall
-#. back to queueing Packages files without verification
-#. only allow going further if the user explicitly wants it
-#: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
-msgid "The repository '%s' is not signed."
-msgstr "目录 %s 已被转移"
-
-#. No Release file was present so fall
-#. back to queueing Packages files without verification
-#. only allow going further if the user explicitly wants it
-#: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
-msgid "The repository '%s' does not have a Release file."
-msgstr "目录 %s 已被转移"
-
-#: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
-msgid "The repository '%s' is no longer signed."
-msgstr "目录 %s 已被转移"
-
-#: apt-pkg/acquire-item.cc
-msgid ""
-"This is normally not allowed, but the option Acquire::"
-"AllowDowngradeToInsecureRepositories was given to override it."
-msgstr ""
-
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
@@ -2563,9 +2574,9 @@ msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 File
 
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #: apt-pkg/acquire-item.cc
-#, fuzzy, c-format
+#, c-format
 msgid "Changelog unavailable for %s=%s"
-msgstr "%s (%s) 的 Changelog"
+msgstr "%s=%s 的 Changelog 不可用"
 
 #: apt-pkg/acquire-worker.cc
 #, c-format
@@ -2583,10 +2594,10 @@ msgid "Method %s did not start correctly"
 msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 
 #: apt-pkg/acquire-worker.cc
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
-msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
+msgstr "请把标有 “%s” 的盘片插入驱动器 “%s” 再按「回车键」。"
 
 #: apt-pkg/acquire.cc apt-pkg/cdrom.cc
 #, c-format
@@ -2606,14 +2617,14 @@ msgstr "无法对目录 %s 加锁"
 #: apt-pkg/acquire.cc
 #, c-format
 msgid "No sandbox user '%s' on the system, can not drop privileges"
-msgstr ""
+msgstr "系统中不存在沙箱用户'%s'，无法降低权限"
 
 #: apt-pkg/acquire.cc
 #, c-format
 msgid ""
 "Can't drop privileges for downloading as file '%s' couldn't be accessed by "
 "user '%s'."
-msgstr ""
+msgstr "文件'%s'无法被用户'%s'访问，无法降低权限以进行下载。"
 
 #: apt-pkg/acquire.cc apt-pkg/clean.cc
 #, c-format
@@ -2813,18 +2824,18 @@ msgid "Failed to stat the cdrom"
 msgstr "无法读取盘片的状态"
 
 #: apt-pkg/contrib/cmndline.cc
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Command line option '%c' [from %s] is not understood in combination with the "
 "other options."
-msgstr "未知的命令行选项“%c” [来自 %s]"
+msgstr "不能理解命令行选项 “%c” [来自 %s] 与其他选项的搭配。"
 
 #: apt-pkg/contrib/cmndline.cc
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Command line option %s is not understood in combination with the other "
 "options"
-msgstr "无法识别命令行选项 %s"
+msgstr "不能理解命令行选项 “%s” 与其他选项的搭配。"
 
 #: apt-pkg/contrib/cmndline.cc
 #, c-format
@@ -2962,11 +2973,6 @@ msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr "忽略‘%s’(于目录‘%s’)，鉴于它的文件扩展名无效"
 
-#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "等待子进程 %s 的退出，但是它并不存在"
-
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
@@ -2993,14 +2999,8 @@ msgid "Problem closing the gzip file %s"
 msgstr "关闭 gzip %s 文件出错"
 
 #: apt-pkg/contrib/fileutl.cc
-#, c-format
-msgid "Could not open file %s"
-msgstr "无法打开文件 %s"
-
-#: apt-pkg/contrib/fileutl.cc
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr "无法打开文件描述符 %d"
+msgid "Unexpected end of file"
+msgstr "未预期的文件结束符"
 
 #: apt-pkg/contrib/fileutl.cc
 msgid "Failed to create subprocess IPC"
@@ -3010,6 +3010,16 @@ msgstr "无法创建子进程的 IPC 管道"
 msgid "Failed to exec compressor "
 msgstr "无法执行压缩程序"
 
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Could not open file %s"
+msgstr "无法打开文件 %s"
+
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "无法打开文件描述符 %d"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "read, still have %llu to read but none left"
@@ -3141,7 +3151,7 @@ msgstr "找不到您选则的 %s"
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
-msgstr ""
+msgstr "目标 %1$s 想要捕获与 %3$s (来自软件源 %4$s) 相同的文件 (%2$s)"
 
 #. TRANSLATOR: an identifier like Packages; Releasefile key indicating
 #. a file like main/binary-amd64/Packages; filename and linenumber of
@@ -3149,7 +3159,7 @@ msgstr ""
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
-msgstr ""
+msgstr "目标 %s (%s) 在 %s 和 %s 中被配置了多次"
 
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
@@ -3169,30 +3179,30 @@ msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid ""
-"No Hash entry in Release file %s, which is considered strong enough for "
+"No Hash entry in Release file %s which is considered strong enough for "
 "security purposes"
-msgstr ""
-
-#: 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
 #, c-format
 msgid "Conflicting values set for option %s regarding source %s %s"
-msgstr ""
+msgstr "软件源 %2$s %3$s 的选项 %1$s 中含有互相冲突的值"
 
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Invalid value set for option %s regarding source %s %s (%s)"
-msgstr ""
+msgstr "软件源 %2$s %3$s (%4$s) 的选项 %1$s 中含有无效值"
+
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr "软件源 %2$s %3$s 的选项 %1$s 中含有互相冲突的值：%4$s != %5$s"
 
 #: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
 #, c-format
@@ -3253,13 +3263,18 @@ msgstr "注意到 %s 已经消失"
 msgid "Running post-installation trigger %s"
 msgstr "执行安装后执行的触发器 %s"
 
+#: apt-pkg/deb/dpkgpm.cc
+#, c-format
+msgid "Installed %s"
+msgstr "已安装 %s"
+
 #. FIXME: use a better string after freeze
 #: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "目录 %s 缺失"
 
-#: apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "无法打开文件 %s"
@@ -3279,11 +3294,6 @@ msgstr "正在解压缩 %s"
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc
-#, c-format
-msgid "Installed %s"
-msgstr "已安装 %s"
-
 #: apt-pkg/deb/dpkgpm.cc
 #, c-format
 msgid "Preparing for removal of %s"
@@ -3401,6 +3411,26 @@ msgstr "外部solver出错，错误信息不恰当"
 msgid "Execute external solver"
 msgstr "执行外部solver"
 
+#: apt-pkg/edsp.cc
+#, fuzzy
+msgid "Execute external planner"
+msgstr "执行外部solver"
+
+#: apt-pkg/edsp.cc
+#, fuzzy
+msgid "Send request to planner"
+msgstr "向solver发送请求"
+
+#: apt-pkg/edsp.cc
+#, fuzzy
+msgid "Send scenario to planner"
+msgstr "向solver发送情景"
+
+#: apt-pkg/edsp.cc
+#, fuzzy
+msgid "External planner failed without a proper error message"
+msgstr "外部solver出错，错误信息不恰当"
+
 #: apt-pkg/indexcopy.cc
 #, c-format
 msgid "Wrote %i records.\n"
@@ -3486,19 +3516,19 @@ msgstr "软件包缓存文件损坏了"
 msgid "The package cache file is an incompatible version"
 msgstr "软件包缓存区文件的版本不兼容"
 
-#: apt-pkg/pkgcache.cc
-msgid "The package cache file is corrupted, it is too small"
-msgstr "软件包缓存文件损坏，它太小了"
-
 #: apt-pkg/pkgcache.cc
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "本程序目前不支持“%s”版本系统"
 
 #: apt-pkg/pkgcache.cc
-#, fuzzy, c-format
+#, c-format
 msgid "The package cache was built for different architectures: %s vs %s"
-msgstr "软件包缓存区是为其它架构的硬件构建的"
+msgstr "软件包缓存是为其它架构的硬件构建的: %s vs %s"
+
+#: apt-pkg/pkgcache.cc
+msgid "The package cache file is corrupted, it has the wrong hash"
+msgstr "软件包缓存文件损坏，散列值错误"
 
 #: apt-pkg/pkgcache.cc
 msgid "Depends"
@@ -3617,7 +3647,7 @@ msgstr "无法识别锁定的类型 %s"
 #: apt-pkg/policy.cc
 #, c-format
 msgid "%s: Value %s is outside the range of valid pin priorities (%d to %d)"
-msgstr ""
+msgstr "%s: 值 %s 超出锁定优先级有效范围 (%d 到 %d)"
 
 #: apt-pkg/policy.cc
 msgid "No priority (or zero) specified for pin"
@@ -3625,9 +3655,9 @@ msgstr "没有为版本锁定指定优先级(或为零)"
 
 #. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
 #: apt-pkg/sourcelist.cc
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "override 文件 %s 第 %llu (%s) 行的格式有误"
+msgstr "文件 %2$s 第 %1$u 行的记录格式有误 %3$s (%4$s)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
@@ -3637,41 +3667,36 @@ msgstr "正在打开 %s"
 #: apt-pkg/sourcelist.cc
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
-msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
+msgstr "在源列表 %2$s 中第 %1$u 行有误 (类型)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
+msgstr "软件源列表 %3$s 第 %2$u 行中的类别 “%1$s” 无法识别"
 
 #: apt-pkg/sourcelist.cc
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed stanza %u in source list %s (type)"
-msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
+msgstr "软件源列表 %2$s 中第 %1$u 行的小节格式有误 (类型)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
 msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "无法识别在源列表 %3$s 里，第 %2$u 节中的软件包类别“%1$s”"
+msgstr "软件源列表 %3$s 第 %2$u 小节的类别 “%1$s” 无法识别"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
 msgid "Unsupported file %s given on commandline"
-msgstr ""
+msgstr "命令行中有不支持的文件 %s"
 
 #: apt-pkg/srcrecords.cc
 msgid "You must put some 'source' URIs in your sources.list"
-msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
+msgstr "您必须在 sources.list 中指定代码源(deb-src) URI"
 
 #: apt-pkg/tagfile.cc
 #, c-format
 msgid "Cannot convert %s to integer: out of range"
-msgstr ""
-
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "无法下载 %s  %s\n"
+msgstr "无法将 %s 转换为整数：超出范围"
 
 #: apt-pkg/update.cc
 msgid ""
@@ -3681,7 +3706,52 @@ msgstr "部分索引文件下载失败。如果忽略它们，那将转而使用
 
 #: apt-pkg/upgrade.cc
 msgid "Calculating upgrade"
-msgstr "正在对升级进行计算"
+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"
+#~ msgstr ""
+#~ "由于 %3$s 不被软件包 %4$s 所允许，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because the package %s cannot be "
+#~ "found"
+#~ msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+
+#~ msgid ""
+#~ "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+#~ msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新"
+
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because candidate version of "
+#~ "package %s can't satisfy version requirements"
+#~ msgstr ""
+#~ "软件包 %3$s 的候选版本不能满足版本要求，因此 %2$s 软件包的 %1$s 依赖无法满"
+#~ "足"
+
+#~ msgid ""
+#~ "%s dependency for %s cannot be satisfied because package %s has no "
+#~ "candidate version"
+#~ msgstr "软件包 %3$s 没有可用的候选版本，因此 %2$s 的 %1$s 依赖无法满足"
+
+#~ msgid "Failed to satisfy %s dependency for %s: %s"
+#~ msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
+
+#~ msgid "Build-dependencies for %s could not be satisfied."
+#~ msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
 
 #~ msgid "Problem unlinking %s"
 #~ msgstr "在使用 unlink 删除 %s 时出错"
@@ -4041,7 +4111,7 @@ msgstr "正在对升级进行计算"
 #~ "Could not perform immediate configuration on already unpacked '%s'. "
 #~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "无法立即对已经解包的 %s 进行配置。请查看 man 5 apt.conf 中的 APT::"
+#~ "无法立即对已经解压的 %s 进行配置。请查看 man 5 apt.conf 中的 APT::"
 #~ "Immediate-Configure。"
 
 #~ msgid "Error occurred while processing %s (NewPackage)"