Dutch program translation update

[apt.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7e2865552428276242f784dc423c6c1fe8b42dd8..67e69f716703711173af418805495d9347dcaca5 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,160 +9,163 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2012-06-27 11:17+0200\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"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "PO-Revision-Date: 2010-08-26 14:42+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"

-"Language: \n"
+"Language: zh_CN\n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: apt-private/private-show.cc:58

 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "软件包文件 %s 尚未同步。"
 
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "软件包文件 %s 尚未同步。"
 

-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
-#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:46
-#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
+#: 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
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173

 msgid "No packages found"
 msgstr "没有发现匹配的软件包"
 
 msgid "No packages found"
 msgstr "没有发现匹配的软件包"
 

-#: cmdline/apt-cache.cc:1222
+#: cmdline/apt-cache.cc:1254 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:1357
+#: cmdline/apt-cache.cc:1421

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

-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596

 #, c-format
 msgid "Unable to locate package %s"
 msgstr "未发现软件包 %s"
 
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "未发现软件包 %s"
 

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

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

-#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
+#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644

 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:1503
+#: cmdline/apt-cache.cc:1567

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

-#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624

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

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

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

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

 msgid "  Candidate: "
 msgstr "  候选软件包："
 
 msgid "  Candidate: "
 msgstr "  候选软件包："
 

-#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
+#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614

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

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

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

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

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

-#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
-#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
+#: 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

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

-#: cmdline/apt-cache.cc:1686
+#: cmdline/apt-cache.cc:1750

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


@@ -236,28 +239,36 @@ 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:79
+#: cmdline/apt-cdrom.cc:76

 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:94
+#: cmdline/apt-cdrom.cc:91

 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:129
+#: cmdline/apt-cdrom.cc:139

 #, 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:163
+#: cmdline/apt-cdrom.cc:178
+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 ""
+
+#: cmdline/apt-cdrom.cc:182

 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
 
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
 

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

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

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

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


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

-#: cmdline/apt-get.cc:135
-msgid "Y"
-msgstr "Y"
+#: cmdline/apt-get.cc:245
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"

 
 

-#: cmdline/apt-get.cc:140
-msgid "N"
-msgstr ""
+#: cmdline/apt-get.cc:327
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
+
+#: cmdline/apt-get.cc:330
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"

 
 

-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:367

 #, c-format
 #, c-format

-msgid "Regex compilation error - %s"
-msgstr "编译正则表达式时出错 - %s"
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "选择 %s 作为源代码包而非 %s\n"

 
 

-#: cmdline/apt-get.cc:260
-msgid "The following packages have unmet dependencies:"
-msgstr "下列软件包有未满足的依赖关系："
+#: cmdline/apt-get.cc:423
+#, fuzzy, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"

 
 

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

 #, c-format
 #, c-format

-msgid "but %s is installed"
-msgstr "但是 %s 已经安装"
+msgid "Couldn't find package %s"
+msgstr "无法找到软件包 %s"

 
 

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

 #, c-format
 #, c-format

-msgid "but %s is to be installed"
-msgstr "但是 %s 正要被安装"
-
-#: cmdline/apt-get.cc:359
-msgid "but it is not installable"
-msgstr "但无法安装它"
-
-#: cmdline/apt-get.cc:361
-msgid "but it is a virtual package"
-msgstr "但是它是虚拟软件包"
-
-#: cmdline/apt-get.cc:364
-msgid "but it is not installed"
-msgstr "但是它还没有被安装"
-
-#: cmdline/apt-get.cc:364
-msgid "but it is not going to be installed"
-msgstr "但是它将不会被安装"
-
-#: cmdline/apt-get.cc:369
-msgid " or"
-msgstr " 或"
+msgid "%s set to manually installed.\n"
+msgstr "%s 被设置为手动安装。\n"

 
 

-#: cmdline/apt-get.cc:398
-msgid "The following NEW packages will be installed:"
-msgstr "下列【新】软件包将被安装："
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
+#, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s 被设置为手动安装。\n"

 
 

-#: cmdline/apt-get.cc:424
-msgid "The following packages will be REMOVED:"
-msgstr "下列软件包将被【卸载】："
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
+msgid ""
+"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
+"instead."
+msgstr ""

 
 

-#: cmdline/apt-get.cc:446
-msgid "The following packages have been kept back:"
-msgstr "下列软件包的版本将保持不变："
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+msgid "Internal error, problem resolver broke stuff"
+msgstr "内部错误，问题解决工具坏事了"

 
 

-#: cmdline/apt-get.cc:467
-msgid "The following packages will be upgraded:"
-msgstr "下列软件包将被升级："
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+msgid "Unable to lock the download directory"
+msgstr "无法锁定下载目录"

 
 

-#: cmdline/apt-get.cc:488
-msgid "The following packages will be DOWNGRADED:"
-msgstr "下列软件包将被【降级】："
+#: cmdline/apt-get.cc:726
+msgid "Must specify at least one package to fetch source for"
+msgstr "要下载源代码，必须指定至少一个对应的软件包"

 
 

-#: cmdline/apt-get.cc:508
-msgid "The following held packages will be changed:"
-msgstr "下列被要求保持版本不变的软件包将被改变："
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "无法找到与 %s 对应的源代码包"

 
 

-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:786

 #, c-format
 #, c-format

-msgid "%s (due to %s) "
-msgstr "%s (是由于 %s) "
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n"
+"%s\n"

 
 

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

 msgid ""
 msgid ""

-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
+"Please use:\n"
+"bzr branch %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"

 msgstr ""
 msgstr ""

-"【警告】：下列基础软件包将被卸载。\n"
-"请勿尝试，除非您确实知道您在做什么！"
+"请使用：\n"
+"bzr get %s\n"
+"获得该软件包的最近更新(可能尚未正式发布)。\n"

 
 

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

 #, c-format
 #, c-format

-msgid "%lu upgraded, %lu newly installed, "
-msgstr "å\8d\87级äº\86 %lu 个软件å\8c\85ï¼\8cæ\96°å®\89è£\85äº\86 %lu 个软件å\8c\85ï¼\8c"
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "忽ç\95¥å·²ä¸\8bè½½è¿\87ç\9a\84æ\96\87件â\80\9c%sâ\80\9d\n"

 
 

-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190

 #, c-format
 #, c-format

-msgid "%lu reinstalled, "
-msgstr "重新安装了 %lu 个软件包，"
+msgid "Couldn't determine free space in %s"
+msgstr "无法获知您在 %s 上的可用空间"

 
 

-#: cmdline/apt-get.cc:608
+#: cmdline/apt-get.cc:882

 #, c-format
 #, c-format

-msgid "%lu downgraded, "
-msgstr "降级了 %lu 个软件包，"
+msgid "You don't have enough free space in %s"
+msgstr "您在 %s 上没有足够的可用空间"
+
+#. 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
+#, c-format
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "需要下载 %sB/%sB 的源代码包。\n"

 
 

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

 #, c-format
 #, c-format

-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
+msgid "Need to get %sB of source archives.\n"
+msgstr "需要下载 %sB 的源代码包。\n"

 
 

-#: cmdline/apt-get.cc:614
+#: cmdline/apt-get.cc:902

 #, c-format
 #, c-format

-msgid "%lu not fully installed or removed.\n"
-msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
+msgid "Fetch source %s\n"
+msgstr "下载源代码 %s\n"
+
+#: cmdline/apt-get.cc:920
+msgid "Failed to fetch some archives."
+msgstr "有一些包文件无法下载。"
+
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
+msgid "Download complete and in download only mode"
+msgstr "下载完毕，目前是“仅下载”模式"

 
 

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

 #, c-format
 #, c-format

-msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "注意，为任务 %2$s 选中了 %1$s\n"
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "忽略已经被解包到 %s 目录的源代码包\n"

 
 

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

 #, c-format
 #, c-format

-msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "注意，根据正则表达式 %2$s 选中了 %1$s\n"
+msgid "Unpack command '%s' failed.\n"
+msgstr "运行解包的命令“%s”出错。\n"

 
 

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

 #, c-format
 #, c-format

-msgid "Package %s is a virtual package provided by:\n"
-msgstr "软件å\8c\85 %s æ\98¯ä¸\80个ç\94±ä¸\8bé\9d¢ç\9a\84软件å\8c\85æ\8f\90ä¾\9bç\9a\84è\99\9aæ\8b\9f软件å\8c\85ï¼\9a\n"
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "请æ£\80æ\9f¥æ\98¯å\90¦å®\89è£\85äº\86â\80\9cdpkg-devâ\80\9d软件å\8c\85ã\80\82\n"

 
 

-#: cmdline/apt-get.cc:668
-msgid " [Installed]"
-msgstr " [已安装]"
+#: cmdline/apt-get.cc:992
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "执行构造软件包命令“%s”失败。\n"

 
 

-#: cmdline/apt-get.cc:677
-msgid " [Not candidate version]"
-msgstr " [无候选版本]"
+#: cmdline/apt-get.cc:1011
+msgid "Child process failed"
+msgstr "子进程出错"

 
 

-#: cmdline/apt-get.cc:679
-msgid "You should explicitly select one to install."
-msgstr "请æ\82¨æ\98\8eç¡®å\9c°é\80\89æ\8b©ä¸\80个æ\9d¥è¿\9bè¡\8cå®\89è£\85ã\80\82"
+#: cmdline/apt-get.cc:1030
+msgid "Must specify at least one package to check builddeps for"
+msgstr "è¦\81æ£\80æ\9f¥ç\94\9fæ\88\90软件å\8c\85ç\9a\84æ\9e\84建ä¾\9dèµ\96å\85³ç³»ï¼\8cå¿\85é¡»æ\8c\87å®\9aè\87³å°\91ä¸\80个软件å\8c\85"

 
 

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

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

-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"

 msgstr ""
 msgstr ""

-"现在没有可用的软件包 %s，但是它被其它的软件包引用了。\n"
-"这可能意味着这个缺失的软件包可能已被废弃，\n"
-"或者只能在其他发布源中找到\n"
-
-#: cmdline/apt-get.cc:700
-msgid "However the following packages replace it:"
-msgstr "可是下列软件包取代了它："

 
 

-#: cmdline/apt-get.cc:712
+#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082

 #, c-format
 #, c-format

-msgid "Package '%s' has no installation candidate"
-msgstr "软件包 %s 没有可供安装的候选者"
+msgid "Unable to get build-dependency information for %s"
+msgstr "无法获得 %s 的构建依赖关系信息"

 
 

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

 #, c-format
 #, c-format

-msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "类似 %s 的虚拟软件包可以卸载\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "软件包 %s 还未安装，因而不会被卸载\n"
+msgid "%s has no build depends.\n"
+msgstr " %s 没有构建依赖关系信息。\n"

 
 

-#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:1272

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

-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "软件包 %s 还未安装，因而不会被卸载\n"
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"

 
 

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

 #, c-format
 #, c-format

-msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "注意，选取 %s 而非 %s\n"
+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:818
+#: cmdline/apt-get.cc:1313

 #, c-format
 #, c-format

-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
+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:822
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n"
+#: cmdline/apt-get.cc:1352
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 "
+"%1$s 依赖关系"

 
 

-#: cmdline/apt-get.cc:834
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "不能重新安装 %s，因为无法下载它。\n"
+#: cmdline/apt-get.cc:1358
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"

 
 

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

 #, c-format
 #, c-format

-msgid "%s is already the newest version.\n"
-msgstr "%s 已经是最新的版本了。\n"
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"

 
 

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

 #, c-format
 #, c-format

-msgid "%s set to manually installed.\n"
-msgstr "%s 被设置为手动安装。\n"
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "不能满足软件包 %s 所要求的构建依赖关系。"

 
 

-#: cmdline/apt-get.cc:884
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
+#: cmdline/apt-get.cc:1401
+msgid "Failed to process build dependencies"
+msgstr "无法处理构建依赖关系"

 
 

-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506

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

-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
-
-#: cmdline/apt-get.cc:1025
-msgid "Correcting dependencies..."
-msgstr "正在更正依赖关系..."
-
-#: cmdline/apt-get.cc:1028
-msgid " failed."
-msgstr " 失败。"
-
-#: cmdline/apt-get.cc:1031
-msgid "Unable to correct dependencies"
-msgstr "无法更正依赖关系"
-
-#: cmdline/apt-get.cc:1034
-msgid "Unable to minimize the upgrade set"
-msgstr "无法最小化要升级的软件包集合"
-
-#: cmdline/apt-get.cc:1036
-msgid " Done"
-msgstr " 完成"
-
-#: cmdline/apt-get.cc:1040
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
-
-#: cmdline/apt-get.cc:1043
-msgid "Unmet dependencies. Try using -f."
-msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-
-#: cmdline/apt-get.cc:1068
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "【警告】：下列软件包不能通过验证！"
-
-#: cmdline/apt-get.cc:1072
-msgid "Authentication warning overridden.\n"
-msgstr "忽略了认证警告。\n"
-
-#: cmdline/apt-get.cc:1079
-msgid "Install these packages without verification [y/N]? "
-msgstr "不经验证就安装这些软件包吗？[y/N] "
-
-#: cmdline/apt-get.cc:1081
-msgid "Some packages could not be authenticated"
-msgstr "有些软件包不能通过验证"
-
-#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251
-msgid "There are problems and -y was used without --force-yes"
-msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
-
-#: cmdline/apt-get.cc:1131
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
-
-#: cmdline/apt-get.cc:1140
-msgid "Packages need to be removed but remove is disabled."
-msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
-
-#: cmdline/apt-get.cc:1151
-msgid "Internal error, Ordering didn't finish"
-msgstr "内部错误，Ordering 未能完成"
+msgid "Changelog for %s (%s)"
+msgstr "正在连接 %s (%s)"

 
 

-#: cmdline/apt-get.cc:1189
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "æ\80ªäº\86â\80¦â\80¦æ\96\87件大å°\8fä¸\8d符ï¼\8c请å\8f\91ä¿¡ç»\99 apt@packages.debian.org å\90§"
+#: cmdline/apt-get.cc:1592
+msgid "Supported modules:"
+msgstr "æ\94¯æ\8c\81ç\9a\84模å\9d\97ï¼\9a"

 
 

-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1196
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "需要下载 %sB/%sB 的软件包。\n"
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1201
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "需要下载 %sB 的软件包。\n"
+#: cmdline/apt-get.cc:1633
+#, fuzzy
+msgid ""
+"Usage: apt-get [options] command\n"
+"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a simple command line interface for downloading and\n"
+"installing packages. The most frequently used commands are update\n"
+"and install.\n"
+"\n"
+"Commands:\n"
+"   update - Retrieve new lists of packages\n"
+"   upgrade - Perform an upgrade\n"
+"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
+"   remove - Remove packages\n"
+"   autoremove - Remove automatically all unused packages\n"
+"   purge - Remove packages and config files\n"
+"   source - Download source archives\n"
+"   build-dep - Configure build-dependencies for source packages\n"
+"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+"   dselect-upgrade - Follow dselect selections\n"
+"   clean - Erase downloaded archive files\n"
+"   autoclean - Erase old downloaded archive files\n"
+"   check - Verify that there are no broken dependencies\n"
+"   changelog - Download and display the changelog for the given package\n"
+"   download - Download the binary package into the current directory\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -qq No output except for errors\n"
+"  -d  Download only - do NOT install or unpack archives\n"
+"  -s  No-act. Perform ordering simulation\n"
+"  -y  Assume Yes to all queries and do not prompt\n"
+"  -f  Attempt to correct a system with broken dependencies in place\n"
+"  -m  Attempt to continue if archives are unlocatable\n"
+"  -u  Show a list of upgraded packages as well\n"
+"  -b  Build the source package after fetching it\n"
+"  -V  Show verbose version numbers\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+"用法： apt-get [选项] 命令\n"
+"　　　 apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
+"　　　 apt-get [选项] source 软件包1 [软件包2 ...]\n"
+"\n"
+"apt-get 提供了一个用于下载和安装软件包的简易命令行界面。\n"
+"最常用命令是 update 和 install。\n"
+"\n"
+"命令：\n"
+"   update - 取回更新的软件包列表信息\n"
+"   upgrade - 进行一次升级\n"
+"   install - 安装新的软件包(注：软件包名称是 libc6 而非 libc6.deb)\n"
+"   remove - 卸载软件包\n"
+"   autoremove - 卸载所有自动安装且不再使用的软件包\n"
+"   purge - 卸载并清除软件包的配置\n"
+"   source - 下载源码包文件\n"
+"   build-dep - 为源码包配置所需的编译依赖关系\n"
+"   dist-upgrade - 发布版升级，见 apt-get(8)\n"
+"   dselect-upgrade - 根据 dselect 的选择来进行升级\n"
+"   clean - 删除所有已下载的包文件\n"
+"   autoclean - 删除老版本的已下载的包文件\n"
+"   check - 核对以确认系统的依赖关系的完整性\n"
+"   markauto - 标记指定的软件包为自动安装\n"
+"   unmarkauto - 标记指定的软件包为手动安装\n"
+"\n"
+"选项：\n"
+"  -h  本帮助文档。\n"
+"  -q  让输出可作为日志 - 不显示进度\n"
+"  -qq 除了错误外，什么都不输出\n"
+"  -d  仅仅下载 - 【不】安装或解开包文件\n"
+"  -s  不作实际操作。只是依次模拟执行命令\n"
+"  -y  对所有询问都回答是(Yes)，同时不作任何提示\n"
+"  -f  当出现破损的依赖关系时，程序将尝试修正系统\n"
+"  -m  当有包文件无法找到时，程序仍尝试继续执行\n"
+"  -u  显示已升级的软件包列表\n"
+"  -b  在下载完源码包后，编译生成相应的软件包\n"
+"  -V  显示详尽的版本号\n"
+"  -c=? 读取指定配置文件\n"
+"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
+"请查阅 apt-get(8)、sources.list(5) 和 apt.conf(5)的参考手册\n"
+"以获取更多信息和选项。\n"
+"                       本 APT 具有超级牛力。\n"

 
 

-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1208
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+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
-#: cmdline/apt-get.cc:1213
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "解压缩后将会空出 %sB 的空间。\n"
+#: cmdline/apt-helper.cc:49
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "要下载源代码，必须指定至少一个对应的软件包"

 
 

-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "无法获知您在 %s 上的可用空间"
+#: cmdline/apt-helper.cc:67
+msgid "Download Failed"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1241
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "您在 %s 上没有足够的可用空间。"
+#: cmdline/apt-helper.cc:80
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。"
+#: cmdline/apt-mark.cc:68
+#, fuzzy, c-format
+msgid "%s can not be marked as it is not installed.\n"
+msgstr "但是它还没有被安装"

 
 

-#: cmdline/apt-get.cc:1259
-msgid "Yes, do as I say!"
-msgstr "是，按我说的做！"
+#: cmdline/apt-mark.cc:74
+#, fuzzy, c-format
+msgid "%s was already set to manually installed.\n"
+msgstr "%s 被设置为手动安装。\n"

 
 

-#: cmdline/apt-get.cc:1261
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"您的操作会导致潜在的危害。\n"
-"若还想继续的话，就输入下面的短句“%s”\n"
-" ?] "
+#: cmdline/apt-mark.cc:76
+#, fuzzy, c-format
+msgid "%s was already set to automatically installed.\n"
+msgstr "%s 被设置为手动安装。\n"

 
 

-#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286
-msgid "Abort."
-msgstr "中止执行。"
+#: cmdline/apt-mark.cc:241
+#, fuzzy, c-format
+msgid "%s was already set on hold.\n"
+msgstr "%s 已经是最新的版本了。\n"

 
 

-#: cmdline/apt-get.cc:1282
-msgid "Do you want to continue [Y/n]? "
-msgstr "您希望继续执行吗？[Y/n]"
+#: cmdline/apt-mark.cc:243
+#, fuzzy, c-format
+msgid "%s was already not hold.\n"
+msgstr "%s 已经是最新的版本了。\n"

 
 

-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: 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

 #, c-format
 #, c-format

-msgid "Failed to fetch %s  %s\n"
-msgstr "无法下载 %s  %s\n"
+msgid "Waited for %s but it wasn't there"
+msgstr "等待子进程 %s 的退出，但是它并不存在"

 
 

-#: cmdline/apt-get.cc:1372
-msgid "Some files failed to download"
-msgstr "有一些文件无法下载"
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#, fuzzy, c-format
+msgid "%s set on hold.\n"
+msgstr "%s 已设置为手动安装。\n"

 
 

-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
-msgid "Download complete and in download only mode"
-msgstr "下载完毕，目前是“仅下载”模式"
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#, fuzzy, c-format
+msgid "Canceled hold on %s.\n"
+msgstr "无法打开 %s"

 
 

-#: cmdline/apt-get.cc:1379
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
+#: cmdline/apt-mark.cc:345
+msgid "Executing dpkg failed. Are you root?"

 msgstr ""
 msgstr ""

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

 
 

-#: cmdline/apt-get.cc:1383
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "目前还不支持 --fix-missing 和介质交换"
+#: cmdline/apt-mark.cc:392
+msgid ""
+"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+"\n"
+"apt-mark is a simple command line interface for marking packages\n"
+"as manually or automatically installed. It can also list marks.\n"
+"\n"
+"Commands:\n"
+"   auto - Mark the given packages as automatically installed\n"
+"   manual - Mark the given packages as manually installed\n"
+"   hold - Mark a package as held back\n"
+"   unhold - Unset a package set as held back\n"
+"   showauto - Print the list of automatically installed packages\n"
+"   showmanual - Print the list of manually installed packages\n"
+"   showhold - Print the list of package on hold\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -qq No output except for errors\n"
+"  -s  No-act. Just prints what would be done.\n"
+"  -f  read/write auto/manual marking in the given file\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-mark(8) and apt.conf(5) manual pages for more information."
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1388
-msgid "Unable to correct missing packages."
-msgstr "无法更正缺少的软件包。"
+#: cmdline/apt.cc:47
+msgid ""
+"Usage: apt [options] command\n"
+"\n"
+"CLI for apt.\n"
+"Basic commands: \n"
+" list - list packages based on package names\n"
+" search - search in package descriptions\n"
+" show - show package details\n"
+"\n"
+" update - update list of available packages\n"
+"\n"
+" install - install packages\n"
+" remove  - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+" full-upgrade - upgrade the system by removing/installing/upgrading "
+"packages\n"
+"\n"
+" edit-sources - edit the source information file\n"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1389
-msgid "Aborting install."
-msgstr "中止安装。"
+#: methods/cdrom.cc:203
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "无法读取盘片数据库 %s"

 
 

-#: cmdline/apt-get.cc:1417
+#: methods/cdrom.cc:212

 msgid ""
 msgid ""

-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失："
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"请使用 apt-cdrom，通过它就可以让 APT 能识别该盘片。apt-get upgdate 不能被用来"
+"加入新的盘片。"

 
 

-#: cmdline/apt-get.cc:1421
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "注意：这是自动被 dpkg 有意完成的。"
+#: methods/cdrom.cc:222
+msgid "Wrong CD-ROM"
+msgstr "错误的 CD-ROM"

 
 

-#: cmdline/apt-get.cc:1559
+#: methods/cdrom.cc:249

 #, c-format
 #, c-format

-msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s"
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。"

 
 

-#: cmdline/apt-get.cc:1591
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "选择 %s 作为源代码包而非 %s\n"
+#: methods/cdrom.cc:254
+msgid "Disk not found."
+msgstr "找不到盘片。"

 
 

-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1629
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
+msgid "File not found"
+msgstr "无法找到该文件"

 
 

-#: cmdline/apt-get.cc:1645
-msgid "The update command takes no arguments"
-msgstr " update 命令不需要参数"
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
+msgid "Failed to stat"
+msgstr "无法读取状态"

 
 

-#: cmdline/apt-get.cc:1711
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "æ\88\91们ä¸\8dåº\94该è¿\9bè¡\8cå\88 é\99¤ï¼\8cæ\97 æ³\95å\90¯å\8a¨è\87ªå\8a¨å\88 é\99¤å\99¨"
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
+msgid "Failed to set modification time"
+msgstr "æ\97 æ³\95设置æ\96\87件ç\9a\84ä¿®æ\94¹æ\97¥æ\9c\9f"

 
 

-#: cmdline/apt-get.cc:1815
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。"
+#: methods/file.cc:48
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "无效的 URI，本地的 URI 不能以 // 开头"

 
 

-#.
-#. if (Packages == 1)
-#. {
-#. c1out << endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << endl;
-#. }
-#.
-#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987
-msgid "The following information may help to resolve the situation:"
-msgstr "下列信息可能会对解决问题有所帮助："
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:177
+msgid "Logging in"
+msgstr "正在登录"

 
 

-#: cmdline/apt-get.cc:1822
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "内部错误，自动卸载工具坏事了"
+#: methods/ftp.cc:183
+msgid "Unable to determine the peer name"
+msgstr "无法获知对方主机名"

 
 

-#: cmdline/apt-get.cc:1829
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "下列软件包是自动安装的并且现在不需要了："
+#: methods/ftp.cc:188
+msgid "Unable to determine the local name"
+msgstr "无法获知本地主机名"

 
 

-#: cmdline/apt-get.cc:1833
+#: methods/ftp.cc:219 methods/ftp.cc:247

 #, c-format
 #, 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"
-
-#: cmdline/apt-get.cc:1835
-#, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "使用'apt-get autoremove'来卸载它们"
+msgid "The server refused the connection and said: %s"
+msgstr "服务器拒绝了我们的连接，响应信息为：%s"

 
 

-#: cmdline/apt-get.cc:1854
-msgid "Internal error, AllUpgrade broke stuff"
-msgstr "内部错误，全部升级工具坏事了"
+#: methods/ftp.cc:225
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "USER 指令出错，服务器响应信息为：%s"

 
 

-#: cmdline/apt-get.cc:1953
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
+#: methods/ftp.cc:232
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "PASS 指令出错，服务器响应信息为：%s"

 
 

-#: cmdline/apt-get.cc:1957
+#: methods/ftp.cc:252

 msgid ""
 msgid ""

-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."

 msgstr ""
 msgstr ""

-"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
-"以指定一个解决办法)。"
+"您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。"

 
 

-#: cmdline/apt-get.cc:1972
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"有一些软件包无法被安装。如果您用的是 unstable 发行版，这也许是\n"
-"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
-"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
+#: methods/ftp.cc:280
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s"

 
 

-#: cmdline/apt-get.cc:1993
-msgid "Broken packages"
-msgstr "破损的软件包"
+#: methods/ftp.cc:306
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "TYPE 指令出错，服务器响应信息为：%s"

 
 

-#: cmdline/apt-get.cc:2019
-msgid "The following extra packages will be installed:"
-msgstr "将会安装下列额外的软件包："
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
+msgid "Connection timeout"
+msgstr "连接超时"

 
 

-#: cmdline/apt-get.cc:2109
-msgid "Suggested packages:"
-msgstr "建议安装的软件包："
+#: methods/ftp.cc:350
+msgid "Server closed the connection"
+msgstr "服务器关闭了连接"

 
 

-#: cmdline/apt-get.cc:2110
-msgid "Recommended packages:"
-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
+msgid "Read error"
+msgstr "读错误"

 
 

-#: cmdline/apt-get.cc:2152
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "无法找到软件包 %s"
+#: methods/ftp.cc:360 methods/rsh.cc:209
+msgid "A response overflowed the buffer."
+msgstr "回应超出了缓存区大小。"

 
 

-#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
-msgid "%s set to automatically installed.\n"
-msgstr "%s 被设置为手动安装。\n"
+#: methods/ftp.cc:377 methods/ftp.cc:389
+msgid "Protocol corruption"
+msgstr "协议有误"

 
 

-#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
-msgid ""
-"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
-"instead."
-msgstr ""
+#: 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
+msgid "Write error"
+msgstr "写出错"

 
 

-#: cmdline/apt-get.cc:2183
-msgid "Calculating upgrade... "
-msgstr "正在对升级进行计算... "
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+msgid "Could not create a socket"
+msgstr "无法创建套接字"
+
+#: methods/ftp.cc:712
+msgid "Could not connect data socket, connection timed out"
+msgstr "无法连接上数据套接字，连接超时"

 
 

-#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
+#: methods/ftp.cc:716 methods/connect.cc:116

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

-#: cmdline/apt-get.cc:2191
-msgid "Done"
-msgstr "完成"
+#: methods/ftp.cc:718
+msgid "Could not connect passive socket."
+msgstr "无法连接被动模式的套接字。"

 
 

-#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266
-msgid "Internal error, problem resolver broke stuff"
-msgstr "内部错误，问题解决工具坏事了"
+#: methods/ftp.cc:735
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "getaddrinfo 无法得到监听套接字"

 
 

-#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330
-msgid "Unable to lock the download directory"
-msgstr "无法锁定下载目录"
+#: methods/ftp.cc:749
+msgid "Could not bind a socket"
+msgstr "无法绑定套接字"

 
 

-#: cmdline/apt-get.cc:2386
+#: methods/ftp.cc:753
+msgid "Could not listen on the socket"
+msgstr "无法在套接字上监听"
+
+#: methods/ftp.cc:760
+msgid "Could not determine the socket's name"
+msgstr "无法确定套接字的名字"
+
+#: methods/ftp.cc:792
+msgid "Unable to send PORT command"
+msgstr "无法发出 PORT 指令"
+
+#: methods/ftp.cc:802

 #, c-format
 #, c-format

-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgid "Unknown address family %u (AF_*)"
+msgstr "无法识别的地址族 %u (AF_*)"

 
 

-#: cmdline/apt-get.cc:2391
+#: methods/ftp.cc:811

 #, c-format
 #, c-format

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

 
 

-#: cmdline/apt-get.cc:2451
-msgid "Must specify at least one package to fetch source for"
-msgstr "要下载源代码，必须指定至少一个对应的软件包"
+#: methods/ftp.cc:831
+msgid "Data socket connect timed out"
+msgstr "数据套接字连接超时"
+
+#: methods/ftp.cc:838
+msgid "Unable to accept connection"
+msgstr "无法接受连接"
+
+#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316
+msgid "Problem hashing file"
+msgstr "把文件加入哈希表时出错"

 
 

-#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
+#: methods/ftp.cc:890

 #, c-format
 #, c-format

-msgid "Unable to find a source package for %s"
-msgstr "无法找到与 %s 对应的源代码包"
+msgid "Unable to fetch file, server said '%s'"
+msgstr "无法获取文件，服务器响应信息为“%s”"
+
+#: methods/ftp.cc:905 methods/rsh.cc:335
+msgid "Data socket timed out"
+msgstr "数据套接字超时"

 
 

-#: cmdline/apt-get.cc:2508
+#: methods/ftp.cc:935

 #, c-format
 #, c-format

-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-"提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n"
-"%s\n"
+msgid "Data transfer failed, server said '%s'"
+msgstr "数据传送出错，服务器响应信息为“%s”"

 
 

-#: cmdline/apt-get.cc:2513
-#, fuzzy, c-format
-msgid ""
-"Please use:\n"
-"bzr branch %s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-"请使用：\n"
-"bzr get %s\n"
-"获得该软件包的最近更新(可能尚未正式发布)。\n"
+#. Get the files information
+#: methods/ftp.cc:1014
+msgid "Query"
+msgstr "查询"
+
+#: methods/ftp.cc:1128
+msgid "Unable to invoke "
+msgstr "无法调用 "

 
 

-#: cmdline/apt-get.cc:2566
+#: methods/connect.cc:76

 #, c-format
 #, c-format

-msgid "Skipping already downloaded file '%s'\n"
-msgstr "忽略已下载过的文件“%s”\n"
+msgid "Connecting to %s (%s)"
+msgstr "正在连接 %s (%s)"

 
 

-#: cmdline/apt-get.cc:2603
+#: methods/connect.cc:87

 #, c-format
 #, c-format

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

 
 

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

 #, c-format
 #, c-format

-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "需要下载 %sB/%sB 的源代码包。\n"
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"

 
 

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

 #, c-format
 #, c-format

-msgid "Need to get %sB of source archives.\n"
-msgstr "需要下载 %sB 的源代码包。\n"
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "无法发起与 %s:%s (%s) 的连接"

 
 

-#: cmdline/apt-get.cc:2623
+#: methods/connect.cc:108

 #, c-format
 #, c-format

-msgid "Fetch source %s\n"
-msgstr "下载源代码 %s\n"
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "无法连接上 %s:%s (%s)，连接超时"

 
 

-#: cmdline/apt-get.cc:2661
-msgid "Failed to fetch some archives."
-msgstr "有一些包文件无法下载。"
+#: methods/connect.cc:126
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "无法连接上 %s:%s (%s)。"

 
 

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

 #, c-format
 #, c-format

-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "忽略已经被解包到 %s 目录的源代码包\n"
+msgid "Connecting to %s"
+msgstr "正在连接 %s"

 
 

-#: cmdline/apt-get.cc:2704
+#: methods/connect.cc:180 methods/connect.cc:199

 #, c-format
 #, c-format

-msgid "Unpack command '%s' failed.\n"
-msgstr "运行解包的命令“%s”出错。\n"
+msgid "Could not resolve '%s'"
+msgstr "无法解析域名“%s”"

 
 

-#: cmdline/apt-get.cc:2705
+#: methods/connect.cc:205

 #, c-format
 #, c-format

-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
+msgid "Temporary failure resolving '%s'"
+msgstr "暂时不能解析域名“%s”"
+
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"

 
 

-#: cmdline/apt-get.cc:2727
+#: methods/connect.cc:211

 #, c-format
 #, c-format

-msgid "Build command '%s' failed.\n"
-msgstr "执行构造软件包命令“%s”失败。\n"
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"

 
 

-#: cmdline/apt-get.cc:2747
-msgid "Child process failed"
-msgstr "子进程出错"
+#: methods/connect.cc:258
+#, c-format
+msgid "Unable to connect to %s:%s:"
+msgstr "不能连接到 %s：%s："

 
 

-#: cmdline/apt-get.cc:2766
-msgid "Must specify at least one package to check builddeps for"
-msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包"
+#: methods/gpgv.cc:168
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！"
+
+#: methods/gpgv.cc:172
+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 吗？)"

 
 

