po-fixups: fill Project-Id-Version and Encoding correctly

[apt.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 67e69f716703711173af418805495d9347dcaca5..7e0bcd406ee4ed2f177572a32e7a392210c60870 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,14 +4,15 @@
 # Tchaikov <tchaikov@sjtu.org>, 2005, 2007.
 # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.
 # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
 # Tchaikov <tchaikov@sjtu.org>, 2005, 2007.
 # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.
 # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.

+# Zhou Mo <cdluminate@gmail.com>, 2014, 2015.

 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2014-09-09 20:35+0200\n"
-"PO-Revision-Date: 2010-08-26 14:42+0800\n"
-"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
+"PO-Revision-Date: 2014-12-04 04:42+0000\n"
+"Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"

 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"


@@ -24,149 +25,144 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
 
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
 

-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320

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

-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322

 msgid "Total package structures: "
 msgstr "全部软件包结构："
 
 msgid "Total package structures: "
 msgstr "全部软件包结构："
 

-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362

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

-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363

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

-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364

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

-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365

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

-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366

 msgid "  Missing: "
 msgstr "  缺失："
 
 msgid "  Missing: "
 msgstr "  缺失："
 

-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368

 msgid "Total distinct versions: "
 msgid "Total distinct versions: "

-msgstr "按版本共计："
+msgstr "按不同的版本共计："

 
 

-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433

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

-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "依赖关系版本名所占空间共计："
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439

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

-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454

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

-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239

 #: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "软件包文件 %s 尚未同步。"
 
 #: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "软件包文件 %s 尚未同步。"
 

-#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229

 #: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "没有发现匹配的软件包"
 
 #: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "没有发现匹配的软件包"
 

-#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41

 msgid "You must give at least one search pattern"
 msgstr "您必须明确地给出至少一个表达式"
 
 msgid "You must give at least one search pattern"
 msgstr "您必须明确地给出至少一个表达式"
 

-#: cmdline/apt-cache.cc:1421
+#: cmdline/apt-cache.cc:1505

 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."

-msgstr ""
+msgstr "该命令已废弃。请使用‘apt-mark showauto’。"

 
 

-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653

 #, c-format
 msgid "Unable to locate package %s"
 #, c-format
 msgid "Unable to locate package %s"

-msgstr "æ\9cªå\8f\91ç\8e°软件包 %s"
+msgstr "æ\97 æ³\95å®\9aä½\8d软件包 %s"

 
 

-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630

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

-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728

 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件"
 
 #. Show any packages have explicit pins
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件"
 
 #. Show any packages have explicit pins

-#: cmdline/apt-cache.cc:1567
+#: cmdline/apt-cache.cc:1651

 msgid "Pinned packages:"
 msgstr "被锁定的软件包："
 
 msgid "Pinned packages:"
 msgstr "被锁定的软件包："
 

-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708

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

-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671

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

-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672

 msgid "  Candidate: "
 msgid "  Candidate: "

-msgstr "  候选软件包："
+msgstr "  候选："

 
 

-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698

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

-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705

 msgid "  Package pin: "
 msgstr "  软件包锁："
 
 #. Show the priority tables
 msgid "  Package pin: "
 msgstr "  软件包锁："
 
 #. Show the priority tables

-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714

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

-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149

 #, 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，用于 %s 构架，编译于 %s %s\n"
+msgstr "%s %s，用于 %s 体系结构，编译于 %s %s\n"

 
 

-#: cmdline/apt-cache.cc:1750
-#, fuzzy
+#: cmdline/apt-cache.cc:1834

 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"


@@ -203,15 +199,13 @@ 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 文件1 [文件2 ...]\n"

 "　　　 apt-cache [选项] showpkg 软件包1 [软件包2 ...]\n"
 "　　　 apt-cache [选项] showsrc 软件包1 [软件包2 ...]\n"
 "\n"
 "　　　 apt-cache [选项] showpkg 软件包1 [软件包2 ...]\n"
 "　　　 apt-cache [选项] showsrc 软件包1 [软件包2 ...]\n"
 "\n"

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

 "\n"
 "命令：\n"
 "\n"
 "命令：\n"

-"   add - 向源缓存加入一个软件包文件\n"

 "   gencaches - 同时生成软件包和源代码包的缓存\n"
 "   showpkg - 显示某个软件包的全面信息\n"
 "   showsrc - 显示源文件的各项记录\n"
 "   gencaches - 同时生成软件包和源代码包的缓存\n"
 "   showpkg - 显示某个软件包的全面信息\n"
 "   showsrc - 显示源文件的各项记录\n"


@@ -221,7 +215,6 @@ msgstr ""
 "   unmet - 显示所有未满足的依赖关系\n"
 "   search - 根据正则表达式搜索软件包列表\n"
 "   show - 以便于阅读的格式介绍该软件包\n"
 "   unmet - 显示所有未满足的依赖关系\n"
 "   search - 根据正则表达式搜索软件包列表\n"
 "   show - 以便于阅读的格式介绍该软件包\n"

-"   showauto - 显示自动安装的软件包的列表\n"

 "   depends - 显示该软件包的依赖关系信息\n"
 "   rdepends - 显示所有依赖于该软件包的软件包名字\n"
 "   pkgnames - 列出所有软件包的名字\n"
 "   depends - 显示该软件包的依赖关系信息\n"
 "   rdepends - 显示所有依赖于该软件包的软件包名字\n"
 "   pkgnames - 列出所有软件包的名字\n"


@@ -239,34 +232,37 @@ 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:76
+#: cmdline/apt-cdrom.cc:77

 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”"
 
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”"
 

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

 msgid "Please insert a Disc in the drive and press enter"
 msgstr "请把盘片插入驱动器再按回车键"
 
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "请把盘片插入驱动器再按回车键"
 

-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140

 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "无法将 %s 挂载到 %s"
 
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "无法将 %s 挂载到 %s"
 

-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179

 msgid ""
 "No CD-ROM could be auto-detected or found using the default mount point.\n"
 "You may try the --cdrom option to set the CD-ROM mount point.\n"
 "See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
 "mount point."
 msgstr ""
 msgid ""
 "No CD-ROM could be auto-detected or found using the default mount point.\n"
 "You may try the --cdrom option to set the CD-ROM mount point.\n"
 "See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
 "mount point."
 msgstr ""

+"从默认挂载点自动检测 CD-ROM 失败。\n"
+"您可以尝试用 --cdrom 选项来设置 CD-ROM 的挂载点。\n"
+"更多关于 CD-ROM 自动检测以及挂载点的信息，请参见‘man apt-cdrom’。"

 
 

-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183

 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
 
 #: cmdline/apt-config.cc:48
 msgid "Arguments not in pairs"
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
 
 #: cmdline/apt-config.cc:48
 msgid "Arguments not in pairs"

-msgstr "参数没有成对"
+msgstr "参数不成对"

 
 #: cmdline/apt-config.cc:89
 msgid ""
 
 #: cmdline/apt-config.cc:89
 msgid ""


@@ -292,75 +288,75 @@ msgstr ""
 "   dump - 显示配置文件\n"
 "\n"
 "选项：\n"
 "   dump - 显示配置文件\n"
 "\n"
 "选项：\n"

-"  -h  本帮助文本。\n"
+"  -h   显示本帮助文本。\n"

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

-#: cmdline/apt-get.cc:245
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:224
+#, c-format

 msgid "Can not find a package for architecture '%s'"
 msgid "Can not find a package for architecture '%s'"

-msgstr "æ\97 æ³\95æ\8c\89ç\85§æ­£å\88\99表达å¼\8f %s æ\89¾å\88°ä»»ä½\95软件包"
+msgstr "æ\89¾ä¸\8då\88°â\80\98%sâ\80\99ä½\93ç³»ç»\93æ\9e\84ä¸\8bç\9a\84软件包"

 
 

-#: cmdline/apt-get.cc:327
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:311
+#, c-format

 msgid "Can not find a package '%s' with version '%s'"
 msgid "Can not find a package '%s' with version '%s'"

-msgstr "æ\97 æ³\95æ\8c\89ç\85§æ­£å\88\99表达å¼\8f %s æ\89¾å\88°ä»»ä½\95软件å\8c\85"
+msgstr "æ\89¾ä¸\8då\88°è½¯ä»¶å\8c\85â\80\98%sâ\80\99ç\9a\84â\80\98%sâ\80\99ç\89\88æ\9c¬"

 
 

-#: cmdline/apt-get.cc:330
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:314
+#, c-format

 msgid "Can not find a package '%s' with release '%s'"
 msgid "Can not find a package '%s' with release '%s'"

-msgstr "æ\97 æ³\95æ\8c\89ç\85§æ­£å\88\99表达å¼\8f %s æ\89¾å\88°ä»»ä½\95软件å\8c\85"
+msgstr "æ\89¾ä¸\8då\88°è½¯ä»¶å\8c\85â\80\98%sâ\80\99ç\9a\84â\80\98%sâ\80\99å\8f\91è¡\8c"

 
 

-#: cmdline/apt-get.cc:367
+#: cmdline/apt-get.cc:358

 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "选择 %s 作为源代码包而非 %s\n"
 
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "选择 %s 作为源代码包而非 %s\n"
 

-#: cmdline/apt-get.cc:423
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:414
+#, c-format

 msgid "Can not find version '%s' of package '%s'"
 msgid "Can not find version '%s' of package '%s'"

-msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
+msgstr "找不到 %2$s 软件包的 %1$s 版本"

 
 

-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445

 #, c-format
 msgid "Couldn't find package %s"
 #, c-format
 msgid "Couldn't find package %s"

-msgstr "æ\97 æ³\95æ\89¾到软件包 %s"
+msgstr "æ\89¾ä¸\8d到软件包 %s"

 
 

-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
+#: apt-private/private-install.cc:863

 #, c-format
 msgid "%s set to manually installed.\n"
 #, c-format
 msgid "%s set to manually installed.\n"

-msgstr "%s 被设置为手动安装。\n"
+msgstr "%s 已设置为手动安装。\n"

 
 

-#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80

 #, c-format
 msgid "%s set to automatically installed.\n"
 #, c-format
 msgid "%s set to automatically installed.\n"

-msgstr "%s 被设置为手动安装。\n"
+msgstr "%s 已设置为自动安装。\n"

 
 

-#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124

 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."

-msgstr ""
+msgstr "该命令已废弃。请用‘apt-mark auto’或‘apt-mark manual’。"

 
 

-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537

 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部错误，问题解决工具坏事了"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部错误，问题解决工具坏事了"
 

-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598

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

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

 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:766 cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074

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

 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"


@@ -369,165 +365,165 @@ msgstr ""
 "提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n"
 "%s\n"
 
 "提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n"
 "%s\n"
 

-#: cmdline/apt-get.cc:791
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:785
+#, c-format

 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "请使用：\n"
 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"
+"bzr branch %s\n"

 "获得该软件包的最近更新(可能尚未正式发布)。\n"
 
 "获得该软件包的最近更新(可能尚未正式发布)。\n"
 

-#: cmdline/apt-get.cc:843
+#: cmdline/apt-get.cc:833

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"

-msgstr "忽略已下载过的文件“%s”\n"
-
-#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "无法获知您在 %s 上的可用空间"
-
-#: cmdline/apt-get.cc:882
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "您在 %s 上没有足够的可用空间"
+msgstr "忽略已下载的文件“%s”\n"

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

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下载 %sB/%sB 的源代码包。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下载 %sB/%sB 的源代码包。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB

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

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

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

-#: cmdline/apt-get.cc:920
+#: cmdline/apt-get.cc:899

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

-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289

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

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

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "忽略已经被解包到 %s 目录的源代码包\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "忽略已经被解包到 %s 目录的源代码包\n"
 

-#: cmdline/apt-get.cc:963
+#: cmdline/apt-get.cc:942

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

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

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

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

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

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

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

 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""

+"找不到关于 %s 的有效体系结构信息。请参见 apt.conf(5) APT::Architectures for "
+"setup"
+
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1057
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "无法处理构建依赖关系"
+
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089

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

-#: cmdline/apt-get.cc:1102
+#: cmdline/apt-get.cc:1109

 #, 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:1272
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1279
+#, c-format

 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"

-msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+msgstr ""
+"由于 %3$s 不被软件包 %4$s 所允许，因此不能满足 %2$s 所要求的 %1$s 依赖关系"

 
 

-#: cmdline/apt-get.cc:1290
+#: cmdline/apt-get.cc:1297

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

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新"
 

-#: cmdline/apt-get.cc:1352
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1359
+#, c-format

 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""

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

 
 

-#: cmdline/apt-get.cc:1358
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1365
+#, c-format

 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"

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

 
 

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

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

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

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

-#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
+#, c-format

 msgid "Changelog for %s (%s)"
 msgid "Changelog for %s (%s)"

-msgstr "正在连接 %s (%s)"
+msgstr "%s (%s) 的 Changelog"

 
 

-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1615

 msgid "Supported modules:"
 msgstr "支持的模块："
 
 msgid "Supported modules:"
 msgstr "支持的模块："
 

-#: cmdline/apt-get.cc:1633
-#, fuzzy
+#: cmdline/apt-get.cc:1656

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


@@ -576,7 +572,7 @@ msgstr ""
 "　　　 apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
 "　　　 apt-get [选项] source 软件包1 [软件包2 ...]\n"
 "\n"
 "　　　 apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
 "　　　 apt-get [选项] source 软件包1 [软件包2 ...]\n"
 "\n"

-"apt-get æ\8f\90ä¾\9bäº\86一个用于下载和安装软件包的简易命令行界面。\n"
+"apt-get æ\98¯一个用于下载和安装软件包的简易命令行界面。\n"

 "最常用命令是 update 和 install。\n"
 "\n"
 "命令：\n"
 "最常用命令是 update 和 install。\n"
 "\n"
 "命令：\n"


@@ -591,10 +587,10 @@ msgstr ""
 "   dist-upgrade - 发布版升级，见 apt-get(8)\n"
 "   dselect-upgrade - 根据 dselect 的选择来进行升级\n"
 "   clean - 删除所有已下载的包文件\n"
 "   dist-upgrade - 发布版升级，见 apt-get(8)\n"
 "   dselect-upgrade - 根据 dselect 的选择来进行升级\n"
 "   clean - 删除所有已下载的包文件\n"

-"   autoclean - 删除老版本的已下载的包文件\n"
+"   autoclean - 删除已下载的旧包文件\n"

 "   check - 核对以确认系统的依赖关系的完整性\n"
 "   check - 核对以确认系统的依赖关系的完整性\n"

-"   markauto - 标记指定的软件包为自动安装\n"
-"   unmarkauto - 标记指定的软件包为手动安装\n"
+"   changelog - 下载指定软件包，并显示其changelog\n"
+"   download - 下载指定的二进制包到当前目录\n"

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


@@ -616,18 +612,17 @@ msgstr ""
 
 #: cmdline/apt-helper.cc:36
 msgid "Need one URL as argument"
 
 #: cmdline/apt-helper.cc:36
 msgid "Need one URL as argument"

-msgstr ""
+msgstr "需要一个 URL 作为参数"

 
 #: cmdline/apt-helper.cc:49
 
 #: cmdline/apt-helper.cc:49

-#, fuzzy

 msgid "Must specify at least one pair url/filename"
 msgid "Must specify at least one pair url/filename"

-msgstr "要下载源代码，必须指定至少一个对应的软件包"
+msgstr "必须指定至少一对URL或者文件名"

 
 

-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79

 msgid "Download Failed"
 msgid "Download Failed"

-msgstr ""
+msgstr "下载失败"

 
 

-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:93

 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"


@@ -640,54 +635,64 @@ msgid ""
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""

+"用法： apt-helper [选项] 命令\n"
+"       apt-helper [选项] download-file URI 目标路径\n"
+"\n"
+"apt-helper 是一个 apt 的内部助手\n"
+"\n"
+"命令：\n"
+"   download-file - 将 URI 指定的文件下载到目标路径\n"
+"   auto-detect-proxy - 用 apt.conf 检测代理设置\n"
+"\n"
+"                       本 APT 助手具有超级喵力。\n"

 
 

-#: cmdline/apt-mark.cc:68
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:65
+#, c-format

 msgid "%s can not be marked as it is not installed.\n"
 msgid "%s can not be marked as it is not installed.\n"

-msgstr "但是它还没有被安装"
+msgstr "%s 还没有安装，因此无法标记。\n"

 
 

-#: cmdline/apt-mark.cc:74
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:71
+#, c-format

 msgid "%s was already set to manually installed.\n"
 msgid "%s was already set to manually installed.\n"

-msgstr "%s 被设置为手动安装。\n"
+msgstr "%s 已经被设置为手动安装。\n"

 
 

-#: cmdline/apt-mark.cc:76
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:73
+#, c-format

 msgid "%s was already set to automatically installed.\n"
 msgid "%s was already set to automatically installed.\n"

-msgstr "%s 被设置为手动安装。\n"
+msgstr "%s 已经被设置为自动安装。\n"

 
 

-#: cmdline/apt-mark.cc:241
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:238
+#, c-format

 msgid "%s was already set on hold.\n"
 msgid "%s was already set on hold.\n"

-msgstr "%s 已经是最新的版本了。\n"
+msgstr "%s 已经设置为保留。\n"

 
 

-#: cmdline/apt-mark.cc:243
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:240
+#, c-format

 msgid "%s was already not hold.\n"
 msgid "%s was already not hold.\n"

-msgstr "%s 已经是最新的版本了。\n"
+msgstr "%s 已经设置为不保留。\n"

 
 

-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
-#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1272
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
+#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303

 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待子进程 %s 的退出，但是它并不存在"
 
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待子进程 %s 的退出，但是它并不存在"
 

-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
+#, c-format

 msgid "%s set on hold.\n"
 msgid "%s set on hold.\n"

-msgstr "%s 已设置为手动安装。\n"
+msgstr "%s 设置为保留。\n"

 
 

-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
+#, c-format

 msgid "Canceled hold on %s.\n"
 msgid "Canceled hold on %s.\n"

-msgstr "无法打开 %s"
+msgstr "取消保留 %s 的设置。\n"

 
 

-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403

 msgid "Executing dpkg failed. Are you root?"
 msgid "Executing dpkg failed. Are you root?"

-msgstr ""
+msgstr "执行 dpkg 失败。您是 root 吗？"

 
 

-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450

 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"


@@ -713,6 +718,29 @@ msgid ""
 "  -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 ""
 "  -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 ""

+"用法：apt-mark [选项] {auto|manual} 软件包1 [软件包2 ...]\n"
+"\n"
+"apt-mark 是一个可以对软件包进行 手动/自动 安装标记的简单命令行界面。\n"
+"它也能列出标记。\n"
+"\n"
+"命令：\n"
+"   auto - 标记指定软件包为自动安装\n"
+"   manual - 标记指定软件包为手动安装\n"
+"   hold - 标记指定软件包为保留(held back)\n"
+"   unhold - 取消指定软件包的保留(held back)标记\n"
+"   showauto - 列出所有自动安装的软件包\n"
+"   showmanual - 列出所有手动安装的软件包\n"
+"   showhold - 列出设为保留的软件包\n"
+"\n"
+"选项：\n"
+"  -h  显示本帮助信息\n"
+"  -q  日志型输出 - 不显示进度\n"
+"  -qq 安静模式，只输出错误信息\n"
+"  -s  无动作。只说明将要做什么。\n"
+"  -f  读取/写入 指定文件的  自动/手动 标记\n"
+"  -c=? 读取指定的配置文件\n"
+"  -o=? 任意设置一个配置项，比如 -o dir::cache=/tmp\n"
+"更多细节请参见 the apt-mark(8) 和 apt.conf(5) 的 man 手册。"

 
 #: cmdline/apt.cc:47
 msgid ""
 
 #: cmdline/apt.cc:47
 msgid ""


@@ -735,6 +763,23 @@ msgid ""
 "\n"
 " edit-sources - edit the source information file\n"
 msgstr ""
 "\n"
 " edit-sources - edit the source information file\n"
 msgstr ""

+"用法： apt [选项] 命令\n"
+"\n"
+"apt 的命令行界面。\n"
+"基本命令：\n"
+" list - 根据名称列出软件包\n"
+" search - 搜索软件包描述\n"
+" show - 显示软件包细节\n"
+"\n"
+" update - 更新可用软件包列表\n"
+"\n"
+" install - 安装软件包\n"
+" remove  - 移除软件包\n"
+"\n"
+" upgrade - 通过 安装/升级 软件来更新系统\n"
+" full-upgrade - 通过 卸载/安装/升级 来更新系统\n"
+"\n"
+" edit-sources - 编辑软件源信息文件\n"

 
 #: methods/cdrom.cc:203
 #, c-format
 
 #: methods/cdrom.cc:203
 #, c-format


@@ -762,16 +807,16 @@ msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。"
 msgid "Disk not found."
 msgstr "找不到盘片。"
 
 msgid "Disk not found."
 msgstr "找不到盘片。"
 

-#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281

 msgid "File not found"
 msgstr "无法找到该文件"
 
 msgid "File not found"
 msgstr "无法找到该文件"
 

-#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598

 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "无法读取状态"
 
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "无法读取状态"
 

-#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605

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


@@ -780,157 +825,157 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "无效的 URI，本地的 URI 不能以 // 开头"
 
 #. Login must be before getpeername otherwise dante won't work.
 msgstr "无效的 URI，本地的 URI 不能以 // 开头"
 
 #. Login must be before getpeername otherwise dante won't work.

-#: methods/ftp.cc:177
+#: methods/ftp.cc:178

 msgid "Logging in"
 msgstr "正在登录"
 
 msgid "Logging in"
 msgstr "正在登录"
 

-#: methods/ftp.cc:183
+#: methods/ftp.cc:184

 msgid "Unable to determine the peer name"
 msgstr "无法获知对方主机名"
 
 msgid "Unable to determine the peer name"
 msgstr "无法获知对方主机名"
 

-#: methods/ftp.cc:188
+#: methods/ftp.cc:189

 msgid "Unable to determine the local name"
 msgstr "无法获知本地主机名"
 
 msgid "Unable to determine the local name"
 msgstr "无法获知本地主机名"
 

-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248

 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "服务器拒绝了我们的连接，响应信息为：%s"
 
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "服务器拒绝了我们的连接，响应信息为：%s"
 

-#: methods/ftp.cc:225
+#: methods/ftp.cc:226

 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER 指令出错，服务器响应信息为：%s"
 
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER 指令出错，服务器响应信息为：%s"
 

-#: methods/ftp.cc:232
+#: methods/ftp.cc:233

 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS 指令出错，服务器响应信息为：%s"
 
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS 指令出错，服务器响应信息为：%s"
 

-#: methods/ftp.cc:252
+#: methods/ftp.cc:253

 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 "您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。"
 
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 "您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。"
 

-#: methods/ftp.cc:280
+#: methods/ftp.cc:281

 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s"
 
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s"
 

-#: methods/ftp.cc:306
+#: methods/ftp.cc:307

 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE 指令出错，服务器响应信息为：%s"
 
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE 指令出错，服务器响应信息为：%s"
 

-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243

 msgid "Connection timeout"
 msgstr "连接超时"
 
 msgid "Connection timeout"
 msgstr "连接超时"
 

-#: methods/ftp.cc:350
+#: methods/ftp.cc:351

 msgid "Server closed the connection"
 msgstr "服务器关闭了连接"
 
 msgid "Server closed the connection"
 msgstr "服务器关闭了连接"
 

-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: methods/ftp.cc:354 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1515
+#: apt-pkg/contrib/fileutl.cc:1524 apt-pkg/contrib/fileutl.cc:1529
+#: apt-pkg/contrib/fileutl.cc:1531

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

-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209

 msgid "A response overflowed the buffer."
 msgstr "回应超出了缓存区大小。"
 
 msgid "A response overflowed the buffer."
 msgstr "回应超出了缓存区大小。"
 

-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390

 msgid "Protocol corruption"
 msgstr "协议有误"
 
 msgid "Protocol corruption"
 msgstr "协议有误"
 

-#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:911
+#: apt-pkg/contrib/fileutl.cc:1637 apt-pkg/contrib/fileutl.cc:1646
+#: apt-pkg/contrib/fileutl.cc:1651 apt-pkg/contrib/fileutl.cc:1653
+#: apt-pkg/contrib/fileutl.cc:1678

 msgid "Write error"
 msgstr "写出错"
 
 msgid "Write error"
 msgstr "写出错"
 

-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743

 msgid "Could not create a socket"
 msgstr "无法创建套接字"
 
 msgid "Could not create a socket"
 msgstr "无法创建套接字"
 

-#: methods/ftp.cc:712
+#: methods/ftp.cc:713

 msgid "Could not connect data socket, connection timed out"
 msgstr "无法连接上数据套接字，连接超时"
 
 msgid "Could not connect data socket, connection timed out"
 msgstr "无法连接上数据套接字，连接超时"
 

-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116

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

-#: methods/ftp.cc:718
+#: methods/ftp.cc:719

 msgid "Could not connect passive socket."
 msgstr "无法连接被动模式的套接字。"
 
 msgid "Could not connect passive socket."
 msgstr "无法连接被动模式的套接字。"
 

-#: methods/ftp.cc:735
+#: methods/ftp.cc:736

 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo 无法得到监听套接字"
 
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo 无法得到监听套接字"
 

-#: methods/ftp.cc:749
+#: methods/ftp.cc:750

 msgid "Could not bind a socket"
 msgstr "无法绑定套接字"
 
 msgid "Could not bind a socket"
 msgstr "无法绑定套接字"
 

-#: methods/ftp.cc:753
+#: methods/ftp.cc:754

 msgid "Could not listen on the socket"
 msgstr "无法在套接字上监听"
 
 msgid "Could not listen on the socket"
 msgstr "无法在套接字上监听"
 

-#: methods/ftp.cc:760
+#: methods/ftp.cc:761

 msgid "Could not determine the socket's name"
 msgstr "无法确定套接字的名字"
 
 msgid "Could not determine the socket's name"
 msgstr "无法确定套接字的名字"
 

-#: methods/ftp.cc:792
+#: methods/ftp.cc:793

 msgid "Unable to send PORT command"
 msgstr "无法发出 PORT 指令"
 
 msgid "Unable to send PORT command"
 msgstr "无法发出 PORT 指令"
 

-#: methods/ftp.cc:802
+#: methods/ftp.cc:803

 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "无法识别的地址族 %u (AF_*)"
 
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "无法识别的地址族 %u (AF_*)"
 

-#: methods/ftp.cc:811
+#: methods/ftp.cc:812

 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT 指令出错，服务器响应信息为：%s"
 
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT 指令出错，服务器响应信息为：%s"
 

-#: methods/ftp.cc:831
+#: methods/ftp.cc:832

 msgid "Data socket connect timed out"
 msgstr "数据套接字连接超时"
 
 msgid "Data socket connect timed out"
 msgstr "数据套接字连接超时"
 

-#: methods/ftp.cc:838
+#: methods/ftp.cc:839

 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 

-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319

 msgid "Problem hashing file"
 msgstr "把文件加入哈希表时出错"
 
 msgid "Problem hashing file"
 msgstr "把文件加入哈希表时出错"
 

-#: methods/ftp.cc:890
+#: methods/ftp.cc:892

 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "无法获取文件，服务器响应信息为“%s”"
 
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "无法获取文件，服务器响应信息为“%s”"
 

-#: methods/ftp.cc:905 methods/rsh.cc:335
+#: methods/ftp.cc:907 methods/rsh.cc:338

 msgid "Data socket timed out"
 msgstr "数据套接字超时"
 
 msgid "Data socket timed out"
 msgstr "数据套接字超时"
 

-#: methods/ftp.cc:935
+#: methods/ftp.cc:944

 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "数据传送出错，服务器响应信息为“%s”"
 
 #. Get the files information
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "数据传送出错，服务器响应信息为“%s”"
 
 #. Get the files information

-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027

 msgid "Query"
 msgstr "查询"
 
 msgid "Query"
 msgstr "查询"
 

-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141

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


@@ -966,7 +1011,7 @@ msgstr "无法连接上 %s:%s (%s)。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going

-#: methods/connect.cc:154 methods/rsh.cc:439
+#: methods/connect.cc:154 methods/rsh.cc:442

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


@@ -982,9 +1027,9 @@ msgid "Temporary failure resolving '%s'"
 msgstr "暂时不能解析域名“%s”"
 
 #: methods/connect.cc:209
 msgstr "暂时不能解析域名“%s”"
 
 #: methods/connect.cc:209

-#, fuzzy, c-format
+#, c-format

 msgid "System error resolving '%s:%s'"
 msgid "System error resolving '%s:%s'"

-msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"
+msgstr "解析“%s:%s”时出现系统故障"

 
 #: methods/connect.cc:211
 #, c-format
 
 #: methods/connect.cc:211
 #, c-format


@@ -996,70 +1041,70 @@ msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "不能连接到 %s：%s："
 
 msgid "Unable to connect to %s:%s:"
 msgstr "不能连接到 %s：%s："
 

-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！"
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！"
 

-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162

 msgid "At least one invalid signature was encountered."
 msgstr "至少发现一个无效的签名。"
 
 msgid "At least one invalid signature was encountered."
 msgstr "至少发现一个无效的签名。"
 

-#: methods/gpgv.cc:174
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)"
+#: methods/gpgv.cc:164
+msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
+msgstr "无法运行 apt-key 以验证签名(您安装了 gnupg 吗？)"

 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'

