* merged with debian-sid

[apt.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 901d9c0c8e8a9abb7ef35d84f1bb62448af35eb5..f887f33288be618629ce5bfd10012c92ea5e7016 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,16 +1,16 @@
 # Chinese/Simplified translation of apt.
 # This file is put in the public domain.
 # Chinese/Simplified translation of apt.
 # This file is put in the public domain.

-# Tchaikov <chaisave@263.net>, 2004.
-# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004.
+# Tchaikov <tchaikov@sjtu.edu.cn>, 2005.
+# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004,2006

 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.23\n"
 "Report-Msgid-Bugs-To: \n"
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.23\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2004-07-29 09:38-0700\n"
-"PO-Revision-Date: 2005-01-15 00:39+0800\n"
-"Last-Translator: Tchaikov <chaisave@263.net>\n"
-"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-02-22 14:20+1300\n"
+"Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>\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"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"


@@ -28,23 +28,23 @@ msgid "Unable to locate package %s"
 msgstr "未发现软件包 %s"
 
 #: cmdline/apt-cache.cc:232
 msgstr "未发现软件包 %s"
 
 #: cmdline/apt-cache.cc:232

-msgid "Total Package Names : "
+msgid "Total package names : "

 msgstr "软件包总数(按名称计)："
 
 #: cmdline/apt-cache.cc:272
 msgstr "软件包总数(按名称计)："
 
 #: cmdline/apt-cache.cc:272

-msgid "  Normal Packages: "
+msgid "  Normal packages: "

 msgstr "  普通软件包："
 
 #: cmdline/apt-cache.cc:273
 msgstr "  普通软件包："
 
 #: cmdline/apt-cache.cc:273

-msgid "  Pure Virtual Packages: "
+msgid "  Pure virtual packages: "

 msgstr "  完全虚拟软件包："
 
 #: cmdline/apt-cache.cc:274
 msgstr "  完全虚拟软件包："
 
 #: cmdline/apt-cache.cc:274

-msgid "  Single Virtual Packages: "
+msgid "  Single virtual packages: "

 msgstr "  单虚拟软件包："
 
 #: cmdline/apt-cache.cc:275
 msgstr "  单虚拟软件包："
 
 #: cmdline/apt-cache.cc:275

-msgid "  Mixed Virtual Packages: "
+msgid "  Mixed virtual packages: "

 msgstr "  混合虚拟软件包："
 
 #: cmdline/apt-cache.cc:276
 msgstr "  混合虚拟软件包："
 
 #: cmdline/apt-cache.cc:276


@@ -52,35 +52,35 @@ msgid "  Missing: "
 msgstr "  缺漏的："
 
 #: cmdline/apt-cache.cc:278
 msgstr "  缺漏的："
 
 #: cmdline/apt-cache.cc:278

-msgid "Total Distinct Versions: "
+msgid "Total distinct versions: "

 msgstr "按版本共计："
 
 #: cmdline/apt-cache.cc:280
 msgstr "按版本共计："
 
 #: cmdline/apt-cache.cc:280

-msgid "Total Dependencies: "
+msgid "Total dependencies: "

 msgstr "按依赖关系共计："
 
 #: cmdline/apt-cache.cc:283
 msgstr "按依赖关系共计："
 
 #: cmdline/apt-cache.cc:283

-msgid "Total Ver/File relations: "
+msgid "Total ver/file relations: "

 msgstr "按版本/文件关系共计："
 
 #: cmdline/apt-cache.cc:285
 msgstr "按版本/文件关系共计："
 
 #: cmdline/apt-cache.cc:285

-msgid "Total Provides Mappings: "
+msgid "Total Provides mappings: "

 msgstr "提供映射共计："
 
 #: cmdline/apt-cache.cc:297
 msgstr "提供映射共计："
 
 #: cmdline/apt-cache.cc:297

-msgid "Total Globbed Strings: "
+msgid "Total globbed strings: "

 msgstr "Glob 字串共计："
 
 #: cmdline/apt-cache.cc:311
 msgstr "Glob 字串共计："
 
 #: cmdline/apt-cache.cc:311

-msgid "Total Dependency Version space: "
+msgid "Total dependency version space: "

 msgstr "依赖关系版本名所占空间共计："
 
 #: cmdline/apt-cache.cc:316
 msgstr "依赖关系版本名所占空间共计："
 
 #: cmdline/apt-cache.cc:316

-msgid "Total Slack space: "
+msgid "Total slack space: "

 msgstr "Slack 空间共计："
 
 #: cmdline/apt-cache.cc:324
 msgstr "Slack 空间共计："
 
 #: cmdline/apt-cache.cc:324

-msgid "Total Space Accounted for: "
+msgid "Total space accounted for: "

 msgstr "总占用空间："
 
 #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
 msgstr "总占用空间："
 
 #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189


@@ -97,7 +97,7 @@ msgid "No packages found"
 msgstr "没有发现吻合的软件包"
 
 #: cmdline/apt-cache.cc:1462
 msgstr "没有发现吻合的软件包"
 
 #: cmdline/apt-cache.cc:1462

-msgid "Package Files:"
+msgid "Package files:"

 msgstr "软件包文件："
 
 #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
 msgstr "软件包文件："
 
 #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555


@@ -111,7 +111,7 @@ msgstr "%4i %s\n"
 
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1482
 
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1482

-msgid "Pinned Packages:"
+msgid "Pinned packages:"

 msgstr "被锁定(pinned)的软件包："
 
 #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
 msgstr "被锁定(pinned)的软件包："
 
 #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535


@@ -133,12 +133,12 @@ msgid "  Candidate: "
 msgstr "  候选的软件包："
 
 #: cmdline/apt-cache.cc:1532
 msgstr "  候选的软件包："
 
 #: cmdline/apt-cache.cc:1532

-msgid "  Package Pin: "
+msgid "  Package pin: "

 msgstr "  软件包锁(Pin)："
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1541
 msgstr "  软件包锁(Pin)："
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1541

-msgid "  Version Table:"
+msgid "  Version table:"

 msgstr "  版本列表："
 
 #: cmdline/apt-cache.cc:1556
 msgstr "  版本列表："
 
 #: cmdline/apt-cache.cc:1556


@@ -146,14 +146,14 @@ msgstr "  版本列表："
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 

-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s for %s %s ，编译于 %s %s\n"
 
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s for %s %s ，编译于 %s %s\n"
 

-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1659

 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"


@@ -188,7 +188,7 @@ msgid ""
 "  -q   Disable progress indicator.\n"
 "  -i   Show only important deps for the unmet command.\n"
 "  -c=? Read this configuration file\n"
 "  -q   Disable progress indicator.\n"
 "  -i   Show only important deps for the unmet command.\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -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"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 "用法： apt-cache [选项] 命令\n"


@@ -206,11 +206,11 @@ msgstr ""
 "   showsrc - 显示源文件的各项记录\n"
 "   stats - 显示一些基本的统计信息\n"
 "   dump - 简要显示整个缓存文件的内容\n"
 "   showsrc - 显示源文件的各项记录\n"
 "   stats - 显示一些基本的统计信息\n"
 "   dump - 简要显示整个缓存文件的内容\n"

-"   dumpavail - 把所有有效的包文件列表打印到 stdout\n"
+"   dumpavail - 把所有有效的包文件列表打印到标准输出\n"

 "   unmet - 显示所有未满足的依赖关系\n"
 "   search - 根据正则表达式搜索软件包列表\n"
 "   unmet - 显示所有未满足的依赖关系\n"
 "   search - 根据正则表达式搜索软件包列表\n"

-"   show - 显示关于该软件包的便于阅读的一个报告\n"
-"   depends - 原原本本的显示该软件包的依赖关系的信息\n"
+"   show - 以便于阅读的格式介绍该软件包\n"
+"   depends - 原原本本地显示该软件包的依赖信息\n"

 "   rdepends - 显示所有依赖于该软件包的软件包名字\n"
 "   pkgnames - 列出所有软件包的名字\n"
 "   dotty - 生成可用 GraphVis 处理的软件包关系图\n"
 "   rdepends - 显示所有依赖于该软件包的软件包名字\n"
 "   pkgnames - 列出所有软件包的名字\n"
 "   dotty - 生成可用 GraphVis 处理的软件包关系图\n"


@@ -227,6 +227,18 @@ msgstr ""
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 "若要深入了解，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n"
 
 "  -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:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "请把光盘碟片插入驱动器再按回车键"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "请对您的光盘套件中的其它光盘重复相同的操作。"
+

 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
 msgstr "参数没有成对"
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
 msgstr "参数没有成对"


@@ -244,7 +256,7 @@ msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -c=? Read this configuration file\n"
 "Options:\n"
 "  -h   This help text.\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 "用法：apt-config [选项] 命令\n"
 "\n"
 msgstr ""
 "用法：apt-config [选项] 命令\n"
 "\n"


@@ -275,7 +287,7 @@ msgid ""
 "  -h   This help text\n"
 "  -t   Set the temp dir\n"
 "  -c=? Read this configuration file\n"
 "  -h   This help text\n"
 "  -t   Set the temp dir\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 "用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
 "\n"
 msgstr ""
 "用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
 "\n"


@@ -284,11 +296,11 @@ msgstr ""
 "\n"
 "选项：\n"
 "  -h   本帮助文本\n"
 "\n"
 "选项：\n"
 "  -h   本帮助文本\n"

-"  -t   设置temp目录\n"
+"  -t   设置 temp 目录\n"

 "  -c=? 读指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 
 "  -c=? 读指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 

-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710

 #, c-format
 msgid "Unable to write to %s"
 msgstr "无法写入 %s"
 #, c-format
 msgid "Unable to write to %s"
 msgstr "无法写入 %s"


@@ -297,31 +309,31 @@ msgstr "无法写入 %s"
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?"
 
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?"
 

-#: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337
+#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341

 msgid "Package extension list is too long"
 msgstr "软件包的扩展列表超长"
 
 msgid "Package extension list is too long"
 msgstr "软件包的扩展列表超长"
 

-#: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179
-#: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
-#: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
+#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
+#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
+#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292

 #, c-format
 #, c-format

-msgid "Error Processing directory %s"
+msgid "Error processing directory %s"

 msgstr "处理目录 %s 时出错"
 
 msgstr "处理目录 %s 时出错"
 

-#: ftparchive/apt-ftparchive.cc:250
+#: ftparchive/apt-ftparchive.cc:254

 msgid "Source extension list is too long"
 msgstr "源扩展列表超长"
 
 msgid "Source extension list is too long"
 msgstr "源扩展列表超长"
 

-#: ftparchive/apt-ftparchive.cc:367
+#: ftparchive/apt-ftparchive.cc:371

 msgid "Error writing header to contents file"
 msgstr "将 header 写到 contents 文件时出错"
 
 msgid "Error writing header to contents file"
 msgstr "将 header 写到 contents 文件时出错"
 

-#: ftparchive/apt-ftparchive.cc:397
+#: ftparchive/apt-ftparchive.cc:401

 #, c-format
 #, c-format

-msgid "Error Processing Contents %s"
+msgid "Error processing contents %s"

 msgstr "处理 Contents %s 时出错"
 
 msgstr "处理 Contents %s 时出错"
 

-#: ftparchive/apt-ftparchive.cc:551
+#: ftparchive/apt-ftparchive.cc:556

 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"


@@ -360,7 +372,7 @@ msgid ""
 "  --no-delink Enable delinking debug mode\n"
 "  --contents  Control contents file generation\n"
 "  -c=?  Read this configuration file\n"
 "  --no-delink Enable delinking debug mode\n"
 "  --contents  Control contents file generation\n"
 "  -c=?  Read this configuration file\n"

-"  -o=?  Set an arbitary configuration option"
+"  -o=?  Set an arbitrary configuration option"

 msgstr ""
 "用法： apt-ftparchive [选项] 命令\n"
 "命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"
 msgstr ""
 "用法： apt-ftparchive [选项] 命令\n"
 "命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"


@@ -371,8 +383,8 @@ msgstr ""
 "       clean 配置文件\n"
 "\n"
 "apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n"
 "       clean 配置文件\n"
 "\n"
 "apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n"

-"å¤\9aç§\8dç\94\9fæ\88\90ç´¢å¼\95ç\9a\84æ\96¹å¼\8fï¼\8cä»\8eå\85¨è\87ªå\8a¨ç\9a\84ç\94\9fæ\88\90å\88°å\9c¨å\8a\9fè\83½ä¸\8a对 dpkg-scanpackages \n"
-"和 dpkg-scansources 的替代，都能游刃有余\n"
+"å¤\9aç§\8dç\94\9fæ\88\90ç´¢å¼\95ç\9a\84æ\96¹å¼\8fï¼\8cä»\8eå\85¨è\87ªå\8a¨ç\9a\84ç´¢å¼\95ç\94\9fæ\88\90å\88°å\9c¨å\8a\9fè\83½ä¸\8aå\8f\96代 dpkg-scanpackages \n"
+"和 dpkg-scansources，都能游刃有余\n"

 "\n"
 "apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
 "Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n"
 "\n"
 "apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
 "Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n"


@@ -383,7 +395,6 @@ msgstr ""
 "可以通过使用 --source-override 选项来指定一个 override 文件\n"
 "\n"
 "使用“packages”和“source”命令时，必须在文件树的根部执行本程序。\n"
 "可以通过使用 --source-override 选项来指定一个 override 文件\n"
 "\n"
 "使用“packages”和“source”命令时，必须在文件树的根部执行本程序。\n"

-"\n"

 "二进制包的搜索路径一定要是递归搜索的底层，而且 override 文件里\n"
 "应该注明 override 的标志。若指定了路径前缀，那么它会被加到文件名前面。\n"
 "下面有个来自 Debian 文档的例子：\n"
 "二进制包的搜索路径一定要是递归搜索的底层，而且 override 文件里\n"
 "应该注明 override 的标志。若指定了路径前缀，那么它会被加到文件名前面。\n"
 "下面有个来自 Debian 文档的例子：\n"


@@ -394,17 +405,19 @@ msgstr ""
 "  -h    本帮助文档\n"
 "  --md5 使之生成 MD5 校验和\n"
 "  -s=?  源代码包 override 文件\n"
 "  -h    本帮助文档\n"
 "  --md5 使之生成 MD5 校验和\n"
 "  -s=?  源代码包 override 文件\n"

-"  -q    输出精简信息  -d=?  指定可选的缓存数据库\n"
+"  -q    输出精简信息\n"
+"  -d=?  指定可选的缓存数据库\n"
+"  -d=?  使用另一个可选的缓存数据库\n"

 "  --no-delink 开启delink的调试模式\n"
 "  --contents  使之生成控制内容文件\n"
 "  -c=?  读取指定配置文件\n"
 "  -o=?  设置任意指定的配置选项"
 
 "  --no-delink 开启delink的调试模式\n"
 "  --contents  使之生成控制内容文件\n"
 "  -c=?  读取指定配置文件\n"
 "  -o=?  设置任意指定的配置选项"
 

-#: ftparchive/apt-ftparchive.cc:757
+#: ftparchive/apt-ftparchive.cc:762

 msgid "No selections matched"
 msgstr "没有任何选定项是匹配的"
 
 msgid "No selections matched"
 msgstr "没有任何选定项是匹配的"
 

-#: ftparchive/apt-ftparchive.cc:830
+#: ftparchive/apt-ftparchive.cc:835

 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "软件包文件组“%s”中缺少一些文件"
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "软件包文件组“%s”中缺少一些文件"


@@ -437,88 +450,93 @@ msgstr "存档没有包含控制字段"
 msgid "Unable to get a cursor"
 msgstr "无法获得游标(cursor)"
 
 msgid "Unable to get a cursor"
 msgstr "无法获得游标(cursor)"
 

-#: ftparchive/writer.cc:79
+#: ftparchive/writer.cc:78

 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "警告：无法读取目录 %s\n"
 
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "警告：无法读取目录 %s\n"
 

-#: ftparchive/writer.cc:84
+#: ftparchive/writer.cc:83

 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "警告：无法对 %s 进行统计\n"
 
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "警告：无法对 %s 进行统计\n"
 

-#: ftparchive/writer.cc:126
+#: ftparchive/writer.cc:125

 msgid "E: "
 msgstr "错误："
 
 msgid "E: "
 msgstr "错误："
 

-#: ftparchive/writer.cc:128
+#: ftparchive/writer.cc:127

 msgid "W: "
 msgstr "警告："
 
 msgid "W: "
 msgstr "警告："
 

-#: ftparchive/writer.cc:135
+#: ftparchive/writer.cc:134

 msgid "E: Errors apply to file "
 msgstr "错误：处理文件时出错 "
 
 msgid "E: Errors apply to file "
 msgstr "错误：处理文件时出错 "
 

-#: ftparchive/writer.cc:152 ftparchive/writer.cc:182
+#: ftparchive/writer.cc:151 ftparchive/writer.cc:181

 #, c-format
 msgid "Failed to resolve %s"
 msgstr "无法解析路径 %s"
 
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "无法解析路径 %s"
 

-#: ftparchive/writer.cc:164
+#: ftparchive/writer.cc:163

 msgid "Tree walking failed"
 msgstr "无法遍历目录树"
 
 msgid "Tree walking failed"
 msgstr "无法遍历目录树"
 

-#: ftparchive/writer.cc:189
+#: ftparchive/writer.cc:188

 #, c-format
 msgid "Failed to open %s"
 msgstr "无法打开 %s"
 
 #, c-format
 msgid "Failed to open %s"
 msgstr "无法打开 %s"
 

-#: ftparchive/writer.cc:246
+#: ftparchive/writer.cc:245

 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 

-#: ftparchive/writer.cc:254
+#: ftparchive/writer.cc:253

 #, c-format
 msgid "Failed to readlink %s"
 msgstr "无法读取符号链接 %s"
 
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "无法读取符号链接 %s"
 

-#: ftparchive/writer.cc:258
+#: ftparchive/writer.cc:257

 #, c-format
 msgid "Failed to unlink %s"
 msgstr "无法 unlink %s"
 
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "无法 unlink %s"
 

-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:264

 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** 无法将 %s 链接到 %s"
 
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** 无法将 %s 链接到 %s"
 

-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:274

 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " 达到了 DeLink 的上限 %sB。\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " 达到了 DeLink 的上限 %sB。\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193

-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266

 #, c-format
 msgid "Failed to stat %s"
 msgstr "无法读取 %s 的状态"
 
 #, c-format
 msgid "Failed to stat %s"
 msgstr "无法读取 %s 的状态"
 

-#: ftparchive/writer.cc:378
+#: ftparchive/writer.cc:386

 msgid "Archive had no package field"
 msgstr "存档没有包含软件包(package)字段"
 
 msgid "Archive had no package field"
 msgstr "存档没有包含软件包(package)字段"
 

-#: ftparchive/writer.cc:386 ftparchive/writer.cc:595
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:603

 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s 中没有 override 项\n"
 
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s 中没有 override 项\n"
 

-#: ftparchive/writer.cc:429 ftparchive/writer.cc:677
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:689

 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s 的维护者 %s 并非 %s\n"
 
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s 的维护者 %s 并非 %s\n"
 

-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "内部错误，无法定位包内文件 %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384

 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - 无法再分配内存"
 
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - 无法再分配内存"
 


@@ -549,7 +567,7 @@ msgstr "无法读取 override 文件 %s"
 
 #: ftparchive/multicompress.cc:75
 #, c-format
 
 #: ftparchive/multicompress.cc:75
 #, c-format

-msgid "Unknown Compresison Algorithm '%s'"
+msgid "Unknown compression algorithm '%s'"

 msgstr "未知的压缩算法“%s”"
 
 #: ftparchive/multicompress.cc:105
 msgstr "未知的压缩算法“%s”"
 
 #: ftparchive/multicompress.cc:105


@@ -570,12 +588,12 @@ msgid "Failed to fork"
 msgstr "无法 fork"
 
 #: ftparchive/multicompress.cc:215
 msgstr "无法 fork"
 
 #: ftparchive/multicompress.cc:215

-msgid "Compress Child"
+msgid "Compress child"

 msgstr "压缩子进程"
 
 #: ftparchive/multicompress.cc:238
 #, c-format
 msgstr "压缩子进程"
 
 #: ftparchive/multicompress.cc:238
 #, c-format

-msgid "Internal Error, Failed to create %s"
+msgid "Internal error, failed to create %s"

 msgstr "内部错误，无法建立 %s"
 
 #: ftparchive/multicompress.cc:289
 msgstr "内部错误，无法建立 %s"
 
 #: ftparchive/multicompress.cc:289


@@ -608,222 +626,255 @@ msgstr "在 unlink %s 时出错"
 msgid "Failed to rename %s to %s"
 msgstr "无法将 %s 重命名为 %s"
 
 msgid "Failed to rename %s to %s"
 msgstr "无法将 %s 重命名为 %s"
 

-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120

 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "编译正则表达式时出错 - %s"
 
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "编译正则表达式时出错 - %s"
 

-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237

 msgid "The following packages have unmet dependencies:"
 msgstr "下列的软件包有不能满足的依赖关系："
 
 msgid "The following packages have unmet dependencies:"
 msgstr "下列的软件包有不能满足的依赖关系："
 

-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327

 #, c-format
 msgid "but %s is installed"
 msgstr "但是 %s 已经安装了"
 
 #, c-format
 msgid "but %s is installed"
 msgstr "但是 %s 已经安装了"
 

-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329

 #, c-format
 msgid "but %s is to be installed"
 msgstr "但是 %s 正要被安装"
 
 #, c-format
 msgid "but %s is to be installed"
 msgstr "但是 %s 正要被安装"
 

-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336

 msgid "but it is not installable"
 msgstr "但却无法安装它"
 
 msgid "but it is not installable"
 msgstr "但却无法安装它"
 

-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338

 msgid "but it is a virtual package"
 msgstr "但是它只是个虚拟软件包"
 
 msgid "but it is a virtual package"
 msgstr "但是它只是个虚拟软件包"
 

-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341

 msgid "but it is not installed"
 msgstr "但是它还没有被安装"
 
 msgid "but it is not installed"
 msgstr "但是它还没有被安装"
 

-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341

 msgid "but it is not going to be installed"
 msgstr "但是它将不会被安装"
 
 msgid "but it is not going to be installed"
 msgstr "但是它将不会被安装"
 

-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346

 msgid " or"
 msgstr " 或"
 
 msgid " or"
 msgstr " 或"
 

-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375

 msgid "The following NEW packages will be installed:"
 msgstr "下列【新】软件包将被安装："
 
 msgid "The following NEW packages will be installed:"
 msgstr "下列【新】软件包将被安装："
 

-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401

 msgid "The following packages will be REMOVED:"
 msgstr "下列软件包将被【卸载】："
 
 msgid "The following packages will be REMOVED:"
 msgstr "下列软件包将被【卸载】："
 

-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423

 msgid "The following packages have been kept back:"
 msgstr "下列的软件包的版本将保持不变："
 
 msgid "The following packages have been kept back:"
 msgstr "下列的软件包的版本将保持不变："
 

-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444

 msgid "The following packages will be upgraded:"
 msgstr "下列的软件包将被升级："
 
 msgid "The following packages will be upgraded:"
 msgstr "下列的软件包将被升级："
 

-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465

 msgid "The following packages will be DOWNGRADED:"
 msgstr "下列软件包将被【降级】："
 
 msgid "The following packages will be DOWNGRADED:"
 msgstr "下列软件包将被【降级】："
 

-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485

 msgid "The following held packages will be changed:"
 msgstr "下列被要求保持版本不变的软件包将被改变："
 
 msgid "The following held packages will be changed:"
 msgstr "下列被要求保持版本不变的软件包将被改变："
 

-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538

 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (是由于 %s) "
 
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (是由于 %s) "
 

-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546

 msgid ""
 msgid ""

-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"

 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""

-"注意：下列的重要软件包将被卸载 \n"
-"请勿尝试，除非您确实清楚您正在执行的操作！"
+"【警告】：下列的重要软件包将被卸载 \n"
+"请勿尝试，除非您确实知道您在做什么！"

 
 

-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:577

 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，"
 
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，"
 

-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:581

 #, c-format
 msgid "%lu reinstalled, "
 msgstr "共重新安装了 %lu 个软件包，"
 
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "共重新安装了 %lu 个软件包，"
 

-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:583

 #, c-format
 msgid "%lu downgraded, "
 msgstr "降级了 %lu 个软件包，"
 
 #, c-format
 msgid "%lu downgraded, "
 msgstr "降级了 %lu 个软件包，"
 

-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:585

 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n"
 
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n"
 

-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:589

 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
 
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
 

-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:649

 msgid "Correcting dependencies..."
 msgstr "正在更正依赖关系..."
 
 msgid "Correcting dependencies..."
 msgstr "正在更正依赖关系..."
 

-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:652

 msgid " failed."
 msgstr " 失败。"
 
 msgid " failed."
 msgstr " 失败。"
 

-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:655

 msgid "Unable to correct dependencies"
 msgstr "无法更正依赖关系"
 
 msgid "Unable to correct dependencies"
 msgstr "无法更正依赖关系"
 

-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:658

 msgid "Unable to minimize the upgrade set"
 msgid "Unable to minimize the upgrade set"

-msgstr "无法使升级的软件包集最小化"
+msgstr "无法最小化要升级的软件包集合"

 
 

-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:660

 msgid " Done"
 msgstr " 完成"
 
 msgid " Done"
 msgstr " 完成"
 

-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:664

 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。"
 
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。"
 

-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:667

 msgid "Unmet dependencies. Try using -f."
 msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
 
 msgid "Unmet dependencies. Try using -f."
 msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
 

-#: cmdline/apt-get.cc:718
-msgid "Packages need to be removed but Remove is disabled."
+#: cmdline/apt-get.cc:689
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "【警告】：下列的软件包不能通过验证！"
+
+#: cmdline/apt-get.cc:693
+msgid "Authentication warning overridden.\n"
+msgstr "忽略了认证警告。\n"
+
+#: cmdline/apt-get.cc:700
+msgid "Install these packages without verification [y/N]? "
+msgstr "不经验证就安装这些软件包么？[y/N] "
+
+#: cmdline/apt-get.cc:702
+msgid "Some packages could not be authenticated"
+msgstr "有些软件包不能通过验证"
+
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
+msgid "There are problems and -y was used without --force-yes"
+msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
+
+#: cmdline/apt-get.cc:755
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
+
+#: cmdline/apt-get.cc:764
+msgid "Packages need to be removed but remove is disabled."

 msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
 
 msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
 

-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:775
+msgid "Internal error, Ordering didn't finish"
+msgstr "内部错误，Ordering 没有完成"
+
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833

 msgid "Unable to lock the download directory"
 msgstr "无法对下载目录加锁"
 
 msgid "Unable to lock the download directory"
 msgstr "无法对下载目录加锁"
 

-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117

 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "无法读取安装源列表。"
 
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "无法读取安装源列表。"
 

-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:816
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧"
+
+#: cmdline/apt-get.cc:821

 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "需要下载 %sB/%sB 的软件包。\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "需要下载 %sB/%sB 的软件包。\n"
 

-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:824

 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "需要下载 %sB 的软件包。\n"
 
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "需要下载 %sB 的软件包。\n"
 

-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:829

 #, c-format
 msgid "After unpacking %sB of additional disk space will be used.\n"
 msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
 
 #, c-format
 msgid "After unpacking %sB of additional disk space will be used.\n"
 msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
 

-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:832

 #, c-format
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "解压缩后将会空出 %sB 的空间。\n"
 
 #, c-format
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "解压缩后将会空出 %sB 的空间。\n"
 

-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "无法获知您在 %s 上的空余空间"
+
+#: cmdline/apt-get.cc:849

 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "您在 %s 中没有足够的空余空间。"
 
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "您在 %s 中没有足够的空余空间。"
 

-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "碰到了一些问题，您使用了 -y 选项但是没有用 --force-yes。"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884

 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。"
 
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。"
 

-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:866

 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 

-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:868

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"

 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""

-"您的操作会导致潜在的危害\n"
+"您的操作会导致潜在的危害。\n"

 "若还想继续的话，就输入下面的短句“%s”\n"
 " ?] "
 
 "若还想继续的话，就输入下面的短句“%s”\n"
 " ?] "
 

-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893

 msgid "Abort."
 msgstr "中止执行。"
 
 msgid "Abort."
 msgstr "中止执行。"
 

-#: cmdline/apt-get.cc:842
-msgid "Do you want to continue? [Y/n] "
+#: cmdline/apt-get.cc:889
+msgid "Do you want to continue [Y/n]? "

 msgstr "您希望继续执行吗？[Y/n]"
 
 msgstr "您希望继续执行吗？[Y/n]"
 

-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"
 
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"
 

-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:979

 msgid "Some files failed to download"
 msgstr "有一些文件下载失败"
 
 msgid "Some files failed to download"
 msgstr "有一些文件下载失败"
 

-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023

 msgid "Download complete and in download only mode"
 msgstr "下载完毕，目前是“仅下载”模式"
 
 msgid "Download complete and in download only mode"
 msgstr "下载完毕，目前是“仅下载”模式"
 

-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:986

 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"


@@ -831,47 +882,47 @@ msgstr ""
 "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
 "再试试？"
 
 "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
 "再试试？"
 

-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:990

 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)"
 
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)"
 