-#: cmdline/apt-get.cc:2791
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:180

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

-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "无法获得 %s 的构建依赖关系信息"
+#: methods/gpgv.cc:184
+msgid "Unknown error executing gpgv"
+msgstr "运行 gpgv 时发生未知错误"

 
 

-#: cmdline/apt-get.cc:2838
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr " %s 没有构建依赖关系信息。\n"
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
+msgid "The following signatures were invalid:\n"
+msgstr "下列签名无效：\n"

 
 

-#: cmdline/apt-get.cc:2997
-#, fuzzy, c-format
+#: methods/gpgv.cc:231

 msgid ""
 msgid ""

-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
-msgstr "ç\94±äº\8eæ\97 æ³\95æ\89¾å\88°è½¯ä»¶å\8c\85 %3$s ï¼\8cå\9b æ­¤ä¸\8dè\83½æ»¡è¶³ %2$s æ\89\80è¦\81æ±\82ç\9a\84 %1$s ä¾\9dèµ\96å\85³ç³»"
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr "ç\94±äº\8e没æ\9c\89å\85¬é\92¥ï¼\8cæ\97 æ³\95éª\8cè¯\81ä¸\8bå\88\97ç­¾å\90\8dï¼\9a\n"

 
 

-#: cmdline/apt-get.cc:3015
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+#: methods/gzip.cc:69
+msgid "Empty files can't be valid archives"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:3038
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新"
+#: methods/http.cc:511
+msgid "Error writing to the file"
+msgstr "写入文件出错"
+
+#: methods/http.cc:525
+msgid "Error reading from server. Remote end closed connection"
+msgstr "从服务器读取数据时出错，对方关闭了连接"
+
+#: methods/http.cc:527
+msgid "Error reading from server"
+msgstr "从服务器读取数据出错"
+
+#: methods/http.cc:563
+msgid "Error writing to file"
+msgstr "写入文件出错"
+
+#: methods/http.cc:623
+msgid "Select failed"
+msgstr "select 调用出错"
+
+#: methods/http.cc:628
+msgid "Connection timed out"
+msgstr "连接超时"
+
+#: methods/http.cc:651
+msgid "Error writing to output file"
+msgstr "写输出文件时出错"
+
+#: methods/server.cc:52
+msgid "Waiting for headers"
+msgstr "正在等待报头"

 
 