-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170

 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"

-msgstr ""
+msgstr "明文签署文件不可用，结果为‘%s’（您的网络需要认证吗？）"

 
 

-#: methods/gpgv.cc:184
-msgid "Unknown error executing gpgv"
-msgstr "运行 gpgv 时发生未知错误"
+#: methods/gpgv.cc:174
+msgid "Unknown error executing apt-key"
+msgstr "运行 apt-key 时发生未知错误"

 
 

-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214

 msgid "The following signatures were invalid:\n"
 msgstr "下列签名无效：\n"
 
 msgid "The following signatures were invalid:\n"
 msgstr "下列签名无效：\n"
 

-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "由于没有公钥，无法验证下列签名：\n"
 
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "由于没有公钥，无法验证下列签名：\n"
 

-#: methods/gzip.cc:69
+#: methods/gzip.cc:79

 msgid "Empty files can't be valid archives"
 msgid "Empty files can't be valid archives"

-msgstr ""
+msgstr "空文件不能当作有效归档"

 
 

-#: methods/http.cc:511
+#: methods/http.cc:517

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

-#: methods/http.cc:525
+#: methods/http.cc:531

 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 

-#: methods/http.cc:527
+#: methods/http.cc:533

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

-#: methods/http.cc:563
+#: methods/http.cc:569

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