-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:995

 msgid "Unable to correct missing packages."
 msgstr "无法更正缺少的软件包。"
 
 msgid "Unable to correct missing packages."
 msgstr "无法更正缺少的软件包。"
 

-#: cmdline/apt-get.cc:946
-msgid "Aborting Install."
+#: cmdline/apt-get.cc:996
+msgid "Aborting install."

 msgstr "放弃安装。"
 
 msgstr "放弃安装。"
 

-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1030

 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "注意，我选了 %s 而非 %s\n"
 
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "注意，我选了 %s 而非 %s\n"
 

-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1040

 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
 
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
 

-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1058

 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "软件包 %s 还未安装，因而不会被卸载\n"
 
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "软件包 %s 还未安装，因而不会被卸载\n"
 

-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1069

 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
 
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
 

-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1081

 msgid " [Installed]"
 msgstr " [已安装]"
 
 msgid " [Installed]"
 msgstr " [已安装]"
 

-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1086

 msgid "You should explicitly select one to install."
 msgstr "请您明确地选择一个来进行安装。"
 
 msgid "You should explicitly select one to install."
 msgstr "请您明确地选择一个来进行安装。"
 

-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1091

 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"


@@ -882,74 +933,74 @@ msgstr ""
 "这可能意味着这个缺失的软件包可能已被废弃，\n"
 "或者只能在其他发布源中找到\n"
 
 "这可能意味着这个缺失的软件包可能已被废弃，\n"
 "或者只能在其他发布源中找到\n"
 

