X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/57722714255118560c98b3245413ff5f693b993c..39b4b76cbfc378d240eb30caaa102b0ca51fad3f:/po/zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4411aaf92..8daf9e203 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,14 +3,15 @@
 # Deng Xiyue <manphiz-guest@users.alioth.debian.org>, 2007, 2008.
 # Tchaikov <tchaikov@sjtu.org>, 2005, 2007.
 # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.
+# Aron Xu <happyaron.xu@gmail.com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-21 15:49+0200\n"
-"PO-Revision-Date: 2009-06-01 15:54+0800\n"
-"Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
+"POT-Creation-Date: 2009-12-10 16:49+0100\n"
+"PO-Revision-Date: 2009-12-02 01:00+0800\n"
+"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@ msgid "Package %s version %s has an unmet dep:\n"
 msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
 
 #: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
-#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021
 #: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
@@ -50,7 +51,7 @@ msgstr "  混合虚拟软件包："
 
 #: cmdline/apt-cache.cc:289
 msgid "  Missing: "
-msgstr "  缺漏的："
+msgstr "  缺失："
 
 #: cmdline/apt-cache.cc:291
 msgid "Total distinct versions: "
@@ -92,10 +93,10 @@ msgstr "Slack 空间共计："
 msgid "Total space accounted for: "
 msgstr "总占用空间："
 
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
 #, c-format
 msgid "Package file %s is out of sync."
-msgstr "软件包文件 %s 尚未同步(sync)。"
+msgstr "软件包文件 %s 尚未同步。"
 
 #: cmdline/apt-cache.cc:1297
 msgid "You must give exactly one pattern"
@@ -103,7 +104,7 @@ msgstr "您必须明确地给出一个表达式"
 
 #: cmdline/apt-cache.cc:1451
 msgid "No packages found"
-msgstr "没有发现吻合的软件包"
+msgstr "没有发现匹配的软件包"
 
 #: cmdline/apt-cache.cc:1528
 msgid "Package files:"
@@ -111,12 +112,12 @@ msgstr "软件包文件："
 
 #: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
 msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "缓存尚未同步(sync)，无法交差引证(x-ref)一个软件包文件"
+msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件"
 
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1549
 msgid "Pinned packages:"
-msgstr "被锁定(pinned)的软件包："
+msgstr "被锁定的软件包："
 
 #: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
 msgid "(not found)"
@@ -134,11 +135,11 @@ msgstr "(无)"
 #. Candidate Version
 #: cmdline/apt-cache.cc:1589
 msgid "  Candidate: "
-msgstr "  候选的软件包："
+msgstr "  候选软件包："
 
 #: cmdline/apt-cache.cc:1599
 msgid "  Package pin: "
-msgstr "  软件包锁(Pin)："
+msgstr "  软件包锁："
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1608
@@ -150,14 +151,14 @@ msgstr "  版本列表："
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s for %s 编译于 %s %s\n"
+msgstr "%s %s，用于 %s 构架，编译于 %s %s\n"
 
-#: cmdline/apt-cache.cc:1726
+#: cmdline/apt-cache.cc:1725
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -196,25 +197,25 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 "用法： apt-cache [选项] 命令\n"
-"       apt-cache [选项] add 文件甲 [文件乙 ...]\n"
-"       apt-cache [选项] showpkg 软件包甲 [软件包乙 ...]\n"
-"       apt-cache [选项] showsrc 软件包甲 [软件包乙 ...]\n"
+"　　　 apt-cache [选项] add 文件1 [文件2 ...]\n"
+"　　　 apt-cache [选项] showpkg 软件包1 [软件包2 ...]\n"
+"　　　 apt-cache [选项] showsrc 软件包1 [软件包2 ...]\n"
 "\n"
 "apt-cache 是一个底层的工具，我们用它来操纵 APT 的二进制\n"
 "缓存文件，也用来在那些文件中查询相关信息\n"
 "\n"
 "命令：\n"
-"   add - 往源缓存加入一个软件包文件\n"
-"   gencaches - 一并生成软件包和源代码包的缓存\n"
+"   add - 向源缓存加入一个软件包文件\n"
+"   gencaches - 同时生成软件包和源代码包的缓存\n"
 "   showpkg - 显示某个软件包的全面信息\n"
 "   showsrc - 显示源文件的各项记录\n"
-"   stats - 显示一些基本的统计信息\n"
+"   stats - 显示基本的统计信息\n"
 "   dump - 简要显示整个缓存文件的内容\n"
 "   dumpavail - 把所有有效的包文件列表打印到标准输出\n"
 "   unmet - 显示所有未满足的依赖关系\n"
 "   search - 根据正则表达式搜索软件包列表\n"
 "   show - 以便于阅读的格式介绍该软件包\n"
-"   depends - 原原本本地显示该软件包的依赖信息\n"
+"   depends - 显示该软件包的依赖关系信息\n"
 "   rdepends - 显示所有依赖于该软件包的软件包名字\n"
 "   pkgnames - 列出所有软件包的名字\n"
 "   dotty - 生成可用 GraphViz 处理的软件包关系图\n"
@@ -231,17 +232,17 @@ msgstr ""
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 "若要了解更多信息，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n"
 
-#: cmdline/apt-cdrom.cc:78
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr "请给这张光盘起个名字，比如说“Debian 2.1r1 Disk 1”"
+#: cmdline/apt-cdrom.cc:77
+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:93
+#: cmdline/apt-cdrom.cc:92
 msgid "Please insert a Disc in the drive and press enter"
-msgstr "请把光盘碟片插入驱动器再按回车键"
+msgstr "请把盘片插入驱动器再按回车键"
 
-#: cmdline/apt-cdrom.cc:117
+#: cmdline/apt-cdrom.cc:114
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "请对您的光盘套件中的其它光盘重复相同的操作。"
+msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
@@ -264,7 +265,7 @@ msgid ""
 msgstr ""
 "用法：apt-config [选项] 命令\n"
 "\n"
-"apt-config 是一个用于读取 APT 配置文件的简单工具\n"
+"apt-config 是一个用于读取APT 配置文件的简单工具\n"
 "\n"
 "命令：\n"
 "   shell - Shell 模式\n"
@@ -304,18 +305,18 @@ msgstr ""
 "  -c=? 读指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
 #, c-format
 msgid "Unable to write to %s"
 msgstr "无法写入 %s"
 
 #: cmdline/apt-extracttemplates.cc:310
 msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?"
+msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
 
 #: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
 msgid "Package extension list is too long"
-msgstr "软件包的扩展列表超长"
+msgstr "软件包的扩展列表太长"
 
 #: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
 #: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
@@ -326,16 +327,16 @@ msgstr "处理目录 %s 时出错"
 
 #: ftparchive/apt-ftparchive.cc:251
 msgid "Source extension list is too long"
-msgstr "源扩展列表超长"
+msgstr "源扩展列表太长"
 
 #: ftparchive/apt-ftparchive.cc:368
 msgid "Error writing header to contents file"
-msgstr "将 header 写到 contents 文件时出错"
+msgstr "将头写入到目录文件时出错"
 
 #: ftparchive/apt-ftparchive.cc:398
 #, c-format
 msgid "Error processing contents %s"
-msgstr "处理 Contents %s 时出错"
+msgstr "处理目录 %s 时出错"
 
 #: ftparchive/apt-ftparchive.cc:553
 msgid ""
@@ -429,38 +430,38 @@ msgstr "软件包文件组“%s”中缺少一些文件"
 #: ftparchive/cachedb.cc:43
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
-msgstr "缓存数据库被损坏了，该数据库文件的文件名已改成 %s.old"
+msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old"
 
 #: ftparchive/cachedb.cc:61
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
-msgstr "DB 已过时，现试图进行升级 %s"
+msgstr "数据库已过期，现尝试进行升级 %s"
 
 #: ftparchive/cachedb.cc:72
 msgid ""
 "DB format is invalid. If you upgraded from a older version of apt, please "
 "remove and re-create the database."
 msgstr ""
-"DB 格式是无效的。如果你是从一个老版本的 apt 升级而来，请删除数据库并重建它。"
+"数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。"
 
 #: ftparchive/cachedb.cc:77
 #, c-format
 msgid "Unable to open DB file %s: %s"
-msgstr "无法打开 DB 文件 %s：%s"
+msgstr "无法打开数据库文件 %s：%s"
 
 #: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
 #: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
 #, c-format
 msgid "Failed to stat %s"
-msgstr "无法读取 %s 的状态"
+msgstr "无法获得 %s 的状态"
 
 #: ftparchive/cachedb.cc:238
 msgid "Archive has no control record"
-msgstr "存档没有包含控制字段"
+msgstr "归档文件没有包含控制字段"
 
 #: ftparchive/cachedb.cc:444
 msgid "Unable to get a cursor"
-msgstr "无法获得游标(cursor)"
+msgstr "无法获得游标"
 
 #: ftparchive/writer.cc:76
 #, c-format
@@ -470,7 +471,7 @@ msgstr "警告：无法读取目录 %s\n"
 #: ftparchive/writer.cc:81
 #, c-format
 msgid "W: Unable to stat %s\n"
-msgstr "警告：无法对 %s 进行统计\n"
+msgstr "警告：无法获得 %s 的状态\n"
 
 #: ftparchive/writer.cc:132
 msgid "E: "
@@ -487,7 +488,7 @@ msgstr "错误：处理文件时出错 "
 #: ftparchive/writer.cc:158 ftparchive/writer.cc:188
 #, c-format
 msgid "Failed to resolve %s"
