merged from the debian-sid branch

1 files changed, 374 insertions, 140 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 28d2b6636..1bc61f15e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-10-12 06:28+0000\n"
+"PO-Revision-Date: 2010-08-26 14:42+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: \n"
@@ -18,8 +18,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -28,71 +26,71 @@ msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
 
 #: cmdline/apt-cache.cc:286
 msgid "Total package names: "
-msgstr "软件包名称总数： "
+msgstr "软件包名称总数："
 
 #: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
-msgstr "全部软件包结构： "
+msgstr "全部软件包结构："
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
-msgstr "  普通软件包： "
+msgstr "  普通软件包："
 
 #: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
-msgstr "  完全虚拟软件包： "
+msgstr "  完全虚拟软件包："
 
 #: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
-msgstr "  单虚拟软件包： "
+msgstr "  单虚拟软件包："
 
 #: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
-msgstr "  混合虚拟软件包： "
+msgstr "  混合虚拟软件包："
 
 #: cmdline/apt-cache.cc:332
 msgid "  Missing: "
-msgstr "  缺失： "
+msgstr "  缺失："
 
 #: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
-msgstr "按版本共计： "
+msgstr "按版本共计："
 
 #: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
-msgstr "按不同的说明共计： "
+msgstr "按不同的说明共计："
 
 #: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
-msgstr "按依赖关系共计： "
+msgstr "按依赖关系共计："
 
 #: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
-msgstr "按版本/文件关系共计： "
+msgstr "按版本/文件关系共计："
 
 #: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
-msgstr "按说明/文件关系共计： "
+msgstr "按说明/文件关系共计："
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
-msgstr "提供映射共计： "
+msgstr "提供映射共计："
 
 #: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
-msgstr "Glob 字串共计： "
+msgstr "Glob 字串共计："
 
 #: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
-msgstr "依赖关系版本名所占空间共计： "
+msgstr "依赖关系版本名所占空间共计："
 
 #: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
-msgstr "Slack 空间共计： "
+msgstr "Slack 空间共计："
 
 #: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
-msgstr "总占用空间： "
+msgstr "总占用空间："
 
 #: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
@@ -116,7 +114,7 @@ msgstr ""
 #: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
-msgstr "无法定位软件包 %s"
+msgstr "未发现软件包 %s"
 
 #: cmdline/apt-cache.cc:1482
 msgid "Package files:"
@@ -137,11 +135,11 @@ msgstr "(没有找到)"
 
 #: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
-msgstr "  已安装： "
+msgstr "  已安装："
 
 #: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
-msgstr "  候选软件包： "
+msgstr "  候选软件包："
 
 #: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
@@ -149,7 +147,7 @@ msgstr "(无)"
 
 #: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
-msgstr "  软件包锁： "
+msgstr "  软件包锁："
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1566
@@ -165,6 +163,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s，用于 %s 构架，编译于 %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -200,6 +199,42 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
+"用法： apt-cache [选项] 命令\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"
+"   showpkg - 显示某个软件包的全面信息\n"
+"   showsrc - 显示源文件的各项记录\n"
+"   stats - 显示基本的统计信息\n"
+"   dump - 简要显示整个缓存文件的内容\n"
+"   dumpavail - 把所有有效的包文件列表打印到标准输出\n"
+"   unmet - 显示所有未满足的依赖关系\n"
+"   search - 根据正则表达式搜索软件包列表\n"
+"   show - 以便于阅读的格式介绍该软件包\n"
+"   showauto - 显示自动安装的软件包的列表\n"
+"   depends - 显示该软件包的依赖关系信息\n"
+"   rdepends - 显示所有依赖于该软件包的软件包名字\n"
+"   pkgnames - 列出所有软件包的名字\n"
+"   dotty - 生成可用 GraphViz 处理的软件包关系图\n"
+"   xvcg - 生成可用 xvcg 处理的软件包的关系图\n"
+"   policy - 显示软件包的安装设置状态\n"
+"\n"
+"选项：\n"
+"  -h   本帮助文档。\n"
+"  -p=? 软件包的缓存。\n"
+"  -s=? 源代码包的缓存。\n"
+"  -q   关闭进度显示。\n"
+"  -i   仅为 unmet 命令显示重要的依赖关系。\n"
+"  -c=? 读取指定配置文件\n"
+"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
+"若要了解更多信息，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n"
 
 #: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -337,17 +372,17 @@ msgstr ""
 #: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
-msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包， "
+msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
 
 #: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
-msgstr "重新安装了 %lu 个软件包， "
+msgstr "重新安装了 %lu 个软件包，"
 
 #: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
-msgstr "降级了 %lu 个软件包， "
+msgstr "降级了 %lu 个软件包，"
 
 #: cmdline/apt-get.cc:610
 #, c-format