-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1110

 msgid "However the following packages replace it:"
 msgstr "可是下列的软件包取代了它："
 
 msgid "However the following packages replace it:"
 msgstr "可是下列的软件包取代了它："
 

-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1113

 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "软件包 %s 还没有可供安装的候选者"
 
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "软件包 %s 还没有可供安装的候选者"
 

-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1133

 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "不能重新安装 %s，因为无法下载它。\n"
 
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "不能重新安装 %s，因为无法下载它。\n"
 

-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1141

 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s 已经是最新的版本了。\n"
 
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s 已经是最新的版本了。\n"
 

-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1168

 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”发布版本"
 
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”发布版本"
 

-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1170

 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”版本"
 
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”版本"
 

-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1176

 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "选定了版本为 %s (%s) 的 %s\n"
 
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "选定了版本为 %s (%s) 的 %s\n"
 

-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1313

 msgid "The update command takes no arguments"
 msgstr " update 命令是不需任何参数的"
 
 msgid "The update command takes no arguments"
 msgstr " update 命令是不需任何参数的"
 

-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1326

 msgid "Unable to lock the list directory"
 msgstr "无法对状态列表目录加锁"
 
 msgid "Unable to lock the list directory"
 msgstr "无法对状态列表目录加锁"
 

-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1384

 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 