-msgstr "无法解析路径 %s"
+msgstr "无法解析 %s"
 
 #: ftparchive/writer.cc:170
 msgid "Tree walking failed"
@@ -511,7 +512,7 @@ msgstr "无法读取符号链接 %s"
 #: ftparchive/writer.cc:266
 #, c-format
 msgid "Failed to unlink %s"
-msgstr "无法 unlink %s"
+msgstr "无法使用 unlink 删除 %s"
 
 #: ftparchive/writer.cc:273
 #, c-format
@@ -525,7 +526,7 @@ msgstr " 达到了 DeLink 的上限 %sB。\n"
 
 #: ftparchive/writer.cc:387
 msgid "Archive had no package field"
-msgstr "存档没有包含软件包(package)字段"
+msgstr "归档文件没有包含 package 字段"
 
 #: ftparchive/writer.cc:395 ftparchive/writer.cc:610
 #, c-format
@@ -554,7 +555,7 @@ msgstr "内部错误，无法定位包内文件 %s"
 
 #: ftparchive/contents.cc:358 ftparchive/contents.cc:389
 msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 无法再分配内存"
+msgstr "realloc - 分配内存失败"
 
 #: ftparchive/override.cc:34 ftparchive/override.cc:142
 #, c-format
@@ -610,11 +611,11 @@ msgstr "压缩子进程"
 #: ftparchive/multicompress.cc:235
 #, c-format
 msgid "Internal error, failed to create %s"
-msgstr "内部错误，无法建立 %s"
+msgstr "内部错误，无法创建 %s"
 
 #: ftparchive/multicompress.cc:286
 msgid "Failed to create subprocess IPC"
-msgstr "无法建立子进程的 IPC 管道"
+msgstr "无法创建子进程的 IPC 管道"
 
 #: ftparchive/multicompress.cc:321
 msgid "Failed to exec compressor "
@@ -630,12 +631,12 @@ msgstr "无法对子进程或文件进行读写"
 
 #: ftparchive/multicompress.cc:455
 msgid "Failed to read while computing MD5"
-msgstr "在计算 MD5 校验和时，无法读取数据"
+msgstr "在计算 MD5 校验和时无法读取数据"
 
 #: ftparchive/multicompress.cc:472
 #, c-format
 msgid "Problem unlinking %s"
-msgstr "在 unlink %s 时出错"
+msgstr "在使用 unlink 删除 %s 时出错"
 
 #: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
 #, c-format
@@ -646,19 +647,19 @@ msgstr "无法将 %s 重命名为 %s"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "编译正则表达式时出错 - %s"
 
 #: cmdline/apt-get.cc:244
 msgid "The following packages have unmet dependencies:"
-msgstr "下列的软件包有不能满足的依赖关系："
+msgstr "下列软件包有未满足的依赖关系："
 
 #: cmdline/apt-get.cc:334
 #, c-format
 msgid "but %s is installed"
-msgstr "但是 %s 已经安装了"
+msgstr "但是 %s 已经安装"
 
 #: cmdline/apt-get.cc:336
 #, c-format
@@ -667,11 +668,11 @@ msgstr "但是 %s 正要被安装"
 
 #: cmdline/apt-get.cc:343
 msgid "but it is not installable"
-msgstr "但却无法安装它"
+msgstr "但无法安装它"
 
 #: cmdline/apt-get.cc:345
 msgid "but it is a virtual package"
-msgstr "但是它只是个虚拟软件包"
+msgstr "但是它是虚拟软件包"
 
 #: cmdline/apt-get.cc:348
 msgid "but it is not installed"
@@ -695,11 +696,11 @@ msgstr "下列软件包将被【卸载】："
 
 #: cmdline/apt-get.cc:430
 msgid "The following packages have been kept back:"
-msgstr "下列的软件包的版本将保持不变："
+msgstr "下列软件包的版本将保持不变："
 
 #: cmdline/apt-get.cc:451
 msgid "The following packages will be upgraded:"
-msgstr "下列的软件包将被升级："
+msgstr "下列软件包将被升级："
 
 #: cmdline/apt-get.cc:472
 msgid "The following packages will be DOWNGRADED:"
@@ -719,18 +720,18 @@ msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
-"【警告】：下列的基础软件包将被卸载。\n"
+"【警告】：下列基础软件包将被卸载。\n"
 "请勿尝试，除非您确实知道您在做什么！"
 
 #: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
-msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，"
+msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
 
 #: cmdline/apt-get.cc:588
 #, c-format
 msgid "%lu reinstalled, "
-msgstr "共重新安装了 %lu 个软件包，"
+msgstr "重新安装了 %lu 个软件包，"
 
 #: cmdline/apt-get.cc:590
 #, c-format
@@ -740,125 +741,125 @@ msgstr "降级了 %lu 个软件包，"
 #: cmdline/apt-get.cc:592
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n"
+msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
 
 #: cmdline/apt-get.cc:596
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
 
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:669
 msgid "Correcting dependencies..."
 msgstr "正在更正依赖关系..."
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:672
 msgid " failed."
 msgstr " 失败。"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:675
 msgid "Unable to correct dependencies"
 msgstr "无法更正依赖关系"
 
-#: cmdline/apt-get.cc:679
+#: cmdline/apt-get.cc:678
 msgid "Unable to minimize the upgrade set"
 msgstr "无法最小化要升级的软件包集合"
 
-#: cmdline/apt-get.cc:681
+#: cmdline/apt-get.cc:680
 msgid " Done"
 msgstr " 完成"
 
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:684
 msgid "You might want to run `apt-get -f install' to correct these."
-msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。"
+msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
 
-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:687
 msgid "Unmet dependencies. Try using -f."
 msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
 
-#: cmdline/apt-get.cc:710
+#: cmdline/apt-get.cc:712
 msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "【警告】：下列的软件包不能通过验证！"
+msgstr "【警告】：下列软件包不能通过验证！"
 
-#: cmdline/apt-get.cc:714
+#: cmdline/apt-get.cc:716
 msgid "Authentication warning overridden.\n"
 msgstr "忽略了认证警告。\n"
 
-#: cmdline/apt-get.cc:721
+#: cmdline/apt-get.cc:723
 msgid "Install these packages without verification [y/N]? "
-msgstr "不经验证就安装这些软件包么？[y/N] "
+msgstr "不经验证就安装这些软件包吗？[y/N] "
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:725
 msgid "Some packages could not be authenticated"
 msgstr "有些软件包不能通过验证"
 
-#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
 msgid "There are problems and -y was used without --force-yes"
 msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
 
-#: cmdline/apt-get.cc:776
+#: cmdline/apt-get.cc:775
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
 
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:784
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
 
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:795
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部错误，Ordering 未能完成"
 
-#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
 msgid "Unable to lock the download directory"
-msgstr "无法对下载目录加锁"
+msgstr "无法锁定下载目录"
 
-#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
-msgstr "无法读取安装源列表。"
+msgstr "无法读取源列表。"
 
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:836
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧"
+msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧"
 
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:841
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "需要下载 %sB/%sB 的软件包。\n"
 
-#: cmdline/apt-get.cc:845
+#: cmdline/apt-get.cc:844
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "需要下载 %sB 的软件包。\n"
 
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:849
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
 
-#: cmdline/apt-get.cc:853
+#: cmdline/apt-get.cc:852
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "解压缩后将会空出 %sB 的空间。\n"
 
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179
+#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
 #, c-format
 msgid "Couldn't determine free space in %s"
-msgstr "无法获知您在 %s 上的空余空间"
+msgstr "无法获知您在 %s 上的可用空间"
 
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:876
 #, c-format
 msgid "You don't have enough free space in %s."
-msgstr "您在 %s 中没有足够的空余空间。"
+msgstr "您在 %s 上没有足够的可用空间。"
 
-#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910
+#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
 msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。"
+msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。"
 
-#: cmdline/apt-get.cc:892
+#: cmdline/apt-get.cc:894
 msgid "Yes, do as I say!"
-msgstr "Yes, do as I say!"
+msgstr "是，按我说的做！"
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:896
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -869,28 +870,28 @@ msgstr ""
 "若还想继续的话，就输入下面的短句“%s”\n"
 " ?] "
 
-#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919
+#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
 msgid "Abort."
 msgstr "中止执行。"
 
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:917
 msgid "Do you want to continue [Y/n]? "
 msgstr "您希望继续执行吗？[Y/n]"
 
-#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407
+#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"
 
-#: cmdline/apt-get.cc:1005
+#: cmdline/apt-get.cc:1007
 msgid "Some files failed to download"
-msgstr "有一些文件下载失败"
+msgstr "有一些文件无法下载"
 
-#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236
+#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
 msgid "Download complete and in download only mode"
 msgstr "下载完毕，目前是“仅下载”模式"
 
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1014
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -898,47 +899,47 @@ msgstr ""
 "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
 "再试试？"
 
-#: cmdline/apt-get.cc:1016
+#: cmdline/apt-get.cc:1018
 msgid "--fix-missing and media swapping is not currently supported"
-msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)"
+msgstr "目前还不支持 --fix-missing 和介质交换"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1023
 msgid "Unable to correct missing packages."
 msgstr "无法更正缺少的软件包。"
 
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1024
 msgid "Aborting install."
-msgstr "放弃安装。"
+msgstr "中止安装。"
 
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1082
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "注意，选取 %s 而非 %s\n"
 
