summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po1023
1 files changed, 517 insertions, 506 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 82c2860f0..60410e7c7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,24 +9,17 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-09-04 15:34+0200\n"
+"POT-Creation-Date: 2012-10-15 00:04+0100\n"
"PO-Revision-Date: 2012-10-12 06:28+0000\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
"X-Generator: Launchpad (build 16130)\n"
-"Language: \n"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:864
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "正在下载第 %li 个文件,共 %li 个(还剩 %s )"
#: cmdline/apt-cache.cc:158
#, c-format
@@ -107,8 +100,8 @@ msgid "Package file %s is out of sync."
msgstr "软件包文件 %s 尚未同步。"
#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
-#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:39
-#: cmdline/apt-mark.cc:86 cmdline/apt-mark.cc:162
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:46
+#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
msgid "No packages found"
msgstr "没有发现匹配的软件包"
@@ -120,7 +113,7 @@ msgstr "您必须明确地给出至少一个表达式"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:445
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:510
#, c-format
msgid "Unable to locate package %s"
msgstr "无法定位软件包 %s"
@@ -163,10 +156,10 @@ msgstr " 软件包锁: "
msgid " Version table:"
msgstr " 版本列表:"
-#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
-#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
-#: cmdline/apt-get.cc:3247 cmdline/apt-internal-solver.cc:32
-#: cmdline/apt-mark.cc:266 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3364 cmdline/apt-mark.cc:375
+#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s,用于 %s 构架,编译于 %s %s\n"
@@ -221,7 +214,7 @@ msgstr "请把盘片插入驱动器再按回车键"
msgid "Failed to mount '%s' to '%s'"
msgstr "无法将 %s 挂载到 %s"
-#: cmdline/apt-cdrom.cc:164
+#: cmdline/apt-cdrom.cc:163
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
@@ -229,7 +222,7 @@ msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
msgid "Arguments not in pairs"
msgstr "参数没有成对"
-#: cmdline/apt-config.cc:81
+#: cmdline/apt-config.cc:87
msgid ""
"Usage: apt-config [options] command\n"
"\n"
@@ -265,75 +258,75 @@ msgstr "Y"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
-#: cmdline/apt-get.cc:257
+#: cmdline/apt-get.cc:260
msgid "The following packages have unmet dependencies:"
msgstr "下列软件包有未满足的依赖关系:"
-#: cmdline/apt-get.cc:347
+#: cmdline/apt-get.cc:350
#, c-format
msgid "but %s is installed"
msgstr "但是 %s 已经安装"
-#: cmdline/apt-get.cc:349
+#: cmdline/apt-get.cc:352
#, c-format
msgid "but %s is to be installed"
msgstr "但是 %s 正要被安装"
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:359
msgid "but it is not installable"
msgstr "但无法安装它"
-#: cmdline/apt-get.cc:358
+#: cmdline/apt-get.cc:361
msgid "but it is a virtual package"
msgstr "但是它是虚拟软件包"
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:364
msgid "but it is not installed"
msgstr "但是它还没有被安装"
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:364
msgid "but it is not going to be installed"
msgstr "但是它将不会被安装"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:369
msgid " or"
msgstr " 或"
-#: cmdline/apt-get.cc:395
+#: cmdline/apt-get.cc:398
msgid "The following NEW packages will be installed:"
msgstr "下列【新】软件包将被安装:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
msgid "The following packages will be REMOVED:"
msgstr "下列软件包将被【卸载】:"
-#: cmdline/apt-get.cc:443
+#: cmdline/apt-get.cc:446
msgid "The following packages have been kept back:"
msgstr "下列软件包的版本将保持不变:"
-#: cmdline/apt-get.cc:464
+#: cmdline/apt-get.cc:467
msgid "The following packages will be upgraded:"
msgstr "下列软件包将被升级:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:488
msgid "The following packages will be DOWNGRADED:"
msgstr "下列软件包将被【降级】:"
-#: cmdline/apt-get.cc:505
+#: cmdline/apt-get.cc:508
msgid "The following held packages will be changed:"
msgstr "下列被要求保持版本不变的软件包将被改变:"
-#: cmdline/apt-get.cc:560
+#: cmdline/apt-get.cc:563
#, c-format
msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
-#: cmdline/apt-get.cc:568
+#: cmdline/apt-get.cc:571
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -341,59 +334,59 @@ msgstr ""
"【警告】:下列基础软件包将被卸载。\n"
"请勿尝试,除非您确实知道您在做什么!"
-#: cmdline/apt-get.cc:599
+#: cmdline/apt-get.cc:602
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "升级了 %lu 个软件包,新安装了 %lu 个软件包, "
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:606
#, c-format
msgid "%lu reinstalled, "
msgstr "重新安装了 %lu 个软件包, "
-#: cmdline/apt-get.cc:605
+#: cmdline/apt-get.cc:608
#, c-format
msgid "%lu downgraded, "
msgstr "降级了 %lu 个软件包, "
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:610
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "要卸载 %lu 个软件包,有 %lu 个软件包未被升级。\n"
-#: cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:614
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-#: cmdline/apt-get.cc:633
+#: 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:639
+#: cmdline/apt-get.cc:640
#, c-format
msgid "Note, selecting '%s' for regex '%s'\n"
msgstr "注意,根据正则表达式 %2$s 选中了 %1$s\n"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:657
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包:\n"
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:668
msgid " [Installed]"
msgstr " [已安装]"
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:677
msgid " [Not candidate version]"
msgstr " [无候选版本]"
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:679
msgid "You should explicitly select one to install."
msgstr "请您明确地选择一个来进行安装。"
-#: cmdline/apt-get.cc:681
+#: cmdline/apt-get.cc:682
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -404,16 +397,16 @@ msgstr ""
"这可能意味着这个缺失的软件包可能已被废弃,\n"
"或者只能在其他发布源中找到\n"
-#: cmdline/apt-get.cc:699
+#: cmdline/apt-get.cc:700
msgid "However the following packages replace it:"
msgstr "可是下列软件包取代了它:"
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:712
#, c-format
msgid "Package '%s' has no installation candidate"
msgstr "软件包 %s 没有可供安装的候选者"
-#: cmdline/apt-get.cc:722
+#: cmdline/apt-get.cc:725
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
msgstr "类似 %s 的虚拟软件包可以卸载\n"
@@ -429,158 +422,158 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:788
#, c-format
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "注意,选取 %s 而非 %s\n"
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略了 %s,它已经被安装而且没有指定要升级。\n"
-#: cmdline/apt-get.cc:787
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "忽略了 %s,它已经被安装而且仅请求了升级。\n"
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:834
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "不能重新安装 %s,因为无法下载它。\n"
-#: cmdline/apt-get.cc:804
+#: cmdline/apt-get.cc:839
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:2103 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:884
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:889
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:1025
msgid "Correcting dependencies..."
msgstr "正在更正依赖关系..."
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:1028
msgid " failed."
msgstr " 失败。"
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:1031
msgid "Unable to correct dependencies"
msgstr "无法更正依赖关系"
-#: cmdline/apt-get.cc:983
+#: cmdline/apt-get.cc:1034
msgid "Unable to minimize the upgrade set"
msgstr "无法最小化要升级的软件包集合"
-#: cmdline/apt-get.cc:985
+#: cmdline/apt-get.cc:1036
msgid " Done"
msgstr " 完成"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1040
msgid "You might want to run 'apt-get -f install' to correct these."
msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
-#: cmdline/apt-get.cc:992
+#: cmdline/apt-get.cc:1043
msgid "Unmet dependencies. Try using -f."
msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-#: cmdline/apt-get.cc:1017
+#: cmdline/apt-get.cc:1068
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "【警告】:下列软件包不能通过验证!"
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1072
msgid "Authentication warning overridden.\n"
msgstr "忽略了认证警告。\n"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1079
msgid "Install these packages without verification [y/N]? "
msgstr "不经验证就安装这些软件包吗?[y/N] "
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1081
msgid "Some packages could not be authenticated"
msgstr "有些软件包不能通过验证"
-#: cmdline/apt-get.cc:1039 cmdline/apt-get.cc:1200
+#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251
msgid "There are problems and -y was used without --force-yes"
msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes"
-#: cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1131
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上!"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1140
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止。"
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1151
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误,Ordering 未能完成"
-#: cmdline/apt-get.cc:1138
+#: cmdline/apt-get.cc:1189
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "怪了……文件大小不符,请发信给 apt@packages.debian.org 吧"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1145
+#: cmdline/apt-get.cc:1196
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需要下载 %sB/%sB 的软件包。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1150
+#: cmdline/apt-get.cc:1201
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需要下载 %sB 的软件包。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1157
+#: cmdline/apt-get.cc:1208
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1162
+#: cmdline/apt-get.cc:1213
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:1177 cmdline/apt-get.cc:1180 cmdline/apt-get.cc:2523
-#: cmdline/apt-get.cc:2526
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2592
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的可用空间"
-#: cmdline/apt-get.cc:1190
+#: cmdline/apt-get.cc:1241
#, c-format
msgid "You don't have enough free space in %s."
msgstr "您在 %s 上没有足够的可用空间。"
-#: cmdline/apt-get.cc:1206 cmdline/apt-get.cc:1226
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "虽然您指定了仅执行常规操作,但这不是个常规操作。"
-#: cmdline/apt-get.cc:1208
+#: cmdline/apt-get.cc:1259
msgid "Yes, do as I say!"
msgstr "是,按我说的做!"
-#: cmdline/apt-get.cc:1210
+#: cmdline/apt-get.cc:1261
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -591,46 +584,48 @@ msgstr ""
"若还想继续的话,就输入下面的短句“%s”\n"
" ?] "
-#: cmdline/apt-get.cc:1216 cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286
msgid "Abort."
msgstr "中止执行。"
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1282
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗?[Y/n] "
-#: cmdline/apt-get.cc:1303 cmdline/apt-get.cc:2588 apt-pkg/algorithms.cc:1492
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: cmdline/apt-get.cc:1321
+#: cmdline/apt-get.cc:1372
msgid "Some files failed to download"
msgstr "有一些文件无法下载"
-#: cmdline/apt-get.cc:1322 cmdline/apt-get.cc:2600
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
-#: cmdline/apt-get.cc:1328
+#: cmdline/apt-get.cc:1379
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
-msgstr "有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项再试试?"
+msgstr ""
+"有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项"
+"再试试?"
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1383
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换"
-#: cmdline/apt-get.cc:1337
+#: cmdline/apt-get.cc:1388
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1389
msgid "Aborting install."
msgstr "中止安装。"
-#: cmdline/apt-get.cc:1366
+#: cmdline/apt-get.cc:1417
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -643,37 +638,37 @@ msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失:"
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr "注意:这是自动被 dpkg 有意完成的。"
-#: cmdline/apt-get.cc:1508
+#: cmdline/apt-get.cc:1559
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s"
-#: cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1591
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "选择 %s 作为源代码包而非 %s\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1578
+#: cmdline/apt-get.cc:1629
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1645
msgid "The update command takes no arguments"
msgstr "update 命令不需要参数"
-#: cmdline/apt-get.cc:1657
+#: cmdline/apt-get.cc:1711
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我们不应该进行删除,无法启动自动删除器"
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1815
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr "似乎自动卸载工具损坏了一些软件,这不应该发生。请向 apt 提交错误报告。"
-#.
+#.
#. if (Packages == 1)
#. {
#. c1out << endl;
@@ -682,16 +677,16 @@ msgstr "似乎自动卸载工具损坏了一些软件,这不应该发生。请
#. "the package is simply not installable and a bug report against\n"
#. "that package should be filed.") << endl;
#. }
-#.
-#: cmdline/apt-get.cc:1764 cmdline/apt-get.cc:1933
+#.
+#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987
msgid "The following information may help to resolve the situation:"
msgstr "下列信息可能会对解决问题有所帮助:"
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1822
msgid "Internal Error, AutoRemover broke stuff"
msgstr "内部错误,自动卸载工具坏事了"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1829
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
@@ -699,7 +694,7 @@ msgid_plural ""
"required:"
msgstr[0] "下列软件包是自动安装的并且现在不需要了:"
-#: cmdline/apt-get.cc:1779
+#: cmdline/apt-get.cc:1833
#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -712,21 +707,23 @@ msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] ""
msgstr[1] ""
-#: cmdline/apt-get.cc:1800
+#: cmdline/apt-get.cc:1854
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部错误,全部升级工具坏事了"
-#: cmdline/apt-get.cc:1899
+#: cmdline/apt-get.cc:1953
msgid "You might want to run 'apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1957
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
-msgstr "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可以指定一个解决办法)。"
+msgstr ""
+"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
+"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1918
+#: cmdline/apt-get.cc:1972
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -737,55 +734,55 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
-#: cmdline/apt-get.cc:1939
+#: cmdline/apt-get.cc:1993
msgid "Broken packages"
msgstr "破损的软件包"
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:2019
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包:"
-#: cmdline/apt-get.cc:2055
+#: cmdline/apt-get.cc:2109
msgid "Suggested packages:"
msgstr "建议安装的软件包:"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2110
msgid "Recommended packages:"
msgstr "推荐安装的软件包:"
-#: cmdline/apt-get.cc:2098
+#: cmdline/apt-get.cc:2152
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:2105 cmdline/apt-mark.cc:63
+#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:2113 cmdline/apt-mark.cc:107
+#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:2129
+#: cmdline/apt-get.cc:2183
msgid "Calculating upgrade... "
msgstr "正在对升级进行计算... "
-#: cmdline/apt-get.cc:2132 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:2137
+#: cmdline/apt-get.cc:2191
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:2204 cmdline/apt-get.cc:2212
+#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误,问题解决工具坏事了"
-#: cmdline/apt-get.cc:2240 cmdline/apt-get.cc:2276
+#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330
msgid "Unable to lock the download directory"
msgstr "无法锁定下载目录"
@@ -794,21 +791,21 @@ msgstr "无法锁定下载目录"
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2391
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2451
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码,必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:2425 cmdline/apt-get.cc:2737
+#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:2442
+#: cmdline/apt-get.cc:2508
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -817,7 +814,7 @@ msgstr ""
"提示:%s 的打包工作被维护于以下位置的 %s 版本控制系统中:\n"
"%s\n"
-#: cmdline/apt-get.cc:2447
+#: cmdline/apt-get.cc:2513
#, c-format
msgid ""
"Please use:\n"
@@ -825,142 +822,141 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2500
+#: cmdline/apt-get.cc:2566
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:2537
+#: cmdline/apt-get.cc:2603
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的可用空间"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2612
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2551
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2623
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:2595
+#: cmdline/apt-get.cc:2661
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "忽略已经被解包到 %s 目录的源代码包\n"
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:2704
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2639
+#: cmdline/apt-get.cc:2705
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2727
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2681
+#: cmdline/apt-get.cc:2747
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2700
+#: cmdline/apt-get.cc:2766
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系,必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2725
+#: cmdline/apt-get.cc:2791
#, c-format
msgid ""
-"No architecture information available for %s. See apt.conf(5) "
-"APT::Architectures for setup"
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2742
+#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系信息"
-#: cmdline/apt-get.cc:2762
+#: cmdline/apt-get.cc:2838
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2892
+#: cmdline/apt-get.cc:3008
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:2913
+#: cmdline/apt-get.cc:3026
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:2936
+#: cmdline/apt-get.cc:3049
#, c-format
-msgid ""
-"Failed to satisfy %s dependency for %s: Installed package %s is too new"
+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:2975
+#: cmdline/apt-get.cc:3088
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2981
+#: cmdline/apt-get.cc:3094
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:3004
+#: cmdline/apt-get.cc:3117
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
-#: cmdline/apt-get.cc:3020
+#: cmdline/apt-get.cc:3133
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:3025
+#: cmdline/apt-get.cc:3138
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:3118 cmdline/apt-get.cc:3130
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
#, c-format
msgid "Changelog for %s (%s)"
msgstr ""
-#: cmdline/apt-get.cc:3252
+#: cmdline/apt-get.cc:3369
msgid "Supported modules:"
msgstr "支持的模块:"
-#: cmdline/apt-get.cc:3293
+#: cmdline/apt-get.cc:3410
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1006,7 +1002,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3458
+#: cmdline/apt-get.cc:3575
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1017,33 +1013,33 @@ msgstr ""
"   apt-get 需要 root 特权进行实际的执行。\n"
"   同时请记住此时并未锁定,所以请勿完全相信当前的情况!"
-#: cmdline/acqprogress.cc:59
+#: cmdline/acqprogress.cc:60
msgid "Hit "
msgstr "命中 "
-#: cmdline/acqprogress.cc:83
+#: cmdline/acqprogress.cc:84
msgid "Get:"
msgstr "获取:"
-#: cmdline/acqprogress.cc:114
+#: cmdline/acqprogress.cc:115
msgid "Ign "
msgstr "忽略 "
-#: cmdline/acqprogress.cc:118
+#: cmdline/acqprogress.cc:119
msgid "Err "
msgstr "错误 "
-#: cmdline/acqprogress.cc:139
+#: cmdline/acqprogress.cc:140
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
msgstr "下载 %sB,耗时 %s (%sB/s)\n"
-#: cmdline/acqprogress.cc:229
+#: cmdline/acqprogress.cc:230
#, c-format
msgid " [Working]"
msgstr " [执行中]"
-#: cmdline/acqprogress.cc:285
+#: cmdline/acqprogress.cc:286
#, c-format
msgid ""
"Media change: please insert the disc labeled\n"
@@ -1054,47 +1050,48 @@ msgstr ""
"“%s”\n"
"的盘片插入驱动器“%s”再按回车键\n"
-#: cmdline/apt-mark.cc:48
+#: cmdline/apt-mark.cc:55
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr ""
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:61
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr ""
-#: cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:63
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr ""
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:228
#, c-format
msgid "%s was already set on hold.\n"
msgstr ""
-#: cmdline/apt-mark.cc:173
+#: cmdline/apt-mark.cc:230
#, c-format
msgid "%s was already not hold.\n"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:691
+#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出,但是它并不存在"
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:209
+#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
#, c-format
msgid "%s set on hold.\n"
msgstr ""
-#: cmdline/apt-mark.cc:189 cmdline/apt-mark.cc:214
+#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
#, c-format
msgid "Canceled hold on %s.\n"
msgstr ""
-#: cmdline/apt-mark.cc:222
+#: cmdline/apt-mark.cc:332
msgid "Executing dpkg failed. Are you root?"
msgstr ""
@@ -1129,7 +1126,9 @@ msgstr "无法读取盘片数据库 %s"
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
-msgstr "请使用 apt-cdrom,通过它就可以让 APT 能识别该盘片。apt-get upgdate 不能被用来加入新的盘片。"
+msgstr ""
+"请使用 apt-cdrom,通过它就可以让 APT 能识别该盘片。apt-get upgdate 不能被用来"
+"加入新的盘片。"
#: methods/cdrom.cc:222
msgid "Wrong CD-ROM"
@@ -1144,18 +1143,16 @@ msgstr "无法卸载现在挂载于 %s 的 CD-ROM,它可能正在使用中。"
msgid "Disk not found."
msgstr "找不到盘片。"
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273
msgid "File not found"
msgstr "无法找到该文件"
-#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
-#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:530
-#: methods/rred.cc:539
+#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
+#: methods/rred.cc:512 methods/rred.cc:521
msgid "Failed to stat"
msgstr "无法读取状态"
-#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
-#: methods/rred.cc:536
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -1164,74 +1161,78 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "无效的 URI,本地的 URI 不能以 // 开头"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:172
+#: methods/ftp.cc:173
msgid "Logging in"
msgstr "正在登录"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the peer name"
msgstr "无法获知对方主机名"
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
msgid "Unable to determine the local name"
msgstr "无法获知本地主机名"
-#: methods/ftp.cc:214 methods/ftp.cc:242
+#: methods/ftp.cc:215 methods/ftp.cc:243
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "服务器拒绝了我们的连接,响应信息为:%s"
-#: methods/ftp.cc:220
+#: methods/ftp.cc:221
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER 指令出错,服务器响应信息为:%s"
-#: methods/ftp.cc:227
+#: methods/ftp.cc:228
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS 指令出错,服务器响应信息为:%s"
-#: methods/ftp.cc:247
+#: methods/ftp.cc:248
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
-msgstr "您指定了代理服务器,但是没有登陆脚本,Acquire::ftp::ProxyLogin 设置为空。"
+msgstr ""
+"您指定了代理服务器,但是没有登陆脚本,Acquire::ftp::ProxyLogin 设置为空。"
-#: methods/ftp.cc:275
+#: methods/ftp.cc:276
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "登录脚本命令“%s”出错,服务器响应信息为:%s"
-#: methods/ftp.cc:301
+#: methods/ftp.cc:302
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE 指令出错,服务器响应信息为:%s"
-#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
+#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235
msgid "Connection timeout"
msgstr "连接超时"
-#: methods/ftp.cc:345
+#: methods/ftp.cc:346
msgid "Server closed the connection"
msgstr "服务器关闭了连接"
-#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:832 methods/rsh.cc:197
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "读错误"
-#: methods/ftp.cc:355 methods/rsh.cc:204
+#: methods/ftp.cc:356 methods/rsh.cc:206
msgid "A response overflowed the buffer."
msgstr "回应超出了缓存区大小。"
-#: methods/ftp.cc:372 methods/ftp.cc:384
+#: methods/ftp.cc:373 methods/ftp.cc:385
msgid "Protocol corruption"
msgstr "协议有误"
-#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:874 methods/rsh.cc:239
+#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "写出错"
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
msgid "Could not create a socket"
msgstr "无法创建套接字"
@@ -1243,68 +1244,68 @@ msgstr "无法连接上数据套接字,连接超时"
msgid "Could not connect passive socket."
msgstr "无法连接被动模式的套接字。"
-#: methods/ftp.cc:731
+#: methods/ftp.cc:730
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo 无法得到监听套接字"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:744
msgid "Could not bind a socket"
msgstr "无法绑定套接字"
-#: methods/ftp.cc:749
+#: methods/ftp.cc:748
msgid "Could not listen on the socket"
msgstr "无法在套接字上监听"
-#: methods/ftp.cc:756
+#: methods/ftp.cc:755
msgid "Could not determine the socket's name"
msgstr "无法确定套接字的名字"
-#: methods/ftp.cc:788
+#: methods/ftp.cc:787
msgid "Unable to send PORT command"
msgstr "无法发出 PORT 指令"
-#: methods/ftp.cc:798
+#: methods/ftp.cc:797
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "无法识别的地址族 %u (AF_*)"
-#: methods/ftp.cc:807
+#: methods/ftp.cc:806
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT 指令出错,服务器响应信息为:%s"
-#: methods/ftp.cc:827
+#: methods/ftp.cc:826
msgid "Data socket connect timed out"
msgstr "数据套接字连接超时"
-#: methods/ftp.cc:834
+#: methods/ftp.cc:833
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:873 methods/http.cc:1031 methods/rsh.cc:309
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "把文件加入哈希表时出错"
-#: methods/ftp.cc:886
+#: methods/ftp.cc:885
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "无法获取文件,服务器响应信息为“%s”"
-#: methods/ftp.cc:901 methods/rsh.cc:328
+#: methods/ftp.cc:900 methods/rsh.cc:330
msgid "Data socket timed out"
msgstr "数据套接字超时"
-#: methods/ftp.cc:931
+#: methods/ftp.cc:930
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "数据传送出错,服务器响应信息为“%s”"
#. Get the files information
-#: methods/ftp.cc:1008
+#: methods/ftp.cc:1007
msgid "Query"
msgstr "查询"
-#: methods/ftp.cc:1120
+#: methods/ftp.cc:1119
msgid "Unable to invoke "
msgstr "无法调用 "
@@ -1340,7 +1341,7 @@ msgstr "无法连接上 %s:%s (%s)。"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:431
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "正在连接 %s"
@@ -1365,161 +1366,162 @@ msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "不能连接到 %s:%s:"
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部错误:签名正确无误,但是无法确认密钥指纹?!"
-#: methods/gpgv.cc:177
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "至少发现一个无效的签名。"
-#: methods/gpgv.cc:181
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗?)"
-#: methods/gpgv.cc:186
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "运行 gpgv 时发生未知错误"
-#: methods/gpgv.cc:220 methods/gpgv.cc:227
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "下列签名无效:\n"
-#: methods/gpgv.cc:234
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr "由于没有公钥,无法验证下列签名:\n"
-#: methods/bzip2.cc:63 methods/gzip.cc:54
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:393
+#: methods/http.cc:394
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/http.cc:547
+#: methods/http.cc:544
msgid "Bad header line"
msgstr "错误的报头行"
-#: methods/http.cc:572 methods/http.cc:579
+#: methods/http.cc:569 methods/http.cc:576
msgid "The HTTP server sent an invalid reply header"
msgstr "该 HTTP 服务器发送了一个无效的应答报头"
-#: methods/http.cc:608
+#: methods/http.cc:606
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
-#: methods/http.cc:623
+#: methods/http.cc:621
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
-#: methods/http.cc:625
+#: methods/http.cc:623
msgid "This HTTP server has broken range support"
msgstr "该 HTTP 服务器的 range 支持不正常"
-#: methods/http.cc:649
+#: methods/http.cc:647
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:808
+#: methods/http.cc:818
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:813
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "连接超时"
-#: methods/http.cc:836
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:867
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "写入文件出错"
-#: methods/http.cc:895
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "写入文件出错"
-#: methods/http.cc:909
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错,对方关闭了连接"
-#: methods/http.cc:911
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:1191
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1208 methods/http.cc:1263
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1355
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "内部错误"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
-#: apt-pkg/contrib/fileutl.cc:344 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
-#: methods/mirror.cc:95
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
+#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
-#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
-#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
-#: methods/mirror.cc:101
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179
+#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491
+#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
+#: apt-pkg/clean.cc:123
#, c-format
msgid "Unable to change to %s"
msgstr "无法切换工作目录到 %s"
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
-#: methods/mirror.cc:279
+#: methods/mirror.cc:280
#, c-format
msgid "No mirror file '%s' found "
msgstr "没有找到镜像文件 %s "
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
-#: methods/mirror.cc:286
+#: methods/mirror.cc:287
#, c-format
msgid "Can not read mirror file '%s'"
msgstr ""
-#: methods/mirror.cc:441
+#: methods/mirror.cc:442
#, c-format
msgid "[Mirror: %s]"
msgstr "[镜像:%s]"
-#: methods/rred.cc:509
+#: methods/rred.cc:491
#, c-format
msgid ""
"Could not patch %s with mmap and with file operation usage - the patch seems "
"to be corrupt."
msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"
-#: methods/rred.cc:514
+#: methods/rred.cc:496
#, c-format
msgid ""
"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
"to be corrupt."
msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"
-#: ftparchive/multicompress.cc:167 methods/rsh.cc:97
+#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
msgstr "无法为子进程创建 IPC 管道"
-#: methods/rsh.cc:336
+#: methods/rsh.cc:338
msgid "Connection closed prematurely"
msgstr "连接被过早地关闭了"
@@ -1557,12 +1559,12 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们,
msgid "Merging available information"
msgstr "正在合并可用信息"
-#: cmdline/apt-extracttemplates.cc:100
+#: cmdline/apt-extracttemplates.cc:102
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s 不是一个有效的 DEB 软件包。"
-#: cmdline/apt-extracttemplates.cc:234
+#: cmdline/apt-extracttemplates.cc:236
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1586,12 +1588,12 @@ msgstr ""
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1269
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1282
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
-#: cmdline/apt-extracttemplates.cc:311
+#: cmdline/apt-extracttemplates.cc:313
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?"
@@ -1708,38 +1710,39 @@ msgstr "没有任何选定项是匹配的"
msgid "Some files are missing in the package file group `%s'"
msgstr "软件包文件组“%s”中缺少一些文件"
-#: ftparchive/cachedb.cc:46
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "数据库被损坏,该数据库文件的文件名已改成 %s.old"
-#: ftparchive/cachedb.cc:64
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "数据库已过期,现尝试进行升级 %s"
-#: ftparchive/cachedb.cc:75
+#: ftparchive/cachedb.cc:76
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
-msgstr "数据库格式无效。如果您是从一个老版本的 apt 升级而来,请删除数据库并重建它。"
+msgstr ""
+"数据库格式无效。如果您是从一个老版本的 apt 升级而来,请删除数据库并重建它。"
-#: ftparchive/cachedb.cc:80
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "无法打开数据库文件 %s:%s"
-#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "无法获得 %s 的状态"
-#: ftparchive/cachedb.cc:248
+#: ftparchive/cachedb.cc:249
msgid "Archive has no control record"
msgstr "归档文件没有包含控制字段"
-#: ftparchive/cachedb.cc:489
+#: ftparchive/cachedb.cc:490
msgid "Unable to get a cursor"
msgstr "无法获得游标"
@@ -1828,76 +1831,76 @@ msgstr " %s 没有源代码的 override 项\n"
msgid " %s has no binary override entry either\n"
msgstr " %s 中没有二进制文件的 override 项\n"
-#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
+#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
msgid "realloc - Failed to allocate memory"
msgstr "realloc - 分配内存失败"
-#: ftparchive/override.cc:34 ftparchive/override.cc:142
+#: ftparchive/override.cc:35 ftparchive/override.cc:143
#, c-format
msgid "Unable to open %s"
msgstr "无法打开 %s"
-#: ftparchive/override.cc:60 ftparchive/override.cc:166
+#: ftparchive/override.cc:61 ftparchive/override.cc:167
#, c-format
msgid "Malformed override %s line %llu #1"
msgstr ""
-#: ftparchive/override.cc:74 ftparchive/override.cc:178
+#: ftparchive/override.cc:75 ftparchive/override.cc:179
#, c-format
msgid "Malformed override %s line %llu #2"
msgstr ""
-#: ftparchive/override.cc:88 ftparchive/override.cc:191
+#: ftparchive/override.cc:89 ftparchive/override.cc:192
#, c-format
msgid "Malformed override %s line %llu #3"
msgstr ""
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: ftparchive/override.cc:128 ftparchive/override.cc:202
#, c-format
msgid "Failed to read the override file %s"
msgstr "无法读取 override 文件 %s"
-#: ftparchive/multicompress.cc:69
+#: ftparchive/multicompress.cc:70
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "未知的压缩算法“%s”"
-#: ftparchive/multicompress.cc:99
+#: ftparchive/multicompress.cc:100
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
-#: ftparchive/multicompress.cc:193
+#: ftparchive/multicompress.cc:189
msgid "Failed to create FILE*"
msgstr "无法创建 FILE*"
-#: ftparchive/multicompress.cc:196
+#: ftparchive/multicompress.cc:192
msgid "Failed to fork"
msgstr "无法 fork"
-#: ftparchive/multicompress.cc:210
+#: ftparchive/multicompress.cc:206
msgid "Compress child"
msgstr "压缩子进程"
-#: ftparchive/multicompress.cc:233
+#: ftparchive/multicompress.cc:229
#, c-format
msgid "Internal error, failed to create %s"
msgstr "内部错误,无法创建 %s"
-#: ftparchive/multicompress.cc:403
+#: ftparchive/multicompress.cc:304
msgid "IO to subprocess/file failed"
msgstr "无法对子进程或文件进行读写"
-#: ftparchive/multicompress.cc:455
+#: ftparchive/multicompress.cc:342
msgid "Failed to read while computing MD5"
msgstr "在计算 MD5 校验和时无法读取数据"
-#: ftparchive/multicompress.cc:472
+#: ftparchive/multicompress.cc:358
#, c-format
msgid "Problem unlinking %s"
msgstr "在使用 unlink 删除 %s 时出错"
-#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "无法将 %s 重命名为 %s"
@@ -2021,12 +2024,12 @@ msgstr "添加了两个转移项 %s-> %s"
msgid "Duplicate conf file %s/%s"
msgstr "重复的配置文件 %s/%s"
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "无法写入文件 %s"
-#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
+#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "无法关闭文件 %s"
@@ -2083,23 +2086,23 @@ msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
msgid "Unable to stat %s"
msgstr "无法读取 %s 的状态"
-#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”"
#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:56
+#: apt-inst/deb/debfile.cc:55
#, c-format
msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”,“%s”或者“%s”"
-#: apt-inst/deb/debfile.cc:157
+#: apt-inst/deb/debfile.cc:120
#, c-format
msgid "Internal error, could not locate member %s"
msgstr "内部错误,无法定位包内文件 %s"
-#: apt-inst/deb/debfile.cc:277
+#: apt-inst/deb/debfile.cc:214
msgid "Unparsable control file"
msgstr "不能解析的主控文件"
@@ -2107,30 +2110,30 @@ msgstr "不能解析的主控文件"
msgid "Can't mmap an empty file"
msgstr "无法 mmap 一个空文件"
-#: apt-pkg/contrib/mmap.cc:91
+#: apt-pkg/contrib/mmap.cc:111
#, c-format
msgid "Couldn't duplicate file descriptor %i"
msgstr "无法为复制文件描述符 %i"
-#: apt-pkg/contrib/mmap.cc:99
+#: apt-pkg/contrib/mmap.cc:119
#, c-format
msgid "Couldn't make mmap of %llu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:126
+#: apt-pkg/contrib/mmap.cc:146
msgid "Unable to close mmap"
msgstr "无法关闭 mmap"
-#: apt-pkg/contrib/mmap.cc:154 apt-pkg/contrib/mmap.cc:182
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
msgid "Unable to synchronize mmap"
msgstr "无法同步 mmap"
-#: apt-pkg/contrib/mmap.cc:260
+#: apt-pkg/contrib/mmap.cc:290
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "无法 mmap %lu 字节的数据"
-#: methods/http.cc:1016 apt-pkg/contrib/mmap.cc:293
+#: apt-pkg/contrib/mmap.cc:322
msgid "Failed to truncate file"
msgstr "无法截断文件"
@@ -2139,101 +2142,102 @@ msgstr "无法截断文件"
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
"Current value: %lu. (man 5 apt.conf)"
-msgstr "动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值:%lu。(man 5 apt.conf)"
+msgstr ""
+"动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值:%lu。(man 5 "
+"apt.conf)"
-#: apt-pkg/contrib/mmap.cc:411
+#: apt-pkg/contrib/mmap.cc:440
#, 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:414
+#: apt-pkg/contrib/mmap.cc:443
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr "无法增加 MMap 大小,因为用户已禁用自动增加。"
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:371
+#: apt-pkg/contrib/strutl.cc:372
#, 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:378
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%li小时 %li分 %li秒"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%li分 %li秒"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:390
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1165
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "找不到您选则的 %s"
-#: apt-pkg/contrib/configuration.cc:468
+#: apt-pkg/contrib/configuration.cc:491
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "无法识别的类型缩写:“%c”"
-#: apt-pkg/contrib/configuration.cc:526
+#: apt-pkg/contrib/configuration.cc:605
#, c-format
msgid "Opening configuration file %s"
msgstr "正在打开配置文件 %s"
-#: apt-pkg/contrib/configuration.cc:694
+#: apt-pkg/contrib/configuration.cc:773
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "语法错误 %s:%u:配置小节没有以名字开头"
-#: apt-pkg/contrib/configuration.cc:713
+#: apt-pkg/contrib/configuration.cc:792
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "语法错误 %s:%u:标签格式有误"
-#: apt-pkg/contrib/configuration.cc:730
+#: apt-pkg/contrib/configuration.cc:809
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "语法错误 %s:%u:配置值后有多余的无意义数据"
-#: apt-pkg/contrib/configuration.cc:770
+#: apt-pkg/contrib/configuration.cc:849
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "语法错误 %s:%u:只能在顶层配置文件中使用指示"
-#: apt-pkg/contrib/configuration.cc:777
+#: apt-pkg/contrib/configuration.cc:856
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "语法错误 %s:%u:太多的嵌套 include 命令"
-#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
+#: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "语法错误 %s:%u:Included from here"
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:869
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "语法错误 %s:%u:不支持的指令“%s”"
-#: apt-pkg/contrib/configuration.cc:793
+#: apt-pkg/contrib/configuration.cc:872
#, c-format
-msgid ""
-"Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "语法错误 %s:%u:clean 指令需要一个选项树作为参数"
-#: apt-pkg/contrib/configuration.cc:843
+#: apt-pkg/contrib/configuration.cc:922
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "语法错误 %s:%u:文件尾部有多余的无意义的数据"
@@ -2253,43 +2257,43 @@ msgstr "%c%s... 完成"
msgid "Command line option '%c' [from %s] is not known."
msgstr "未知的命令行选项“%c” [来自 %s]"
-#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
-#: apt-pkg/contrib/cmndline.cc:120
+#: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114
+#: apt-pkg/contrib/cmndline.cc:122
#, c-format
msgid "Command line option %s is not understood"
msgstr "无法识别命令行选项 %s"
-#: apt-pkg/contrib/cmndline.cc:125
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option %s is not boolean"
msgstr "命令行选项 %s 不是布尔值"
-#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189
#, c-format
msgid "Option %s requires an argument."
msgstr "选项 %s 要求有一个参数"
-#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
+#: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "选项 %s:配置项后必须包含有形如“=<变量>”的具体指定"
-#: apt-pkg/contrib/cmndline.cc:235
+#: apt-pkg/contrib/cmndline.cc:237
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "选项 %s 要求有一个整数作为参数,而不是“%s”"
-#: apt-pkg/contrib/cmndline.cc:266
+#: apt-pkg/contrib/cmndline.cc:268
#, 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"
@@ -2303,116 +2307,116 @@ msgstr "无法读取文件系统挂载点 %s 的状态"
msgid "Failed to stat the cdrom"
msgstr "无法读取盘片的状态"
-#: apt-pkg/contrib/fileutl.cc:1023
+#: apt-pkg/contrib/fileutl.cc:93
#, c-format
msgid "Problem closing the gzip file %s"
msgstr "关闭 gzip %s 文件出错"
-#: apt-pkg/contrib/fileutl.cc:169
+#: apt-pkg/contrib/fileutl.cc:225
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "由于文件系统为只读,因而无法使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:174
+#: apt-pkg/contrib/fileutl.cc:230
#, c-format
msgid "Could not open lock file %s"
msgstr "无法打开锁文件 %s"
-#: apt-pkg/contrib/fileutl.cc:192
+#: apt-pkg/contrib/fileutl.cc:248
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "无法在 nfs 文件系统上使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:196
+#: apt-pkg/contrib/fileutl.cc:252
#, c-format
msgid "Could not get lock %s"
msgstr "无法获得锁 %s"
-#: apt-pkg/contrib/fileutl.cc:336
+#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:363
+#: apt-pkg/contrib/fileutl.cc:426
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:381
+#: apt-pkg/contrib/fileutl.cc:444
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:390
+#: apt-pkg/contrib/fileutl.cc:453
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:703
+#: apt-pkg/contrib/fileutl.cc:840
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子进程 %s 发生了段错误"
-#: apt-pkg/contrib/fileutl.cc:705
+#: apt-pkg/contrib/fileutl.cc:842
#, c-format
msgid "Sub-process %s received signal %u."
msgstr "子进程 %s 收到信号 %u。"
-#: apt-pkg/contrib/fileutl.cc:709
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:711
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出"
-#: apt-pkg/contrib/fileutl.cc:776 apt-pkg/indexcopy.cc:676
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: apt-pkg/contrib/fileutl.cc:793
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "无法打开文件描述符 %d"
-#: ftparchive/multicompress.cc:284
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "无法创建子进程的 IPC 管道"
-#: ftparchive/multicompress.cc:321
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "无法执行压缩程序 "
-#: apt-pkg/contrib/fileutl.cc:853
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:886
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1026
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "关闭文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1031
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "重命名文件 %s 为 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "用 unlink 删除文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1055
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "同步文件出错"
@@ -2497,38 +2501,38 @@ msgstr "可选"
msgid "extra"
msgstr "额外"
-#: apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:159
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
msgid "Building dependency tree"
msgstr "正在分析软件包的依赖关系树"
-#: apt-pkg/depcache.cc:131
+#: apt-pkg/depcache.cc:133
msgid "Candidate versions"
msgstr "候选版本"
-#: apt-pkg/depcache.cc:160
+#: apt-pkg/depcache.cc:162
msgid "Dependency generation"
msgstr "生成依赖关系"
-#: apt-pkg/depcache.cc:180 apt-pkg/depcache.cc:213 apt-pkg/depcache.cc:217
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
msgid "Reading state information"
msgstr "正在读取状态信息"
-#: apt-pkg/depcache.cc:242
+#: apt-pkg/depcache.cc:244
#, c-format
msgid "Failed to open StateFile %s"
msgstr "无法打开状态文件 %s"
-#: apt-pkg/depcache.cc:248
+#: apt-pkg/depcache.cc:250
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "无法写入临时状态文件 %s"
-#: apt-pkg/tagfile.cc:126
+#: apt-pkg/tagfile.cc:129
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "无法解析软件包文件 %s (1)"
-#: apt-pkg/tagfile.cc:213
+#: apt-pkg/tagfile.cc:216
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "无法解析软件包文件 %s (2)"
@@ -2588,7 +2592,7 @@ msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
msgid "Opening %s"
msgstr "正在打开 %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:447
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "源列表 %2$s 的第 %1$u 行太长了。"
@@ -2603,50 +2607,57 @@ msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”"
-#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
-msgstr "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure (%d)"
+msgstr ""
+"无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
+"(%d)"
-#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
#, c-format
msgid "Could not configure '%s'. "
msgstr ""
-#: apt-pkg/packagemanager.cc:507
+#: apt-pkg/packagemanager.cc:545
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-"由于这次安装存在着一个 Conflicts/Pre-Depends 循环,因而需要暂时删除一个必不可少的软件包 "
-"%s。通常并不建议这样做,但是如果您确实希望如此,可以打开 APT::Force-LoopBreak 选项。"
+"由于这次安装存在着一个 Conflicts/Pre-Depends 循环,因而需要暂时删除一个必不可"
+"少的软件包 %s。通常并不建议这样做,但是如果您确实希望如此,可以打开 APT::"
+"Force-LoopBreak 选项。"
#: apt-pkg/pkgrecords.cc:34
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "不支持索引文件类型“%s”"
-#: apt-pkg/algorithms.cc:255
+#: apt-pkg/algorithms.cc:261
#, 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:1191
+#: apt-pkg/algorithms.cc:1223
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
-msgstr "错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的缘故。"
+msgstr ""
+"错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的"
+"缘故。"
-#: apt-pkg/algorithms.cc:1193
+#: apt-pkg/algorithms.cc:1225
msgid "Unable to correct problems, you have held broken packages."
-msgstr "无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关系。"
+msgstr ""
+"无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关"
+"系。"
-#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
+#: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2667,7 +2678,14 @@ msgstr "仓库目录 %spartial 确实。"
msgid "Unable to lock directory %s"
msgstr "无法对目录 %s 加锁"
-#: apt-pkg/acquire.cc:866
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:893
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "正在下载第 %li 个文件,共 %li 个(还剩 %s )"
+
+#: apt-pkg/acquire.cc:895
#, c-format
msgid "Retrieving file %li of %li"
msgstr "正在下载第 %li 个文件,共 %li 个"
@@ -2682,22 +2700,21 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
msgid "Method %s did not start correctly"
msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-#: apt-pkg/acquire-worker.cc:425
+#: apt-pkg/acquire-worker.cc:440
#, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
-#: apt-pkg/clean.cc:59
+#: apt-pkg/clean.cc:57
#, c-format
msgid "Unable to stat %s."
msgstr "无法读取 %s 的状态。"
@@ -2739,60 +2756,60 @@ msgstr "无法识别锁定的类型 %s"
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
-#: apt-pkg/pkgcachegen.cc:83
+#: apt-pkg/pkgcachegen.cc:85
msgid "Cache has an incompatible versioning system"
msgstr "软件包暂存区使用的是不兼容的版本控制系统"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:275
-#: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:353
-#: apt-pkg/pkgcachegen.cc:357 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:384 apt-pkg/pkgcachegen.cc:388
-#: apt-pkg/pkgcachegen.cc:392 apt-pkg/pkgcachegen.cc:413
-#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:463
-#: apt-pkg/pkgcachegen.cc:494 apt-pkg/pkgcachegen.cc:508
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:308 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:358 apt-pkg/pkgcachegen.cc:362
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:389
+#: apt-pkg/pkgcachegen.cc:393 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
+#: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
+#: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:232
+#: apt-pkg/pkgcachegen.cc:234
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "哇,软件包数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:235
+#: apt-pkg/pkgcachegen.cc:237
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "哇,软件包版本数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:238
+#: apt-pkg/pkgcachegen.cc:240
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr "哇,软件包说明数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:243
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "哇,依赖关系数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:515
+#: apt-pkg/pkgcachegen.cc:523
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "当处理文件依赖关系时,无法找到软件包 %s %s"
-#: apt-pkg/pkgcachegen.cc:1080
+#: apt-pkg/pkgcachegen.cc:1093
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1168
-#: apt-pkg/pkgcachegen.cc:1272 apt-pkg/pkgcachegen.cc:1278
-#: apt-pkg/pkgcachegen.cc:1434
+#: apt-pkg/pkgcachegen.cc:1181 apt-pkg/pkgcachegen.cc:1285
+#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1448
msgid "Reading package lists"
msgstr "正在读取软件包列表"
-#: apt-pkg/pkgcachegen.cc:1185
+#: apt-pkg/pkgcachegen.cc:1198
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:1376 apt-pkg/pkgcachegen.cc:1383
+#: apt-pkg/pkgcachegen.cc:1390 apt-pkg/pkgcachegen.cc:1397
msgid "IO Error saving source cache"
msgstr "无法读取或写入软件源缓存"
@@ -2801,101 +2818,105 @@ msgstr "无法读取或写入软件源缓存"
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:599
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
-#: apt-pkg/acquire-item.cc:2006
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
-#: apt-pkg/acquire-item.cc:1399
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1415
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr ""
-#: apt-pkg/acquire-item.cc:1450
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 ID 的密钥没有可用的公钥:\n"
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1510
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "冲突的发行版:%s (期望 %s 但得到 %s)"
-#: apt-pkg/acquire-item.cc:1543
+#: apt-pkg/acquire-item.cc:1532
#, 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"
+msgstr ""
+"校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 错误:%s: %s"
-#: apt-pkg/acquire-item.cc:1650
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
-msgstr "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件包。(缘于架构缺失)"
+msgstr ""
+"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
+"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package."
-msgstr "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
+msgstr ""
+"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:1768
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:1855
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/indexrecords.cc:61
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/indexrecords.cc:71
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-#: apt-pkg/indexrecords.cc:105
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-#: apt-pkg/indexrecords.cc:118
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
-#: apt-pkg/indexrecords.cc:137
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
@@ -2905,7 +2926,7 @@ msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
msgid "Vendor block %s contains no fingerprint"
msgstr "软件提供者数据块内 %s 没有包含指纹信息"
-#: apt-pkg/cdrom.cc:528
+#: apt-pkg/cdrom.cc:576
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
@@ -2914,63 +2935,67 @@ msgstr ""
"现把 %s 作为了 CD-ROM 的挂载点\n"
"正在挂载 CD-ROM\n"
-#: apt-pkg/cdrom.cc:537 apt-pkg/cdrom.cc:634
+#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
msgid "Identifying.. "
msgstr "正在鉴别.. "
-#: apt-pkg/cdrom.cc:565
+#: apt-pkg/cdrom.cc:613
#, c-format
msgid "Stored label: %s\n"
msgstr "已归档文件的标签:%s\n"
-#: apt-pkg/cdrom.cc:574 apt-pkg/cdrom.cc:850
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
msgid "Unmounting CD-ROM...\n"
msgstr "正在卸载 CD-ROM...\n"
-#: apt-pkg/cdrom.cc:594
+#: apt-pkg/cdrom.cc:642
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
-#: apt-pkg/cdrom.cc:612
+#: apt-pkg/cdrom.cc:660
msgid "Unmounting CD-ROM\n"
msgstr "正在卸载 CD-ROM 文件系统\n"
-#: apt-pkg/cdrom.cc:617
+#: apt-pkg/cdrom.cc:665
msgid "Waiting for disc...\n"
msgstr "等待插入盘片……\n"
-#: apt-pkg/cdrom.cc:626
+#: apt-pkg/cdrom.cc:674
msgid "Mounting CD-ROM...\n"
msgstr "正在挂载 CD-ROM 文件系统……\n"
-#: apt-pkg/cdrom.cc:645
+#: apt-pkg/cdrom.cc:693
msgid "Scanning disc for index files..\n"
msgstr "正在盘片中查找索引文件..\n"
-#: apt-pkg/cdrom.cc:687
+#: apt-pkg/cdrom.cc:744
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
-msgstr "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签名\n"
+msgstr ""
+"找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
+"名\n"
-#: apt-pkg/cdrom.cc:698
+#: apt-pkg/cdrom.cc:755
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
-msgstr "无法确定任何包文件的位置,可能这不是一张 Debian 盘片或者是选择了错误的硬件构架。"
+msgstr ""
+"无法确定任何包文件的位置,可能这不是一张 Debian 盘片或者是选择了错误的硬件构"
+"架。"
-#: apt-pkg/cdrom.cc:725
+#: apt-pkg/cdrom.cc:782
#, c-format
msgid "Found label '%s'\n"
msgstr "找到标签 '%s'\n"
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:811
msgid "That is not a valid name, try again.\n"
msgstr "这不是一个有效的名字,请重试。\n"
-#: apt-pkg/cdrom.cc:771
+#: apt-pkg/cdrom.cc:828
#, c-format
msgid ""
"This disc is called: \n"
@@ -2979,102 +3004,102 @@ msgstr ""
"这张盘片现在的名字是:\n"
"“%s”\n"
-#: apt-pkg/cdrom.cc:773
+#: apt-pkg/cdrom.cc:830
msgid "Copying package lists..."
msgstr "正在复制软件包列表……"
-#: apt-pkg/cdrom.cc:800
+#: apt-pkg/cdrom.cc:857
msgid "Writing new source list\n"
msgstr "正在写入新的源列表\n"
-#: apt-pkg/cdrom.cc:808
+#: apt-pkg/cdrom.cc:865
msgid "Source list entries for this disc are:\n"
msgstr "对应于该盘片的软件源设置项是:\n"
-#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "已写入 %i 条记录。\n"
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "已写入 %i 条记录,并有 %i 个文件缺失。\n"
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个文件不匹配\n"
-#: apt-pkg/indexcopy.cc:281 apt-pkg/indexcopy.cc:938
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个缺失,以及 %i 个文件不匹配\n"
-#: apt-pkg/indexcopy.cc:546
+#: apt-pkg/indexcopy.cc:515
#, c-format
msgid "Can't find authentication record for: %s"
msgstr "无法找到认证记录:%s"
-#: apt-pkg/indexcopy.cc:552
+#: apt-pkg/indexcopy.cc:521
#, c-format
msgid "Hash mismatch for: %s"
msgstr "Hash 校验和不符:%s"
-#: apt-pkg/indexcopy.cc:680
+#: apt-pkg/indexcopy.cc:662
#, c-format
msgid "File %s doesn't start with a clearsigned message"
msgstr ""
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:711
+#: apt-pkg/indexcopy.cc:692
#, c-format
msgid "No keyring installed in %s."
msgstr "%s 中没有安装密钥环。"
-#: apt-pkg/cacheset.cc:342
+#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: apt-pkg/cacheset.cc:345
+#: apt-pkg/cacheset.cc:406
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: apt-pkg/cacheset.cc:452
+#: apt-pkg/cacheset.cc:517
#, c-format
msgid "Couldn't find task '%s'"
msgstr "无法找到任务 %s"
-#: apt-pkg/cacheset.cc:459
+#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "无法按照正则表达式 %s 找到任何软件包"
-#: apt-pkg/cacheset.cc:472
+#: apt-pkg/cacheset.cc:534
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "无法从完全虚拟的软件包 %s 中选择版本"
-#: apt-pkg/cacheset.cc:480 apt-pkg/cacheset.cc:488
+#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr "因为软件包 %s 没有已安装或候选的版本,无法进行选择"
-#: apt-pkg/cacheset.cc:496
+#: apt-pkg/cacheset.cc:555
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "因为软件包 %s 是完全的虚拟软件包,无法选择它的最新版"
-#: apt-pkg/cacheset.cc:504
+#: apt-pkg/cacheset.cc:563
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "因为软件包 %s 没有候选版本,无法进行选择"
-#: apt-pkg/cacheset.cc:512
+#: apt-pkg/cacheset.cc:571
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "因为软件包 %s 没有安装,无法选择它的已安装版本"
@@ -3083,149 +3108,149 @@ msgstr "因为软件包 %s 没有安装,无法选择它的已安装版本"
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:213
+#: apt-pkg/edsp.cc:209
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:281
+#: apt-pkg/edsp.cc:277
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:288
+#: apt-pkg/edsp.cc:284
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+#: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:70
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "正在安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:71 apt-pkg/deb/dpkgpm.cc:865
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "正在配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:872
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "正在删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:74
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "注意到 %s 已经消失"
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "执行安装后执行的触发器 %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:671
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "目录 %s 缺失"
-#: apt-pkg/deb/dpkgpm.cc:686 apt-pkg/deb/dpkgpm.cc:706
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "无法打开文件 %s"
-#: apt-pkg/deb/dpkgpm.cc:858
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "正在准备 %s"
-#: apt-pkg/deb/dpkgpm.cc:859
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "正在解压缩 %s"
-#: apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "正在准备配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:866
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "已安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:871
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在准备 %s 的删除操作"
-#: apt-pkg/deb/dpkgpm.cc:873
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "已删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在准备完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "完全删除了 %s"
-#: apt-pkg/deb/dpkgpm.cc:1110
+#: apt-pkg/deb/dpkgpm.cc:1208
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1140
+#: apt-pkg/deb/dpkgpm.cc:1238
msgid "Running dpkg"
msgstr "正在运行 dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1319
+#: apt-pkg/deb/dpkgpm.cc:1410
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1376
+#: apt-pkg/deb/dpkgpm.cc:1472
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:1381
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "dependency problems - leaving unconfigured"
msgstr "依赖问题 - 保持未配置"
-#: apt-pkg/deb/dpkgpm.cc:1383
+#: apt-pkg/deb/dpkgpm.cc:1479
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:1389
+#: apt-pkg/deb/dpkgpm.cc:1485
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1396
+#: apt-pkg/deb/dpkgpm.cc:1492
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1403 apt-pkg/deb/dpkgpm.cc:1409
+#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1430
+#: apt-pkg/deb/dpkgpm.cc:1526
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。"
@@ -3254,37 +3279,30 @@ msgstr "dpkg 被中断,您必须手工运行 %s 解决此问题。 "
msgid "Not locked"
msgstr "未锁定"
-#, c-format
#~ msgid "Read error from %s process"
#~ msgstr "从 %s 进程读取数据出错"
-#, c-format
#~ msgid "Couldn't open pipe for %s"
#~ msgstr "无法为 %s 开启管道"
-#, c-format
#~ msgid "Couldn't change to %s"
#~ msgstr "无法切换工作目录到 %s"
-#, c-format
#~ msgid "Bad ConfFile section in the status file. Offset %lu"
#~ msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu"
-#, c-format
#~ msgid "Failed to find a Package: header, offset %lu"
#~ msgstr "无法找到某个软件包:包头,于偏移位置 %lu"
#~ msgid "The pkg cache must be initialized first"
#~ msgstr "必须首先初始化软件包缓存"
-#, c-format
#~ msgid "Invalid line in the diversion file: %s"
#~ msgstr "转移配置文件中有一行是无效的:%s"
#~ msgid "Internal error getting a node"
#~ msgstr "获得一个节点时出现内部错误"
-#, c-format
#~ msgid "Failed reading the list file %sinfo/%s"
#~ msgstr "无法读取列表文件 %sinfo/%s"
@@ -3294,33 +3312,29 @@ msgstr "未锁定"
#~ msgid "Internal error getting a package name"
#~ msgstr "在获取软件包名字时出现内部错误"
-#, c-format
#~ msgid "Failed to change to the admin dir %sinfo"
#~ msgstr "无法切换工作目录到 admin 目录 %sinfo"
#~ msgid "The info and temp directories need to be on the same filesystem"
#~ msgstr "info 和 temp 目录要求处于同一文件系统之下"
-#, c-format
#~ msgid "Failed to stat %sinfo"
#~ msgstr "无法读取 %sinfo 的状态"
-#, c-format
#~ msgid "Unable to create %s"
#~ msgstr "无法创建 %s"
-#, c-format
#~ msgid "Package %s is not installed, so not removed\n"
#~ msgstr "软件包 %s 还未安装,因而不会被卸载\n"
-#, c-format
#~ msgid ""
#~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
#~ "then make it empty and immediately re-install the same version of the "
#~ "package!"
-#~ msgstr "无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件,那么就清空该文件并马上重新安装相同版本的这个软件包!"
+#~ msgstr ""
+#~ "无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件,那么就清空该文件并马"
+#~ "上重新安装相同版本的这个软件包!"
-#, c-format
#~ msgid "Failed to open the diversions file %sdiversions"
#~ msgstr "无法打开转移配置文件 %sdiversions"
@@ -3330,22 +3344,21 @@ msgstr "未锁定"
#~ msgid "Internal error adding a diversion"
#~ msgstr "添加转移配置时出现内部错误"
-#, c-format
#~ msgid "Error parsing MD5. Offset %lu"
#~ msgstr "解析 MD5 出错。文件内偏移量为 %lu"
#~ msgid "Failed to locate a valid control file"
#~ msgstr "无法在归档文件中找到有效的主控文件"
-#, c-format
#~ msgid "Got a single header line over %u chars"
#~ msgstr "接收到一行报头行,它的长度超过了 %u 个字符"
-#, 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)"
+#~ "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)"
#~ msgid "Note: This is done automatic and on purpose by dpkg."
#~ msgstr "注意:这是自动被 dpkg 有意完成的。"
@@ -3353,10 +3366,8 @@ msgstr "未锁定"
#~ msgid "Use 'apt-get autoremove' to remove them."
#~ msgstr "使用'apt-get autoremove'来卸载它们"
-#, c-format
#~ msgid "Failed to remove %s"
#~ msgstr "无法卸载 %s"
-#, c-format
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "跳过不存在的文件 %s"