-#: cmdline/apt-get.cc:1319
-msgid "Internal Error, AllUpgrade broke stuff"
-msgstr "内部错误，AllUpgrade 造成某些故障"
+#: cmdline/apt-get.cc:1403
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr "内部错误，AllUpgrade 坏事了"

 
 

-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 

-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1516

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
 

-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1546

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
 

-#: cmdline/apt-get.cc:1465
+#: cmdline/apt-get.cc:1549

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -957,7 +1008,7 @@ msgstr ""
 "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
 "以指定一个解决办法)。"
 
 "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
 "以指定一个解决办法)。"
 

-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1561

 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"
 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"


@@ -968,7 +1019,7 @@ msgstr ""
 "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
 "包尚未被创建或是它们还在新到(incoming)目录中。"
 
 "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
 "包尚未被创建或是它们还在新到(incoming)目录中。"
 

-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1569

 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"
 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"


@@ -977,112 +1028,126 @@ msgstr ""
 "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n"
 "您最好提交一个针对这个软件包的故障报告。"
 
 "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n"
 "您最好提交一个针对这个软件包的故障报告。"
 

-#: cmdline/apt-get.cc:1490
+#: cmdline/apt-get.cc:1574

 msgid "The following information may help to resolve the situation:"
 msgid "The following information may help to resolve the situation:"

-msgstr "下列的信息可能会对问题的解决有所帮助："
+msgstr "下列的信息可能会对解决问题有所帮助："

 
 

-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1577

 msgid "Broken packages"
 msgid "Broken packages"

-msgstr "受损安装包"
+msgstr "无法安装的软件包"

 
 

-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1603

 msgid "The following extra packages will be installed:"
 msgid "The following extra packages will be installed:"

-msgstr "将会安装下列的额外的软件包："
+msgstr "将会安装下列额外的软件包："

 
 

-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1674

 msgid "Suggested packages:"
 msgstr "建议安装的软件包："
 
 msgid "Suggested packages:"
 msgstr "建议安装的软件包："
 

-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1675

 msgid "Recommended packages:"
 msgstr "推荐安装的软件包："
 
 msgid "Recommended packages:"
 msgstr "推荐安装的软件包："
 

-#: cmdline/apt-get.cc:1611
-msgid "Calculating Upgrade... "
+#: cmdline/apt-get.cc:1695
+msgid "Calculating upgrade... "

 msgstr "正在筹划升级... "
 
 msgstr "正在筹划升级... "
 

-#: cmdline/apt-get.cc:1614 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101

 msgid "Failed"
 msgstr "失败"
 
 msgid "Failed"
 msgstr "失败"
 

-#: cmdline/apt-get.cc:1619
+#: cmdline/apt-get.cc:1703

 msgid "Done"
 msgstr "完成"
 
 msgid "Done"
 msgstr "完成"
 

-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
+msgid "Internal error, problem resolver broke stuff"
+msgstr "内部错误，problem resolver 坏事了"
+
+#: cmdline/apt-get.cc:1876

 msgid "Must specify at least one package to fetch source for"
 msgstr "要下载源代码，必须指定至少一个对应的软件包"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "要下载源代码，必须指定至少一个对应的软件包"
 

-#: cmdline/apt-get.cc:1819 cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "无法找到与 %s 对应的源代码包"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "无法找到与 %s 对应的源代码包"
 

-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "忽略已下载过的文件“%s”\n"
+
+#: cmdline/apt-get.cc:1974

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "您在 %s 上没有足够的空余空间"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "您在 %s 上没有足够的空余空间"
 

-#: cmdline/apt-get.cc:1871
+#: cmdline/apt-get.cc:1979

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下载 %sB/%sB 的源代码包。\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下载 %sB/%sB 的源代码包。\n"
 

-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1982

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下载 %sB 的源代码包。\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下载 %sB 的源代码包。\n"
 

-#: cmdline/apt-get.cc:1880
+#: cmdline/apt-get.cc:1988

 #, c-format
 #, c-format

-msgid "Fetch Source %s\n"
+msgid "Fetch source %s\n"

 msgstr "下载源代码 %s\n"
 
 msgstr "下载源代码 %s\n"
 

-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:2019

 msgid "Failed to fetch some archives."
 msgstr "有一些包文件无法下载。"
 
 msgid "Failed to fetch some archives."
 msgstr "有一些包文件无法下载。"
 

-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:2047

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
 

-#: cmdline/apt-get.cc:1951
+#: cmdline/apt-get.cc:2059

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "运行解包的命令“%s”出错。\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "运行解包的命令“%s”出错。\n"
 

-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2060
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
+
+#: cmdline/apt-get.cc:2077

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s”失败。\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s”失败。\n"
 

-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2096

 msgid "Child process failed"
 msgstr "子进程出错"
 
 msgid "Child process failed"
 msgstr "子进程出错"
 

-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2112

 msgid "Must specify at least one package to check builddeps for"
 msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
 

-#: cmdline/apt-get.cc:2031
+#: cmdline/apt-get.cc:2140

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
 

-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2160

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 

-#: cmdline/apt-get.cc:2103
+#: cmdline/apt-get.cc:2212

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
 #, 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:2155
+#: cmdline/apt-get.cc:2264

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1091,30 +1156,30 @@ msgstr ""
 "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
 "$s 依赖关系"
 
 "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
 "$s 依赖关系"
 

-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2299

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了"
 
 #, c-format
 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:2215
+#: cmdline/apt-get.cc:2324

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
 

-#: cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:2338

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
 

-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2342

 msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 
 msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 

-#: cmdline/apt-get.cc:2265
-msgid "Supported Modules:"
+#: cmdline/apt-get.cc:2374
+msgid "Supported modules:"

 msgstr "被支持模块："
 
 msgstr "被支持模块："
 

-#: cmdline/apt-get.cc:2306
+#: cmdline/apt-get.cc:2415

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1150,7 +1215,7 @@ msgid ""
 "  -b  Build the source package after fetching it\n"
 "  -V  Show verbose version numbers\n"
 "  -c=? Read this configuration file\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 arbitary configuration option, eg -o dir::cache=/tmp\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"
 "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"


@@ -1221,7 +1286,7 @@ msgstr " [执行中]"
 #: cmdline/acqprogress.cc:271
 #, c-format
 msgid ""
 #: cmdline/acqprogress.cc:271
 #, c-format
 msgid ""