-#: cmdline/apt-get.cc:1066
+#: cmdline/apt-get.cc:1093
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
 
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1111
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "软件包 %s 还未安装，因而不会被卸载\n"
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1122
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
 
-#: cmdline/apt-get.cc:1107
+#: cmdline/apt-get.cc:1134
 msgid " [Installed]"
 msgstr " [已安装]"
 
-#: cmdline/apt-get.cc:1112
+#: cmdline/apt-get.cc:1139
 msgid "You should explicitly select one to install."
 msgstr "请您明确地选择一个来进行安装。"
 
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -949,72 +950,77 @@ msgstr ""
 "这可能意味着这个缺失的软件包可能已被废弃，\n"
 "或者只能在其他发布源中找到\n"
 
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1163
 msgid "However the following packages replace it:"
-msgstr "可是下列的软件包取代了它："
+msgstr "可是下列软件包取代了它："
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1166
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "软件包 %s 还没有可供安装的候选者"
 
-#: cmdline/apt-get.cc:1159
+#: cmdline/apt-get.cc:1186
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "不能重新安装 %s，因为无法下载它。\n"
 
-#: cmdline/apt-get.cc:1167
+#: cmdline/apt-get.cc:1194
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s 已经是最新的版本了。\n"
 
-#: cmdline/apt-get.cc:1196
+#: cmdline/apt-get.cc:1223
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”发布版本"
 
-#: cmdline/apt-get.cc:1198
+#: cmdline/apt-get.cc:1225
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”版本"
 
-#: cmdline/apt-get.cc:1204
+#: cmdline/apt-get.cc:1231
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "选定了版本为 %s (%s) 的 %s\n"
 
-#: cmdline/apt-get.cc:1310
+#: cmdline/apt-get.cc:1348
 #, c-format
 msgid "No source package '%s' picking '%s' instead\n"
-msgstr ""
+msgstr "没有源代码包“%s”，使用“%s”代替\n"
 
-#: cmdline/apt-get.cc:1348
+#: cmdline/apt-get.cc:1385
 msgid "The update command takes no arguments"
-msgstr " update 命令是不需任何参数的"
+msgstr " update 命令不需要参数"
 
-#: cmdline/apt-get.cc:1361
+#: cmdline/apt-get.cc:1398
 msgid "Unable to lock the list directory"
 msgstr "无法对状态列表目录加锁"
 
-#: cmdline/apt-get.cc:1413
+#: cmdline/apt-get.cc:1454
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "我们不应该进行删除，无法启动自动删除器"
 
-#: cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1503
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr "下列软件包是自动安装的并且现在不再被使用了："
+msgstr "下列软件包是自动安装的并且现在不需要了："
+
+#: cmdline/apt-get.cc:1505
+#, c-format
+msgid "%lu packages were automatically installed and are no longer required.\n"
+msgstr "%lu 个自动安装的的软件包现在不需要了\n"
 
-#: cmdline/apt-get.cc:1447
+#: cmdline/apt-get.cc:1506
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "使用'apt-get autoremove'来删除它们"
 
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1511
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
-msgstr "似乎自动删除器毁掉了一些软件，这不应该发生。请向 apt 提交错误报告。"
+msgstr "似乎自动删除工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。"
 
 #.
 #. if (Packages == 1)
@@ -1026,43 +1032,43 @@ msgstr "似乎自动删除器毁掉了一些软件，这不应该发生。请向
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745
+#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
 msgid "The following information may help to resolve the situation:"
-msgstr "下列的信息可能会对解决问题有所帮助："
+msgstr "下列信息可能会对解决问题有所帮助："
 
-#: cmdline/apt-get.cc:1459
+#: cmdline/apt-get.cc:1518
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr "内部错误，自动删除器坏事了"
+msgstr "内部错误，自动删除工具坏事了"
 
-#: cmdline/apt-get.cc:1478
+#: cmdline/apt-get.cc:1537
 msgid "Internal error, AllUpgrade broke stuff"
-msgstr "内部错误，全部升级坏事了"
+msgstr "内部错误，全部升级工具坏事了"
 
-#: cmdline/apt-get.cc:1533
+#: cmdline/apt-get.cc:1592
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "无法找到任务 %s"
 
-#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684
+#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 
-#: cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:1730
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1761
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 
-#: cmdline/apt-get.cc:1715
+#: cmdline/apt-get.cc:1774
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
 
-#: cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:1777
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1070,133 +1076,133 @@ msgstr ""
 "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
 "以指定一个解决办法)。"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1789
 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"
+"有一些软件包无法被安装。如果您用的是 unstable 发行版，这也许是\n"
 "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
-"包尚未被创建或是它们还在新到(incoming)目录中。"
+"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1807
 msgid "Broken packages"
-msgstr "无法安装的软件包"
+msgstr "破损的软件包"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1836
 msgid "The following extra packages will be installed:"
 msgstr "将会安装下列额外的软件包："
 
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1925
 msgid "Suggested packages:"
 msgstr "建议安装的软件包："
 
-#: cmdline/apt-get.cc:1867
+#: cmdline/apt-get.cc:1926
 msgid "Recommended packages:"
 msgstr "推荐安装的软件包："
 
-#: cmdline/apt-get.cc:1896
+#: cmdline/apt-get.cc:1955
 msgid "Calculating upgrade... "
-msgstr "正在筹划升级... "
+msgstr "正在对升级进行计算... "
 
-#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1958 methods/ftp.cc:708 methods/connect.cc:112
 msgid "Failed"
 msgstr "失败"
 
-#: cmdline/apt-get.cc:1904
+#: cmdline/apt-get.cc:1963
 msgid "Done"
 msgstr "完成"
 
-#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
 msgid "Internal error, problem resolver broke stuff"
-msgstr "内部错误，问题解决器坏事了"
+msgstr "内部错误，问题解决工具坏事了"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2138
 msgid "Must specify at least one package to fetch source for"
 msgstr "要下载源代码，必须指定至少一个对应的软件包"
 
-#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "无法找到与 %s 对应的源代码包"
 
-#: cmdline/apt-get.cc:2158
+#: cmdline/apt-get.cc:2217
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "忽略已下载过的文件“%s”\n"
 
-#: cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:2248
 #, c-format
 msgid "You don't have enough free space in %s"
-msgstr "您在 %s 上没有足够的空余空间"
+msgstr "您在 %s 上没有足够的可用空间"
 
-#: cmdline/apt-get.cc:2192
+#: cmdline/apt-get.cc:2254
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下载 %sB/%sB 的源代码包。\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2257
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下载 %sB 的源代码包。\n"
 
-#: cmdline/apt-get.cc:2201
+#: cmdline/apt-get.cc:2263
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下载源代码 %s\n"
 
-#: cmdline/apt-get.cc:2232
+#: cmdline/apt-get.cc:2294
 msgid "Failed to fetch some archives."
 msgstr "有一些包文件无法下载。"
 
-#: cmdline/apt-get.cc:2260
+#: cmdline/apt-get.cc:2322
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
+msgstr "忽略已经被解包到 %s 目录的源代码包\n"
 
-#: cmdline/apt-get.cc:2272
+#: cmdline/apt-get.cc:2334
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "运行解包的命令“%s”出错。\n"
 
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2335
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 
-#: cmdline/apt-get.cc:2290
+#: cmdline/apt-get.cc:2352
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s”失败。\n"
 
-#: cmdline/apt-get.cc:2309
+#: cmdline/apt-get.cc:2371
 msgid "Child process failed"
 msgstr "子进程出错"
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2387
 msgid "Must specify at least one package to check builddeps for"
-msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
+msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包"
 
-#: cmdline/apt-get.cc:2353
+#: cmdline/apt-get.cc:2415
 #, c-format
 msgid "Unable to get build-dependency information for %s"
-msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
+msgstr "无法获得 %s 的构建依赖关系信息"
 
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2435
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 
-#: cmdline/apt-get.cc:2425
+#: cmdline/apt-get.cc:2487
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2540
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1205,72 +1211,30 @@ msgstr ""
 "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
 "$s 依赖关系"
 
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2576
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了"
+msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新"
 
-#: cmdline/apt-get.cc:2541
+#: cmdline/apt-get.cc:2603
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
 
-#: cmdline/apt-get.cc:2555
+#: cmdline/apt-get.cc:2619
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
 
-#: cmdline/apt-get.cc:2559
+#: cmdline/apt-get.cc:2624
 msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 
-#: cmdline/apt-get.cc:2591
+#: cmdline/apt-get.cc:2656
 msgid "Supported modules:"