@@ -413,14 +448,14 @@ msgstr "类似 %s 的虚拟软件包可以卸载\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "软件包 %s 还未安装，因而不会被卸载\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "软件包 %s 还未安装，因而不会被卸载\n"
 
 #: cmdline/apt-get.cc:788
 #, c-format
@@ -458,9 +493,9 @@ msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -590,7 +625,7 @@ msgstr "中止执行。"
 
 #: cmdline/apt-get.cc:1282
 msgid "Do you want to continue [Y/n]? "
-msgstr "您希望继续执行吗？[Y/n] "
+msgstr "您希望继续执行吗？[Y/n]"
 
 #: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
 #, c-format
@@ -656,7 +691,7 @@ msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
 
 #: cmdline/apt-get.cc:1645
 msgid "The update command takes no arguments"
-msgstr "update 命令不需要参数"
+msgstr " update 命令不需要参数"
 
 #: cmdline/apt-get.cc:1711
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
@@ -702,10 +737,10 @@ msgid_plural ""
 msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "使用'apt-get autoremove'来卸载它们"
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -815,12 +850,15 @@ msgstr ""
 "%s\n"
 
 #: cmdline/apt-get.cc:2513
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
+"请使用：\n"
+"bzr get %s\n"
+"获得该软件包的最近更新(可能尚未正式发布)。\n"
 
 #: cmdline/apt-get.cc:2566
 #, c-format
@@ -898,14 +936,14 @@ msgstr "无法获得 %s 的构建依赖关系信息"
 #: cmdline/apt-get.cc:2838
 #, c-format
 msgid "%s has no build depends.\n"
-msgstr "%s 没有构建依赖关系信息。\n"
+msgstr " %s 没有构建依赖关系信息。\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
-msgstr ""
+msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -920,18 +958,20 @@ msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, 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 依赖关系"
 
 #: cmdline/apt-get.cc:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
-msgstr ""
+msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -948,15 +988,16 @@ msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "正在连接 %s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "支持的模块："
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1001,6 +1042,47 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"用法： apt-get [选项] 命令\n"
+"　　　 apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
+"　　　 apt-get [选项] source 软件包1 [软件包2 ...]\n"
+"\n"
+"apt-get 提供了一个用于下载和安装软件包的简易命令行界面。\n"
+"最常用命令是 update 和 install。\n"
+"\n"
+"命令：\n"
+"   update - 取回更新的软件包列表信息\n"
+"   upgrade - 进行一次升级\n"
+"   install - 安装新的软件包(注：软件包名称是 libc6 而非 libc6.deb)\n"
+"   remove - 卸载软件包\n"
+"   autoremove - 卸载所有自动安装且不再使用的软件包\n"
+"   purge - 卸载并清除软件包的配置\n"
+"   source - 下载源码包文件\n"
+"   build-dep - 为源码包配置所需的编译依赖关系\n"
+"   dist-upgrade - 发布版升级，见 apt-get(8)\n"
+"   dselect-upgrade - 根据 dselect 的选择来进行升级\n"
+"   clean - 删除所有已下载的包文件\n"
+"   autoclean - 删除老版本的已下载的包文件\n"
+"   check - 核对以确认系统的依赖关系的完整性\n"
+"   markauto - 标记指定的软件包为自动安装\n"
+"   unmarkauto - 标记指定的软件包为手动安装\n"
+"\n"
+"选项：\n"
+"  -h  本帮助文档。\n"
+"  -q  让输出可作为日志 - 不显示进度\n"
+"  -qq 除了错误外，什么都不输出\n"
+"  -d  仅仅下载 - 【不】安装或解开包文件\n"
+"  -s  不作实际操作。只是依次模拟执行命令\n"
+"  -y  对所有询问都回答是(Yes)，同时不作任何提示\n"
+"  -f  当出现破损的依赖关系时，程序将尝试修正系统\n"
+"  -m  当有包文件无法找到时，程序仍尝试继续执行\n"
+"  -u  显示已升级的软件包列表\n"
+"  -b  在下载完源码包后，编译生成相应的软件包\n"
+"  -V  显示详尽的版本号\n"
+"  -c=? 读取指定配置文件\n"
+"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
+"请查阅 apt-get(8)、sources.list(5) 和 apt.conf(5)的参考手册\n"
+"以获取更多信息和选项。\n"
+"                       本 APT 具有超级牛力。\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1051,29 +1133,29 @@ msgstr ""
 "的盘片插入驱动器“%s”再按回车键\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "但是它还没有被安装"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "%s 被设置为手动安装。\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "%s 被设置为手动安装。\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s 已经是最新的版本了。\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s 已经是最新的版本了。\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1082,14 +1164,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "等待子进程 %s 的退出，但是它并不存在"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "%s 已设置为手动安装。\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "无法打开 %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1489,14 +1571,14 @@ msgstr "无法切换工作目录到 %s"
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "没有找到镜像文件 %s "
+msgstr "没有找到镜像文件 %s"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "没有找到镜像文件 %s"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1523,7 +1605,7 @@ msgstr "无法为子进程创建 IPC 管道"
 
 #: methods/rsh.cc:338
 msgid "Connection closed prematurely"