-"Media Change: Please insert the disc labeled\n"
+"Media change: please insert the disc labeled\n"

 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""


@@ -1244,7 +1309,7 @@ msgid ""
 "  -h   This help text\n"
 "  -s   Use source file sorting\n"
 "  -c=? Read this configuration file\n"
 "  -h   This help text\n"
 "  -s   Use source file sorting\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 "用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
 "\n"
 msgstr ""
 "用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
 "\n"


@@ -1284,26 +1349,26 @@ msgid ""
 msgstr "这个提示之前的错误消息才值得您注意。请更正它们，然后再次执行 [I]nstall"
 
 #: dselect/update:30
 msgstr "这个提示之前的错误消息才值得您注意。请更正它们，然后再次执行 [I]nstall"
 
 #: dselect/update:30

-msgid "Merging Available information"
+msgid "Merging available information"

 msgstr "正在合并现有信息"
 
 msgstr "正在合并现有信息"
 

-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117

 msgid "Failed to create pipes"
 msgstr "无法创建管道"
 
 msgid "Failed to create pipes"
 msgstr "无法创建管道"
 

-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143

 msgid "Failed to exec gzip "
 msgstr "无法执行 gzip"
 
 msgid "Failed to exec gzip "
 msgstr "无法执行 gzip"
 

-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206

 msgid "Corrupted archive"
 msgstr "包文件已被损坏"
 
 msgid "Corrupted archive"
 msgstr "包文件已被损坏"
 

-#: apt-inst/contrib/extracttar.cc:193
-msgid "Tar Checksum failed, archive corrupted"
+#: apt-inst/contrib/extracttar.cc:195
+msgid "Tar checksum failed, archive corrupted"

 msgstr "tar 的校验码不符，包文件已被损坏"
 
 msgstr "tar 的校验码不符，包文件已被损坏"
 

-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298

 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "未知的 TAR 数据头类型 %u，成员 %s"
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "未知的 TAR 数据头类型 %u，成员 %s"


@@ -1341,7 +1406,7 @@ msgid "Failed to allocate diversion"
 msgstr "无法分配转移项(diversion)"
 
 #: apt-inst/filelist.cc:468
 msgstr "无法分配转移项(diversion)"
 
 #: apt-inst/filelist.cc:468

-msgid "Internal Error in AddDiversion"
+msgid "Internal error in AddDiversion"

 msgstr "内部错误，出现在 AddDiversion"
 
 #: apt-inst/filelist.cc:481
 msgstr "内部错误，出现在 AddDiversion"
 
 #: apt-inst/filelist.cc:481


@@ -1361,10 +1426,10 @@ msgstr "重复的配置文件 %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
 #, c-format
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
 #, c-format

-msgid "Failed write file %s"
+msgid "Failed to write file %s"

 msgstr "无法写入文件 %s"
 
 msgstr "无法写入文件 %s"
 

-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104

 #, c-format
 msgid "Failed to close file %s"
 msgstr "无法关闭文件 %s"
 #, c-format
 msgid "Failed to close file %s"
 msgstr "无法关闭文件 %s"


@@ -1416,8 +1481,9 @@ msgstr "用来覆盖的软件包不属于 %s 的任何版本"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 

-#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38
+#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38

 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"
 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"


@@ -1448,9 +1514,9 @@ msgstr "info 和 temp 目录要求处于同一文件系统之下"
 
 #. Build the status cache
 #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
 
 #. Build the status cache
 #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643

-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
-msgid "Reading Package Lists"
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
+msgid "Reading package lists"

 msgstr "正在读取软件包列表"
 
 #: apt-inst/deb/dpkgdb.cc:180
 msgstr "正在读取软件包列表"
 
 #: apt-inst/deb/dpkgdb.cc:180


@@ -1460,11 +1526,11 @@ msgstr "无法切换工作目录到 admin 目录 %sinfo"
 
 #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
 #: apt-inst/deb/dpkgdb.cc:448
 
 #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
 #: apt-inst/deb/dpkgdb.cc:448

-msgid "Internal Error getting a Package Name"
+msgid "Internal error getting a package name"

 msgstr "在获取软件包名字时出现内部错误"
 
 msgstr "在获取软件包名字时出现内部错误"
 

-#: apt-inst/deb/dpkgdb.cc:205
-msgid "Reading File Listing"
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
+msgid "Reading file listing"

 msgstr "正在读取文件列表"
 
 #: apt-inst/deb/dpkgdb.cc:216
 msgstr "正在读取文件列表"
 
 #: apt-inst/deb/dpkgdb.cc:216


@@ -1483,7 +1549,7 @@ msgid "Failed reading the list file %sinfo/%s"
 msgstr "无法读取列表文件 %sinfo/%s"
 
 #: apt-inst/deb/dpkgdb.cc:266
 msgstr "无法读取列表文件 %sinfo/%s"
 
 #: apt-inst/deb/dpkgdb.cc:266

-msgid "Internal Error getting a Node"
+msgid "Internal error getting a node"

 msgstr "获得一个节点时出现内部错误"
 
 #: apt-inst/deb/dpkgdb.cc:309
 msgstr "获得一个节点时出现内部错误"
 
 #: apt-inst/deb/dpkgdb.cc:309


@@ -1502,20 +1568,16 @@ msgid "Invalid line in the diversion file: %s"
 msgstr "转移配置文件中有一行是无效的：%s"
 
 #: apt-inst/deb/dpkgdb.cc:362
 msgstr "转移配置文件中有一行是无效的：%s"
 
 #: apt-inst/deb/dpkgdb.cc:362

-msgid "Internal Error adding a diversion"
+msgid "Internal error adding a diversion"

 msgstr "添加 diversion 时出现内部错误"
 
 #: apt-inst/deb/dpkgdb.cc:383
 msgstr "添加 diversion 时出现内部错误"
 
 #: apt-inst/deb/dpkgdb.cc:383

-msgid "The pkg cache must be initialize first"
+msgid "The pkg cache must be initialized first"

 msgstr "必须首先初始化软件包缓存"
 
 msgstr "必须首先初始化软件包缓存"
 

-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading File List"
-msgstr "正在读取文件列表"
-

 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format

-msgid "Failed to find a Package: Header, offset %lu"
+msgid "Failed to find a Package: header, offset %lu"

 msgstr "无法找到某个软件包：包头，于偏移位置 %lu"
 
 #: apt-inst/deb/dpkgdb.cc:465
 msgstr "无法找到某个软件包：包头，于偏移位置 %lu"
 
 #: apt-inst/deb/dpkgdb.cc:465


@@ -1528,68 +1590,73 @@ msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu"
 msgid "Error parsing MD5. Offset %lu"
 msgstr "无法解析 MD5 码。文件内偏移量为 %lu"
 
 msgid "Error parsing MD5. Offset %lu"
 msgstr "无法解析 MD5 码。文件内偏移量为 %lu"
 

-#: apt-inst/deb/debfile.cc:55
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47

 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
 
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
 

-#: apt-inst/deb/debfile.cc:72
+#: apt-inst/deb/debfile.cc:52

 #, c-format
 #, c-format

-msgid "Internal Error, could not locate member %s"
-msgstr "内部错误，无法定位包内文件 %s"
+msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”或者“%s”"

 
 

-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112

 #, c-format
 msgid "Couldn't change to %s"
 msgstr "无法切换工作目录到 %s"
 
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "无法切换工作目录到 %s"
 

-#: apt-inst/deb/debfile.cc:125
-msgid "Internal Error, could not locate member"
+#: apt-inst/deb/debfile.cc:138
+msgid "Internal error, could not locate member"

 msgstr "内部错误，无法定位包内文件"
 
 msgstr "内部错误，无法定位包内文件"
 

-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171

 msgid "Failed to locate a valid control file"
 msgstr "无法在打包文件中找到有效的主控文件"
 
 msgid "Failed to locate a valid control file"
 msgstr "无法在打包文件中找到有效的主控文件"
 

-#: apt-inst/deb/debfile.cc:243
-msgid "Unparsible control file"
+#: apt-inst/deb/debfile.cc:256
+msgid "Unparsable control file"

 msgstr "不能解析的主控文件"
 
 msgstr "不能解析的主控文件"
 

-#: methods/cdrom.cc:113
+#: methods/cdrom.cc:114

 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "无法读取光盘数据库 %s"
 
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "无法读取光盘数据库 %s"
 

-#: methods/cdrom.cc:122
+#: methods/cdrom.cc:123

 msgid ""
 msgid ""

-"Please use apt-cdrom to make this CD recognized by APT. apt-get update "
-"cannot be used to add new CDs"
+"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 不能被用来"
 "加入新的光盘。"
 
 msgstr ""
 "请使用 apt-cdrom，通过它就可以让 APT 能识别该光盘。apt-get upgdate 不能被用来"
 "加入新的光盘。"
 

-#: methods/cdrom.cc:130 methods/cdrom.cc:168
-msgid "Wrong CD"
+#: methods/cdrom.cc:131
+msgid "Wrong CD-ROM"

 msgstr "错误的光盘"
 
 msgstr "错误的光盘"
 

-#: methods/cdrom.cc:163
+#: methods/cdrom.cc:164

 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."

-msgstr "无法卸载现在挂载于 %s 的 CD-ROM，可能它正在使用中。"
+msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。"
+
+#: methods/cdrom.cc:169
+msgid "Disk not found."
+msgstr "找不到光盘。"

 
 

-#: methods/cdrom.cc:177 methods/file.cc:77
+#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264

 msgid "File not found"
 msgid "File not found"

-msgstr "无法找到文件"
+msgstr "无法找到该文件"

 
 

-#: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
+#: methods/gzip.cc:142

 msgid "Failed to stat"
 msgstr "无法读取状态"
 
 msgid "Failed to stat"
 msgstr "无法读取状态"
 

-#: methods/copy.cc:79 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139

 msgid "Failed to set modification time"
 msgstr "无法设置文件的修改日期"
 
 msgid "Failed to set modification time"
 msgstr "无法设置文件的修改日期"
 

-#: methods/file.cc:42
+#: methods/file.cc:44

 msgid "Invalid URI, local URIS must not start with //"
 msgstr "无效的 URI，本地的 URI 不能以 // 开头"
 
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "无效的 URI，本地的 URI 不能以 // 开头"
 


@@ -1608,7 +1675,7 @@ msgstr "无法获知本地主机名"
 
 #: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format
 
 #: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format

-msgid "Server refused our connection and said: %s"
+msgid "The server refused the connection and said: %s"

 msgstr "服务器拒绝了我们的连接，它响应道：%s"
 
 #: methods/ftp.cc:210
 msgstr "服务器拒绝了我们的连接，它响应道：%s"
 
 #: methods/ftp.cc:210


@@ -1646,7 +1713,7 @@ msgstr "连接超时"
 msgid "Server closed the connection"
 msgstr "服务器关闭了连接"
 
 msgid "Server closed the connection"
 msgstr "服务器关闭了连接"
 

-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:452 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190

 msgid "Read error"
 msgstr "读错误"
 
 msgid "Read error"
 msgstr "读错误"
 


@@ -1658,9 +1725,9 @@ msgstr "回应超出了缓存区大小。"
 msgid "Protocol corruption"
 msgstr "协议有误"
 
 msgid "Protocol corruption"
 msgstr "协议有误"
 

-#: methods/ftp.cc:446 methods/rsh.cc:232
-msgid "Write Error"
-msgstr "写错误"
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+msgid "Write error"
+msgstr "写文件出错"

 
 #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
 msgid "Could not create a socket"
 
 #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
 msgid "Could not create a socket"


@@ -1712,7 +1779,7 @@ msgstr "数据套接字连接超时"
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 

-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "把文件加入散列表时出错"
 
 msgid "Problem hashing file"
 msgstr "把文件加入散列表时出错"
 


@@ -1735,7 +1802,7 @@ msgstr "数据传送出错，服务器响应道“%s”"
 msgid "Query"
 msgstr "查询"
 
 msgid "Query"
 msgstr "查询"
 

-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1109

 msgid "Unable to invoke "
 msgstr "无法调用 "
 
 msgid "Unable to invoke "
 msgstr "无法调用 "
 


@@ -1759,43 +1826,80 @@ msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "无法发起与 %s:%s (%s) 的连接"
 
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "无法发起与 %s:%s (%s) 的连接"
 

-#: methods/connect.cc:92
+#: methods/connect.cc:93

 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "无法连接上 %s:%s (%s)，连接超时"
 
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "无法连接上 %s:%s (%s)，连接超时"
 

-#: methods/connect.cc:104
+#: methods/connect.cc:108

 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "无法连接上 %s:%s (%s)。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "无法连接上 %s:%s (%s)。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going

-#: methods/connect.cc:132 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425

 #, c-format
 msgid "Connecting to %s"
 msgstr "正在连接 %s"
 
 #, c-format
 msgid "Connecting to %s"
 msgstr "正在连接 %s"
 

-#: methods/connect.cc:163
+#: methods/connect.cc:167

 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "无法解析域名“%s”"
 
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "无法解析域名“%s”"
 

-#: methods/connect.cc:167
+#: methods/connect.cc:173

 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "暂时不能解析域名“%s”"
 
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "暂时不能解析域名“%s”"
 

-#: methods/connect.cc:169
+#: methods/connect.cc:176

 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "解析“%s:%s”时，出现了某些故障 (%i)"
 
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "解析“%s:%s”时，出现了某些故障 (%i)"
 

-#: methods/connect.cc:216
+#: methods/connect.cc:223

 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "不能连接上 %s %s："
 
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "不能连接上 %s %s："
 

+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "无法解析域名“%s”"
+
+#: methods/gpgv.cc:99
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。"
+
+#: methods/gpgv.cc:198
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！"
+
+#: methods/gpgv.cc:203
+msgid "At least one invalid signature was encountered."
+msgstr "至少发现一个无效的签名。"
+
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr "用于验证签名(您安装了 gnupg 么？)"
+
+#: methods/gpgv.cc:212
+msgid "Unknown error executing gpgv"
+msgstr "运行 gpgv 时发生未知错误"
+
+#: methods/gpgv.cc:243
+msgid "The following signatures were invalid:\n"
+msgstr "下列签名无效：\n"
+
+#: methods/gpgv.cc:250
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr "由于没有公钥，下列签名无法进行验证：\n"
+

 #: methods/gzip.cc:57
 #, c-format
 msgid "Couldn't open pipe for %s"
 #: methods/gzip.cc:57
 #, c-format
 msgid "Couldn't open pipe for %s"


@@ -1806,76 +1910,76 @@ msgstr "无法为 %s 开启管道"
 msgid "Read error from %s process"
 msgstr "从 %s 进程读取数据出错"
 
 msgid "Read error from %s process"
 msgstr "从 %s 进程读取数据出错"
 

-#: methods/http.cc:344
+#: methods/http.cc:376

 msgid "Waiting for headers"
 msgstr "正在等待报头"
 
 msgid "Waiting for headers"
 msgstr "正在等待报头"
 

-#: methods/http.cc:490
+#: methods/http.cc:522

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
 

-#: methods/http.cc:498
+#: methods/http.cc:530

 msgid "Bad header line"
 msgstr "错误的报头条目"
 
 msgid "Bad header line"
 msgstr "错误的报头条目"
 

-#: methods/http.cc:517 methods/http.cc:524
-msgid "The http server sent an invalid reply header"
+#: methods/http.cc:549 methods/http.cc:556
+msgid "The HTTP server sent an invalid reply header"

 msgstr "该 http 服务器发送了一个无效的应答报头"
 
 msgstr "该 http 服务器发送了一个无效的应答报头"
 

-#: methods/http.cc:553
-msgid "The http server sent an invalid Content-Length header"
+#: methods/http.cc:585
+msgid "The HTTP server sent an invalid Content-Length header"

 msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
 
 msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
 

-#: methods/http.cc:568
-msgid "The http server sent an invalid Content-Range header"
+#: methods/http.cc:600
+msgid "The HTTP server sent an invalid Content-Range header"

 msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
 
 msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
 

-#: methods/http.cc:570
-msgid "This http server has broken range support"
+#: methods/http.cc:602
+msgid "This HTTP server has broken range support"

 msgstr "该 http 服务器的 range 支持不正常"
 
 msgstr "该 http 服务器的 range 支持不正常"
 

-#: methods/http.cc:594
+#: methods/http.cc:626

 msgid "Unknown date format"
 msgstr "无法识别的日期格式"
 
 msgid "Unknown date format"
 msgstr "无法识别的日期格式"
 

-#: methods/http.cc:737
+#: methods/http.cc:773

 msgid "Select failed"
 msgstr "select 调用出错"
 
 msgid "Select failed"
 msgstr "select 调用出错"
 

-#: methods/http.cc:742
+#: methods/http.cc:778

 msgid "Connection timed out"
 msgstr "连接服务器超时"
 
 msgid "Connection timed out"
 msgstr "连接服务器超时"
 

-#: methods/http.cc:765
+#: methods/http.cc:801

 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 
 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 

-#: methods/http.cc:793
+#: methods/http.cc:832

 msgid "Error writing to file"
 msgstr "写文件时出错"
 
 msgid "Error writing to file"
 msgstr "写文件时出错"
 

-#: methods/http.cc:818
+#: methods/http.cc:860

 msgid "Error writing to the file"
 msgstr "写文件时出错"
 
 msgid "Error writing to the file"
 msgstr "写文件时出错"
 

-#: methods/http.cc:832
-msgid "Error reading from server Remote end closed connection"
+#: methods/http.cc:874
+msgid "Error reading from server. Remote end closed connection"

 msgstr "从服务器读取数据时出错，对方关闭了连接"
 
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 

-#: methods/http.cc:834
+#: methods/http.cc:876

 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 
 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 

-#: methods/http.cc:1065
-msgid "Bad header Data"
+#: methods/http.cc:1107
+msgid "Bad header data"

 msgstr "错误的报头数据"
 
 msgstr "错误的报头数据"
 

-#: methods/http.cc:1082
+#: methods/http.cc:1124

 msgid "Connection failed"
 msgstr "连接失败"
 
 msgid "Connection failed"
 msgstr "连接失败"
 

-#: methods/http.cc:1173
+#: methods/http.cc:1215

 msgid "Internal error"
 msgstr "内部错误"
 
 msgid "Internal error"
 msgstr "内部错误"
 


@@ -1888,62 +1992,62 @@ msgstr "无法 mmap 一个空文件"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 

-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938

 #, c-format
 msgid "Selection %s not found"
 msgstr "没有发现您的所选 %s"
 
 #, c-format
 msgid "Selection %s not found"
 msgstr "没有发现您的所选 %s"
 

-#: apt-pkg/contrib/configuration.cc:395
+#: apt-pkg/contrib/configuration.cc:436

 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "无法识别的类型缩写：“%c”"
 
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "无法识别的类型缩写：“%c”"
 

-#: apt-pkg/contrib/configuration.cc:453
+#: apt-pkg/contrib/configuration.cc:494

 #, c-format
 msgid "Opening configuration file %s"
 msgstr "正在打开配置文件 %s"
 
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "正在打开配置文件 %s"
 

-#: apt-pkg/contrib/configuration.cc:471
+#: apt-pkg/contrib/configuration.cc:512

 #, c-format
 msgid "Line %d too long (max %d)"
 msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。"
 
 #, c-format
 msgid "Line %d too long (max %d)"
 msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。"
 

-#: apt-pkg/contrib/configuration.cc:567
+#: apt-pkg/contrib/configuration.cc:608

 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "语法错误 %s:%u：配置小节没有以名字开头"
 
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "语法错误 %s:%u：配置小节没有以名字开头"
 

-#: apt-pkg/contrib/configuration.cc:586
+#: apt-pkg/contrib/configuration.cc:627

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Malformed Tag"
+msgid "Syntax error %s:%u: Malformed tag"

 msgstr "语法错误 %s:%u：标签格式有误"
 
 msgstr "语法错误 %s:%u：标签格式有误"
 

-#: apt-pkg/contrib/configuration.cc:603
+#: apt-pkg/contrib/configuration.cc:644

 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据"
 
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据"
 

-#: apt-pkg/contrib/configuration.cc:643
+#: apt-pkg/contrib/configuration.cc:684

 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
 
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
 

-#: apt-pkg/contrib/configuration.cc:650
+#: apt-pkg/contrib/configuration.cc:691

 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
 
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
 

-#: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659
+#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700

 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "语法错误 %s:%u: Included from here"
 
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "语法错误 %s:%u: Included from here"
 

-#: apt-pkg/contrib/configuration.cc:663
+#: apt-pkg/contrib/configuration.cc:704

 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "语法错误 %s:%u: 不支持的指令“%s”"
 
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "语法错误 %s:%u: 不支持的指令“%s”"
 

-#: apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:738

 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"


@@ -2009,7 +2113,7 @@ msgstr "无效的操作 %s"
 msgid "Unable to stat the mount point %s"
 msgstr "无法读取文件系统挂载点 %s 的状态"
 
 msgid "Unable to stat the mount point %s"
 msgstr "无法读取文件系统挂载点 %s 的状态"
 

-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44

 #, c-format
 msgid "Unable to change to %s"
 msgstr "无法切换工作目录到 %s"
 #, c-format
 msgid "Unable to change to %s"
 msgstr "无法切换工作目录到 %s"


@@ -2018,74 +2122,70 @@ msgstr "无法切换工作目录到 %s"
 msgid "Failed to stat the cdrom"
 msgstr "无法读取光盘的状态"
 
 msgid "Failed to stat the cdrom"
 msgstr "无法读取光盘的状态"
 

-#: apt-pkg/contrib/fileutl.cc:80
+#: apt-pkg/contrib/fileutl.cc:82

 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "由于文件系统为只读，因而无法使用文件锁%s"
 
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "由于文件系统为只读，因而无法使用文件锁%s"
 

-#: apt-pkg/contrib/fileutl.cc:85
+#: apt-pkg/contrib/fileutl.cc:87

 #, c-format
 msgid "Could not open lock file %s"
 msgstr "无法打开锁文件 %s"
 
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "无法打开锁文件 %s"
 

-#: apt-pkg/contrib/fileutl.cc:103
+#: apt-pkg/contrib/fileutl.cc:105

 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "无法在 nfs 文件系统上使用文件锁 %s"
 
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "无法在 nfs 文件系统上使用文件锁 %s"
 

-#: apt-pkg/contrib/fileutl.cc:107
+#: apt-pkg/contrib/fileutl.cc:109

 #, c-format
 msgid "Could not get lock %s"
 msgstr "无法获得锁 %s"
 
 #, c-format
 msgid "Could not get lock %s"
 msgstr "无法获得锁 %s"
 

-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:377

 #, c-format
 #, c-format

-msgid "Waited, for %s but it wasn't there"
+msgid "Waited for %s but it wasn't there"

 msgstr "等待子进程 %s 的退出，但是它并不存在"
 
 msgstr "等待子进程 %s 的退出，但是它并不存在"
 

-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:387

 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "子进程 %s 发生了段错误"
 
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "子进程 %s 发生了段错误"
 

-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:390

 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子进程 %s 返回了一个错误号 (%u)"
 
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子进程 %s 返回了一个错误号 (%u)"
 

-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:392

 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子进程 %s 异常退出了"
 
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子进程 %s 异常退出了"
 

-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:436

 #, c-format
 msgid "Could not open file %s"
 msgstr "无法打开文件 %s"
 
 #, c-format
 msgid "Could not open file %s"
 msgstr "无法打开文件 %s"
 

-#: apt-pkg/contrib/fileutl.cc:473
+#: apt-pkg/contrib/fileutl.cc:492

 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "读文件时出错，还剩 %lu 字节没有读出"
 
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "读文件时出错，还剩 %lu 字节没有读出"
 

-#: apt-pkg/contrib/fileutl.cc:491
-msgid "Write error"
-msgstr "写文件出错"
-
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:522

 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "写文件时出错，还剩 %lu 字节没有保存"
 
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "写文件时出错，还剩 %lu 字节没有保存"
 

-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:597

 msgid "Problem closing the file"
 msgstr "关闭文件时出错"
 
 msgid "Problem closing the file"
 msgstr "关闭文件时出错"
 

-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:603

 msgid "Problem unlinking the file"
 msgstr "用 unlink 删除文件时出错"
 
 msgid "Problem unlinking the file"
 msgstr "用 unlink 删除文件时出错"
 

-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:614

 msgid "Problem syncing the file"
 msgstr "同步文件时出错"
 
 msgid "Problem syncing the file"
 msgstr "同步文件时出错"
 


@@ -2103,7 +2203,7 @@ msgstr "软件包缓存区文件的版本不兼容"
 
 #: apt-pkg/pkgcache.cc:142
 #, c-format
 
 #: apt-pkg/pkgcache.cc:142
 #, c-format

-msgid "This APT does not support the Versioning System '%s'"
+msgid "This APT does not support the versioning system '%s'"

 msgstr "本程序目前不支持“%s”这个版本控制系统"
 
 #: apt-pkg/pkgcache.cc:147
 msgstr "本程序目前不支持“%s”这个版本控制系统"
 
 #: apt-pkg/pkgcache.cc:147


@@ -2159,89 +2259,77 @@ msgid "extra"
 msgstr "额外"
 
 #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
 msgstr "额外"
 
 #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89

-msgid "Building Dependency Tree"
+msgid "Building dependency tree"

 msgstr "正在分析软件包的依赖关系树"
 
 #: apt-pkg/depcache.cc:61
 msgstr "正在分析软件包的依赖关系树"
 
 #: apt-pkg/depcache.cc:61

-msgid "Candidate Versions"
+msgid "Candidate versions"

 msgstr "候选版本"
 
 #: apt-pkg/depcache.cc:90
 msgstr "候选版本"
 
 #: apt-pkg/depcache.cc:90

-msgid "Dependency Generation"
+msgid "Dependency generation"

 msgstr "生成依赖关系"
 
 msgstr "生成依赖关系"
 

-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:72

 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "无法解析软件包文件 %s (1)"
 
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "无法解析软件包文件 %s (1)"
 

-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:102

 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "无法解析软件包文件 %s (2)"
 
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "无法解析软件包文件 %s (2)"
 

-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:94

 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)"
 

-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:96

 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist)"
 

-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:99

 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)"
 

-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:105

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (Absolute dist)"
+msgid "Malformed line %lu in source list %s (absolute dist)"

 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)"
 
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)"
 

-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:112

 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)"
 

-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Vendor 块 %s 是无效的"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:203

 #, c-format
 msgid "Opening %s"
 msgstr "正在打开 %s"
 
 #, c-format
 msgid "Opening %s"
 msgstr "正在打开 %s"
 

-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426

 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。"
 
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。"
 

-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:240

 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
 
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
 

-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:244

 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
 
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
 

-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255

 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)"
 
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)"
 

-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr ""
-"在安装源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%1"
-"$s”"
-

 #: apt-pkg/packagemanager.cc:402
 #, c-format
 msgid ""
 #: apt-pkg/packagemanager.cc:402
 #, c-format
 msgid ""


@@ -2258,13 +2346,13 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr "不支持索引文件类型“%s”"
 
 msgid "Index file type '%s' is not supported"
 msgstr "不支持索引文件类型“%s”"
 

-#: apt-pkg/algorithms.cc:238
+#: apt-pkg/algorithms.cc:241

 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
 
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
 

-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059

 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."


@@ -2272,38 +2360,55 @@ msgstr ""
 "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
 "缘故。"
 
 "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
 "缘故。"
 

-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061

 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
 "系。"
 
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
 "系。"
 

-#: apt-pkg/acquire.cc:61
+#: apt-pkg/acquire.cc:62

 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "软件包列表的目录 %spartial 不见了。"
 
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "软件包列表的目录 %spartial 不见了。"
 

-#: apt-pkg/acquire.cc:65
+#: apt-pkg/acquire.cc:66

 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "找不到“%spartial”这个目录。"
 
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "找不到“%spartial”这个目录。"
 

-#: apt-pkg/acquire-worker.cc:112
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "正在下载第 %li 个文件(共 %li 个，尚需 %s)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "正在读取文件列表"
+
+#: apt-pkg/acquire-worker.cc:113

 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
 
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
 

-#: apt-pkg/acquire-worker.cc:161
+#: apt-pkg/acquire-worker.cc:162

 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 

-#: apt-pkg/init.cc:119
+#: apt-pkg/acquire-worker.cc:377
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
+
+#: apt-pkg/init.cc:120

 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "不支持“%s”打包系统"
 
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "不支持“%s”打包系统"
 

-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136

 msgid "Unable to determine a suitable packaging system type"
 msgstr "无法确定适合的打包系统类型"
 
 msgid "Unable to determine a suitable packaging system type"
 msgstr "无法确定适合的打包系统类型"
 