-#: cmdline/apt-get.cc:3077
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
-msgstr ""
-"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 "
-"%1$s 依赖关系"
+#: methods/server.cc:110
+msgid "Bad header line"
+msgstr "错误的报头行"

 
 

-#: cmdline/apt-get.cc:3083
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
-msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+#: methods/server.cc:135 methods/server.cc:142
+msgid "The HTTP server sent an invalid reply header"
+msgstr "该 HTTP 服务器发送了一个无效的应答报头"

 
 

-#: cmdline/apt-get.cc:3106
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
+#: methods/server.cc:172
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"

 
 

-#: cmdline/apt-get.cc:3122
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
+#: methods/server.cc:195
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"

 
 

-#: cmdline/apt-get.cc:3127
-msgid "Failed to process build dependencies"
-msgstr "无法处理构建依赖关系"
+#: methods/server.cc:197
+msgid "This HTTP server has broken range support"
+msgstr "该 HTTP 服务器的 range 支持不正常"

 
 

-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
-#, fuzzy, c-format
-msgid "Changelog for %s (%s)"
-msgstr "正在连接 %s (%s)"
+#: methods/server.cc:221
+msgid "Unknown date format"
+msgstr "无法识别的日期格式"

 
 

-#: cmdline/apt-get.cc:3355
-msgid "Supported modules:"
-msgstr "支持的模块："
+#: methods/server.cc:490
+msgid "Bad header data"
+msgstr "错误的报头数据"

 
 

-#: cmdline/apt-get.cc:3396
-#, fuzzy
-msgid ""
-"Usage: apt-get [options] command\n"
-"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [options] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get is a simple command line interface for downloading and\n"
-"installing packages. The most frequently used commands are update\n"
-"and install.\n"
-"\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -d  Download only - do NOT install or unpack archives\n"
-"  -s  No-act. Perform ordering simulation\n"
-"  -y  Assume Yes to all queries and do not prompt\n"
-"  -f  Attempt to correct a system with broken dependencies in place\n"
-"  -m  Attempt to continue if archives are unlocatable\n"
-"  -u  Show a list of upgraded packages as well\n"
-"  -b  Build the source package after fetching it\n"
-"  -V  Show verbose version numbers\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
-"pages for more information and options.\n"
-"                       This APT has Super Cow Powers.\n"
-msgstr ""
-"用法： apt-get [选项] 命令\n"
-"　　　 apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
-"　　　 apt-get [选项] source 软件包1 [软件包2 ...]\n"
-"\n"
-"apt-get 提供了一个用于下载和安装软件包的简易命令行界面。\n"
-"最常用命令是 update 和 install。\n"
-"\n"
-"命令：\n"
-"   update - 取回更新的软件包列表信息\n"
-"   upgrade - 进行一次升级\n"
-"   install - 安装新的软件包(注：软件包名称是 libc6 而非 libc6.deb)\n"
-"   remove - 卸载软件包\n"
-"   autoremove - 卸载所有自动安装且不再使用的软件包\n"
-"   purge - 卸载并清除软件包的配置\n"
-"   source - 下载源码包文件\n"
-"   build-dep - 为源码包配置所需的编译依赖关系\n"
-"   dist-upgrade - 发布版升级，见 apt-get(8)\n"
-"   dselect-upgrade - 根据 dselect 的选择来进行升级\n"
-"   clean - 删除所有已下载的包文件\n"
-"   autoclean - 删除老版本的已下载的包文件\n"
-"   check - 核对以确认系统的依赖关系的完整性\n"
-"   markauto - 标记指定的软件包为自动安装\n"
-"   unmarkauto - 标记指定的软件包为手动安装\n"
-"\n"
-"选项：\n"
-"  -h  本帮助文档。\n"
-"  -q  让输出可作为日志 - 不显示进度\n"
-"  -qq 除了错误外，什么都不输出\n"
-"  -d  仅仅下载 - 【不】安装或解开包文件\n"
-"  -s  不作实际操作。只是依次模拟执行命令\n"
-"  -y  对所有询问都回答是(Yes)，同时不作任何提示\n"
-"  -f  当出现破损的依赖关系时，程序将尝试修正系统\n"
-"  -m  当有包文件无法找到时，程序仍尝试继续执行\n"
-"  -u  显示已升级的软件包列表\n"
-"  -b  在下载完源码包后，编译生成相应的软件包\n"
-"  -V  显示详尽的版本号\n"
-"  -c=? 读取指定配置文件\n"
-"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
-"请查阅 apt-get(8)、sources.list(5) 和 apt.conf(5)的参考手册\n"
-"以获取更多信息和选项。\n"
-"                       本 APT 具有超级牛力。\n"
+#: methods/server.cc:507 methods/server.cc:563
+msgid "Connection failed"
+msgstr "连接失败"

 
 

-#: cmdline/apt-get.cc:3561
-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"
-"　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！"
+#: methods/server.cc:655
+msgid "Internal error"
+msgstr "内部错误"

 
 

-#: cmdline/acqprogress.cc:60
+#: apt-private/acqprogress.cc:66

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

-#: cmdline/acqprogress.cc:84
+#: apt-private/acqprogress.cc:90

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

-#: cmdline/acqprogress.cc:115
+#: apt-private/acqprogress.cc:121

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

-#: cmdline/acqprogress.cc:119
+#: apt-private/acqprogress.cc:125

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

-#: cmdline/acqprogress.cc:140
+#: apt-private/acqprogress.cc:146

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