-msgstr "被支持模块："
-
-#: cmdline/apt-get.cc:2632
-#, fuzzy
-#| msgid ""
-#| "Usage: apt-get [options] command\n"
-#| "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-#| "       apt-get [options] source pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-get is a simple command line interface for downloading and\n"
-#| "installing packages. The most frequently used commands are update\n"
-#| "and install.\n"
-#| "\n"
-#| "Commands:\n"
-#| "   update - Retrieve new lists of packages\n"
-#| "   upgrade - Perform an upgrade\n"
-#| "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-#| "   remove - Remove packages\n"
-#| "   autoremove - Remove automatically all unused packages\n"
-#| "   purge - Remove and purge packages\n"
-#| "   source - Download source archives\n"
-#| "   build-dep - Configure build-dependencies for source packages\n"
-#| "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-#| "   dselect-upgrade - Follow dselect selections\n"
-#| "   clean - Erase downloaded archive files\n"
-#| "   autoclean - Erase old downloaded archive files\n"
-#| "   check - Verify that there are no broken dependencies\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h  This help text.\n"
-#| "  -q  Loggable output - no progress indicator\n"
-#| "  -qq No output except for errors\n"
-#| "  -d  Download only - do NOT install or unpack archives\n"
-#| "  -s  No-act. Perform ordering simulation\n"
-#| "  -y  Assume Yes to all queries and do not prompt\n"
-#| "  -f  Attempt to correct a system with broken dependencies in place\n"
-#| "  -m  Attempt to continue if archives are unlocatable\n"
-#| "  -u  Show a list of upgraded packages as well\n"
-#| "  -b  Build the source package after fetching it\n"
-#| "  -V  Show verbose version numbers\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
-#| "pages for more information and options.\n"
-#| "                       This APT has Super Cow Powers.\n"
+msgstr "支持的模块："
+
+#: cmdline/apt-get.cc:2697
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1314,8 +1278,8 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 "用法： apt-get [选项] 命令\n"
-"       apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
-"       apt-get [选项] source 软件包1 [软件包2 ...]\n"
+"　　　 apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
+"　　　 apt-get [选项] source 软件包1 [软件包2 ...]\n"
 "\n"
 "apt-get 提供了一个用于下载和安装软件包的简易命令行界面。\n"
 "最常用命令是 update 和 install。\n"
@@ -1342,8 +1306,8 @@ msgstr ""
 "  -d  仅仅下载 - 【不】安装或解开包文件\n"
 "  -s  不作实际操作。只是依次模拟执行命令\n"
 "  -y  对所有询问都回答是(Yes)，同时不作任何提示\n"
-"  -f  当出现破损的依赖关系时，程序将试图修正系统\n"
-"  -m  当有包文件无法找到时，程序仍试图继续执行\n"
+"  -f  当出现破损的依赖关系时，程序将尝试修正系统\n"
+"  -m  当有包文件无法找到时，程序仍尝试继续执行\n"
 "  -u  显示已升级的软件包列表\n"
 "  -b  在下载完源码包后，编译生成相应的软件包\n"
 "  -V  显示详尽的版本号\n"
@@ -1351,15 +1315,18 @@ msgstr ""
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 "请查阅 apt-get(8)、sources.list(5) 和 apt.conf(5)的参考手册\n"
 "以获取更多信息和选项。\n"
-"                       本 APT 有着超级牛力。\n"
+"                       本 APT 具有超级牛力。\n"
 
-#: cmdline/apt-get.cc:2799
+#: cmdline/apt-get.cc:2864
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get 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!"
 msgstr ""
+"注意：这只是模拟！\n"
+"　　　apt-get 需要 root 特权进行实际的执行。\n"
+"　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！"
 
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
@@ -1396,7 +1363,7 @@ msgid ""
 msgstr ""
 "更换介质：请把标有\n"
 "“%s”\n"
-"的碟片插入驱动器“%s”再按回车键\n"
+"的盘片插入驱动器“%s”再按回车键\n"
 
 #: cmdline/apt-sortpkgs.cc:86
 msgid "Unknown package record!"
@@ -1440,12 +1407,12 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr "您想要删除之前下载的所有 .deb 文件吗？"
 
 #: dselect/install:101
-msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr "在解包时发生了一些错误。我正准备配置"
+msgid "Some errors occurred while unpacking. Packages that were installed"
+msgstr "在解包时发生了一些错误。已经安装的软件包"
 
 #: dselect/install:102
-msgid "packages that were installed. This may result in duplicate errors"
-msgstr "已经安装的软件包。这个操作可能会导致出现重复的错误"
+msgid "will be configured. This may result in duplicate errors"
+msgstr "将被配置。这个操作可能会导致出现重复的错误"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1458,7 +1425,7 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们，
 
 #: dselect/update:30
 msgid "Merging available information"
-msgstr "正在合并现有信息"
+msgstr "正在合并可用信息"
 
 #: apt-inst/contrib/extracttar.cc:114
 msgid "Failed to create pipes"
@@ -1474,7 +1441,7 @@ msgstr "包文件已被损坏"
 
 #: apt-inst/contrib/extracttar.cc:193
 msgid "Tar checksum failed, archive corrupted"
-msgstr "tar 的校验码不符，包文件已被损坏"
+msgstr "Tar 的校验和不符，文件已损坏"
 
 #: apt-inst/contrib/extracttar.cc:296
 #, c-format
@@ -1483,23 +1450,28 @@ msgstr "未知的 TAR 数据头类型 %u，成员 %s"
 
 #: apt-inst/contrib/arfile.cc:70
 msgid "Invalid archive signature"
-msgstr "无效的打包文件特征号(signature)"
+msgstr "无效的归档签名"
 
 #: apt-inst/contrib/arfile.cc:78
 msgid "Error reading archive member header"
-msgstr "读取打包文件中的成员文件头出错"
+msgstr "读取归档成员文件头出错"
+
+#: apt-inst/contrib/arfile.cc:90
+#, c-format
+msgid "Invalid archive member header %s"
+msgstr "归档文件中成员文件头 %s 无效"
 
-#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:102
 msgid "Invalid archive member header"
-msgstr "打包文件中成员文件头无效"
+msgstr "归档文件中成员文件头无效"
 
 #: apt-inst/contrib/arfile.cc:128
 msgid "Archive is too short"
-msgstr "存档太短了"
+msgstr "归档文件太短"
 
 #: apt-inst/contrib/arfile.cc:132
 msgid "Failed to read the archive headers"
-msgstr "无法读取打包文件的数据头"
+msgstr "无法读取归档文件的数据头"
 
 #: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
@@ -1507,11 +1479,11 @@ msgstr "把 DropNode 用在了仍在链表中的节点上"
 
 #: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
-msgstr "无法分配散列表项！"
+msgstr "无法定位哈希表元素！"
 
 #: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
-msgstr "无法分配转移项(diversion)"
+msgstr "无法分配转移项"
 
 #: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
@@ -1520,12 +1492,12 @@ msgstr "内部错误，出现在 AddDiversion"
 #: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "试图覆盖一个转移项(diversion)，%s -> %s 即 %s/%s"
+msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s"
 
 #: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
-msgstr "添加了两个转移项(diversion) %s-> %s"
+msgstr "添加了两个转移项 %s-> %s"
 
 #: apt-inst/filelist.cc:549
 #, c-format
@@ -1545,7 +1517,7 @@ msgstr "无法关闭文件 %s"
 #: apt-inst/extract.cc:93 apt-inst/extract.cc:164
 #, c-format
 msgid "The path %s is too long"
-msgstr "路径名 %s 过长"
+msgstr "路径名 %s 太长"
 
 #: apt-inst/extract.cc:124
 #, c-format
@@ -1555,16 +1527,16 @@ msgstr "%s 被解包了不只一次"
 #: apt-inst/extract.cc:134
 #, c-format
 msgid "The directory %s is diverted"
-msgstr "目录 %s 已被转移(diverted)"
+msgstr "目录 %s 已被转移"
 
 #: apt-inst/extract.cc:144
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "该软件包正尝试写入转移对象(diversion target) %s/%s"
+msgstr "该软件包正尝试写入转移对象 %s/%s"
 
 #: apt-inst/extract.cc:154 apt-inst/extract.cc:297
 msgid "The diversion path is too long"
-msgstr "该转移路径(diversion path)过长"
+msgstr "该转移路径太长"
 
 #: apt-inst/extract.cc:240
 #, c-format
@@ -1573,11 +1545,11 @@ msgstr "目录 %s 要被一个非目录的文件替换"
 
 #: apt-inst/extract.cc:280
 msgid "Failed to locate node in its hash bucket"
-msgstr "无法在其散列桶(hash bucket)中分配节点"
+msgstr "无法在其散列桶中分配节点"
 
 #: apt-inst/extract.cc:284
 msgid "The path is too long"
-msgstr "路径名过长"
+msgstr "路径名太长"
 
 #: apt-inst/extract.cc:414
 #, c-format
@@ -1589,9 +1561,13 @@ msgstr "用来覆盖的软件包不属于 %s 的任何版本"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
-#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268
+#. Only warn if there are no sources.list.d.
+#. Only warn if there is no sources.list file.
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
+#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
+#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
+#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"
@@ -1621,9 +1597,9 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr "info 和 temp 目录要求处于同一文件系统之下"
 
 #. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760
-#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
-#: apt-pkg/pkgcachegen.cc:957
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
+#: apt-pkg/pkgcachegen.cc:961
 msgid "Reading package lists"
 msgstr "正在读取软件包列表"
 
@@ -1648,8 +1624,8 @@ msgid ""
 "then make it empty and immediately re-install the same version of the "
 "package!"
 msgstr ""
-"无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，那么就清空该文件，再马上"
-"重新安装相同版本的这个软件包！"
+"无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，那么就清空该文件并马上重"
+"新安装相同版本的这个软件包！"
 
 #: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
 #, c-format
@@ -1663,11 +1639,11 @@ msgstr "获得一个节点时出现内部错误"
 #: apt-inst/deb/dpkgdb.cc:305
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
-msgstr "无法打开转移配置文件(diversions file) %sdiversions"
+msgstr "无法打开转移配置文件 %sdiversions"
 
 #: apt-inst/deb/dpkgdb.cc:320
 msgid "The diversion file is corrupted"
-msgstr "该转移配置文件(diversion file)被损坏了"
+msgstr "该转移配置文件被损坏了"
 
 #: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
 #: apt-inst/deb/dpkgdb.cc:337