@@ -2312,9 +2417,9 @@ msgstr "无法确定适合的打包系统类型"
 msgid "Unable to stat %s."
 msgstr "无法读取 %s 的状态。"
 
 msgid "Unable to stat %s."
 msgstr "无法读取 %s 的状态。"
 

-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48

 msgid "You must put some 'source' URIs in your sources.list"
 msgid "You must put some 'source' URIs in your sources.list"

-msgstr "您必须在您的 sources.list 输入一些“软件包源”的 URL"
+msgstr "您必须在您的 sources.list 写入一些“软件包源”的 URI"

 
 #: apt-pkg/cachefile.cc:73
 msgid "The package lists or status file could not be parsed or opened."
 
 #: apt-pkg/cachefile.cc:73
 msgid "The package lists or status file could not be parsed or opened."


@@ -2343,37 +2448,37 @@ msgstr "软件包暂存区使用的是不兼容的版本控制系统"
 
 #: apt-pkg/pkgcachegen.cc:117
 #, c-format
 
 #: apt-pkg/pkgcachegen.cc:117
 #, c-format

-msgid "Error occured while processing %s (NewPackage)"
+msgid "Error occurred while processing %s (NewPackage)"

 msgstr "处理 %s (NewPackage)时出错"
 
 #: apt-pkg/pkgcachegen.cc:129
 #, c-format
 msgstr "处理 %s (NewPackage)时出错"
 
 #: apt-pkg/pkgcachegen.cc:129
 #, c-format

-msgid "Error occured while processing %s (UsePackage1)"
+msgid "Error occurred while processing %s (UsePackage1)"

 msgstr "处理 %s (UsePackage1)时出错"
 
 #: apt-pkg/pkgcachegen.cc:150
 #, c-format
 msgstr "处理 %s (UsePackage1)时出错"
 
 #: apt-pkg/pkgcachegen.cc:150
 #, c-format

-msgid "Error occured while processing %s (UsePackage2)"
+msgid "Error occurred while processing %s (UsePackage2)"

 msgstr "处理 %s (UsePackage2)时出错"
 
 #: apt-pkg/pkgcachegen.cc:154
 #, c-format
 msgstr "处理 %s (UsePackage2)时出错"
 
 #: apt-pkg/pkgcachegen.cc:154
 #, c-format

-msgid "Error occured while processing %s (NewFileVer1)"
+msgid "Error occurred while processing %s (NewFileVer1)"

 msgstr "处理 %s (NewFileVer1)时出错"
 
 #: apt-pkg/pkgcachegen.cc:184
 #, c-format
 msgstr "处理 %s (NewFileVer1)时出错"
 
 #: apt-pkg/pkgcachegen.cc:184
 #, c-format

-msgid "Error occured while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion1)"

 msgstr "处理 %s (NewVersion1)时出错"
 
 #: apt-pkg/pkgcachegen.cc:188
 #, c-format
 msgstr "处理 %s (NewVersion1)时出错"
 
 #: apt-pkg/pkgcachegen.cc:188
 #, c-format

-msgid "Error occured while processing %s (UsePackage3)"
+msgid "Error occurred while processing %s (UsePackage3)"

 msgstr "处理 %s (UsePackage3)时出错"
 
 #: apt-pkg/pkgcachegen.cc:192
 #, c-format
 msgstr "处理 %s (UsePackage3)时出错"
 
 #: apt-pkg/pkgcachegen.cc:192
 #, c-format

-msgid "Error occured while processing %s (NewVersion2)"
+msgid "Error occurred while processing %s (NewVersion2)"

 msgstr "处理 %s (NewVersion2)时出错"
 
 #: apt-pkg/pkgcachegen.cc:207
 msgstr "处理 %s (NewVersion2)时出错"
 
 #: apt-pkg/pkgcachegen.cc:207


@@ -2390,12 +2495,12 @@ msgstr "糟了，依赖关系的数量超出了本程序的处理能力。"
 
 #: apt-pkg/pkgcachegen.cc:241
 #, c-format
 
 #: apt-pkg/pkgcachegen.cc:241
 #, c-format

-msgid "Error occured while processing %s (FindPkg)"
+msgid "Error occurred while processing %s (FindPkg)"

 msgstr "处理 %s (FindPkg)时出错"
 
 #: apt-pkg/pkgcachegen.cc:254
 #, c-format
 msgstr "处理 %s (FindPkg)时出错"
 
 #: apt-pkg/pkgcachegen.cc:254
 #, c-format

-msgid "Error occured while processing %s (CollectFileProvides)"
+msgid "Error occurred while processing %s (CollectFileProvides)"

 msgstr "处理 %s (CollectFileProvides)时出错"
 
 #: apt-pkg/pkgcachegen.cc:260
 msgstr "处理 %s (CollectFileProvides)时出错"
 
 #: apt-pkg/pkgcachegen.cc:260


@@ -2412,16 +2517,24 @@ msgstr "无法获取源软件包列表 %s 的状态"
 msgid "Collecting File Provides"
 msgstr "正在收集文件所提供的软件包"
 
 msgid "Collecting File Provides"
 msgstr "正在收集文件所提供的软件包"
 

-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792

 msgid "IO Error saving source cache"
 msgstr "无法写入来源缓存文件"
 
 msgid "IO Error saving source cache"
 msgstr "无法写入来源缓存文件"
 

-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126

 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "无法重命名文件，%s (%s -> %s)。"
 
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "无法重命名文件，%s (%s -> %s)。"
 

-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+msgid "MD5Sum mismatch"
+msgstr "MD5 校验和不符"
+
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "以下 key ID 没有可用的公钥：\n"
+
+#: apt-pkg/acquire-item.cc:753

 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "


@@ -2430,7 +2543,7 @@ msgstr ""
 "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
 "包。(缘于架构缺失)"
 
 "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
 "包。(缘于架构缺失)"
 

-#: apt-pkg/acquire-item.cc:388
+#: apt-pkg/acquire-item.cc:812

 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "


@@ -2438,24 +2551,182 @@ msgid ""
 msgstr ""
 "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
 
 msgstr ""
 "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
 

-#: apt-pkg/acquire-item.cc:419
+#: apt-pkg/acquire-item.cc:848

 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."

-msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段"
+msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"

 
 

-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:935

 msgid "Size mismatch"
 msgstr "大小不符"
 
 msgid "Size mismatch"
 msgstr "大小不符"
 

-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "MD5 校验和不符"
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "软件提供者数据块内 %s 没有包含指纹信息"

 
 

-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "无法找到该文件"
+#: apt-pkg/cdrom.cc:507
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+"现把 %s 作为了 CD-ROM 的挂载点\n"
+"正在挂载 CD-ROM\n"
+
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+msgid "Identifying.. "
+msgstr "正在鉴别.. "
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Stored label: %s \n"
+msgstr "存档标签：%s \n"
+
+#: apt-pkg/cdrom.cc:561
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
+
+#: apt-pkg/cdrom.cc:579
+msgid "Unmounting CD-ROM\n"
+msgstr "正在卸载 CD-ROM 文件系统\n"
+
+#: apt-pkg/cdrom.cc:583
+msgid "Waiting for disc...\n"
+msgstr "等待插入盘片……\n"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:591
+msgid "Mounting CD-ROM...\n"
+msgstr "正在挂载 CD-ROM 文件系统……\n"
+
+#: apt-pkg/cdrom.cc:609
+msgid "Scanning disc for index files..\n"
+msgstr "正在光盘中查找索引文件..\n"
+
+#: apt-pkg/cdrom.cc:647
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr "找到了 %i 个软件包索引、%i 个源代码包索引，和 %i 个数字签名\n"
+
+#: apt-pkg/cdrom.cc:710
+msgid "That is not a valid name, try again.\n"
+msgstr "这不是一个有效的名字，请再次命名。\n"
+
+#: apt-pkg/cdrom.cc:726
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"这张光盘现在的名字是：\n"
+"“%s”\n"
+
+#: apt-pkg/cdrom.cc:730
+msgid "Copying package lists..."
+msgstr "正在复制软件包列表……"
+
+#: apt-pkg/cdrom.cc:754
+msgid "Writing new source list\n"
+msgstr "正在写入新的软件包源列表\n"
+
+#: apt-pkg/cdrom.cc:763
+msgid "Source list entries for this disc are:\n"
+msgstr "对应于该光盘的软件包源设置项是：\n"
+
+#: apt-pkg/cdrom.cc:803
+msgid "Unmounting CD-ROM..."
+msgstr "正在卸载 CD-ROM 文件系统……"
+
+#: apt-pkg/indexcopy.cc:261
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "已写入 %i 条记录。\n"
+
+#: apt-pkg/indexcopy.cc:263
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
+
+#: apt-pkg/indexcopy.cc:266
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "已写入 %i 条记录，并有 %i 个文件不吻合\n"
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n"
+
+#: apt-pkg/deb/dpkgpm.cc:358
+#, c-format
+msgid "Preparing %s"
+msgstr "正在准备 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:359
+#, c-format
+msgid "Unpacking %s"
+msgstr "正在解压缩 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:364
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "正在准备配置 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:365
+#, c-format
+msgid "Configuring %s"
+msgstr "正在配置 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:366
+#, c-format
+msgid "Installed %s"
+msgstr "已安装 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:371
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "正在准备 %s 的删除操作"
+
+#: apt-pkg/deb/dpkgpm.cc:372
+#, c-format
+msgid "Removing %s"
+msgstr "正在删除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:373
+#, c-format
+msgid "Removed %s"
+msgstr "已删除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:378
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "正在准备配置 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:379
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "无法删除 %s"

 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "连接被永久关闭"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "连接被永久关闭"

+
+#~ 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”"