-#: cmdline/acqprogress.cc:230
+#: apt-private/acqprogress.cc:236

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

-#: cmdline/acqprogress.cc:286
+#: apt-private/acqprogress.cc:297

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


@@ -1132,436 +1140,557 @@ msgstr ""
 "“%s”\n"
 "的盘片插入驱动器“%s”再按回车键\n"
 
 "“%s”\n"
 "的盘片插入驱动器“%s”再按回车键\n"
 

-#: cmdline/apt-mark.cc:55
-#, fuzzy, c-format
-msgid "%s can not be marked as it is not installed.\n"
-msgstr "但是它还没有被安装"
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "正在更正依赖关系..."

 
 

-#: cmdline/apt-mark.cc:61
-#, fuzzy, c-format
-msgid "%s was already set to manually installed.\n"
-msgstr "%s 被设置为手动安装。\n"
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 失败。"

 
 

-#: cmdline/apt-mark.cc:63
-#, fuzzy, c-format
-msgid "%s was already set to automatically installed.\n"
-msgstr "%s 被设置为手动安装。\n"
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "无法更正依赖关系"

 
 

-#: cmdline/apt-mark.cc:228
-#, fuzzy, c-format
-msgid "%s was already set on hold.\n"
-msgstr "%s 已经是最新的版本了。\n"
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "无法最小化要升级的软件包集合"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 完成"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
+
+#: apt-private/private-cachefile.cc:111
+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-download.cc:91 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "无法下载 %s  %s\n"
+
+#: apt-private/private-install.cc:82
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
+
+#: apt-private/private-install.cc:91
+msgid "Packages need to be removed but remove is disabled."
+msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
+
+#: apt-private/private-install.cc:110
+msgid "Internal error, Ordering didn't finish"
+msgstr "内部错误，Ordering 未能完成"
+
+#: apt-private/private-install.cc:148
+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:155
+#, 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:160
+#, 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:167
+#, 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:172
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "解压缩后将会空出 %sB 的空间。\n"
+
+#: apt-private/private-install.cc:200
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "您在 %s 上没有足够的可用空间。"
+
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
+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:220
+msgid "Yes, do as I say!"
+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-install.cc:228 apt-private/private-install.cc:246
+msgid "Abort."
+msgstr "中止执行。"
+
+#: apt-private/private-install.cc:243
+msgid "Do you want to continue?"
+msgstr "您希望继续执行吗？"
+
+#: apt-private/private-install.cc:313
+msgid "Some files failed to download"
+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-install.cc:324
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "目前还不支持 --fix-missing 和介质交换"

 
 

-#: cmdline/apt-mark.cc:230
-#, fuzzy, c-format
-msgid "%s was already not hold.\n"
-msgstr "%s 已经是最新的版本了。\n"
+#: apt-private/private-install.cc:329
+msgid "Unable to correct missing packages."
+msgstr "无法更正缺少的软件包。"

 
 

-#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "等待子进程 %s 的退出，但是它并不存在"
+#: apt-private/private-install.cc:330
+msgid "Aborting install."
+msgstr "中止安装。"

 
 

-#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:297
-#, fuzzy, c-format
-msgid "%s set on hold.\n"
-msgstr "%s 已设置为手动安装。\n"
+#: apt-private/private-install.cc:366
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失："

 
 

-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:302
-#, fuzzy, c-format
-msgid "Canceled hold on %s.\n"
-msgstr "无法打开 %s"
+#: apt-private/private-install.cc:370
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "注意：这是自动被 dpkg 有意完成的。"

 
 

-#: cmdline/apt-mark.cc:320
-msgid "Executing dpkg failed. Are you root?"
-msgstr ""
+#: apt-private/private-install.cc:391
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "我们不应该进行删除，无法启动自动删除器"

 
 

-#: cmdline/apt-mark.cc:367
+#: apt-private/private-install.cc:499

 msgid ""
 msgid ""

-"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-"\n"
-"apt-mark is a simple command line interface for marking packages\n"
-"as manually or automatically installed. It can also list marks.\n"
-"\n"
-"Commands:\n"
-"   auto - Mark the given packages as automatically installed\n"
-"   manual - Mark the given packages as manually installed\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -s  No-act. Just prints what would be done.\n"
-"  -f  read/write auto/manual marking in the given file\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-mark(8) and apt.conf(5) manual pages for more information."
-msgstr ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。"

 
 

-#: methods/cdrom.cc:203
-#, c-format
-msgid "Unable to read the cdrom database %s"
-msgstr "无法读取盘片数据库 %s"
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
+msgid "The following information may help to resolve the situation:"
+msgstr "下列信息可能会对解决问题有所帮助："

 
 

-#: methods/cdrom.cc:212
-msgid ""
-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
-msgstr ""
-"请使用 apt-cdrom，通过它就可以让 APT 能识别该盘片。apt-get upgdate 不能被用来"
-"加入新的盘片。"
+#: apt-private/private-install.cc:506
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "内部错误，自动卸载工具坏事了"

 
 

-#: methods/cdrom.cc:222
-msgid "Wrong CD-ROM"
-msgstr "错误的 CD-ROM"
+#: apt-private/private-install.cc:513
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "下列软件包是自动安装的并且现在不需要了："

 
 

-#: methods/cdrom.cc:249
+#: apt-private/private-install.cc:517

 #, c-format
 #, c-format

-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。"
+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"

 
 

-#: methods/cdrom.cc:254
-msgid "Disk not found."
-msgstr "找不到盘片。"
+#: apt-private/private-install.cc:519
+#, fuzzy
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "使用'apt-get autoremove'来卸载它们"

 
 

-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273
-msgid "File not found"
-msgstr "æ\97 æ³\95æ\89¾å\88°è¯¥æ\96\87件"
+#: apt-private/private-install.cc:612
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "æ\82¨å\8f¯è\83½é\9c\80è¦\81è¿\90è¡\8câ\80\9capt-get -f installâ\80\9dæ\9d¥çº æ­£ä¸\8bå\88\97é\94\99误ï¼\9a"

 
 

-#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
-msgid "Failed to stat"
-msgstr "无法读取状态"
+#: apt-private/private-install.cc:614
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
+"以指定一个解决办法)。"

 
 

-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
-msgid "Failed to set modification time"
-msgstr "无法设置文件的修改日期"
+#: apt-private/private-install.cc:638
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"有一些软件包无法被安装。如果您用的是 unstable 发行版，这也许是\n"
+"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
+"包尚未被创建或是它们已被从新到(Incoming)目录移出。"

 
 

-#: methods/file.cc:47
-msgid "Invalid URI, local URIS must not start with //"
-msgstr "无效的 URI，本地的 URI 不能以 // 开头"
+#: apt-private/private-install.cc:659
+msgid "Broken packages"
+msgstr "破损的软件包"

 
 

-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:173
-msgid "Logging in"
-msgstr "正在登录"
+#: apt-private/private-install.cc:712
+msgid "The following extra packages will be installed:"
+msgstr "将会安装下列额外的软件包："

 
 

-#: methods/ftp.cc:179
-msgid "Unable to determine the peer name"
-msgstr "无法获知对方主机名"
+#: apt-private/private-install.cc:802
+msgid "Suggested packages:"
+msgstr "建议安装的软件包："

 
 

-#: methods/ftp.cc:184
-msgid "Unable to determine the local name"
-msgstr "æ\97 æ³\95è\8e·ç\9f¥æ\9c¬å\9c°ä¸»æ\9cºå\90\8d"
+#: apt-private/private-install.cc:803
+msgid "Recommended packages:"
+msgstr "æ\8e¨è\8d\90å®\89è£\85ç\9a\84软件å\8c\85ï¼\9a"

 
 

-#: methods/ftp.cc:215 methods/ftp.cc:243
+#: apt-private/private-install.cc:825

 #, c-format
 #, c-format

-msgid "The server refused the connection and said: %s"
-msgstr "服务器拒绝了我们的连接，响应信息为：%s"
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"

 
 

-#: methods/ftp.cc:221
+#: apt-private/private-install.cc:829

 #, c-format
 #, c-format

-msgid "USER failed, server said: %s"
-msgstr "USER 指令出错，服务器响应信息为：%s"
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n"

 
 

-#: methods/ftp.cc:228
+#: apt-private/private-install.cc:841

 #, c-format
 #, c-format

-msgid "PASS failed, server said: %s"
-msgstr "PASS 指令出错，服务器响应信息为：%s"
-
-#: methods/ftp.cc:248
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
-msgstr ""
-"您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。"
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "不能重新安装 %s，因为无法下载它。\n"

 
 

-#: methods/ftp.cc:276
+#: apt-private/private-install.cc:846

 #, c-format
 #, c-format

-msgid "Login script command '%s' failed, server said: %s"
-msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s"
+msgid "%s is already the newest version.\n"
+msgstr "%s 已经是最新的版本了。\n"

 
 

-#: methods/ftp.cc:302
+#: apt-private/private-install.cc:894

 #, c-format
 #, c-format

-msgid "TYPE failed, server said: %s"
-msgstr "TYPE 指令出错，服务器响应信息为：%s"
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"

 
 

-#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235
-msgid "Connection timeout"
-msgstr "连接超时"
+#: apt-private/private-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"

 
 

-#: methods/ftp.cc:346
-msgid "Server closed the connection"
-msgstr "服务器关闭了连接"
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "软件包 %s 还未安装，因而不会被卸载\n"

 
 

-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
-msgid "Read error"
-msgstr "读é\94\99误"
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "软件å\8c\85 %s è¿\98æ\9cªå®\89è£\85ï¼\8cå\9b è\80\8cä¸\8dä¼\9a被å\8d¸è½½\n"

 
 

-#: methods/ftp.cc:356 methods/rsh.cc:206
-msgid "A response overflowed the buffer."
-msgstr "回应超出了缓存区大小。"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""

 
 

-#: methods/ftp.cc:373 methods/ftp.cc:385
-msgid "Protocol corruption"
-msgstr "协议有误"
+#: apt-private/private-list.cc:159
+#, 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] ""

 
 

-#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
-msgid "Write error"
-msgstr "写出错"
+#: apt-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"
+"　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！"

 
 

-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
-msgid "Could not create a socket"
-msgstr "无法创建套接字"
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""

 
 

-#: methods/ftp.cc:707
-msgid "Could not connect data socket, connection timed out"
-msgstr "无法连接上数据套接字，连接超时"
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [已安装]"

 
 

-#: methods/ftp.cc:713
-msgid "Could not connect passive socket."
-msgstr "无法连接被动模式的套接字。"
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [已安装]"

 
 

-#: methods/ftp.cc:730
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo 无法得到监听套接字"
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""

 
 

-#: methods/ftp.cc:744
-msgid "Could not bind a socket"
-msgstr "无法绑定套接字"
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [已安装]"

 
 

-#: methods/ftp.cc:748
-msgid "Could not listen on the socket"
-msgstr "无法在套接字上监听"
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [已安装]"

 
 

-#: methods/ftp.cc:755
-msgid "Could not determine the socket's name"
-msgstr "无法确定套接字的名字"
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""

 
 

-#: methods/ftp.cc:787
-msgid "Unable to send PORT command"
-msgstr "无法发出 PORT 指令"
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""

 
 

-#: methods/ftp.cc:797
+#: apt-private/private-output.cc:455

 #, c-format
 #, c-format

-msgid "Unknown address family %u (AF_*)"
-msgstr "无法识别的地址族 %u (AF_*)"
+msgid "but %s is installed"
+msgstr "但是 %s 已经安装"

 
 

-#: methods/ftp.cc:806
+#: apt-private/private-output.cc:457

 #, c-format
 #, c-format

-msgid "EPRT failed, server said: %s"
-msgstr "EPRT 指令出错，服务器响应信息为：%s"
+msgid "but %s is to be installed"
+msgstr "但是 %s 正要被安装"

 
 

-#: methods/ftp.cc:826
-msgid "Data socket connect timed out"
-msgstr "数据套接字连接超时"
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "但无法安装它"

 
 

-#: methods/ftp.cc:833
-msgid "Unable to accept connection"
-msgstr "无法接受连接"
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "但是它是虚拟软件包"

 
 

-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
-msgid "Problem hashing file"
-msgstr "把文件加入哈希表时出错"
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "但是它还没有被安装"

 
 

-#: methods/ftp.cc:885
-#, c-format
-msgid "Unable to fetch file, server said '%s'"
-msgstr "无法获取文件，服务器响应信息为“%s”"
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "但是它将不会被安装"

 
 

-#: methods/ftp.cc:900 methods/rsh.cc:330
-msgid "Data socket timed out"
-msgstr "数据套接字超时"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " 或"

 
 

-#: methods/ftp.cc:930
-#, c-format
-msgid "Data transfer failed, server said '%s'"
-msgstr "数据传送出错，服务器响应信息为“%s”"
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "下列软件包有未满足的依赖关系："

 
 

-#. Get the files information
-#: methods/ftp.cc:1007
-msgid "Query"
-msgstr "查询"
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "下列【新】软件包将被安装："

 
 

-#: methods/ftp.cc:1119
-msgid "Unable to invoke "
-msgstr "无法调用 "
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "下列软件包将被【卸载】："

 
 

-#: methods/connect.cc:75
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "正在连接 %s (%s)"
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "下列软件包的版本将保持不变："

 
 

-#: methods/connect.cc:86
-#, c-format
-msgid "[IP: %s %s]"
-msgstr "[IP: %s %s]"
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "下列软件包将被升级："

 
 

-#: methods/connect.cc:93
-#, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "下列软件包将被【降级】："

 
 

-#: methods/connect.cc:99
-#, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "无法发起与 %s:%s (%s) 的连接"
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "下列被要求保持版本不变的软件包将被改变："

 
 

-#: methods/connect.cc:107
+#: apt-private/private-output.cc:688

 #, c-format
 #, c-format

-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "无法连接上 %s:%s (%s)，连接超时"
+msgid "%s (due to %s) "
+msgstr "%s (是由于 %s) "

 
 