@@ -1677,7 +1653,7 @@ msgstr "转移配置文件中有一行是无效的：%s"
 
 #: apt-inst/deb/dpkgdb.cc:358
 msgid "Internal error adding a diversion"
-msgstr "添加 diversion 时出现内部错误"
+msgstr "添加转移配置时出现内部错误"
 
 #: apt-inst/deb/dpkgdb.cc:379
 msgid "The pkg cache must be initialized first"
@@ -1696,7 +1672,7 @@ msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu"
 #: apt-inst/deb/dpkgdb.cc:466
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
-msgstr "无法解析 MD5 码。文件内偏移量为 %lu"
+msgstr "解析 MD5 出错。文件内偏移量为 %lu"
 
 #: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
 #, c-format
@@ -1719,39 +1695,39 @@ msgstr "内部错误，无法定位包内文件"
 
 #: apt-inst/deb/debfile.cc:173
 msgid "Failed to locate a valid control file"
-msgstr "无法在打包文件中找到有效的主控文件"
+msgstr "无法在归档文件中找到有效的主控文件"
 
 #: apt-inst/deb/debfile.cc:258
 msgid "Unparsable control file"
 msgstr "不能解析的主控文件"
 
-#: methods/cdrom.cc:114
+#: methods/cdrom.cc:200
 #, c-format
 msgid "Unable to read the cdrom database %s"
-msgstr "无法读取光盘数据库 %s"
+msgstr "无法读取盘片数据库 %s"
 
-#: methods/cdrom.cc:123
+#: methods/cdrom.cc:209
 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:131
+#: methods/cdrom.cc:219
 msgid "Wrong CD-ROM"
-msgstr "错误的光盘"
+msgstr "错误的 CD-ROM"
 
-#: methods/cdrom.cc:166
+#: methods/cdrom.cc:245
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。"
 
-#: methods/cdrom.cc:171
+#: methods/cdrom.cc:250
 msgid "Disk not found."
-msgstr "找不到光盘。"
+msgstr "找不到盘片。"
 
-#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
 msgstr "无法找到该文件"
 
@@ -1769,148 +1745,148 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "无效的 URI，本地的 URI 不能以 // 开头"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:162
+#: methods/ftp.cc:168
 msgid "Logging in"
 msgstr "正在登录"
 
-#: methods/ftp.cc:168
+#: methods/ftp.cc:174
 msgid "Unable to determine the peer name"
 msgstr "无法获知对方主机名"
 
-#: methods/ftp.cc:173
+#: methods/ftp.cc:179
 msgid "Unable to determine the local name"
 msgstr "无法获知本地主机名"
 
-#: methods/ftp.cc:204 methods/ftp.cc:232
+#: methods/ftp.cc:210 methods/ftp.cc:238
 #, c-format
 msgid "The server refused the connection and said: %s"
-msgstr "服务器拒绝了我们的连接，它响应道：%s"
+msgstr "服务器拒绝了我们的连接，响应信息为：%s"
 
-#: methods/ftp.cc:210
+#: methods/ftp.cc:216
 #, c-format
 msgid "USER failed, server said: %s"
-msgstr "USER 指令出错，服务器响应道：%s"
+msgstr "USER 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:217
+#: methods/ftp.cc:223
 #, c-format
 msgid "PASS failed, server said: %s"
-msgstr "PASS 指令出错，服务器响应道：%s"
+msgstr "PASS 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:237
+#: methods/ftp.cc:243
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 "您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。"
 
-#: methods/ftp.cc:265
+#: methods/ftp.cc:271
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
-msgstr "登录脚本命令“%s”出错，服务器响应道：%s"
+msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:291
+#: methods/ftp.cc:297
 #, c-format
 msgid "TYPE failed, server said: %s"
-msgstr "TYPE 指令出错，服务器响应道：%s"
+msgstr "TYPE 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
 msgid "Connection timeout"
 msgstr "连接超时"
 
-#: methods/ftp.cc:335
+#: methods/ftp.cc:341
 msgid "Server closed the connection"
 msgstr "服务器关闭了连接"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
 msgid "Read error"
 msgstr "读错误"
 
-#: methods/ftp.cc:345 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
 msgid "A response overflowed the buffer."
 msgstr "回应超出了缓存区大小。"
 
-#: methods/ftp.cc:362 methods/ftp.cc:374
+#: methods/ftp.cc:368 methods/ftp.cc:380
 msgid "Protocol corruption"
 msgstr "协议有误"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
 msgid "Write error"
-msgstr "写文件出错"
+msgstr "写出错"
 
-#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
 msgid "Could not create a socket"
-msgstr "不能创建套接字"
+msgstr "无法创建套接字"
 
-#: methods/ftp.cc:698
+#: methods/ftp.cc:704
 msgid "Could not connect data socket, connection timed out"
 msgstr "无法连接上数据套接字，连接超时"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:710
 msgid "Could not connect passive socket."
 msgstr "无法连接被动模式的套接字。"
 
-#: methods/ftp.cc:722
+#: methods/ftp.cc:728
 msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo 无法得到侦听套接字"
+msgstr "getaddrinfo 无法得到监听套接字"
 
-#: methods/ftp.cc:736
+#: methods/ftp.cc:742
 msgid "Could not bind a socket"
 msgstr "无法绑定套接字"
 
-#: methods/ftp.cc:740
+#: methods/ftp.cc:746
 msgid "Could not listen on the socket"
-msgstr "无法在套接字上侦听"
+msgstr "无法在套接字上监听"
 
-#: methods/ftp.cc:747
+#: methods/ftp.cc:753
 msgid "Could not determine the socket's name"
 msgstr "无法确定套接字的名字"
 
-#: methods/ftp.cc:779
+#: methods/ftp.cc:785
 msgid "Unable to send PORT command"
 msgstr "无法发出 PORT 指令"
 
-#: methods/ftp.cc:789
+#: methods/ftp.cc:795
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "无法识别的地址族 %u (AF_*)"
 
-#: methods/ftp.cc:798
+#: methods/ftp.cc:804
 #, c-format
 msgid "EPRT failed, server said: %s"
-msgstr "EPRT 指令出错，服务器响应道：%s"
+msgstr "EPRT 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:818
+#: methods/ftp.cc:824
 msgid "Data socket connect timed out"
 msgstr "数据套接字连接超时"
 
-#: methods/ftp.cc:825
+#: methods/ftp.cc:831
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 
-#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
 msgid "Problem hashing file"
-msgstr "把文件加入散列表时出错"
+msgstr "把文件加入哈希表时出错"
 
-#: methods/ftp.cc:877
+#: methods/ftp.cc:883
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
-msgstr "无法获取文件，服务器响应道“%s”"
+msgstr "无法获取文件，服务器响应信息为“%s”"
 
-#: methods/ftp.cc:892 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
 msgid "Data socket timed out"
 msgstr "数据套接字超时"
 
-#: methods/ftp.cc:922
+#: methods/ftp.cc:928
 #, c-format
 msgid "Data transfer failed, server said '%s'"
-msgstr "数据传送出错，服务器响应道“%s”"
+msgstr "数据传送出错，服务器响应信息为“%s”"
 
 #. Get the files information
-#: methods/ftp.cc:997
+#: methods/ftp.cc:1005
 msgid "Query"
 msgstr "查询"
 
-#: methods/ftp.cc:1109
+#: methods/ftp.cc:1117
 msgid "Unable to invoke "
 msgstr "无法调用 "
 
@@ -1964,26 +1940,26 @@ msgstr "暂时不能解析域名“%s”"
 #: methods/connect.cc:193
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr "解析“%s:%s”时，出现了某些故障 (%i)"
+msgstr "解析“%s:%s”时，出现了某些故障(%i)"
 
 #: methods/connect.cc:240
 #, c-format
-msgid "Unable to connect to %s %s:"
-msgstr "不能连接上 %s %s："
+msgid "Unable to connect to %s:%s:"
+msgstr "不能连接到 %s：%s："
 
 #: methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
-msgstr "无法访问密匙：“%s”"
+msgstr "无法访问密钥环：“%s”"
 
 #: methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。"
+msgstr "错误：Acquire::gpgv::Options 的参数列表太长。结束运行。"
 
 #: methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！"
+msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！"
 
 #: methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
@@ -1992,7 +1968,7 @@ msgstr "至少发现一个无效的签名。"
 #: methods/gpgv.cc:232
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
-msgstr "无法运行\"%s\"以验证签名(您安装了 gpgv 么？)"
+msgstr "无法运行“%s”以验证签名(您安装了 gpgv 吗？)"
 
 #: methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
@@ -2006,7 +1982,7 @@ msgstr "下列签名无效：\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
-msgstr "由于没有公钥，下列签名无法进行验证：\n"
+msgstr "由于没有公钥，无法验证下列签名：\n"
 
 #: methods/gzip.cc:64
 #, c-format
@@ -2018,176 +1994,176 @@ msgstr "无法为 %s 开启管道"
 msgid "Read error from %s process"
 msgstr "从 %s 进程读取数据出错"
 
-#: methods/http.cc:379
+#: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "正在等待报头"
 
-#: methods/http.cc:525
+#: methods/http.cc:531
 #, c-format
 msgid "Got a single header line over %u chars"
-msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
+msgstr "接收到一行报头行，它的长度超过了 %u 个字符"
 
-#: methods/http.cc:533
+#: methods/http.cc:539
 msgid "Bad header line"
-msgstr "错误的报头条目"
+msgstr "错误的报头行"
 
-#: methods/http.cc:552 methods/http.cc:559
+#: methods/http.cc:558 methods/http.cc:565
 msgid "The HTTP server sent an invalid reply header"