-#: methods/http.cc:623
+#: methods/http.cc:629

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

-#: methods/http.cc:628
+#: methods/http.cc:634

 msgid "Connection timed out"
 msgstr "连接超时"
 
 msgid "Connection timed out"
 msgstr "连接超时"
 

-#: methods/http.cc:651
+#: methods/http.cc:657

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


@@ -1067,239 +1112,394 @@ msgstr "写输出文件时出错"
 msgid "Waiting for headers"
 msgstr "正在等待报头"
 
 msgid "Waiting for headers"
 msgstr "正在等待报头"
 

-#: methods/server.cc:110
+#: methods/server.cc:111

 msgid "Bad header line"
 msgstr "错误的报头行"
 
 msgid "Bad header line"
 msgstr "错误的报头行"
 

-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143

 msgid "The HTTP server sent an invalid reply header"
 msgstr "该 HTTP 服务器发送了一个无效的应答报头"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "该 HTTP 服务器发送了一个无效的应答报头"
 

-#: methods/server.cc:172
+#: methods/server.cc:173

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
 

-#: methods/server.cc:195
+#: methods/server.cc:193

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
 

-#: methods/server.cc:197
+#: methods/server.cc:195

 msgid "This HTTP server has broken range support"
 msgstr "该 HTTP 服务器的 range 支持不正常"
 
 msgid "This HTTP server has broken range support"
 msgstr "该 HTTP 服务器的 range 支持不正常"
 

-#: methods/server.cc:221
+#: methods/server.cc:219

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

-#: methods/server.cc:490
+#: methods/server.cc:506

 msgid "Bad header data"
 msgstr "错误的报头数据"
 
 msgid "Bad header data"
 msgstr "错误的报头数据"
 

-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:523 methods/server.cc:617

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

-#: methods/server.cc:655
+#: methods/server.cc:589
+#, c-format
+msgid ""
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
+msgstr ""
+
+#: methods/server.cc:712

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

-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "命中 "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "获取："
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "忽略 "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "错误 "
-
-#: apt-private/acqprogress.cc:146
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "下载 %sB，耗时 %s (%sB/s)\n"
-
-#: apt-private/acqprogress.cc:236
-#, c-format
-msgid " [Working]"
-msgstr " [执行中]"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "正在列表"

 
 

-#: apt-private/acqprogress.cc:297
+#: apt-private/private-list.cc:151

 #, c-format
 #, c-format

-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"更换介质：请把标有\n"
-"“%s”\n"
-"的盘片插入驱动器“%s”再按回车键\n"
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "还有 %i 个版本。请使用 -a 选项来查看它(他们)。"

 
 

-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95

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

-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98

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

-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101

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

-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104

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

-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106

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

-#: apt-private/private-cachefile.cc:108
+#: apt-private/private-cachefile.cc:110

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

-#: apt-private/private-cachefile.cc:111
+#: apt-private/private-cachefile.cc:113

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

-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "【警告】：下列软件包不能通过验证！"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "忽略了认证警告。\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "有些软件包不能通过验证"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "不经验证就安装这些软件包吗？"
-
-#: apt-private/private-download.cc:59 apt-private/private-install.cc:210
-msgid "There are problems and -y was used without --force-yes"
-msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "未知"

 
 

-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-output.cc:265

 #, c-format
 #, c-format

-msgid "Failed to fetch %s  %s\n"
-msgstr "无法下载 %s  %s\n"
+msgid "[installed,upgradable to: %s]"
+msgstr "[已安装，可升级至：%s]"

 
 

-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr "[已安装，本地]"

 
 

-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[已安装，可自动卸载]"

 
 

-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "内部错误，Ordering 未能完成"
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr "[已安装，自动]"

 
 

-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧"
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr "[已安装]"

 
 

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

 #, c-format
 #, c-format

-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "需要下载 %sB/%sB 的软件包。\n"
+msgid "[upgradable from: %s]"
+msgstr "[可从该版本升级：%s]"

 
 

-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "需要下载 %sB 的软件包。\n"
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[配置文件残留]"

 
 

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

 #, c-format
 #, c-format

-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
+msgid "but %s is installed"
+msgstr "但是 %s 已经安装"

 
 

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

 #, c-format
 #, c-format

-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "解压缩后将会空出 %sB 的空间。\n"
+msgid "but %s is to be installed"
+msgstr "但是 %s 正要被安装"

 
 

-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "您在 %s 上没有足够的可用空间。"
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "但无法安装它"

 
 

-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。"
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "但是它是虚拟软件包"

 
 

-#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
-#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "是，按我说的做！"
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "但是它还没有被安装"

 
 

-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"您的操作会导致潜在的危害。\n"
-"若还想继续的话，就输入下面的短句“%s”\n"
-" ?] "
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "但是它将不会被安装"

 
 

-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "中止执行。"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " 或"

 
 

-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "您希望继续执行吗？"
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "下列软件包有未满足的依赖关系："

 
 

-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "有一些文件无法下载"
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "下列【新】软件包将被安装："

 
 

-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
-"再试试？"
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "下列软件包将被【卸载】："

 
 

-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "目前还不支持 --fix-missing 和介质交换"
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "下列软件包的版本将保持不变："
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "下列软件包将被升级："
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "下列软件包将被【降级】："
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "下列被要求保持版本不变的软件包将被改变："
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (是由于 %s)"
+
+#: apt-private/private-output.cc:696
+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"
+"请勿尝试，除非您确实知道您在做什么！"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "重新安装了 %lu 个软件包，"
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "降级了 %lu 个软件包，"
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "编译正则表达式时出错 - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr " update 命令不需要参数"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"有 %i 个软件包可以升级。请执行 ‘apt list --upgradable’ 来查看它们。\n"
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr "所有软件包均为最新。"
+
+#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
+msgid "Sorting"
+msgstr "正在排序"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "有 %i 条附加记录。请加上 ‘-a’ 参数来查看它们"
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "不是一个实包(虚包)"
+
+#: apt-private/private-main.cc:32
+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"
+"　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！"
+
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "内部错误，Ordering 未能完成"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧"
+
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "需要下载 %sB/%sB 的软件包。\n"
+
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "需要下载 %sB 的软件包。\n"
+
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
+
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "解压缩后将会空出 %sB 的空间。\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
+
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。"
+
+#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
+#. careful with hard to type or special characters (like non-breaking spaces)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "是，按我说的做！"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"您的操作会导致潜在的危害。\n"
+"若还想继续的话，就输入下面的短句“%s”\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "中止执行。"
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "您希望继续执行吗？"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "有一些文件无法下载"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
+"再试试？"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "目前还不支持 --fix-missing 和介质交换"

 
 