-#: methods/connect.cc:125
-#, c-format
-msgid "Could not connect to %s:%s (%s)."
-msgstr "无法连接上 %s:%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"
+"请勿尝试，除非您确实知道您在做什么！"

 
 

-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: apt-private/private-output.cc:727

 #, c-format
 #, c-format

-msgid "Connecting to %s"
-msgstr "正在连接 %s"
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"

 
 

-#: methods/connect.cc:172 methods/connect.cc:191
+#: apt-private/private-output.cc:731

 #, c-format
 #, c-format

-msgid "Could not resolve '%s'"
-msgstr "无法解析域名“%s”"
+msgid "%lu reinstalled, "
+msgstr "重新安装了 %lu 个软件包，"

 
 

-#: methods/connect.cc:197
+#: apt-private/private-output.cc:733

 #, c-format
 #, c-format

-msgid "Temporary failure resolving '%s'"
-msgstr "暂时不能解析域名“%s”"
+msgid "%lu downgraded, "
+msgstr "降级了 %lu 个软件包，"

 
 

-#: methods/connect.cc:200
+#: apt-private/private-output.cc:735

 #, c-format
 #, c-format

-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "解æ\9e\90â\80\9c%s:%sâ\80\9dæ\97¶ï¼\8cå\87ºç\8e°äº\86æ\9f\90äº\9bæ\95\85é\9a\9c(%i - %s)"
+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"

 
 

-#: methods/connect.cc:247
+#: apt-private/private-output.cc:739

 #, c-format
 #, c-format

-msgid "Unable to connect to %s:%s:"
-msgstr "不能连接到 %s：%s："
-
-#: methods/gpgv.cc:180
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！"
-
-#: methods/gpgv.cc:185
-msgid "At least one invalid signature was encountered."
-msgstr "至少发现一个无效的签名。"
-
-#: methods/gpgv.cc:189
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)"
-
-#: methods/gpgv.cc:194
-msgid "Unknown error executing gpgv"
-msgstr "运行 gpgv 时发生未知错误"
-
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
-msgid "The following signatures were invalid:\n"
-msgstr "下列签名无效：\n"
-
-#: methods/gpgv.cc:242
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
-msgstr "由于没有公钥，无法验证下列签名：\n"
+msgid "%lu not fully installed or removed.\n"
+msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"

 
 

-#: methods/gzip.cc:65
-msgid "Empty files can't be valid archives"
+#. 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 ""
 
 msgstr ""
 

-#: methods/http.cc:394
-msgid "Waiting for headers"
-msgstr "正在等待报头"
-
-#: methods/http.cc:544
-msgid "Bad header line"
-msgstr "错误的报头行"
-
-#: methods/http.cc:569 methods/http.cc:576
-msgid "The HTTP server sent an invalid reply header"
-msgstr "该 HTTP 服务器发送了一个无效的应答报头"
-
-#: methods/http.cc:606
-msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
+#. 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 ""

 
 

-#: methods/http.cc:621
-msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr ""

 
 

-#: methods/http.cc:623
-msgid "This HTTP server has broken range support"
-msgstr "该 HTTP 服务器的 range 支持不正常"
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""

 
 

-#: methods/http.cc:647
-msgid "Unknown date format"
-msgstr "无法识别的日期格式"
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "编译正则表达式时出错 - %s"

 
 

-#: methods/http.cc:818
-msgid "Select failed"
-msgstr "select 调用出错"
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""

 
 

-#: methods/http.cc:823
-msgid "Connection timed out"
-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] ""

 
 

-#: methods/http.cc:846
-msgid "Error writing to output file"
-msgstr "写输出文件时出错"
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""

 
 

-#: methods/http.cc:877
-msgid "Error writing to file"
-msgstr "写入文件出错"
+#: apt-private/private-sources.cc:58
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "无法将 %s 重命名为 %s"

 
 

-#: methods/http.cc:905
-msgid "Error writing to the file"
-msgstr "写入文件出错"
+#: apt-private/private-sources.cc:70
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""

 
 

-#: methods/http.cc:919
-msgid "Error reading from server. Remote end closed connection"
-msgstr "从服务器读取数据时出错，对方关闭了连接"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr " update 命令不需要参数"

 
 

-#: methods/http.cc:921
-msgid "Error reading from server"
-msgstr "从服务器读取数据出错"
+#: apt-private/private-update.cc:90
+#, 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] ""

 
 

-#: methods/http.cc:1194
-msgid "Bad header data"
-msgstr "错误的报头数据"
+#: apt-private/private-update.cc:94
+msgid "All packages are up to date."
+msgstr ""

 
 

-#: methods/http.cc:1211 methods/http.cc:1266
-msgid "Connection failed"
-msgstr "连接失败"
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "正在对升级进行计算... "

 
 

-#: methods/http.cc:1358
-msgid "Internal error"
-msgstr "å\86\85é\83¨é\94\99误"
+#: apt-private/private-upgrade.cc:28
+msgid "Done"
+msgstr "å®\8cæ\88\90"

 
 #. 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:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: 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

 #, 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/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:122
+#: 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
+#: apt-pkg/contrib/cdromutl.cc:235

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


@@ -1580,59 +1709,50 @@ msgstr "没有找到镜像文件 %s"
 msgid "Can not read mirror file '%s'"
 msgstr "没有找到镜像文件 %s"
 
 msgid "Can not read mirror file '%s'"
 msgstr "没有找到镜像文件 %s"
 

-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "没有找到镜像文件 %s"
+
+#: methods/mirror.cc:445

 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[镜像：%s]"
 
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[镜像：%s]"
 

-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"
-
-#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171

 msgid "Failed to create IPC pipe to subprocess"
 msgstr "无法为子进程创建 IPC 管道"
 
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "无法为子进程创建 IPC 管道"
 

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

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

-#: dselect/install:32
+#: dselect/install:33

 msgid "Bad default setting!"
 msgstr "错误的默认设置！"
 
 msgid "Bad default setting!"
 msgstr "错误的默认设置！"
 

-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
-#: dselect/install:105 dselect/update:45
+#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
+#: dselect/install:106 dselect/update:45

 msgid "Press enter to continue."
 msgstr "按回车键继续。"
 
 msgid "Press enter to continue."
 msgstr "按回车键继续。"
 

-#: dselect/install:91
+#: dselect/install:92

 msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr "您想要删除之前下载的所有 .deb 文件吗？"
 
 msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr "您想要删除之前下载的所有 .deb 文件吗？"
 

-#: dselect/install:101
+#: dselect/install:102

 msgid "Some errors occurred while unpacking. Packages that were installed"
 msgstr "在解包时发生了一些错误。已经安装的软件包"
 
 msgid "Some errors occurred while unpacking. Packages that were installed"
 msgstr "在解包时发生了一些错误。已经安装的软件包"
 

-#: dselect/install:102
+#: dselect/install:103

 msgid "will be configured. This may result in duplicate errors"
 msgstr "将被配置。这个操作可能会导致出现重复的错误"
 
 msgid "will be configured. This may result in duplicate errors"
 msgstr "将被配置。这个操作可能会导致出现重复的错误"
 

-#: dselect/install:103
+#: dselect/install:104

 msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr "或一些由于依赖关系不能满足所产生的错误。这个问题不大，只有"
 
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr "或一些由于依赖关系不能满足所产生的错误。这个问题不大，只有"
 

-#: dselect/install:104
+#: dselect/install:105

 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr "这个提示之前的错误消息才值得您注意。请更正它们，然后再次执行 [I]nstall"
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr "这个提示之前的错误消息才值得您注意。请更正它们，然后再次执行 [I]nstall"


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

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

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


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

-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1277
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "无法读取 %s 的状态"
+
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400

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

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

 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:171 ftparchive/apt-ftparchive.cc:348
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371

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

-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263
-#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
+#: 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

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

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

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

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

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

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

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

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

 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"


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

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

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

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

 #, 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:47
+#: ftparchive/cachedb.cc:65

 #, 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:65
+#: ftparchive/cachedb.cc:83

 #, 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:76
+#: ftparchive/cachedb.cc:94

 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:81
+#: ftparchive/cachedb.cc:99

 #, 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:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216

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

-#: ftparchive/cachedb.cc:249
+#: ftparchive/cachedb.cc:332
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "无法读取符号链接 %s"
+
+#: ftparchive/cachedb.cc:365

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

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

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

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

 #, 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:85
+#: ftparchive/writer.cc:96

 #, 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:141
+#: ftparchive/writer.cc:152

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

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

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

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

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

-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211

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

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

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

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

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

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

 #, 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:275
+#: ftparchive/writer.cc:286

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

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

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

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

 #, 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:296
+#: ftparchive/writer.cc:308

 #, 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:401
+#: ftparchive/writer.cc:417

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

-#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692

 #, 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:477 ftparchive/writer.cc:827
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848

 #, 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:721
+#: ftparchive/writer.cc:706

 #, 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:725
+#: ftparchive/writer.cc:710

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

-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382

 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - 分配内存失败"
 
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - 分配内存失败"
 

-#: ftparchive/override.cc:35 ftparchive/override.cc:143
+#: ftparchive/override.cc:38 ftparchive/override.cc:142

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

-#: ftparchive/override.cc:61 ftparchive/override.cc:167
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "无法读取 override 文件 %s"
+
+#: ftparchive/override.cc:166

 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
 msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
 
 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
 msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
 

-#: ftparchive/override.cc:75 ftparchive/override.cc:179
+#: ftparchive/override.cc:178

 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
 msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
 
 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
 msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
 

-#: ftparchive/override.cc:89 ftparchive/override.cc:192
+#: ftparchive/override.cc:191

 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
 msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
 
 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
 msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
 

-#: ftparchive/override.cc:128 ftparchive/override.cc:202
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "无法读取 override 文件 %s"
-
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:73

 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "未知的压缩算法“%s”"
 
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "未知的压缩算法“%s”"
 

-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:103

 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
 
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
 

-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:192

 msgid "Failed to create FILE*"
 msgstr "无法创建 FILE*"
 
 msgid "Failed to create FILE*"
 msgstr "无法创建 FILE*"
 

-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:195

 msgid "Failed to fork"
 msgstr "无法 fork"
 
 msgid "Failed to fork"
 msgstr "无法 fork"
 

-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:209

 msgid "Compress child"
 msgstr "压缩子进程"
 
 msgid "Compress child"
 msgstr "压缩子进程"
 

-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:232

 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "内部错误，无法创建 %s"
 
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "内部错误，无法创建 %s"
 

-#: ftparchive/multicompress.cc:304
+#: ftparchive/multicompress.cc:305

 msgid "IO to subprocess/file failed"
 msgstr "无法对子进程或文件进行读写"
 
 msgid "IO to subprocess/file failed"
 msgstr "无法对子进程或文件进行读写"
 

-#: ftparchive/multicompress.cc:342
+#: ftparchive/multicompress.cc:343

 msgid "Failed to read while computing MD5"
 msgstr "在计算 MD5 校验和时无法读取数据"
 
 msgid "Failed to read while computing MD5"
 msgstr "在计算 MD5 校验和时无法读取数据"
 

-#: ftparchive/multicompress.cc:358
+#: ftparchive/multicompress.cc:359

 #, c-format
 msgid "Problem unlinking %s"
 msgstr "在使用 unlink 删除 %s 时出错"
 
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "在使用 unlink 删除 %s 时出错"
 

-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194

 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "无法将 %s 重命名为 %s"
 
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "无法将 %s 重命名为 %s"
 

-#: cmdline/apt-internal-solver.cc:37
+#: cmdline/apt-internal-solver.cc:49

 #, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 #, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"


@@ -2038,720 +2170,865 @@ msgstr ""
 "  -h   本帮助文档\n"
 "  -s   根据源文件排序\n"
 "  -c=? 读取指定配置文件\n"
 "  -h   本帮助文档\n"
 "  -s   根据源文件排序\n"
 "  -c=? 读取指定配置文件\n"

-"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
-
-#: apt-inst/contrib/extracttar.cc:117
-msgid "Failed to create pipes"
-msgstr "无法创建管道"
-
-#: apt-inst/contrib/extracttar.cc:144
-msgid "Failed to exec gzip "
-msgstr "无法执行 gzip"
-
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
-msgid "Corrupted archive"
-msgstr "包文件已被损坏"
-
-#: apt-inst/contrib/extracttar.cc:196
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar 的校验和不符，文件已损坏"
-
-#: apt-inst/contrib/extracttar.cc:303
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "未知的 TAR 数据头类型 %u，成员 %s"
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
-msgstr "无效的归档签名"
-
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
-msgstr "读取归档成员文件头出错"
-
-#: apt-inst/contrib/arfile.cc:94
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "归档文件中成员文件头 %s 无效"
-
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
-msgstr "归档文件中成员文件头无效"
-
-#: apt-inst/contrib/arfile.cc:132
-msgid "Archive is too short"
-msgstr "归档文件太短"
-
-#: apt-inst/contrib/arfile.cc:136
-msgid "Failed to read the archive headers"
-msgstr "无法读取归档文件的数据头"
-
-#: apt-inst/filelist.cc:382
-msgid "DropNode called on still linked node"
-msgstr "把 DropNode 用在了仍在链表中的节点上"
-
-#: apt-inst/filelist.cc:414
-msgid "Failed to locate the hash element!"
-msgstr "无法定位哈希表元素！"
-
-#: apt-inst/filelist.cc:461
-msgid "Failed to allocate diversion"
-msgstr "无法分配转移项"
-
-#: apt-inst/filelist.cc:466
-msgid "Internal error in AddDiversion"
-msgstr "内部错误，出现在 AddDiversion"
-
-#: apt-inst/filelist.cc:479
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s"
-
-#: apt-inst/filelist.cc:508
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "添加了两个转移项 %s-> %s"
-
-#: apt-inst/filelist.cc:551
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "重复的配置文件 %s/%s"
+"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"

 
 

-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
+#: 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"
 
 #, c-format
 msgid "Failed to write file %s"
 msgstr "无法写入文件 %s"
 

-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
+#: apt-inst/dirstream.cc:105

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