-msgstr "该 http 服务器发送了一个无效的应答报头"
+msgstr "该 HTTP 服务器发送了一个无效的应答报头"
 
-#: methods/http.cc:588
+#: methods/http.cc:594
 msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
+msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
 
-#: methods/http.cc:603
+#: methods/http.cc:609
 msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
+msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
 
-#: methods/http.cc:605
+#: methods/http.cc:611
 msgid "This HTTP server has broken range support"
-msgstr "该 http 服务器的 range 支持不正常"
+msgstr "该 HTTP 服务器的 range 支持不正常"
 
-#: methods/http.cc:629
+#: methods/http.cc:635
 msgid "Unknown date format"
 msgstr "无法识别的日期格式"
 
-#: methods/http.cc:782
+#: methods/http.cc:790
 msgid "Select failed"
 msgstr "select 调用出错"
 
-#: methods/http.cc:787
+#: methods/http.cc:795
 msgid "Connection timed out"
-msgstr "连接服务器超时"
+msgstr "连接超时"
 
-#: methods/http.cc:810
+#: methods/http.cc:818
 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 
-#: methods/http.cc:841
+#: methods/http.cc:849
 msgid "Error writing to file"
-msgstr "写文件时出错"
+msgstr "写入文件出错"
 
-#: methods/http.cc:869
+#: methods/http.cc:877
 msgid "Error writing to the file"
-msgstr "写文件时出错"
+msgstr "写入文件出错"
 
-#: methods/http.cc:883
+#: methods/http.cc:891
 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 
-#: methods/http.cc:885
+#: methods/http.cc:893
 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 
-#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
 msgid "Failed to truncate file"
-msgstr "截断文件失败"
+msgstr "无法截断文件"
 
-#: methods/http.cc:1141
+#: methods/http.cc:1149
 msgid "Bad header data"
 msgstr "错误的报头数据"
 
-#: methods/http.cc:1158 methods/http.cc:1213
+#: methods/http.cc:1166 methods/http.cc:1221
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: methods/http.cc:1305
+#: methods/http.cc:1313
 msgid "Internal error"
 msgstr "内部错误"
 
-#: apt-pkg/contrib/mmap.cc:80
+#: apt-pkg/contrib/mmap.cc:76
 msgid "Can't mmap an empty file"
 msgstr "无法 mmap 一个空文件"
 
-#: apt-pkg/contrib/mmap.cc:85
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 
-#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#: apt-pkg/contrib/mmap.cc:234
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
-"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大侠。当前值：%lu。(man 5 "
+"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值：%lu。(man 5 "
 "apt.conf)"
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:335
+#: apt-pkg/contrib/strutl.cc:346
 #, c-format
 msgid "%lid %lih %limin %lis"
-msgstr ""
+msgstr "%li天 %li小时 %li分 %li秒"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:342
+#: apt-pkg/contrib/strutl.cc:353
 #, c-format
 msgid "%lih %limin %lis"
-msgstr ""
+msgstr "%li小时 %li分 %li秒"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:349
+#: apt-pkg/contrib/strutl.cc:360
 #, c-format
 msgid "%limin %lis"
-msgstr ""
+msgstr "%li分 %li秒"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:354
+#: apt-pkg/contrib/strutl.cc:365
 #, c-format
 msgid "%lis"
-msgstr ""
+msgstr "%li秒"
 
-#: apt-pkg/contrib/strutl.cc:1029
+#: apt-pkg/contrib/strutl.cc:1040
 #, c-format
 msgid "Selection %s not found"
-msgstr "没有发现您的所选 %s"
+msgstr "找不到您选则的 %s"
 
-#: apt-pkg/contrib/configuration.cc:439
+#: apt-pkg/contrib/configuration.cc:458
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "无法识别的类型缩写：“%c”"
 
-#: apt-pkg/contrib/configuration.cc:497
+#: apt-pkg/contrib/configuration.cc:516
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "正在打开配置文件 %s"
 
-#: apt-pkg/contrib/configuration.cc:663
+#: apt-pkg/contrib/configuration.cc:684
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "语法错误 %s:%u：配置小节没有以名字开头"
 
-#: apt-pkg/contrib/configuration.cc:682
+#: apt-pkg/contrib/configuration.cc:703
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "语法错误 %s:%u：标签格式有误"
 
-#: apt-pkg/contrib/configuration.cc:699
+#: apt-pkg/contrib/configuration.cc:720
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据"
 
-#: apt-pkg/contrib/configuration.cc:739
+#: apt-pkg/contrib/configuration.cc:760
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
 
-#: apt-pkg/contrib/configuration.cc:746
+#: apt-pkg/contrib/configuration.cc:767
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
 
-#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
+#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "语法错误 %s:%u: Included from here"
 
-#: apt-pkg/contrib/configuration.cc:759
+#: apt-pkg/contrib/configuration.cc:780
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "语法错误 %s:%u: 不支持的指令“%s”"
 
-#: apt-pkg/contrib/configuration.cc:810
+#: apt-pkg/contrib/configuration.cc:831
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"
@@ -2195,7 +2171,7 @@ msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"
 #: apt-pkg/contrib/progress.cc:153
 #, c-format
 msgid "%c%s... Error!"
-msgstr "%c%s... 有错误!"
+msgstr "%c%s... 有错误！"
 
 #: apt-pkg/contrib/progress.cc:155
 #, c-format
@@ -2205,7 +2181,7 @@ msgstr "%c%s... 完成"
 #: apt-pkg/contrib/cmndline.cc:77
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
-msgstr "未知的命令行选项“%c”[来自 %s]"
+msgstr "未知的命令行选项“%c” [来自 %s]"
 
 #: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
 #: apt-pkg/contrib/cmndline.cc:119
@@ -2216,7 +2192,7 @@ msgstr "无法识别命令行选项 %s"
 #: apt-pkg/contrib/cmndline.cc:124
 #, c-format
 msgid "Command line option %s is not boolean"
-msgstr "命令行选项 %s 不是个布尔值"
+msgstr "命令行选项 %s 不是布尔值"
 
 #: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
 #, c-format
@@ -2236,7 +2212,7 @@ msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"
 #: apt-pkg/contrib/cmndline.cc:265
 #, c-format
 msgid "Option '%s' is too long"
-msgstr "选项“%s”超长"
+msgstr "选项“%s”太长"
 
 #: apt-pkg/contrib/cmndline.cc:298
 #, c-format
@@ -2253,20 +2229,20 @@ msgstr "无效的操作 %s"
 msgid "Unable to stat the mount point %s"
 msgstr "无法读取文件系统挂载点 %s 的状态"
 
-#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
 #, c-format
 msgid "Unable to change to %s"
 msgstr "无法切换工作目录到 %s"
 
-#: apt-pkg/contrib/cdromutl.cc:188
+#: apt-pkg/contrib/cdromutl.cc:195
 msgid "Failed to stat the cdrom"
-msgstr "无法读取光盘的状态"
+msgstr "无法读取盘片的状态"
 
 #: apt-pkg/contrib/fileutl.cc:149
 #, c-format
 msgid "Not using locking for read only lock file %s"
-msgstr "由于文件系统为只读，因而无法使用文件锁%s"
+msgstr "由于文件系统为只读，因而无法使用文件锁 %s"
 
 #: apt-pkg/contrib/fileutl.cc:154
 #, c-format
@@ -2288,53 +2264,52 @@ msgstr "无法获得锁 %s"
 msgid "Waited for %s but it wasn't there"
 msgstr "等待子进程 %s 的退出，但是它并不存在"
 
-#: apt-pkg/contrib/fileutl.cc:455
+#: apt-pkg/contrib/fileutl.cc:456
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "子进程 %s 发生了段错误"
 
-#: apt-pkg/contrib/fileutl.cc:457
-#, fuzzy, c-format
-#| msgid "Sub-process %s received a segmentation fault."
+#: apt-pkg/contrib/fileutl.cc:458
+#, c-format
 msgid "Sub-process %s received signal %u."
-msgstr "子进程 %s 发生了段错误"
+msgstr "子进程 %s 收到信号 %u。"
 
-#: apt-pkg/contrib/fileutl.cc:460
+#: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子进程 %s 返回了一个错误号 (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:464
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
-msgstr "子进程 %s 异常退出了"
+msgstr "子进程 %s 异常退出"
 
-#: apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:508
 #, c-format
 msgid "Could not open file %s"
 msgstr "无法打开文件 %s"
 
-#: apt-pkg/contrib/fileutl.cc:562
+#: apt-pkg/contrib/fileutl.cc:564
 #, c-format
 msgid "read, still have %lu to read but none left"
-msgstr "读文件时出错，还剩 %lu 字节没有读出"
+msgstr "读取文件出错，还剩 %lu 字节没有读出"
 
-#: apt-pkg/contrib/fileutl.cc:592
+#: apt-pkg/contrib/fileutl.cc:594
 #, c-format
 msgid "write, still have %lu to write but couldn't"
-msgstr "写文件时出错，还剩 %lu 字节没有保存"
+msgstr "写入文件出错，还剩 %lu 字节没有保存"
 
-#: apt-pkg/contrib/fileutl.cc:667
+#: apt-pkg/contrib/fileutl.cc:669
 msgid "Problem closing the file"
-msgstr "关闭文件时出错"
+msgstr "关闭文件出错"
 
-#: apt-pkg/contrib/fileutl.cc:673
+#: apt-pkg/contrib/fileutl.cc:675
 msgid "Problem unlinking the file"