-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:304

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

-#: apt-private/private-install.cc:330
+#: apt-private/private-install.cc:305

 msgid "Aborting install."
 msgstr "中止安装。"
 
 msgid "Aborting install."
 msgstr "中止安装。"
 

-#: apt-private/private-install.cc:366
+#: apt-private/private-install.cc:341

 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"


@@ -1308,15 +1508,15 @@ msgid_plural ""
 "all files have been overwritten by other packages:"
 msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失："
 
 "all files have been overwritten by other packages:"
 msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失："
 

-#: apt-private/private-install.cc:370
+#: apt-private/private-install.cc:345

 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "注意：这是自动被 dpkg 有意完成的。"
 
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "注意：这是自动被 dpkg 有意完成的。"
 

-#: apt-private/private-install.cc:391
+#: apt-private/private-install.cc:366

 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 "我们不应该进行删除，无法启动自动删除器"
 

-#: apt-private/private-install.cc:499
+#: apt-private/private-install.cc:474

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


@@ -1332,15 +1532,15 @@ msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请
 #. "that package should be filed.") << std::endl;
 #. }
 #.
 #. "that package should be filed.") << std::endl;
 #. }
 #.

-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627

 msgid "The following information may help to resolve the situation:"
 msgstr "下列信息可能会对解决问题有所帮助："
 
 msgid "The following information may help to resolve the situation:"
 msgstr "下列信息可能会对解决问题有所帮助："
 

-#: apt-private/private-install.cc:506
+#: apt-private/private-install.cc:481

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部错误，自动卸载工具坏事了"
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部错误，自动卸载工具坏事了"
 

-#: apt-private/private-install.cc:513
+#: apt-private/private-install.cc:488

 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""


@@ -1348,24 +1548,23 @@ msgid_plural ""
 "required:"
 msgstr[0] "下列软件包是自动安装的并且现在不需要了："
 
 "required:"
 msgstr[0] "下列软件包是自动安装的并且现在不需要了："
 

-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:492

 #, c-format
 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"
 
 #, c-format
 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"
 

-#: apt-private/private-install.cc:519
-#, fuzzy
+#: apt-private/private-install.cc:494

 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."

-msgstr[0] "使用'apt-get autoremove'来卸载它们"
+msgstr[0] "使用'apt-get autoremove'来卸载它(它们)。"

 
 

-#: apt-private/private-install.cc:612
+#: apt-private/private-install.cc:587

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

-#: apt-private/private-install.cc:614
+#: apt-private/private-install.cc:589

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


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

-#: apt-private/private-install.cc:638
+#: apt-private/private-install.cc:612

 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"


@@ -1384,312 +1583,170 @@ msgstr ""
 "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
 "包尚未被创建或是它们已被从新到(Incoming)目录移出。"
 
 "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
 "包尚未被创建或是它们已被从新到(Incoming)目录移出。"
 

-#: apt-private/private-install.cc:659
+#: apt-private/private-install.cc:633

 msgid "Broken packages"
 msgstr "破损的软件包"
 
 msgid "Broken packages"
 msgstr "破损的软件包"
 

-#: apt-private/private-install.cc:712
+#: apt-private/private-install.cc:710

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

-#: apt-private/private-install.cc:802
+#: apt-private/private-install.cc:800

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

-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:801

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

-#: apt-private/private-install.cc:825
+#: apt-private/private-install.cc:823

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

-#: apt-private/private-install.cc:829
+#: apt-private/private-install.cc:827

 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n"
 
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n"
 

-#: apt-private/private-install.cc:841
+#: apt-private/private-install.cc:839

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

-#: apt-private/private-install.cc:846
+#: apt-private/private-install.cc:844

 #, c-format
 msgid "%s is already the newest version.\n"
 #, c-format
 msgid "%s is already the newest version.\n"

-msgstr "%s 已经是最新的版本了。\n"
+msgstr "%s 已经是最新的版本。\n"

 
 

-#: apt-private/private-install.cc:894
+#: apt-private/private-install.cc:892

 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
 
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
 

-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
+#: apt-private/private-install.cc:897
+#, c-format

 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"

-msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
+msgstr "由于 %4$s，为 %3$s 选定了版本 %1$s (%2$s)\n"

 
 #. TRANSLATORS: Note, this is not an interactive question
 
 #. TRANSLATORS: Note, this is not an interactive question

-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
+#: apt-private/private-install.cc:939
+#, c-format

 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"

-msgstr "软件包 %s 还未安装，因而不会被卸载\n"
+msgstr "软件包 %s 还未安装，因而不会被卸载。您的意思是 ‘%s’ 吗？\n"

 
 

-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
+#: apt-private/private-install.cc:945
+#, c-format

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

-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
+#: apt-private/private-download.cc:62

 #, c-format
 #, c-format

-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-
-#: apt-private/private-main.cc:32

 msgid ""
 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!"
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."

 msgstr ""
 msgstr ""

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

 
 

-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "【警告】：下列软件包不能通过验证！"

 
 

-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [已安装]"
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "忽略了认证警告。\n"

 
 

-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [已安装]"
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "有些软件包不能通过验证"

 
 

-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "不经验证就安装这些软件包吗？"

 
 

-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [已安装]"
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "无法下载 %s  %s\n"

 
 

-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [已安装]"
+#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "无法获知您在 %s 上的可用空间"

 
 

-#: apt-private/private-output.cc:277
+#: apt-private/private-download.cc:188

 #, c-format
 #, c-format

-msgid "[upgradable from: %s]"
-msgstr ""
+msgid "You don't have enough free space in %s."
+msgstr "您在 %s 上没有足够的可用空间。"

 
 

-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "但是 %s 已经安装"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "但是 %s 正要被安装"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "但无法安装它"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "但是它是虚拟软件包"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "但是它还没有被安装"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "但是它将不会被安装"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " 或"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "下列软件包有未满足的依赖关系："
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "下列【新】软件包将被安装："
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "下列软件包将被【卸载】："
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "下列软件包的版本将保持不变："
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "下列软件包将被升级："
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "下列软件包将被【降级】："
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "下列被要求保持版本不变的软件包将被改变："
-
-#: apt-private/private-output.cc:688
+#: apt-private/private-sources.cc:58

 #, c-format
 #, c-format

-msgid "%s (due to %s) "
-msgstr "%s (是由于 %s) "
-
-#: apt-private/private-output.cc:696
-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"
-"请勿尝试，除非您确实知道您在做什么！"
+msgid "Failed to parse %s. Edit again? "
+msgstr "解析 %s 失败。请重新编辑之后再试。"

 
 

-#: apt-private/private-output.cc:727
+#: apt-private/private-sources.cc:70

 #, c-format
 #, c-format

-msgid "%lu upgraded, %lu newly installed, "
-msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr "您的 %s 文件有过改动，请执行 ‘apt-get update’。"

 
 

-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "重新安装了 %lu 个软件包，"
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr "全文搜索"

 
 

-#: apt-private/private-output.cc:733
+#: apt-private/acqprogress.cc:66

 #, c-format
 #, c-format

-msgid "%lu downgraded, "
-msgstr "降级了 %lu 个软件包，"
+msgid "Hit:%lu %s"
+msgstr "命中:%lu %s"

 
 

-#: apt-private/private-output.cc:735
+#: apt-private/acqprogress.cc:88

 #, c-format
 #, c-format

-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "è¦\81å\8d¸è½½ %lu 个软件å\8c\85ï¼\8cæ\9c\89 %lu 个软件å\8c\85æ\9cªè¢«å\8d\87级ã\80\82\n"
+msgid "Get:%lu %s"
+msgstr "è\8e·å\8f\96:%lu %s"

 
 

-#: apt-private/private-output.cc:739
+#: apt-private/acqprogress.cc:119

 #, c-format
 #, c-format

-msgid "%lu not fully installed or removed.\n"
-msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
+msgid "Ign:%lu %s"
+msgstr "忽略:%lu %s"

 
 

-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/acqprogress.cc:126

 #, c-format
 #, c-format

-msgid "Regex compilation error - %s"
-msgstr "编译正则表达式时出错 - %s"
-
-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
-msgstr ""
+msgid "Err:%lu %s"
+msgstr "错误:%lu %s"

 
 

-#: apt-private/private-show.cc:156
+#: apt-private/acqprogress.cc:150

 #, c-format
 #, c-format

-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "无法将 %s 重命名为 %s"
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "下载 %sB，耗时 %s (%sB/s)\n"

 
 

-#: apt-private/private-sources.cc:70
+#: apt-private/acqprogress.cc:240

 #, c-format
 #, c-format

-msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr " update 命令不需要参数"
+msgid " [Working]"
+msgstr " [执行中]"

 
 

-#: apt-private/private-update.cc:90
+#: apt-private/acqprogress.cc:301

 #, c-format
 #, c-format

-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-
-#: apt-private/private-update.cc:94
-msgid "All packages are up to date."
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"

 msgstr ""
 msgstr ""

-
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "正在对升级进行计算... "
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "完成"
+"更换介质：请把标有\n"
+"“%s”\n"
+"的盘片插入驱动器“%s”再按回车键\n"

 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 
 #. 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:471 apt-pkg/acquire.cc:494
-#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368
-#: apt-pkg/contrib/fileutl.cc:481
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471

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

-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201

 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"


@@ -1705,14 +1762,14 @@ msgstr "没有找到镜像文件 %s"
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287

-#, fuzzy, c-format
+#, c-format

 msgid "Can not read mirror file '%s'"
 msgid "Can not read mirror file '%s'"

-msgstr "没æ\9c\89æ\89¾å\88°镜像文件 %s"
+msgstr "æ\97 æ³\95读å\8f\96镜像文件 %s"

 
 #: methods/mirror.cc:315
 
 #: methods/mirror.cc:315

-#, fuzzy, c-format
+#, c-format

 msgid "No entry found in mirror file '%s'"
 msgid "No entry found in mirror file '%s'"

-msgstr "没有找到镜像文件 %s"
+msgstr "在镜像文件 %s 中未找到所需条目"

 
 #: methods/mirror.cc:445
 #, c-format
 
 #: methods/mirror.cc:445
 #, c-format


@@ -1723,7 +1780,7 @@ msgstr "[镜像：%s]"
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "无法为子进程创建 IPC 管道"
 
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "无法为子进程创建 IPC 管道"
 

-#: methods/rsh.cc:343
+#: methods/rsh.cc:346

 msgid "Connection closed prematurely"
 msgstr "连接被永久关闭"
 
 msgid "Connection closed prematurely"
 msgstr "连接被永久关闭"
 


@@ -1761,7 +1818,7 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们，
 msgid "Merging available information"
 msgstr "正在合并可用信息"
 
 msgid "Merging available information"
 msgstr "正在合并可用信息"
 

-#: cmdline/apt-extracttemplates.cc:224
+#: cmdline/apt-extracttemplates.cc:229

 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"


@@ -1785,45 +1842,46 @@ msgstr ""
 "  -c=? 读指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 
 "  -c=? 读指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 

-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, c-format

 msgid "Unable to mkstemp %s"
 msgid "Unable to mkstemp %s"

-msgstr "无法读取 %s 的状态"
+msgstr "无法建立临时文件(mkstemp) %s "

 
 

-#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097

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

-#: cmdline/apt-extracttemplates.cc:300
+#: cmdline/apt-extracttemplates.cc:305

 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
 
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
 

-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370

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

-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318

 #, c-format
 msgid "Error processing directory %s"
 msgstr "处理目录 %s 时出错"
 
 #, c-format
 msgid "Error processing directory %s"
 msgstr "处理目录 %s 时出错"
 

-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280

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

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

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

-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430

 #, c-format
 msgid "Error processing contents %s"
 msgstr "处理目录 %s 时出错"
 
 #, c-format
 msgid "Error processing contents %s"
 msgstr "处理目录 %s 时出错"
 

-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625

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


@@ -1903,137 +1961,136 @@ msgstr ""
 "  -c=?  读取指定配置文件\n"
 "  -o=?  设置任意指定的配置选项"
 
 "  -c=?  读取指定配置文件\n"
 "  -o=?  设置任意指定的配置选项"
 

-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821

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

-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906

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

-#: ftparchive/cachedb.cc:65
+#: ftparchive/cachedb.cc:67

 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old"
 
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old"
 