-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172

 #, c-format
 msgid "The path %s is too long"
 msgstr "路径名 %s 太长"
 
 #, c-format
 msgid "The path %s is too long"
 msgstr "路径名 %s 太长"
 

-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:132

 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s 被解包了不只一次"
 
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s 被解包了不只一次"
 

-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:142

 #, c-format
 msgid "The directory %s is diverted"
 msgstr "目录 %s 已被转移"
 
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "目录 %s 已被转移"
 

-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:152

 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "该软件包正尝试写入转移对象 %s/%s"
 
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "该软件包正尝试写入转移对象 %s/%s"
 

-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306

 msgid "The diversion path is too long"
 msgstr "该转移路径太长"
 
 msgid "The diversion path is too long"
 msgstr "该转移路径太长"
 

-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:249

 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "目录 %s 要被一个非目录的文件替换"
 
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "目录 %s 要被一个非目录的文件替换"
 

-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:289

 msgid "Failed to locate node in its hash bucket"
 msgstr "无法在其散列桶中分配节点"
 
 msgid "Failed to locate node in its hash bucket"
 msgstr "无法在其散列桶中分配节点"
 

-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:293

 msgid "The path is too long"
 msgstr "路径名太长"
 
 msgid "The path is too long"
 msgstr "路径名太长"
 

-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:421

 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "用来覆盖的软件包不属于 %s 的任何版本"
 
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "用来覆盖的软件包不属于 %s 的任何版本"
 

-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:438

 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 

-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:498

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

-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
+#: 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
 #, c-format

-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
+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 的校验和不符，文件已损坏"

 
 

-#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:55
+#: apt-inst/contrib/extracttar.cc:308

 #, c-format
 #, c-format

-msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”，“%s”或者“%s”"
+msgid "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:120
+#: apt-inst/deb/debfile.cc:132

 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "内部错误，无法定位包内文件 %s"
 
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "内部错误，无法定位包内文件 %s"
 

-#: apt-inst/deb/debfile.cc:214
+#: apt-inst/deb/debfile.cc:227

 msgid "Unparsable control file"
 msgstr "不能解析的主控文件"
 
 msgid "Unparsable control file"
 msgstr "不能解析的主控文件"
 

-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "无法 mmap 一个空文件"
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#, c-format
+msgid "List directory %spartial is missing."
+msgstr "软件包列表的目录 %spartial 缺失。"

 
 

-#: apt-pkg/contrib/mmap.cc:110
+#: apt-pkg/acquire.cc:91

 #, c-format
 #, c-format

-msgid "Couldn't duplicate file descriptor %i"
-msgstr "无法为复制文件描述符 %i"
+msgid "Archives directory %spartial is missing."
+msgstr "仓库目录 %spartial 确实。"

 
 

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

-msgid "Couldn't make mmap of %llu bytes"
-msgstr "无法 mmap %lu 字节的数据"
+msgid "Clean of %s is not supported"
+msgstr "不支持索引文件类型“%s”"

 
 

-#: apt-pkg/contrib/mmap.cc:145
-msgid "Unable to close mmap"
-msgstr "无法关闭 mmap"
+#. 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/contrib/mmap.cc:173 apt-pkg/contrib/mmap.cc:201
-msgid "Unable to synchronize mmap"
-msgstr "无法同步 mmap "
+#: apt-pkg/acquire.cc:904
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "正在下载第 %li 个文件，共 %li 个"

 
 

-#: apt-pkg/contrib/mmap.cc:279
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047

 #, c-format
 #, c-format

-msgid "Couldn't make mmap of %lu bytes"
-msgstr "无法 mmap %lu 字节的数据"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "无法重命名文件，%s (%s -> %s)。"

 
 

-#: apt-pkg/contrib/mmap.cc:311
-msgid "Failed to truncate file"
-msgstr "无法截断文件"
+#: 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/contrib/mmap.cc:330
+#: apt-pkg/acquire-item.cc:1573

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

-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/contrib/mmap.cc:429
+#: 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 ""
 #, c-format
 msgid ""

-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。"
+"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/contrib/mmap.cc:432
+#: apt-pkg/acquire-item.cc:1721
+#, c-format

 msgid ""
 msgid ""

-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"
+"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"

 
 

-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736

 #, c-format
 #, c-format

-msgid "%lid %lih %limin %lis"
-msgstr "%li天 %li小时 %li分 %li秒"
+msgid "GPG error: %s: %s"
+msgstr "GPG 错误：%s: %s"

 
 

-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/acquire-item.cc:1859

 #, c-format
 #, c-format

-msgid "%lih %limin %lis"
-msgstr "%li小时 %li分 %li秒"
+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 软件包的文件。在这种情况下可能需要您手动修正这个软件"
+"包。(缘于架构缺失)"

 
 

-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/acquire-item.cc:1925

 #, c-format
 #, c-format

-msgid "%limin %lis"
-msgstr "%li分 %li秒"
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""

 
 

-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/acquire-item.cc:1983

 #, c-format
 #, c-format

-msgid "%lis"
-msgstr "%li秒"
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"

 
 

-#: apt-pkg/contrib/strutl.cc:1166
+#: apt-pkg/acquire-worker.cc:116

 #, c-format
 #, c-format

-msgid "Selection %s not found"
-msgstr "æ\89¾ä¸\8då\88°æ\82¨é\80\89å\88\99ç\9a\84 %s"
+msgid "The method driver %s could not be found."
+msgstr "æ\97 æ³\95æ\89¾å\88°è\8e·å\8f\96软件å\8c\85ç\9a\84æ¸ é\81\93 %s æ\89\80é\9c\80ç\9a\84驱å\8a¨ç¨\8båº\8fã\80\82"

 
 

-#: apt-pkg/contrib/configuration.cc:491
+#: 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
 #, c-format

-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "无法识别的类型缩写：“%c”"
+msgid "Method %s did not start correctly"
+msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"

 
 

-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/acquire-worker.cc:455

 #, c-format
 #, c-format

-msgid "Opening configuration file %s"
-msgstr "正在打开配置文件 %s"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"

 
 

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

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "语法错误 %s:%u：配置小节没有以名字开头"
+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/contrib/configuration.cc:792
+#: 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
 #, c-format

-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "语法错误 %s:%u：标签格式有误"
+msgid "Release '%s' for '%s' was not found"
+msgstr "未找到“%2$s”的“%1$s”发布版本"

 
 

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

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "语法错误 %s:%u：配置值后有多余的无意义数据"
+msgid "Version '%s' for '%s' was not found"
+msgstr "未找到“%2$s”的“%1$s”版本"

 
 

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

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "语法错误 %s:%u：只能在顶层配置文件中使用指示"
+msgid "Couldn't find task '%s'"
+msgstr "无法找到任务 %s"

 
 

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

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
+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/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865
+#: apt-pkg/cacheset.cc:626

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Included from here"
-msgstr "语法错误 %s:%u：Included from here"
+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/contrib/configuration.cc:869
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "语法错误 %s:%u：不支持的指令“%s”"
+#: apt-pkg/cdrom.cc:609
+msgid "Mounting CD-ROM...\n"
+msgstr "正在挂载 CD-ROM 文件系统……\n"

 
 

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

 
 

-#: apt-pkg/contrib/configuration.cc:922
+#: apt-pkg/cdrom.cc:662

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"
+msgid "Stored label: %s\n"
+msgstr "已归档文件的标签：%s\n"

 
 

-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... 有错误！"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr "正在盘片中查找索引文件...\n"

 
 

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

 #, c-format
 #, c-format

-msgid "%c%s... Done"
-msgstr "%c%s... 完成"
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
+msgstr ""
+"找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
+"名\n"

 
 

-#: apt-pkg/contrib/cmndline.cc:80
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "未知的命令行选项“%c” [来自 %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/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/cdrom.cc:771

 #, c-format
 #, c-format

-msgid "Command line option %s is not understood"
-msgstr "æ\97 æ³\95è¯\86å\88«å\91½ä»¤è¡\8cé\80\89项 %s"
+msgid "Found label '%s'\n"
+msgstr "æ\89¾å\88°æ \87ç­¾ '%s'\n"

 
 

-#: apt-pkg/contrib/cmndline.cc:127
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "命令行选项 %s 不是布尔值"
+#: apt-pkg/cdrom.cc:800
+msgid "That is not a valid name, try again.\n"
+msgstr "这不是一个有效的名字，请重试。\n"

 
 

-#: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189
+#: apt-pkg/cdrom.cc:817

 #, c-format
 #, c-format

-msgid "Option %s requires an argument."
-msgstr "选项 %s 要求有一个参数"
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"这张盘片现在的名字是：\n"
+"“%s”\n"

 
 

-#: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定"
+#: apt-pkg/cdrom.cc:819
+msgid "Copying package lists..."
+msgstr "正在复制软件包列表……"

 
 

-#: apt-pkg/contrib/cmndline.cc:237
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"
+#: apt-pkg/cdrom.cc:863
+msgid "Writing new source list\n"
+msgstr "正在写入新的源列表\n"

 
 

-#: apt-pkg/contrib/cmndline.cc:268
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "选项“%s”太长"
+#: apt-pkg/cdrom.cc:874
+msgid "Source list entries for this disc are:\n"
+msgstr "对应于该盘片的软件源设置项是：\n"

 
 

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

 #, c-format
 #, c-format

-msgid "Sense %s is not understood, try true or false."
-msgstr "不能识别参数 %s，请用 true 或 false"
+msgid "Unable to stat %s."
+msgstr "无法读取 %s 的状态。"

 
 

-#: apt-pkg/contrib/cmndline.cc:350
-#, c-format
-msgid "Invalid operation %s"
-msgstr "无效的操作 %s"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "正在分析软件包的依赖关系树"

 
 

-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "无法读取文件系统挂载点 %s 的状态"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候选版本"

 
 

-#: apt-pkg/contrib/cdromutl.cc:224
-msgid "Failed to stat the cdrom"
-msgstr "无法读取盘片的状态"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "生成依赖关系"

 
 

-#: apt-pkg/contrib/fileutl.cc:93
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "关闭 gzip %s 文件出错"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "正在读取状态信息"

 
 

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

 #, c-format
 #, c-format

-msgid "Not using locking for read only lock file %s"
-msgstr "由于文件系统为只读，因而无法使用文件锁 %s"
+msgid "Failed to open StateFile %s"
+msgstr "无法打开状态文件 %s"

 
 

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

 #, c-format
 #, c-format

-msgid "Could not open lock file %s"
-msgstr "无法æ\89\93å¼\80é\94\81æ\96\87件 %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "无法å\86\99å\85¥ä¸´æ\97¶ç\8a¶æ\80\81æ\96\87件 %s"

 
 

-#: apt-pkg/contrib/fileutl.cc:248
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "无法在 nfs 文件系统上使用文件锁 %s"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""

 
 

-#: apt-pkg/contrib/fileutl.cc:252
-#, c-format
-msgid "Could not get lock %s"
-msgstr "无法获得锁 %s"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""

 
 

-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:426
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:444
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773

 #, c-format
 #, c-format

-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
+msgid "Wrote %i records.\n"
+msgstr "已写入 %i 条记录。\n"

 
 

-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775

 #, c-format
 #, c-format

-msgid "Sub-process %s received a segmentation fault."
-msgstr "å­\90è¿\9bç¨\8b %s å\8f\91ç\94\9fäº\86段é\94\99误"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "å·²å\86\99å\85¥ %i æ\9d¡è®°å½\95ï¼\8c并æ\9c\89 %i 个æ\96\87件缺失ã\80\82\n"

 
 

-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778

 #, c-format
 #, c-format

-msgid "Sub-process %s received signal %u."
-msgstr "å­\90è¿\9bç¨\8b %s æ\94¶å\88°ä¿¡å\8f· %uã\80\82"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "å·²å\86\99å\85¥ %i æ\9d¡è®°å½\95ï¼\8c并æ\9c\89 %i 个æ\96\87件ä¸\8då\8c¹é\85\8d\n"

 
 

-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781

 #, c-format
 #, c-format

-msgid "Sub-process %s returned an error code (%u)"
-msgstr "å­\90è¿\9bç¨\8b %s è¿\94å\9b\9eäº\86ä¸\80个é\94\99误å\8f· (%u)"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "å·²å\86\99å\85¥ %i æ\9d¡è®°å½\95ï¼\8c并æ\9c\89 %i 个缺失ï¼\8c以å\8f\8a %i 个æ\96\87件ä¸\8då\8c¹é\85\8d\n"

 
 

-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/indexcopy.cc:515

 #, c-format
 #, c-format

-msgid "Sub-process %s exited unexpectedly"
-msgstr "子进程 %s 异常退出"
+msgid "Can't find authentication record for: %s"
+msgstr "无法找到认证记录：%s"

 
 

-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:655
+#: apt-pkg/indexcopy.cc:521

 #, c-format
 #, c-format

-msgid "Could not open file %s"
-msgstr "无法打开文件 %s"
+msgid "Hash mismatch for: %s"
+msgstr "Hash 校验和不符：%s"

 
 

-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/indexrecords.cc:78

 #, c-format
 #, c-format

-msgid "Could not open file descriptor %d"
-msgstr "无法打开文件描述符 %d"
+msgid "Unable to parse Release file %s"
+msgstr "无法解析软件包仓库 Release 文件 %s"

 
 

-#: apt-pkg/contrib/fileutl.cc:1136
-msgid "Failed to create subprocess IPC"
-msgstr "无法创建子进程的 IPC 管道"
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"

 
 

-#: apt-pkg/contrib/fileutl.cc:1192
-msgid "Failed to exec compressor "
-msgstr "无法执行压缩程序"
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无哈希条目"

 
 

-#: apt-pkg/contrib/fileutl.cc:1289
-#, fuzzy, c-format
-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º"
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+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/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
-#, fuzzy, c-format
-msgid "write, still have %llu to write but couldn't"
-msgstr "写入文件出错，还剩 %lu 字节没有保存"
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"

 
 

-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/init.cc:146

 #, c-format
 #, c-format

