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.po605
1 files changed, 330 insertions, 275 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bc15dddb6..72caa48cb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-28 17:23+0200\n"
+"POT-Creation-Date: 2011-02-15 06:09+0100\n"
"PO-Revision-Date: 2010-08-26 14:42+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -92,82 +92,81 @@ msgstr "Slack 空间共计:"
msgid "Total space accounted for: "
msgstr "总占用空间:"
-#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1142
#, c-format
msgid "Package file %s is out of sync."
msgstr "软件包文件 %s 尚未同步。"
-#: cmdline/apt-cache.cc:1273
-msgid "You must give at least one search pattern"
-msgstr "您必须明确地给出至少一个表达式"
-
-#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
-#: cmdline/apt-cache.cc:1508
+#: cmdline/apt-cache.cc:591 cmdline/apt-cache.cc:1377
+#: cmdline/apt-cache.cc:1379 cmdline/apt-cache.cc:1456
msgid "No packages found"
msgstr "没有发现匹配的软件包"
-#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1221
+msgid "You must give at least one search pattern"
+msgstr "您必须明确地给出至少一个表达式"
+
+#: cmdline/apt-cache.cc:1451 apt-pkg/cacheset.cc:440
#, c-format
msgid "Unable to locate package %s"
msgstr "未发现软件包 %s"
-#: cmdline/apt-cache.cc:1533
+#: cmdline/apt-cache.cc:1481
msgid "Package files:"
msgstr "软件包文件:"
-#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
+#: cmdline/apt-cache.cc:1488 cmdline/apt-cache.cc:1586
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "缓存尚未同步,无法交差引证(x-ref)一个软件包文件"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1502
msgid "Pinned packages:"
msgstr "被锁定的软件包:"
-#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1514 cmdline/apt-cache.cc:1566
msgid "(not found)"
msgstr "(没有找到)"
-#: cmdline/apt-cache.cc:1575
+#: cmdline/apt-cache.cc:1523
msgid " Installed: "
msgstr " 已安装:"
-#: cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1524
msgid " Candidate: "
msgstr " 候选软件包:"
-#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
+#: cmdline/apt-cache.cc:1548 cmdline/apt-cache.cc:1556
msgid "(none)"
msgstr "(无)"
-#: cmdline/apt-cache.cc:1615
+#: cmdline/apt-cache.cc:1563
msgid " Package pin: "
msgstr " 软件包锁:"
#. Show the priority tables
-#: cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1572
msgid " Version table:"
msgstr " 版本列表:"
-#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1686 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:2758 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:3047 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s,用于 %s 构架,编译于 %s %s\n"
-#: cmdline/apt-cache.cc:1745
+#: cmdline/apt-cache.cc:1693
+#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
-" apt-cache [options] add file1 [file2 ...]\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
"\n"
-"apt-cache is a low-level tool used to manipulate APT's binary\n"
-"cache files, and query information from them\n"
+"apt-cache is a low-level tool used to query information\n"
+"from APT's binary cache files\n"
"\n"
"Commands:\n"
-" add - Add a package file to the source cache\n"
" gencaches - Build both the package and source cache\n"
" showpkg - Show some general information for a single package\n"
" showsrc - Show source records\n"
@@ -310,7 +309,7 @@ msgstr ""
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1175
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
@@ -715,12 +714,12 @@ msgstr "下列软件包将被【降级】:"
msgid "The following held packages will be changed:"
msgstr "下列被要求保持版本不变的软件包将被改变:"
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:563
#, c-format
msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
-#: cmdline/apt-get.cc:569
+#: 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!"
@@ -728,64 +727,59 @@ msgstr ""
"【警告】:下列基础软件包将被卸载。\n"
"请勿尝试,除非您确实知道您在做什么!"
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:605
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "升级了 %lu 个软件包,新安装了 %lu 个软件包,"
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:609
#, c-format
msgid "%lu reinstalled, "
msgstr "重新安装了 %lu 个软件包,"
-#: cmdline/apt-get.cc:609
+#: cmdline/apt-get.cc:611
#, c-format
msgid "%lu downgraded, "
msgstr "降级了 %lu 个软件包,"
-#: cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:613
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "要卸载 %lu 个软件包,有 %lu 个软件包未被升级。\n"
-#: cmdline/apt-get.cc:615
+#: cmdline/apt-get.cc:617
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-#: cmdline/apt-get.cc:635
+#: cmdline/apt-get.cc:639
#, c-format
msgid "Note, selecting '%s' for task '%s'\n"
msgstr "注意,为任务 %2$s 选中了 %1$s\n"
-#: cmdline/apt-get.cc:641
+#: cmdline/apt-get.cc:645
#, c-format
msgid "Note, selecting '%s' for regex '%s'\n"
msgstr "注意,根据正则表达式 %2$s 选中了 %1$s\n"
-#: cmdline/apt-get.cc:648
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
-
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:662
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包:\n"
-#: cmdline/apt-get.cc:669
+#: cmdline/apt-get.cc:673
msgid " [Installed]"
msgstr " [已安装]"
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:682
msgid " [Not candidate version]"
msgstr " [无候选版本]"
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:684
msgid "You should explicitly select one to install."
msgstr "请您明确地选择一个来进行安装。"
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:687
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -796,167 +790,177 @@ msgstr ""
"这可能意味着这个缺失的软件包可能已被废弃,\n"
"或者只能在其他发布源中找到\n"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:705
msgid "However the following packages replace it:"
msgstr "可是下列软件包取代了它:"
-#: cmdline/apt-get.cc:713
+#: cmdline/apt-get.cc:717
#, c-format
msgid "Package '%s' has no installation candidate"
msgstr "软件包 %s 没有可供安装的候选者"
-#: cmdline/apt-get.cc:724
+#: cmdline/apt-get.cc:728
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
msgstr "类似 %s 的虚拟软件包可以卸载\n"
-#: cmdline/apt-get.cc:755
+#: cmdline/apt-get.cc:759
#, c-format
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "注意,选取 %s 而非 %s\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:789
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略了 %s,它已经被安装而且没有指定要升级。\n"
-#: cmdline/apt-get.cc:789
+#: cmdline/apt-get.cc:793
#, 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:803
#, 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:808
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2024
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:863
+#: cmdline/apt-get.cc:853
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
+
+#: cmdline/apt-get.cc:858
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
+
+#: cmdline/apt-get.cc:899
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "软件包 %s 还未安装,因而不会被卸载\n"
-#: cmdline/apt-get.cc:938
+#: cmdline/apt-get.cc:977
msgid "Correcting dependencies..."
msgstr "正在更正依赖关系..."
-#: cmdline/apt-get.cc:941
+#: cmdline/apt-get.cc:980
msgid " failed."
msgstr " 失败。"
-#: cmdline/apt-get.cc:944
+#: cmdline/apt-get.cc:983
msgid "Unable to correct dependencies"
msgstr "无法更正依赖关系"
-#: cmdline/apt-get.cc:947
+#: cmdline/apt-get.cc:986
msgid "Unable to minimize the upgrade set"
msgstr "无法最小化要升级的软件包集合"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:988
msgid " Done"
msgstr " 完成"
-#: cmdline/apt-get.cc:953
+#: cmdline/apt-get.cc:992
msgid "You might want to run 'apt-get -f install' to correct these."
msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
-#: cmdline/apt-get.cc:956
+#: cmdline/apt-get.cc:995
msgid "Unmet dependencies. Try using -f."
msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-#: cmdline/apt-get.cc:981
+#: cmdline/apt-get.cc:1020
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "【警告】:下列软件包不能通过验证!"
-#: cmdline/apt-get.cc:985
+#: cmdline/apt-get.cc:1024
msgid "Authentication warning overridden.\n"
msgstr "忽略了认证警告。\n"
-#: cmdline/apt-get.cc:992
+#: cmdline/apt-get.cc:1031
msgid "Install these packages without verification [y/N]? "
msgstr "不经验证就安装这些软件包吗?[y/N] "
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:1033
msgid "Some packages could not be authenticated"
msgstr "有些软件包不能通过验证"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1042 cmdline/apt-get.cc:1203
msgid "There are problems and -y was used without --force-yes"
msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes"
-#: cmdline/apt-get.cc:1044
+#: cmdline/apt-get.cc:1083
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上!"
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1092
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止。"
-#: cmdline/apt-get.cc:1064
+#: cmdline/apt-get.cc:1103
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误,Ordering 未能完成"
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1141
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:1111
+#: cmdline/apt-get.cc:1148
#, 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:1116
+#: cmdline/apt-get.cc:1153
#, 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:1123
+#: cmdline/apt-get.cc:1160
#, 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:1128
+#: cmdline/apt-get.cc:1165
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:1143 cmdline/apt-get.cc:1146 cmdline/apt-get.cc:2332
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:1180 cmdline/apt-get.cc:1183 cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2431
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的可用空间"
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1193
#, c-format
msgid "You don't have enough free space in %s."
msgstr "您在 %s 上没有足够的可用空间。"
-#: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1192
+#: cmdline/apt-get.cc:1209 cmdline/apt-get.cc:1229
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "虽然您指定了仅执行常规操作,但这不是个常规操作。"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1211
msgid "Yes, do as I say!"
msgstr "是,按我说的做!"
-#: cmdline/apt-get.cc:1176
+#: cmdline/apt-get.cc:1213
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -967,28 +971,28 @@ msgstr ""
"若还想继续的话,就输入下面的短句“%s”\n"
" ?] "
-#: cmdline/apt-get.cc:1182 cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1219 cmdline/apt-get.cc:1238
msgid "Abort."
msgstr "中止执行。"
-#: cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1234
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗?[Y/n]"
-#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:2392 apt-pkg/algorithms.cc:1462
+#: cmdline/apt-get.cc:1306 cmdline/apt-get.cc:2488 apt-pkg/algorithms.cc:1491
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: cmdline/apt-get.cc:1287
+#: cmdline/apt-get.cc:1324
msgid "Some files failed to download"
msgstr "有一些文件无法下载"
-#: cmdline/apt-get.cc:1288 cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:2497
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
-#: cmdline/apt-get.cc:1294
+#: cmdline/apt-get.cc:1331
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -996,19 +1000,19 @@ msgstr ""
"有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项"
"再试试?"
-#: cmdline/apt-get.cc:1298
+#: cmdline/apt-get.cc:1335
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换"
-#: cmdline/apt-get.cc:1303
+#: cmdline/apt-get.cc:1340
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: cmdline/apt-get.cc:1304
+#: cmdline/apt-get.cc:1341
msgid "Aborting install."
msgstr "中止安装。"
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1369
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1017,54 +1021,35 @@ msgid_plural ""
"all files have been overwritten by other packages:"
msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失:"
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1373
msgid "Note: This is done automatic and on purpose by dpkg."
msgstr "注意:这是自动被 dpkg 有意完成的。"
-#: cmdline/apt-get.cc:1466
+#: cmdline/apt-get.cc:1503
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s"
-#: cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1535
#, 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:1536
+#: cmdline/apt-get.cc:1573
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
-#: cmdline/apt-get.cc:1552
+#: cmdline/apt-get.cc:1589
msgid "The update command takes no arguments"
msgstr " update 命令不需要参数"
-#: cmdline/apt-get.cc:1618
+#: cmdline/apt-get.cc:1651
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我们不应该进行删除,无法启动自动删除器"
-#: cmdline/apt-get.cc:1666
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "下列软件包是自动安装的并且现在不需要了:"
-
-#: cmdline/apt-get.cc:1670
-#, c-format
-msgid "%lu package was automatically installed and is no longer required.\n"
-msgid_plural ""
-"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
-
-#: cmdline/apt-get.cc:1672
-msgid "Use 'apt-get autoremove' to remove them."
-msgstr "使用'apt-get autoremove'来卸载它们"
-
-#: cmdline/apt-get.cc:1677
+#: cmdline/apt-get.cc:1703
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1080,23 +1065,42 @@ msgstr "似乎自动卸载工具损坏了一些软件,这不应该发生。请
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1680 cmdline/apt-get.cc:1822
+#: cmdline/apt-get.cc:1706 cmdline/apt-get.cc:1855
msgid "The following information may help to resolve the situation:"
msgstr "下列信息可能会对解决问题有所帮助:"
-#: cmdline/apt-get.cc:1684
+#: cmdline/apt-get.cc:1710
msgid "Internal Error, AutoRemover broke stuff"
msgstr "内部错误,自动卸载工具坏事了"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1717
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "下列软件包是自动安装的并且现在不需要了:"
+
+#: cmdline/apt-get.cc:1721
+#, c-format
+msgid "%lu package was automatically installed and is no longer required.\n"
+msgid_plural ""
+"%lu packages were automatically installed and are no longer required.\n"
+msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
+
+#: cmdline/apt-get.cc:1723
+msgid "Use 'apt-get autoremove' to remove them."
+msgstr "使用'apt-get autoremove'来卸载它们"
+
+#: cmdline/apt-get.cc:1742
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部错误,全部升级工具坏事了"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1825
msgid "You might want to run 'apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误:"
-#: cmdline/apt-get.cc:1795
+#: cmdline/apt-get.cc:1828
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1104,7 +1108,7 @@ msgstr ""
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1840
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"
@@ -1115,62 +1119,67 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
-#: cmdline/apt-get.cc:1825
+#: cmdline/apt-get.cc:1858
msgid "Broken packages"
msgstr "破损的软件包"
-#: cmdline/apt-get.cc:1854
+#: cmdline/apt-get.cc:1886
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包:"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1976
msgid "Suggested packages:"
msgstr "建议安装的软件包:"
-#: cmdline/apt-get.cc:1945
+#: cmdline/apt-get.cc:1977
msgid "Recommended packages:"
msgstr "推荐安装的软件包:"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2019
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1994
+#: cmdline/apt-get.cc:2026
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2047
msgid "Calculating upgrade... "
msgstr "正在对升级进行计算... "
-#: cmdline/apt-get.cc:2018 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2050 methods/ftp.cc:707 methods/connect.cc:111
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:2023
+#: cmdline/apt-get.cc:2055
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2098
+#: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2130
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误,问题解决工具坏事了"
-#: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2154 cmdline/apt-get.cc:2187
msgid "Unable to lock the download directory"
msgstr "无法锁定下载目录"
-#: cmdline/apt-get.cc:2198
+#: cmdline/apt-get.cc:2238
+#, c-format
+msgid "Downloading %s %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:2294
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码,必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:2238 cmdline/apt-get.cc:2519
+#: cmdline/apt-get.cc:2334 cmdline/apt-get.cc:2615
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2350
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1179,7 +1188,7 @@ msgstr ""
"提示:%s 的打包工作被维护于以下位置的 %s 版本控制系统中:\n"
"%s\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2355
#, c-format
msgid ""
"Please use:\n"
@@ -1190,85 +1199,85 @@ msgstr ""
"bzr get %s\n"
"获得该软件包的最近更新(可能尚未正式发布)。\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2406
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:2345
+#: cmdline/apt-get.cc:2441
#, 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:2353
+#: cmdline/apt-get.cc:2449
#, 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:2358
+#: cmdline/apt-get.cc:2454
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2364
+#: cmdline/apt-get.cc:2460
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:2397
+#: cmdline/apt-get.cc:2493
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2523
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "忽略已经被解包到 %s 目录的源代码包\n"
-#: cmdline/apt-get.cc:2439
+#: cmdline/apt-get.cc:2535
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2440
+#: cmdline/apt-get.cc:2536
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:2457
+#: cmdline/apt-get.cc:2553
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2477
+#: cmdline/apt-get.cc:2573
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2493
+#: cmdline/apt-get.cc:2589
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系,必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2524
+#: cmdline/apt-get.cc:2620
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系信息"
-#: cmdline/apt-get.cc:2544
+#: cmdline/apt-get.cc:2640
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2595
+#: cmdline/apt-get.cc:2691
#, 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:2648
+#: cmdline/apt-get.cc:2744
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1277,30 +1286,36 @@ msgstr ""
"由于无法找到符合要求的软件包 %3$s 的可用版本,因此不能满足 %2$s 所要求的 "
"%1$s 依赖关系"
-#: cmdline/apt-get.cc:2684
+#: cmdline/apt-get.cc:2780
#, 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:2711
+#: cmdline/apt-get.cc:2807
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2823
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:2732
+#: cmdline/apt-get.cc:2828
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:2763
+#: cmdline/apt-get.cc:2921 cmdline/apt-get.cc:2933
+#, fuzzy, c-format
+msgid "Changelog for %s (%s)"
+msgstr "正在连接 %s (%s)"
+
+#: cmdline/apt-get.cc:3052
msgid "Supported modules:"
msgstr "支持的模块:"
-#: cmdline/apt-get.cc:2804
+#: cmdline/apt-get.cc:3093
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1326,6 +1341,8 @@ msgid ""
" check - Verify that there are no broken dependencies\n"
" markauto - Mark the given packages as automatically installed\n"
" unmarkauto - Mark the given packages as manually installed\n"
+" changelog - Download and display the changelog for the given package\n"
+" download - Download the binary package into the current directory\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -1387,7 +1404,7 @@ msgstr ""
"以获取更多信息和选项。\n"
" 本 APT 具有超级牛力。\n"
-#: cmdline/apt-get.cc:2960
+#: cmdline/apt-get.cc:3254
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1398,33 +1415,33 @@ msgstr ""
"   apt-get 需要 root 特权进行实际的执行。\n"
"   同时请记住此时并未锁定,所以请勿完全相信当前的情况!"
-#: cmdline/acqprogress.cc:55
+#: cmdline/acqprogress.cc:57
msgid "Hit "
msgstr "命中 "
-#: cmdline/acqprogress.cc:79
+#: cmdline/acqprogress.cc:81
msgid "Get:"
msgstr "获取:"
-#: cmdline/acqprogress.cc:110
+#: cmdline/acqprogress.cc:112
msgid "Ign "
msgstr "忽略 "
-#: cmdline/acqprogress.cc:114
+#: cmdline/acqprogress.cc:116
msgid "Err "
msgstr "错误 "
-#: cmdline/acqprogress.cc:135
+#: cmdline/acqprogress.cc:137
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
msgstr "下载 %sB,耗时 %s (%sB/s)\n"
-#: cmdline/acqprogress.cc:225
+#: cmdline/acqprogress.cc:227
#, c-format
msgid " [Working]"
msgstr " [执行中]"
-#: cmdline/acqprogress.cc:271
+#: cmdline/acqprogress.cc:283
#, c-format
msgid ""
"Media change: please insert the disc labeled\n"
@@ -1505,7 +1522,7 @@ msgstr "无法创建管道"
msgid "Failed to exec gzip "
msgstr "无法执行 gzip"
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
msgid "Corrupted archive"
msgstr "包文件已被损坏"
@@ -1513,7 +1530,7 @@ msgstr "包文件已被损坏"
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar 的校验和不符,文件已损坏"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:300
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "未知的 TAR 数据头类型 %u,成员 %s"
@@ -1621,28 +1638,28 @@ msgstr "无法在其散列桶中分配节点"
msgid "The path is too long"
msgstr "路径名太长"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:412
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "用来覆盖的软件包不属于 %s 的任何版本"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:429
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
#. 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/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:311 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
+#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:334 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:309
#: methods/mirror.cc:87
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:489
#, c-format
msgid "Unable to stat %s"
msgstr "无法读取 %s 的状态"
@@ -1666,9 +1683,9 @@ msgstr "无法读取 %sinfo 的状态"
msgid "The info and temp directories need to be on the same filesystem"
msgstr "info 和 temp 目录要求处于同一文件系统之下"
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
-#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
-#: apt-pkg/pkgcachegen.cc:1326
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1074
+#: apt-pkg/pkgcachegen.cc:1178 apt-pkg/pkgcachegen.cc:1184
+#: apt-pkg/pkgcachegen.cc:1330
msgid "Reading package lists"
msgstr "正在读取软件包列表"
@@ -1770,24 +1787,28 @@ msgstr "无法在归档文件中找到有效的主控文件"
msgid "Unparsable control file"
msgstr "不能解析的主控文件"
-#: methods/bzip2.cc:65
+#: methods/bzip2.cc:60 methods/gzip.cc:52
+msgid "Empty files can't be valid archives"
+msgstr ""
+
+#: methods/bzip2.cc:64
#, c-format
msgid "Couldn't open pipe for %s"
msgstr "无法为 %s 开启管道"
-#: methods/bzip2.cc:109
+#: methods/bzip2.cc:108
#, c-format
msgid "Read error from %s process"
msgstr "从 %s 进程读取数据出错"
-#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43
-#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486
-#: methods/rred.cc:495
+#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
+#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
+#: methods/rred.cc:533
msgid "Failed to stat"
msgstr "无法读取状态"
-#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99
-#: methods/rred.cc:492
+#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
+#: methods/rred.cc:530
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -1878,7 +1899,7 @@ msgstr "连接超时"
msgid "Server closed the connection"
msgstr "服务器关闭了连接"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:784 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:811 methods/rsh.cc:190
msgid "Read error"
msgstr "读错误"
@@ -1890,7 +1911,7 @@ msgstr "回应超出了缓存区大小。"
msgid "Protocol corruption"
msgstr "协议有误"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:826 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:853 methods/rsh.cc:232
msgid "Write error"
msgstr "写出错"
@@ -2122,7 +2143,7 @@ msgstr "从服务器读取数据时出错,对方关闭了连接"
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:283
msgid "Failed to truncate file"
msgstr "无法截断文件"
@@ -2160,7 +2181,7 @@ msgstr "无法关闭 mmap"
msgid "Unable to synchronize mmap"
msgstr "无法同步 mmap "
-#: apt-pkg/contrib/mmap.cc:300
+#: apt-pkg/contrib/mmap.cc:302
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2169,14 +2190,14 @@ msgstr ""
"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值:%lu。(man 5 "
"apt.conf)"
-#: apt-pkg/contrib/mmap.cc:399
+#: apt-pkg/contrib/mmap.cc:401
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr "无法增加 MMap 的大小,因为已经达到 %lu 字节的限制。"
-#: apt-pkg/contrib/mmap.cc:402
+#: apt-pkg/contrib/mmap.cc:404
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr "无法增加 MMap 大小,因为用户已禁用自动增加。"
@@ -2205,7 +2226,7 @@ msgstr "%li分 %li秒"
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1119
+#: apt-pkg/contrib/strutl.cc:1136
#, c-format
msgid "Selection %s not found"
msgstr "找不到您选则的 %s"
@@ -2337,92 +2358,113 @@ msgstr "无法切换工作目录到 %s"
msgid "Failed to stat the cdrom"
msgstr "无法读取盘片的状态"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:159
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "由于文件系统为只读,因而无法使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:159
+#: apt-pkg/contrib/fileutl.cc:164
#, c-format
msgid "Could not open lock file %s"
msgstr "无法打开锁文件 %s"
-#: apt-pkg/contrib/fileutl.cc:177
+#: apt-pkg/contrib/fileutl.cc:182
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "无法在 nfs 文件系统上使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:181
+#: apt-pkg/contrib/fileutl.cc:186
#, c-format
msgid "Could not get lock %s"
msgstr "无法获得锁 %s"
-#: apt-pkg/contrib/fileutl.cc:643
+#: apt-pkg/contrib/fileutl.cc:326
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:353
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:371
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:380
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:670
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出,但是它并不存在"
-#: apt-pkg/contrib/fileutl.cc:655
+#: apt-pkg/contrib/fileutl.cc:682
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子进程 %s 发生了段错误"
-#: apt-pkg/contrib/fileutl.cc:657
+#: apt-pkg/contrib/fileutl.cc:684
#, c-format
msgid "Sub-process %s received signal %u."
msgstr "子进程 %s 收到信号 %u。"
-#: apt-pkg/contrib/fileutl.cc:661
+#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:663
+#: apt-pkg/contrib/fileutl.cc:690
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出"
-#: apt-pkg/contrib/fileutl.cc:728
+#: apt-pkg/contrib/fileutl.cc:755
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: apt-pkg/contrib/fileutl.cc:745
+#: apt-pkg/contrib/fileutl.cc:772
#, c-format
msgid "Could not open file descriptor %d"
msgstr "无法打开文件描述符 %d"
-#: apt-pkg/contrib/fileutl.cc:805
+#: apt-pkg/contrib/fileutl.cc:832
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "读取文件出错,还剩 %lu 字节没有读出"
-#: apt-pkg/contrib/fileutl.cc:838
+#: apt-pkg/contrib/fileutl.cc:865
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "写入文件出错,还剩 %lu 字节没有保存"
-#: apt-pkg/contrib/fileutl.cc:937
+#: apt-pkg/contrib/fileutl.cc:1001
#, c-format
msgid "Problem closing the gzip file %s"
msgstr "关闭 gzip %s 文件出错"
-#: apt-pkg/contrib/fileutl.cc:940
+#: apt-pkg/contrib/fileutl.cc:1004
#, c-format
msgid "Problem closing the file %s"
msgstr "关闭文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:945
+#: apt-pkg/contrib/fileutl.cc:1009
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "重命名文件 %s 为 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:956
+#: apt-pkg/contrib/fileutl.cc:1020
#, c-format
msgid "Problem unlinking the file %s"
msgstr "用 unlink 删除文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:969
+#: apt-pkg/contrib/fileutl.cc:1033
msgid "Problem syncing the file"
msgstr "同步文件出错"
@@ -2503,33 +2545,33 @@ msgstr "可选"
msgid "extra"
msgstr "额外"
-#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153
+#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
msgid "Building dependency tree"
msgstr "正在分析软件包的依赖关系树"
-#: apt-pkg/depcache.cc:125
+#: apt-pkg/depcache.cc:126
msgid "Candidate versions"
msgstr "候选版本"
-#: apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:155
msgid "Dependency generation"
msgstr "生成依赖关系"
-#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211
+#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
msgid "Reading state information"
msgstr "正在读取状态信息"
-#: apt-pkg/depcache.cc:236
+#: apt-pkg/depcache.cc:237
#, c-format
msgid "Failed to open StateFile %s"
msgstr "无法打开状态文件 %s"
-#: apt-pkg/depcache.cc:242
+#: apt-pkg/depcache.cc:243
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "无法写入临时状态文件 %s"
-#: apt-pkg/depcache.cc:921
+#: apt-pkg/depcache.cc:922
#, c-format
msgid "Internal error, group '%s' has no installable pseudo package"
msgstr "内部错误,组 %s 没有可安装的 pseudo 软件包"
@@ -2648,13 +2690,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "不支持索引文件类型“%s”"
-#: apt-pkg/algorithms.cc:292
+#: apt-pkg/algorithms.cc:313
#, 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:1210
+#: apt-pkg/algorithms.cc:1239
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2662,15 +2704,16 @@ msgstr ""
"错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的"
"缘故。"
-#: apt-pkg/algorithms.cc:1212
+#: apt-pkg/algorithms.cc:1241
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关"
"系。"
-#: apt-pkg/algorithms.cc:1488 apt-pkg/algorithms.cc:1490
+#: apt-pkg/algorithms.cc:1517 apt-pkg/algorithms.cc:1519
+#, fuzzy
msgid ""
-"Some index files failed to download, they have been ignored, or old ones "
+"Some index files failed to download. They have been ignored, or old ones "
"used instead."
msgstr ""
"有一些索引文件不能下载,它们可能被忽略了,也可能转而使用了旧的索引文件。"
@@ -2717,12 +2760,12 @@ msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:143
+#: apt-pkg/init.cc:146
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:159
+#: apt-pkg/init.cc:162
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
@@ -2747,17 +2790,17 @@ msgstr "您可能需要运行 apt-get update 来解决这些问题"
msgid "The list of sources could not be read."
msgstr "无法读取源列表。"
-#: apt-pkg/policy.cc:344
+#: apt-pkg/policy.cc:346
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "首选项文件 %s 中发现有无效的记录,无 Package 字段头"
-#: apt-pkg/policy.cc:366
+#: apt-pkg/policy.cc:368
#, c-format
msgid "Did not understand pin type %s"
msgstr "无法识别锁定的类型 %s"
-#: apt-pkg/policy.cc:374
+#: apt-pkg/policy.cc:376
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
@@ -2837,16 +2880,16 @@ msgstr "处理 %s (CollectFileProvides)时出错"
msgid "Package %s %s was not found while processing file dependencies"
msgstr "当处理文件依赖关系时,无法找到软件包 %s %s"
-#: apt-pkg/pkgcachegen.cc:982
+#: apt-pkg/pkgcachegen.cc:986
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
-#: apt-pkg/pkgcachegen.cc:1087
+#: apt-pkg/pkgcachegen.cc:1091
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
+#: apt-pkg/pkgcachegen.cc:1269 apt-pkg/pkgcachegen.cc:1276
msgid "IO Error saving source cache"
msgstr "无法读取或写入软件源缓存"
@@ -2855,33 +2898,45 @@ msgstr "无法读取或写入软件源缓存"
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:484
+#: apt-pkg/acquire-item.cc:629
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574
-#: apt-pkg/acquire-item.cc:1717
+#: apt-pkg/acquire-item.cc:887 apt-pkg/acquire-item.cc:1781
+#: apt-pkg/acquire-item.cc:1924
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
-#: apt-pkg/acquire-item.cc:1244
+#: apt-pkg/acquire-item.cc:1341
+#, 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:1356
+#, fuzzy, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "无法解析软件包仓库 Release 文件 %s"
+
+#: apt-pkg/acquire-item.cc:1415
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 ID 的密钥没有可用的公钥:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formated in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1281
+#: apt-pkg/acquire-item.cc:1452
#, c-format
msgid "Release file expired, ignoring %s (invalid since %s)"
msgstr "Release 文件已过期,忽略 %s (从 %s 起无效)"
-#: apt-pkg/acquire-item.cc:1302
+#: apt-pkg/acquire-item.cc:1473
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "冲突的发行版:%s (期望 %s 但得到 %s)"
-#: apt-pkg/acquire-item.cc:1328
+#: apt-pkg/acquire-item.cc:1506
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -2889,12 +2944,12 @@ msgid ""
msgstr ""
"校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n"
-#: apt-pkg/acquire-item.cc:1337
+#: apt-pkg/acquire-item.cc:1515
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 错误:%s: %s"
-#: apt-pkg/acquire-item.cc:1365
+#: apt-pkg/acquire-item.cc:1572
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2903,7 +2958,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1424
+#: apt-pkg/acquire-item.cc:1631
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2911,13 +2966,13 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:1479
+#: apt-pkg/acquire-item.cc:1686
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:1566
+#: apt-pkg/acquire-item.cc:1773
msgid "Size mismatch"
msgstr "大小不符"
@@ -2926,22 +2981,22 @@ msgstr "大小不符"
msgid "Unable to parse Release file %s"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/indexrecords.cc:60
+#: apt-pkg/indexrecords.cc:63
#, c-format
msgid "No sections in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-#: apt-pkg/indexrecords.cc:94
+#: apt-pkg/indexrecords.cc:97
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-#: apt-pkg/indexrecords.cc:107
+#: apt-pkg/indexrecords.cc:110
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
-#: apt-pkg/indexrecords.cc:122
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
@@ -3042,22 +3097,22 @@ msgstr "正在写入新的源列表\n"
msgid "Source list entries for this disc are:\n"
msgstr "对应于该盘片的软件源设置项是:\n"
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909
#, c-format
msgid "Wrote %i records.\n"
msgstr "已写入 %i 条记录。\n"
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910
+#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "已写入 %i 条记录,并有 %i 个文件缺失。\n"
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913
+#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个文件不匹配\n"
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916
+#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个缺失,以及 %i 个文件不匹配\n"
@@ -3099,7 +3154,7 @@ msgstr "无法按照正则表达式 %s 找到任何软件包"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "无法从完全虚拟的软件包 %s 中选择版本"
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
@@ -3129,12 +3184,12 @@ msgstr "因为软件包 %s 没有安装,无法选择它的已安装版本"
msgid "Installing %s"
msgstr "正在安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:822
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
#, c-format
msgid "Configuring %s"
msgstr "正在配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:829
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
#, c-format
msgid "Removing %s"
msgstr "正在删除 %s"
@@ -3155,92 +3210,92 @@ msgid "Running post-installation trigger %s"
msgstr "执行安装后执行的触发器 %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:646
+#: apt-pkg/deb/dpkgpm.cc:642
#, c-format
msgid "Directory '%s' missing"
msgstr "目录 %s 缺失"
-#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:657 apt-pkg/deb/dpkgpm.cc:671
#, c-format
msgid "Could not open file '%s'"
msgstr "无法打开文件 %s"
-#: apt-pkg/deb/dpkgpm.cc:815
+#: apt-pkg/deb/dpkgpm.cc:812
#, c-format
msgid "Preparing %s"
msgstr "正在准备 %s"
-#: apt-pkg/deb/dpkgpm.cc:816
+#: apt-pkg/deb/dpkgpm.cc:813
#, c-format
msgid "Unpacking %s"
msgstr "正在解压缩 %s"
-#: apt-pkg/deb/dpkgpm.cc:821
+#: apt-pkg/deb/dpkgpm.cc:818
#, c-format
msgid "Preparing to configure %s"
msgstr "正在准备配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:823
+#: apt-pkg/deb/dpkgpm.cc:820
#, c-format
msgid "Installed %s"
msgstr "已安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:828
+#: apt-pkg/deb/dpkgpm.cc:825
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在准备 %s 的删除操作"
-#: apt-pkg/deb/dpkgpm.cc:830
+#: apt-pkg/deb/dpkgpm.cc:827
#, c-format
msgid "Removed %s"
msgstr "已删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:835
+#: apt-pkg/deb/dpkgpm.cc:832
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在准备完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:836
+#: apt-pkg/deb/dpkgpm.cc:833
#, c-format
msgid "Completely removed %s"
msgstr "完全删除了 %s"
-#: apt-pkg/deb/dpkgpm.cc:1042
+#: apt-pkg/deb/dpkgpm.cc:1039
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1073
+#: apt-pkg/deb/dpkgpm.cc:1070
msgid "Running dpkg"
msgstr "正在运行 dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1276
+#: apt-pkg/deb/dpkgpm.cc:1273
msgid "No apport report written because MaxReports is reached already"
msgstr "由于已经达到 MaxReports 限制,没有写入 apport 报告。"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1281
+#: apt-pkg/deb/dpkgpm.cc:1278
msgid "dependency problems - leaving unconfigured"
msgstr "依赖问题 - 保持未配置"
-#: apt-pkg/deb/dpkgpm.cc:1283
+#: apt-pkg/deb/dpkgpm.cc:1280
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr "因为错误消息指示这是由于上一个问题导致的错误,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1289
+#: apt-pkg/deb/dpkgpm.cc:1286
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1295
+#: apt-pkg/deb/dpkgpm.cc:1292
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1302
+#: apt-pkg/deb/dpkgpm.cc:1299
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。"
@@ -3281,14 +3336,14 @@ msgstr "没有找到镜像文件 %s"
msgid "[Mirror: %s]"
msgstr "[镜像:%s]"
-#: methods/rred.cc:465
+#: methods/rred.cc:503
#, 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:470
+#: methods/rred.cc:508
#, c-format
msgid ""
"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "