* apt-pkg/deb/debversion.cc:

[apt.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 742c5cbe8ff019dfb5774fa53e10329d2163c4a7..59f51dd870f23789d01efb916451917f5c69ffdf 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,172 +3,176 @@
 # Deng Xiyue <manphiz-guest@users.alioth.debian.org>, 2007, 2008.
 # Tchaikov <tchaikov@sjtu.org>, 2005, 2007.
 # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.
 # Deng Xiyue <manphiz-guest@users.alioth.debian.org>, 2007, 2008.
 # Tchaikov <tchaikov@sjtu.org>, 2005, 2007.
 # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.

+# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.

 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
-"PO-Revision-Date: 2009-06-01 15:54+0800\n"
-"Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
-"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
+"Project-Id-Version: apt 0.8.0~pre1\n"
+"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+"POT-Creation-Date: 2012-10-15 09:49+0200\n"
+"PO-Revision-Date: 2010-08-26 14:42+0800\n"
+"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: \n"

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

+"Plural-Forms: nplurals=1; plural=0;\n"

 
 

-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:158

 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
 
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
 

-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
-#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021
-#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "未发现软件包 %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:286

 msgid "Total package names: "
 msgstr "软件包名称总数："
 
 msgid "Total package names: "
 msgstr "软件包名称总数："
 

-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:288
+msgid "Total package structures: "
+msgstr "全部软件包结构："
+
+#: cmdline/apt-cache.cc:328

 msgid "  Normal packages: "
 msgstr "  普通软件包："
 
 msgid "  Normal packages: "
 msgstr "  普通软件包："
 

-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:329

 msgid "  Pure virtual packages: "
 msgstr "  完全虚拟软件包："
 
 msgid "  Pure virtual packages: "
 msgstr "  完全虚拟软件包："
 

-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:330

 msgid "  Single virtual packages: "
 msgstr "  单虚拟软件包："
 
 msgid "  Single virtual packages: "
 msgstr "  单虚拟软件包："
 

-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:331

 msgid "  Mixed virtual packages: "
 msgstr "  混合虚拟软件包："
 
 msgid "  Mixed virtual packages: "
 msgstr "  混合虚拟软件包："
 

-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:332

 msgid "  Missing: "
 msgid "  Missing: "

-msgstr "  缺漏的："
+msgstr "  缺失："

 
 

-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:334

 msgid "Total distinct versions: "
 msgstr "按版本共计："
 
 msgid "Total distinct versions: "
 msgstr "按版本共计："
 

-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:336

 msgid "Total distinct descriptions: "
 msgstr "按不同的说明共计："
 
 msgid "Total distinct descriptions: "
 msgstr "按不同的说明共计："
 

-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:338

 msgid "Total dependencies: "
 msgstr "按依赖关系共计："
 
 msgid "Total dependencies: "
 msgstr "按依赖关系共计："
 

-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc:341

 msgid "Total ver/file relations: "
 msgstr "按版本/文件关系共计："
 
 msgid "Total ver/file relations: "
 msgstr "按版本/文件关系共计："
 

-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:343

 msgid "Total Desc/File relations: "
 msgstr "按说明/文件关系共计："
 
 msgid "Total Desc/File relations: "
 msgstr "按说明/文件关系共计："
 

-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:345

 msgid "Total Provides mappings: "
 msgstr "提供映射共计："
 
 msgid "Total Provides mappings: "
 msgstr "提供映射共计："
 

-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:357

 msgid "Total globbed strings: "
 msgstr "Glob 字串共计："
 
 msgid "Total globbed strings: "
 msgstr "Glob 字串共计："
 

-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:371

 msgid "Total dependency version space: "
 msgstr "依赖关系版本名所占空间共计："
 
 msgid "Total dependency version space: "
 msgstr "依赖关系版本名所占空间共计："
 

-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc:376

 msgid "Total slack space: "
 msgstr "Slack 空间共计："
 
 msgid "Total slack space: "
 msgstr "Slack 空间共计："
 

-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:384

 msgid "Total space accounted for: "
 msgstr "总占用空间："
 
 msgid "Total space accounted for: "
 msgstr "总占用空间："
 

-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147

 #, c-format
 msgid "Package file %s is out of sync."
 #, c-format
 msgid "Package file %s is out of sync."

-msgstr "软件包文件 %s 尚未同步(sync)。"
-
-#: cmdline/apt-cache.cc:1297
-msgid "You must give exactly one pattern"
-msgstr "您必须明确地给出一个表达式"
+msgstr "软件包文件 %s 尚未同步。"

 
 

-#: cmdline/apt-cache.cc:1451
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
+#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219

 msgid "No packages found"
 msgid "No packages found"

-msgstr "没æ\9c\89å\8f\91ç\8e°å\90»å\90\88的软件包"
+msgstr "没æ\9c\89å\8f\91ç\8e°å\8c¹é\85\8d的软件包"

 
 

-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1226
+msgid "You must give at least one search pattern"
+msgstr "您必须明确地给出至少一个表达式"
+
+#: cmdline/apt-cache.cc:1361
+msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
+msgstr ""
+
+#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "未发现软件包 %s"
+
+#: cmdline/apt-cache.cc:1486

 msgid "Package files:"
 msgstr "软件包文件："
 
 msgid "Package files:"
 msgstr "软件包文件："
 

-#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
+#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584

 msgid "Cache is out of sync, can't x-ref a package file"
 msgid "Cache is out of sync, can't x-ref a package file"

-msgstr "缓存尚未同步(sync)，无法交差引证(x-ref)一个软件包文件"
+msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件"

 
 #. Show any packages have explicit pins
 
 #. Show any packages have explicit pins

-#: cmdline/apt-cache.cc:1549
+#: cmdline/apt-cache.cc:1507

 msgid "Pinned packages:"
 msgid "Pinned packages:"

-msgstr "被锁定(pinned)的软件包："
+msgstr "被锁定的软件包："

 
 

-#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
+#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564

 msgid "(not found)"
 msgstr "(没有找到)"
 
 msgid "(not found)"
 msgstr "(没有找到)"
 

-#. Installed version
-#: cmdline/apt-cache.cc:1582
+#: cmdline/apt-cache.cc:1527

 msgid "  Installed: "
 msgstr "  已安装："
 
 msgid "  Installed: "
 msgstr "  已安装："
 

-#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
+#: cmdline/apt-cache.cc:1528
+msgid "  Candidate: "
+msgstr "  候选软件包："
+
+#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554

 msgid "(none)"
 msgstr "(无)"
 
 msgid "(none)"
 msgstr "(无)"
 

-#. Candidate Version
-#: cmdline/apt-cache.cc:1589
-msgid "  Candidate: "
-msgstr "  候选的软件包："
-
-#: cmdline/apt-cache.cc:1599
+#: cmdline/apt-cache.cc:1561

 msgid "  Package pin: "
 msgid "  Package pin: "

-msgstr "  软件包锁(Pin)："
+msgstr "  软件包锁："

 
 #. Show the priority tables
 
 #. Show the priority tables

-#: cmdline/apt-cache.cc:1608
+#: cmdline/apt-cache.cc:1570

 msgid "  Version table:"
 msgstr "  版本列表："
 
 msgid "  Version table:"
 msgstr "  版本列表："
 

-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid "       %4i %s\n"
-msgstr "       %4i %s\n"
-
-#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
+#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"

-msgstr "%s %s for %s 编译于 %s %s\n"
+msgstr "%s %s，用于 %s 构架，编译于 %s %s\n"

 
 

-#: cmdline/apt-cache.cc:1725
+#: cmdline/apt-cache.cc:1690
+#, fuzzy

 msgid ""
 "Usage: apt-cache [options] command\n"
 msgid ""
 "Usage: apt-cache [options] command\n"

-"       apt-cache [options] add file1 [file2 ...]\n"

 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
 "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
 "\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
 "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
 "\n"

-"apt-cache is a low-level tool used to manipulate APT's binary\n"
-"cache files, and query information from them\n"
+"apt-cache is a low-level tool used to query information\n"
+"from APT's binary cache files\n"

 "\n"
 "Commands:\n"
 "\n"
 "Commands:\n"

-"   add - Add a package file to the source cache\n"

 "   gencaches - Build both the package and source cache\n"
 "   showpkg - Show some general information for a single package\n"
 "   showsrc - Show source records\n"
 "   gencaches - Build both the package and source cache\n"
 "   showpkg - Show some general information for a single package\n"
 "   showsrc - Show source records\n"


@@ -196,25 +200,26 @@ msgid ""
 "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"

-"       apt-cache [选项] add 文件甲 [文件乙 ...]\n"
-"       apt-cache [选项] showpkg 软件包甲 [软件包乙 ...]\n"
-"       apt-cache [选项] showsrc 软件包甲 [软件包乙 ...]\n"
+"　　　 apt-cache [选项] add 文件1 [文件2 ...]\n"
+"　　　 apt-cache [选项] showpkg 软件包1 [软件包2 ...]\n"
+"　　　 apt-cache [选项] showsrc 软件包1 [软件包2 ...]\n"

 "\n"
 "apt-cache 是一个底层的工具，我们用它来操纵 APT 的二进制\n"
 "缓存文件，也用来在那些文件中查询相关信息\n"
 "\n"
 "命令：\n"
 "\n"
 "apt-cache 是一个底层的工具，我们用它来操纵 APT 的二进制\n"
 "缓存文件，也用来在那些文件中查询相关信息\n"
 "\n"
 "命令：\n"

-"   add - å¾\80源缓存加入一个软件包文件\n"
-"   gencaches - ä¸\80并ç\94\9fæ\88\90软件å\8c\85å\92\8cæº\90代ç \81å\8c\85ç\9a\84ç¼\93å­\98\n"
+"   add - å\90\91源缓存加入一个软件包文件\n"
+"   gencaches - å\90\8cæ\97¶ç\94\9fæ\88\90软件å\8c\85å\92\8cæº\90代ç \81å\8c\85ç\9a\84ç¼\93å­\98\n"

 "   showpkg - 显示某个软件包的全面信息\n"
 "   showsrc - 显示源文件的各项记录\n"
 "   showpkg - 显示某个软件包的全面信息\n"
 "   showsrc - 显示源文件的各项记录\n"

-"   stats - 显示一些基本的统计信息\n"
+"   stats - 显示基本的统计信息\n"

 "   dump - 简要显示整个缓存文件的内容\n"
 "   dumpavail - 把所有有效的包文件列表打印到标准输出\n"
 "   unmet - 显示所有未满足的依赖关系\n"
 "   search - 根据正则表达式搜索软件包列表\n"
 "   show - 以便于阅读的格式介绍该软件包\n"
 "   dump - 简要显示整个缓存文件的内容\n"
 "   dumpavail - 把所有有效的包文件列表打印到标准输出\n"
 "   unmet - 显示所有未满足的依赖关系\n"
 "   search - 根据正则表达式搜索软件包列表\n"
 "   show - 以便于阅读的格式介绍该软件包\n"

-"   depends - 原原本本地显示该软件包的依赖信息\n"
+"   showauto - 显示自动安装的软件包的列表\n"
+"   depends - 显示该软件包的依赖关系信息\n"

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


@@ -231,24 +236,28 @@ 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:77
-#, fuzzy
+#: cmdline/apt-cdrom.cc:79

 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"

-msgstr "请给这张光盘起个名字，比如说“Debian 2.1r1 Disk 1”"
+msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”"

 
 

-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94

 msgid "Please insert a Disc in the drive and press enter"
 msgid "Please insert a Disc in the drive and press enter"

-msgstr "请把光盘碟片插入驱动器再按回车键"
+msgstr "请把盘片插入驱动器再按回车键"
+
+#: cmdline/apt-cdrom.cc:129
+#, c-format
+msgid "Failed to mount '%s' to '%s'"
+msgstr "无法将 %s 挂载到 %s"

 
 

-#: cmdline/apt-cdrom.cc:114
+#: cmdline/apt-cdrom.cc:163

 msgid "Repeat this process for the rest of the CDs in your set."
 msgid "Repeat this process for the rest of the CDs in your set."

-msgstr "请对您的光盘套件中的其它光盘重复相同的操作。"
+msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"

 
 

-#: cmdline/apt-config.cc:41
+#: cmdline/apt-config.cc:46

 msgid "Arguments not in pairs"
 msgstr "参数没有成对"
 
 msgid "Arguments not in pairs"
 msgstr "参数没有成对"
 

-#: cmdline/apt-config.cc:76
+#: cmdline/apt-config.cc:87

 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"


@@ -265,7 +274,7 @@ msgid ""
 msgstr ""
 "用法：apt-config [选项] 命令\n"
 "\n"
 msgstr ""
 "用法：apt-config [选项] 命令\n"
 "\n"

-"apt-config 是一个用于读取 APT 配置文件的简单工具\n"
+"apt-config 是一个用于读取APT 配置文件的简单工具\n"

 "\n"
 "命令：\n"
 "   shell - Shell 模式\n"
 "\n"
 "命令：\n"
 "   shell - Shell 模式\n"


@@ -276,591 +285,330 @@ msgstr ""
 "  -c=? 读取指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如：-o dir::cache=/tmp\n"
 
 "  -c=? 读取指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如：-o dir::cache=/tmp\n"
 

-#: cmdline/apt-extracttemplates.cc:98
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "%s 不是一个有效的 DEB 软件包。"
+#: cmdline/apt-get.cc:135
+msgid "Y"
+msgstr "Y"

 
 

-#: cmdline/apt-extracttemplates.cc:232
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#: cmdline/apt-get.cc:140
+msgid "N"

 msgstr ""
 msgstr ""

-"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
-"\n"
-"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
-"信息的工具\n"
-"\n"
-"选项：\n"
-"  -h   本帮助文本\n"
-"  -t   设置 temp 目录\n"
-"  -c=? 读指定的配置文件\n"
-"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"

 
 

-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33

 #, c-format
 #, c-format

-msgid "Unable to write to %s"
-msgstr "无法写入 %s"
+msgid "Regex compilation error - %s"
+msgstr "编译正则表达式时出错 - %s"

 
 

-#: cmdline/apt-extracttemplates.cc:310
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?"
+#: cmdline/apt-get.cc:260
+msgid "The following packages have unmet dependencies:"
+msgstr "下列软件包有未满足的依赖关系："

 
 

-#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
-msgid "Package extension list is too long"
-msgstr "软件包的扩展列表超长"
+#: cmdline/apt-get.cc:350
+#, c-format
+msgid "but %s is installed"
+msgstr "但是 %s 已经安装"

 
 

-#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
-#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
-#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
+#: cmdline/apt-get.cc:352

 #, c-format
 #, c-format

-msgid "Error processing directory %s"
-msgstr "处理目录 %s 时出错"
+msgid "but %s is to be installed"
+msgstr "但是 %s 正要被安装"

 
 

-#: ftparchive/apt-ftparchive.cc:251
-msgid "Source extension list is too long"
-msgstr "源扩展列表超长"
+#: cmdline/apt-get.cc:359
+msgid "but it is not installable"
+msgstr "但无法安装它"

 
 

-#: ftparchive/apt-ftparchive.cc:368
-msgid "Error writing header to contents file"
-msgstr "将 header 写到 contents 文件时出错"
+#: cmdline/apt-get.cc:361
+msgid "but it is a virtual package"
+msgstr "但是它是虚拟软件包"

 
 

-#: ftparchive/apt-ftparchive.cc:398
-#, c-format
-msgid "Error processing contents %s"
-msgstr "处理 Contents %s 时出错"
+#: cmdline/apt-get.cc:364
+msgid "but it is not installed"
+msgstr "但是它还没有被安装"

 
 

-#: ftparchive/apt-ftparchive.cc:553
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"用法： apt-ftparchive [选项] 命令\n"
-"命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"
-"       sources 源代码包搜索路径 [overridefile [路径前缀]]\n"
-"       contents 搜索路径\n"
-"       release 搜索路径\n"
-"       generate 配置文件 [groups]\n"
-"       clean 配置文件\n"
-"\n"
-"apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n"
-"多种生成索引的方式，从全自动的索引生成到在功能上取代 dpkg-scanpackages \n"
-"和 dpkg-scansources，都能游刃有余\n"
-"\n"
-"apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
-"Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n"
-"还有软件包的所有控制字段的内容。该软件同时支持 override 文件，\n"
-"通过它可以强制指定软件包的优先级及其所属的软件类别。\n"
-"\n"
-"与上面类似，apt-ftparchive 也能由 .dsc 的文件树生成 Source 文件。\n"
-"可以通过使用 --source-override 选项来指定一个 override 文件\n"
-"\n"
-"使用“packages”和“source”命令时，必须在文件树的根部执行本程序。\n"
-"二进制包的搜索路径一定要是递归搜索的底层，而且 override 文件里\n"
-"应该注明 override 的标志。若指定了路径前缀，那么它会被加到文件名前面。\n"
-"下面有个来自 Debian 文档的例子：\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386 > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"选项:\n"
-"  -h    本帮助文档\n"
-"  --md5 使之生成 MD5 校验和\n"
-"  -s=?  源代码包 override 文件\n"
-"  -q    输出精简信息\n"
-"  -d=?  指定可选的缓存数据库\n"
-"  -d=?  使用另一个可选的缓存数据库\n"
-"  --no-delink 开启delink的调试模式\n"
-"  --contents  使之生成控制内容文件\n"
-"  -c=?  读取指定配置文件\n"
-"  -o=?  设置任意指定的配置选项"
+#: cmdline/apt-get.cc:364
+msgid "but it is not going to be installed"
+msgstr "但是它将不会被安装"

 
 

-#: ftparchive/apt-ftparchive.cc:759
-msgid "No selections matched"
-msgstr "没有任何选定项是匹配的"
+#: cmdline/apt-get.cc:369
+msgid " or"
+msgstr " 或"

 
 

-#: ftparchive/apt-ftparchive.cc:832
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "软件包文件组“%s”中缺少一些文件"
+#: cmdline/apt-get.cc:398
+msgid "The following NEW packages will be installed:"
+msgstr "下列【新】软件包将被安装："

 
 

-#: ftparchive/cachedb.cc:43
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "缓存数据库被损坏了，该数据库文件的文件名已改成 %s.old"
+#: cmdline/apt-get.cc:424
+msgid "The following packages will be REMOVED:"
+msgstr "下列软件包将被【卸载】："
+
+#: cmdline/apt-get.cc:446
+msgid "The following packages have been kept back:"
+msgstr "下列软件包的版本将保持不变："
+
+#: cmdline/apt-get.cc:467
+msgid "The following packages will be upgraded:"
+msgstr "下列软件包将被升级："
+
+#: cmdline/apt-get.cc:488
+msgid "The following packages will be DOWNGRADED:"
+msgstr "下列软件包将被【降级】："

 
 

-#: ftparchive/cachedb.cc:61
+#: cmdline/apt-get.cc:508
+msgid "The following held packages will be changed:"
+msgstr "下列被要求保持版本不变的软件包将被改变："
+
+#: cmdline/apt-get.cc:563

 #, c-format
 #, c-format

-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB 已过时，现试图进行升级 %s"
+msgid "%s (due to %s) "
+msgstr "%s (是由于 %s) "

 
 

-#: ftparchive/cachedb.cc:72
+#: cmdline/apt-get.cc:571

 msgid ""
 msgid ""

-"DB format is invalid. If you upgraded from a older version of apt, please "
-"remove and re-create the database."
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"

 msgstr ""
 msgstr ""

-"DB 格式是无效的。如果你是从一个老版本的 apt 升级而来，请删除数据库并重建它。"
+"【警告】：下列基础软件包将被卸载。\n"
+"请勿尝试，除非您确实知道您在做什么！"

 
 

-#: ftparchive/cachedb.cc:77
+#: cmdline/apt-get.cc:602

 #, c-format
 #, c-format

-msgid "Unable to open DB file %s: %s"
-msgstr "无法打开 DB 文件 %s：%s"
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"

 
 

-#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
-#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
+#: cmdline/apt-get.cc:606

 #, c-format
 #, c-format

-msgid "Failed to stat %s"
-msgstr "无法读取 %s 的状态"
+msgid "%lu reinstalled, "
+msgstr "重新安装了 %lu 个软件包，"

 
 

-#: ftparchive/cachedb.cc:238
-msgid "Archive has no control record"
-msgstr "存档没有包含控制字段"
+#: cmdline/apt-get.cc:608
+#, c-format
+msgid "%lu downgraded, "
+msgstr "降级了 %lu 个软件包，"

 
 

-#: ftparchive/cachedb.cc:444
-msgid "Unable to get a cursor"
-msgstr "无法获得游标(cursor)"
+#: cmdline/apt-get.cc:610
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"

 
 

-#: ftparchive/writer.cc:76
+#: cmdline/apt-get.cc:614

 #, c-format
 #, c-format

-msgid "W: Unable to read directory %s\n"
-msgstr "警告：无法读取目录 %s\n"
+msgid "%lu not fully installed or removed.\n"
+msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"

 
 

-#: ftparchive/writer.cc:81
+#: cmdline/apt-get.cc:635

 #, c-format
 #, c-format

-msgid "W: Unable to stat %s\n"
-msgstr "警告：无法对 %s 进行统计\n"
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "注意，为任务 %2$s 选中了 %1$s\n"

 
 

-#: ftparchive/writer.cc:132
-msgid "E: "
-msgstr "错误："
+#: cmdline/apt-get.cc:640
+#, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "注意，根据正则表达式 %2$s 选中了 %1$s\n"

 
 

-#: ftparchive/writer.cc:134
-msgid "W: "
-msgstr "警告："
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"

 
 

-#: ftparchive/writer.cc:141
-msgid "E: Errors apply to file "
-msgstr "错误：处理文件时出错 "
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [已安装]"
+
+#: cmdline/apt-get.cc:677
+msgid " [Not candidate version]"
+msgstr " [无候选版本]"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "请您明确地选择一个来进行安装。"

 
 

-#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
+#: cmdline/apt-get.cc:682

 #, c-format
 #, c-format

-msgid "Failed to resolve %s"
-msgstr "无法解析路径 %s"
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"现在没有可用的软件包 %s，但是它被其它的软件包引用了。\n"
+"这可能意味着这个缺失的软件包可能已被废弃，\n"
+"或者只能在其他发布源中找到\n"

 
 

-#: ftparchive/writer.cc:170
-msgid "Tree walking failed"
-msgstr "无法遍历目录树"
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "可是下列软件包取代了它："

 
 

-#: ftparchive/writer.cc:195
+#: cmdline/apt-get.cc:712

 #, c-format
 #, c-format

-msgid "Failed to open %s"
-msgstr "无法打开 %s"
+msgid "Package '%s' has no installation candidate"
+msgstr "软件包 %s 没有可供安装的候选者"

 
 

-#: ftparchive/writer.cc:254
+#: cmdline/apt-get.cc:725

 #, c-format
 #, c-format

-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr "类似 %s 的虚拟软件包可以卸载\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "软件包 %s 还未安装，因而不会被卸载\n"
+
+#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "软件包 %s 还未安装，因而不会被卸载\n"

 
 

-#: ftparchive/writer.cc:262
+#: cmdline/apt-get.cc:788

 #, c-format
 #, c-format

-msgid "Failed to readlink %s"
-msgstr "æ\97 æ³\95读å\8f\96符å\8f·é\93¾æ\8e¥ %s"
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "注æ\84\8fï¼\8cé\80\89å\8f\96 %s è\80\8cé\9d\9e %s\n"

 
 

-#: ftparchive/writer.cc:266
+#: cmdline/apt-get.cc:818

 #, c-format
 #, c-format

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

 
 

-#: ftparchive/writer.cc:273
+#: cmdline/apt-get.cc:822

 #, c-format
 #, c-format

-msgid "*** Failed to link %s to %s"
-msgstr "*** 无法将 %s 链接到 %s"
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n"

 
 

-#: ftparchive/writer.cc:283
+#: cmdline/apt-get.cc:834

 #, c-format
 #, c-format

-msgid " DeLink limit of %sB hit.\n"
-msgstr " 达到了 DeLink 的上限 %sB。\n"
-
-#: ftparchive/writer.cc:388
-msgid "Archive had no package field"
-msgstr "存档没有包含软件包(package)字段"
-
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s 中没有 override 项\n"
-
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s 的维护者 %s 并非 %s\n"
-
-#: ftparchive/writer.cc:637
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s 没有源代码的 override 项\n"
-
-#: ftparchive/writer.cc:641
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s 中没有二进制文件的 override 项\n"
-
-#: ftparchive/contents.cc:321
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "内部错误，无法定位包内文件 %s"
-
-#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 无法再分配内存"
-
-#: ftparchive/override.cc:34 ftparchive/override.cc:142
-#, c-format
-msgid "Unable to open %s"
-msgstr "无法打开 %s"
-
-#: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
-
-#: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
-
-#: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
-
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "无法读取 override 文件 %s"
-
-#: ftparchive/multicompress.cc:72
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "未知的压缩算法“%s”"
-
-#: ftparchive/multicompress.cc:102
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
-
-#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
-msgid "Failed to create IPC pipe to subprocess"
-msgstr "无法为子进程创建 IPC 管道"
-
-#: ftparchive/multicompress.cc:195
-msgid "Failed to create FILE*"
-msgstr "无法创建 FILE*"
-
-#: ftparchive/multicompress.cc:198
-msgid "Failed to fork"
-msgstr "无法 fork"
-
-#: ftparchive/multicompress.cc:212
-msgid "Compress child"
-msgstr "压缩子进程"
-
-#: ftparchive/multicompress.cc:235
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "内部错误，无法建立 %s"
-
-#: ftparchive/multicompress.cc:286
-msgid "Failed to create subprocess IPC"
-msgstr "无法建立子进程的 IPC 管道"
-
-#: ftparchive/multicompress.cc:321
-msgid "Failed to exec compressor "
-msgstr "无法执行压缩程序"
-
-#: ftparchive/multicompress.cc:360
-msgid "decompressor"
-msgstr "解压程序"
-
-#: ftparchive/multicompress.cc:403
-msgid "IO to subprocess/file failed"
-msgstr "无法对子进程或文件进行读写"
-
-#: ftparchive/multicompress.cc:455
-msgid "Failed to read while computing MD5"
-msgstr "在计算 MD5 校验和时，无法读取数据"
-
-#: ftparchive/multicompress.cc:472
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "在 unlink %s 时出错"
-
-#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "无法将 %s 重命名为 %s"
-
-#: cmdline/apt-get.cc:127
-msgid "Y"
-msgstr "Y"
-
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "编译正则表达式时出错 - %s"
-
-#: cmdline/apt-get.cc:244
-msgid "The following packages have unmet dependencies:"
-msgstr "下列的软件包有不能满足的依赖关系："
-
-#: cmdline/apt-get.cc:334
-#, c-format
-msgid "but %s is installed"
-msgstr "但是 %s 已经安装了"
-
-#: cmdline/apt-get.cc:336
-#, c-format
-msgid "but %s is to be installed"
-msgstr "但是 %s 正要被安装"
-
-#: cmdline/apt-get.cc:343
-msgid "but it is not installable"
-msgstr "但却无法安装它"
-
-#: cmdline/apt-get.cc:345
-msgid "but it is a virtual package"
-msgstr "但是它只是个虚拟软件包"
-
-#: cmdline/apt-get.cc:348
-msgid "but it is not installed"
-msgstr "但是它还没有被安装"
-
-#: cmdline/apt-get.cc:348
-msgid "but it is not going to be installed"
-msgstr "但是它将不会被安装"
-
-#: cmdline/apt-get.cc:353
-msgid " or"
-msgstr " 或"
-
-#: cmdline/apt-get.cc:382
-msgid "The following NEW packages will be installed:"
-msgstr "下列【新】软件包将被安装："
-
-#: cmdline/apt-get.cc:408
-msgid "The following packages will be REMOVED:"
-msgstr "下列软件包将被【卸载】："
-
-#: cmdline/apt-get.cc:430
-msgid "The following packages have been kept back:"
-msgstr "下列的软件包的版本将保持不变："
-
-#: cmdline/apt-get.cc:451
-msgid "The following packages will be upgraded:"
-msgstr "下列的软件包将被升级："
-
-#: cmdline/apt-get.cc:472
-msgid "The following packages will be DOWNGRADED:"
-msgstr "下列软件包将被【降级】："
-
-#: cmdline/apt-get.cc:492
-msgid "The following held packages will be changed:"
-msgstr "下列被要求保持版本不变的软件包将被改变："
-
-#: cmdline/apt-get.cc:545
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (是由于 %s) "
-
-#: cmdline/apt-get.cc:553
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"【警告】：下列的基础软件包将被卸载。\n"
-"请勿尝试，除非您确实知道您在做什么！"
-
-#: cmdline/apt-get.cc:584
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，"
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "不能重新安装 %s，因为无法下载它。\n"

 
 

-#: cmdline/apt-get.cc:588
+#: cmdline/apt-get.cc:839

 #, c-format
 #, c-format

-msgid "%lu reinstalled, "
-msgstr "共重新安装了 %lu 个软件包，"
+msgid "%s is already the newest version.\n"
+msgstr "%s 已经是最新的版本了。\n"

 
 

-#: cmdline/apt-get.cc:590
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68

 #, c-format
 #, c-format

-msgid "%lu downgraded, "
-msgstr "降级了 %lu 个软件包，"
+msgid "%s set to manually installed.\n"
+msgstr "%s 被设置为手动安装。\n"

 
 

-#: cmdline/apt-get.cc:592
+#: cmdline/apt-get.cc:884

 #, c-format
 #, c-format

-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n"
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"

 
 

-#: cmdline/apt-get.cc:596
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
+#: cmdline/apt-get.cc:889
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"

 
 

-#: cmdline/apt-get.cc:669
+#: cmdline/apt-get.cc:1025

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

-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:1028

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

-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:1031

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

-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:1034

 msgid "Unable to minimize the upgrade set"
 msgstr "无法最小化要升级的软件包集合"
 
 msgid "Unable to minimize the upgrade set"
 msgstr "无法最小化要升级的软件包集合"
 

-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:1036

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

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

 
 

-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:1043

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

-#: cmdline/apt-get.cc:712
+#: cmdline/apt-get.cc:1068

 msgid "WARNING: The following packages cannot be authenticated!"
 msgid "WARNING: The following packages cannot be authenticated!"

-msgstr "【警告】：下列的软件包不能通过验证！"
+msgstr "【警告】：下列软件包不能通过验证！"

 
 

-#: cmdline/apt-get.cc:716
+#: cmdline/apt-get.cc:1072

 msgid "Authentication warning overridden.\n"
 msgstr "忽略了认证警告。\n"
 
 msgid "Authentication warning overridden.\n"
 msgstr "忽略了认证警告。\n"
 

-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:1079

 msgid "Install these packages without verification [y/N]? "
 msgid "Install these packages without verification [y/N]? "

-msgstr "不经验证就安装这些软件包么？[y/N] "
+msgstr "不经验证就安装这些软件包吗？[y/N] "

 
 

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

 msgid "Some packages could not be authenticated"
 msgstr "有些软件包不能通过验证"
 
 msgid "Some packages could not be authenticated"
 msgstr "有些软件包不能通过验证"
 

-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251

 msgid "There are problems and -y was used without --force-yes"
 msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
 
 msgid "There are problems and -y was used without --force-yes"
 msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
 

-#: cmdline/apt-get.cc:775
+#: cmdline/apt-get.cc:1131

 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
 
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
 

-#: cmdline/apt-get.cc:784
+#: cmdline/apt-get.cc:1140

 msgid "Packages need to be removed but remove is disabled."
 msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
 
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
 

-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1151

 msgid "Internal error, Ordering didn't finish"
 msgstr "内部错误，Ordering 未能完成"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部错误，Ordering 未能完成"
 

-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
-msgid "Unable to lock the download directory"
-msgstr "无法对下载目录加锁"
-
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
-#: apt-pkg/cachefile.cc:65
-msgid "The list of sources could not be read."
-msgstr "无法读取安装源列表。"
-
-#: cmdline/apt-get.cc:836
+#: cmdline/apt-get.cc:1189

 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"

-msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧"
+msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧"

 
 

-#: cmdline/apt-get.cc:841
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1196

 #, 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:844
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1201

 #, 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:849
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1208

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

-#: cmdline/apt-get.cc:852
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1213

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

-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2592

 #, c-format
 msgid "Couldn't determine free space in %s"
 #, c-format
 msgid "Couldn't determine free space in %s"

-msgstr "无法获知您在 %s 上的空余空间"
+msgstr "无法获知您在 %s 上的可用空间"

 
 

-#: cmdline/apt-get.cc:880
+#: cmdline/apt-get.cc:1241

 #, c-format
 msgid "You don't have enough free space in %s."
 #, c-format
 msgid "You don't have enough free space in %s."

-msgstr "æ\82¨å\9c¨ %s 中没æ\9c\89足å¤\9fç\9a\84空ä½\99空间。"
+msgstr "æ\82¨å\9c¨ %s ä¸\8a没æ\9c\89足å¤\9fç\9a\84å\8f¯ç\94¨空间。"

 
 

-#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277

 msgid "Trivial Only specified but this is not a trivial operation."
 msgid "Trivial Only specified but this is not a trivial operation."

-msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。"
+msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。"

 
 

-#: cmdline/apt-get.cc:898
+#: cmdline/apt-get.cc:1259

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

-msgstr "Yes, do as I say!"
+msgstr "是，按我说的做！"

 
 

-#: cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:1261

 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"


@@ -871,28 +619,28 @@ msgstr ""
 "若还想继续的话，就输入下面的短句“%s”\n"
 " ?] "
 
 "若还想继续的话，就输入下面的短句“%s”\n"
 " ?] "
 

-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
+#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286

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

-#: cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:1282

 msgid "Do you want to continue [Y/n]? "
 msgstr "您希望继续执行吗？[Y/n]"
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "您希望继续执行吗？[Y/n]"
 

-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548

 #, 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:1011
+#: cmdline/apt-get.cc:1372

 msgid "Some files failed to download"
 msgid "Some files failed to download"

-msgstr "有一些文件下载失败"
+msgstr "有一些文件无法下载"

 
 

-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666

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

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

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


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

-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1383

 msgid "--fix-missing and media swapping is not currently supported"
 msgid "--fix-missing and media swapping is not currently supported"

-msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)"
+msgstr "目前还不支持 --fix-missing 和介质交换"

 
 

-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1388

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

-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1389

 msgid "Aborting install."
 msgid "Aborting install."

-msgstr "放弃安装。"
-
-#: cmdline/apt-get.cc:1086
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "注意，选取 %s 而非 %s\n"
-
-#: cmdline/apt-get.cc:1097
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
-
-#: cmdline/apt-get.cc:1115
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "软件包 %s 还未安装，因而不会被卸载\n"
-
-#: cmdline/apt-get.cc:1126
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
-
-#: cmdline/apt-get.cc:1138
-msgid " [Installed]"
-msgstr " [已安装]"
-
-#: cmdline/apt-get.cc:1143
-msgid "You should explicitly select one to install."
-msgstr "请您明确地选择一个来进行安装。"
+msgstr "中止安装。"

 
 

-#: cmdline/apt-get.cc:1148
-#, c-format
+#: cmdline/apt-get.cc:1417

 msgid ""
 msgid ""

-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"现在没有可用的软件包 %s，但是它被其它的软件包引用了。\n"
-"这可能意味着这个缺失的软件包可能已被废弃，\n"
-"或者只能在其他发布源中找到\n"
-
-#: cmdline/apt-get.cc:1167
-msgid "However the following packages replace it:"
-msgstr "可是下列的软件包取代了它："
-
-#: cmdline/apt-get.cc:1170
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "软件包 %s 还没有可供安装的候选者"
-
-#: cmdline/apt-get.cc:1190
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "不能重新安装 %s，因为无法下载它。\n"
-
-#: cmdline/apt-get.cc:1198
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s 已经是最新的版本了。\n"
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失："

 
 

-#: cmdline/apt-get.cc:1227
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "未找到“%2$s”的“%1$s”发布版本"
+#: cmdline/apt-get.cc:1421
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "注意：这是自动被 dpkg 有意完成的。"

 
 

-#: cmdline/apt-get.cc:1229
+#: cmdline/apt-get.cc:1559

 #, c-format
 #, c-format

-msgid "Version '%s' for '%s' was not found"
-msgstr "未找到“%2$s”的“%1$s”版本"
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s"

 
 

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

 #, c-format
 #, c-format

-msgid "Selected version %s (%s) for %s\n"
-msgstr "选定了版本为 %s (%s) 的 %s\n"
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "选择 %s 作为源代码包而非 %s\n"

 
 #. if (VerTag.empty() == false && Last == 0)
 
 #. if (VerTag.empty() == false && Last == 0)

-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1629

 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"

-msgstr ""
-
-#: cmdline/apt-get.cc:1307
-#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1332
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "无法获取源软件包列表 %s 的状态"
+msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"

 
 

-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1645

 msgid "The update command takes no arguments"
 msgid "The update command takes no arguments"

-msgstr " update 命令是不需任何参数的"
+msgstr " update 命令不需要参数"

 
 

-#: cmdline/apt-get.cc:1396
-msgid "Unable to lock the list directory"
-msgstr "无法对状态列表目录加锁"
-
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1711

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "我们不应该进行删除，无法启动自动删除器"
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "我们不应该进行删除，无法启动自动删除器"
 

-#: cmdline/apt-get.cc:1501
-msgid ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr "下列软件包是自动安装的并且现在不再被使用了："
-
-#: cmdline/apt-get.cc:1503
-#, fuzzy, c-format
-msgid "%lu packages were automatically installed and are no longer required.\n"
-msgstr "下列软件包是自动安装的并且现在不再被使用了："
-
-#: cmdline/apt-get.cc:1504
-msgid "Use 'apt-get autoremove' to remove them."
-msgstr "使用'apt-get autoremove'来删除它们"
-
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1815

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."

-msgstr "ä¼¼ä¹\8eè\87ªå\8a¨å\88 é\99¤å\99¨æ¯\81æ\8e\89了一些软件，这不应该发生。请向 apt 提交错误报告。"
+msgstr "ä¼¼ä¹\8eè\87ªå\8a¨å\8d¸è½½å·¥å\85·æ\8d\9få\9d\8f了一些软件，这不应该发生。请向 apt 提交错误报告。"

 
 #.
 #. if (Packages == 1)
 
 #.
 #. if (Packages == 1)


@@ -1044,43 +713,44 @@ msgstr "似乎自动删除器毁掉了一些软件，这不应该发生。请向
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987

 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:1516
+#: cmdline/apt-get.cc:1822

 msgid "Internal Error, AutoRemover broke stuff"
 msgid "Internal Error, AutoRemover broke stuff"

-msgstr "内部错误，自动删除器坏事了"
-
-#: cmdline/apt-get.cc:1535
-msgid "Internal error, AllUpgrade broke stuff"
-msgstr "内部错误，全部升级坏事了"
+msgstr "内部错误，自动卸载工具坏事了"

 
 

-#: cmdline/apt-get.cc:1590
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "无法找到任务 %s"
+#: cmdline/apt-get.cc:1829
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "下列软件包是自动安装的并且现在不需要了："

 
 

-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1833

 #, c-format
 #, c-format

-msgid "Couldn't find package %s"
-msgstr "无法找到软件包 %s"
+msgid "%lu package was automatically installed and is no longer required.\n"
+msgid_plural ""
+"%lu packages were automatically installed and are no longer required.\n"
+msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"

 
 

-#: cmdline/apt-get.cc:1728
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
+#: cmdline/apt-get.cc:1835
+#, fuzzy
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "使用'apt-get autoremove'来卸载它们"

 
 

-#: cmdline/apt-get.cc:1759
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s 被设置为手动安装。\n"
+#: cmdline/apt-get.cc:1854
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr "内部错误，全部升级工具坏事了"

 
 

-#: cmdline/apt-get.cc:1772
-msgid "You might want to run `apt-get -f install' to correct these:"
+#: cmdline/apt-get.cc:1953
+msgid "You might want to run 'apt-get -f install' to correct these:"

 msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
 
 msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
 

-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1957

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


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

-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1972

 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 msgstr ""
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 msgstr ""

-"有一些软件包无法被安装。如果您用的是不稳定(unstable)发行版，这也许是\n"
+"有一些软件包无法被安装。如果您用的是 unstable 发行版，这也许是\n"

 "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
 "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"

-"包尚未被创建或是它们还在新到(incoming)目录中。"
+"包尚未被创建或是它们已被从新到(Incoming)目录移出。"

 
 

-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1993

 msgid "Broken packages"
 msgid "Broken packages"

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

 
 

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

 msgid "The following extra packages will be installed:"
 msgstr "将会安装下列额外的软件包："
 
 msgid "The following extra packages will be installed:"
 msgstr "将会安装下列额外的软件包："
 

-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:2109

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

-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:2110

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

-#: cmdline/apt-get.cc:1953
-msgid "Calculating upgrade... "
-msgstr "正在筹划升级... "
+#: cmdline/apt-get.cc:2152
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "无法找到软件包 %s"

 
 

-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
-msgid "Failed"
-msgstr "失败"
+#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
+#, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s 被设置为手动安装。\n"

 
 

-#: cmdline/apt-get.cc:1961
-msgid "Done"
+#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
+msgid ""
+"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
+"instead."
+msgstr ""
+
+#: cmdline/apt-get.cc:2183
+msgid "Calculating upgrade... "
+msgstr "正在对升级进行计算... "
+
+#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
+msgid "Failed"
+msgstr "失败"
+
+#: cmdline/apt-get.cc:2191
+msgid "Done"

 msgstr "完成"
 
 msgstr "完成"
 

-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266

 msgid "Internal error, problem resolver broke stuff"
 msgid "Internal error, problem resolver broke stuff"

-msgstr "内部错误，问题解决器坏事了"
+msgstr "内部错误，问题解决工具坏事了"
+
+#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330
+msgid "Unable to lock the download directory"
+msgstr "无法锁定下载目录"
+
+#: cmdline/apt-get.cc:2386
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:2391
+#, c-format
+msgid "Downloading %s %s"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2451

 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:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803

 #, 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:2215
+#: cmdline/apt-get.cc:2508
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n"
+"%s\n"
+
+#: cmdline/apt-get.cc:2513
+#, fuzzy, c-format
+msgid ""
+"Please use:\n"
+"bzr branch %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+"请使用：\n"
+"bzr get %s\n"
+"获得该软件包的最近更新(可能尚未正式发布)。\n"
+
+#: cmdline/apt-get.cc:2566

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "忽略已下载过的文件“%s”\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "忽略已下载过的文件“%s”\n"
 

-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2603

 #, c-format
 msgid "You don't have enough free space in %s"
 #, c-format
 msgid "You don't have enough free space in %s"

-msgstr "您在 %s 上没有足够的空余空间"
+msgstr "您在 %s 上没有足够的可用空间"

 
 

-#: cmdline/apt-get.cc:2256
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:2612

 #, 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:2259
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:2617

 #, 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:2265
+#: cmdline/apt-get.cc:2623

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下载源代码 %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下载源代码 %s\n"
 

-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2661

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

-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2692

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"

-msgstr "对äº\8eå·²ç»\8f被解å\8c\85å\88° %s ç\9b®å½\95ç\9a\84æº\90代ç \81å\8c\85å°±ä¸\8då\86\8d解å¼\80äº\86\n"
+msgstr "忽ç\95¥å·²ç»\8f被解å\8c\85å\88° %s ç\9b®å½\95ç\9a\84æº\90代ç \81å\8c\85\n"

 
 

-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2704

 #, 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:2337
+#: cmdline/apt-get.cc:2705

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 

-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2727

 #, 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:2373
+#: cmdline/apt-get.cc:2747

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

-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2766

 msgid "Must specify at least one package to check builddeps for"
 msgid "Must specify at least one package to check builddeps for"

-msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
+msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包"
+
+#: cmdline/apt-get.cc:2791
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 #, c-format
 msgid "Unable to get build-dependency information for %s"

-msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
+msgstr "无法获得 %s 的构建依赖关系信息"

 
 

-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2838

 #, 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:2489
+#: cmdline/apt-get.cc:3008
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+
+#: cmdline/apt-get.cc:3026

 #, 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:2542
+#: cmdline/apt-get.cc:3049

 #, c-format
 #, 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:3088
+#, fuzzy, c-format

 msgid ""
 msgid ""

-"%s dependency for %s cannot be satisfied because no available versions of "
-"package %s can satisfy version requirements"
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"

 msgstr ""
 msgstr ""

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

 
 

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

 
 

-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:3117

 #, 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:2621
+#: cmdline/apt-get.cc:3133

 #, 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:2626
+#: cmdline/apt-get.cc:3138

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

-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
+#, fuzzy, c-format
+msgid "Changelog for %s (%s)"
+msgstr "正在连接 %s (%s)"
+
+#: cmdline/apt-get.cc:3366

 msgid "Supported modules:"
 msgid "Supported modules:"

-msgstr "被支持模块："
+msgstr "支持的模块："

 
 

-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:3407

 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"


@@ -1271,6 +1021,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"

+"   changelog - Download and display the changelog for the given package\n"
+"   download - Download the binary package into the current directory\n"

 "\n"
 "Options:\n"
 "  -h  This help text.\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"


@@ -1291,8 +1043,8 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 "用法： apt-get [选项] 命令\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 "用法： apt-get [选项] 命令\n"

-"       apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
-"       apt-get [选项] source 软件包1 [软件包2 ...]\n"
+"　　　 apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
+"　　　 apt-get [选项] source 软件包1 [软件包2 ...]\n"

 "\n"
 "apt-get 提供了一个用于下载和安装软件包的简易命令行界面。\n"
 "最常用命令是 update 和 install。\n"
 "\n"
 "apt-get 提供了一个用于下载和安装软件包的简易命令行界面。\n"
 "最常用命令是 update 和 install。\n"


@@ -1300,17 +1052,19 @@ msgstr ""
 "命令：\n"
 "   update - 取回更新的软件包列表信息\n"
 "   upgrade - 进行一次升级\n"
 "命令：\n"
 "   update - 取回更新的软件包列表信息\n"
 "   upgrade - 进行一次升级\n"

-"   install - 安装新的软件包(注：包名是 libc6 而非 libc6.deb)\n"
+"   install - 安装新的软件包(注：软件包名称是 libc6 而非 libc6.deb)\n"

 "   remove - 卸载软件包\n"
 "   autoremove - 卸载所有自动安装且不再使用的软件包\n"
 "   purge - 卸载并清除软件包的配置\n"
 "   source - 下载源码包文件\n"
 "   remove - 卸载软件包\n"
 "   autoremove - 卸载所有自动安装且不再使用的软件包\n"
 "   purge - 卸载并清除软件包的配置\n"
 "   source - 下载源码包文件\n"

-"   build-dep - 为源码包配置所需的构建依赖关系\n"
+"   build-dep - 为源码包配置所需的编译依赖关系\n"

 "   dist-upgrade - 发布版升级，见 apt-get(8)\n"
 "   dselect-upgrade - 根据 dselect 的选择来进行升级\n"
 "   clean - 删除所有已下载的包文件\n"
 "   autoclean - 删除老版本的已下载的包文件\n"
 "   check - 核对以确认系统的依赖关系的完整性\n"
 "   dist-upgrade - 发布版升级，见 apt-get(8)\n"
 "   dselect-upgrade - 根据 dselect 的选择来进行升级\n"
 "   clean - 删除所有已下载的包文件\n"
 "   autoclean - 删除老版本的已下载的包文件\n"
 "   check - 核对以确认系统的依赖关系的完整性\n"

+"   markauto - 标记指定的软件包为自动安装\n"
+"   unmarkauto - 标记指定的软件包为手动安装\n"

 "\n"
 "选项：\n"
 "  -h  本帮助文档。\n"
 "\n"
 "选项：\n"
 "  -h  本帮助文档。\n"


@@ -1319,8 +1073,8 @@ msgstr ""
 "  -d  仅仅下载 - 【不】安装或解开包文件\n"
 "  -s  不作实际操作。只是依次模拟执行命令\n"
 "  -y  对所有询问都回答是(Yes)，同时不作任何提示\n"
 "  -d  仅仅下载 - 【不】安装或解开包文件\n"
 "  -s  不作实际操作。只是依次模拟执行命令\n"
 "  -y  对所有询问都回答是(Yes)，同时不作任何提示\n"

-"  -f  当出现破损的依赖关系时，程序将试图修正系统\n"
-"  -m  当有包文件无法找到时，程序仍试图继续执行\n"
+"  -f  当出现破损的依赖关系时，程序将尝试修正系统\n"
+"  -m  当有包文件无法找到时，程序仍尝试继续执行\n"

 "  -u  显示已升级的软件包列表\n"
 "  -b  在下载完源码包后，编译生成相应的软件包\n"
 "  -V  显示详尽的版本号\n"
 "  -u  显示已升级的软件包列表\n"
 "  -b  在下载完源码包后，编译生成相应的软件包\n"
 "  -V  显示详尽的版本号\n"


@@ -1328,43 +1082,46 @@ msgstr ""
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 "请查阅 apt-get(8)、sources.list(5) 和 apt.conf(5)的参考手册\n"
 "以获取更多信息和选项。\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 "请查阅 apt-get(8)、sources.list(5) 和 apt.conf(5)的参考手册\n"
 "以获取更多信息和选项。\n"

-"                       本 APT 有着超级牛力。\n"
+"                       本 APT 具有超级牛力。\n"

 
 

-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:3572

 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
 "      Keep also in mind that locking is deactivated,\n"
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
 "      Keep also in mind that locking is deactivated,\n"
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""

+"注意：这只是模拟！\n"
+"　　　apt-get 需要 root 特权进行实际的执行。\n"
+"　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！"

 
 

-#: cmdline/acqprogress.cc:55
+#: cmdline/acqprogress.cc:60

 msgid "Hit "
 msgstr "命中 "
 
 msgid "Hit "
 msgstr "命中 "
 

-#: cmdline/acqprogress.cc:79
+#: cmdline/acqprogress.cc:84

 msgid "Get:"
 msgstr "获取："
 
 msgid "Get:"
 msgstr "获取："
 

-#: cmdline/acqprogress.cc:110
+#: cmdline/acqprogress.cc:115

 msgid "Ign "
 msgstr "忽略 "
 
 msgid "Ign "
 msgstr "忽略 "
 

-#: cmdline/acqprogress.cc:114
+#: cmdline/acqprogress.cc:119

 msgid "Err "
 msgstr "错误 "
 
 msgid "Err "
 msgstr "错误 "
 

-#: cmdline/acqprogress.cc:135
+#: cmdline/acqprogress.cc:140

 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "下载 %sB，耗时 %s (%sB/s)\n"
 
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "下载 %sB，耗时 %s (%sB/s)\n"
 

-#: cmdline/acqprogress.cc:225
+#: cmdline/acqprogress.cc:230

 #, c-format
 msgid " [Working]"
 msgstr " [执行中]"
 
 #, c-format
 msgid " [Working]"
 msgstr " [执行中]"
 

-#: cmdline/acqprogress.cc:271
+#: cmdline/acqprogress.cc:286

 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"


@@ -1373,1134 +1130,1592 @@ msgid ""
 msgstr ""
 "更换介质：请把标有\n"
 "“%s”\n"
 msgstr ""
 "更换介质：请把标有\n"
 "“%s”\n"

-"ç\9a\84ç¢\9f片插入驱动器“%s”再按回车键\n"
+"ç\9a\84ç\9b\98片插入驱动器“%s”再按回车键\n"

 
 

-#: cmdline/apt-sortpkgs.cc:86
-msgid "Unknown package record!"
-msgstr "未知的软件包记录！"
+#: cmdline/apt-mark.cc:55
+#, fuzzy, c-format
+msgid "%s can not be marked as it is not installed.\n"
+msgstr "但是它还没有被安装"
+
+#: cmdline/apt-mark.cc:61
+#, fuzzy, c-format
+msgid "%s was already set to manually installed.\n"
+msgstr "%s 被设置为手动安装。\n"
+
+#: cmdline/apt-mark.cc:63
+#, fuzzy, c-format
+msgid "%s was already set to automatically installed.\n"
+msgstr "%s 被设置为手动安装。\n"
+
+#: cmdline/apt-mark.cc:228
+#, fuzzy, c-format
+msgid "%s was already set on hold.\n"
+msgstr "%s 已经是最新的版本了。\n"
+
+#: cmdline/apt-mark.cc:230
+#, fuzzy, c-format
+msgid "%s was already not hold.\n"
+msgstr "%s 已经是最新的版本了。\n"
+
+#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "等待子进程 %s 的退出，但是它并不存在"

 
 