-msgid "Problem closing the file %s"
-msgstr "关闭文件 %s 出错"
+msgid "Packaging system '%s' is not supported"
+msgstr "不支持“%s”打包系统"
+
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
+msgstr "无法确定适合的打包系统类型"

 
 

-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/install-progress.cc:57

 #, c-format
 #, c-format

-msgid "Problem renaming the file %s to %s"
-msgstr "重命名文件 %s 为 %s 出错"
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
+msgstr "正在运行 dpkg"

 
 

-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957

 #, c-format
 #, c-format

-msgid "Problem unlinking the file %s"
-msgstr "用 unlink 删除文件 %s 出错"
+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/contrib/fileutl.cc:1755
-msgid "Problem syncing the file"
-msgstr "同步文件出错"
+#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "无法打开文件 %s"
+
+#: apt-pkg/packagemanager.cc:630
+#, 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:148
+#: apt-pkg/pkgcache.cc:155

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

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

 msgid "The package cache file is corrupted"
 msgstr "软件包缓存文件损坏了"
 
 msgid "The package cache file is corrupted"
 msgstr "软件包缓存文件损坏了"
 

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

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

-#: apt-pkg/pkgcache.cc:162
+#: apt-pkg/pkgcache.cc:169

 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "软件包缓存文件损坏了"
 
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "软件包缓存文件损坏了"
 

-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:174

 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "本程序目前不支持“%s”版本系统"
 
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "本程序目前不支持“%s”版本系统"
 

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

 msgid "The package cache was built for a different architecture"
 msgstr "软件包缓存区是为其它架构的硬件构建的"
 
 msgid "The package cache was built for a different architecture"
 msgstr "软件包缓存区是为其它架构的硬件构建的"
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 msgid "Enhances"
 msgstr "增强"
 
 msgid "Enhances"
 msgstr "增强"
 

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

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

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

 msgid "required"
 msgstr "必需"
 
 msgid "required"
 msgstr "必需"
 

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

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

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

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

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

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

-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "正在分析软件包的依赖关系树"
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
+msgstr "软件包暂存区使用的是不兼容的版本控制系统"

 
 

-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-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: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
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "处理 %s (FindPkg)时出错"

 
 

-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "生成依赖关系"
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "哇，软件包数量超出了本 APT 的处理能力。"

 
 

-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-msgid "Reading state information"
-msgstr "正在读取状态信息"
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"

 
 

-#: apt-pkg/depcache.cc:244
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:576

 #, c-format
 #, c-format

-msgid "Failed to open StateFile %s"
-msgstr "无法打开状态文件 %s"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"

 
 

-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:1211

 #, c-format
 #, c-format

-msgid "Failed to write temporary StateFile %s"
-msgstr "无法写入临时状态文件 %s"
+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
+msgid "Reading package lists"
+msgstr "正在读取软件包列表"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "正在收集文件所提供的软件包"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "无法读取或写入软件源缓存"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "不支持索引文件类型“%s”"
+
+#: apt-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""

 
 

-#: apt-pkg/tagfile.cc:129
+#: apt-pkg/policy.cc:422

 #, c-format
 #, c-format

-msgid "Unable to parse package file %s (1)"
-msgstr "无法解析软件包文件 %s (1)"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头"

 
 

-#: apt-pkg/tagfile.cc:216
+#: apt-pkg/policy.cc:444

 #, c-format
 #, c-format

-msgid "Unable to parse package file %s (2)"
-msgstr "无法解析软件包文件 %s (2)"
+msgid "Did not understand pin type %s"
+msgstr "无法识别锁定的类型 %s"
+
+#: apt-pkg/policy.cc:452
+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:96
+#: apt-pkg/sourcelist.cc:170

 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
 

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

 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
 

-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:184

 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
 

-#: apt-pkg/sourcelist.cc:116
+#: 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] 没有键)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"
 

-#: apt-pkg/sourcelist.cc:119
+#: 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 没有值)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)"
 

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

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

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

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

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

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

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

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

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

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

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

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

-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:469
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "源列表 %2$s 的第 %1$u 行太长了。"
-
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:371

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

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

-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:891
-#, 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:473 apt-pkg/packagemanager.cc:503
+#: apt-pkg/sourcelist.cc:416

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

-msgid "Could not configure '%s'. "
-msgstr "无法打开文件 %s"
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"

 
 

-#: apt-pkg/packagemanager.cc:545
-#, 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/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"

 
 

-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/tagfile.cc:140

 #, c-format
 #, c-format

-msgid "Index file type '%s' is not supported"
-msgstr "不支持索引文件类型“%s”"
+msgid "Unable to parse package file %s (1)"
+msgstr "无法解析软件包文件 %s (1)"

 
 

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

 #, c-format
 #, 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:1223
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
-"缘故。"
-
-#: apt-pkg/algorithms.cc:1225
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
-"系。"
+msgid "Unable to parse package file %s (2)"
+msgstr "无法解析软件包文件 %s (2)"

 
 

-#: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105

 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "


@@ -2759,620 +3036,583 @@ msgid ""
 msgstr ""
 "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 
 msgstr ""
 "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 

-#: apt-pkg/acquire.cc:81
+#: apt-pkg/vendorlist.cc:85

 #, c-format
 #, c-format

-msgid "List directory %spartial is missing."
-msgstr "软件包列表的目录 %spartial 缺失。"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "软件提供者数据块内 %s 没有包含指纹信息"

 
 

-#: apt-pkg/acquire.cc:85
+#: apt-pkg/contrib/cdromutl.cc:65

 #, c-format
 #, c-format

-msgid "Archives directory %spartial is missing."
-msgstr "仓库目录 %spartial 确实。"
+msgid "Unable to stat the mount point %s"
+msgstr "无法读取文件系统挂载点 %s 的状态"

 
 

-#: apt-pkg/acquire.cc:93
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "无法对目录 %s 加锁"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "无法读取盘片的状态"

 
 

-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
+#: apt-pkg/contrib/cmndline.cc:121

 #, c-format
 #, c-format

-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "æ­£å\9c¨ä¸\8b载第 %li 个æ\96\87件ï¼\8cå\85± %li 个(è¿\98å\89© %s 个)"
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "æ\9cªç\9f¥ç\9a\84å\91½ä»¤è¡\8cé\80\89项â\80\9c%câ\80\9d [æ\9d¥è\87ª %s]"

 
 

-#: apt-pkg/acquire.cc:895
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163

 #, c-format
 #, c-format

-msgid "Retrieving file %li of %li"
-msgstr "æ­£å\9c¨ä¸\8b载第 %li 个æ\96\87件ï¼\8cå\85± %li 个"
+msgid "Command line option %s is not understood"
+msgstr "æ\97 æ³\95è¯\86å\88«å\91½ä»¤è¡\8cé\80\89项 %s"

 
 

-#: apt-pkg/acquire-worker.cc:112
+#: apt-pkg/contrib/cmndline.cc:168

 #, c-format
 #, c-format

-msgid "The method driver %s could not be found."
-msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
+msgid "Command line option %s is not boolean"
+msgstr "命令行选项 %s 不是布尔值"

 
 

-#: apt-pkg/acquire-worker.cc:161
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230

 #, c-format
 #, c-format

-msgid "Method %s did not start correctly"
-msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
+msgid "Option %s requires an argument."
+msgstr "选项 %s 要求有一个参数"

 
 

-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249

 #, c-format
 #, c-format

-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定"

 
 

-#: apt-pkg/init.cc:151
+#: apt-pkg/contrib/cmndline.cc:278

 #, c-format
 #, c-format

-msgid "Packaging system '%s' is not supported"
-msgstr "不支持“%s”打包系统"
-
-#: apt-pkg/init.cc:167
-msgid "Unable to determine a suitable packaging system type"
-msgstr "无法确定适合的打包系统类型"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"

 
 

-#: apt-pkg/clean.cc:57
+#: apt-pkg/contrib/cmndline.cc:309

 #, c-format
 #, c-format

-msgid "Unable to stat %s."
-msgstr "无法读取 %s 的状态。"
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
-
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "无法解析或打开软件包的列表或是状态文件。"
-
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "您可能需要运行 apt-get update 来解决这些问题"
-
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr "无法读取源列表。"
+msgid "Option '%s' is too long"
+msgstr "选项“%s”太长"

 
 

-#: apt-pkg/policy.cc:74
+#: apt-pkg/contrib/cmndline.cc:341

 #, c-format
 #, c-format

-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
+msgid "Sense %s is not understood, try true or false."
+msgstr "不能识别参数 %s，请用 true 或 false"

 
 

-#: apt-pkg/policy.cc:396
+#: apt-pkg/contrib/cmndline.cc:391

 #, c-format
 #, c-format

-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头"
+msgid "Invalid operation %s"
+msgstr "无效的操作 %s"

 
 

-#: apt-pkg/policy.cc:418
+#: apt-pkg/contrib/configuration.cc:519

 #, c-format
 #, c-format

-msgid "Did not understand pin type %s"
-msgstr "无法识别锁定的类型 %s"
-
-#: apt-pkg/policy.cc:426
-msgid "No priority (or zero) specified for pin"
-msgstr "没有为版本锁定指定优先级(或为零)"
-
-#: apt-pkg/pkgcachegen.cc:85
-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:211 apt-pkg/pkgcachegen.cc:277
-#: apt-pkg/pkgcachegen.cc:308 apt-pkg/pkgcachegen.cc:316
-#: apt-pkg/pkgcachegen.cc:358 apt-pkg/pkgcachegen.cc:362
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:389
-#: apt-pkg/pkgcachegen.cc:393 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
-#: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
-#: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "处理 %s (FindPkg)时出错"
-
-#: apt-pkg/pkgcachegen.cc:234
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "哇，软件包数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:237
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:240
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:243
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "无法识别的类型缩写：“%c”"

 
 

-#: apt-pkg/pkgcachegen.cc:523
+#: apt-pkg/contrib/configuration.cc:633

 #, c-format
 #, c-format

-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
+msgid "Opening configuration file %s"
+msgstr "正在打开配置文件 %s"

 
 

-#: apt-pkg/pkgcachegen.cc:1088
+#: apt-pkg/contrib/configuration.cc:801

 #, c-format
 #, c-format

-msgid "Couldn't stat source package list %s"
-msgstr "无法获取源软件包列表 %s 的状态"
-
-#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
-msgid "Reading package lists"
-msgstr "正在读取软件包列表"
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "语法错误 %s:%u：配置小节没有以名字开头"

 
 

-#: apt-pkg/pkgcachegen.cc:1193
-msgid "Collecting File Provides"
-msgstr "正在收集文件所提供的软件包"
+#: apt-pkg/contrib/configuration.cc:820
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "语法错误 %s:%u：标签格式有误"

 
 

-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
-msgid "IO Error saving source cache"
-msgstr "无法读取或写入软件源缓存"
+#: apt-pkg/contrib/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "语法错误 %s:%u：配置值后有多余的无意义数据"

 
 

-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/contrib/configuration.cc:877

 #, c-format
 #, c-format

-msgid "rename failed, %s (%s -> %s)."
-msgstr "无法重命名文件，%s (%s -> %s)。"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "语法错误 %s:%u：只能在顶层配置文件中使用指示"

 
 

-#: apt-pkg/acquire-item.cc:599
-msgid "MD5Sum mismatch"
-msgstr "MD5 校验和不符"
+#: apt-pkg/contrib/configuration.cc:884
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "语法错误 %s:%u：太多的嵌套 include 命令"

 
 

-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
-#: apt-pkg/acquire-item.cc:2002
-msgid "Hash Sum mismatch"
-msgstr "Hash 校验和不符"
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "语法错误 %s:%u：Included from here"

 
 

-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/contrib/configuration.cc:897

 #, c-format
 #, c-format

-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "语法错误 %s:%u：不支持的指令“%s”"

 
 

-#: apt-pkg/acquire-item.cc:1386
-#, fuzzy, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "无法解析软件包仓库 Release 文件 %s"
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数"

 
 

-#: apt-pkg/acquire-item.cc:1428
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "以下 ID 的密钥没有可用的公钥：\n"
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"

 
 

-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/contrib/fileutl.cc:190

 #, c-format
 #, c-format

-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
+msgid "Not using locking for read only lock file %s"
+msgstr "由于文件系统为只读，因而无法使用文件锁 %s"

 
 

-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/contrib/fileutl.cc:195

 #, c-format
 #, c-format

-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
+msgid "Could not open lock file %s"
+msgstr "无法打开锁文件 %s"

 
 

-#: apt-pkg/acquire-item.cc:1521
+#: apt-pkg/contrib/fileutl.cc:218

 #, c-format
 #, c-format

-msgid ""
-"A error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
-msgstr ""
-"校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "无法在 nfs 文件系统上使用文件锁 %s"

 
 

-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#: apt-pkg/contrib/fileutl.cc:223

 #, c-format
 #, c-format

-msgid "GPG error: %s: %s"
-msgstr "GPG 错误：%s: %s"
+msgid "Could not get lock %s"
+msgstr "无法获得锁 %s"

 
 

-#: apt-pkg/acquire-item.cc:1635
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474

 #, c-format
 #, 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)"
+msgid "List of files can't be created as '%s' is not a directory"

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/acquire-item.cc:1694
+#: apt-pkg/contrib/fileutl.cc:394

 #, c-format
 #, 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."
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"

 msgstr ""
 msgstr ""

-"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"

 
 

-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/contrib/fileutl.cc:412

 #, c-format
 #, c-format

-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-
-#: apt-pkg/acquire-item.cc:1851
-msgid "Size mismatch"
-msgstr "大小不符"
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""

 
 

-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/contrib/fileutl.cc:421

 #, c-format
 #, c-format

-msgid "Unable to parse Release file %s"
-msgstr "无法解析软件包仓库 Release 文件 %s"
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""

 
 

-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/contrib/fileutl.cc:824

 #, c-format
 #, c-format

-msgid "No sections in Release file %s"
-msgstr "软件å\8c\85ä»\93åº\93 Release æ\96\87件 %s å\86\85æ\97 ç»\84ä»¶ç« è\8a\82ä¿¡æ\81¯"
+msgid "Sub-process %s received a segmentation fault."
+msgstr "å­\90è¿\9bç¨\8b %s å\8f\91ç\94\9fäº\86段é\94\99误"

 
 