-msgstr "用 unlink 删除文件时出错"
+msgstr "用 unlink 删除文件出错"
 
-#: apt-pkg/contrib/fileutl.cc:684
+#: apt-pkg/contrib/fileutl.cc:686
 msgid "Problem syncing the file"
-msgstr "同步文件时出错"
+msgstr "同步文件出错"
 
 #: apt-pkg/pkgcache.cc:133
 msgid "Empty package cache"
@@ -2342,7 +2317,7 @@ msgstr "软件包缓存区是空的"
 
 #: apt-pkg/pkgcache.cc:139
 msgid "The package cache file is corrupted"
-msgstr "软件包缓存区文件损坏了"
+msgstr "软件包缓存文件损坏了"
 
 #: apt-pkg/pkgcache.cc:144
 msgid "The package cache file is an incompatible version"
@@ -2351,11 +2326,11 @@ msgstr "软件包缓存区文件的版本不兼容"
 #: apt-pkg/pkgcache.cc:149
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
-msgstr "本程序目前不支持“%s”这个版本控制系统"
+msgstr "本程序目前不支持“%s”版本系统"
 
 #: apt-pkg/pkgcache.cc:154
 msgid "The package cache was built for a different architecture"
-msgstr "软件包缓存区是为其它架构的主机构造的"
+msgstr "软件包缓存区是为其它架构的硬件构建的"
 
 #: apt-pkg/pkgcache.cc:225
 msgid "Depends"
@@ -2391,7 +2366,7 @@ msgstr "破坏"
 
 #: apt-pkg/pkgcache.cc:227
 msgid "Enhances"
-msgstr ""
+msgstr "增强"
 
 #: apt-pkg/pkgcache.cc:238
 msgid "important"
@@ -2399,7 +2374,7 @@ msgstr "重要"
 
 #: apt-pkg/pkgcache.cc:238
 msgid "required"
-msgstr "必要"
+msgstr "必需"
 
 #: apt-pkg/pkgcache.cc:238
 msgid "standard"
@@ -2425,16 +2400,16 @@ msgstr "候选版本"
 msgid "Dependency generation"
 msgstr "生成依赖关系"
 
-#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
+#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr "正在读取状态信息"
 
-#: apt-pkg/depcache.cc:221
+#: apt-pkg/depcache.cc:223
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "无法打开状态文件 %s"
 
-#: apt-pkg/depcache.cc:227
+#: apt-pkg/depcache.cc:229
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "无法写入临时状态文件 %s"
@@ -2452,54 +2427,54 @@ msgstr "无法解析软件包文件 %s (2)"
 #: apt-pkg/sourcelist.cc:90
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
 
 #: apt-pkg/sourcelist.cc:92
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
 
 #: apt-pkg/sourcelist.cc:95
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
 
 #: apt-pkg/sourcelist.cc:101
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
 
 #: apt-pkg/sourcelist.cc:108
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
 
-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:206
 #, c-format
 msgid "Opening %s"
 msgstr "正在打开 %s"
 
-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
+#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
 #, c-format
 msgid "Line %u too long in source list %s."
-msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。"
+msgstr "源列表 %2$s 的第 %1$u 行太长了。"
 
-#: apt-pkg/sourcelist.cc:236
+#: apt-pkg/sourcelist.cc:243
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
-msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
+msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
 
-#: apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc:247
 #, 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:248 apt-pkg/sourcelist.cc:251
+#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)"
+msgstr "在源列表中 %2$s 中第 %1$u 行的格式有误(供应商 ID)"
 
-#: apt-pkg/packagemanager.cc:428
+#: apt-pkg/packagemanager.cc:439
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2521,7 +2496,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
 
-#: apt-pkg/algorithms.cc:1154
+#: apt-pkg/algorithms.cc:1138
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2529,13 +2504,13 @@ msgstr ""
 "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
 "缘故。"
 
-#: apt-pkg/algorithms.cc:1156
+#: apt-pkg/algorithms.cc:1140
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
 "系。"
 
-#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435
+#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -2545,21 +2520,21 @@ msgstr ""
 #: apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
-msgstr "软件包列表的目录 %spartial 不见了。"
+msgstr "软件包列表的目录 %spartial 缺失。"
 
 #: apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
-msgstr "找不到“%spartial”这个目录。"
+msgstr "找不到“%spartial”目录。"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:829
+#: apt-pkg/acquire.cc:826
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
 
-#: apt-pkg/acquire.cc:831
+#: apt-pkg/acquire.cc:828
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "正在下载第 %li 个文件，共 %li 个"
@@ -2577,25 +2552,25 @@ msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 #: apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
+msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
 
-#: apt-pkg/init.cc:125
+#: apt-pkg/init.cc:133
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "不支持“%s”打包系统"
 
-#: apt-pkg/init.cc:141
+#: apt-pkg/init.cc:149
 msgid "Unable to determine a suitable packaging system type"
 msgstr "无法确定适合的打包系统类型"
 
-#: apt-pkg/clean.cc:57
+#: apt-pkg/clean.cc:56
 #, c-format
 msgid "Unable to stat %s."
 msgstr "无法读取 %s 的状态。"
 
 #: apt-pkg/srcrecords.cc:44
 msgid "You must put some 'source' URIs in your sources.list"
-msgstr "您必须在您的 sources.list 写入一些“软件包源”的 URI"
+msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
 
 #: apt-pkg/cachefile.cc:71
 msgid "The package lists or status file could not be parsed or opened."
@@ -2605,132 +2580,131 @@ msgstr "无法解析或打开软件包的列表或是状态文件。"
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "您可能需要运行 apt-get update 来解决这些问题"
 
-#: apt-pkg/policy.cc:329
-#, fuzzy, c-format
-#| msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:347
+#, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "偏好设定(preferences)文件中发现有无效的记录，无 Package 字段头"
+msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头"
 
-#: apt-pkg/policy.cc:351
+#: apt-pkg/policy.cc:369
 #, c-format
 msgid "Did not understand pin type %s"
-msgstr "无法识别锁定的类型(pin type) %s"
+msgstr "无法识别锁定的类型 %s"
 
-#: apt-pkg/policy.cc:359
+#: apt-pkg/policy.cc:377
 msgid "No priority (or zero) specified for pin"
 msgstr "没有为版本锁定指定优先级(或为零)"
 
-#: apt-pkg/pkgcachegen.cc:72
+#: apt-pkg/pkgcachegen.cc:74
 msgid "Cache has an incompatible versioning system"
 msgstr "软件包暂存区使用的是不兼容的版本控制系统"
 
-#: apt-pkg/pkgcachegen.cc:115
+#: apt-pkg/pkgcachegen.cc:117
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "处理 %s (NewPackage)时出错"
 
-#: apt-pkg/pkgcachegen.cc:130
+#: apt-pkg/pkgcachegen.cc:132
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "处理 %s (UsePackage1)时出错"
 
-#: apt-pkg/pkgcachegen.cc:164
+#: apt-pkg/pkgcachegen.cc:166
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "处理 %s (NewFileDesc1)时出错"
 
-#: apt-pkg/pkgcachegen.cc:189
+#: apt-pkg/pkgcachegen.cc:191
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "处理 %s (UsePackage2)时出错"
 
-#: apt-pkg/pkgcachegen.cc:193
+#: apt-pkg/pkgcachegen.cc:195
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "处理 %s (NewFileVer1)时出错"
 
-#: apt-pkg/pkgcachegen.cc:224
+#: apt-pkg/pkgcachegen.cc:226
 #, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
 msgstr "处理 %s (NewVersion1)时出错"
 
-#: apt-pkg/pkgcachegen.cc:228
+#: apt-pkg/pkgcachegen.cc:230
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "处理 %s (UsePackage3)时出错"
 
-#: apt-pkg/pkgcachegen.cc:232
+#: apt-pkg/pkgcachegen.cc:234
 #, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
 msgstr "处理 %s (NewVersion2)时出错"
 
-#: apt-pkg/pkgcachegen.cc:256
+#: apt-pkg/pkgcachegen.cc:258
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "处理 %s (NewFileDesc2)时出错"
 
-#: apt-pkg/pkgcachegen.cc:262
+#: apt-pkg/pkgcachegen.cc:264
 msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "糟了，软件包的数量了超出本程序的处理能力。"
+msgstr "哇，软件包数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:265
+#: apt-pkg/pkgcachegen.cc:267
 msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "糟了，软件包版本的数量了超出本程序的处理能力。"
+msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:268
+#: apt-pkg/pkgcachegen.cc:270
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "糟了，软件包说明的数量了超出本程序的处理能力。"
+msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:271
+#: apt-pkg/pkgcachegen.cc:273
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "糟了，依赖关系的数量超出了本程序的处理能力。"
+msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:301
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "处理 %s (FindPkg)时出错"
 
-#: apt-pkg/pkgcachegen.cc:312
+#: apt-pkg/pkgcachegen.cc:314
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "处理 %s (CollectFileProvides)时出错"
 
-#: apt-pkg/pkgcachegen.cc:318
+#: apt-pkg/pkgcachegen.cc:320
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
 
-#: apt-pkg/pkgcachegen.cc:690
+#: apt-pkg/pkgcachegen.cc:693
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "无法获取源软件包列表 %s 的状态"
 
-#: apt-pkg/pkgcachegen.cc:775
+#: apt-pkg/pkgcachegen.cc:778
 msgid "Collecting File Provides"
 msgstr "正在收集文件所提供的软件包"
 