-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
+#, fuzzy, c-format
+msgid "%s set on hold.\n"
+msgstr "%s 已设置为手动安装。\n"
+
+#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
+#, fuzzy, c-format
+msgid "Canceled hold on %s.\n"
+msgstr "无法打开 %s"
+
+#: cmdline/apt-mark.cc:332
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
+
+#: cmdline/apt-mark.cc:379

 msgid ""
 msgid ""

-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"

 "\n"
 "\n"

-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
+"apt-mark is a simple command line interface for marking packages\n"
+"as manually or automatically installed. It can also list marks.\n"
+"\n"
+"Commands:\n"
+"   auto - Mark the given packages as automatically installed\n"
+"   manual - Mark the given packages as manually installed\n"

 "\n"
 "Options:\n"
 "\n"
 "Options:\n"

-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -qq No output except for errors\n"
+"  -s  No-act. Just prints what would be done.\n"
+"  -f  read/write auto/manual marking in the given file\n"

 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

+"See the apt-mark(8) and apt.conf(5) manual pages for more information."

 msgstr ""
 msgstr ""

-"用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
-"\n"
-"apt-sortpkgs 是对软件包索引文件内容进行排序的简单工具。-s 选项\n"
-"是用来指出后面参数所示文件是哪种文件。\n"
-"\n"
-"选项：\n"
-"  -h   本帮助文档\n"
-"  -s   根据源文件排序\n"
-"  -c=? 读取指定配置文件\n"
-"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"

 
 

-#: dselect/install:32
-msgid "Bad default setting!"
-msgstr "错误的默认设置！"
+#: methods/cdrom.cc:203
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "无法读取盘片数据库 %s"

 
 

-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
-#: dselect/install:105 dselect/update:45
-msgid "Press enter to continue."
-msgstr "按回车键继续。"
+#: methods/cdrom.cc:212
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"请使用 apt-cdrom，通过它就可以让 APT 能识别该盘片。apt-get upgdate 不能被用来"
+"加入新的盘片。"

 
 

-#: dselect/install:91
-msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr "您想要删除之前下载的所有 .deb 文件吗？"
+#: methods/cdrom.cc:222
+msgid "Wrong CD-ROM"
+msgstr "错误的 CD-ROM"

 
 

-#: dselect/install:101
-#, fuzzy
-msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "在解包时发生了一些错误。我正准备配置"
+#: methods/cdrom.cc:249
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。"

 
 

-#: dselect/install:102
-#, fuzzy
-msgid "will be configured. This may result in duplicate errors"
-msgstr "已经安装的软件包。这个操作可能会导致出现重复的错误"
+#: methods/cdrom.cc:254
+msgid "Disk not found."
+msgstr "找不到盘片。"

 
 

-#: dselect/install:103
-msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "æ\88\96ä¸\80äº\9bç\94±äº\8eä¾\9dèµ\96å\85³ç³»ä¸\8dè\83½æ»¡è¶³æ\89\80产ç\94\9fç\9a\84é\94\99误ã\80\82è¿\99个é\97®é¢\98ä¸\8d大ï¼\8cå\8fªæ\9c\89"
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273
+msgid "File not found"
+msgstr "æ\97 æ³\95æ\89¾å\88°è¯¥æ\96\87件"

 
 

-#: dselect/install:104
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
-msgstr "这个提示之前的错误消息才值得您注意。请更正它们，然后再次执行 [I]nstall"
+#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
+#: methods/rred.cc:512 methods/rred.cc:521
+msgid "Failed to stat"
+msgstr "无法读取状态"

 
 

-#: dselect/update:30
-msgid "Merging available information"
-msgstr "æ­£å\9c¨å\90\88并ç\8e°æ\9c\89ä¿¡æ\81¯"
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+msgid "Failed to set modification time"
+msgstr "æ\97 æ³\95设置æ\96\87件ç\9a\84ä¿®æ\94¹æ\97¥æ\9c\9f"

 
 

-#: apt-inst/contrib/extracttar.cc:114
-msgid "Failed to create pipes"
-msgstr "æ\97 æ³\95å\88\9b建管é\81\93"
+#: methods/file.cc:47
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "æ\97 æ\95\88ç\9a\84 URIï¼\8cæ\9c¬å\9c°ç\9a\84 URI ä¸\8dè\83½ä»¥ // å¼\80头"

 
 

-#: apt-inst/contrib/extracttar.cc:141
-msgid "Failed to exec gzip "
-msgstr "无法执行 gzip"
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:173
+msgid "Logging in"
+msgstr "正在登录"

 
 

-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
-msgid "Corrupted archive"
-msgstr "包文件已被损坏"
+#: methods/ftp.cc:179
+msgid "Unable to determine the peer name"
+msgstr "无法获知对方主机名"

 
 

-#: apt-inst/contrib/extracttar.cc:193
-msgid "Tar checksum failed, archive corrupted"
-msgstr "tar 的校验码不符，包文件已被损坏"
+#: methods/ftp.cc:184
+msgid "Unable to determine the local name"
+msgstr "无法获知本地主机名"

 
 

-#: apt-inst/contrib/extracttar.cc:296
+#: methods/ftp.cc:215 methods/ftp.cc:243

 #, c-format
 #, c-format

-msgid "Unknown TAR header type %u, member %s"
-msgstr "æ\9cªç\9f¥ç\9a\84 TAR æ\95°æ\8d®å¤´ç±»å\9e\8b %uï¼\8cæ\88\90å\91\98 %s"
+msgid "The server refused the connection and said: %s"
+msgstr "æ\9c\8då\8a¡å\99¨æ\8b\92ç»\9däº\86æ\88\91们ç\9a\84è¿\9eæ\8e¥ï¼\8cå\93\8dåº\94ä¿¡æ\81¯ä¸ºï¼\9a%s"

 
 

-#: apt-inst/contrib/arfile.cc:70
-msgid "Invalid archive signature"
-msgstr "无效的打包文件特征号(signature)"
+#: methods/ftp.cc:221
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "USER 指令出错，服务器响应信息为：%s"

 
 

-#: apt-inst/contrib/arfile.cc:78
-msgid "Error reading archive member header"
-msgstr "读取打包文件中的成员文件头出错"
+#: methods/ftp.cc:228
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "PASS 指令出错，服务器响应信息为：%s"

 
 

-#: apt-inst/contrib/arfile.cc:90
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "打包文件中成员文件头无效"
+#: methods/ftp.cc:248
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。"

 
 

-#: apt-inst/contrib/arfile.cc:102
-msgid "Invalid archive member header"
-msgstr "打包文件中成员文件头无效"
+#: methods/ftp.cc:276
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s"

 
 

-#: apt-inst/contrib/arfile.cc:128
-msgid "Archive is too short"
-msgstr "存档太短了"
+#: methods/ftp.cc:302
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "TYPE 指令出错，服务器响应信息为：%s"

 
 

-#: apt-inst/contrib/arfile.cc:132
-msgid "Failed to read the archive headers"
-msgstr "无法读取打包文件的数据头"
+#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235
+msgid "Connection timeout"
+msgstr "连接超时"

 
 

-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "æ\8a\8a DropNode ç\94¨å\9c¨äº\86ä»\8då\9c¨é\93¾è¡¨ä¸­ç\9a\84è\8a\82ç\82¹ä¸\8a"
+#: methods/ftp.cc:346
+msgid "Server closed the connection"
+msgstr "æ\9c\8då\8a¡å\99¨å\85³é\97­äº\86è¿\9eæ\8e¥"

 
 

-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "无法分配散列表项！"
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
+#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+msgid "Read error"
+msgstr "读错误"

 
 

-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "无法分配转移项(diversion)"
+#: methods/ftp.cc:356 methods/rsh.cc:206
+msgid "A response overflowed the buffer."
+msgstr "回应超出了缓存区大小。"

 
 

-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "å\86\85é\83¨é\94\99误ï¼\8cå\87ºç\8e°å\9c¨ AddDiversion"
+#: methods/ftp.cc:373 methods/ftp.cc:385
+msgid "Protocol corruption"
+msgstr "å\8d\8fè®®æ\9c\89误"

 
 

-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "试图覆盖一个转移项(diversion)，%s -> %s 即 %s/%s"
+#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
+#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
+#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+msgid "Write error"
+msgstr "写出错"

 
 

-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "添加了两个转移项(diversion) %s-> %s"
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+msgid "Could not create a socket"
+msgstr "无法创建套接字"

 
 

-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "重复的配置文件 %s/%s"
+#: methods/ftp.cc:707
+msgid "Could not connect data socket, connection timed out"
+msgstr "无法连接上数据套接字，连接超时"

 
 

-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
-#, c-format
-msgid "Failed to write file %s"
-msgstr "无法写入文件 %s"
+#: methods/ftp.cc:713
+msgid "Could not connect passive socket."
+msgstr "无法连接被动模式的套接字。"

 
 

-#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
-#, c-format
-msgid "Failed to close file %s"
-msgstr "无法关闭文件 %s"
+#: methods/ftp.cc:730
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "getaddrinfo 无法得到监听套接字"

 
 

-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
-#, c-format
-msgid "The path %s is too long"
-msgstr "路径名 %s 过长"
+#: methods/ftp.cc:744
+msgid "Could not bind a socket"
+msgstr "无法绑定套接字"

 
 

-#: apt-inst/extract.cc:124
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr "%s 被解包了不只一次"
+#: methods/ftp.cc:748
+msgid "Could not listen on the socket"
+msgstr "无法在套接字上监听"

 
 

-#: apt-inst/extract.cc:134
-#, c-format
-msgid "The directory %s is diverted"
-msgstr "目录 %s 已被转移(diverted)"
+#: methods/ftp.cc:755
+msgid "Could not determine the socket's name"
+msgstr "无法确定套接字的名字"

 
 

-#: apt-inst/extract.cc:144
-#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "该软件包正尝试写入转移对象(diversion target) %s/%s"
+#: methods/ftp.cc:787
+msgid "Unable to send PORT command"
+msgstr "无法发出 PORT 指令"

 
 

-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
-msgid "The diversion path is too long"
-msgstr "该转移路径(diversion path)过长"
+#: methods/ftp.cc:797
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "无法识别的地址族 %u (AF_*)"

 
 

-#: apt-inst/extract.cc:240
+#: methods/ftp.cc:806

 #, c-format
 #, c-format

-msgid "The directory %s is being replaced by a non-directory"
-msgstr "目录 %s 要被一个非目录的文件替换"
+msgid "EPRT failed, server said: %s"
+msgstr "EPRT 指令出错，服务器响应信息为：%s"

 
 

-#: apt-inst/extract.cc:280
-msgid "Failed to locate node in its hash bucket"
-msgstr "æ\97 æ³\95å\9c¨å\85¶æ\95£å\88\97桶(hash bucket)中å\88\86é\85\8dè\8a\82ç\82¹"
+#: methods/ftp.cc:826
+msgid "Data socket connect timed out"
+msgstr "æ\95°æ\8d®å¥\97æ\8e¥å­\97è¿\9eæ\8e¥è¶\85æ\97¶"

 
 

-#: apt-inst/extract.cc:284
-msgid "The path is too long"
-msgstr "路径名过长"
+#: methods/ftp.cc:833
+msgid "Unable to accept connection"
+msgstr "无法接受连接"

 
 

-#: apt-inst/extract.cc:414
-#, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "用来覆盖的软件包不属于 %s 的任何版本"
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+msgid "Problem hashing file"
+msgstr "把文件加入哈希表时出错"

 
 

-#: apt-inst/extract.cc:431
+#: methods/ftp.cc:885

 #, c-format
 #, c-format

-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "æ\96\87件 %s/%s ä¼\9aè¦\86ç\9b\96å±\9eäº\8e软件å\8c\85 %s 中ç\9a\84å\90\8cå\90\8dæ\96\87件"
+msgid "Unable to fetch file, server said '%s'"
+msgstr "æ\97 æ³\95è\8e·å\8f\96æ\96\87件ï¼\8cæ\9c\8då\8a¡å\99¨å\93\8dåº\94ä¿¡æ\81¯ä¸ºâ\80\9c%sâ\80\9d"

 
 

-#. Only warn if there are no sources.list.d.
-#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
-#, c-format
-msgid "Unable to read %s"
-msgstr "无法读取 %s"
+#: methods/ftp.cc:900 methods/rsh.cc:330
+msgid "Data socket timed out"
+msgstr "数据套接字超时"

 
 

-#: apt-inst/extract.cc:491
+#: methods/ftp.cc:930

 #, c-format
 #, c-format

-msgid "Unable to stat %s"
-msgstr "æ\97 æ³\95读å\8f\96 %s ç\9a\84ç\8a¶æ\80\81"
+msgid "Data transfer failed, server said '%s'"
+msgstr "æ\95°æ\8d®ä¼ é\80\81å\87ºé\94\99ï¼\8cæ\9c\8då\8a¡å\99¨å\93\8dåº\94ä¿¡æ\81¯ä¸ºâ\80\9c%sâ\80\9d"

 
 

-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#. Get the files information
+#: methods/ftp.cc:1007
+msgid "Query"
+msgstr "查询"
+
+#: methods/ftp.cc:1119
+msgid "Unable to invoke "
+msgstr "无法调用 "
+
+#: methods/connect.cc:75

 #, c-format
 #, c-format

-msgid "Failed to remove %s"
-msgstr "æ\97 æ³\95å\88 é\99¤ %s"
+msgid "Connecting to %s (%s)"
+msgstr "æ­£å\9c¨è¿\9eæ\8e¥ %s (%s)"

 
 

-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: methods/connect.cc:86

 #, c-format
 #, c-format

-msgid "Unable to create %s"
-msgstr "无法创建 %s "
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"

 
 

-#: apt-inst/deb/dpkgdb.cc:114
+#: methods/connect.cc:93

 #, c-format
 #, c-format

-msgid "Failed to stat %sinfo"
-msgstr "无法读取 %sinfo 的状态"
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"

 
 

-#: apt-inst/deb/dpkgdb.cc:119
-msgid "The info and temp directories need to be on the same filesystem"
-msgstr "info 和 temp 目录要求处于同一文件系统之下"
+#: methods/connect.cc:99
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "无法发起与 %s:%s (%s) 的连接"

 
 

-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
-msgid "Reading package lists"
-msgstr "正在读取软件包列表"
+#: methods/connect.cc:107
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "无法连接上 %s:%s (%s)，连接超时"

 
 

-#: apt-inst/deb/dpkgdb.cc:176
+#: methods/connect.cc:125

 #, c-format
 #, c-format

-msgid "Failed to change to the admin dir %sinfo"
-msgstr "无法切换工作目录到 admin 目录 %sinfo"
+msgid "Could not connect to %s:%s (%s)."
+msgstr "无法连接上 %s:%s (%s)。"

 
 

-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
-msgid "Internal error getting a package name"
-msgstr "在获取软件包名字时出现内部错误"
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:153 methods/rsh.cc:433
+#, c-format
+msgid "Connecting to %s"
+msgstr "正在连接 %s"
+
+#: methods/connect.cc:172 methods/connect.cc:191
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "无法解析域名“%s”"
+
+#: methods/connect.cc:197
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "暂时不能解析域名“%s”"

 
 

-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
-msgid "Reading file listing"
-msgstr "正在读取文件列表"
+#: methods/connect.cc:200
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"

 
 

-#: apt-inst/deb/dpkgdb.cc:212
+#: methods/connect.cc:247

 #, c-format
 #, c-format

+msgid "Unable to connect to %s:%s:"
+msgstr "不能连接到 %s：%s："
+
+#: methods/gpgv.cc:180

 msgid ""
 msgid ""

-"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
-"then make it empty and immediately re-install the same version of the "
-"package!"
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！"
+
+#: methods/gpgv.cc:185
+msgid "At least one invalid signature was encountered."
+msgstr "至少发现一个无效的签名。"
+
+#: methods/gpgv.cc:189
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)"
+
+#: methods/gpgv.cc:194
+msgid "Unknown error executing gpgv"
+msgstr "运行 gpgv 时发生未知错误"
+
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
+msgid "The following signatures were invalid:\n"
+msgstr "下列签名无效：\n"
+
+#: methods/gpgv.cc:242
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr "由于没有公钥，无法验证下列签名：\n"
+
+#: methods/gzip.cc:65
+msgid "Empty files can't be valid archives"

 msgstr ""
 msgstr ""

-"无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，那么就清空该文件，再马上"
-"重新安装相同版本的这个软件包！"

 
 

-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
-#, c-format
-msgid "Failed reading the list file %sinfo/%s"
-msgstr "无法读取列表文件 %sinfo/%s"
+#: methods/http.cc:394
+msgid "Waiting for headers"
+msgstr "正在等待报头"

 
 

-#: apt-inst/deb/dpkgdb.cc:262
-msgid "Internal error getting a node"
-msgstr "获得一个节点时出现内部错误"
+#: methods/http.cc:544
+msgid "Bad header line"
+msgstr "错误的报头行"

 
 

-#: apt-inst/deb/dpkgdb.cc:305
-#, c-format
-msgid "Failed to open the diversions file %sdiversions"
-msgstr "无法打开转移配置文件(diversions file) %sdiversions"
+#: methods/http.cc:569 methods/http.cc:576
+msgid "The HTTP server sent an invalid reply header"
+msgstr "该 HTTP 服务器发送了一个无效的应答报头"

 
 

-#: apt-inst/deb/dpkgdb.cc:320
-msgid "The diversion file is corrupted"
-msgstr "该转移配置文件(diversion file)被损坏了"
+#: methods/http.cc:606
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"

 
 

-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
-#, c-format
-msgid "Invalid line in the diversion file: %s"
-msgstr "转移配置文件中有一行是无效的：%s"
+#: methods/http.cc:621
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
+
+#: methods/http.cc:623
+msgid "This HTTP server has broken range support"
+msgstr "该 HTTP 服务器的 range 支持不正常"
+
+#: methods/http.cc:647
+msgid "Unknown date format"
+msgstr "无法识别的日期格式"
+
+#: methods/http.cc:818
+msgid "Select failed"
+msgstr "select 调用出错"

 
 

-#: apt-inst/deb/dpkgdb.cc:358
-msgid "Internal error adding a diversion"
-msgstr "添加 diversion 时出现内部错误"
+#: methods/http.cc:823
+msgid "Connection timed out"
+msgstr "连接超时"
+
+#: methods/http.cc:846
+msgid "Error writing to output file"
+msgstr "写输出文件时出错"
+
+#: methods/http.cc:877
+msgid "Error writing to file"
+msgstr "写入文件出错"
+
+#: methods/http.cc:905
+msgid "Error writing to the file"
+msgstr "写入文件出错"
+
+#: methods/http.cc:919
+msgid "Error reading from server. Remote end closed connection"
+msgstr "从服务器读取数据时出错，对方关闭了连接"

 
 

-#: apt-inst/deb/dpkgdb.cc:379
-msgid "The pkg cache must be initialized first"
-msgstr "必须首先初始化软件包缓存"
+#: methods/http.cc:921
+msgid "Error reading from server"
+msgstr "从服务器读取数据出错"
+
+#: methods/http.cc:1194
+msgid "Bad header data"
+msgstr "错误的报头数据"
+
+#: methods/http.cc:1211 methods/http.cc:1266
+msgid "Connection failed"
+msgstr "连接失败"
+
+#: methods/http.cc:1358
+msgid "Internal error"
+msgstr "内部错误"

 
 

-#: apt-inst/deb/dpkgdb.cc:439
+#. Only warn if there are no sources.list.d.
+#. Only warn if there is no sources.list file.
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
+#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362

 #, c-format
 #, c-format

-msgid "Failed to find a Package: header, offset %lu"
-msgstr "无法找到某个软件包：包头，于偏移位置 %lu"
+msgid "Unable to read %s"
+msgstr "无法读取 %s"

 
 

-#: apt-inst/deb/dpkgdb.cc:461
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179
+#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491
+#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
+#: apt-pkg/clean.cc:123

 #, c-format
 #, c-format

-msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu"
+msgid "Unable to change to %s"
+msgstr "无法切换工作目录到 %s"

 
 

-#: apt-inst/deb/dpkgdb.cc:466
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:280

 #, c-format
 #, c-format

-msgid "Error parsing MD5. Offset %lu"
-msgstr "无法解析 MD5 码。文件内偏移量为 %lu"
+msgid "No mirror file '%s' found "
+msgstr "没有找到镜像文件 %s"
+
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:287
+#, fuzzy, c-format
+msgid "Can not read mirror file '%s'"
+msgstr "没有找到镜像文件 %s"

 
 

-#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
+#: methods/mirror.cc:442

 #, c-format
 #, c-format

-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
+msgid "[Mirror: %s]"
+msgstr "[镜像：%s]"

 
 

-#: apt-inst/deb/debfile.cc:50
+#: methods/rred.cc:491

 #, c-format
 #, c-format

-msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”，“%s”或者“%s”"
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"

 
 

-#: apt-inst/deb/debfile.cc:110
+#: methods/rred.cc:496

 #, c-format
 #, c-format

-msgid "Couldn't change to %s"
-msgstr "无法切换工作目录到 %s"
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"

 
 

-#: apt-inst/deb/debfile.cc:140
-msgid "Internal error, could not locate member"
-msgstr "内部错误，无法定位包内文件"
+#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "无法为子进程创建 IPC 管道"

 
 

-#: apt-inst/deb/debfile.cc:173
-msgid "Failed to locate a valid control file"
-msgstr "无法在打包文件中找到有效的主控文件"
+#: methods/rsh.cc:338
+msgid "Connection closed prematurely"
+msgstr "连接被永久关闭"

 
 

-#: apt-inst/deb/debfile.cc:258
-msgid "Unparsable control file"
-msgstr "不能解析的主控文件"
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr "错误的默认设置！"
+
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
+#: dselect/install:105 dselect/update:45
+msgid "Press enter to continue."
+msgstr "按回车键继续。"
+
+#: dselect/install:91
+msgid "Do you want to erase any previously downloaded .deb files?"
+msgstr "您想要删除之前下载的所有 .deb 文件吗？"
+
+#: dselect/install:101
+msgid "Some errors occurred while unpacking. Packages that were installed"
+msgstr "在解包时发生了一些错误。已经安装的软件包"
+
+#: dselect/install:102
+msgid "will be configured. This may result in duplicate errors"
+msgstr "将被配置。这个操作可能会导致出现重复的错误"
+
+#: dselect/install:103
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr "或一些由于依赖关系不能满足所产生的错误。这个问题不大，只有"
+
+#: dselect/install:104
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr "这个提示之前的错误消息才值得您注意。请更正它们，然后再次执行 [I]nstall"
+
+#: dselect/update:30
+msgid "Merging available information"
+msgstr "正在合并可用信息"

 
 

-#: methods/cdrom.cc:200
+#: cmdline/apt-extracttemplates.cc:102

 #, c-format
 #, c-format

-msgid "Unable to read the cdrom database %s"
-msgstr "无法读取光盘数据库 %s"
+msgid "%s not a valid DEB package."
+msgstr "%s 不是一个有效的 DEB 软件包。"

 
 

-#: methods/cdrom.cc:209
+#: cmdline/apt-extracttemplates.cc:236

 msgid ""
 msgid ""

-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 msgstr ""

-"请使用 apt-cdrom，通过它就可以让 APT 能识别该光盘。apt-get upgdate 不能被用来"
-"加入新的光盘。"
-
-#: methods/cdrom.cc:219
-msgid "Wrong CD-ROM"
-msgstr "错误的光盘"
+"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
+"\n"
+"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
+"信息的工具\n"
+"\n"
+"选项：\n"
+"  -h   本帮助文本\n"
+"  -t   设置 temp 目录\n"
+"  -c=? 读指定的配置文件\n"
+"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"

 
 

-#: methods/cdrom.cc:245
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335

 #, c-format
 #, c-format

-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "æ\97 æ³\95å\8d¸è½½ç\8e°å\9c¨æ\8c\82è½½äº\8e %s ç\9a\84 CD-ROMï¼\8cå®\83å\8f¯è\83½æ­£å\9c¨ä½¿ç\94¨ä¸­ã\80\82"
+msgid "Unable to write to %s"
+msgstr "æ\97 æ³\95å\86\99å\85¥ %s"

 
 

-#: methods/cdrom.cc:250
-msgid "Disk not found."
-msgstr "æ\89¾ä¸\8då\88°å\85\89ç\9b\98ã\80\82"
+#: cmdline/apt-extracttemplates.cc:313
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "æ\97 æ³\95è\8e·å¾\97 debconf ç\9a\84ç\89\88æ\9c¬ã\80\82æ\82¨å®\89è£\85äº\86 debconf å\90\97ï¼\9f"

 
 

-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
-msgid "File not found"
-msgstr "无法找到该文件"
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
+msgid "Package extension list is too long"
+msgstr "软件包的扩展列表太长"

 
 

-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
-msgid "Failed to stat"
-msgstr "无法读取状态"
+#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
+#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263
+#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
+#, c-format
+msgid "Error processing directory %s"
+msgstr "处理目录 %s 时出错"

 
 

-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
-msgid "Failed to set modification time"
-msgstr "æ\97 æ³\95设置æ\96\87件ç\9a\84ä¿®æ\94¹æ\97¥æ\9c\9f"
+#: ftparchive/apt-ftparchive.cc:261
+msgid "Source extension list is too long"
+msgstr "æº\90æ\89©å±\95å\88\97表太é\95¿"

 
 

-#: methods/file.cc:44
-msgid "Invalid URI, local URIS must not start with //"
-msgstr "无效的 URI，本地的 URI 不能以 // 开头"
+#: ftparchive/apt-ftparchive.cc:378
+msgid "Error writing header to contents file"
+msgstr "将头写入到目录文件时出错"

 
 

-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
-msgid "Logging in"
-msgstr "正在登录"
+#: ftparchive/apt-ftparchive.cc:408
+#, c-format
+msgid "Error processing contents %s"
+msgstr "处理目录 %s 时出错"

 
 

-#: methods/ftp.cc:173
-msgid "Unable to determine the peer name"
-msgstr "无法获知对方主机名"
+#: ftparchive/apt-ftparchive.cc:596
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"用法： apt-ftparchive [选项] 命令\n"
+"命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"
+"       sources 源代码包搜索路径 [overridefile [路径前缀]]\n"
+"       contents 搜索路径\n"
+"       release 搜索路径\n"
+"       generate 配置文件 [groups]\n"
+"       clean 配置文件\n"
+"\n"
+"apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n"
+"多种生成索引的方式，从全自动的索引生成到在功能上取代 dpkg-scanpackages \n"
+"和 dpkg-scansources，都能游刃有余\n"
+"\n"
+"apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
+"Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n"
+"还有软件包的所有控制字段的内容。该软件同时支持 override 文件，\n"
+"通过它可以强制指定软件包的优先级及其所属的软件类别。\n"
+"\n"
+"与上面类似，apt-ftparchive 也能由 .dsc 的文件树生成 Source 文件。\n"
+"可以通过使用 --source-override 选项来指定一个 override 文件\n"
+"\n"
+"使用“packages”和“source”命令时，必须在文件树的根部执行本程序。\n"
+"二进制包的搜索路径一定要是递归搜索的底层，而且 override 文件里\n"
+"应该注明 override 的标志。若指定了路径前缀，那么它会被加到文件名前面。\n"
+"下面有个来自 Debian 文档的例子：\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386 > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"选项:\n"
+"  -h    本帮助文档\n"
+"  --md5 使之生成 MD5 校验和\n"
+"  -s=?  源代码包 override 文件\n"
+"  -q    输出精简信息\n"
+"  -d=?  指定可选的缓存数据库\n"
+"  -d=?  使用另一个可选的缓存数据库\n"
+"  --no-delink 开启delink的调试模式\n"
+"  --contents  使之生成控制内容文件\n"
+"  -c=?  读取指定配置文件\n"
+"  -o=?  设置任意指定的配置选项"

 
 

-#: methods/ftp.cc:178
-msgid "Unable to determine the local name"
-msgstr "æ\97 æ³\95è\8e·ç\9f¥æ\9c¬å\9c°ä¸»æ\9cºå\90\8d"
+#: ftparchive/apt-ftparchive.cc:802
+msgid "No selections matched"
+msgstr "没æ\9c\89ä»»ä½\95é\80\89å®\9a项æ\98¯å\8c¹é\85\8dç\9a\84"

 
 

-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: ftparchive/apt-ftparchive.cc:880

 #, c-format
 #, c-format

-msgid "The server refused the connection and said: %s"
-msgstr "服务器拒绝了我们的连接，它响应道：%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "软件包文件组“%s”中缺少一些文件"

 
 

-#: methods/ftp.cc:215
+#: ftparchive/cachedb.cc:47

 #, c-format
 #, c-format

-msgid "USER failed, server said: %s"
-msgstr "USER 指令出错，服务器响应道：%s"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old"

 
 

-#: methods/ftp.cc:222
+#: ftparchive/cachedb.cc:65

 #, c-format
 #, c-format

-msgid "PASS failed, server said: %s"
-msgstr "PASS 指令出错，服务器响应道：%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "数据库已过期，现尝试进行升级 %s"

 
 

-#: methods/ftp.cc:242
+#: ftparchive/cachedb.cc:76

 msgid ""
 msgid ""

-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."

 msgstr ""
 msgstr ""

-"æ\82¨æ\8c\87å®\9aäº\86代ç\90\86æ\9c\8då\8a¡å\99¨ï¼\8cä½\86æ\98¯æ²¡æ\9c\89ç\99»é\99\86è\84\9aæ\9c¬ï¼\8cAcquire::ftp::ProxyLogin 设置为空。"
+"æ\95°æ\8d®åº\93æ ¼å¼\8fæ\97 æ\95\88ã\80\82å¦\82æ\9e\9cæ\82¨æ\98¯ä»\8eä¸\80个è\80\81ç\89\88æ\9c¬ç\9a\84 apt å\8d\87级è\80\8cæ\9d¥ï¼\8c请å\88 é\99¤æ\95°æ\8d®åº\93并é\87\8d建å®\83。"

 
 

-#: methods/ftp.cc:270
+#: ftparchive/cachedb.cc:81

 #, c-format
 #, c-format

-msgid "Login script command '%s' failed, server said: %s"
-msgstr "登录脚本命令“%s”出错，服务器响应道：%s"
+msgid "Unable to open DB file %s: %s"
+msgstr "无法打开数据库文件 %s：%s"

 
 

-#: methods/ftp.cc:296
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210

 #, c-format
 #, c-format

-msgid "TYPE failed, server said: %s"
-msgstr "TYPE 指令出错，服务器响应道：%s"
+msgid "Failed to stat %s"
+msgstr "无法获得 %s 的状态"

 
 

-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
-msgid "Connection timeout"
-msgstr "连接超时"
+#: ftparchive/cachedb.cc:249
+msgid "Archive has no control record"
+msgstr "归档文件没有包含控制字段"

 
 

-#: methods/ftp.cc:340
-msgid "Server closed the connection"
-msgstr "æ\9c\8då\8a¡å\99¨å\85³é\97­äº\86è¿\9eæ\8e¥"
+#: ftparchive/cachedb.cc:490
+msgid "Unable to get a cursor"
+msgstr "æ\97 æ³\95è\8e·å¾\97游æ \87"

 
 

-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
-msgid "Read error"
-msgstr "读错误"
+#: ftparchive/writer.cc:80
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "警告：无法读取目录 %s\n"

 
 

-#: methods/ftp.cc:350 methods/rsh.cc:197
-msgid "A response overflowed the buffer."
-msgstr "回应超出了缓存区大小。"
+#: ftparchive/writer.cc:85
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "警告：无法获得 %s 的状态\n"

 
 

-#: methods/ftp.cc:367 methods/ftp.cc:379
-msgid "Protocol corruption"
-msgstr "协议有误"
+#: ftparchive/writer.cc:141
+msgid "E: "
+msgstr "错误："

 
 

-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
-msgid "Write error"
-msgstr "写文件出错"
+#: ftparchive/writer.cc:143
+msgid "W: "
+msgstr "警告："

 
 

-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
-msgid "Could not create a socket"
-msgstr "不能创建套接字"
+#: ftparchive/writer.cc:150
+msgid "E: Errors apply to file "
+msgstr "错误：处理文件时出错 "

 
 

-#: methods/ftp.cc:703
-msgid "Could not connect data socket, connection timed out"
-msgstr "无法连接上数据套接字，连接超时"
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "无法解析 %s"

 
 

-#: methods/ftp.cc:709
-msgid "Could not connect passive socket."
-msgstr "无法连接被动模式的套接字。"
+#: ftparchive/writer.cc:181
+msgid "Tree walking failed"
+msgstr "无法遍历目录树"

 
 

-#: methods/ftp.cc:727
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo 无法得到侦听套接字"
+#: ftparchive/writer.cc:208
+#, c-format
+msgid "Failed to open %s"
+msgstr "无法打开 %s"

 
 

-#: methods/ftp.cc:741
-msgid "Could not bind a socket"
-msgstr "无法绑定套接字"
+#: ftparchive/writer.cc:267
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:275
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "无法读取符号链接 %s"
+
+#: ftparchive/writer.cc:279
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "无法使用 unlink 删除 %s"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** 无法将 %s 链接到 %s"
+
+#: ftparchive/writer.cc:296
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " 达到了 DeLink 的上限 %sB。\n"
+
+#: ftparchive/writer.cc:401
+msgid "Archive had no package field"
+msgstr "归档文件没有包含 package 字段"
+
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s 中没有 override 项\n"
+
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s 的维护者 %s 并非 %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s 没有源代码的 override 项\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s 中没有二进制文件的 override 项\n"
+
+#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - 分配内存失败"
+
+#: ftparchive/override.cc:35 ftparchive/override.cc:143
+#, c-format
+msgid "Unable to open %s"
+msgstr "无法打开 %s"

 
 

-#: methods/ftp.cc:745
-msgid "Could not listen on the socket"
-msgstr "无法在套接字上侦听"
+#: ftparchive/override.cc:61 ftparchive/override.cc:167
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "override 文件 %s 第 %lu 行的格式有误 #1"

 
 

-#: methods/ftp.cc:752
-msgid "Could not determine the socket's name"
-msgstr "无法确定套接字的名字"
+#: ftparchive/override.cc:75 ftparchive/override.cc:179
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "override 文件 %s 第 %lu 行的格式有误 #2"

 
 

-#: methods/ftp.cc:784
-msgid "Unable to send PORT command"
-msgstr "无法发出 PORT 指令"
+#: ftparchive/override.cc:89 ftparchive/override.cc:192
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "override 文件 %s 第 %lu 行的格式有误 #3"

 
 

-#: methods/ftp.cc:794
+#: ftparchive/override.cc:128 ftparchive/override.cc:202

 #, c-format
 #, c-format

