#
msgid ""
msgstr ""
-"Project-Id-Version: apt 0.5.23\n"
+"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-15 16:05-0300\n"
-"PO-Revision-Date: 2008-02-15 21:01+0800\n"
+"POT-Creation-Date: 2009-09-26 11:38+0200\n"
+"PO-Revision-Date: 2009-06-01 15:54+0800\n"
"Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: 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:247
+#: cmdline/apt-cache.cc:245
msgid "Total package names: "
-msgstr "软件包总数(按名称计)："
+msgstr "软件包名称总数："
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285
msgid " Normal packages: "
msgstr " 普通软件包："
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286
msgid " Pure virtual packages: "
msgstr " 完全虚拟软件包："
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287
msgid " Single virtual packages: "
msgstr " 单虚拟软件包："
-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288
msgid " Mixed virtual packages: "
msgstr " 混合虚拟软件包："
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289
msgid " Missing: "
msgstr " 缺漏的："
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291
msgid "Total distinct versions: "
msgstr "按版本共计："
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293
msgid "Total distinct descriptions: "
-msgstr "按说明共计："
+msgstr "按不同的说明共计："
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295
msgid "Total dependencies: "
msgstr "按依赖关系共计："
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298
msgid "Total ver/file relations: "
msgstr "按版本/文件关系共计："
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300
msgid "Total Desc/File relations: "
msgstr "按说明/文件关系共计："
-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302
msgid "Total Provides mappings: "
msgstr "提供映射共计："
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314
msgid "Total globbed strings: "
msgstr "Glob 字串共计："
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328
msgid "Total dependency version space: "
msgstr "依赖关系版本名所占空间共计："
-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333
msgid "Total slack space: "
msgstr "Slack 空间共计："
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341
msgid "Total space accounted for: "
msgstr "总占用空间："
-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
#, c-format
msgid "Package file %s is out of sync."
msgstr "软件包文件 %s 尚未同步(sync)。"
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297
msgid "You must give exactly one pattern"
msgstr "您必须明确地给出一个表达式"
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451
msgid "No packages found"
msgstr "没有发现吻合的软件包"
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
msgid "Package files:"
msgstr "软件包文件："
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "缓存尚未同步(sync)，无法交差引证(x-ref)一个软件包文件"
-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549
msgid "Pinned packages:"
msgstr "被锁定(pinned)的软件包："
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
msgid "(not found)"
msgstr "(没有找到)"
#. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582
msgid " Installed: "
msgstr " 已安装："
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
msgid "(none)"
msgstr "(无)"
#. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589
msgid " Candidate: "
msgstr " 候选的软件包："
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599
msgid " Package pin: "
msgstr " 软件包锁(Pin)："
#. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608
msgid " Version table:"
msgstr " 版本列表："
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623
#, c-format
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: 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:2570 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s 编译于 %s %s\n"
-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1725
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
" show - Show a readable record for the package\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\n"
-" dotty - Generate package graphs for GraphVis\n"
+" pkgnames - List the names of all packages in the system\n"
+" dotty - Generate package graphs for GraphViz\n"
" xvcg - Generate package graphs for xvcg\n"
" policy - Show policy settings\n"
"\n"
" depends - 原原本本地显示该软件包的依赖信息\n"
" rdepends - 显示所有依赖于该软件包的软件包名字\n"
" pkgnames - 列出所有软件包的名字\n"
-" dotty - 生成可用 GraphVis 处理的软件包关系图\n"
+" dotty - 生成可用 GraphViz 处理的软件包关系图\n"
" xvcg - 生成可用 xvcg 处理的软件包的关系图\n"
" policy - 显示软件包的安装设置状态\n"
"\n"
" -i 仅为 unmet 命令显示重要的依赖关系。\n"
" -c=? 读取指定配置文件\n"
" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
-"若要深入了解，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n"
+"若要了解更多信息，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n"
-#: cmdline/apt-cdrom.cc:78
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
msgstr "请给这张光盘起个名字，比如说“Debian 2.1r1 Disk 1”"
-#: cmdline/apt-cdrom.cc:93
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "请把光盘碟片插入驱动器再按回车键"
-#: cmdline/apt-cdrom.cc:117
+#: cmdline/apt-cdrom.cc:114
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:815
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
msgid "Failed to rename %s to %s"
msgstr "无法将 %s 重命名为 %s"
-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1650
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244
msgid "The following packages have unmet dependencies:"
msgstr "下列的软件包有不能满足的依赖关系："
-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334
#, c-format
msgid "but %s is installed"
msgstr "但是 %s 已经安装了"
-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336
#, c-format
msgid "but %s is to be installed"
msgstr "但是 %s 正要被安装"
-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343
msgid "but it is not installable"
msgstr "但却无法安装它"
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
msgid "but it is a virtual package"
msgstr "但是它只是个虚拟软件包"
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
msgid "but it is not installed"
msgstr "但是它还没有被安装"
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348
msgid "but it is not going to be installed"
msgstr "但是它将不会被安装"
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353
msgid " or"
msgstr " 或"
-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382
msgid "The following NEW packages will be installed:"
msgstr "下列【新】软件包将被安装："
-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408
msgid "The following packages will be REMOVED:"
msgstr "下列软件包将被【卸载】："
-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430
msgid "The following packages have been kept back:"
msgstr "下列的软件包的版本将保持不变："
-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451
msgid "The following packages will be upgraded:"
msgstr "下列的软件包将被升级："
-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472
msgid "The following packages will be DOWNGRADED:"
msgstr "下列软件包将被【降级】："
-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492
msgid "The following held packages will be changed:"
msgstr "下列被要求保持版本不变的软件包将被改变："
-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545
#, c-format
msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
"【警告】：下列的基础软件包将被卸载。\n"
"请勿尝试，除非您确实知道您在做什么！"
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，"
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588
#, c-format
msgid "%lu reinstalled, "
msgstr "共重新安装了 %lu 个软件包，"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu downgraded, "
msgstr "降级了 %lu 个软件包，"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n"
-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:669
msgid "Correcting dependencies..."
msgstr "正在更正依赖关系..."
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:672
msgid " failed."
msgstr " 失败。"
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:675
msgid "Unable to correct dependencies"
msgstr "无法更正依赖关系"
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:678
msgid "Unable to minimize the upgrade set"
msgstr "无法最小化要升级的软件包集合"
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:680
msgid " Done"
msgstr " 完成"
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:684
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。"
-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:687
msgid "Unmet dependencies. Try using -f."
msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:712
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "【警告】：下列的软件包不能通过验证！"
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:716
msgid "Authentication warning overridden.\n"
msgstr "忽略了认证警告。\n"
-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:723
msgid "Install these packages without verification [y/N]? "
msgstr "不经验证就安装这些软件包么？[y/N] "
-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:725
msgid "Some packages could not be authenticated"
msgstr "有些软件包不能通过验证"
-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
msgid "There are problems and -y was used without --force-yes"
msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:784
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:795
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误，Ordering 未能完成"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1989 cmdline/apt-get.cc:2022
+#: 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:819 cmdline/apt-get.cc:2070 cmdline/apt-get.cc:2316
+#: 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:834
+#: cmdline/apt-get.cc:836
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:841
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需要下载 %sB/%sB 的软件包。\n"
-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:844
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需要下载 %sB 的软件包。\n"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:852
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的空余空间"
-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:876
#, c-format
msgid "You don't have enough free space in %s."
msgstr "您在 %s 中没有足够的空余空间。"
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。"
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:894
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:896
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"若还想继续的话，就输入下面的短句“%s”\n"
" ?] "
-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
msgid "Abort."
msgstr "中止执行。"
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:917
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗？[Y/n]"
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2213 apt-pkg/algorithms.cc:1344
+#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1007
msgid "Some files failed to download"
msgstr "有一些文件下载失败"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2222
+#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
msgid "Download complete and in download only mode"
msgstr "下载完毕，目前是“仅下载”模式"
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1014
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:1013
+#: cmdline/apt-get.cc:1018
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1023
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1024
msgid "Aborting install."
msgstr "放弃安装。"
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1082
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "注意，选取 %s 而非 %s\n"
-#: cmdline/apt-get.cc:1063
+#: 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:1081
+#: cmdline/apt-get.cc:1111
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "软件包 %s 还未安装，因而不会被卸载\n"
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1122
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1134
msgid " [Installed]"
msgstr " [已安装]"
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1139
msgid "You should explicitly select one to install."
msgstr "请您明确地选择一个来进行安装。"
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1144
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
"这可能意味着这个缺失的软件包可能已被废弃，\n"
"或者只能在其他发布源中找到\n"
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1163
msgid "However the following packages replace it:"
msgstr "可是下列的软件包取代了它："
-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Package %s has no installation candidate"
msgstr "软件包 %s 还没有可供安装的候选者"
-#: cmdline/apt-get.cc:1156
+#: 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:1164
+#: cmdline/apt-get.cc:1194
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1223
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1225
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1231
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "选定了版本为 %s (%s) 的 %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1348
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1385
msgid "The update command takes no arguments"
msgstr " update 命令是不需任何参数的"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1398
msgid "Unable to lock the list directory"
msgstr "无法对状态列表目录加锁"
-#: cmdline/apt-get.cc:1402
+#: cmdline/apt-get.cc:1454
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我们不应该进行删除，无法启动自动删除器"
-#: cmdline/apt-get.cc:1434
+#: cmdline/apt-get.cc:1503
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "下列软件包是自动安装的并且现在不再被使用了："
-#: cmdline/apt-get.cc:1436
+#: cmdline/apt-get.cc:1505
+#, fuzzy, c-format
+msgid "%lu packages were automatically installed and are no longer required.\n"
+msgstr "下列软件包是自动安装的并且现在不再被使用了："
+
+#: cmdline/apt-get.cc:1506
msgid "Use 'apt-get autoremove' to remove them."
msgstr "使用'apt-get autoremove'来删除它们"
-#: cmdline/apt-get.cc:1441
+#: cmdline/apt-get.cc:1511
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr "似乎自动删除器毁掉了一些软件，这不应该发生。请向 apt 提交错误报告。"
-#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1732
+#.
+#. 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:1514 cmdline/apt-get.cc:1804
msgid "The following information may help to resolve the situation:"
msgstr "下列的信息可能会对解决问题有所帮助："
-#: cmdline/apt-get.cc:1448
+#: cmdline/apt-get.cc:1518
msgid "Internal Error, AutoRemover broke stuff"
msgstr "内部错误，自动删除器坏事了"
-#: cmdline/apt-get.cc:1467
+#: cmdline/apt-get.cc:1537
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部错误，全部升级坏事了"
-#: cmdline/apt-get.cc:1522
+#: cmdline/apt-get.cc:1592
#, c-format
msgid "Couldn't find task %s"
msgstr "无法找到任务 %s"
-#: cmdline/apt-get.cc:1637 cmdline/apt-get.cc:1673
+#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1660
+#: 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:1691
+#: cmdline/apt-get.cc:1761
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:1704
+#: cmdline/apt-get.cc:1774
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
-#: cmdline/apt-get.cc:1707
+#: cmdline/apt-get.cc:1777
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1719
+#: cmdline/apt-get.cc:1789
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:1727
-msgid ""
-"Since you only requested a single operation it is extremely likely that\n"
-"the package is simply not installable and a bug report against\n"
-"that package should be filed."
-msgstr ""
-"您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n"
-"您最好提交一个针对这个软件包的故障报告。"
-
-#: cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1807
msgid "Broken packages"
msgstr "无法安装的软件包"
-#: cmdline/apt-get.cc:1764
+#: cmdline/apt-get.cc:1836
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包："
-#: cmdline/apt-get.cc:1853
+#: cmdline/apt-get.cc:1925
msgid "Suggested packages:"
msgstr "建议安装的软件包："
-#: cmdline/apt-get.cc:1854
+#: cmdline/apt-get.cc:1926
msgid "Recommended packages:"
msgstr "推荐安装的软件包："
-#: cmdline/apt-get.cc:1882
+#: cmdline/apt-get.cc:1955
msgid "Calculating upgrade... "
msgstr "正在筹划升级... "
-#: cmdline/apt-get.cc:1885 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1963
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1957 cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误，问题解决器坏事了"
-#: cmdline/apt-get.cc:2065
+#: cmdline/apt-get.cc:2138
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码，必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:2095 cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:2144
+#: cmdline/apt-get.cc:2217
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:2172
+#: cmdline/apt-get.cc:2248
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的空余空间"
-#: cmdline/apt-get.cc:2178
+#: cmdline/apt-get.cc:2254
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2257
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2187
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:2218
+#: cmdline/apt-get.cc:2294
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2246
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
-#: cmdline/apt-get.cc:2258
+#: cmdline/apt-get.cc:2334
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2335
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:2276
+#: cmdline/apt-get.cc:2352
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2295
+#: cmdline/apt-get.cc:2371
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2387
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2339
+#: cmdline/apt-get.cc:2415
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2435
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2487
#, 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:2464
+#: cmdline/apt-get.cc:2540
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
"$s 依赖关系"
-#: cmdline/apt-get.cc:2500
+#: cmdline/apt-get.cc:2576
#, 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:2525
+#: cmdline/apt-get.cc:2603
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2619
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:2543
+#: cmdline/apt-get.cc:2624
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:2575
+#: cmdline/apt-get.cc:2656
msgid "Supported modules:"
msgstr "被支持模块："
-#: cmdline/apt-get.cc:2616
+#: cmdline/apt-get.cc:2697
#, fuzzy
msgid ""
"Usage: apt-get [options] command\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 and purge 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"
" source - 下载源码包文件\n"
" build-dep - 为源码包配置所需的构建依赖关系\n"
" dist-upgrade - 发布版升级，见 apt-get(8)\n"
-" dselect-upgrade - 根据 dselect的选择来进行升级\n"
+" dselect-upgrade - 根据 dselect 的选择来进行升级\n"
" clean - 删除所有已下载的包文件\n"
" autoclean - 删除老版本的已下载的包文件\n"
" check - 核对以确认系统的依赖关系的完整性\n"
" -qq 除了错误外，什么都不输出\n"
" -d 仅仅下载 - 【不】安装或解开包文件\n"
" -s 不作实际操作。只是依次模拟执行命令\n"
-" -y 对所有询问都作肯定的回答，同时不作任何提示\n"
-" -f 当没有通过完整性测试时，程序仍试图继续执行\n"
+" -y 对所有询问都回答是(Yes)，同时不作任何提示\n"
+" -f 当出现破损的依赖关系时，程序将试图修正系统\n"
" -m 当有包文件无法找到时，程序仍试图继续执行\n"
" -u 显示已升级的软件包列表\n"
" -b 在下载完源码包后，编译生成相应的软件包\n"
"以获取更多信息和选项。\n"
" 本 APT 有着超级牛力。\n"
+#: cmdline/apt-get.cc:2864
+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 ""
+
#: cmdline/acqprogress.cc:55
msgid "Hit "
msgstr "命中 "
msgid "Bad default setting!"
msgstr "错误的默认设置！"
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
-#: dselect/install:104 dselect/update:45
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
+#: dselect/install:105 dselect/update:45
msgid "Press enter to continue."
msgstr "按回车键继续。"
-#: dselect/install:100
+#: dselect/install:91
+msgid "Do you want to erase any previously downloaded .deb files?"
+msgstr "您想要删除之前下载的所有 .deb 文件吗？"
+
+#: dselect/install:101
msgid "Some errors occurred while unpacking. I'm going to configure the"
msgstr "在解包时发生了一些错误。我正准备配置"
-#: dselect/install:101
+#: dselect/install:102
msgid "packages that were installed. This may result in duplicate errors"
msgstr "已经安装的软件包。这个操作可能会导致出现重复的错误"
-#: dselect/install:102
+#: dselect/install:103
msgid "or errors caused by missing dependencies. This is OK, only the errors"
msgstr "或一些由于依赖关系不能满足所产生的错误。这个问题不大，只有"
-#: dselect/install:103
+#: dselect/install:104
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr "这个提示之前的错误消息才值得您注意。请更正它们，然后再次执行 [I]nstall"
msgid "Error reading archive member header"
msgstr "读取打包文件中的成员文件头出错"
-#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:90
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "打包文件中成员文件头无效"
+
+#: apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
msgstr "打包文件中成员文件头无效"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
-#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#. Only warn if there are no sources.list.d.
+#. Only warn if there is no sources.list file.
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
+#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
+#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
+#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
msgstr "info 和 temp 目录要求处于同一文件系统之下"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
+#: apt-pkg/pkgcachegen.cc:961
msgid "Reading package lists"
msgstr "正在读取软件包列表"
msgid "Unparsable control file"
msgstr "不能解析的主控文件"
-#: methods/cdrom.cc:114
+#: methods/cdrom.cc:200
#, c-format
msgid "Unable to read the cdrom database %s"
msgstr "无法读取光盘数据库 %s"
-#: methods/cdrom.cc:123
+#: methods/cdrom.cc:209
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:131
+#: methods/cdrom.cc:219
msgid "Wrong CD-ROM"
msgstr "错误的光盘"
-#: methods/cdrom.cc:166
+#: methods/cdrom.cc:245
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。"
-#: methods/cdrom.cc:171
+#: methods/cdrom.cc:250
msgid "Disk not found."
msgstr "找不到光盘。"
-#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "无法找到该文件"
msgstr "无效的 URI，本地的 URI 不能以 // 开头"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:162
+#: methods/ftp.cc:167
msgid "Logging in"
msgstr "正在登录"
-#: methods/ftp.cc:168
+#: methods/ftp.cc:173
msgid "Unable to determine the peer name"
msgstr "无法获知对方主机名"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:178
msgid "Unable to determine the local name"
msgstr "无法获知本地主机名"
-#: methods/ftp.cc:204 methods/ftp.cc:232
+#: methods/ftp.cc:209 methods/ftp.cc:237
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "服务器拒绝了我们的连接，它响应道：%s"
-#: methods/ftp.cc:210
+#: methods/ftp.cc:215
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER 指令出错，服务器响应道：%s"
-#: methods/ftp.cc:217
+#: methods/ftp.cc:222
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS 指令出错，服务器响应道：%s"
-#: methods/ftp.cc:237
+#: methods/ftp.cc:242
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
"您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。"
-#: methods/ftp.cc:265
+#: methods/ftp.cc:270
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "登录脚本命令“%s”出错，服务器响应道：%s"
-#: methods/ftp.cc:291
+#: methods/ftp.cc:296
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE 指令出错，服务器响应道：%s"
-#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "连接超时"
-#: methods/ftp.cc:335
+#: methods/ftp.cc:340
msgid "Server closed the connection"
msgstr "服务器关闭了连接"
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190
+#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "读错误"
-#: methods/ftp.cc:345 methods/rsh.cc:197
+#: methods/ftp.cc:350 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "回应超出了缓存区大小。"
-#: methods/ftp.cc:362 methods/ftp.cc:374
+#: methods/ftp.cc:367 methods/ftp.cc:379
msgid "Protocol corruption"
msgstr "协议有误"
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232
+#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "写文件出错"
-#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
msgid "Could not create a socket"
msgstr "不能创建套接字"
-#: methods/ftp.cc:698
+#: methods/ftp.cc:703
msgid "Could not connect data socket, connection timed out"
msgstr "无法连接上数据套接字，连接超时"
-#: methods/ftp.cc:704
+#: methods/ftp.cc:709
msgid "Could not connect passive socket."
msgstr "无法连接被动模式的套接字。"
-#: methods/ftp.cc:722
+#: methods/ftp.cc:727
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo 无法得到侦听套接字"
-#: methods/ftp.cc:736
+#: methods/ftp.cc:741
msgid "Could not bind a socket"
msgstr "无法绑定套接字"
-#: methods/ftp.cc:740
+#: methods/ftp.cc:745
msgid "Could not listen on the socket"
msgstr "无法在套接字上侦听"
-#: methods/ftp.cc:747
+#: methods/ftp.cc:752
msgid "Could not determine the socket's name"
msgstr "无法确定套接字的名字"
-#: methods/ftp.cc:779
+#: methods/ftp.cc:784
msgid "Unable to send PORT command"
msgstr "无法发出 PORT 指令"
-#: methods/ftp.cc:789
+#: methods/ftp.cc:794
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "无法识别的地址族 %u (AF_*)"
-#: methods/ftp.cc:798
+#: methods/ftp.cc:803
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT 指令出错，服务器响应道：%s"
-#: methods/ftp.cc:818
+#: methods/ftp.cc:823
msgid "Data socket connect timed out"
msgstr "数据套接字连接超时"
-#: methods/ftp.cc:825
+#: methods/ftp.cc:830
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "把文件加入散列表时出错"
-#: methods/ftp.cc:877
+#: methods/ftp.cc:882
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "无法获取文件，服务器响应道“%s”"
-#: methods/ftp.cc:892 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "数据套接字超时"
-#: methods/ftp.cc:922
+#: methods/ftp.cc:927
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "数据传送出错，服务器响应道“%s”"
#. Get the files information
-#: methods/ftp.cc:997
+#: methods/ftp.cc:1002
msgid "Query"
msgstr "查询"
-#: methods/ftp.cc:1109
+#: methods/ftp.cc:1114
msgid "Unable to invoke "
msgstr "无法调用 "
msgid "Unable to connect to %s %s:"
msgstr "不能连接上 %s %s："
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "无法访问密匙：“%s”"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。"
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "至少发现一个无效的签名。"
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "无法运行\"%s\"以验证签名(您安装了 gpgv 么？)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "运行 gpgv 时发生未知错误"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "下列签名无效：\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgid "Read error from %s process"
msgstr "从 %s 进程读取数据出错"
-#: methods/http.cc:377
+#: methods/http.cc:384
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/http.cc:523
+#: methods/http.cc:530
#, c-format
msgid "Got a single header line over %u chars"
msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
-#: methods/http.cc:531
+#: methods/http.cc:538
msgid "Bad header line"
msgstr "错误的报头条目"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:557 methods/http.cc:564
msgid "The HTTP server sent an invalid reply header"
msgstr "该 http 服务器发送了一个无效的应答报头"
-#: methods/http.cc:586
+#: methods/http.cc:593
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
-#: methods/http.cc:601
+#: methods/http.cc:608
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
-#: methods/http.cc:603
+#: methods/http.cc:610
msgid "This HTTP server has broken range support"
msgstr "该 http 服务器的 range 支持不正常"
-#: methods/http.cc:627
+#: methods/http.cc:634
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:774
+#: methods/http.cc:787
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:779
+#: methods/http.cc:792
msgid "Connection timed out"
msgstr "连接服务器超时"
-#: methods/http.cc:802
+#: methods/http.cc:815
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:833
+#: methods/http.cc:846
msgid "Error writing to file"
msgstr "写文件时出错"
-#: methods/http.cc:861
+#: methods/http.cc:874
msgid "Error writing to the file"
msgstr "写文件时出错"
-#: methods/http.cc:875
+#: methods/http.cc:888
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错，对方关闭了连接"
-#: methods/http.cc:877
+#: methods/http.cc:890
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:1104
+#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+msgid "Failed to truncate file"
+msgstr "截断文件失败"
+
+#: methods/http.cc:1146
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1121 methods/http.cc:1176
+#: methods/http.cc:1163 methods/http.cc:1218
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1228
+#: methods/http.cc:1310
msgid "Internal error"
msgstr "内部错误"
-#: apt-pkg/contrib/mmap.cc:80
+#: apt-pkg/contrib/mmap.cc:76
msgid "Can't mmap an empty file"
msgstr "无法 mmap 一个空文件"
-#: apt-pkg/contrib/mmap.cc:85
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "无法 mmap %lu 字节的数据"
-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/mmap.cc:234
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大侠。当前值：%lu。(man 5 "
+"apt.conf)"
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:346
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:353
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:360
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:365
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1040
#, c-format
msgid "Selection %s not found"
msgstr "没有发现您的所选 %s"
-#: apt-pkg/contrib/configuration.cc:439
+#: apt-pkg/contrib/configuration.cc:458
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "无法识别的类型缩写：“%c”"
-#: apt-pkg/contrib/configuration.cc:497
+#: apt-pkg/contrib/configuration.cc:516
#, c-format
msgid "Opening configuration file %s"
msgstr "正在打开配置文件 %s"
-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:684
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "语法错误 %s:%u：配置小节没有以名字开头"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:703
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "语法错误 %s:%u：标签格式有误"
-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:720
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据"
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:760
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:767
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "语法错误 %s:%u: Included from here"
-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:780
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "语法错误 %s:%u: 不支持的指令“%s”"
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:831
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"
msgid "Unable to stat the mount point %s"
msgstr "无法读取文件系统挂载点 %s 的状态"
-#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
#, c-format
msgid "Unable to change to %s"
msgstr "无法切换工作目录到 %s"
-#: apt-pkg/contrib/cdromutl.cc:187
+#: apt-pkg/contrib/cdromutl.cc:195
msgid "Failed to stat the cdrom"
msgstr "无法读取光盘的状态"
-#: apt-pkg/contrib/fileutl.cc:147
+#: apt-pkg/contrib/fileutl.cc:149
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "由于文件系统为只读，因而无法使用文件锁%s"
-#: apt-pkg/contrib/fileutl.cc:152
+#: apt-pkg/contrib/fileutl.cc:154
#, c-format
msgid "Could not open lock file %s"
msgstr "无法打开锁文件 %s"
-#: apt-pkg/contrib/fileutl.cc:170
+#: apt-pkg/contrib/fileutl.cc:172
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "无法在 nfs 文件系统上使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:174
+#: apt-pkg/contrib/fileutl.cc:176
#, c-format
msgid "Could not get lock %s"
msgstr "无法获得锁 %s"
-#: apt-pkg/contrib/fileutl.cc:442
+#: apt-pkg/contrib/fileutl.cc:444
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出，但是它并不存在"
-#: apt-pkg/contrib/fileutl.cc:452
+#: apt-pkg/contrib/fileutl.cc:456
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子进程 %s 发生了段错误"
-#: apt-pkg/contrib/fileutl.cc:455
+#: apt-pkg/contrib/fileutl.cc:458
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "子进程 %s 发生了段错误"
+
+#: apt-pkg/contrib/fileutl.cc:462
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:457
+#: apt-pkg/contrib/fileutl.cc:464
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出了"
-#: apt-pkg/contrib/fileutl.cc:501
+#: apt-pkg/contrib/fileutl.cc:508
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: apt-pkg/contrib/fileutl.cc:557
+#: apt-pkg/contrib/fileutl.cc:564
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "读文件时出错，还剩 %lu 字节没有读出"
-#: apt-pkg/contrib/fileutl.cc:587
+#: apt-pkg/contrib/fileutl.cc:594
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "写文件时出错，还剩 %lu 字节没有保存"
-#: apt-pkg/contrib/fileutl.cc:662
+#: apt-pkg/contrib/fileutl.cc:669
msgid "Problem closing the file"
msgstr "关闭文件时出错"
-#: apt-pkg/contrib/fileutl.cc:668
+#: apt-pkg/contrib/fileutl.cc:675
msgid "Problem unlinking the file"
msgstr "用 unlink 删除文件时出错"
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:686
msgid "Problem syncing the file"
msgstr "同步文件时出错"
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133
msgid "Empty package cache"
msgstr "软件包缓存区是空的"
-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139
msgid "The package cache file is corrupted"
msgstr "软件包缓存区文件损坏了"
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144
msgid "The package cache file is an incompatible version"
msgstr "软件包缓存区文件的版本不兼容"
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "本程序目前不支持“%s”这个版本控制系统"
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154
msgid "The package cache was built for a different architecture"
msgstr "软件包缓存区是为其它架构的主机构造的"
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
msgid "Depends"
msgstr "依赖"
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
msgid "PreDepends"
msgstr "预依赖"
-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225
msgid "Suggests"
msgstr "建议"
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
msgid "Recommends"
msgstr "推荐"
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
msgid "Conflicts"
msgstr "冲突"
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226
msgid "Replaces"
msgstr "替换"
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
msgid "Obsoletes"
msgstr "废弃"
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227
msgid "Breaks"
msgstr "破坏"
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
msgid "important"
msgstr "重要"
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
msgid "required"
msgstr "必要"
-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238
msgid "standard"
msgstr "标准"
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
msgid "optional"
msgstr "可选"
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239
msgid "extra"
msgstr "额外"
-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
msgid "Building dependency tree"
msgstr "正在分析软件包的依赖关系树"
-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124
msgid "Candidate versions"
msgstr "候选版本"
-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153
msgid "Dependency generation"
msgstr "生成依赖关系"
-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
msgid "Reading state information"
msgstr "正在读取状态信息"
-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:223
#, c-format
msgid "Failed to open StateFile %s"
msgstr "无法打开状态文件 %s"
-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:229
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "无法写入临时状态文件 %s"
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)"
-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:206
#, c-format
msgid "Opening %s"
msgstr "正在打开 %s"
-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
+#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。"
-#: apt-pkg/sourcelist.cc:236
+#: apt-pkg/sourcelist.cc:243
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
-#: apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc:247
#, 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:248 apt-pkg/sourcelist.cc:251
+#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)"
-#: apt-pkg/packagemanager.cc:428
+#: apt-pkg/packagemanager.cc:436
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
msgid "Index file type '%s' is not supported"
msgstr "不支持索引文件类型“%s”"
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:248
#, 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:1106
+#: apt-pkg/algorithms.cc:1138
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
"缘故。"
-#: apt-pkg/algorithms.cc:1108
+#: apt-pkg/algorithms.cc:1140
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
"系。"
-#: apt-pkg/algorithms.cc:1370 apt-pkg/algorithms.cc:1372
+#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
"有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60
#, c-format
msgid "Lists directory %spartial is missing."
msgstr "软件包列表的目录 %spartial 不见了。"
-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64
#, c-format
msgid "Archive directory %spartial is missing."
msgstr "找不到“%spartial”这个目录。"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:827
+#: apt-pkg/acquire.cc:826
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "正在下载 %li 个文件中的第 %li 个(还有 %s 个)"
+msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
-#: apt-pkg/acquire.cc:829
+#: apt-pkg/acquire.cc:828
#, c-format
msgid "Retrieving file %li of %li"
-msgstr "正在下载 %2$li 个文件中的 %1$li 个"
+msgstr "正在下载第 %li 个文件，共 %li 个"
#: apt-pkg/acquire-worker.cc:110
#, c-format
msgid "Method %s did not start correctly"
msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:132
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:148
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
-#: apt-pkg/clean.cc:57
+#: apt-pkg/clean.cc:56
#, c-format
msgid "Unable to stat %s."
msgstr "无法读取 %s 的状态。"
msgid "You may want to run apt-get update to correct these problems"
msgstr "您可能需要运行 apt-get update 来解决这些问题"
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:347
+#, fuzzy, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
msgstr "偏好设定(preferences)文件中发现有无效的记录，无 Package 字段头"
-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:369
#, c-format
msgid "Did not understand pin type %s"
msgstr "无法识别锁定的类型(pin type) %s"
-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:377
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
-#: apt-pkg/pkgcachegen.cc:72
+#: apt-pkg/pkgcachegen.cc:74
msgid "Cache has an incompatible versioning system"
msgstr "软件包暂存区使用的是不兼容的版本控制系统"
-#: apt-pkg/pkgcachegen.cc:115
+#: apt-pkg/pkgcachegen.cc:117
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "处理 %s (NewPackage)时出错"
-#: apt-pkg/pkgcachegen.cc:130
+#: apt-pkg/pkgcachegen.cc:132
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "处理 %s (UsePackage1)时出错"
-#: apt-pkg/pkgcachegen.cc:153
+#: apt-pkg/pkgcachegen.cc:166
#, c-format
msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "处理 %s (NewFileDesc1)时出错"
-#: apt-pkg/pkgcachegen.cc:178
+#: apt-pkg/pkgcachegen.cc:191
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "处理 %s (UsePackage2)时出错"
-#: apt-pkg/pkgcachegen.cc:182
+#: apt-pkg/pkgcachegen.cc:195
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "处理 %s (NewFileVer1)时出错"
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:226
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "处理 %s (NewVersion1)时出错"
-#: apt-pkg/pkgcachegen.cc:217
+#: apt-pkg/pkgcachegen.cc:230
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "处理 %s (UsePackage3)时出错"
-#: apt-pkg/pkgcachegen.cc:221
+#: apt-pkg/pkgcachegen.cc:234
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "处理 %s (NewVersion2)时出错"
-#: apt-pkg/pkgcachegen.cc:245
+#: apt-pkg/pkgcachegen.cc:258
#, c-format
msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "处理 %s (NewFileDesc2)时出错"
-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:264
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "糟了，软件包的数量了超出本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:267
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "糟了，软件包版本的数量了超出本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:270
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr "糟了，软件包说明的数量了超出本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:273
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "糟了，依赖关系的数量超出了本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:288
+#: apt-pkg/pkgcachegen.cc:301
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "处理 %s (FindPkg)时出错"
-#: apt-pkg/pkgcachegen.cc:301
+#: apt-pkg/pkgcachegen.cc:314
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "处理 %s (CollectFileProvides)时出错"
-#: apt-pkg/pkgcachegen.cc:307
+#: apt-pkg/pkgcachegen.cc:320
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
-#: apt-pkg/pkgcachegen.cc:678
+#: apt-pkg/pkgcachegen.cc:693
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
-#: apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:778
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
+#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
msgid "IO Error saving source cache"
msgstr "无法写入来源缓存文件"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:128
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件，%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:401
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
-#: apt-pkg/acquire-item.cc:1100
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 key ID 没有可用的公钥：\n"
-#: apt-pkg/acquire-item.cc:1213
+#: apt-pkg/acquire-item.cc:1216
#, 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:1272
+#: apt-pkg/acquire-item.cc:1275
#, 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:1313
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:1400
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "大小不符"
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "无法解析软件包文件 %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "注意，选取 %s 而非 %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
#: apt-pkg/vendorlist.cc:66
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "软件提供者数据块内 %s 没有包含指纹信息"
-#: apt-pkg/cdrom.cc:529
+#: apt-pkg/cdrom.cc:525
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"现把 %s 作为了 CD-ROM 的挂载点\n"
"正在挂载 CD-ROM\n"
-#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627
+#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
msgid "Identifying.. "
msgstr "正在鉴别.. "
-#: apt-pkg/cdrom.cc:563
+#: apt-pkg/cdrom.cc:559
#, c-format
msgid "Stored label: %s\n"
msgstr "已存档的标签：%s\n"
-#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
+#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
msgid "Unmounting CD-ROM...\n"
msgstr "正在卸载 CD-ROM...\n"
-#: apt-pkg/cdrom.cc:590
+#: apt-pkg/cdrom.cc:585
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
-#: apt-pkg/cdrom.cc:608
+#: apt-pkg/cdrom.cc:603
msgid "Unmounting CD-ROM\n"
msgstr "正在卸载 CD-ROM 文件系统\n"
-#: apt-pkg/cdrom.cc:612
+#: apt-pkg/cdrom.cc:607
msgid "Waiting for disc...\n"
msgstr "等待插入盘片……\n"
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:620
+#: apt-pkg/cdrom.cc:615
msgid "Mounting CD-ROM...\n"
msgstr "正在挂载 CD-ROM 文件系统……\n"
-#: apt-pkg/cdrom.cc:638
+#: apt-pkg/cdrom.cc:633
msgid "Scanning disc for index files..\n"
msgstr "正在光盘中查找索引文件..\n"
-#: apt-pkg/cdrom.cc:678
+#: apt-pkg/cdrom.cc:673
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
"找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
"名\n"
-#: apt-pkg/cdrom.cc:715
+#: apt-pkg/cdrom.cc:684
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:710
#, c-format
msgid "Found label '%s'\n"
msgstr "找到标签 '%s'\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:739
msgid "That is not a valid name, try again.\n"
msgstr "这不是一个有效的名字，请再次命名。\n"
-#: apt-pkg/cdrom.cc:760
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid ""
"This disc is called: \n"
"这张光盘现在的名字是：\n"
"“%s”\n"
-#: apt-pkg/cdrom.cc:764
+#: apt-pkg/cdrom.cc:759
msgid "Copying package lists..."
msgstr "正在复制软件包列表……"
-#: apt-pkg/cdrom.cc:790
+#: apt-pkg/cdrom.cc:785
msgid "Writing new source list\n"
msgstr "正在写入新的软件包源列表\n"
-#: apt-pkg/cdrom.cc:799
+#: apt-pkg/cdrom.cc:794
msgid "Source list entries for this disc are:\n"
msgstr "对应于该光盘的软件包源设置项是：\n"
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
#, c-format
msgid "Wrote %i records.\n"
msgstr "已写入 %i 条记录。\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "已写入 %i 条记录，并有 %i 个文件不吻合\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n"
-#: apt-pkg/deb/dpkgpm.cc:452
+#: apt-pkg/deb/dpkgpm.cc:49
+#, c-format
+msgid "Installing %s"
+msgstr "正在安装 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#, c-format
+msgid "Configuring %s"
+msgstr "正在配置 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#, c-format
+msgid "Removing %s"
+msgstr "正在删除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:52
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "执行安装后执行的触发器 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:557
#, c-format
msgid "Directory '%s' missing"
msgstr "目录 %s 不见了"
-#: apt-pkg/deb/dpkgpm.cc:535
+#: apt-pkg/deb/dpkgpm.cc:653
#, c-format
msgid "Preparing %s"
msgstr "正在准备 %s"
-#: apt-pkg/deb/dpkgpm.cc:536
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Unpacking %s"
msgstr "正在解压缩 %s"
-#: apt-pkg/deb/dpkgpm.cc:541
+#: apt-pkg/deb/dpkgpm.cc:659
#, c-format
msgid "Preparing to configure %s"
msgstr "正在准备配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:542
-#, c-format
-msgid "Configuring %s"
-msgstr "正在配置 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545
-#, c-format
-msgid "Processing triggers for %s"
-msgstr "启动对 %s 的处理"
-
-#: apt-pkg/deb/dpkgpm.cc:547
+#: apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Installed %s"
msgstr "已安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554
-#: apt-pkg/deb/dpkgpm.cc:555
+#: apt-pkg/deb/dpkgpm.cc:666
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在准备 %s 的删除操作"
-#: apt-pkg/deb/dpkgpm.cc:557
-#, c-format
-msgid "Removing %s"
-msgstr "正在删除 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:558
+#: apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removed %s"
msgstr "已删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:563
+#: apt-pkg/deb/dpkgpm.cc:673
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在准备完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:564
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Completely removed %s"
msgstr "完全删除了 %s"
-#: apt-pkg/deb/dpkgpm.cc:716
+#: apt-pkg/deb/dpkgpm.cc:878
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "无法写入日志。 openpty() 失败 (/dev/pts 没有 mount 上？)\n"
+#: apt-pkg/deb/dpkgpm.cc:907
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "无法对状态列表目录加锁"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "无法打开补丁文件"
msgid "Connection closed prematurely"
msgstr "连接被永久关闭"
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "启动对 %s 的处理"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "动态内存映射(Dynamic MMap)空间不足"
+
+#~ msgid ""
+#~ "Since you only requested a single operation it is extremely likely that\n"
+#~ "the package is simply not installable and a bug report against\n"
+#~ "that package should be filed."
+#~ msgstr ""
+#~ "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n"
+#~ "您最好提交一个针对这个软件包的故障报告。"
+
#~ msgid "Line %d too long (max %lu)"
#~ msgstr "第 %d 行超长了(长度限制为 %lu)。"
projects / apt.git / blobdiff