-msgstr "连接被过早地关闭了"
+msgstr "连接被永久关闭"
 
 #: dselect/install:32
 msgid "Bad default setting!"
@@ -1758,11 +1840,11 @@ msgstr "警告：无法获得 %s 的状态\n"
 
 #: ftparchive/writer.cc:141
 msgid "E: "
-msgstr "错误： "
+msgstr "错误："
 
 #: ftparchive/writer.cc:143
 msgid "W: "
-msgstr "警告： "
+msgstr "警告："
 
 #: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
@@ -1841,19 +1923,19 @@ msgid "Unable to open %s"
 msgstr "无法打开 %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1906,6 +1988,7 @@ msgid "Failed to rename %s to %s"
 msgstr "无法将 %s 重命名为 %s"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1918,6 +2001,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
+"\n"
+"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
+"信息的工具\n"
+"\n"
+"选项：\n"
+"  -h   本帮助文本\n"
+"  -t   设置 temp 目录\n"
+"  -c=? 读指定的配置文件\n"
+"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -1953,7 +2046,7 @@ msgstr "无法创建管道"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "无法执行 gzip "
+msgstr "无法执行 gzip"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -2116,9 +2209,9 @@ msgid "Couldn't duplicate file descriptor %i"
 msgstr "无法为复制文件描述符 %i"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "无法 mmap %lu 字节的数据"
 
 #: apt-pkg/contrib/mmap.cc:146
 msgid "Unable to close mmap"
@@ -2126,7 +2219,7 @@ msgstr "无法关闭 mmap"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
 msgid "Unable to synchronize mmap"
-msgstr "无法同步 mmap"
+msgstr "无法同步 mmap "
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2389,17 +2482,17 @@ msgstr "无法创建子进程的 IPC 管道"
 
 #: apt-pkg/contrib/fileutl.cc:1212
 msgid "Failed to exec compressor "
-msgstr "无法执行压缩程序 "
+msgstr "无法执行压缩程序"
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "读取文件出错，还剩 %lu 字节没有读出"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "写入文件出错，还剩 %lu 字节没有保存"
 
 #: apt-pkg/contrib/fileutl.cc:1736
 #, c-format
@@ -2433,8 +2526,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "软件包缓存区文件的版本不兼容"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "软件包缓存文件损坏了"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2617,9 +2711,9 @@ msgstr ""
 "(%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "无法打开文件 %s"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2658,10 +2752,12 @@ msgstr ""
 "系。"
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 
 #: apt-pkg/acquire.cc:81
 #, c-format
@@ -2683,7 +2779,7 @@ msgstr "无法对目录 %s 加锁"
 #: apt-pkg/acquire.cc:893
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s )"
+msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
 
 #: apt-pkg/acquire.cc:895
 #, c-format
@@ -2770,9 +2866,9 @@ msgstr "软件包暂存区使用的是不兼容的版本控制系统"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "处理 %s (FindPkg)时出错"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2835,9 +2931,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "无法解析软件包仓库 Release 文件 %s"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -3273,59 +3369,35 @@ msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root �
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。 "
+msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。"
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "未锁定"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "从 %s 进程读取数据出错"
-
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "无法为 %s 开启管道"
-
-#~ msgid "Couldn't change to %s"
-#~ msgstr "无法切换工作目录到 %s"
-
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu"
-
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "无法找到某个软件包：包头，于偏移位置 %lu"
-
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "必须首先初始化软件包缓存"
-
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "转移配置文件中有一行是无效的：%s"
-
-#~ msgid "Internal error getting a node"
-#~ msgstr "获得一个节点时出现内部错误"
-
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "无法读取列表文件 %sinfo/%s"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "跳过不存在的文件 %s"
 
-#~ msgid "Reading file listing"
-#~ msgstr "正在读取文件列表"
+#~ msgid "Failed to remove %s"
+#~ msgstr "无法卸载 %s"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "在获取软件包名字时出现内部错误"
+#~ msgid "Unable to create %s"
+#~ msgstr "无法创建 %s "
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "无法切换工作目录到 admin 目录 %sinfo"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "无法读取 %sinfo 的状态"
 
 #~ msgid "The info and temp directories need to be on the same filesystem"
 #~ msgstr "info 和 temp 目录要求处于同一文件系统之下"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "无法读取 %sinfo 的状态"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "无法切换工作目录到 admin 目录 %sinfo"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "无法创建 %s"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "在获取软件包名字时出现内部错误"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "软件包 %s 还未安装，因而不会被卸载\n"