-msgid "Unknown address family %u (AF_*)"
-msgstr "æ\97 æ³\95è¯\86å\88«ç\9a\84å\9c°å\9d\80æ\97\8f %u (AF_*)"
+msgid "Failed to read the override file %s"
+msgstr "æ\97 æ³\95读å\8f\96 override æ\96\87件 %s"

 
 

-#: methods/ftp.cc:803
+#: ftparchive/multicompress.cc:70

 #, c-format
 #, c-format

-msgid "EPRT failed, server said: %s"
-msgstr "EPRT 指令出错，服务器响应道：%s"
-
-#: methods/ftp.cc:823
-msgid "Data socket connect timed out"
-msgstr "数据套接字连接超时"
+msgid "Unknown compression algorithm '%s'"
+msgstr "未知的压缩算法“%s”"

 
 

-#: methods/ftp.cc:830
-msgid "Unable to accept connection"
-msgstr "无法接受连接"
+#: ftparchive/multicompress.cc:100
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"

 
 

-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
-msgid "Problem hashing file"
-msgstr "æ\8a\8aæ\96\87件å\8a å\85¥æ\95£å\88\97表æ\97¶å\87ºé\94\99"
+#: ftparchive/multicompress.cc:189
+msgid "Failed to create FILE*"
+msgstr "æ\97 æ³\95å\88\9b建 FILE*"

 
 

-#: methods/ftp.cc:882
-#, c-format
-msgid "Unable to fetch file, server said '%s'"
-msgstr "无法获取文件，服务器响应道“%s”"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to fork"
+msgstr "无法 fork"

 
 

-#: methods/ftp.cc:897 methods/rsh.cc:322
-msgid "Data socket timed out"
-msgstr "数据套接字超时"
+#: ftparchive/multicompress.cc:206
+msgid "Compress child"
+msgstr "压缩子进程"

 
 

-#: methods/ftp.cc:927
+#: ftparchive/multicompress.cc:229

 #, c-format
 #, c-format

-msgid "Data transfer failed, server said '%s'"
-msgstr "数据传送出错，服务器响应道“%s”"
+msgid "Internal error, failed to create %s"
+msgstr "内部错误，无法创建 %s"

 
 

-#. Get the files information
-#: methods/ftp.cc:1002
-msgid "Query"
-msgstr "查询"
+#: ftparchive/multicompress.cc:304
+msgid "IO to subprocess/file failed"
+msgstr "无法对子进程或文件进行读写"

 
 

-#: methods/ftp.cc:1114
-msgid "Unable to invoke "
-msgstr "无法调用 "
+#: ftparchive/multicompress.cc:342
+msgid "Failed to read while computing MD5"
+msgstr "在计算 MD5 校验和时无法读取数据"

 
 

-#: methods/connect.cc:70
+#: ftparchive/multicompress.cc:358

 #, c-format
 #, c-format

-msgid "Connecting to %s (%s)"
-msgstr "正在连接 %s (%s)"
+msgid "Problem unlinking %s"
+msgstr "在使用 unlink 删除 %s 时出错"

 
 

-#: methods/connect.cc:81
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188

 #, c-format
 #, c-format

-msgid "[IP: %s %s]"
-msgstr "[IP: %s %s]"
+msgid "Failed to rename %s to %s"
+msgstr "无法将 %s 重命名为 %s"

 
 

-#: methods/connect.cc:90
-#, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"
+#: cmdline/apt-internal-solver.cc:37
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
+"\n"
+"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
+"信息的工具\n"
+"\n"
+"选项：\n"
+"  -h   本帮助文本\n"
+"  -t   设置 temp 目录\n"
+"  -c=? 读指定的配置文件\n"
+"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"

 
 

-#: methods/connect.cc:96
-#, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "无法发起与 %s:%s (%s) 的连接"
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "未知的软件包记录！"

 
 

-#: methods/connect.cc:104
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "无法连接上 %s:%s (%s)，连接超时"
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
+"\n"
+"apt-sortpkgs 是对软件包索引文件内容进行排序的简单工具。-s 选项\n"
+"是用来指出后面参数所示文件是哪种文件。\n"
+"\n"
+"选项：\n"
+"  -h   本帮助文档\n"
+"  -s   根据源文件排序\n"
+"  -c=? 读取指定配置文件\n"
+"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"

 
 

-#: methods/connect.cc:119
-#, c-format
-msgid "Could not connect to %s:%s (%s)."
-msgstr "无法连接上 %s:%s (%s)。"
+#: apt-inst/contrib/extracttar.cc:117
+msgid "Failed to create pipes"
+msgstr "无法创建管道"

 
 

-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:147 methods/rsh.cc:425
-#, c-format
-msgid "Connecting to %s"
-msgstr "正在连接 %s"
+#: apt-inst/contrib/extracttar.cc:144
+msgid "Failed to exec gzip "
+msgstr "无法执行 gzip"

 
 

-#: methods/connect.cc:165 methods/connect.cc:184
-#, c-format
-msgid "Could not resolve '%s'"
-msgstr "无法解析域名“%s”"
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+msgid "Corrupted archive"
+msgstr "包文件已被损坏"

 
 

-#: methods/connect.cc:190
+#: apt-inst/contrib/extracttar.cc:196
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar 的校验和不符，文件已损坏"
+
+#: apt-inst/contrib/extracttar.cc:303

 #, c-format
 #, c-format

-msgid "Temporary failure resolving '%s'"
-msgstr "æ\9a\82æ\97¶ä¸\8dè\83½è§£æ\9e\90å\9f\9få\90\8dâ\80\9c%sâ\80\9d"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "æ\9cªç\9f¥ç\9a\84 TAR æ\95°æ\8d®å¤´ç±»å\9e\8b %uï¼\8cæ\88\90å\91\98 %s"

 
 

-#: methods/connect.cc:193
-#, fuzzy, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "解析“%s:%s”时，出现了某些故障 (%i)"
+#: apt-inst/contrib/arfile.cc:74
+msgid "Invalid archive signature"
+msgstr "无效的归档签名"

 
 

-#: methods/connect.cc:240
-#, fuzzy, c-format
-msgid "Unable to connect to %s:%s:"
-msgstr "不能连接上 %s %s："
+#: apt-inst/contrib/arfile.cc:82
+msgid "Error reading archive member header"
+msgstr "读取归档成员文件头出错"

 
 

-#: methods/gpgv.cc:71
+#: apt-inst/contrib/arfile.cc:94

 #, c-format
 #, c-format

-msgid "Couldn't access keyring: '%s'"
-msgstr "无法访问密匙：“%s”"
+msgid "Invalid archive member header %s"
+msgstr "归档文件中成员文件头 %s 无效"

 
 

-#: methods/gpgv.cc:107
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。"
+#: apt-inst/contrib/arfile.cc:106
+msgid "Invalid archive member header"
+msgstr "归档文件中成员文件头无效"

 
 

-#: methods/gpgv.cc:223
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！"
+#: apt-inst/contrib/arfile.cc:132
+msgid "Archive is too short"
+msgstr "归档文件太短"

 
 

-#: methods/gpgv.cc:228
-msgid "At least one invalid signature was encountered."
-msgstr "至少发现一个无效的签名。"
+#: apt-inst/contrib/arfile.cc:136
+msgid "Failed to read the archive headers"
+msgstr "无法读取归档文件的数据头"

 
 

-#: methods/gpgv.cc:232
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
-msgstr "无法运行\"%s\"以验证签名(您安装了 gpgv 么？)"
+#: apt-inst/filelist.cc:382
+msgid "DropNode called on still linked node"
+msgstr "把 DropNode 用在了仍在链表中的节点上"

 
 

-#: methods/gpgv.cc:237
-msgid "Unknown error executing gpgv"
-msgstr "运行 gpgv 时发生未知错误"
+#: apt-inst/filelist.cc:414
+msgid "Failed to locate the hash element!"
+msgstr "无法定位哈希表元素！"

 
 

-#: methods/gpgv.cc:271 methods/gpgv.cc:278
-msgid "The following signatures were invalid:\n"
-msgstr "下列签名无效：\n"
+#: apt-inst/filelist.cc:461
+msgid "Failed to allocate diversion"
+msgstr "无法分配转移项"

 
 

-#: methods/gpgv.cc:285
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
-msgstr "由于没有公钥，下列签名无法进行验证：\n"
+#: apt-inst/filelist.cc:466
+msgid "Internal error in AddDiversion"
+msgstr "内部错误，出现在 AddDiversion"

 
 

-#: methods/gzip.cc:64
+#: apt-inst/filelist.cc:479

 #, c-format
 #, c-format

-msgid "Couldn't open pipe for %s"
-msgstr "无法为 %s 开启管道"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s"

 
 

-#: methods/gzip.cc:109
+#: apt-inst/filelist.cc:508

 #, c-format
 #, c-format

-msgid "Read error from %s process"
-msgstr "从 %s 进程读取数据出错"
-
-#: methods/http.cc:384
-msgid "Waiting for headers"
-msgstr "正在等待报头"
+msgid "Double add of diversion %s -> %s"
+msgstr "添加了两个转移项 %s-> %s"

 
 

-#: methods/http.cc:530
+#: apt-inst/filelist.cc:551

 #, c-format
 #, c-format

-msgid "Got a single header line over %u chars"
-msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
+msgid "Duplicate conf file %s/%s"
+msgstr "重复的配置文件 %s/%s"

 
 

-#: methods/http.cc:538
-msgid "Bad header line"
-msgstr "错误的报头条目"
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
+#, c-format
+msgid "Failed to write file %s"
+msgstr "无法写入文件 %s"

 
 

-#: methods/http.cc:557 methods/http.cc:564
-msgid "The HTTP server sent an invalid reply header"
-msgstr "该 http 服务器发送了一个无效的应答报头"
+#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
+#, c-format
+msgid "Failed to close file %s"
+msgstr "无法关闭文件 %s"

 
 

-#: methods/http.cc:593
-msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#, c-format
+msgid "The path %s is too long"
+msgstr "路径名 %s 太长"

 
 

-#: methods/http.cc:608
-msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
+#: apt-inst/extract.cc:127
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "%s 被解包了不只一次"

 
 

-#: methods/http.cc:610
-msgid "This HTTP server has broken range support"
-msgstr "该 http 服务器的 range 支持不正常"
+#: apt-inst/extract.cc:137
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "目录 %s 已被转移"

 
 

-#: methods/http.cc:634
-msgid "Unknown date format"
-msgstr "无法识别的日期格式"
+#: apt-inst/extract.cc:147
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "该软件包正尝试写入转移对象 %s/%s"

 
 

-#: methods/http.cc:788
-msgid "Select failed"
-msgstr "select 调用出错"
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+msgid "The diversion path is too long"
+msgstr "该转移路径太长"

 
 

-#: methods/http.cc:793
-msgid "Connection timed out"
-msgstr "连接服务器超时"
+#: apt-inst/extract.cc:243
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "目录 %s 要被一个非目录的文件替换"

 
 

-#: methods/http.cc:816
-msgid "Error writing to output file"
-msgstr "写输出文件时出错"
+#: apt-inst/extract.cc:283
+msgid "Failed to locate node in its hash bucket"
+msgstr "无法在其散列桶中分配节点"

 
 

-#: methods/http.cc:847
-msgid "Error writing to file"
-msgstr "写文件时出错"
+#: apt-inst/extract.cc:287
+msgid "The path is too long"
+msgstr "路径名太长"

 
 

-#: methods/http.cc:875
-msgid "Error writing to the file"
-msgstr "写文件时出错"
+#: apt-inst/extract.cc:415
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "用来覆盖的软件包不属于 %s 的任何版本"

 
 

-#: methods/http.cc:889
-msgid "Error reading from server. Remote end closed connection"
-msgstr "从服务器读取数据时出错，对方关闭了连接"
+#: apt-inst/extract.cc:432
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"

 
 

-#: methods/http.cc:891
-msgid "Error reading from server"
-msgstr "从服务器读取数据出错"
+#: apt-inst/extract.cc:492
+#, c-format
+msgid "Unable to stat %s"
+msgstr "无法读取 %s 的状态"

 
 

-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
-msgid "Failed to truncate file"
-msgstr "截断文件失败"
+#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"

 
 

-#: methods/http.cc:1147
-msgid "Bad header data"
-msgstr "错误的报头数据"
+#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
+#: apt-inst/deb/debfile.cc:55
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”，“%s”或者“%s”"

 
 

-#: methods/http.cc:1164 methods/http.cc:1219
-msgid "Connection failed"
-msgstr "连接失败"
+#: apt-inst/deb/debfile.cc:120
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "内部错误，无法定位包内文件 %s"

 
 

-#: methods/http.cc:1311
-msgid "Internal error"
-msgstr "内部错误"
+#: apt-inst/deb/debfile.cc:214
+msgid "Unparsable control file"
+msgstr "不能解析的主控文件"

 
 

-#: apt-pkg/contrib/mmap.cc:76
+#: apt-pkg/contrib/mmap.cc:79

 msgid "Can't mmap an empty file"
 msgstr "无法 mmap 一个空文件"
 
 msgid "Can't mmap an empty file"
 msgstr "无法 mmap 一个空文件"
 

-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "无法为复制文件描述符 %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "无法 mmap %lu 字节的数据"
+
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "无法关闭 mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "无法同步 mmap "
+
+#: apt-pkg/contrib/mmap.cc:290

 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 

-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "无法截断文件"
+
+#: apt-pkg/contrib/mmap.cc:341

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

-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "

 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""

-"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大侠。当前值：%lu。(man 5 "
+"动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值：%lu。(man 5 "

 "apt.conf)"
 
 "apt.conf)"
 

-#: apt-pkg/contrib/mmap.cc:347
+#: apt-pkg/contrib/mmap.cc:440

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

-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。"
+
+#: apt-pkg/contrib/mmap.cc:443
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"

 
 #. d means days, h means hours, min means minutes, s means seconds
 
 #. d means days, h means hours, min means minutes, s means seconds

-#: apt-pkg/contrib/strutl.cc:346
+#: apt-pkg/contrib/strutl.cc:372

 #, c-format
 msgid "%lid %lih %limin %lis"
 #, c-format
 msgid "%lid %lih %limin %lis"

-msgstr ""
+msgstr "%li天 %li小时 %li分 %li秒"

 
 #. h means hours, min means minutes, s means seconds
 
 #. h means hours, min means minutes, s means seconds

-#: apt-pkg/contrib/strutl.cc:353
+#: apt-pkg/contrib/strutl.cc:379

 #, c-format
 msgid "%lih %limin %lis"
 #, c-format
 msgid "%lih %limin %lis"

-msgstr ""
+msgstr "%li小时 %li分 %li秒"

 
 #. min means minutes, s means seconds
 
 #. min means minutes, s means seconds

-#: apt-pkg/contrib/strutl.cc:360
+#: apt-pkg/contrib/strutl.cc:386

 #, c-format
 msgid "%limin %lis"
 #, c-format
 msgid "%limin %lis"

-msgstr ""
+msgstr "%li分 %li秒"

 
 #. s means seconds
 
 #. s means seconds

-#: apt-pkg/contrib/strutl.cc:365
+#: apt-pkg/contrib/strutl.cc:391

 #, c-format
 msgid "%lis"
 #, c-format
 msgid "%lis"

-msgstr ""
+msgstr "%li秒"

 
 

-#: apt-pkg/contrib/strutl.cc:1040
+#: apt-pkg/contrib/strutl.cc:1166

 #, c-format
 msgid "Selection %s not found"
 #, c-format
 msgid "Selection %s not found"

-msgstr "没æ\9c\89å\8f\91ç\8e°æ\82¨ç\9a\84æ\89\80é\80\89 %s"
+msgstr "æ\89¾ä¸\8då\88°æ\82¨é\80\89å\88\99ç\9a\84 %s"

 
 

-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:491

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

-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:605

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

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

 #, 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:703
+#: apt-pkg/contrib/configuration.cc:792

 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "语法错误 %s:%u：标签格式有误"
 
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "语法错误 %s:%u：标签格式有误"
 

-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:809

 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"

-msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据"
+msgstr "语法错误 %s:%u：配置值后有多余的无意义数据"

 
 

-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:849

 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"

-msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
+msgstr "语法错误 %s:%u：只能在顶层配置文件中使用指示"

 
 

-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:856

 #, 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:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865

 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 #, c-format
 msgid "Syntax error %s:%u: Included from here"

-msgstr "语法错误 %s:%u: Included from here"
+msgstr "语法错误 %s:%u：Included from here"

 
 

-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:869

 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"

-msgstr "语法错误 %s:%u: 不支持的指令“%s”"
+msgstr "语法错误 %s:%u：不支持的指令“%s”"

 
 

-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:872
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数"
+
+#: apt-pkg/contrib/configuration.cc:922

 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"

-msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"
+msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"

 
 

-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146

 #, c-format
 msgid "%c%s... Error!"
 #, c-format
 msgid "%c%s... Error!"

-msgstr "%c%s... 有错误!"
+msgstr "%c%s... 有错误！"

 
 

-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148

 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... 完成"
 
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... 完成"
 

-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80

 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."

-msgstr "未知的命令行选项“%c”[来自 %s]"
+msgstr "未知的命令行选项“%c” [来自 %s]"

 
 

-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114
+#: apt-pkg/contrib/cmndline.cc:122

 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "无法识别命令行选项 %s"
 
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "无法识别命令行选项 %s"
 

-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127

 #, c-format
 msgid "Command line option %s is not boolean"
 #, c-format
 msgid "Command line option %s is not boolean"

-msgstr "命令行选项 %s 不是个布尔值"
+msgstr "命令行选项 %s 不是布尔值"

 
 

-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189

 #, c-format
 msgid "Option %s requires an argument."
 msgstr "选项 %s 要求有一个参数"
 
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "选项 %s 要求有一个参数"
 

