# Deng Xiyue <manphiz-guest@users.alioth.debian.org>, 2007, 2008.
# Tchaikov <tchaikov@sjtu.org>, 2005, 2007.
# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.
-# Aron Xu <happyaron.xu@gmail.com>, 2009.
+# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-10 16:49+0100\n"
-"PO-Revision-Date: 2009-12-02 01:00+0800\n"
+"POT-Creation-Date: 2010-09-28 17:23+0200\n"
+"PO-Revision-Date: 2010-08-26 14:42+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
-"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:156
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
-#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021
-#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "未发现软件包 %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284
msgid "Total package names: "
msgstr "软件包名称总数："
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:286
+msgid "Total package structures: "
+msgstr "全部软件包结构："
+
+#: cmdline/apt-cache.cc:326
msgid " Normal packages: "
msgstr " 普通软件包："
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:327
msgid " Pure virtual packages: "
msgstr " 完全虚拟软件包："
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:328
msgid " Single virtual packages: "
msgstr " 单虚拟软件包："
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:329
msgid " Mixed virtual packages: "
msgstr " 混合虚拟软件包："
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:330
msgid " Missing: "
msgstr " 缺失："
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:332
msgid "Total distinct versions: "
msgstr "按版本共计："
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:334
msgid "Total distinct descriptions: "
msgstr "按不同的说明共计："
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:336
msgid "Total dependencies: "
msgstr "按依赖关系共计："
-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc:339
msgid "Total ver/file relations: "
msgstr "按版本/文件关系共计："
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:341
msgid "Total Desc/File relations: "
msgstr "按说明/文件关系共计："
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:343
msgid "Total Provides mappings: "
msgstr "提供映射共计："
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:355
msgid "Total globbed strings: "
msgstr "Glob 字串共计："
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:369
msgid "Total dependency version space: "
msgstr "依赖关系版本名所占空间共计："
-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc:374
msgid "Total slack space: "
msgstr "Slack 空间共计："
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:382
msgid "Total space accounted for: "
msgstr "总占用空间："
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
#, c-format
msgid "Package file %s is out of sync."
msgstr "软件包文件 %s 尚未同步。"
-#: cmdline/apt-cache.cc:1297
-msgid "You must give exactly one pattern"
-msgstr "您必须明确地给出一个表达式"
+#: cmdline/apt-cache.cc:1273
+msgid "You must give at least one search pattern"
+msgstr "您必须明确地给出至少一个表达式"
-#: cmdline/apt-cache.cc:1451
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
msgid "No packages found"
msgstr "没有发现匹配的软件包"
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "未发现软件包 %s"
+
+#: cmdline/apt-cache.cc:1533
msgid "Package files:"
msgstr "软件包文件："
-#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
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:1549
+#: cmdline/apt-cache.cc:1554
msgid "Pinned packages:"
msgstr "被锁定的软件包："
-#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
msgid "(not found)"
msgstr "(没有找到)"
-#. Installed version
-#: cmdline/apt-cache.cc:1582
+#: cmdline/apt-cache.cc:1575
msgid " Installed: "
msgstr " 已安装："
-#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
-msgid "(none)"
-msgstr "(无)"
-
-#. Candidate Version
-#: cmdline/apt-cache.cc:1589
+#: cmdline/apt-cache.cc:1576
msgid " Candidate: "
msgstr " 候选软件包："
-#: cmdline/apt-cache.cc:1599
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
+msgid "(none)"
+msgstr "(无)"
+
+#: cmdline/apt-cache.cc:1615
msgid " Package pin: "
msgstr " 软件包锁："
#. Show the priority tables
-#: cmdline/apt-cache.cc:1608
+#: cmdline/apt-cache.cc:1624
msgid " Version table:"
msgstr " 版本列表："
-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid " %4i %s\n"
-msgstr " %4i %s\n"
-
-#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
+#: cmdline/apt-get.cc:2758 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s，用于 %s 构架，编译于 %s %s\n"
-#: cmdline/apt-cache.cc:1725
+#: cmdline/apt-cache.cc:1745
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
" unmet - Show unmet dependencies\n"
" search - Search the package list for a regex pattern\n"
" show - Show a readable record for the package\n"
+" showauto - Display a list of automatically installed packages\n"
" depends - Show raw dependency information for a package\n"
" rdepends - Show reverse dependency information for a package\n"
" pkgnames - List the names of all packages in the system\n"
" unmet - 显示所有未满足的依赖关系\n"
" search - 根据正则表达式搜索软件包列表\n"
" show - 以便于阅读的格式介绍该软件包\n"
+" showauto - 显示自动安装的软件包的列表\n"
" depends - 显示该软件包的依赖关系信息\n"
" rdepends - 显示所有依赖于该软件包的软件包名字\n"
" pkgnames - 列出所有软件包的名字\n"
msgid "Please insert a Disc in the drive and press enter"
msgstr "请把盘片插入驱动器再按回车键"
-#: cmdline/apt-cdrom.cc:114
+#: cmdline/apt-cdrom.cc:127
+#, c-format
+msgid "Failed to mount '%s' to '%s'"
+msgstr "无法将 %s 挂载到 %s"
+
+#: cmdline/apt-cdrom.cc:162
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:309
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
-#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
+#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
msgid "Package extension list is too long"
msgstr "软件包的扩展列表太长"
-#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
-#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
-#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
+#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
+#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
+#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
#, c-format
msgid "Error processing directory %s"
msgstr "处理目录 %s 时出错"
-#: ftparchive/apt-ftparchive.cc:251
+#: ftparchive/apt-ftparchive.cc:260
msgid "Source extension list is too long"
msgstr "源扩展列表太长"
-#: ftparchive/apt-ftparchive.cc:368
+#: ftparchive/apt-ftparchive.cc:377
msgid "Error writing header to contents file"
msgstr "将头写入到目录文件时出错"
-#: ftparchive/apt-ftparchive.cc:398
+#: ftparchive/apt-ftparchive.cc:407
#, c-format
msgid "Error processing contents %s"
msgstr "处理目录 %s 时出错"
-#: ftparchive/apt-ftparchive.cc:553
+#: ftparchive/apt-ftparchive.cc:595
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
" -c=? 读取指定配置文件\n"
" -o=? 设置任意指定的配置选项"
-#: ftparchive/apt-ftparchive.cc:759
+#: ftparchive/apt-ftparchive.cc:801
msgid "No selections matched"
msgstr "没有任何选定项是匹配的"
-#: ftparchive/apt-ftparchive.cc:832
+#: ftparchive/apt-ftparchive.cc:879
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "软件包文件组“%s”中缺少一些文件"
#: ftparchive/cachedb.cc:72
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。"
msgid "Failed to stat %s"
msgstr "无法获得 %s 的状态"
-#: ftparchive/cachedb.cc:238
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "归档文件没有包含控制字段"
-#: ftparchive/cachedb.cc:444
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "无法获得游标"
-#: ftparchive/writer.cc:76
+#: ftparchive/writer.cc:73
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告：无法读取目录 %s\n"
-#: ftparchive/writer.cc:81
+#: ftparchive/writer.cc:78
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告：无法获得 %s 的状态\n"
-#: ftparchive/writer.cc:132
+#: ftparchive/writer.cc:134
msgid "E: "
msgstr "错误："
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:136
msgid "W: "
msgstr "警告："
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: Errors apply to file "
msgstr "错误：处理文件时出错 "
-#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
#, c-format
msgid "Failed to resolve %s"
msgstr "无法解析 %s"
-#: ftparchive/writer.cc:170
+#: ftparchive/writer.cc:174
msgid "Tree walking failed"
msgstr "无法遍历目录树"
-#: ftparchive/writer.cc:195
+#: ftparchive/writer.cc:201
#, c-format
msgid "Failed to open %s"
msgstr "无法打开 %s"
-#: ftparchive/writer.cc:254
+#: ftparchive/writer.cc:260
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:262
+#: ftparchive/writer.cc:268
#, c-format
msgid "Failed to readlink %s"
msgstr "无法读取符号链接 %s"
-#: ftparchive/writer.cc:266
+#: ftparchive/writer.cc:272
#, c-format
msgid "Failed to unlink %s"
msgstr "无法使用 unlink 删除 %s"
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:279
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 无法将 %s 链接到 %s"
-#: ftparchive/writer.cc:283
+#: ftparchive/writer.cc:289
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " 达到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:393
msgid "Archive had no package field"
msgstr "归档文件没有包含 package 字段"
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:401 ftparchive/writer.cc:688
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:464 ftparchive/writer.cc:793
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:698
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 没有源代码的 override 项\n"
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:702
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 中没有二进制文件的 override 项\n"
msgid "Failed to rename %s to %s"
msgstr "无法将 %s 重命名为 %s"
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:135
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:252
msgid "The following packages have unmet dependencies:"
msgstr "下列软件包有未满足的依赖关系："
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:342
#, c-format
msgid "but %s is installed"
msgstr "但是 %s 已经安装"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:344
#, c-format
msgid "but %s is to be installed"
msgstr "但是 %s 正要被安装"
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:351
msgid "but it is not installable"
msgstr "但无法安装它"
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:353
msgid "but it is a virtual package"
msgstr "但是它是虚拟软件包"
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:356
msgid "but it is not installed"
msgstr "但是它还没有被安装"
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:356
msgid "but it is not going to be installed"
msgstr "但是它将不会被安装"
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:361
msgid " or"
msgstr " 或"
-#: cmdline/apt-get.cc:382
+#: cmdline/apt-get.cc:392
msgid "The following NEW packages will be installed:"
msgstr "下列【新】软件包将被安装："
-#: cmdline/apt-get.cc:408
+#: cmdline/apt-get.cc:420
msgid "The following packages will be REMOVED:"
msgstr "下列软件包将被【卸载】："
-#: cmdline/apt-get.cc:430
+#: cmdline/apt-get.cc:442
msgid "The following packages have been kept back:"
msgstr "下列软件包的版本将保持不变："
-#: cmdline/apt-get.cc:451
+#: cmdline/apt-get.cc:465
msgid "The following packages will be upgraded:"
msgstr "下列软件包将被升级："
-#: cmdline/apt-get.cc:472
+#: cmdline/apt-get.cc:488
msgid "The following packages will be DOWNGRADED:"
msgstr "下列软件包将被【降级】："
-#: cmdline/apt-get.cc:492
+#: cmdline/apt-get.cc:508
msgid "The following held packages will be changed:"
msgstr "下列被要求保持版本不变的软件包将被改变："
-#: cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:561
#, c-format
msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:569
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
"【警告】：下列基础软件包将被卸载。\n"
"请勿尝试，除非您确实知道您在做什么！"
-#: cmdline/apt-get.cc:584
+#: cmdline/apt-get.cc:603
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
-#: cmdline/apt-get.cc:588
+#: cmdline/apt-get.cc:607
#, c-format
msgid "%lu reinstalled, "
msgstr "重新安装了 %lu 个软件包，"
-#: cmdline/apt-get.cc:590
+#: cmdline/apt-get.cc:609
#, c-format
msgid "%lu downgraded, "
msgstr "降级了 %lu 个软件包，"
-#: cmdline/apt-get.cc:592
+#: cmdline/apt-get.cc:611
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
-#: cmdline/apt-get.cc:596
+#: cmdline/apt-get.cc:615
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
+#: cmdline/apt-get.cc:635
+#, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "注意，为任务 %2$s 选中了 %1$s\n"
+
+#: cmdline/apt-get.cc:641
+#, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "注意，根据正则表达式 %2$s 选中了 %1$s\n"
+
+#: cmdline/apt-get.cc:648
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
+
+#: cmdline/apt-get.cc:658
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
+
#: cmdline/apt-get.cc:669
+msgid " [Installed]"
+msgstr " [已安装]"
+
+#: cmdline/apt-get.cc:678
+msgid " [Not candidate version]"
+msgstr " [无候选版本]"
+
+#: cmdline/apt-get.cc:680
+msgid "You should explicitly select one to install."
+msgstr "请您明确地选择一个来进行安装。"
+
+#: cmdline/apt-get.cc:683
+#, 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"
+msgstr ""
+"现在没有可用的软件包 %s，但是它被其它的软件包引用了。\n"
+"这可能意味着这个缺失的软件包可能已被废弃，\n"
+"或者只能在其他发布源中找到\n"
+
+#: cmdline/apt-get.cc:701
+msgid "However the following packages replace it:"
+msgstr "可是下列软件包取代了它："
+
+#: cmdline/apt-get.cc:713
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "软件包 %s 没有可供安装的候选者"
+
+#: cmdline/apt-get.cc:724
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr "类似 %s 的虚拟软件包可以卸载\n"
+
+#: cmdline/apt-get.cc:755
+#, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "注意，选取 %s 而非 %s\n"
+
+#: cmdline/apt-get.cc:785
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
+
+#: cmdline/apt-get.cc:789
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n"
+
+#: cmdline/apt-get.cc:799
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "不能重新安装 %s，因为无法下载它。\n"
+
+#: cmdline/apt-get.cc:804
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s 已经是最新的版本了。\n"
+
+#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:1992
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s 被设置为手动安装。\n"
+
+#: cmdline/apt-get.cc:863
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "软件包 %s 还未安装，因而不会被卸载\n"
+
+#: cmdline/apt-get.cc:938
msgid "Correcting dependencies..."
msgstr "正在更正依赖关系..."
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:941
msgid " failed."
msgstr " 失败。"
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:944
msgid "Unable to correct dependencies"
msgstr "无法更正依赖关系"
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:947
msgid "Unable to minimize the upgrade set"
msgstr "无法最小化要升级的软件包集合"
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:949
msgid " Done"
msgstr " 完成"
-#: cmdline/apt-get.cc:684
-msgid "You might want to run `apt-get -f install' to correct these."
+#: cmdline/apt-get.cc:953
+msgid "You might want to run 'apt-get -f install' to correct these."
msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:956
msgid "Unmet dependencies. Try using -f."
msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-#: cmdline/apt-get.cc:712
+#: cmdline/apt-get.cc:981
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "【警告】：下列软件包不能通过验证！"
-#: cmdline/apt-get.cc:716
+#: cmdline/apt-get.cc:985
msgid "Authentication warning overridden.\n"
msgstr "忽略了认证警告。\n"
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:992
msgid "Install these packages without verification [y/N]? "
msgstr "不经验证就安装这些软件包吗？[y/N] "
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:994
msgid "Some packages could not be authenticated"
msgstr "有些软件包不能通过验证"
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:1166
msgid "There are problems and -y was used without --force-yes"
msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
-#: cmdline/apt-get.cc:775
+#: cmdline/apt-get.cc:1044
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
-#: cmdline/apt-get.cc:784
+#: cmdline/apt-get.cc:1053
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1064
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误，Ordering 未能完成"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
-msgid "Unable to lock the download directory"
-msgstr "无法锁定下载目录"
-
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
-#: apt-pkg/cachefile.cc:65
-msgid "The list of sources could not be read."
-msgstr "无法读取源列表。"
-
-#: cmdline/apt-get.cc:836
+#: cmdline/apt-get.cc:1104
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧"
-#: cmdline/apt-get.cc:841
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1111
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需要下载 %sB/%sB 的软件包。\n"
-#: cmdline/apt-get.cc:844
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1116
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需要下载 %sB 的软件包。\n"
-#: cmdline/apt-get.cc:849
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1123
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
-#: cmdline/apt-get.cc:852
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1128
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:1143 cmdline/apt-get.cc:1146 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2335
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的可用空间"
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:1156
#, c-format
msgid "You don't have enough free space in %s."
msgstr "您在 %s 上没有足够的可用空间。"
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1192
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。"
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:1174
msgid "Yes, do as I say!"
msgstr "是，按我说的做！"
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:1176
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"若还想继续的话，就输入下面的短句“%s”\n"
" ?] "
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:1182 cmdline/apt-get.cc:1201
msgid "Abort."
msgstr "中止执行。"
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:1197
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗？[Y/n]"
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:2392 apt-pkg/algorithms.cc:1462
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1287
msgid "Some files failed to download"
msgstr "有一些文件无法下载"
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1288 cmdline/apt-get.cc:2401
msgid "Download complete and in download only mode"
msgstr "下载完毕，目前是“仅下载”模式"
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1294
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
"有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
"再试试？"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1298
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换"
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1303
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1304
msgid "Aborting install."
msgstr "中止安装。"
-#: cmdline/apt-get.cc:1082
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "注意，选取 %s 而非 %s\n"
-
-#: cmdline/apt-get.cc:1093
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
-
-#: cmdline/apt-get.cc:1111
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "软件包 %s 还未安装，因而不会被卸载\n"
-
-#: cmdline/apt-get.cc:1122
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
-
-#: cmdline/apt-get.cc:1134
-msgid " [Installed]"
-msgstr " [已安装]"
-
-#: cmdline/apt-get.cc:1139
-msgid "You should explicitly select one to install."
-msgstr "请您明确地选择一个来进行安装。"
-
-#: cmdline/apt-get.cc:1144
-#, c-format
+#: cmdline/apt-get.cc:1332
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"
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失："
-#: cmdline/apt-get.cc:1163
-msgid "However the following packages replace it:"
-msgstr "可是下列软件包取代了它："
-
-#: cmdline/apt-get.cc:1166
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "软件包 %s 还没有可供安装的候选者"
-
-#: cmdline/apt-get.cc:1186
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "不能重新安装 %s，因为无法下载它。\n"
-
-#: cmdline/apt-get.cc:1194
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s 已经是最新的版本了。\n"
+#: cmdline/apt-get.cc:1336
+msgid "Note: This is done automatic and on purpose by dpkg."
+msgstr "注意：这是自动被 dpkg 有意完成的。"
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1466
#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "未找到“%2$s”的“%1$s”发布版本"
-
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "未找到“%2$s”的“%1$s”版本"
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s"
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1498
#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "选定了版本为 %s (%s) 的 %s\n"
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "选择 %s 作为源代码包而非 %s\n"
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1536
#, c-format
-msgid "No source package '%s' picking '%s' instead\n"
-msgstr "没有源代码包“%s”，使用“%s”代替\n"
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1552
msgid "The update command takes no arguments"
msgstr " update 命令不需要参数"
-#: cmdline/apt-get.cc:1398
-msgid "Unable to lock the list directory"
-msgstr "无法对状态列表目录加锁"
-
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1618
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我们不应该进行删除，无法启动自动删除器"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1666
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 "下列软件包是自动安装的并且现在不需要了："
+msgstr[0] "下列软件包是自动安装的并且现在不需要了："
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1670
#, c-format
-msgid "%lu packages were automatically installed and are no longer required.\n"
-msgstr "%lu 个自动安装的的软件包现在不需要了\n"
+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:1506
+#: cmdline/apt-get.cc:1672
msgid "Use 'apt-get autoremove' to remove them."
-msgstr "使ç\94¨'apt-get autoremove'æ\9d¥å\88 é\99¤它们"
+msgstr "使ç\94¨'apt-get autoremove'æ\9d¥å\8d¸è½½它们"
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1677
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
-msgstr "ä¼¼ä¹\8eè\87ªå\8a¨å\88 é\99¤工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。"
+msgstr "ä¼¼ä¹\8eè\87ªå\8a¨å\8d¸è½½工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。"
#.
#. if (Packages == 1)
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1680 cmdline/apt-get.cc:1822
msgid "The following information may help to resolve the situation:"
msgstr "下列信息可能会对解决问题有所帮助："
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1684
msgid "Internal Error, AutoRemover broke stuff"
-msgstr "å\86\85é\83¨é\94\99误ï¼\8cè\87ªå\8a¨å\88 é\99¤工具坏事了"
+msgstr "å\86\85é\83¨é\94\99误ï¼\8cè\87ªå\8a¨å\8d¸è½½工具坏事了"
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1703
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部错误，全部升级工具坏事了"
-#: cmdline/apt-get.cc:1592
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "无法找到任务 %s"
-
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "无法找到软件包 %s"
-
-#: cmdline/apt-get.cc:1730
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
-
-#: cmdline/apt-get.cc:1761
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s 被设置为手动安装。\n"
-
-#: cmdline/apt-get.cc:1774
-msgid "You might want to run `apt-get -f install' to correct these:"
+#: cmdline/apt-get.cc:1792
+msgid "You might want to run 'apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1795
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1807
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"
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1825
msgid "Broken packages"
msgstr "破损的软件包"
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1854
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包："
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1944
msgid "Suggested packages:"
msgstr "建议安装的软件包："
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1945
msgid "Recommended packages:"
msgstr "推荐安装的软件包："
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1987
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "无法找到软件包 %s"
+
+#: cmdline/apt-get.cc:1994
+#, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s 被设置为手动安装。\n"
+
+#: cmdline/apt-get.cc:2015
msgid "Calculating upgrade... "
msgstr "正在对升级进行计算... "
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2018 methods/ftp.cc:707 methods/connect.cc:111
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:2023
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2098
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误，问题解决工具坏事了"
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2155
+msgid "Unable to lock the download directory"
+msgstr "无法锁定下载目录"
+
+#: cmdline/apt-get.cc:2198
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码，必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2238 cmdline/apt-get.cc:2519
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2254
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+"提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n"
+"%s\n"
+
+#: cmdline/apt-get.cc:2259
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+"请使用：\n"
+"bzr get %s\n"
+"获得该软件包的最近更新(可能尚未正式发布)。\n"
+
+#: cmdline/apt-get.cc:2310
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2345
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的可用空间"
-#: cmdline/apt-get.cc:2254
+#. 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:2353
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2257
+#. 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:2358
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2364
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2397
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2427
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "忽略已经被解包到 %s 目录的源代码包\n"
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2440
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2457
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2477
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2493
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2524
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系信息"
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2595
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2648
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
-"$s 依赖关系"
+"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 "
+"%1$s 依赖关系"
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2684
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新"
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2711
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2727
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2732
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2763
msgid "Supported modules:"
msgstr "支持的模块："
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2804
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
" clean - Erase downloaded archive files\n"
" autoclean - Erase old downloaded archive files\n"
" check - Verify that there are no broken dependencies\n"
+" markauto - Mark the given packages as automatically installed\n"
+" unmarkauto - Mark the given packages as manually installed\n"
"\n"
"Options:\n"
" -h This help text.\n"
"命令：\n"
" update - 取回更新的软件包列表信息\n"
" upgrade - 进行一次升级\n"
-" install - 安装新的软件包(注：包名是 libc6 而非 libc6.deb)\n"
+" install - 安装新的软件包(注：软件包名称是 libc6 而非 libc6.deb)\n"
" remove - 卸载软件包\n"
" autoremove - 卸载所有自动安装且不再使用的软件包\n"
" purge - 卸载并清除软件包的配置\n"
" source - 下载源码包文件\n"
-" build-dep - 为源码包配置所需的构建依赖关系\n"
+" build-dep - 为源码包配置所需的编译依赖关系\n"
" dist-upgrade - 发布版升级，见 apt-get(8)\n"
" dselect-upgrade - 根据 dselect 的选择来进行升级\n"
" clean - 删除所有已下载的包文件\n"
" autoclean - 删除老版本的已下载的包文件\n"
" check - 核对以确认系统的依赖关系的完整性\n"
+" markauto - 标记指定的软件包为自动安装\n"
+" unmarkauto - 标记指定的软件包为手动安装\n"
"\n"
"选项：\n"
" -h 本帮助文档。\n"
"以获取更多信息和选项。\n"
" 本 APT 具有超级牛力。\n"
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2960
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:311 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100
+#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
+#: methods/mirror.cc:87
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
#, c-format
msgid "Failed to remove %s"
-msgstr "æ\97 æ³\95å\88 é\99¤ %s"
+msgstr "æ\97 æ³\95å\8d¸è½½ %s"
#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
#, c-format
msgid "The info and temp directories need to be on the same filesystem"
msgstr "info 和 temp 目录要求处于同一文件系统之下"
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
msgid "Reading package lists"
msgstr "正在读取软件包列表"
msgid "Unparsable control file"
msgstr "不能解析的主控文件"
-#: methods/cdrom.cc:200
+#: methods/bzip2.cc:65
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr "无法为 %s 开启管道"
+
+#: methods/bzip2.cc:109
+#, c-format
+msgid "Read error from %s process"
+msgstr "从 %s 进程读取数据出错"
+
+#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43
+#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486
+#: methods/rred.cc:495
+msgid "Failed to stat"
+msgstr "无法读取状态"
+
+#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99
+#: methods/rred.cc:492
+msgid "Failed to set modification time"
+msgstr "无法设置文件的修改日期"
+
+#: methods/cdrom.cc:199
#, c-format
msgid "Unable to read the cdrom database %s"
msgstr "无法读取盘片数据库 %s"
-#: methods/cdrom.cc:209
+#: methods/cdrom.cc:208
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
"请使用 apt-cdrom，通过它就可以让 APT 能识别该盘片。apt-get upgdate 不能被用来"
"加入新的盘片。"
-#: methods/cdrom.cc:219
+#: methods/cdrom.cc:218
msgid "Wrong CD-ROM"
msgstr "错误的 CD-ROM"
msgid "File not found"
msgstr "无法找到该文件"
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
-msgid "Failed to stat"
-msgstr "无法读取状态"
-
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
-msgid "Failed to set modification time"
-msgstr "无法设置文件的修改日期"
-
#: methods/file.cc:44
msgid "Invalid URI, local URIS must not start with //"
msgstr "无效的 URI，本地的 URI 不能以 // 开头"
msgid "Server closed the connection"
msgstr "服务器关闭了连接"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:784 methods/rsh.cc:190
msgid "Read error"
msgstr "读错误"
msgid "Protocol corruption"
msgstr "协议有误"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:826 methods/rsh.cc:232
msgid "Write error"
msgstr "写出错"
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
msgid "Could not create a socket"
msgstr "无法创建套接字"
-#: methods/ftp.cc:704
+#: methods/ftp.cc:703
msgid "Could not connect data socket, connection timed out"
msgstr "无法连接上数据套接字，连接超时"
-#: methods/ftp.cc:710
+#: methods/ftp.cc:709
msgid "Could not connect passive socket."
msgstr "无法连接被动模式的套接字。"
-#: methods/ftp.cc:728
+#: methods/ftp.cc:727
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo 无法得到监听套接字"
-#: methods/ftp.cc:742
+#: methods/ftp.cc:741
msgid "Could not bind a socket"
msgstr "无法绑定套接字"
-#: methods/ftp.cc:746
+#: methods/ftp.cc:745
msgid "Could not listen on the socket"
msgstr "无法在套接字上监听"
-#: methods/ftp.cc:753
+#: methods/ftp.cc:752
msgid "Could not determine the socket's name"
msgstr "无法确定套接字的名字"
-#: methods/ftp.cc:785
+#: methods/ftp.cc:784
msgid "Unable to send PORT command"
msgstr "无法发出 PORT 指令"
-#: methods/ftp.cc:795
+#: methods/ftp.cc:794
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "无法识别的地址族 %u (AF_*)"
-#: methods/ftp.cc:804
+#: methods/ftp.cc:803
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT 指令出错，服务器响应信息为：%s"
-#: methods/ftp.cc:824
+#: methods/ftp.cc:823
msgid "Data socket connect timed out"
msgstr "数据套接字连接超时"
-#: methods/ftp.cc:831
+#: methods/ftp.cc:830
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302
msgid "Problem hashing file"
msgstr "把文件加入哈希表时出错"
-#: methods/ftp.cc:883
+#: methods/ftp.cc:882
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "无法获取文件，服务器响应信息为“%s”"
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321
msgid "Data socket timed out"
msgstr "数据套接字超时"
-#: methods/ftp.cc:928
+#: methods/ftp.cc:927
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "数据传送出错，服务器响应信息为“%s”"
#. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1004
msgid "Query"
msgstr "查询"
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1116
msgid "Unable to invoke "
msgstr "无法调用 "
-#: methods/connect.cc:70
+#: methods/connect.cc:71
#, c-format
msgid "Connecting to %s (%s)"
msgstr "正在连接 %s (%s)"
-#: methods/connect.cc:81
+#: methods/connect.cc:82
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:90
+#: methods/connect.cc:89
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"
-#: methods/connect.cc:96
+#: methods/connect.cc:95
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "无法发起与 %s:%s (%s) 的连接"
-#: methods/connect.cc:104
+#: methods/connect.cc:103
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "无法连接上 %s:%s (%s)，连接超时"
-#: methods/connect.cc:119
+#: methods/connect.cc:121
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "无法连接上 %s:%s (%s)。"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:147 methods/rsh.cc:425
+#: methods/connect.cc:149 methods/rsh.cc:424
#, c-format
msgid "Connecting to %s"
msgstr "正在连接 %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:168 methods/connect.cc:187
#, c-format
msgid "Could not resolve '%s'"
msgstr "无法解析域名“%s”"
-#: methods/connect.cc:190
+#: methods/connect.cc:193
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "暂时不能解析域名“%s”"
-#: methods/connect.cc:193
+#: methods/connect.cc:196
#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr "解析“%s:%s”时，出现了某些故障(%i)"
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"
-#: methods/connect.cc:240
+#: methods/connect.cc:243
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "不能连接到 %s：%s："
+#. TRANSLATOR: %s is the trusted keyring parts directory
#: methods/gpgv.cc:71
#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "无法访问密钥环：“%s”"
+msgid "No keyring installed in %s."
+msgstr "%s 中没有安装密钥环。"
-#: methods/gpgv.cc:107
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "错误：Acquire::gpgv::Options 的参数列表太长。结束运行。"
-
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:163
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:168
msgid "At least one invalid signature was encountered."
msgstr "至少发现一个无效的签名。"
-#: methods/gpgv.cc:232
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
-msgstr "无法运行“%s”以验证签名(您安装了 gpgv 吗？)"
+#: methods/gpgv.cc:172
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:177
msgid "Unknown error executing gpgv"
msgstr "运行 gpgv 时发生未知错误"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:211 methods/gpgv.cc:218
msgid "The following signatures were invalid:\n"
msgstr "下列签名无效：\n"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:225
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr "由于没有公钥，无法验证下列签名：\n"
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "无法为 %s 开启管道"
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "从 %s 进程读取数据出错"
-
#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "正在等待报头"
msgid "Bad header line"
msgstr "错误的报头行"
-#: methods/http.cc:558 methods/http.cc:565
+#: methods/http.cc:564 methods/http.cc:571
msgid "The HTTP server sent an invalid reply header"
msgstr "该 HTTP 服务器发送了一个无效的应答报头"
-#: methods/http.cc:594
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
-#: methods/http.cc:609
+#: methods/http.cc:615
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
-#: methods/http.cc:611
+#: methods/http.cc:617
msgid "This HTTP server has broken range support"
msgstr "该 HTTP 服务器的 range 支持不正常"
-#: methods/http.cc:635
+#: methods/http.cc:641
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:790
+#: methods/http.cc:799
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:795
+#: methods/http.cc:804
msgid "Connection timed out"
msgstr "连接超时"
-#: methods/http.cc:818
+#: methods/http.cc:827
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:849
+#: methods/http.cc:858
msgid "Error writing to file"
msgstr "写入文件出错"
-#: methods/http.cc:877
+#: methods/http.cc:886
msgid "Error writing to the file"
msgstr "写入文件出错"
-#: methods/http.cc:891
+#: methods/http.cc:900
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错，对方关闭了连接"
-#: methods/http.cc:893
+#: methods/http.cc:902
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281
msgid "Failed to truncate file"
msgstr "无法截断文件"
-#: methods/http.cc:1149
+#: methods/http.cc:1160
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1177 methods/http.cc:1232
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1313
+#: methods/http.cc:1324
msgid "Internal error"
msgstr "内部错误"
-#: apt-pkg/contrib/mmap.cc:76
+#: apt-pkg/contrib/mmap.cc:77
msgid "Can't mmap an empty file"
msgstr "无法 mmap 一个空文件"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:89
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "无法为复制文件描述符 %i"
+
+#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "无法 mmap %lu 字节的数据"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:124
+msgid "Unable to close mmap"
+msgstr "无法关闭 mmap"
+
+#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+msgid "Unable to synchronize mmap"
+msgstr "无法同步 mmap "
+
+#: apt-pkg/contrib/mmap.cc:300
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值：%lu。(man 5 "
"apt.conf)"
+#: apt-pkg/contrib/mmap.cc:399
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。"
+
+#: apt-pkg/contrib/mmap.cc:402
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"
+
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:346
+#: apt-pkg/contrib/strutl.cc:371
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li天 %li小时 %li分 %li秒"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:353
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lih %limin %lis"
msgstr "%li小时 %li分 %li秒"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:360
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%limin %lis"
msgstr "%li分 %li秒"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:365
+#: apt-pkg/contrib/strutl.cc:390
#, c-format
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1040
+#: apt-pkg/contrib/strutl.cc:1119
#, c-format
msgid "Selection %s not found"
msgstr "找不到您选则的 %s"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "无法识别的类型缩写：“%c”"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr "正在打开配置文件 %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "语法错误 %s:%u：配置小节没有以名字开头"
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "语法错误 %s:%u：标签格式有误"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据"
+msgstr "语法错误 %s:%u：配置值后有多余的无意义数据"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
+msgstr "语法错误 %s:%u：只能在顶层配置文件中使用指示"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
-msgstr "语法错误 %s:%u: Included from here"
+msgstr "语法错误 %s:%u：Included from here"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "语法错误 %s:%u: 不支持的指令“%s”"
+msgstr "语法错误 %s:%u：不支持的指令“%s”"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:777
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数"
+
+#: apt-pkg/contrib/configuration.cc:827
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"
+msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"
#: apt-pkg/contrib/progress.cc:153
#, c-format
msgid "Command line option %s is not boolean"
msgstr "命令行选项 %s 不是布尔值"
-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
#, c-format
msgid "Option %s requires an argument."
msgstr "选项 %s 要求有一个参数"
-#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定"
-#: apt-pkg/contrib/cmndline.cc:234
+#: apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"
-#: apt-pkg/contrib/cmndline.cc:265
+#: apt-pkg/contrib/cmndline.cc:267
#, c-format
msgid "Option '%s' is too long"
msgstr "选项“%s”太长"
-#: apt-pkg/contrib/cmndline.cc:298
+#: apt-pkg/contrib/cmndline.cc:300
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "不能识别参数 %s，请用 true 或 false"
-#: apt-pkg/contrib/cmndline.cc:348
+#: apt-pkg/contrib/cmndline.cc:350
#, c-format
msgid "Invalid operation %s"
msgstr "无效的操作 %s"
msgid "Unable to stat the mount point %s"
msgstr "无法读取文件系统挂载点 %s 的状态"
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
-#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
+#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
+#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
+#: methods/mirror.cc:93
#, c-format
msgid "Unable to change to %s"
msgstr "无法切换工作目录到 %s"
-#: apt-pkg/contrib/cdromutl.cc:195
+#: apt-pkg/contrib/cdromutl.cc:217
msgid "Failed to stat the cdrom"
msgstr "无法读取盘片的状态"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:154
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "由于文件系统为只读，因而无法使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:159
#, c-format
msgid "Could not open lock file %s"
msgstr "无法打开锁文件 %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:177
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "无法在 nfs 文件系统上使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:181
#, c-format
msgid "Could not get lock %s"
msgstr "无法获得锁 %s"
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:643
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出，但是它并不存在"
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:655
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子进程 %s 发生了段错误"
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:657
#, c-format
msgid "Sub-process %s received signal %u."
msgstr "子进程 %s 收到信号 %u。"
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:661
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:663
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:728
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:745
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "无法打开文件描述符 %d"
+
+#: apt-pkg/contrib/fileutl.cc:805
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "读取文件出错，还剩 %lu 字节没有读出"
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:838
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "写入文件出错，还剩 %lu 字节没有保存"
-#: apt-pkg/contrib/fileutl.cc:669
-msgid "Problem closing the file"
-msgstr "关闭文件出错"
+#: apt-pkg/contrib/fileutl.cc:937
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "关闭 gzip %s 文件出错"
-#: apt-pkg/contrib/fileutl.cc:675
-msgid "Problem unlinking the file"
-msgstr "用 unlink 删除文件出错"
+#: apt-pkg/contrib/fileutl.cc:940
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "关闭文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:945
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "重命名文件 %s 为 %s 出错"
+
+#: apt-pkg/contrib/fileutl.cc:956
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "用 unlink 删除文件 %s 出错"
+
+#: apt-pkg/contrib/fileutl.cc:969
msgid "Problem syncing the file"
msgstr "同步文件出错"
-#: apt-pkg/pkgcache.cc:133
+#: apt-pkg/pkgcache.cc:145
msgid "Empty package cache"
msgstr "软件包缓存区是空的"
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:151
msgid "The package cache file is corrupted"
msgstr "软件包缓存文件损坏了"
-#: apt-pkg/pkgcache.cc:144
+#: apt-pkg/pkgcache.cc:156
msgid "The package cache file is an incompatible version"
msgstr "软件包缓存区文件的版本不兼容"
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:161
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "本程序目前不支持“%s”版本系统"
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:166
msgid "The package cache was built for a different architecture"
msgstr "软件包缓存区是为其它架构的硬件构建的"
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:293
msgid "Depends"
msgstr "依赖"
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:293
msgid "PreDepends"
msgstr "预依赖"
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:293
msgid "Suggests"
msgstr "建议"
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:294
msgid "Recommends"
msgstr "推荐"
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:294
msgid "Conflicts"
msgstr "冲突"
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:294
msgid "Replaces"
msgstr "替换"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:295
msgid "Obsoletes"
msgstr "废弃"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:295
msgid "Breaks"
msgstr "破坏"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:295
msgid "Enhances"
msgstr "增强"
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:306
msgid "important"
msgstr "重要"
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:306
msgid "required"
msgstr "必需"
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:306
msgid "standard"
msgstr "标准"
-#: apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:307
msgid "optional"
msgstr "可选"
-#: apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:307
msgid "extra"
msgstr "额外"
-#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
+#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153
msgid "Building dependency tree"
msgstr "正在分析软件包的依赖关系树"
-#: apt-pkg/depcache.cc:124
+#: apt-pkg/depcache.cc:125
msgid "Candidate versions"
msgstr "候选版本"
-#: apt-pkg/depcache.cc:153
+#: apt-pkg/depcache.cc:154
msgid "Dependency generation"
msgstr "生成依赖关系"
-#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211
msgid "Reading state information"
msgstr "正在读取状态信息"
-#: apt-pkg/depcache.cc:223
+#: apt-pkg/depcache.cc:236
#, c-format
msgid "Failed to open StateFile %s"
msgstr "无法打开状态文件 %s"
-#: apt-pkg/depcache.cc:229
+#: apt-pkg/depcache.cc:242
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "无法写入临时状态文件 %s"
+#: apt-pkg/depcache.cc:921
+#, c-format
+msgid "Internal error, group '%s' has no installable pseudo package"
+msgstr "内部错误，组 %s 没有可安装的 pseudo 软件包"
+
#: apt-pkg/tagfile.cc:102
#, c-format
msgid "Unable to parse package file %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "无法解析软件包文件 %s (2)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:92
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
+
+#: apt-pkg/sourcelist.cc:95
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
+
+#: apt-pkg/sourcelist.cc:106
+#, 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:112
+#, 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:115
+#, 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:128
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:130
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:133
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:139
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:146
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Opening %s"
msgstr "正在打开 %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438
#, c-format
msgid "Line %u too long in source list %s."
msgstr "源列表 %2$s 的第 %1$u 行太长了。"
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:281
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
#, c-format
-msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "在源列表中 %2$s 中第 %1$u 行的格式有误(供应商 ID)"
+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:439
+#: apt-pkg/packagemanager.cc:452
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
"少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::"
"Force-LoopBreak 选项。"
+#: apt-pkg/packagemanager.cc:495
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'. Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+"无法立即对已经解包的 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-"
+"Configure。"
+
#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "不支持索引文件类型“%s”"
-#: apt-pkg/algorithms.cc:248
+#: apt-pkg/algorithms.cc:292
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
-#: apt-pkg/algorithms.cc:1138
+#: apt-pkg/algorithms.cc:1210
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
"缘故。"
-#: apt-pkg/algorithms.cc:1140
+#: apt-pkg/algorithms.cc:1212
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
"系。"
-#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
+#: apt-pkg/algorithms.cc:1488 apt-pkg/algorithms.cc:1490
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
"有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
-#: apt-pkg/acquire.cc:60
+#: apt-pkg/acquire.cc:79
#, c-format
-msgid "Lists directory %spartial is missing."
+msgid "List directory %spartial is missing."
msgstr "软件包列表的目录 %spartial 缺失。"
-#: apt-pkg/acquire.cc:64
+#: apt-pkg/acquire.cc:83
+#, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "仓库目录 %spartial 确实。"
+
+#: apt-pkg/acquire.cc:91
#, c-format
-msgid "Archive directory %spartial is missing."
-msgstr "æ\89¾ä¸\8då\88°â\80\9c%spartialâ\80\9dç\9b®å½\95ã\80\82"
+msgid "Unable to lock directory %s"
+msgstr "æ\97 æ³\95对ç\9b®å½\95 %s å\8a é\94\81"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:826
+#: apt-pkg/acquire.cc:857
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:859
#, c-format
msgid "Retrieving file %li of %li"
msgstr "正在下载第 %li 个文件，共 %li 个"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:133
+#: apt-pkg/init.cc:143
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:149
+#: apt-pkg/init.cc:159
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
msgid "You must put some 'source' URIs in your sources.list"
msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84
msgid "The package lists or status file could not be parsed or opened."
msgstr "无法解析或打开软件包的列表或是状态文件。"
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88
msgid "You may want to run apt-get update to correct these problems"
msgstr "您可能需要运行 apt-get update 来解决这些问题"
-#: apt-pkg/policy.cc:347
+#: apt-pkg/cachefile.cc:106
+msgid "The list of sources could not be read."
+msgstr "无法读取源列表。"
+
+#: apt-pkg/policy.cc:344
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:366
#, c-format
msgid "Did not understand pin type %s"
msgstr "无法识别锁定的类型 %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:374
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:80
msgid "Cache has an incompatible versioning system"
msgstr "软件包暂存区使用的是不兼容的版本控制系统"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:198
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "处理 %s (NewPackage)时出错"
-#: apt-pkg/pkgcachegen.cc:132
+#: apt-pkg/pkgcachegen.cc:215
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "处理 %s (UsePackage1)时出错"
-#: apt-pkg/pkgcachegen.cc:166
+#: apt-pkg/pkgcachegen.cc:253
#, c-format
msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "处理 %s (NewFileDesc1)时出错"
-#: apt-pkg/pkgcachegen.cc:191
+#: apt-pkg/pkgcachegen.cc:285
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "处理 %s (UsePackage2)时出错"
-#: apt-pkg/pkgcachegen.cc:195
+#: apt-pkg/pkgcachegen.cc:289
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "处理 %s (NewFileVer1)时出错"
-#: apt-pkg/pkgcachegen.cc:226
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "处理 %s (NewVersion1)时出错"
+msgid "Error occurred while processing %s (NewVersion%d)"
+msgstr "处理 %s (NewVersion%d)时出错"
-#: apt-pkg/pkgcachegen.cc:230
+#: apt-pkg/pkgcachegen.cc:320
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "处理 %s (UsePackage3)时出错"
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "处理 %s (NewVersion2)时出错"
-
-#: apt-pkg/pkgcachegen.cc:258
+#: apt-pkg/pkgcachegen.cc:353
#, c-format
msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "处理 %s (NewFileDesc2)时出错"
-#: apt-pkg/pkgcachegen.cc:264
+#: apt-pkg/pkgcachegen.cc:360
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "哇，软件包数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:267
+#: apt-pkg/pkgcachegen.cc:363
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:270
+#: apt-pkg/pkgcachegen.cc:366
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:369
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:301
+#: apt-pkg/pkgcachegen.cc:398
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "处理 %s (FindPkg)时出错"
-#: apt-pkg/pkgcachegen.cc:314
+#: apt-pkg/pkgcachegen.cc:412
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "处理 %s (CollectFileProvides)时出错"
-#: apt-pkg/pkgcachegen.cc:320
+#: apt-pkg/pkgcachegen.cc:418
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:982
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:1087
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
msgid "IO Error saving source cache"
msgstr "无法读取或写入软件源缓存"
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件，%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:484
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574
+#: apt-pkg/acquire-item.cc:1717
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1244
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 ID 的密钥没有可用的公钥：\n"
-#: apt-pkg/acquire-item.cc:1216
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1281
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr "Release 文件已过期，忽略 %s (从 %s 起无效)"
+
+#: apt-pkg/acquire-item.cc:1302
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
+
+#: apt-pkg/acquire-item.cc:1328
+#, 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"
+
+#: apt-pkg/acquire-item.cc:1337
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG 错误：%s: %s"
+
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1424
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1479
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1566
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53
#, c-format
msgid "Unable to parse Release file %s"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60
#, c-format
msgid "No sections in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
+#: apt-pkg/indexrecords.cc:107
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
+
+#: apt-pkg/indexrecords.cc:122
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
+
#: apt-pkg/vendorlist.cc:66
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "软件提供者数据块内 %s 没有包含指纹信息"
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:518
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"现把 %s 作为了 CD-ROM 的挂载点\n"
"正在挂载 CD-ROM\n"
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615
msgid "Identifying.. "
msgstr "正在鉴别.. "
-#: apt-pkg/cdrom.cc:559
+#: apt-pkg/cdrom.cc:552
#, c-format
msgid "Stored label: %s\n"
msgstr "已归档文件的标签：%s\n"
-#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
+#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827
msgid "Unmounting CD-ROM...\n"
msgstr "正在卸载 CD-ROM...\n"
-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:578
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
-#: apt-pkg/cdrom.cc:603
+#: apt-pkg/cdrom.cc:596
msgid "Unmounting CD-ROM\n"
msgstr "正在卸载 CD-ROM 文件系统\n"
-#: apt-pkg/cdrom.cc:607
+#: apt-pkg/cdrom.cc:600
msgid "Waiting for disc...\n"
msgstr "等待插入盘片……\n"
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:608
msgid "Mounting CD-ROM...\n"
msgstr "正在挂载 CD-ROM 文件系统……\n"
-#: apt-pkg/cdrom.cc:633
+#: apt-pkg/cdrom.cc:626
msgid "Scanning disc for index files..\n"
msgstr "正在盘片中查找索引文件..\n"
-#: apt-pkg/cdrom.cc:673
+#: apt-pkg/cdrom.cc:666
#, c-format
msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
msgstr ""
"找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
"名\n"
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:677
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
"无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构"
"架。"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:703
#, c-format
msgid "Found label '%s'\n"
msgstr "找到标签 '%s'\n"
-#: apt-pkg/cdrom.cc:739
+#: apt-pkg/cdrom.cc:732
msgid "That is not a valid name, try again.\n"
msgstr "这不是一个有效的名字，请重试。\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:748
#, c-format
msgid ""
"This disc is called: \n"
"这张盘片现在的名字是：\n"
"“%s”\n"
-#: apt-pkg/cdrom.cc:759
+#: apt-pkg/cdrom.cc:752
msgid "Copying package lists..."
msgstr "正在复制软件包列表……"
-#: apt-pkg/cdrom.cc:785
+#: apt-pkg/cdrom.cc:778
msgid "Writing new source list\n"
msgstr "正在写入新的源列表\n"
-#: apt-pkg/cdrom.cc:794
+#: apt-pkg/cdrom.cc:787
msgid "Source list entries for this disc are:\n"
msgstr "对应于该盘片的软件源设置项是：\n"
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908
#, c-format
msgid "Wrote %i records.\n"
msgstr "已写入 %i 条记录。\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
-#: apt-pkg/indexcopy.cc:530
-#, fuzzy, c-format
+#: apt-pkg/indexcopy.cc:537
+#, c-format
msgid "Skipping nonexistent file %s"
-msgstr "正在打开配置文件 %s"
+msgstr "跳过不存在的文件 %s"
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:543
#, c-format
msgid "Can't find authentication record for: %s"
-msgstr ""
+msgstr "无法找到认证记录：%s"
-#: apt-pkg/indexcopy.cc:542
-#, fuzzy, c-format
+#: apt-pkg/indexcopy.cc:549
+#, c-format
msgid "Hash mismatch for: %s"
-msgstr "Hash 校验和不符"
+msgstr "Hash 校验和不符：%s"
+
+#: apt-pkg/cacheset.cc:337
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "未找到“%2$s”的“%1$s”发布版本"
+
+#: apt-pkg/cacheset.cc:340
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "未找到“%2$s”的“%1$s”版本"
+
+#: apt-pkg/cacheset.cc:447
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "无法找到任务 %s"
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/cacheset.cc:454
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
+
+#: apt-pkg/cacheset.cc:467
+#, c-format
+msgid "Can't select versions from package '%s' as it purely virtual"
+msgstr "无法从完全虚拟的软件包 %s 中选择版本"
+
+#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#, 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:491
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
+
+#: apt-pkg/cacheset.cc:499
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "因为软件包 %s 没有候选版本，无法进行选择"
+
+#: apt-pkg/cacheset.cc:507
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
+
+#: apt-pkg/deb/dpkgpm.cc:52
#, c-format
msgid "Installing %s"
msgstr "正在安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:822
#, c-format
msgid "Configuring %s"
msgstr "正在配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:829
#, c-format
msgid "Removing %s"
msgstr "正在删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:52
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:55
+#, c-format
msgid "Completely removing %s"
-msgstr "完全删除了 %s"
+msgstr "完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "注意到 %s 已经消失"
+
+#: apt-pkg/deb/dpkgpm.cc:57
#, c-format
msgid "Running post-installation trigger %s"
msgstr "执行安装后执行的触发器 %s"
-#: apt-pkg/deb/dpkgpm.cc:558
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:646
#, c-format
msgid "Directory '%s' missing"
-msgstr "目录 %s 不见了"
+msgstr "目录 %s 缺失"
+
+#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:674
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "无法打开文件 %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:815
#, c-format
msgid "Preparing %s"
msgstr "正在准备 %s"
-#: apt-pkg/deb/dpkgpm.cc:655
+#: apt-pkg/deb/dpkgpm.cc:816
#, c-format
msgid "Unpacking %s"
msgstr "正在解压缩 %s"
-#: apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:821
#, c-format
msgid "Preparing to configure %s"
msgstr "正在准备配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:662
+#: apt-pkg/deb/dpkgpm.cc:823
#, c-format
msgid "Installed %s"
msgstr "已安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:828
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在准备 %s 的删除操作"
-#: apt-pkg/deb/dpkgpm.cc:669
+#: apt-pkg/deb/dpkgpm.cc:830
#, c-format
msgid "Removed %s"
msgstr "已删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:835
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在准备完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:675
+#: apt-pkg/deb/dpkgpm.cc:836
#, c-format
msgid "Completely removed %s"
msgstr "完全删除了 %s"
-#: apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/deb/dpkgpm.cc:1042
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ？)\n"
-#: apt-pkg/deb/dpkgpm.cc:908
+#: apt-pkg/deb/dpkgpm.cc:1073
msgid "Running dpkg"
msgstr "正在运行 dpkg"
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1276
+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:1281
+msgid "dependency problems - leaving unconfigured"
+msgstr "依赖问题 - 保持未配置"
+
+#: apt-pkg/deb/dpkgpm.cc:1283
+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:1289
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
+
+#: apt-pkg/deb/dpkgpm.cc:1295
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
+
+#: apt-pkg/deb/dpkgpm.cc:1302
+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:69
#, c-format
msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
-msgstr "dpkg 被中断，您必须手工运行 'dpkg --configure -a' 解决此问题。"
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。"
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:106
msgid "Not locked"
msgstr "未锁定"
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "无法打开补丁文件"
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:200
+#, c-format
+msgid "No mirror file '%s' found "
+msgstr "没有找到镜像文件 %s"
+
+#: methods/mirror.cc:343
+#, c-format
+msgid "[Mirror: %s]"
+msgstr "[镜像：%s]"
+
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"
-#: methods/rsh.cc:330
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"
+
+#: methods/rsh.cc:329
msgid "Connection closed prematurely"
msgstr "连接被永久关闭"
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "错误：Acquire::gpgv::Options 的参数列表太长。结束运行。"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "处理 %s (NewVersion2)时出错"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "在源列表中 %2$s 中第 %1$u 行的格式有误(供应商 ID)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "无法访问密钥环：“%s”"
+
+#~ msgid "Could not patch file"
+#~ msgstr "无法打开补丁文件"
+
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
+
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "没有源代码包“%s”，使用“%s”代替\n"
+
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
#~ msgstr "归档文件标签：%s \n"
#~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
#~ msgstr ""
#~ "找到了 %i 个软件包索引、%i 个源代码包索引，%i 个翻译索引和 %i 个数字签名\n"
projects / apt.git / blobdiff