-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/contrib/fileutl.cc:826

 #, c-format
 #, c-format

-msgid "No Hash entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
+msgid "Sub-process %s received signal %u."
+msgstr "子进程 %s 收到信号 %u。"

 
 

-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239

 #, c-format
 #, c-format

-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "子进程 %s 返回了一个错误号 (%u)"

 
 

-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232

 #, c-format
 #, c-format

-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
+msgid "Sub-process %s exited unexpectedly"
+msgstr "子进程 %s 异常退出"

 
 

-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/contrib/fileutl.cc:913

 #, c-format
 #, c-format

-msgid "Vendor block %s contains no fingerprint"
-msgstr "软件提供者数据块内 %s 没有包含指纹信息"
+msgid "Problem closing the gzip file %s"
+msgstr "关闭 gzip %s 文件出错"

 
 

-#: apt-pkg/cdrom.cc:550
+#: apt-pkg/contrib/fileutl.cc:1101

 #, c-format
 #, c-format

-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"现把 %s 作为了 CD-ROM 的挂载点\n"
-"正在挂载 CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:656
-msgid "Identifying.. "
-msgstr "正在鉴别.. "
+msgid "Could not open file %s"
+msgstr "无法打开文件 %s"

 
 

-#: apt-pkg/cdrom.cc:587
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207

 #, c-format
 #, c-format

-msgid "Stored label: %s\n"
-msgstr "已归档文件的标签：%s\n"
+msgid "Could not open file descriptor %d"
+msgstr "无法打开文件描述符 %d"

 
 

-#: apt-pkg/cdrom.cc:596 apt-pkg/cdrom.cc:879
-msgid "Unmounting CD-ROM...\n"
-msgstr "æ­£å\9c¨å\8d¸è½½ CD-ROM...\n"
+#: apt-pkg/contrib/fileutl.cc:1315
+msgid "Failed to create subprocess IPC"
+msgstr "æ\97 æ³\95å\88\9b建å­\90è¿\9bç¨\8bç\9a\84 IPC 管é\81\93"

 
 

-#: apt-pkg/cdrom.cc:616
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
+#: apt-pkg/contrib/fileutl.cc:1373
+msgid "Failed to exec compressor "
+msgstr "无法执行压缩程序"

 
 

-#: apt-pkg/cdrom.cc:634
-msgid "Unmounting CD-ROM\n"
-msgstr "正在卸载 CD-ROM 文件系统\n"
+#: apt-pkg/contrib/fileutl.cc:1514
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "读取文件出错，还剩 %lu 字节没有读出"

 
 

-#: apt-pkg/cdrom.cc:639
-msgid "Waiting for disc...\n"
-msgstr "等待插入盘片……\n"
+#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "写入文件出错，还剩 %lu 字节没有保存"

 
 

-#: apt-pkg/cdrom.cc:648
-msgid "Mounting CD-ROM...\n"
-msgstr "正在挂载 CD-ROM 文件系统……\n"
+#: apt-pkg/contrib/fileutl.cc:1915
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "关闭文件 %s 出错"

 
 

-#: apt-pkg/cdrom.cc:667
-msgid "Scanning disc for index files..\n"
-msgstr "正在盘片中查找索引文件..\n"
+#: apt-pkg/contrib/fileutl.cc:1927
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "重命名文件 %s 为 %s 出错"

 
 

-#: apt-pkg/cdrom.cc:716
+#: apt-pkg/contrib/fileutl.cc:1938

 #, 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 "Problem unlinking the file %s"
+msgstr "用 unlink 删除文件 %s 出错"

 
 

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

 
 

-#: apt-pkg/cdrom.cc:754
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72

 #, c-format
 #, c-format

-msgid "Found label '%s'\n"
-msgstr "找到标签 '%s'\n"
+msgid "No keyring installed in %s."
+msgstr "%s 中没有安装密钥环。"

 
 

-#: apt-pkg/cdrom.cc:783
-msgid "That is not a valid name, try again.\n"
-msgstr "这不是一个有效的名字，请重试。\n"
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "无法 mmap 一个空文件"

 
 

-#: apt-pkg/cdrom.cc:800
+#: apt-pkg/contrib/mmap.cc:111

 #, c-format
 #, c-format

-msgid ""
-"This disc is called: \n"
-"'%s'\n"
-msgstr ""
-"这张盘片现在的名字是：\n"
-"“%s”\n"
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "无法为复制文件描述符 %i"

 
 

-#: apt-pkg/cdrom.cc:802
-msgid "Copying package lists..."
-msgstr "正在复制软件包列表……"
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "无法 mmap %lu 字节的数据"

 
 

-#: apt-pkg/cdrom.cc:829
-msgid "Writing new source list\n"
-msgstr "æ­£å\9c¨å\86\99å\85¥æ\96°ç\9a\84æº\90å\88\97表\n"
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "æ\97 æ³\95å\85³é\97­ mmap"

 
 

-#: apt-pkg/cdrom.cc:837
-msgid "Source list entries for this disc are:\n"
-msgstr "对应于该盘片的软件源设置项是：\n"
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "无法同步 mmap "

 
 

-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
+#: apt-pkg/contrib/mmap.cc:290

 #, c-format
 #, c-format

-msgid "Wrote %i records.\n"
-msgstr "已写入 %i 条记录。\n"
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "无法 mmap %lu 字节的数据"

 
 

-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
+#: apt-pkg/contrib/mmap.cc:322
+msgid "Failed to truncate file"
+msgstr "无法截断文件"

 
 

-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
+#: apt-pkg/contrib/mmap.cc:341

 #, c-format
 #, c-format

-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值：%lu。(man 5 "
+"apt.conf)"

 
 

-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
+#: apt-pkg/contrib/mmap.cc:446

 #, c-format
 #, c-format

-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。"

 
 

-#: apt-pkg/indexcopy.cc:503
-#, c-format
-msgid "Skipping nonexistent file %s"
-msgstr "跳过不存在的文件 %s"
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"

 
 

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

 #, c-format
 #, c-format

-msgid "Can't find authentication record for: %s"
-msgstr "无法找到认证记录：%s"
+msgid "%c%s... Error!"
+msgstr "%c%s... 有错误！"

 
 

-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/contrib/progress.cc:150

 #, c-format
 #, c-format

-msgid "Hash mismatch for: %s"
-msgstr "Hash 校验和不符：%s"
+msgid "%c%s... Done"
+msgstr "%c%s... 完成"

 
 

-#: apt-pkg/indexcopy.cc:659
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."

 msgstr ""
 
 msgstr ""
 

-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:690
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s 中没有安装密钥环。"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... 完成"

 
 

-#: apt-pkg/cacheset.cc:401
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:418

 #, c-format
 #, c-format

-msgid "Release '%s' for '%s' was not found"
-msgstr "未找到“%2$s”的“%1$s”发布版本"
+msgid "%lid %lih %limin %lis"
+msgstr "%li天 %li小时 %li分 %li秒"

 
 

-#: apt-pkg/cacheset.cc:404
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425

 #, c-format
 #, c-format

-msgid "Version '%s' for '%s' was not found"
-msgstr "未找到“%2$s”的“%1$s”版本"
+msgid "%lih %limin %lis"
+msgstr "%li小时 %li分 %li秒"

 
 

-#: apt-pkg/cacheset.cc:515
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432

 #, c-format
 #, c-format

-msgid "Couldn't find task '%s'"
-msgstr "无法找到任务 %s"
+msgid "%limin %lis"
+msgstr "%li分 %li秒"

 
 

-#: apt-pkg/cacheset.cc:521
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:437

 #, c-format
 #, c-format

-msgid "Couldn't find any package by regex '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
+msgid "%lis"
+msgstr "%li秒"

 
 

-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/contrib/strutl.cc:1258

 #, c-format
 #, c-format

-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "æ\97 æ³\95ä»\8eå®\8cå\85¨è\99\9aæ\8b\9fç\9a\84软件å\8c\85 %s 中é\80\89æ\8b©ç\89\88æ\9c¬"
+msgid "Selection %s not found"
+msgstr "æ\89¾ä¸\8då\88°æ\82¨é\80\89å\88\99ç\9a\84 %s"

 
 

-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/deb/debsystem.cc:91

 #, c-format
 msgid ""
 #, 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:553
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"

 
 

-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/deb/debsystem.cc:94

 #, c-format
 #, c-format

-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "因为软件包 %s 没有候选版本，无法进行选择"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"

 
 

-#: apt-pkg/cacheset.cc:569
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110

 #, c-format
 #, c-format

-msgid "Can't select installed version from package %s as it is not installed"
-msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
-
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:277
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:284
-msgid "External solver failed without a proper error message"
-msgstr ""
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。"

 
 

-#: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "未锁定"

 
 

-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:95

 #, c-format
 msgid "Installing %s"
 msgstr "正在安装 %s"
 
 #, c-format
 msgid "Installing %s"
 msgstr "正在安装 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999

 #, c-format
 msgid "Configuring %s"
 msgstr "正在配置 %s"
 
 #, c-format
 msgid "Configuring %s"
 msgstr "正在配置 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006

 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
 
 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:98

 #, c-format
 msgid "Completely removing %s"
 msgstr "完全删除 %s"
 
 #, c-format
 msgid "Completely removing %s"
 msgstr "完全删除 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:99

 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "注意到 %s 已经消失"
 
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "注意到 %s 已经消失"
 

-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:100

 #, 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:705
+#: apt-pkg/deb/dpkgpm.cc:830

 #, c-format
 msgid "Directory '%s' missing"
 msgstr "目录 %s 缺失"
 
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "目录 %s 缺失"
 

-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867

 #, 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:945
+#: apt-pkg/deb/dpkgpm.cc:992

 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 
 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:993

 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:998

 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:1000

 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 
 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:1005

 #, 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:960
+#: apt-pkg/deb/dpkgpm.cc:1007

 #, c-format
 msgid "Removed %s"
 msgstr "已删除 %s"
 
 #, c-format
 msgid "Removed %s"
 msgstr "已删除 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:1012

 #, 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:966
+#: apt-pkg/deb/dpkgpm.cc:1013

 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 
 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:1209
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ？)\n"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124
+#: apt-pkg/deb/dpkgpm.cc:1150
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "无法写入 %s"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1239
-msgid "Running dpkg"
-msgstr "正在运行 dpkg"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150
+msgid "Is /dev/pts mounted?"
+msgstr ""

 
 

-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1124
+msgid "Is stdout a terminal?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1625

 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1687

 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:1478
+#: apt-pkg/deb/dpkgpm.cc:1692

 msgid "dependency problems - leaving unconfigured"
 msgstr "依赖问题 - 保持未配置"
 
 msgid "dependency problems - leaving unconfigured"
 msgstr "依赖问题 - 保持未配置"
 

-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1694

 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:1486
+#: apt-pkg/deb/dpkgpm.cc:1700

 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:1492
+#: apt-pkg/deb/dpkgpm.cc:1707

 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:1499
+#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
+
+#: apt-pkg/deb/dpkgpm.cc:1742

 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:84
-#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "内部错误，全部升级工具坏事了"

 
 

-#: apt-pkg/deb/debsystem.cc:87
-#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"
+#~ msgid "%s not a valid DEB package."
+#~ msgstr "%s 不是一个有效的 DEB 软件包。"

 
 

-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
-#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。"
+#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "现把 %s 作为了 CD-ROM 的挂载点\n"
+#~ "正在挂载 CD-ROM\n"

 
 

-#: apt-pkg/deb/debsystem.cc:121
-msgid "Not locked"
-msgstr "未锁定"
+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"
+
+#~ msgid "Note, selecting '%s' for task '%s'\n"
+#~ msgstr "注意，为任务 %2$s 选中了 %1$s\n"
+
+#~ msgid "Note, selecting '%s' for regex '%s'\n"
+#~ msgstr "注意，根据正则表达式 %2$s 选中了 %1$s\n"
+
+#~ msgid "Package %s is a virtual package provided by:\n"
+#~ msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
+
+#~ msgid " [Not candidate version]"
+#~ msgstr " [无候选版本]"
+
+#~ msgid "You should explicitly select one to install."
+#~ msgstr "请您明确地选择一个来进行安装。"
+
+#~ msgid ""
+#~ "Package %s is not available, but is referred to by another package.\n"
+#~ "This may mean that the package is missing, has been obsoleted, or\n"
+#~ "is only available from another source\n"
+#~ msgstr ""
+#~ "现在没有可用的软件包 %s，但是它被其它的软件包引用了。\n"
+#~ "这可能意味着这个缺失的软件包可能已被废弃，\n"
+#~ "或者只能在其他发布源中找到\n"
+
+#~ msgid "However the following packages replace it:"
+#~ msgstr "可是下列软件包取代了它："
+
+#~ msgid "Package '%s' has no installation candidate"
+#~ msgstr "软件包 %s 没有可供安装的候选者"
+
+#~ msgid "Virtual packages like '%s' can't be removed\n"
+#~ msgstr "类似 %s 的虚拟软件包可以卸载\n"
+
+#~ msgid "Note, selecting '%s' instead of '%s'\n"
+#~ msgstr "注意，选取 %s 而非 %s\n"
+
+#~ msgid "Ignore unavailable target release '%s' of package '%s'"
+#~ msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s"
+
+#~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+#~ msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”，“%s”或者“%s”"
+
+#~ msgid "MD5Sum mismatch"
+#~ msgstr "MD5 校验和不符"
+
+#~ msgid ""
+#~ "I wasn't able to locate a file for the %s package. This might mean you "
+#~ "need to manually fix this package."
+#~ msgstr ""
+#~ "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
+
+#~ msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+#~ msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ？)\n"
+
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "跳过不存在的文件 %s"

 
 #~ msgid "Failed to remove %s"
 #~ msgstr "无法卸载 %s"
 
 #~ msgid "Failed to remove %s"
 #~ msgstr "无法卸载 %s"