-#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
+#: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208

 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定"
 
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定"
 

-#: apt-pkg/contrib/cmndline.cc:234
+#: apt-pkg/contrib/cmndline.cc:237

 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"
 
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"
 

-#: apt-pkg/contrib/cmndline.cc:265
+#: apt-pkg/contrib/cmndline.cc:268

 #, c-format
 msgid "Option '%s' is too long"
 #, c-format
 msgid "Option '%s' is too long"

-msgstr "选项“%s”超长"
+msgstr "选项“%s”太长"

 
 

-#: apt-pkg/contrib/cmndline.cc:298
+#: apt-pkg/contrib/cmndline.cc:300

 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr "不能识别参数 %s，请用 true 或 false"
 
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr "不能识别参数 %s，请用 true 或 false"
 

-#: apt-pkg/contrib/cmndline.cc:348
+#: apt-pkg/contrib/cmndline.cc:350

 #, c-format
 msgid "Invalid operation %s"
 msgstr "无效的操作 %s"
 
 #, c-format
 msgid "Invalid operation %s"
 msgstr "无效的操作 %s"
 

-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56

 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "无法读取文件系统挂载点 %s 的状态"
 
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "无法读取文件系统挂载点 %s 的状态"
 

-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
-#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
-#, c-format
-msgid "Unable to change to %s"
-msgstr "无法切换工作目录到 %s"
-
-#: apt-pkg/contrib/cdromutl.cc:195
+#: apt-pkg/contrib/cdromutl.cc:224

 msgid "Failed to stat the cdrom"
 msgid "Failed to stat the cdrom"

-msgstr "无法读取光盘的状态"
+msgstr "无法读取盘片的状态"
+
+#: apt-pkg/contrib/fileutl.cc:93
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "关闭 gzip %s 文件出错"

 
 

-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:225

 #, c-format
 msgid "Not using locking for read only lock file %s"
 #, c-format
 msgid "Not using locking for read only lock file %s"

-msgstr "由于文件系统为只读，因而无法使用文件锁%s"
+msgstr "由于文件系统为只读，因而无法使用文件锁 %s"

 
 

-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:230

 #, 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:172
+#: apt-pkg/contrib/fileutl.cc:248

 #, 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:176
+#: apt-pkg/contrib/fileutl.cc:252

 #, 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:392 apt-pkg/contrib/fileutl.cc:506
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:426
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+

 #: apt-pkg/contrib/fileutl.cc:444
 #, c-format
 #: apt-pkg/contrib/fileutl.cc:444
 #, c-format

-msgid "Waited for %s but it wasn't there"
-msgstr "等待子进程 %s 的退出，但是它并不存在"
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:453
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""

 
 

-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:840

 #, 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:458
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:842
+#, c-format

 msgid "Sub-process %s received signal %u."
 msgid "Sub-process %s received signal %u."

-msgstr "子进程 %s 发生了段错误"
+msgstr "子进程 %s 收到信号 %u。"

 
 

-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:846

 #, 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:464
+#: apt-pkg/contrib/fileutl.cc:848

 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 #, c-format
 msgid "Sub-process %s exited unexpectedly"

-msgstr "子进程 %s 异常退出了"
+msgstr "子进程 %s 异常退出"

 
 

-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661

 #, 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:564
+#: apt-pkg/contrib/fileutl.cc:1046

 #, c-format
 #, c-format

-msgid "read, still have %lu to read but none left"
-msgstr "读文件时出错，还剩 %lu 字节没有读出"
+msgid "Could not open file descriptor %d"
+msgstr "无法打开文件描述符 %d"

 
 

-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:1136
+msgid "Failed to create subprocess IPC"
+msgstr "无法创建子进程的 IPC 管道"
+
+#: apt-pkg/contrib/fileutl.cc:1192
+msgid "Failed to exec compressor "
+msgstr "无法执行压缩程序"
+
+#: apt-pkg/contrib/fileutl.cc:1289
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "读取文件出错，还剩 %lu 字节没有读出"
+
+#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "写入文件出错，还剩 %lu 字节没有保存"
+
+#: apt-pkg/contrib/fileutl.cc:1716

 #, c-format
 #, c-format

-msgid "write, still have %lu to write but couldn't"
-msgstr "å\86\99æ\96\87件æ\97¶å\87ºé\94\99ï¼\8cè¿\98å\89© %lu å­\97è\8a\82没æ\9c\89ä¿\9då­\98"
+msgid "Problem closing the file %s"
+msgstr "å\85³é\97­æ\96\87件 %s å\87ºé\94\99"

 
 

-#: apt-pkg/contrib/fileutl.cc:669
-msgid "Problem closing the file"
-msgstr "关闭文件时出错"
+#: apt-pkg/contrib/fileutl.cc:1728
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "重命名文件 %s 为 %s 出错"

 
 

-#: apt-pkg/contrib/fileutl.cc:675
-msgid "Problem unlinking the file"
-msgstr "用 unlink 删除文件时出错"
+#: apt-pkg/contrib/fileutl.cc:1739
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "用 unlink 删除文件 %s 出错"

 
 

-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:1754

 msgid "Problem syncing the file"
 msgid "Problem syncing the file"

-msgstr "同步文件时出错"
+msgstr "同步文件出错"

 
 

-#: apt-pkg/pkgcache.cc:133
+#: apt-pkg/pkgcache.cc:148

 msgid "Empty package cache"
 msgstr "软件包缓存区是空的"
 
 msgid "Empty package cache"
 msgstr "软件包缓存区是空的"
 

-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:154

 msgid "The package cache file is corrupted"
 msgid "The package cache file is corrupted"

-msgstr "软件包缓存区文件损坏了"
+msgstr "软件包缓存文件损坏了"

 
 

-#: apt-pkg/pkgcache.cc:144
+#: apt-pkg/pkgcache.cc:159

 msgid "The package cache file is an incompatible version"
 msgstr "软件包缓存区文件的版本不兼容"
 
 msgid "The package cache file is an incompatible version"
 msgstr "软件包缓存区文件的版本不兼容"
 

-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "软件包缓存文件损坏了"
+
+#: apt-pkg/pkgcache.cc:167

 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 #, c-format
 msgid "This APT does not support the versioning system '%s'"

-msgstr "本程序目前不支持“%s”这个版本控制系统"
+msgstr "本程序目前不支持“%s”版本系统"

 
 

-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:172

 msgid "The package cache was built for a different architecture"
 msgid "The package cache was built for a different architecture"

-msgstr "软件包缓存区是为其它架构的主机构造的"
+msgstr "软件包缓存区是为其它架构的硬件构建的"

 
 

-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:305

 msgid "Depends"
 msgstr "依赖"
 
 msgid "Depends"
 msgstr "依赖"
 

-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:305

 msgid "PreDepends"
 msgstr "预依赖"
 
 msgid "PreDepends"
 msgstr "预依赖"
 

-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:305

 msgid "Suggests"
 msgstr "建议"
 
 msgid "Suggests"
 msgstr "建议"
 

-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:306

 msgid "Recommends"
 msgstr "推荐"
 
 msgid "Recommends"
 msgstr "推荐"
 

-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:306

 msgid "Conflicts"
 msgstr "冲突"
 
 msgid "Conflicts"
 msgstr "冲突"
 

-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:306

 msgid "Replaces"
 msgstr "替换"
 
 msgid "Replaces"
 msgstr "替换"
 

-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:307

 msgid "Obsoletes"
 msgstr "废弃"
 
 msgid "Obsoletes"
 msgstr "废弃"
 

-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:307

 msgid "Breaks"
 msgstr "破坏"
 
 msgid "Breaks"
 msgstr "破坏"
 

-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:307

 msgid "Enhances"
 msgid "Enhances"

-msgstr ""
+msgstr "增强"

 
 

-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:318

 msgid "important"
 msgstr "重要"
 
 msgid "important"
 msgstr "重要"
 

-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:318

 msgid "required"
 msgid "required"

-msgstr "必要"
+msgstr "必需"

 
 

-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:318

 msgid "standard"
 msgstr "标准"
 
 msgid "standard"
 msgstr "标准"
 

-#: apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:319

 msgid "optional"
 msgstr "可选"
 
 msgid "optional"
 msgstr "可选"
 

-#: apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:319

 msgid "extra"
 msgstr "额外"
 
 msgid "extra"
 msgstr "额外"
 

-#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161

 msgid "Building dependency tree"
 msgstr "正在分析软件包的依赖关系树"
 
 msgid "Building dependency tree"
 msgstr "正在分析软件包的依赖关系树"
 

-#: apt-pkg/depcache.cc:124
+#: apt-pkg/depcache.cc:133

 msgid "Candidate versions"
 msgstr "候选版本"
 
 msgid "Candidate versions"
 msgstr "候选版本"
 

-#: apt-pkg/depcache.cc:153
+#: apt-pkg/depcache.cc:162

 msgid "Dependency generation"
 msgstr "生成依赖关系"
 
 msgid "Dependency generation"
 msgstr "生成依赖关系"
 

-#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219

 msgid "Reading state information"
 msgstr "正在读取状态信息"
 
 msgid "Reading state information"
 msgstr "正在读取状态信息"
 

-#: apt-pkg/depcache.cc:223
+#: apt-pkg/depcache.cc:244

 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "无法打开状态文件 %s"
 
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "无法打开状态文件 %s"
 

-#: apt-pkg/depcache.cc:229
+#: apt-pkg/depcache.cc:250

 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "无法写入临时状态文件 %s"
 
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "无法写入临时状态文件 %s"
 

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

 #, 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:189
+#: apt-pkg/tagfile.cc:216

 #, 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:90
+#: apt-pkg/sourcelist.cc:96
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
+
+#: apt-pkg/sourcelist.cc:99
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
+
+#: apt-pkg/sourcelist.cc:110
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
+
+#: apt-pkg/sourcelist.cc:116
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"
+
+#: apt-pkg/sourcelist.cc:119
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)"
+
+#: apt-pkg/sourcelist.cc:132

 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"

-msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"

 
 

-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:134

 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"

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

 
 

-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:137

 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"

-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"

 
 

-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:143

 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"

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

 
 

-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:150

 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"

-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"

 
 

-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:248

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

-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495

 #, c-format
 msgid "Line %u too long in source list %s."
 #, c-format
 msgid "Line %u too long in source list %s."

-msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。"
+msgstr "源列表 %2$s 的第 %1$u 行太长了。"

 
 

-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:285

 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 #, c-format
 msgid "Malformed line %u in source list %s (type)"

-msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
+msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"

 
 

-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:289

 #, c-format
 msgid "Type '%s' is not known on line %u in source list %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:255 apt-pkg/sourcelist.cc:258
-#, c-format
-msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)"
+msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"

 
 

-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896

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

-"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "

 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""

+"无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
+"(%d)"

 
 

-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "无法打开文件 %s"
+
+#: apt-pkg/packagemanager.cc:545

 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "


@@ -2511,25 +2726,18 @@ msgstr ""
 "少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::"
 "Force-LoopBreak 选项。"
 
 "少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::"
 "Force-LoopBreak 选项。"
 

-#: apt-pkg/packagemanager.cc:475
-#, c-format
-msgid ""
-"Could not perform immediate configuration on already unpacked '%s'.Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
-msgstr ""
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34

 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "不支持索引文件类型“%s”"
 
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "不支持索引文件类型“%s”"
 

-#: apt-pkg/algorithms.cc:248
+#: apt-pkg/algorithms.cc:266

 #, 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:1138
+#: apt-pkg/algorithms.cc:1228

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


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

-#: apt-pkg/algorithms.cc:1140
+#: apt-pkg/algorithms.cc:1230

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

-#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
+#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576
+#, fuzzy

 msgid ""
 msgid ""

-"Some index files failed to download, they have been ignored, or old ones "
+"Some index files failed to download. They have been ignored, or old ones "

 "used instead."
 msgstr ""
 "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 
 "used instead."
 msgstr ""
 "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 

-#: apt-pkg/acquire.cc:60
+#: apt-pkg/acquire.cc:81

 #, c-format
 #, c-format

-msgid "Lists directory %spartial is missing."
-msgstr "软件包列表的目录 %spartial 不见了。"
+msgid "List directory %spartial is missing."
+msgstr "软件包列表的目录 %spartial 缺失。"

 
 

-#: apt-pkg/acquire.cc:64
+#: apt-pkg/acquire.cc:85

 #, c-format
 #, c-format

-msgid "Archive directory %spartial is missing."
-msgstr "找不到“%spartial”这个目录。"
+msgid "Archives directory %spartial is missing."
+msgstr "仓库目录 %spartial 确实。"
+
+#: apt-pkg/acquire.cc:93
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "无法对目录 %s 加锁"

 
 #. only show the ETA if it makes sense
 #. two days
 
 #. only show the ETA if it makes sense
 #. two days

-#: apt-pkg/acquire.cc:826
+#: apt-pkg/acquire.cc:893

 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
 
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
 

-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:895

 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "正在下载第 %li 个文件，共 %li 个"
 
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "正在下载第 %li 个文件，共 %li 个"
 

-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112

 #, 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:159
+#: apt-pkg/acquire-worker.cc:161

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

-#: apt-pkg/acquire-worker.cc:413
+#: apt-pkg/acquire-worker.cc:440

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."

-msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
+msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"

 
 

-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:151

 #, 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:148
+#: apt-pkg/init.cc:167

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

-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:57

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

-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47

 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 写入一些“软件包源”的 URI"
+msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"

 
 

-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:87

 msgid "The package lists or status file could not be parsed or opened."
 msgstr "无法解析或打开软件包的列表或是状态文件。"
 
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "无法解析或打开软件包的列表或是状态文件。"
 

-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:91

 msgid "You may want to run apt-get update to correct these problems"
 msgstr "您可能需要运行 apt-get update 来解决这些问题"
 
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "您可能需要运行 apt-get update 来解决这些问题"
 

-#: apt-pkg/policy.cc:347
-#, fuzzy, c-format
+#: apt-pkg/cachefile.cc:109
+msgid "The list of sources could not be read."
+msgstr "无法读取源列表。"
+
+#: apt-pkg/policy.cc:75
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+#: apt-pkg/policy.cc:399
+#, c-format

 msgid "Invalid record in the preferences file %s, no Package header"
 msgid "Invalid record in the preferences file %s, no Package header"

-msgstr "偏好设定(preferences)文件中发现有无效的记录，无 Package 字段头"
+msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头"

 
 

-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:421

 #, c-format
 msgid "Did not understand pin type %s"
 #, c-format
 msgid "Did not understand pin type %s"

-msgstr "无法识别锁定的类型(pin type) %s"
+msgstr "无法识别锁定的类型 %s"

 
 

-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:429

 msgid "No priority (or zero) specified for pin"
 msgstr "没有为版本锁定指定优先级(或为零)"
 
 msgid "No priority (or zero) specified for pin"
 msgstr "没有为版本锁定指定优先级(或为零)"
 

-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:87

 msgid "Cache has an incompatible versioning system"
 msgstr "软件包暂存区使用的是不兼容的版本控制系统"
 
 msgid "Cache has an incompatible versioning system"
 msgstr "软件包暂存区使用的是不兼容的版本控制系统"
 

-#: apt-pkg/pkgcachegen.cc:117
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "处理 %s (NewPackage)时出错"
-
-#: apt-pkg/pkgcachegen.cc:132
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "处理 %s (UsePackage1)时出错"
-
-#: apt-pkg/pkgcachegen.cc:166
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "处理 %s (NewFileDesc1)时出错"
-
-#: apt-pkg/pkgcachegen.cc:191
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "处理 %s (UsePackage2)时出错"
-
-#: apt-pkg/pkgcachegen.cc:195
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "处理 %s (NewFileVer1)时出错"
-
-#: apt-pkg/pkgcachegen.cc:226
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "处理 %s (NewVersion1)时出错"
-
-#: apt-pkg/pkgcachegen.cc:230
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "处理 %s (UsePackage3)时出错"
-
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "处理 %s (NewVersion2)时出错"
-
-#: apt-pkg/pkgcachegen.cc:258
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "处理 %s (NewFileDesc2)时出错"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "处理 %s (FindPkg)时出错"

 
 

-#: apt-pkg/pkgcachegen.cc:264
+#: apt-pkg/pkgcachegen.cc:251

 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgid "Wow, you exceeded the number of package names this APT is capable of."

-msgstr "糟了，软件包的数量了超出本程序的处理能力。"
+msgstr "哇，软件包数量超出了本 APT 的处理能力。"

 
 

-#: apt-pkg/pkgcachegen.cc:267
+#: apt-pkg/pkgcachegen.cc:254

 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgid "Wow, you exceeded the number of versions this APT is capable of."

-msgstr "糟了，软件包版本的数量了超出本程序的处理能力。"
+msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"

 
 

-#: apt-pkg/pkgcachegen.cc:270
+#: apt-pkg/pkgcachegen.cc:257

 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."

-msgstr "糟了，软件包说明的数量了超出本程序的处理能力。"
+msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"

 
 

-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:260

 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."

-msgstr "糟了，依赖关系的数量超出了本程序的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:301
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "处理 %s (FindPkg)时出错"
+msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"

 
 

-#: apt-pkg/pkgcachegen.cc:314
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "处理 %s (CollectFileProvides)时出错"
-
-#: apt-pkg/pkgcachegen.cc:320
+#: apt-pkg/pkgcachegen.cc:577

 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
 
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
 

-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:1146

 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "无法获取源软件包列表 %s 的状态"
 
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "无法获取源软件包列表 %s 的状态"
 