-#: ftparchive/cachedb.cc:83
+#: ftparchive/cachedb.cc:85

 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "数据库已过期，现尝试进行升级 %s"
 
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "数据库已过期，现尝试进行升级 %s"
 

-#: ftparchive/cachedb.cc:94
+#: ftparchive/cachedb.cc:96

 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 "数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。"
 
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 "数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。"
 

-#: ftparchive/cachedb.cc:99
+#: ftparchive/cachedb.cc:101

 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "无法打开数据库文件 %s：%s"
 
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "无法打开数据库文件 %s：%s"
 

-#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199

 #: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "无法获得 %s 的状态"
 
 #: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "无法获得 %s 的状态"
 

-#: ftparchive/cachedb.cc:332
-#, fuzzy
+#: ftparchive/cachedb.cc:326

 msgid "Failed to read .dsc"
 msgid "Failed to read .dsc"

-msgstr "无法读取符号链接 %s"
+msgstr "读取 .dsc 文件失败"

 
 

-#: ftparchive/cachedb.cc:365
+#: ftparchive/cachedb.cc:359

 msgid "Archive has no control record"
 msgstr "归档文件没有包含控制字段"
 
 msgid "Archive has no control record"
 msgstr "归档文件没有包含控制字段"
 

-#: ftparchive/cachedb.cc:594
+#: ftparchive/cachedb.cc:526

 msgid "Unable to get a cursor"
 msgstr "无法获得游标"
 
 msgid "Unable to get a cursor"
 msgstr "无法获得游标"
 

-#: ftparchive/writer.cc:91
+#: ftparchive/writer.cc:104

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

-#: ftparchive/writer.cc:96
+#: ftparchive/writer.cc:109

 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "警告：无法获得 %s 的状态\n"
 
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "警告：无法获得 %s 的状态\n"
 

-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:165

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

-#: ftparchive/writer.cc:154
+#: ftparchive/writer.cc:167

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

-#: ftparchive/writer.cc:161
+#: ftparchive/writer.cc:174

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

-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224

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

-#: ftparchive/writer.cc:192
+#: ftparchive/writer.cc:205

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

-#: ftparchive/writer.cc:219
+#: ftparchive/writer.cc:232

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

-#: ftparchive/writer.cc:278
+#: ftparchive/writer.cc:291

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

-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:299

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

-#: ftparchive/writer.cc:290
+#: ftparchive/writer.cc:303

 #, c-format
 msgid "Failed to unlink %s"
 msgstr "无法使用 unlink 删除 %s"
 
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "无法使用 unlink 删除 %s"
 

-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:311

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

-#: ftparchive/writer.cc:308
+#: ftparchive/writer.cc:321

 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " 达到了 DeLink 的上限 %sB。\n"
 
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " 达到了 DeLink 的上限 %sB。\n"
 

-#: ftparchive/writer.cc:417
+#: ftparchive/writer.cc:427

 msgid "Archive had no package field"
 msgstr "归档文件没有包含 package 字段"
 
 msgid "Archive had no package field"
 msgstr "归档文件没有包含 package 字段"
 

-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698

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

-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862

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

-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:712

 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s 没有源代码的 override 项\n"
 
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s 没有源代码的 override 项\n"
 

-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:716

 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s 中没有二进制文件的 override 项\n"
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s 中没有二进制文件的 override 项\n"


@@ -2050,9 +2107,9 @@ msgstr "无法打开 %s"
 #. skip spaces
 #. find end of word
 #: ftparchive/override.cc:68
 #. skip spaces
 #. find end of word
 #: ftparchive/override.cc:68

-#, fuzzy, c-format
+#, c-format

 msgid "Malformed override %s line %llu (%s)"
 msgid "Malformed override %s line %llu (%s)"

-msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
+msgstr "override 文件 %s 第 %llu (%s) 行的格式有误"

 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format


@@ -2060,19 +2117,19 @@ msgid "Failed to read the override file %s"
 msgstr "无法读取 override 文件 %s"
 
 #: ftparchive/override.cc:166
 msgstr "无法读取 override 文件 %s"
 
 #: ftparchive/override.cc:166

-#, fuzzy, c-format
+#, c-format

 msgid "Malformed override %s line %llu #1"
 msgid "Malformed override %s line %llu #1"

-msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
+msgstr "override 文件 %s 第 %llu 行的格式有误 #1"

 
 #: ftparchive/override.cc:178
 
 #: ftparchive/override.cc:178

-#, fuzzy, c-format
+#, c-format

 msgid "Malformed override %s line %llu #2"
 msgid "Malformed override %s line %llu #2"

-msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
+msgstr "override 文件 %s 第 %llu 行的格式有误 #2"

 
 #: ftparchive/override.cc:191
 
 #: ftparchive/override.cc:191

-#, fuzzy, c-format
+#, c-format

 msgid "Malformed override %s line %llu #3"
 msgid "Malformed override %s line %llu #3"

-msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
+msgstr "override 文件 %s 第 %llu 行的格式有误 #3"

 
 #: ftparchive/multicompress.cc:73
 #, c-format
 
 #: ftparchive/multicompress.cc:73
 #, c-format


@@ -2119,8 +2176,7 @@ msgstr "在使用 unlink 删除 %s 时出错"
 msgid "Failed to rename %s to %s"
 msgstr "无法将 %s 重命名为 %s"
 
 msgid "Failed to rename %s to %s"
 msgstr "无法将 %s 重命名为 %s"
 

-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
+#: cmdline/apt-internal-solver.cc:51

 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"


@@ -2133,22 +2189,22 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""

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

 "\n"
 "\n"

-"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
-"信息的工具\n"
+"apt-internal-solver 是个用于调试及类似用途的接口，它可以\n"
+"像 APT 家族外部解决器(resolver)那样使用当前的内部解决器。\n"

 "\n"
 "选项：\n"
 "\n"
 "选项：\n"

-"  -h   本帮助文本\n"
-"  -t   设置 temp 目录\n"
-"  -c=? 读指定的配置文件\n"
-"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
+"  -h  显示本帮助。\n"
+"  -q  日志型输出 - 无进度指示\n"
+"  -c=? 读取指定配置文件\n"
+"  -o=? 设置任意配置项，比如 -o dir::cache=/tmp\n"

 
 

-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91

 msgid "Unknown package record!"
 msgstr "未知的软件包记录！"
 
 msgid "Unknown package record!"
 msgstr "未知的软件包记录！"
 

-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155

 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"


@@ -2172,751 +2228,498 @@ msgstr ""
 "  -c=? 读取指定配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 
 "  -c=? 读取指定配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 

-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-pkg/install-progress.cc:59

 #, c-format
 #, c-format

-msgid "Failed to write file %s"
-msgstr "无法写入文件 %s"
+msgid "Progress: [%3i%%]"
+msgstr "进度：[%3i%%]"

 
 

-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "无法关闭文件 %s"
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
+msgid "Running dpkg"
+msgstr "正在运行 dpkg"

 
 

-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: apt-pkg/init.cc:156

 #, c-format
 #, c-format

-msgid "The path %s is too long"
-msgstr "路径名 %s 太长"
+msgid "Packaging system '%s' is not supported"
+msgstr "不支持“%s”打包系统"

 
 

-#: apt-inst/extract.cc:132
+#: apt-pkg/init.cc:172
+msgid "Unable to determine a suitable packaging system type"
+msgstr "无法确定适合的打包系统类型"
+
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775

 #, c-format
 #, c-format

-msgid "Unpacking %s more than once"
-msgstr "%s 被解包了不只一次"
+msgid "Wrote %i records.\n"
+msgstr "已写入 %i 条记录。\n"

 
 

-#: apt-inst/extract.cc:142
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777

 #, c-format
 #, c-format

-msgid "The directory %s is diverted"
-msgstr "目录 %s 已被转移"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"

 
 

-#: apt-inst/extract.cc:152
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780

 #, c-format
 #, c-format

-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "该软件包正尝试写入转移对象 %s/%s"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"

 
 

-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "该转移路径太长"
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"

 
 

-#: apt-inst/extract.cc:249
+#: apt-pkg/indexcopy.cc:515

 #, c-format
 #, c-format

-msgid "The directory %s is being replaced by a non-directory"
-msgstr "目录 %s 要被一个非目录的文件替换"
+msgid "Can't find authentication record for: %s"
+msgstr "无法找到认证记录：%s"

 
 

-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "无法在其散列桶中分配节点"
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash 校验和不符：%s"

 
 

-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "路径名太长"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"

 
 

-#: apt-inst/extract.cc:421
+#: apt-pkg/acquire-worker.cc:135

 #, c-format
 #, c-format

-msgid "Overwrite package match with no version for %s"
-msgstr "用来覆盖的软件包不属于 %s 的任何版本"
+msgid "Is the package %s installed?"
+msgstr "请检查是否安装了 %s 软件包"

 
 

-#: apt-inst/extract.cc:438
+#: apt-pkg/acquire-worker.cc:186

 #, c-format
 #, c-format

-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
-
-#: apt-inst/extract.cc:498
-#, c-format
-msgid "Unable to stat %s"
-msgstr "无法读取 %s 的状态"
-
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "把 DropNode 用在了仍在链表中的节点上"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "无法定位哈希表元素！"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "无法分配转移项"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "内部错误，出现在 AddDiversion"
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s"
-
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "添加了两个转移项 %s-> %s"
-
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "重复的配置文件 %s/%s"
-
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "无效的归档签名"
-
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "读取归档成员文件头出错"
-
-#: apt-inst/contrib/arfile.cc:96
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "归档文件中成员文件头 %s 无效"
-
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "归档文件中成员文件头无效"
-
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "归档文件太短"
-
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "无法读取归档文件的数据头"
-
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "无法创建管道"
-
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "无法执行 gzip"
-
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "包文件已被损坏"
-
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar 的校验和不符，文件已损坏"
-
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "未知的 TAR 数据头类型 %u，成员 %s"
-
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
-
-#: apt-inst/deb/debfile.cc:132
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "内部错误，无法定位包内文件 %s"
-
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "不能解析的主控文件"
-
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "软件包列表的目录 %spartial 缺失。"
-
-#: apt-pkg/acquire.cc:91
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "仓库目录 %spartial 确实。"
-
-#: apt-pkg/acquire.cc:99
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "无法对目录 %s 加锁"
-
-#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "不支持索引文件类型“%s”"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:902
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
-
-#: apt-pkg/acquire.cc:904
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "正在下载第 %li 个文件，共 %li 个"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "无法重命名文件，%s (%s -> %s)。"
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Hash 校验和不符"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "大小不符"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "无效的操作 %s"
-
-#: apt-pkg/acquire-item.cc:1573
-#, 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:1589
-#, fuzzy, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "无法解析软件包仓库 Release 文件 %s"
-
-#: apt-pkg/acquire-item.cc:1631
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "以下 ID 的密钥没有可用的公钥：\n"
-
-#: apt-pkg/acquire-item.cc:1669
-#, 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:1691
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
-
-#: apt-pkg/acquire-item.cc:1721
-#, c-format
-msgid ""
-"An error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
-msgstr ""
-"校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG 错误：%s: %s"
-
-#: apt-pkg/acquire-item.cc:1859
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
-"包。(缘于架构缺失)"
-
-#: apt-pkg/acquire-item.cc:1925
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1983
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-
-#: apt-pkg/algorithms.cc:265
-#, 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:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
-"缘故。"
-
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
-"系。"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "无法解析或打开软件包的列表或是状态文件。"
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "您可能需要运行 apt-get update 来解决这些问题"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "无法读取源列表。"
-
-#: apt-pkg/cacheset.cc:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "未找到“%2$s”的“%1$s”发布版本"
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "未找到“%2$s”的“%1$s”版本"
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "无法找到任务 %s"
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
-
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "无法从完全虚拟的软件包 %s 中选择版本"
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, 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:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "因为软件包 %s 没有候选版本，无法进行选择"
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
-
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "源列表 %2$s 的第 %1$u 行太长了。"
-
-#: apt-pkg/cdrom.cc:571
-msgid "Unmounting CD-ROM...\n"
-msgstr "正在卸载 CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:586
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
-
-#: apt-pkg/cdrom.cc:599
-msgid "Waiting for disc...\n"
-msgstr "等待插入盘片……\n"
-
-#: apt-pkg/cdrom.cc:609
-msgid "Mounting CD-ROM...\n"
-msgstr "正在挂载 CD-ROM 文件系统……\n"
-
-#: apt-pkg/cdrom.cc:620
-msgid "Identifying... "
-msgstr "正在鉴别... "
-
-#: apt-pkg/cdrom.cc:662
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "已归档文件的标签：%s\n"
-
-#: apt-pkg/cdrom.cc:680
-msgid "Scanning disc for index files...\n"
-msgstr "正在盘片中查找索引文件...\n"
+msgid "Method %s did not start correctly"
+msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"

 
 