-#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
+#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
 msgid "IO Error saving source cache"
-msgstr "无法写入来源缓存文件"
+msgstr "无法读取或写入软件源缓存"
 
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:128
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "无法重命名文件，%s (%s -> %s)。"
 
-#: apt-pkg/acquire-item.cc:401
+#: apt-pkg/acquire-item.cc:395
 msgid "MD5Sum mismatch"
 msgstr "MD5 校验和不符"
 
-#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
 msgid "Hash Sum mismatch"
 msgstr "Hash 校验和不符"
 
-#: apt-pkg/acquire-item.cc:1118
+#: apt-pkg/acquire-item.cc:1106
 msgid "There is no public key available for the following key IDs:\n"
-msgstr "以下 key ID 没有可用的公钥：\n"
+msgstr "以下 ID 的密钥没有可用的公钥：\n"
 
-#: apt-pkg/acquire-item.cc:1231
+#: apt-pkg/acquire-item.cc:1216
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2739,7 +2713,7 @@ msgstr ""
 "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
 "包。(缘于架构缺失)"
 
-#: apt-pkg/acquire-item.cc:1290
+#: apt-pkg/acquire-item.cc:1275
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2747,39 +2721,37 @@ msgid ""
 msgstr ""
 "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
 
-#: apt-pkg/acquire-item.cc:1331
+#: apt-pkg/acquire-item.cc:1316
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
 
-#: apt-pkg/acquire-item.cc:1418
+#: apt-pkg/acquire-item.cc:1403
 msgid "Size mismatch"
 msgstr "大小不符"
 
 #: apt-pkg/indexrecords.cc:40
-#, fuzzy, c-format
-#| msgid "Unable to parse package file %s (1)"
+#, c-format
 msgid "Unable to parse Release file %s"
-msgstr "无法解析软件包文件 %s (1)"
+msgstr "无法解析软件包仓库 Release 文件 %s"
 
 #: apt-pkg/indexrecords.cc:47
-#, fuzzy, c-format
-#| msgid "Note, selecting %s instead of %s\n"
+#, c-format
 msgid "No sections in Release file %s"
-msgstr "注意，选取 %s 而非 %s\n"
+msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
 
 #: apt-pkg/indexrecords.cc:81
 #, c-format
 msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
 
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "软件提供者数据块内 %s 没有包含指纹信息"
 
-#: apt-pkg/cdrom.cc:529
+#: apt-pkg/cdrom.cc:525
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -2788,42 +2760,42 @@ msgstr ""
 "现把 %s 作为了 CD-ROM 的挂载点\n"
 "正在挂载 CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627
+#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
 msgid "Identifying.. "
 msgstr "正在鉴别.. "
 
-#: apt-pkg/cdrom.cc:563
+#: apt-pkg/cdrom.cc:559
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "已存档的标签：%s\n"
+msgstr "已归档文件的标签：%s\n"
 
-#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
+#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
 msgid "Unmounting CD-ROM...\n"
 msgstr "正在卸载 CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:590
+#: apt-pkg/cdrom.cc:585
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
 
-#: apt-pkg/cdrom.cc:608
+#: apt-pkg/cdrom.cc:603
 msgid "Unmounting CD-ROM\n"
 msgstr "正在卸载 CD-ROM 文件系统\n"
 
-#: apt-pkg/cdrom.cc:612
+#: apt-pkg/cdrom.cc:607
 msgid "Waiting for disc...\n"
 msgstr "等待插入盘片……\n"
 
 #. Mount the new CDROM
-#: apt-pkg/cdrom.cc:620
+#: apt-pkg/cdrom.cc:615
 msgid "Mounting CD-ROM...\n"
 msgstr "正在挂载 CD-ROM 文件系统……\n"
 
-#: apt-pkg/cdrom.cc:638
+#: apt-pkg/cdrom.cc:633
 msgid "Scanning disc for index files..\n"
-msgstr "正在光盘中查找索引文件..\n"
+msgstr "正在盘片中查找索引文件..\n"
 
-#: apt-pkg/cdrom.cc:678
+#: apt-pkg/cdrom.cc:673
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
@@ -2832,157 +2804,178 @@ msgstr ""
 "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
 "名\n"
 
-#: apt-pkg/cdrom.cc:689
+#: apt-pkg/cdrom.cc:684
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
+"无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构"
+"架。"
 
-#: apt-pkg/cdrom.cc:715
+#: apt-pkg/cdrom.cc:710
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "找到标签 '%s'\n"
 
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:739
 msgid "That is not a valid name, try again.\n"
-msgstr "这不是一个有效的名字，请再次命名。\n"
+msgstr "这不是一个有效的名字，请重试。\n"
 
-#: apt-pkg/cdrom.cc:760
+#: apt-pkg/cdrom.cc:755
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
-"这张光盘现在的名字是：\n"
+"这张盘片现在的名字是：\n"
 "“%s”\n"
 
-#: apt-pkg/cdrom.cc:764
+#: apt-pkg/cdrom.cc:759
 msgid "Copying package lists..."
 msgstr "正在复制软件包列表……"
 
-#: apt-pkg/cdrom.cc:790
+#: apt-pkg/cdrom.cc:785
 msgid "Writing new source list\n"
-msgstr "正在写入新的软件包源列表\n"
+msgstr "正在写入新的源列表\n"
 
-#: apt-pkg/cdrom.cc:799
+#: apt-pkg/cdrom.cc:794
 msgid "Source list entries for this disc are:\n"
-msgstr "对应于该光盘的软件包源设置项是：\n"
+msgstr "对应于该盘片的软件源设置项是：\n"
 
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "已写入 %i 条记录。\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
-msgstr "已写入 %i 条记录，并有 %i 个文件不吻合\n"
+msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n"
+msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
+
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+msgid "Skipping nonexistent file %s"
+msgstr "正在打开配置文件 %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash 校验和不符"
 
 #: apt-pkg/deb/dpkgpm.cc:49
 #, c-format
 msgid "Installing %s"
 msgstr "正在安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
 #, c-format
 msgid "Configuring %s"
 msgstr "正在配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "完全删除了 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "执行安装后执行的触发器 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:546
+#: apt-pkg/deb/dpkgpm.cc:558
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "目录 %s 不见了"
 
-#: apt-pkg/deb/dpkgpm.cc:635
+#: apt-pkg/deb/dpkgpm.cc:654
 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:636
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:641
+#: apt-pkg/deb/dpkgpm.cc:660
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:643
+#: apt-pkg/deb/dpkgpm.cc:662
 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:648
+#: apt-pkg/deb/dpkgpm.cc:667
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在准备 %s 的删除操作"
 
-#: apt-pkg/deb/dpkgpm.cc:650
+#: apt-pkg/deb/dpkgpm.cc:669
 #, c-format
 msgid "Removed %s"
 msgstr "已删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:655
+#: apt-pkg/deb/dpkgpm.cc:674
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在准备完全删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:656
+#: apt-pkg/deb/dpkgpm.cc:675
 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:820
+#: apt-pkg/deb/dpkgpm.cc:879
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr "无法写入日志。 openpty() 失败 (/dev/pts 没有 mount 上？)\n"
+msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ？)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:908
 msgid "Running dpkg"
-msgstr ""
+msgstr "正在运行 dpkg"
 
 #: apt-pkg/deb/debsystem.cc:70
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
-msgstr ""
+msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"
 
 #: apt-pkg/deb/debsystem.cc:73
-#, fuzzy, c-format
-#| msgid "Unable to lock the list directory"
+#, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "无法对状态列表目录加锁"
+msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"
 
 #: apt-pkg/deb/debsystem.cc:82
 msgid ""
 "dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
 "the problem. "
-msgstr ""
+msgstr "dpkg 被中断，您必须手工运行 'dpkg --configure -a' 解决此问题。"
 
 #: apt-pkg/deb/debsystem.cc:100
 msgid "Not locked"
-msgstr ""
+msgstr "未锁定"
 
 #: methods/rred.cc:219
 msgid "Could not patch file"
@@ -3010,7 +3003,7 @@ msgstr "连接被永久关闭"
 #~ "您最好提交一个针对这个软件包的故障报告。"
 
 #~ msgid "Line %d too long (max %lu)"
-#~ msgstr "第 %d 行超长了(长度限制为 %lu)。"
+#~ msgstr "第 %d 行太长了(长度限制为 %lu)。"
 
 #~ msgid "After unpacking %sB of additional disk space will be used.\n"
 #~ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
@@ -3022,7 +3015,7 @@ msgstr "连接被永久关闭"
 #~ msgstr "%s 已设置为手动安装。\n"
 
 #~ msgid "Line %d too long (max %d)"
-#~ msgstr "第 %d 行超长了(长度限制为 %d)"
+#~ msgstr "第 %d 行太长了(长度限制为 %d)"
 
 #~ msgid "Error occured while processing %s (NewFileDesc1)"
 #~ msgstr "处理 %s (NewFileDesc1)时出错"
@@ -3031,7 +3024,7 @@ msgstr "连接被永久关闭"
 #~ msgstr "处理 %s (NewFileDesc2)时出错"
 
 #~ msgid "Stored label: %s \n"
-#~ msgstr "存档标签：%s \n"
+#~ msgstr "归档文件标签：%s \n"
 
 #~ msgid ""
 #~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
@@ -3059,5 +3052,4 @@ msgstr "连接被永久关闭"
 
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr ""
-#~ "在安装源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%"
-#~ "1$s”"
+#~ "在源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%1$s”"