+#~ msgid "Reading file listing"
+#~ msgstr "正在读取文件列表"
 
 #~ msgid ""
 #~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -3335,39 +3407,201 @@ msgstr "未锁定"
 #~ "无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，那么就清空该文件并马"
 #~ "上重新安装相同版本的这个软件包！"
 
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "无法读取列表文件 %sinfo/%s"
+
+#~ msgid "Internal error getting a node"
+#~ msgstr "获得一个节点时出现内部错误"
+
 #~ msgid "Failed to open the diversions file %sdiversions"
 #~ msgstr "无法打开转移配置文件 %sdiversions"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "该转移配置文件被损坏了"
 
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "转移配置文件中有一行是无效的：%s"
+
 #~ msgid "Internal error adding a diversion"
 #~ msgstr "添加转移配置时出现内部错误"
 
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "必须首先初始化软件包缓存"
+
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "无法找到某个软件包：包头，于偏移位置 %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu"
+
 #~ msgid "Error parsing MD5. Offset %lu"
 #~ msgstr "解析 MD5 出错。文件内偏移量为 %lu"
 
+#~ msgid "Couldn't change to %s"
+#~ msgstr "无法切换工作目录到 %s"
+
 #~ msgid "Failed to locate a valid control file"
 #~ msgstr "无法在归档文件中找到有效的主控文件"
 
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "无法为 %s 开启管道"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "从 %s 进程读取数据出错"
+
 #~ msgid "Got a single header line over %u chars"
 #~ msgstr "接收到一行报头行，它的长度超过了 %u 个字符"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "注意：这是自动被 dpkg 有意完成的。"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
+
+#~ msgid "decompressor"
+#~ msgstr "解压程序"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "读取文件出错，还剩 %lu 字节没有读出"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "写入文件出错，还剩 %lu 字节没有保存"
+
 #~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值：%lu。(man 5 "
-#~ "apt.conf)"
+#~ "无法立即对已经解包的 %s 进行配置。请查看 man 5 apt.conf 中的 APT::"
+#~ "Immediate-Configure。"
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "注意：这是自动被 dpkg 有意完成的。"
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "处理 %s (NewPackage)时出错"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "使用'apt-get autoremove'来卸载它们"
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "处理 %s (UsePackage1)时出错"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "无法卸载 %s"
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "处理 %s (NewFileDesc1)时出错"
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "跳过不存在的文件 %s"
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "处理 %s (UsePackage2)时出错"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "处理 %s (NewFileVer1)时出错"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "处理 %s (NewVersion%d)时出错"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "处理 %s (UsePackage3)时出错"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "处理 %s (NewFileDesc2)时出错"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "处理 %s (FindPkg)时出错"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "处理 %s (CollectFileProvides)时出错"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "内部错误，无法定位包内文件"
+
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr "内部错误，组 %s 没有可安装的 pseudo 软件包"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr "Release 文件已过期，忽略 %s (从 %s 起无效)"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "错误：Acquire::gpgv::Options 的参数列表太长。结束运行。"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "处理 %s (NewVersion2)时出错"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "在源列表中 %2$s 中第 %1$u 行的格式有误(供应商 ID)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "无法访问密钥环：“%s”"
+
+#~ msgid "Could not patch file"
+#~ msgstr "无法打开补丁文件"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "没有源代码包“%s”，使用“%s”代替\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "启动对 %s 的处理"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "动态内存映射(Dynamic MMap)空间不足"
+
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n"
+#~ "您最好提交一个针对这个软件包的故障报告。"
+
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "第 %d 行太长了(长度限制为 %lu)。"
+
+#~ msgid "After unpacking %sB of additional disk space will be used.\n"
+#~ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
+
+#~ msgid "After unpacking %sB disk space will be freed.\n"
+#~ msgstr "解压缩后将会空出 %sB 的空间。\n"
+
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "第 %d 行太长了(长度限制为 %d)"
+
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "处理 %s (NewFileDesc1)时出错"
+
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "处理 %s (NewFileDesc2)时出错"
+
+#~ msgid "Stored label: %s \n"
+#~ msgstr "归档文件标签：%s \n"
+
+#~ msgid ""
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
+#~ msgstr ""
+#~ "找到了 %i 个软件包索引、%i 个源代码包索引，%i 个翻译索引和 %i 个数字签名\n"
+
+#~ msgid "openpty failed\n"
+#~ msgstr "openpty 失败\n"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "文件 %s 的时间已被改动"
+
+#~ msgid "Reading file list"
+#~ msgstr "正在读取文件列表"
+
+#~ msgid "Could not execute "
+#~ msgstr "未能执行 "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "正在准备连同配置文件的删除 %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "连同配置文件一同删除 %s "
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr ""
+#~ "在源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%1$s”"