-#: apt-pkg/cdrom.cc:734
+#: apt-pkg/acquire-worker.cc:485

 #, c-format
 #, c-format

-msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
-msgstr ""
-"找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
-"名\n"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"

 
 

-#: apt-pkg/cdrom.cc:744
-msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
-msgstr ""
-"无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构"
-"架。"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "无法解析或打开软件包的列表或是状态文件。"

 
 

-#: apt-pkg/cdrom.cc:771
-#, c-format
-msgid "Found label '%s'\n"
-msgstr "找到标签 '%s'\n"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "您可能需要运行 apt-get update 来解决这些问题"

 
 

-#: apt-pkg/cdrom.cc:800
-msgid "That is not a valid name, try again.\n"
-msgstr "这不是一个有效的名字，请重试。\n"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "无法读取源列表。"

 
 

-#: apt-pkg/cdrom.cc:817
-#, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
-msgstr ""
-"这张盘片现在的名字是：\n"
-"“%s”\n"
+#: apt-pkg/pkgcache.cc:154
+msgid "Empty package cache"
+msgstr "软件包缓存区是空的"

 
 

-#: apt-pkg/cdrom.cc:819
-msgid "Copying package lists..."
-msgstr "正在复制软件包列表……"
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
+msgid "The package cache file is corrupted"
+msgstr "软件包缓存文件损坏了"

 
 

-#: apt-pkg/cdrom.cc:863
-msgid "Writing new source list\n"
-msgstr "正在写入新的源列表\n"
+#: apt-pkg/pkgcache.cc:165
+msgid "The package cache file is an incompatible version"
+msgstr "软件包缓存区文件的版本不兼容"

 
 

-#: apt-pkg/cdrom.cc:874
-msgid "Source list entries for this disc are:\n"
-msgstr "对应于该盘片的软件源设置项是：\n"
+#: apt-pkg/pkgcache.cc:168
+msgid "The package cache file is corrupted, it is too small"
+msgstr "软件包缓存文件损坏，它太小了"

 
 

-#: apt-pkg/clean.cc:64
+#: apt-pkg/pkgcache.cc:175

 #, c-format
 #, c-format

-msgid "Unable to stat %s."
-msgstr "æ\97 æ³\95读å\8f\96 %s ç\9a\84ç\8a¶æ\80\81ã\80\82"
+msgid "This APT does not support the versioning system '%s'"
+msgstr "æ\9c¬ç¨\8båº\8fç\9b®å\89\8dä¸\8dæ\94¯æ\8c\81â\80\9c%sâ\80\9dç\89\88æ\9c¬ç³»ç»\9f"

 
 

-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "正在分析软件包的依赖关系树"
+#: apt-pkg/pkgcache.cc:185
+#, fuzzy, c-format
+msgid "The package cache was built for different architectures: %s vs %s"
+msgstr "软件包缓存区是为其它架构的硬件构建的"

 
 

-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "候选版本"
+#: apt-pkg/pkgcache.cc:322
+msgid "Depends"
+msgstr "依赖"

 
 

-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "生成依赖关系"
+#: apt-pkg/pkgcache.cc:322
+msgid "PreDepends"
+msgstr "预依赖"

 
 

-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "正在读取状态信息"
+#: apt-pkg/pkgcache.cc:322
+msgid "Suggests"
+msgstr "建议"

 
 

-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "无法打开状态文件 %s"
+#: apt-pkg/pkgcache.cc:323
+msgid "Recommends"
+msgstr "推荐"

 
 

-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "无法写入临时状态文件 %s"
+#: apt-pkg/pkgcache.cc:323
+msgid "Conflicts"
+msgstr "冲突"

 
 

-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/pkgcache.cc:323
+msgid "Replaces"
+msgstr "替换"

 
 

-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/pkgcache.cc:324
+msgid "Obsoletes"
+msgstr "废弃"

 
 

-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/pkgcache.cc:324
+msgid "Breaks"
+msgstr "破坏"

 
 

-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/pkgcache.cc:324
+msgid "Enhances"
+msgstr "增强"

 
 

-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/pkgcache.cc:335
+msgid "important"
+msgstr "重要"

 
 

-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "已写入 %i 条记录。\n"
+#: apt-pkg/pkgcache.cc:335
+msgid "required"
+msgstr "必需"

 
 

-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
+#: apt-pkg/pkgcache.cc:335
+msgid "standard"
+msgstr "标准"

 
 

-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"
+#: apt-pkg/pkgcache.cc:336
+msgid "optional"
+msgstr "可选"

 
 

-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
+#: apt-pkg/pkgcache.cc:336
+msgid "extra"
+msgstr "额外"

 
 

-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "无法找到认证记录：%s"
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "正在对升级进行计算"

 
 

-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/pkgrecords.cc:38

 #, c-format
 #, c-format

-msgid "Hash mismatch for: %s"
-msgstr "Hash 校验和不符：%s"
+msgid "Index file type '%s' is not supported"
+msgstr "不支持索引文件类型“%s”"

 
 

-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/sourcelist.cc:127

 #, c-format
 #, c-format

-msgid "Unable to parse Release file %s"
-msgstr "无法解析软件包仓库 Release 文件 %s"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "安装源配置文件“%2$s”第 %1$u 节有错误(URI 解析)"

 
 

-#: apt-pkg/indexrecords.cc:86
+#: apt-pkg/sourcelist.cc:170

 #, c-format
 #, c-format

-msgid "No sections in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"

 
 

-#: apt-pkg/indexrecords.cc:117
+#: apt-pkg/sourcelist.cc:173

 #, c-format
 #, c-format

-msgid "No Hash entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"

 
 

-#: apt-pkg/indexrecords.cc:130
+#: apt-pkg/sourcelist.cc:184

 #, c-format
 #, c-format

-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"

 
 

-#: apt-pkg/indexrecords.cc:149
+#: apt-pkg/sourcelist.cc:190

 #, c-format
 #, c-format

-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"

 
 

-#: apt-pkg/init.cc:146
+#: apt-pkg/sourcelist.cc:193

 #, c-format
 #, c-format

-msgid "Packaging system '%s' is not supported"
-msgstr "不支持“%s”打包系统"
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr "无法确定适合的打包系统类型"
+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/install-progress.cc:57
+#: apt-pkg/sourcelist.cc:206

 #, c-format
 #, c-format

-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr "正在运行 dpkg"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"

 
 

-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: apt-pkg/sourcelist.cc:208

 #, c-format
 #, c-format

-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
-"(%d)"
-
-#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "无法打开文件 %s"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"

 
 

-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/sourcelist.cc:211

 #, c-format
 #, c-format

-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"由于这次安装存在着一个 Conflicts/Pre-Depends 循环，因而需要暂时删除一个必不可"
-"少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::"
-"Force-LoopBreak 选项。"
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "软件包缓存区是空的"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "软件包缓存文件损坏了"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "软件包缓存区文件的版本不兼容"
-
-#: apt-pkg/pkgcache.cc:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "软件包缓存文件损坏了"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"

 
 

-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/sourcelist.cc:217

 #, c-format
 #, c-format

-msgid "This APT does not support the versioning system '%s'"
-msgstr "本程序目前不支持“%s”版本系统"
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "软件包缓存区是为其它架构的硬件构建的"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "依赖"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "预依赖"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "建议"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "推荐"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "冲突"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "替换"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"

 
 

-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "废弃"
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"

 
 

-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr "破坏"
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "正在打开 %s"

 
 

-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr "增强"
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "源列表 %2$s 的第 %1$u 行太长了。"

 
 

-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "重要"
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"

 
 

-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "必需"
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"

 
 

-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "标准"
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "无法识别在源列表 %3$s 里，第 %2$u 节中的软件包类别“%1$s”"

 
 

-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "可选"
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr "%s 的 Clean (清理)不被支持"

 
 

-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "额外"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "无法读取 %s 的状态。"

 
 

-#: apt-pkg/pkgcachegen.cc:93
+#: apt-pkg/pkgcachegen.cc:113

 msgid "Cache has an incompatible versioning system"
 msgstr "软件包暂存区使用的是不兼容的版本控制系统"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 msgid "Cache has an incompatible versioning system"
 msgstr "软件包暂存区使用的是不兼容的版本控制系统"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info

-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382

 #: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
 #: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
 #: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
 #: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
 #: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
 #: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440

-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format

 msgid "Error occurred while processing %s (%s%d)"
 msgid "Error occurred while processing %s (%s%d)"

-msgstr "处理 %s (FindPkg)时出错"
+msgstr "处理 %s (%s%d) 时出错"

 
 

-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:273

 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "哇，软件包数量超出了本 APT 的处理能力。"
 
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "哇，软件包数量超出了本 APT 的处理能力。"
 

-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:276

 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
 
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
 

-#: apt-pkg/pkgcachegen.cc:263
+#: apt-pkg/pkgcachegen.cc:279

 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
 
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
 

-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:282

 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
 
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
 

-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/pkgcachegen.cc:591

 #, 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:1211
+#: apt-pkg/pkgcachegen.cc:1196

 #, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551

 msgid "Reading package lists"
 msgstr "正在读取软件包列表"
 
 msgid "Reading package lists"
 msgstr "正在读取软件包列表"
 

-#: apt-pkg/pkgcachegen.cc:1316
+#: apt-pkg/pkgcachegen.cc:1301

 msgid "Collecting File Provides"
 msgstr "正在收集文件所提供的软件包"
 
 msgid "Collecting File Provides"
 msgstr "正在收集文件所提供的软件包"
 

-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500

 msgid "IO Error saving source cache"
 msgstr "无法读取或写入软件源缓存"
 
 msgid "IO Error saving source cache"
 msgstr "无法读取或写入软件源缓存"
 

-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "向solver发送情景"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "向solver发送请求"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "准备接收解决方案"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "外部solver出错，错误信息不恰当"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "执行外部solver"
+
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108

 #, c-format
 #, c-format

-msgid "Index file type '%s' is not supported"
-msgstr "不支持索引文件类型“%s”"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "无法重命名文件，%s (%s -> %s)。"
+
+#: apt-pkg/acquire-item.cc:240
+msgid "Hash Sum mismatch"
+msgstr "Hash 校验和不符"
+
+#: apt-pkg/acquire-item.cc:245
+msgid "Size mismatch"
+msgstr "大小不符"
+
+#: apt-pkg/acquire-item.cc:250
+msgid "Invalid file format"
+msgstr "无效的文件格式 %s"
+
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "写出错"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"An error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s\n"
+msgstr ""
+"校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG 错误：%s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "目录 %s 已被转移"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
+#, c-format
+msgid ""
+"The data from '%s' is not signed. Packages from that repository can not be "
+"authenticated."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1956
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"在 Release 文件中找不到期望的条目 %s（sources.list条目有误，或者文件有误）"
+
+#: apt-pkg/acquire-item.cc:1975
+#, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "在 Release 文件中找不到 %s 的哈希值"
+
+#: apt-pkg/acquire-item.cc:1999
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "以下 ID 的密钥没有可用的公钥：\n"
+
+#: apt-pkg/acquire-item.cc:2037
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+"%s 的 Release 文件已经过期(invalid since %s)。该仓库的更新将不会被应用。"
+
+#: apt-pkg/acquire-item.cc:2059
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
+
+#: apt-pkg/acquire-item.cc:2078
+#, c-format
+msgid ""
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2249
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
+"包。(缘于架构缺失)"
+
+#: apt-pkg/acquire-item.cc:2315
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr "没有源可以用来下载 %s 版本的 %s"
+
+#: apt-pkg/acquire-item.cc:2351
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
+
+#: apt-pkg/vendorlist.cc:83
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "软件提供者数据块内 %s 没有包含指纹信息"
+
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
+#, c-format
+msgid "List directory %spartial is missing."
+msgstr "软件包列表的目录 %spartial 缺失。"
+
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "仓库目录 %spartial 确实。"
+
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "无法对目录 %s 加锁"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:981
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
+
+#: apt-pkg/acquire.cc:983
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "正在下载第 %li 个文件，共 %li 个"
+
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"

 
 #: apt-pkg/policy.cc:83
 #, c-format
 
 #: apt-pkg/policy.cc:83
 #, c-format