-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338
+#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501
+msgid "Reading package lists"
+msgstr "正在读取软件包列表"
+
+#: apt-pkg/pkgcachegen.cc:1251

 msgid "Collecting File Provides"
 msgstr "正在收集文件所提供的软件包"
 
 msgid "Collecting File Provides"
 msgstr "正在收集文件所提供的软件包"
 

-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450

 msgid "IO Error saving source cache"
 msgid "IO Error saving source cache"

-msgstr "无法写入来源缓存文件"
+msgstr "无法读取或写入软件源缓存"

 
 

-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:139

 #, 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:396
+#: apt-pkg/acquire-item.cc:599

 msgid "MD5Sum mismatch"
 msgstr "MD5 校验和不符"
 
 msgid "MD5Sum mismatch"
 msgstr "MD5 校验和不符"
 

-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
+#: apt-pkg/acquire-item.cc:2002

 msgid "Hash Sum mismatch"
 msgstr "Hash 校验和不符"
 
 msgid "Hash Sum mismatch"
 msgstr "Hash 校验和不符"
 

-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1370
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1386
+#, fuzzy, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "无法解析软件包仓库 Release 文件 %s"
+
+#: apt-pkg/acquire-item.cc:1428

 msgid "There is no public key available for the following key IDs:\n"
 msgid "There is no public key available for the following key IDs:\n"

-msgstr "以下 key ID 没有可用的公钥：\n"
+msgstr "以下 ID 的密钥没有可用的公钥：\n"
+
+#: apt-pkg/acquire-item.cc:1466
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1488
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
+
+#: apt-pkg/acquire-item.cc:1521
+#, c-format
+msgid ""
+"A error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s\n"
+msgstr ""
+"校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG 错误：%s: %s"

 
 

-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1635

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


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

-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1694

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

-"I wasn't able to locate file for the %s package. This might mean you need to "
-"manually fix this package."
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package."

 msgstr ""
 "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
 
 msgstr ""
 "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
 

-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1753

 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
 
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
 

-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1851

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

-#: apt-pkg/indexrecords.cc:40
-#, fuzzy, c-format
+#: apt-pkg/indexrecords.cc:64
+#, c-format

 msgid "Unable to parse Release file %s"
 msgid "Unable to parse Release file %s"

-msgstr "无法解析软件包文件 %s (1)"
+msgstr "无法解析软件包仓库 Release 文件 %s"

 
 

-#: apt-pkg/indexrecords.cc:47
-#, fuzzy, c-format
+#: apt-pkg/indexrecords.cc:74
+#, c-format

 msgid "No sections in Release file %s"
 msgid "No sections in Release file %s"

-msgstr "注意，选取 %s 而非 %s\n"
+msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"

 
 

-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:108

 #, c-format
 msgid "No Hash entry in Release file %s"
 #, c-format
 msgid "No Hash entry in Release file %s"

-msgstr ""
+msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
+
+#: apt-pkg/indexrecords.cc:121
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
+
+#: apt-pkg/indexrecords.cc:140
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"

 
 

-#: apt-pkg/vendorlist.cc:66
+#: apt-pkg/vendorlist.cc:78

 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "软件提供者数据块内 %s 没有包含指纹信息"
 
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "软件提供者数据块内 %s 没有包含指纹信息"
 

-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:576

 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"


@@ -2793,222 +3032,509 @@ msgstr ""
 "现把 %s 作为了 CD-ROM 的挂载点\n"
 "正在挂载 CD-ROM\n"
 
 "现把 %s 作为了 CD-ROM 的挂载点\n"
 "正在挂载 CD-ROM\n"
 

-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682

 msgid "Identifying.. "
 msgstr "正在鉴别.. "
 
 msgid "Identifying.. "
 msgstr "正在鉴别.. "
 

-#: apt-pkg/cdrom.cc:559
+#: apt-pkg/cdrom.cc:613

 #, c-format
 msgid "Stored label: %s\n"
 #, c-format
 msgid "Stored label: %s\n"

-msgstr "å·²å­\98æ¡£的标签：%s\n"
+msgstr "å·²å½\92æ¡£æ\96\87件的标签：%s\n"

 
 

-#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907

 msgid "Unmounting CD-ROM...\n"
 msgstr "正在卸载 CD-ROM...\n"
 
 msgid "Unmounting CD-ROM...\n"
 msgstr "正在卸载 CD-ROM...\n"
 

-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:642

 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
 
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
 

-#: apt-pkg/cdrom.cc:603
+#: apt-pkg/cdrom.cc:660

 msgid "Unmounting CD-ROM\n"
 msgstr "正在卸载 CD-ROM 文件系统\n"
 
 msgid "Unmounting CD-ROM\n"
 msgstr "正在卸载 CD-ROM 文件系统\n"
 

-#: apt-pkg/cdrom.cc:607
+#: apt-pkg/cdrom.cc:665

 msgid "Waiting for disc...\n"
 msgstr "等待插入盘片……\n"
 
 msgid "Waiting for disc...\n"
 msgstr "等待插入盘片……\n"
 

-#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:674

 msgid "Mounting CD-ROM...\n"
 msgstr "正在挂载 CD-ROM 文件系统……\n"
 
 msgid "Mounting CD-ROM...\n"
 msgstr "正在挂载 CD-ROM 文件系统……\n"
 

-#: apt-pkg/cdrom.cc:633
+#: apt-pkg/cdrom.cc:693

 msgid "Scanning disc for index files..\n"
 msgid "Scanning disc for index files..\n"

-msgstr "正在光盘中查找索引文件..\n"
+msgstr "正在盘片中查找索引文件..\n"

 
 

-#: apt-pkg/cdrom.cc:673
+#: apt-pkg/cdrom.cc:744

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

-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"

 msgstr ""
 "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
 "名\n"
 
 msgstr ""
 "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
 "名\n"
 

-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:755

 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""

+"无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构"
+"架。"

 
 

-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:782

 #, c-format
 msgid "Found label '%s'\n"
 msgstr "找到标签 '%s'\n"
 
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "找到标签 '%s'\n"
 

-#: apt-pkg/cdrom.cc:739
+#: apt-pkg/cdrom.cc:811

 msgid "That is not a valid name, try again.\n"
 msgid "That is not a valid name, try again.\n"

-msgstr "这不是一个有效的名字，请再次命名。\n"
+msgstr "这不是一个有效的名字，请重试。\n"

 
 

-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:828

 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""

-"这张光盘现在的名字是：\n"
+"这张盘片现在的名字是：\n"

 "“%s”\n"
 
 "“%s”\n"
 

-#: apt-pkg/cdrom.cc:759
+#: apt-pkg/cdrom.cc:830

 msgid "Copying package lists..."
 msgstr "正在复制软件包列表……"
 
 msgid "Copying package lists..."
 msgstr "正在复制软件包列表……"
 

-#: apt-pkg/cdrom.cc:785
+#: apt-pkg/cdrom.cc:857

 msgid "Writing new source list\n"
 msgid "Writing new source list\n"

-msgstr "正在写入新的软件包源列表\n"
+msgstr "正在写入新的源列表\n"

 
 

-#: apt-pkg/cdrom.cc:794
+#: apt-pkg/cdrom.cc:865

 msgid "Source list entries for this disc are:\n"
 msgid "Source list entries for this disc are:\n"

-msgstr "对应于该光盘的软件包源设置项是：\n"
+msgstr "对应于该盘片的软件源设置项是：\n"

 
 

-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884

 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "已写入 %i 条记录。\n"
 
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "已写入 %i 条记录。\n"
 

-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886

 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
 
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
 

-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889

 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"

-msgstr "å·²å\86\99å\85¥ %i æ\9d¡è®°å½\95ï¼\8c并æ\9c\89 %i 个æ\96\87件ä¸\8då\90»å\90\88\n"
+msgstr "å·²å\86\99å\85¥ %i æ\9d¡è®°å½\95ï¼\8c并æ\9c\89 %i 个æ\96\87件ä¸\8då\8c¹é\85\8d\n"

 
 

-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892

 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"

-msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n"
+msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "无法找到认证记录：%s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash 校验和不符：%s"
+
+#: apt-pkg/indexcopy.cc:665
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""

 
 

-#: apt-pkg/deb/dpkgpm.cc:49
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:696
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s 中没有安装密钥环。"
+
+#: apt-pkg/cacheset.cc:403
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "未找到“%2$s”的“%1$s”发布版本"
+
+#: apt-pkg/cacheset.cc:406
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "未找到“%2$s”的“%1$s”版本"
+
+#: apt-pkg/cacheset.cc:517
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "无法找到任务 %s"
+
+#: apt-pkg/cacheset.cc:523
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
+
+#: apt-pkg/cacheset.cc:534
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "无法从完全虚拟的软件包 %s 中选择版本"
+
+#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择"
+
+#: apt-pkg/cacheset.cc:555
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
+
+#: apt-pkg/cacheset.cc:563
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "因为软件包 %s 没有候选版本，无法进行选择"
+
+#: apt-pkg/cacheset.cc:571
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
+
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:209
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:279
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:73

 #, c-format
 msgid "Installing %s"
 msgstr "正在安装 %s"
 
 #, c-format
 msgid "Installing %s"
 msgstr "正在安装 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952

 #, c-format
 msgid "Configuring %s"
 msgstr "正在配置 %s"
 
 #, c-format
 msgid "Configuring %s"
 msgstr "正在配置 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959

 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
 
 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:76
+#, c-format
+msgid "Completely removing %s"
+msgstr "完全删除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:77
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "注意到 %s 已经消失"
+
+#: apt-pkg/deb/dpkgpm.cc:78

 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "执行安装后执行的触发器 %s"
 
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "执行安装后执行的触发器 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:557
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:705

 #, c-format
 msgid "Directory '%s' missing"
 #, c-format
 msgid "Directory '%s' missing"

-msgstr "目录 %s 不见了"
+msgstr "目录 %s 缺失"

 
 

-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "无法打开文件 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:945

 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 
 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:946

 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:951

 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:953

 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 
 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:958

 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在准备 %s 的删除操作"
 
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在准备 %s 的删除操作"
 

-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:960

 #, c-format
 msgid "Removed %s"
 msgstr "已删除 %s"
 
 #, c-format
 msgid "Removed %s"
 msgstr "已删除 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:965

 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在准备完全删除 %s"
 
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在准备完全删除 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:966

 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 
 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:1213

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"

-msgstr "无法写入日志。 openpty() 失败 (/dev/pts 没有 mount 上？)\n"
+msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ？)\n"

 
 

-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:1243

 msgid "Running dpkg"
 msgid "Running dpkg"

+msgstr "正在运行 dpkg"
+
+#: apt-pkg/deb/dpkgpm.cc:1415
+msgid "Operation was interrupted before it could finish"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1477
+msgid "No apport report written because MaxReports is reached already"
+msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1482
+msgid "dependency problems - leaving unconfigured"
+msgstr "依赖问题 - 保持未配置"
+
+#: apt-pkg/deb/dpkgpm.cc:1484
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。"
+
+#: apt-pkg/deb/dpkgpm.cc:1490
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
+
+#: apt-pkg/deb/dpkgpm.cc:1496
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
+
+#: apt-pkg/deb/dpkgpm.cc:1503
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"
+
+#: apt-pkg/deb/debsystem.cc:84

 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"

-msgstr ""
+msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"

 
 

-#: apt-pkg/deb/debsystem.cc:73
-#, fuzzy, c-format
+#: apt-pkg/deb/debsystem.cc:87
+#, c-format

 msgid "Unable to lock the administration directory (%s), are you root?"
 msgid "Unable to lock the administration directory (%s), are you root?"

-msgstr "无法对状态列表目录加锁"
+msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"

 
 

-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:103
+#, c-format

 msgid ""
 msgid ""

-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
-msgstr ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。"

 
 

-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:121

 msgid "Not locked"
 msgid "Not locked"

-msgstr ""
+msgstr "未锁定"

 
 

-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "跳过不存在的文件 %s"

 
 

-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#~ msgid "Failed to remove %s"
+#~ msgstr "无法卸载 %s"

 
 

-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "连接被永久关闭"
+#~ msgid "Unable to create %s"
+#~ msgstr "无法创建 %s "
+
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "无法读取 %sinfo 的状态"
+
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "info 和 temp 目录要求处于同一文件系统之下"
+
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "无法切换工作目录到 admin 目录 %sinfo"
+
+#~ msgid "Internal error getting a package name"
+#~ msgstr "在获取软件包名字时出现内部错误"
+
+#~ msgid "Reading file listing"
+#~ msgstr "正在读取文件列表"
+
+#~ msgid ""
+#~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+#~ "then make it empty and immediately re-install the same version of the "
+#~ "package!"
+#~ msgstr ""
+#~ "无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，那么就清空该文件并马"
+#~ "上重新安装相同版本的这个软件包！"
+
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "无法读取列表文件 %sinfo/%s"
+
+#~ msgid "Internal error getting a node"
+#~ msgstr "获得一个节点时出现内部错误"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "无法打开转移配置文件 %sdiversions"
+
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "该转移配置文件被损坏了"
+
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "转移配置文件中有一行是无效的：%s"
+
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "添加转移配置时出现内部错误"
+
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "必须首先初始化软件包缓存"
+
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "无法找到某个软件包：包头，于偏移位置 %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu"
+
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "解析 MD5 出错。文件内偏移量为 %lu"
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "无法切换工作目录到 %s"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "无法在归档文件中找到有效的主控文件"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "无法为 %s 开启管道"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "从 %s 进程读取数据出错"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "接收到一行报头行，它的长度超过了 %u 个字符"
+
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "注意：这是自动被 dpkg 有意完成的。"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
+
+#~ msgid "decompressor"
+#~ msgstr "解压程序"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "读取文件出错，还剩 %lu 字节没有读出"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "写入文件出错，还剩 %lu 字节没有保存"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "无法立即对已经解包的 %s 进行配置。请查看 man 5 apt.conf 中的 APT::"
+#~ "Immediate-Configure。"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "处理 %s (NewPackage)时出错"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "处理 %s (UsePackage1)时出错"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "处理 %s (NewFileDesc1)时出错"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "处理 %s (UsePackage2)时出错"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "处理 %s (NewFileVer1)时出错"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "处理 %s (NewVersion%d)时出错"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "处理 %s (UsePackage3)时出错"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "处理 %s (NewFileDesc2)时出错"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "处理 %s (FindPkg)时出错"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "处理 %s (CollectFileProvides)时出错"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "内部错误，无法定位包内文件"
+
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr "内部错误，组 %s 没有可安装的 pseudo 软件包"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr "Release 文件已过期，忽略 %s (从 %s 起无效)"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "错误：Acquire::gpgv::Options 的参数列表太长。结束运行。"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "处理 %s (NewVersion2)时出错"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "在源列表中 %2$s 中第 %1$u 行的格式有误(供应商 ID)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "无法访问密钥环：“%s”"

 
 #~ msgid "Could not patch file"
 #~ msgstr "无法打开补丁文件"
 
 
 #~ msgid "Could not patch file"
 #~ msgstr "无法打开补丁文件"
 

+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "没有源代码包“%s”，使用“%s”代替\n"
+

 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 


@@ -3027,7 +3553,7 @@ msgstr "连接被永久关闭"
 #~ "您最好提交一个针对这个软件包的故障报告。"
 
 #~ msgid "Line %d too long (max %lu)"
 #~ "您最好提交一个针对这个软件包的故障报告。"
 
 #~ msgid "Line %d too long (max %lu)"

-#~ msgstr "第 %d 行超长了(长度限制为 %lu)。"
+#~ msgstr "第 %d 行太长了(长度限制为 %lu)。"

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


@@ -3035,11 +3561,8 @@ msgstr "连接被永久关闭"
 #~ msgid "After unpacking %sB disk space will be freed.\n"
 #~ msgstr "解压缩后将会空出 %sB 的空间。\n"
 
 #~ msgid "After unpacking %sB disk space will be freed.\n"
 #~ msgstr "解压缩后将会空出 %sB 的空间。\n"
 

-#~ msgid "%s set to manual installed.\n"
-#~ msgstr "%s 已设置为手动安装。\n"
-

 #~ msgid "Line %d too long (max %d)"
 #~ msgid "Line %d too long (max %d)"

-#~ msgstr "第 %d 行超长了(长度限制为 %d)"
+#~ msgstr "第 %d 行太长了(长度限制为 %d)"

 
 #~ msgid "Error occured while processing %s (NewFileDesc1)"
 #~ msgstr "处理 %s (NewFileDesc1)时出错"
 
 #~ msgid "Error occured while processing %s (NewFileDesc1)"
 #~ msgstr "处理 %s (NewFileDesc1)时出错"


@@ -3048,11 +3571,11 @@ msgstr "连接被永久关闭"
 #~ msgstr "处理 %s (NewFileDesc2)时出错"
 
 #~ msgid "Stored label: %s \n"
 #~ msgstr "处理 %s (NewFileDesc2)时出错"
 
 #~ msgid "Stored label: %s \n"

-#~ msgstr "å­\98æ¡£标签：%s \n"
+#~ msgstr "å½\92æ¡£æ\96\87件标签：%s \n"

 
 #~ msgid ""
 
 #~ msgid ""

-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"

 #~ msgstr ""
 #~ "找到了 %i 个软件包索引、%i 个源代码包索引，%i 个翻译索引和 %i 个数字签名\n"
 
 #~ msgstr ""
 #~ "找到了 %i 个软件包索引、%i 个源代码包索引，%i 个翻译索引和 %i 个数字签名\n"
 


@@ -3076,5 +3599,4 @@ msgstr "连接被永久关闭"
 
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr ""
 
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr ""

-#~ "在安装源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%"
-#~ "1$s”"
+#~ "在源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%1$s”"