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.po429
1 files changed, 236 insertions, 193 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c76a4abd9..06ea0e977 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.23\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-09 23:46+0200\n"
+"POT-Creation-Date: 2006-08-15 15:55+0200\n"
"PO-Revision-Date: 2006-02-22 14:20+1300\n"
"Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -15,145 +15,155 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:135
+#: cmdline/apt-cache.cc:141
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系:\n"
-#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
-#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
-#: cmdline/apt-cache.cc:1508
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
+#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
+#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
#, c-format
msgid "Unable to locate package %s"
msgstr "未发现软件包 %s"
-#: cmdline/apt-cache.cc:232
+#: cmdline/apt-cache.cc:245
msgid "Total package names : "
msgstr "软件包总数(按名称计):"
-#: cmdline/apt-cache.cc:272
+#: cmdline/apt-cache.cc:285
msgid " Normal packages: "
msgstr " 普通软件包:"
-#: cmdline/apt-cache.cc:273
+#: cmdline/apt-cache.cc:286
msgid " Pure virtual packages: "
msgstr " 完全虚拟软件包:"
-#: cmdline/apt-cache.cc:274
+#: cmdline/apt-cache.cc:287
msgid " Single virtual packages: "
msgstr " 单虚拟软件包:"
-#: cmdline/apt-cache.cc:275
+#: cmdline/apt-cache.cc:288
msgid " Mixed virtual packages: "
msgstr " 混合虚拟软件包:"
-#: cmdline/apt-cache.cc:276
+#: cmdline/apt-cache.cc:289
msgid " Missing: "
msgstr " 缺漏的:"
-#: cmdline/apt-cache.cc:278
+#: cmdline/apt-cache.cc:291
msgid "Total distinct versions: "
msgstr "按版本共计:"
-#: cmdline/apt-cache.cc:280
+#: cmdline/apt-cache.cc:293
+#, fuzzy
+msgid "Total Distinct Descriptions: "
+msgstr "按版本共计:"
+
+#: cmdline/apt-cache.cc:295
msgid "Total dependencies: "
msgstr "按依赖关系共计:"
-#: cmdline/apt-cache.cc:283
+#: cmdline/apt-cache.cc:298
msgid "Total ver/file relations: "
msgstr "按版本/文件关系共计:"
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:300
+#, fuzzy
+msgid "Total Desc/File relations: "
+msgstr "按版本/文件关系共计:"
+
+#: cmdline/apt-cache.cc:302
msgid "Total Provides mappings: "
msgstr "提供映射共计:"
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:314
msgid "Total globbed strings: "
msgstr "Glob 字串共计:"
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:328
msgid "Total dependency version space: "
msgstr "依赖关系版本名所占空间共计:"
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:333
msgid "Total slack space: "
msgstr "Slack 空间共计:"
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:341
msgid "Total space accounted for: "
msgstr "总占用空间:"
-#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
#, c-format
msgid "Package file %s is out of sync."
msgstr "软件包文件 %s 尚未同步(sync)。"
-#: cmdline/apt-cache.cc:1231
+#: cmdline/apt-cache.cc:1287
msgid "You must give exactly one pattern"
msgstr "您必须明确地给出一个表达式"
-#: cmdline/apt-cache.cc:1385
+#: cmdline/apt-cache.cc:1441
msgid "No packages found"
msgstr "没有发现吻合的软件包"
-#: cmdline/apt-cache.cc:1462
+#: cmdline/apt-cache.cc:1518
msgid "Package files:"
msgstr "软件包文件:"
-#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
+#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "缓存尚未同步(sync),无法交差引证(x-ref)一个软件包文件"
-#: cmdline/apt-cache.cc:1470
+#: cmdline/apt-cache.cc:1526
#, c-format
msgid "%4i %s\n"
msgstr "%4i %s\n"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1482
+#: cmdline/apt-cache.cc:1538
msgid "Pinned packages:"
msgstr "被锁定(pinned)的软件包:"
-#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
+#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
msgid "(not found)"
msgstr "(没有找到)"
#. Installed version
-#: cmdline/apt-cache.cc:1515
+#: cmdline/apt-cache.cc:1571
msgid " Installed: "
msgstr " 已安装:"
-#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
+#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
msgid "(none)"
msgstr "(无)"
#. Candidate Version
-#: cmdline/apt-cache.cc:1522
+#: cmdline/apt-cache.cc:1578
msgid " Candidate: "
msgstr " 候选的软件包:"
-#: cmdline/apt-cache.cc:1532
+#: cmdline/apt-cache.cc:1588
msgid " Package pin: "
msgstr " 软件包锁(Pin):"
#. Show the priority tables
-#: cmdline/apt-cache.cc:1541
+#: cmdline/apt-cache.cc:1597
msgid " Version table:"
msgstr " 版本列表:"
-#: cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1612
#, c-format
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s ,编译于 %s %s\n"
-#: cmdline/apt-cache.cc:1659
+#: cmdline/apt-cache.cc:1715
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -300,7 +310,7 @@ msgstr ""
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
@@ -742,118 +752,118 @@ msgstr "要卸载 %lu 个软件包,有 %lu 个软件未被升级。\n"
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:664
msgid "Correcting dependencies..."
msgstr "正在更正依赖关系..."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:667
msgid " failed."
msgstr " 失败。"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:670
msgid "Unable to correct dependencies"
msgstr "无法更正依赖关系"
-#: cmdline/apt-get.cc:659
+#: cmdline/apt-get.cc:673
msgid "Unable to minimize the upgrade set"
msgstr "无法最小化要升级的软件包集合"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:675
msgid " Done"
msgstr " 完成"
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:679
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:682
msgid "Unmet dependencies. Try using -f."
msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-#: cmdline/apt-get.cc:690
+#: cmdline/apt-get.cc:704
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "【警告】:下列的软件包不能通过验证!"
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:708
msgid "Authentication warning overridden.\n"
msgstr "忽略了认证警告。\n"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:715
msgid "Install these packages without verification [y/N]? "
msgstr "不经验证就安装这些软件包么?[y/N] "
-#: cmdline/apt-get.cc:703
+#: cmdline/apt-get.cc:717
msgid "Some packages could not be authenticated"
msgstr "有些软件包不能通过验证"
-#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
msgid "There are problems and -y was used without --force-yes"
msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes"
-#: cmdline/apt-get.cc:756
+#: cmdline/apt-get.cc:770
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上!"
-#: cmdline/apt-get.cc:765
+#: cmdline/apt-get.cc:779
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止。"
-#: cmdline/apt-get.cc:776
+#: cmdline/apt-get.cc:790
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误,Ordering 没有完成"
-#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
msgid "Unable to lock the download directory"
msgstr "无法对下载目录加锁"
-#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "无法读取安装源列表。"
-#: cmdline/apt-get.cc:817
+#: cmdline/apt-get.cc:831
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "怪了……文件大小不符,发信给 apt@packages.debian.org 吧"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需要下载 %sB/%sB 的软件包。\n"
-#: cmdline/apt-get.cc:825
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需要下载 %sB 的软件包。\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:844
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:847
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的空余空间"
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:864
#, c-format
msgid "You don't have enough free space in %s."
msgstr "您在 %s 中没有足够的空余空间。"
-#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
+#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "虽然您指定了 Trivial Only,但这不是个日常(trivial)操作。"
-#: cmdline/apt-get.cc:867
+#: cmdline/apt-get.cc:881
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:869
+#: cmdline/apt-get.cc:883
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -864,28 +874,28 @@ msgstr ""
"若还想继续的话,就输入下面的短句“%s”\n"
" ?] "
-#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
msgid "Abort."
msgstr "中止执行。"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:904
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗?[Y/n]"
-#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
msgid "Some files failed to download"
msgstr "有一些文件下载失败"
-#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:1001
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -893,47 +903,47 @@ msgstr ""
"有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项"
"再试试?"
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:1005
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)"
-#: cmdline/apt-get.cc:996
+#: cmdline/apt-get.cc:1010
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: cmdline/apt-get.cc:997
+#: cmdline/apt-get.cc:1011
msgid "Aborting install."
msgstr "放弃安装。"
-#: cmdline/apt-get.cc:1031
+#: cmdline/apt-get.cc:1045
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "注意,我选了 %s 而非 %s\n"
-#: cmdline/apt-get.cc:1041
+#: cmdline/apt-get.cc:1055
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略了 %s,它已经被安装而且没有指定要升级。\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1073
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "软件包 %s 还未安装,因而不会被卸载\n"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1084
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包:\n"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1096
msgid " [Installed]"
msgstr " [已安装]"
-#: cmdline/apt-get.cc:1087
+#: cmdline/apt-get.cc:1101
msgid "You should explicitly select one to install."
msgstr "请您明确地选择一个来进行安装。"
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1106
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -944,75 +954,75 @@ msgstr ""
"这可能意味着这个缺失的软件包可能已被废弃,\n"
"或者只能在其他发布源中找到\n"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1125
msgid "However the following packages replace it:"
msgstr "可是下列的软件包取代了它:"
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1128
#, c-format
msgid "Package %s has no installation candidate"
msgstr "软件包 %s 还没有可供安装的候选者"
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1148
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "不能重新安装 %s,因为无法下载它。\n"
-#: cmdline/apt-get.cc:1142
+#: cmdline/apt-get.cc:1156
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-get.cc:1171
+#: cmdline/apt-get.cc:1185
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: cmdline/apt-get.cc:1173
+#: cmdline/apt-get.cc:1187
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: cmdline/apt-get.cc:1179
+#: cmdline/apt-get.cc:1193
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "选定了版本为 %s (%s) 的 %s\n"
-#: cmdline/apt-get.cc:1316
+#: cmdline/apt-get.cc:1330
msgid "The update command takes no arguments"
msgstr " update 命令是不需任何参数的"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
msgid "Unable to lock the list directory"
msgstr "无法对状态列表目录加锁"
-#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1401
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
"有一些索引文件不能下载,它们可能被忽略了,也可能转而使用了旧的索引文件。"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1415
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1440
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
+#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
msgid "The following information may help to resolve the situation:"
msgstr "下列的信息可能会对解决问题有所帮助:"
-#: cmdline/apt-get.cc:1444
+#: cmdline/apt-get.cc:1447
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "内部错误,problem resolver 坏事了"
-#: cmdline/apt-get.cc:1463
+#: cmdline/apt-get.cc:1466
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部错误,AllUpgrade 坏事了"
@@ -1539,9 +1549,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "info 和 temp 目录要求处于同一文件系统之下"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
-#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
-#: apt-pkg/pkgcachegen.cc:844
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
+#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
+#: apt-pkg/pkgcachegen.cc:947
msgid "Reading package lists"
msgstr "正在读取软件包列表"
@@ -1674,11 +1684,13 @@ msgid "File not found"
msgstr "无法找到该文件"
#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
-#: methods/gzip.cc:142
+#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
+#: methods/gzip.cc:141 methods/gzip.cc:150
msgid "Failed to stat"
msgstr "无法读取状态"
#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
+#: methods/rred.cc:240 methods/gzip.cc:147
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -1805,7 +1817,7 @@ msgstr "数据套接字连接超时"
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "把文件加入散列表时出错"
@@ -1926,86 +1938,86 @@ msgid ""
"available:\n"
msgstr "由于没有公钥,下列签名无法进行验证:\n"
-#: methods/gzip.cc:57
+#: methods/gzip.cc:57 methods/gzip.cc:64
#, c-format
msgid "Couldn't open pipe for %s"
msgstr "无法为 %s 开启管道"
-#: methods/gzip.cc:102
+#: methods/gzip.cc:102 methods/gzip.cc:109
#, c-format
msgid "Read error from %s process"
msgstr "从 %s 进程读取数据出错"
-#: methods/http.cc:376
+#: methods/http.cc:375
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/http.cc:522
+#: methods/http.cc:521
#, c-format
msgid "Got a single header line over %u chars"
msgstr "受到了一行报头条目,它的长度超过了 %u 个字符"
-#: methods/http.cc:530
+#: methods/http.cc:529
msgid "Bad header line"
msgstr "错误的报头条目"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:548 methods/http.cc:555
msgid "The HTTP server sent an invalid reply header"
msgstr "该 http 服务器发送了一个无效的应答报头"
-#: methods/http.cc:585
+#: methods/http.cc:584
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
-#: methods/http.cc:600
+#: methods/http.cc:599
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
-#: methods/http.cc:602
+#: methods/http.cc:601
msgid "This HTTP server has broken range support"
msgstr "该 http 服务器的 range 支持不正常"
-#: methods/http.cc:626
+#: methods/http.cc:625
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:773
+#: methods/http.cc:772
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:778
+#: methods/http.cc:777
msgid "Connection timed out"
msgstr "连接服务器超时"
-#: methods/http.cc:801
+#: methods/http.cc:800
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:832
+#: methods/http.cc:831
msgid "Error writing to file"
msgstr "写文件时出错"
-#: methods/http.cc:860
+#: methods/http.cc:859
msgid "Error writing to the file"
msgstr "写文件时出错"
-#: methods/http.cc:874
+#: methods/http.cc:873
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错,对方关闭了连接"
-#: methods/http.cc:876
+#: methods/http.cc:875
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:1107
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1124
+#: methods/http.cc:1123
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1215
+#: methods/http.cc:1214
msgid "Internal error"
msgstr "内部错误"
@@ -2018,7 +2030,7 @@ msgstr "无法 mmap 一个空文件"
msgid "Couldn't make mmap of %lu bytes"
msgstr "无法 mmap %lu 字节的数据"
-#: apt-pkg/contrib/strutl.cc:938
+#: apt-pkg/contrib/strutl.cc:981
#, c-format
msgid "Selection %s not found"
msgstr "没有发现您的所选 %s"
@@ -2078,12 +2090,12 @@ msgstr "语法错误 %s:%u: 不支持的指令“%s”"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... 有错误!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... 完成"
@@ -2215,108 +2227,110 @@ msgstr "用 unlink 删除文件时出错"
msgid "Problem syncing the file"
msgstr "同步文件时出错"
-#: apt-pkg/pkgcache.cc:126
+#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
msgid "Empty package cache"
msgstr "软件包缓存区是空的"
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
msgid "The package cache file is corrupted"
msgstr "软件包缓存区文件损坏了"
-#: apt-pkg/pkgcache.cc:137
+#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
msgid "The package cache file is an incompatible version"
msgstr "软件包缓存区文件的版本不兼容"
-#: apt-pkg/pkgcache.cc:142
+#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "本程序目前不支持“%s”这个版本控制系统"
-#: apt-pkg/pkgcache.cc:147
+#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
msgid "The package cache was built for a different architecture"
msgstr "软件包缓存区是为其它架构的主机构造的"
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
msgid "Depends"
msgstr "依赖"
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
msgid "PreDepends"
msgstr "预依赖"
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
msgid "Suggests"
msgstr "建议"
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
msgid "Recommends"
msgstr "推荐"
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
msgid "Conflicts"
msgstr "冲突"
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
msgid "Replaces"
msgstr "替换"
-#: apt-pkg/pkgcache.cc:220
+#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
msgid "Obsoletes"
msgstr "废弃"
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
msgid "important"
msgstr "重要"
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
msgid "required"
msgstr "必要"
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
msgid "standard"
msgstr "标准"
-#: apt-pkg/pkgcache.cc:232
+#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
msgid "optional"
msgstr "可选"
-#: apt-pkg/pkgcache.cc:232
+#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
msgid "extra"
msgstr "额外"
-#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
+#: apt-pkg/depcache.cc:127
msgid "Building dependency tree"
msgstr "正在分析软件包的依赖关系树"
-#: apt-pkg/depcache.cc:102
+#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
msgid "Candidate versions"
msgstr "候选版本"
-#: apt-pkg/depcache.cc:131
+#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
msgid "Dependency generation"
msgstr "生成依赖关系"
#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
#, fuzzy
msgid "Reading state information"
msgstr "正在合并现有信息"
-#: apt-pkg/depcache.cc:199
+#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "无法打开 %s"
-#: apt-pkg/depcache.cc:205
+#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "无法写入文件 %s"
-#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "无法解析软件包文件 %s (1)"
-#: apt-pkg/tagfile.cc:186
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "无法解析软件包文件 %s (2)"
@@ -2351,7 +2365,7 @@ msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)"
msgid "Opening %s"
msgstr "正在打开 %s"
-#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
#, c-format
msgid "Line %u too long in source list %s."
msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。"
@@ -2439,17 +2453,17 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
msgid "Method %s did not start correctly"
msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-#: apt-pkg/acquire-worker.cc:384
+#: apt-pkg/acquire-worker.cc:377
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:122
+#: apt-pkg/init.cc:125
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:138
+#: apt-pkg/init.cc:141
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
@@ -2492,90 +2506,107 @@ msgstr "软件包暂存区使用的是不兼容的版本控制系统"
msgid "Error occurred while processing %s (NewPackage)"
msgstr "处理 %s (NewPackage)时出错"
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:134
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "处理 %s (UsePackage1)时出错"
-#: apt-pkg/pkgcachegen.cc:152
+#: apt-pkg/pkgcachegen.cc:157
+#, fuzzy, c-format
+msgid "Error occured while processing %s (NewFileDesc1)"
+msgstr "处理 %s (NewFileVer1)时出错"
+
+#: apt-pkg/pkgcachegen.cc:182
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "处理 %s (UsePackage2)时出错"
-#: apt-pkg/pkgcachegen.cc:156
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "处理 %s (NewFileVer1)时出错"
-#: apt-pkg/pkgcachegen.cc:186
+#: apt-pkg/pkgcachegen.cc:217
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "处理 %s (NewVersion1)时出错"
-#: apt-pkg/pkgcachegen.cc:190
+#: apt-pkg/pkgcachegen.cc:221
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "处理 %s (UsePackage3)时出错"
-#: apt-pkg/pkgcachegen.cc:194
+#: apt-pkg/pkgcachegen.cc:225
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "处理 %s (NewVersion2)时出错"
-#: apt-pkg/pkgcachegen.cc:209
+#: apt-pkg/pkgcachegen.cc:249
+#, fuzzy, c-format
+msgid "Error occured while processing %s (NewFileDesc2)"
+msgstr "处理 %s (NewFileVer1)时出错"
+
+#: apt-pkg/pkgcachegen.cc:255
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "糟了,软件包的数量了超出本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:212
+#: apt-pkg/pkgcachegen.cc:258
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "糟了,软件包版本的数量了超出本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:215
+#: apt-pkg/pkgcachegen.cc:261
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "糟了,软件包版本的数量了超出本程序的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:264
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "糟了,依赖关系的数量超出了本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:243
+#: apt-pkg/pkgcachegen.cc:292
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "处理 %s (FindPkg)时出错"
-#: apt-pkg/pkgcachegen.cc:256
+#: apt-pkg/pkgcachegen.cc:305
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "处理 %s (CollectFileProvides)时出错"
-#: apt-pkg/pkgcachegen.cc:262
+#: apt-pkg/pkgcachegen.cc:311
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "当处理文件依赖关系时,无法找到软件包 %s %s"
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:681
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
-#: apt-pkg/pkgcachegen.cc:662
+#: apt-pkg/pkgcachegen.cc:765
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
+#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
msgid "IO Error saving source cache"
msgstr "无法写入来源缓存文件"
-#: apt-pkg/acquire-item.cc:126
+#: apt-pkg/acquire-item.cc:130
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
+#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
+#: apt-pkg/acquire-item.cc:1402
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:646
+#: apt-pkg/acquire-item.cc:1097
+#, fuzzy
msgid "There are no public key available for the following key IDs:\n"
msgstr "以下 key ID 没有可用的公钥:\n"
-#: apt-pkg/acquire-item.cc:759
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2584,7 +2615,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:818
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2592,13 +2623,13 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:854
+#: apt-pkg/acquire-item.cc:1305
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:941
+#: apt-pkg/acquire-item.cc:1392
msgid "Size mismatch"
msgstr "大小不符"
@@ -2607,7 +2638,7 @@ msgstr "大小不符"
msgid "Vendor block %s contains no fingerprint"
msgstr "软件提供者数据块内 %s 没有包含指纹信息"
-#: apt-pkg/cdrom.cc:507
+#: apt-pkg/cdrom.cc:531
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
@@ -2616,47 +2647,49 @@ msgstr ""
"现把 %s 作为了 CD-ROM 的挂载点\n"
"正在挂载 CD-ROM\n"
-#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
msgid "Identifying.. "
msgstr "正在鉴别.. "
-#: apt-pkg/cdrom.cc:541
+#: apt-pkg/cdrom.cc:565
#, c-format
msgid "Stored label: %s \n"
msgstr "存档标签:%s \n"
-#: apt-pkg/cdrom.cc:561
+#: apt-pkg/cdrom.cc:585
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
-#: apt-pkg/cdrom.cc:579
+#: apt-pkg/cdrom.cc:603
msgid "Unmounting CD-ROM\n"
msgstr "正在卸载 CD-ROM 文件系统\n"
-#: apt-pkg/cdrom.cc:583
+#: apt-pkg/cdrom.cc:607
msgid "Waiting for disc...\n"
msgstr "等待插入盘片……\n"
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:615
msgid "Mounting CD-ROM...\n"
msgstr "正在挂载 CD-ROM 文件系统……\n"
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:633
msgid "Scanning disc for index files..\n"
msgstr "正在光盘中查找索引文件..\n"
-#: apt-pkg/cdrom.cc:647
-#, c-format
-msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+#: apt-pkg/cdrom.cc:673
+#, fuzzy, c-format
+msgid ""
+"Found %i package indexes, %i source indexes, %i translation indexes and %i "
+"signatures\n"
msgstr "找到了 %i 个软件包索引、%i 个源代码包索引,和 %i 个数字签名\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:737
msgid "That is not a valid name, try again.\n"
msgstr "这不是一个有效的名字,请再次命名。\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:753
#, c-format
msgid ""
"This disc is called: \n"
@@ -2665,38 +2698,38 @@ msgstr ""
"这张光盘现在的名字是:\n"
"“%s”\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:757
msgid "Copying package lists..."
msgstr "正在复制软件包列表……"
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:783
msgid "Writing new source list\n"
msgstr "正在写入新的软件包源列表\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:792
msgid "Source list entries for this disc are:\n"
msgstr "对应于该光盘的软件包源设置项是:\n"
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:832
msgid "Unmounting CD-ROM..."
msgstr "正在卸载 CD-ROM 文件系统……"
-#: apt-pkg/indexcopy.cc:261
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
#, c-format
msgid "Wrote %i records.\n"
msgstr "已写入 %i 条记录。\n"
-#: apt-pkg/indexcopy.cc:263
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "已写入 %i 条记录,并有 %i 个文件缺失。\n"
-#: apt-pkg/indexcopy.cc:266
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个文件不吻合\n"
-#: apt-pkg/indexcopy.cc:269
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个缺失,以及 %i 个文件不吻合\n"
@@ -2751,10 +2784,20 @@ msgstr "正在准备配置 %s"
msgid "Completely removed %s"
msgstr "无法删除 %s"
+#: methods/rred.cc:219
+#, fuzzy
+msgid "Could not patch file"
+msgstr "无法打开文件 %s"
+
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "连接被永久关闭"
+#: apt-pkg/acquire-item.cc:1097
+#, fuzzy
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "以下 key ID 没有可用的公钥:\n"
+
#~ msgid "File date has changed %s"
#~ msgstr "文件 %s 的时间已被改动"