@@ -2924,6 +2727,7 @@ msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
 "available in the sources"
 msgstr ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
 "available in the sources"
 msgstr ""

+"'%s' 这个值对 APT::Default-Release 是无效的，因为在源里找不到这样的发行"

 
 #: apt-pkg/policy.cc:422
 #, c-format
 
 #: apt-pkg/policy.cc:422
 #, c-format


@@ -2939,336 +2743,403 @@ msgstr "无法识别锁定的类型 %s"
 msgid "No priority (or zero) specified for pin"
 msgstr "没有为版本锁定指定优先级(或为零)"
 
 msgid "No priority (or zero) specified for pin"
 msgstr "没有为版本锁定指定优先级(或为零)"
 

-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
-
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
+"(%d)"

 
 

-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
+msgid "Could not configure '%s'. "
+msgstr "无法配置 %s。"

 
 

-#: apt-pkg/sourcelist.cc:184
+#: apt-pkg/packagemanager.cc:643

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"由于这次安装存在着一个 Conflicts/Pre-Depends 循环，因而需要暂时删除一个必不可"
+"少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::"
+"Force-LoopBreak 选项。"

 
 

-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr "部分索引文件下载失败。如果忽略它们，那将转而使用旧的索引文件。"

 
 

-#: apt-pkg/sourcelist.cc:193
-#, 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/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "正在卸载 CD-ROM...\n"

 
 

-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/cdrom.cc:586

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
+msgid "Using CD-ROM mount point %s\n"
+msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"

 
 

-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
+#: apt-pkg/cdrom.cc:599
+msgid "Waiting for disc...\n"
+msgstr "等待插入盘片……\n"

 
 

-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
+#: apt-pkg/cdrom.cc:609
+msgid "Mounting CD-ROM...\n"
+msgstr "正在挂载 CD-ROM 文件系统……\n"

 
 

-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
+msgstr "正在鉴别... "

 
 

-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/cdrom.cc:662

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
+msgid "Stored label: %s\n"
+msgstr "已归档文件的标签：%s\n"
+
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "正在盘片中查找索引文件...\n"

 
 

-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/cdrom.cc:734

 #, c-format
 #, c-format

-msgid "Opening %s"
-msgstr "正在打开 %s"
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
+msgstr ""
+"找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
+"名\n"

 
 

-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/cdrom.cc:744
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+"无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构"
+"架。"
+
+#: apt-pkg/cdrom.cc:771

 #, c-format
 #, c-format

-msgid "Malformed line %u in source list %s (type)"
-msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
+msgid "Found label '%s'\n"
+msgstr "找到标签 '%s'\n"

 
 

-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/cdrom.cc:800
+msgid "That is not a valid name, try again.\n"
+msgstr "这不是一个有效的名字，请重试。\n"
+
+#: apt-pkg/cdrom.cc:817

 #, c-format
 #, c-format

-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"这张盘片现在的名字是：\n"
+"“%s”\n"

 
 

-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
+#: apt-pkg/cdrom.cc:819
+msgid "Copying package lists..."
+msgstr "正在复制软件包列表……"

 
 

-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "æ\82¨å¿\85é¡»å\9c¨æ\82¨ç\9a\84 sources.list å\86\99å\85¥ä¸\80äº\9bâ\80\9c软件æº\90â\80\9dç\9a\84 URI"
+#: apt-pkg/cdrom.cc:866
+msgid "Writing new source list\n"
+msgstr "æ­£å\9c¨å\86\99å\85¥æ\96°ç\9a\84æº\90å\88\97表\n"

 
 

-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "无法解析软件包文件 %s (1)"
+#: apt-pkg/cdrom.cc:877
+msgid "Source list entries for this disc are:\n"
+msgstr "对应于该盘片的软件源设置项是：\n"

 
 

-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/algorithms.cc:265

 #, c-format
 #, c-format

-msgid "Unable to parse package file %s (2)"
-msgstr "无法解析软件包文件 %s (2)"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"

 
 

-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
+#: apt-pkg/algorithms.cc:1090

 msgid ""
 msgid ""

-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
+"缘故。"
+
+#: apt-pkg/algorithms.cc:1092
+msgid "Unable to correct problems, you have held broken packages."

 msgstr ""
 msgstr ""

-"有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
+"无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
+"系。"
+
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "正在分析软件包的依赖关系树"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候选版本"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "生成依赖关系"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "正在读取状态信息"

 
 

-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/depcache.cc:252

 #, c-format
 #, c-format

-msgid "Vendor block %s contains no fingerprint"
-msgstr "软件提供者数据块内 %s 没有包含指纹信息"
+msgid "Failed to open StateFile %s"
+msgstr "无法打开状态文件 %s"

 
 

-#: apt-pkg/contrib/cdromutl.cc:65
+#: apt-pkg/depcache.cc:258

 #, c-format
 #, c-format

-msgid "Unable to stat the mount point %s"
-msgstr "无法读取文件系统挂载点 %s 的状态"
+msgid "Failed to write temporary StateFile %s"
+msgstr "无法写入临时状态文件 %s"

 
 

-#: apt-pkg/contrib/cdromutl.cc:246
-msgid "Failed to stat the cdrom"
-msgstr "无法读取盘片的状态"
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "无法解析软件包文件 %s (%d)"

 
 

-#: apt-pkg/contrib/cmndline.cc:121
+#: apt-pkg/cacheset.cc:501

 #, c-format
 #, c-format

-msgid "Command line option '%c' [from %s] is not known."
-msgstr "未知的命令行选项“%c” [来自 %s]"
+msgid "Release '%s' for '%s' was not found"
+msgstr "未找到“%2$s”的“%1$s”发布版本"

 
 

-#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-pkg/cacheset.cc:504

 #, c-format
 #, c-format

-msgid "Command line option %s is not understood"
-msgstr "æ\97 æ³\95è¯\86å\88«å\91½ä»¤è¡\8cé\80\89项 %s"
+msgid "Version '%s' for '%s' was not found"
+msgstr "æ\9cªæ\89¾å\88°â\80\9c%2$sâ\80\9dç\9a\84â\80\9c%1$sâ\80\9dç\89\88æ\9c¬"

 
 

-#: apt-pkg/contrib/cmndline.cc:168
+#: apt-pkg/cacheset.cc:629

 #, c-format
 #, c-format

-msgid "Command line option %s is not boolean"
-msgstr "命令行选项 %s 不是布尔值"
+msgid "Couldn't find task '%s'"
+msgstr "无法找到任务 %s"

 
 

-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#: apt-pkg/cacheset.cc:635

 #, c-format
 #, c-format

-msgid "Option %s requires an argument."
-msgstr "选项 %s 要求有一个参数"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"

 
 

-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#: apt-pkg/cacheset.cc:641

 #, c-format
 #, c-format

-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "无法按照 glob ‘%s’ 找到任何软件包"

 
 

-#: apt-pkg/contrib/cmndline.cc:278
+#: apt-pkg/cacheset.cc:680

 #, c-format
 #, c-format

-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "无法从完全虚拟的软件包 %s 中选择版本"

 
 

-#: apt-pkg/contrib/cmndline.cc:309
+#: apt-pkg/cacheset.cc:719

 #, c-format
 #, c-format

-msgid "Option '%s' is too long"
-msgstr "选项“%s”太长"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"

 
 

-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/cacheset.cc:727

 #, c-format
 #, c-format

-msgid "Sense %s is not understood, try true or false."
-msgstr "不能识别参数 %s，请用 true 或 false"
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "因为软件包 %s 没有候选版本，无法进行选择"

 
 

-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/cacheset.cc:735

 #, c-format
 #, c-format

-msgid "Invalid operation %s"
-msgstr "无效的操作 %s"
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"

 
 

-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751

 #, c-format
 #, c-format

-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "无法识别的类型缩写：“%c”"
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择"

 
 

-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/indexrecords.cc:83

 #, c-format
 #, c-format

-msgid "Opening configuration file %s"
-msgstr "æ­£å\9c¨æ\89\93å¼\80é\85\8dç½®文件 %s"
+msgid "Unable to parse Release file %s"
+msgstr "æ\97 æ³\95解æ\9e\90软件å\8c\85ä»\93åº\93 Release 文件 %s"

 
 

-#: apt-pkg/contrib/configuration.cc:801
+#: apt-pkg/indexrecords.cc:91

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "语æ³\95é\94\99误 %s:%uï¼\9aé\85\8dç½®å°\8fè\8a\82没æ\9c\89以å\90\8då­\97å¼\80头"
+msgid "No sections in Release file %s"
+msgstr "软件å\8c\85ä»\93åº\93 Release æ\96\87件 %s å\86\85æ\97 ç»\84ä»¶ç« è\8a\82ä¿¡æ\81¯"

 
 

-#: apt-pkg/contrib/configuration.cc:820
+#: apt-pkg/indexrecords.cc:132

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "语æ³\95é\94\99误 %s:%uï¼\9aæ \87ç­¾æ ¼å¼\8fæ\9c\89误"
+msgid "No Hash entry in Release file %s"
+msgstr "软件å\8c\85ä»\93åº\93 Release æ\96\87件 %s å\86\85æ\97 å\93\88å¸\8cæ\9d¡ç\9b®"

 
 

-#: apt-pkg/contrib/configuration.cc:837
+#: apt-pkg/indexrecords.cc:145

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "语æ³\95é\94\99误 %s:%uï¼\9aé\85\8dç½®å\80¼å\90\8eæ\9c\89å¤\9aä½\99ç\9a\84æ\97 æ\84\8fä¹\89æ\95°æ\8d®"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "软件å\8c\85ä»\93åº\93 Release æ\96\87件 %s å\86\85 Valid-Until æ\9d¡ç\9b®æ\97 æ\95\88"

 
 

-#: apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/indexrecords.cc:164

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "语æ³\95é\94\99误 %s:%uï¼\9aå\8fªè\83½å\9c¨é¡¶å±\82é\85\8dç½®æ\96\87件中使ç\94¨æ\8c\87示"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "软件å\8c\85ä»\93åº\93 Release æ\96\87件 %s å\86\85 Date æ\9d¡ç\9b®æ\97 æ\95\88"

 
 

-#: apt-pkg/contrib/configuration.cc:884
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
+msgid "%lid %lih %limin %lis"
+msgstr "%li天 %li小时 %li分 %li秒"

 
 

-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Included from here"
-msgstr "语法错误 %s:%u：Included from here"
+msgid "%lih %limin %lis"
+msgstr "%li小时 %li分 %li秒"

 
 

-#: apt-pkg/contrib/configuration.cc:897
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "语法错误 %s:%u：不支持的指令“%s”"
+msgid "%limin %lis"
+msgstr "%li分 %li秒"

 
 

-#: apt-pkg/contrib/configuration.cc:900
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数"
+msgid "%lis"
+msgstr "%li秒"

 
 

-#: apt-pkg/contrib/configuration.cc:950
+#: apt-pkg/contrib/strutl.cc:1290

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"
+msgid "Selection %s not found"
+msgstr "找不到您选则的 %s"

 
 

-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196

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

-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201

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

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

 #, 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:360 apt-pkg/contrib/fileutl.cc:474
+#: apt-pkg/contrib/fileutl.cc:366 apt-pkg/contrib/fileutl.cc:480

 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"

-msgstr ""
+msgstr "无法创建文件列表，因为‘%s’不是一个目录"

 
 

-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400

 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"

-msgstr ""
+msgstr "忽略‘%s’(于目录‘%s’)，鉴于它不是一个常规文件"

 
 

-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418

 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"

-msgstr ""
+msgstr "忽略‘%s’(于目录‘%s’)，鉴于它没有文件扩展名"

 
 

-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427

 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"

-msgstr ""
+msgstr "忽略‘%s’(于目录‘%s’)，鉴于它的文件扩展名无效"

 
 

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

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

 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "子进程 %s 收到信号 %u。"
 
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "子进程 %s 收到信号 %u。"
 

-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212

 #, 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:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205

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

-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952

 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "关闭 gzip %s 文件出错"
 
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "关闭 gzip %s 文件出错"
 

-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140

 #, 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:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246

 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "无法打开文件描述符 %d"
 
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "无法打开文件描述符 %d"
 

-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123

 msgid "Failed to create subprocess IPC"
 msgstr "无法创建子进程的 IPC 管道"
 
 msgid "Failed to create subprocess IPC"
 msgstr "无法创建子进程的 IPC 管道"
 

-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412

 msgid "Failed to exec compressor "
 msgstr "无法执行压缩程序"
 
 msgid "Failed to exec compressor "
 msgstr "无法执行压缩程序"
 

-#: apt-pkg/contrib/fileutl.cc:1514
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:1553
+#, c-format

 msgid "read, still have %llu to read but none left"
 msgid "read, still have %llu to read but none left"

-msgstr "读å\8f\96æ\96\87件å\87ºé\94\99ï¼\8cè¿\98å\89© %lu å­\97è\8a\82没æ\9c\89读å\87º"
+msgstr "è¿\98å\89© %llu å­\97è\8a\82没æ\9c\89读å\87ºï¼\8cä½\86已没æ\9c\89å\8f¯è¯»ä¿¡æ\81¯"

 
 

-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
+#, c-format

 msgid "write, still have %llu to write but couldn't"
 msgid "write, still have %llu to write but couldn't"

-msgstr "写入文件出错，还剩 %lu 字节没有保存"
+msgstr "还剩 %llu 字节没有写入，但无法写入操作"

 
 

-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954

 #, c-format
 msgid "Problem closing the file %s"
 msgstr "关闭文件 %s 出错"
 
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "关闭文件 %s 出错"
 

-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965

 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "重命名文件 %s 为 %s 出错"
 
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "重命名文件 %s 为 %s 出错"
 

-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976

 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "用 unlink 删除文件 %s 出错"
 
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "用 unlink 删除文件 %s 出错"
 

-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989

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

-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... 有错误！"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... 完成"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr "..."
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197

 #, c-format
 #, c-format

-msgid "No keyring installed in %s."
-msgstr "%s 中没有安装密钥环。"
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"

 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"


@@ -3280,9 +3151,9 @@ msgid "Couldn't duplicate file descriptor %i"
 msgstr "无法为复制文件描述符 %i"
 
 #: apt-pkg/contrib/mmap.cc:119
 msgstr "无法为复制文件描述符 %i"
 
 #: apt-pkg/contrib/mmap.cc:119

-#, fuzzy, c-format
+#, c-format

 msgid "Couldn't make mmap of %llu bytes"
 msgid "Couldn't make mmap of %llu bytes"

-msgstr "无法 mmap %lu 字节的数据"
+msgstr "无法 mmap %llu 字节的数据"

 
 #: apt-pkg/contrib/mmap.cc:146
 msgid "Unable to close mmap"
 
 #: apt-pkg/contrib/mmap.cc:146
 msgid "Unable to close mmap"


@@ -3322,217 +3193,441 @@ msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"
 
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"
 

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

 #, c-format
 #, c-format

-msgid "%c%s... Error!"
-msgstr "%c%s... æ\9c\89é\94\99误ï¼\81"
+msgid "Unable to stat the mount point %s"
+msgstr "æ\97 æ³\95读å\8f\96æ\96\87件系ç»\9fæ\8c\82è½½ç\82¹ %s ç\9a\84ç\8a¶æ\80\81"

 
 

-#: apt-pkg/contrib/progress.cc:150
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "无法读取盘片的状态"
+
+#: apt-pkg/contrib/configuration.cc:522
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "无法识别的类型缩写：“%c”"
+
+#: apt-pkg/contrib/configuration.cc:636
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "正在打开配置文件 %s"
+
+#: apt-pkg/contrib/configuration.cc:804
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "语法错误 %s:%u：配置小节没有以名字开头"
+
+#: apt-pkg/contrib/configuration.cc:823
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "语法错误 %s:%u：标签格式有误"
+
+#: apt-pkg/contrib/configuration.cc:840
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "语法错误 %s:%u：配置值后有多余的无意义数据"
+
+#: apt-pkg/contrib/configuration.cc:880
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "语法错误 %s:%u：只能在顶层配置文件中使用指示"
+
+#: apt-pkg/contrib/configuration.cc:887
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
+
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "语法错误 %s:%u：Included from here"
+
+#: apt-pkg/contrib/configuration.cc:900

 #, c-format
 #, c-format

-msgid "%c%s... Done"
-msgstr "%c%s... 完成"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "语法错误 %s:%u：不支持的指令“%s”"

 
 

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

 
 

-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:197
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... 完成"
+#: apt-pkg/contrib/configuration.cc:953
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"

 
 

-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: apt-pkg/contrib/cmndline.cc:127

 #, c-format
 #, c-format

-msgid "%lid %lih %limin %lis"
-msgstr "%li天 %li小时 %li分 %li秒"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "未知的命令行选项“%c” [来自 %s]"

 
 

-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169

 #, c-format
 #, c-format

-msgid "%lih %limin %lis"
-msgstr "%li小时 %li分 %li秒"
+msgid "Command line option %s is not understood"
+msgstr "无法识别命令行选项 %s"

 
 

-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/cmndline.cc:174

 #, c-format
 #, c-format

-msgid "%limin %lis"
-msgstr "%li分 %li秒"
+msgid "Command line option %s is not boolean"
+msgstr "命令行选项 %s 不是布尔值"

 
 

-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236

 #, c-format
 #, c-format

-msgid "%lis"
-msgstr "%li秒"
+msgid "Option %s requires an argument."
+msgstr "选项 %s 要求有一个参数"

 
 

-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255

 #, c-format
 #, c-format

-msgid "Selection %s not found"
-msgstr "找不到您选则的 %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定"

 
 

-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/cmndline.cc:284

 #, c-format
 #, c-format

-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"

 
 

-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/cmndline.cc:315

 #, c-format
 #, c-format

-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"
+msgid "Option '%s' is too long"
+msgstr "选项“%s”太长"

 
 

-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/cmndline.cc:347

 #, c-format
 #, c-format

-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。"
+msgid "Sense %s is not understood, try true or false."
+msgstr "不能识别参数 %s，请用 true 或 false"

 
 

-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "未锁定"
+#: apt-pkg/contrib/cmndline.cc:397
+#, c-format
+msgid "Invalid operation %s"
+msgstr "无效的操作 %s"

 
 

-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:112

 #, c-format
 msgid "Installing %s"
 msgstr "正在安装 %s"
 
 #, c-format
 msgid "Installing %s"
 msgstr "正在安装 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008

 #, c-format
 msgid "Configuring %s"
 msgstr "正在配置 %s"
 
 #, c-format
 msgid "Configuring %s"
 msgstr "正在配置 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015

 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
 
 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/deb/dpkgpm.cc:115

 #, c-format
 msgid "Completely removing %s"
 msgstr "完全删除 %s"
 
 #, c-format
 msgid "Completely removing %s"
 msgstr "完全删除 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/deb/dpkgpm.cc:116

 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "注意到 %s 已经消失"
 
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "注意到 %s 已经消失"
 

-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/deb/dpkgpm.cc:117

 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "执行安装后执行的触发器 %s"
 
 #. FIXME: use a better string after freeze
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "执行安装后执行的触发器 %s"
 
 #. FIXME: use a better string after freeze

-#: apt-pkg/deb/dpkgpm.cc:830
+#: apt-pkg/deb/dpkgpm.cc:839

 #, c-format
 msgid "Directory '%s' missing"
 msgstr "目录 %s 缺失"
 
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "目录 %s 缺失"
 

-#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876

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

-#: apt-pkg/deb/dpkgpm.cc:992
+#: apt-pkg/deb/dpkgpm.cc:1001

 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 
 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:993
+#: apt-pkg/deb/dpkgpm.cc:1002

 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:998
+#: apt-pkg/deb/dpkgpm.cc:1007

 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:1000
+#: apt-pkg/deb/dpkgpm.cc:1009

 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 
 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/deb/dpkgpm.cc:1014

 #, 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:1007
+#: apt-pkg/deb/dpkgpm.cc:1016

 #, c-format
 msgid "Removed %s"
 msgstr "已删除 %s"
 
 #, c-format
 msgid "Removed %s"
 msgstr "已删除 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/deb/dpkgpm.cc:1021

 #, 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:1013
+#: apt-pkg/deb/dpkgpm.cc:1022

 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 
 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
-#: apt-pkg/deb/dpkgpm.cc:1150
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format

 msgid "Can not write log (%s)"
 msgid "Can not write log (%s)"

-msgstr "无法写入 %s"
+msgstr "无法写入日志 (%s)"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169

 msgid "Is /dev/pts mounted?"
 msgid "Is /dev/pts mounted?"

-msgstr ""
+msgstr "/dev/pts 挂载了吗？"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1124
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1656

 msgid "Operation was interrupted before it could finish"
 msgid "Operation was interrupted before it could finish"

-msgstr ""
+msgstr "操作在完成之前被打断"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1687
+#: apt-pkg/deb/dpkgpm.cc:1718

 msgid "No apport report written because MaxReports is reached already"
 msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。"
 
 #. check if its not a follow up error
 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:1692
+#: apt-pkg/deb/dpkgpm.cc:1723

 msgid "dependency problems - leaving unconfigured"
 msgstr "依赖问题 - 保持未配置"
 
 msgid "dependency problems - leaving unconfigured"
 msgstr "依赖问题 - 保持未配置"
 

-#: apt-pkg/deb/dpkgpm.cc:1694
+#: apt-pkg/deb/dpkgpm.cc:1725

 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。"
 
 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:1700
+#: apt-pkg/deb/dpkgpm.cc:1731

 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
 
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
 

-#: apt-pkg/deb/dpkgpm.cc:1707
+#: apt-pkg/deb/dpkgpm.cc:1738

 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
 
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
 

-#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
-#, fuzzy
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751

 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"

-msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
+msgstr "错误信息显示本地系统有一些问题，因此没有写入 apport 报告"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1742
+#: apt-pkg/deb/dpkgpm.cc:1773

 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"
 
 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:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg 被中断，您必须手工运行 ‘%s’ 解决此问题。"
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "未锁定"
+
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "把 DropNode 用在了仍在链表中的节点上"
+
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "无法定位哈希表元素！"
+
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "无法分配转移项"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "内部错误，出现在 AddDiversion"
+
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s"
+
+#: apt-inst/filelist.cc:506
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "添加了两个转移项 %s-> %s"
+
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "重复的配置文件 %s/%s"
+
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#, c-format
+msgid "The path %s is too long"
+msgstr "路径名 %s 太长"
+
+#: apt-inst/extract.cc:132
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "%s 被解包了不只一次"
+
+#: apt-inst/extract.cc:142
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "目录 %s 已被转移"
+
+#: apt-inst/extract.cc:152
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "该软件包正尝试写入转移对象 %s/%s"
+
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "该转移路径太长"
+
+#: apt-inst/extract.cc:249
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "目录 %s 要被一个非目录的文件替换"
+
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "无法在其散列桶中分配节点"
+
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "路径名太长"
+
+#: apt-inst/extract.cc:421
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "用来覆盖的软件包不属于 %s 的任何版本"
+
+#: apt-inst/extract.cc:438
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
+
+#: apt-inst/extract.cc:498
+#, c-format
+msgid "Unable to stat %s"
+msgstr "无法读取 %s 的状态"
+
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "无法写入文件 %s"
+
+#: apt-inst/dirstream.cc:104
+#, c-format
+msgid "Failed to close file %s"
+msgstr "无法关闭文件 %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
+
+#: apt-inst/deb/debfile.cc:132
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "内部错误，无法定位包内文件 %s"
+
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "不能解析的主控文件"
+
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "无效的归档签名"
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "读取归档成员文件头出错"
+
+#: apt-inst/contrib/arfile.cc:96
+#, c-format
+msgid "Invalid archive member header %s"
+msgstr "归档文件中成员文件头 %s 无效"
+
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "归档文件中成员文件头无效"
+
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "归档文件太短"
+
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "无法读取归档文件的数据头"
+
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "无法创建管道"
+
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "无法执行 gzip"
+
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "包文件已被损坏"
+
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar 的校验和不符，文件已损坏"
+
+#: apt-inst/contrib/extracttar.cc:312
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "未知的 TAR 数据头类型 %u，成员 %s"
+
+#~ msgid "Total dependency version space: "
+#~ msgstr "依赖关系版本名所占空间共计："
+
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "您在 %s 上没有足够的可用空间"
+
+#~ msgid "Done"
+#~ msgstr "完成"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "%s 中没有安装密钥环。"
+
+#~ msgid "Is stdout a terminal?"
+#~ msgstr "stdout 是终端吗？"
+

 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
 #~ msgstr "内部错误，全部升级工具坏事了"
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
 #~ msgstr "内部错误，全部升级工具坏事了"