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.po742
1 files changed, 415 insertions, 327 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c38c5f0f4..19d2df120 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,159 +1,169 @@
# Chinese/Simplified translation of apt.
# This file is put in the public domain.
-# Tchaikov <tchaikov@sjtu.edu.cn>, 2005.
+# Tchaikov <tchaikov@sjtu.org>, 2005,2007.
# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004,2006
#
msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.23\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-27 13:46+0200\n"
-"PO-Revision-Date: 2006-02-22 14:20+1300\n"
-"Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>\n"
+"POT-Creation-Date: 2007-06-07 00:57+0200\n"
+"PO-Revision-Date: 2007-03-29 17:14+0800\n"
+"Last-Translator: Kov Chai <tchaikov@sjtu.org>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:135
+#: cmdline/apt-cache.cc:143
#, 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
+#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
+#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
#, c-format
msgid "Unable to locate package %s"
msgstr "未发现软件包 %s"
-#: cmdline/apt-cache.cc:232
+#: cmdline/apt-cache.cc:247
msgid "Total package names : "
msgstr "软件包总数(按名称计):"
-#: cmdline/apt-cache.cc:272
+#: cmdline/apt-cache.cc:287
msgid " Normal packages: "
msgstr " 普通软件包:"
-#: cmdline/apt-cache.cc:273
+#: cmdline/apt-cache.cc:288
msgid " Pure virtual packages: "
msgstr " 完全虚拟软件包:"
-#: cmdline/apt-cache.cc:274
+#: cmdline/apt-cache.cc:289
msgid " Single virtual packages: "
msgstr " 单虚拟软件包:"
-#: cmdline/apt-cache.cc:275
+#: cmdline/apt-cache.cc:290
msgid " Mixed virtual packages: "
msgstr " 混合虚拟软件包:"
-#: cmdline/apt-cache.cc:276
+#: cmdline/apt-cache.cc:291
msgid " Missing: "
msgstr " 缺漏的:"
-#: cmdline/apt-cache.cc:278
+#: cmdline/apt-cache.cc:293
msgid "Total distinct versions: "
msgstr "按版本共计:"
-#: cmdline/apt-cache.cc:280
+#: cmdline/apt-cache.cc:295
+#, fuzzy
+msgid "Total Distinct Descriptions: "
+msgstr "按版本共计:"
+
+#: cmdline/apt-cache.cc:297
msgid "Total dependencies: "
msgstr "按依赖关系共计:"
-#: cmdline/apt-cache.cc:283
+#: cmdline/apt-cache.cc:300
msgid "Total ver/file relations: "
msgstr "按版本/文件关系共计:"
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:302
+#, fuzzy
+msgid "Total Desc/File relations: "
+msgstr "按版本/文件关系共计:"
+
+#: cmdline/apt-cache.cc:304
msgid "Total Provides mappings: "
msgstr "提供映射共计:"
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:316
msgid "Total globbed strings: "
msgstr "Glob 字串共计:"
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:330
msgid "Total dependency version space: "
msgstr "依赖关系版本名所占空间共计:"
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:335
msgid "Total slack space: "
msgstr "Slack 空间共计:"
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:343
msgid "Total space accounted for: "
msgstr "总占用空间:"
-#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
#, c-format
msgid "Package file %s is out of sync."
msgstr "软件包文件 %s 尚未同步(sync)。"
-#: cmdline/apt-cache.cc:1231
+#: cmdline/apt-cache.cc:1293
msgid "You must give exactly one pattern"
msgstr "您必须明确地给出一个表达式"
-#: cmdline/apt-cache.cc:1385
+#: cmdline/apt-cache.cc:1447
msgid "No packages found"
msgstr "没有发现吻合的软件包"
-#: cmdline/apt-cache.cc:1462
+#: cmdline/apt-cache.cc:1524
msgid "Package files:"
msgstr "软件包文件:"
-#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
+#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
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:1532
#, 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:1544
msgid "Pinned packages:"
msgstr "被锁定(pinned)的软件包:"
-#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
+#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
msgid "(not found)"
msgstr "(没有找到)"
#. Installed version
-#: cmdline/apt-cache.cc:1515
+#: cmdline/apt-cache.cc:1577
msgid " Installed: "
msgstr " 已安装:"
-#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
msgid "(none)"
msgstr "(无)"
#. Candidate Version
-#: cmdline/apt-cache.cc:1522
+#: cmdline/apt-cache.cc:1584
msgid " Candidate: "
msgstr " 候选的软件包:"
-#: cmdline/apt-cache.cc:1532
+#: cmdline/apt-cache.cc:1594
msgid " Package pin: "
msgstr " 软件包锁(Pin):"
#. Show the priority tables
-#: cmdline/apt-cache.cc:1541
+#: cmdline/apt-cache.cc:1603
msgid " Version table:"
msgstr " 版本列表:"
-#: cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1618
#, 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:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2564 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:1721
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:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:819
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
@@ -422,115 +432,127 @@ msgstr "没有任何选定项是匹配的"
msgid "Some files are missing in the package file group `%s'"
msgstr "软件包文件组“%s”中缺少一些文件"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "缓存数据库被损坏了,该数据库文件的文件名已改成 %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB 已过时,现试图进行升级 %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"DB 格式是无效的。如果你是从一个老版本的 apt 升级而来,请删除数据库并重建它。"
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "无法打开 DB 文件 %s:%s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "文件 %s 的时间已被改动"
+msgid "Failed to stat %s"
+msgstr "无法读取 %s 的状态"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "存档没有包含控制字段"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "无法获得游标(cursor)"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告:无法读取目录 %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告:无法对 %s 进行统计\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
msgstr "错误:"
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
msgstr "警告:"
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "错误:处理文件时出错 "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "无法解析路径 %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "无法遍历目录树"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "无法打开 %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "无法读取符号链接 %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "无法 unlink %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 无法将 %s 链接到 %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " 达到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
-#, c-format
-msgid "Failed to stat %s"
-msgstr "无法读取 %s 的状态"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "存档没有包含软件包(package)字段"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
+#: ftparchive/writer.cc:623
+#, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s 没有源代码的 override 项\n"
+
+#: ftparchive/writer.cc:627
+#, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s 中没有二进制文件的 override 项\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
@@ -626,79 +648,79 @@ msgstr "在 unlink %s 时出错"
msgid "Failed to rename %s to %s"
msgstr "无法将 %s 重命名为 %s"
-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:121
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1655
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
msgstr "下列的软件包有不能满足的依赖关系:"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
msgstr "但是 %s 已经安装了"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
msgstr "但是 %s 正要被安装"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:337
msgid "but it is not installable"
msgstr "但却无法安装它"
-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:339
msgid "but it is a virtual package"
msgstr "但是它只是个虚拟软件包"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not installed"
msgstr "但是它还没有被安装"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
msgstr "但是它将不会被安装"
-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:347
msgid " or"
msgstr " 或"
-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
msgstr "下列【新】软件包将被安装:"
-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
msgstr "下列软件包将被【卸载】:"
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
msgstr "下列的软件包的版本将保持不变:"
-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
msgstr "下列的软件包将被升级:"
-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
msgstr "下列软件包将被【降级】:"
-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
msgstr "下列被要求保持版本不变的软件包将被改变:"
-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:539
#, c-format
msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:547
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -706,143 +728,143 @@ msgstr ""
"【警告】:下列的重要软件包将被卸载 \n"
"请勿尝试,除非您确实知道您在做什么!"
-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "共升级了 %lu 个软件包,新安装了 %lu 个软件包,"
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
msgstr "共重新安装了 %lu 个软件包,"
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
msgstr "降级了 %lu 个软件包,"
-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "要卸载 %lu 个软件包,有 %lu 个软件未被升级。\n"
-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:664
msgid "Correcting dependencies..."
msgstr "正在更正依赖关系..."
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:667
msgid " failed."
msgstr " 失败。"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:670
msgid "Unable to correct dependencies"
msgstr "无法更正依赖关系"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:673
msgid "Unable to minimize the upgrade set"
msgstr "无法最小化要升级的软件包集合"
-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:675
msgid " Done"
msgstr " 完成"
-#: cmdline/apt-get.cc:664
+#: 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:667
+#: cmdline/apt-get.cc:682
msgid "Unmet dependencies. Try using -f."
msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:704
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "【警告】:下列的软件包不能通过验证!"
-#: cmdline/apt-get.cc:693
+#: cmdline/apt-get.cc:708
msgid "Authentication warning overridden.\n"
msgstr "忽略了认证警告。\n"
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:715
msgid "Install these packages without verification [y/N]? "
msgstr "不经验证就安装这些软件包么?[y/N] "
-#: cmdline/apt-get.cc:702
+#: cmdline/apt-get.cc:717
msgid "Some packages could not be authenticated"
msgstr "有些软件包不能通过验证"
-#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
+#: 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:755
+#: cmdline/apt-get.cc:770
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上!"
-#: cmdline/apt-get.cc:764
+#: cmdline/apt-get.cc:779
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止。"
-#: cmdline/apt-get.cc:775
+#: cmdline/apt-get.cc:790
msgid "Internal error, Ordering didn't finish"
-msgstr "内部错误,Ordering 没有完成"
+msgstr "内部错误,Ordering 未能完成"
-#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1995 cmdline/apt-get.cc:2028
msgid "Unable to lock the download directory"
msgstr "无法对下载目录加锁"
-#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2076 cmdline/apt-get.cc:2312
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "无法读取安装源列表。"
-#: cmdline/apt-get.cc:816
+#: 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:821
+#: cmdline/apt-get.cc:836
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需要下载 %sB/%sB 的软件包。\n"
-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需要下载 %sB 的软件包。\n"
-#: cmdline/apt-get.cc:829
+#: 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:832
+#: cmdline/apt-get.cc:847
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2166
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的空余空间"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:864
#, c-format
msgid "You don't have enough free space in %s."
msgstr "您在 %s 中没有足够的空余空间。"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
+#: 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:866
+#: cmdline/apt-get.cc:881
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:868
+#: cmdline/apt-get.cc:883
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -853,28 +875,28 @@ msgstr ""
"若还想继续的话,就输入下面的短句“%s”\n"
" ?] "
-#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
msgid "Abort."
msgstr "中止执行。"
-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:904
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗?[Y/n]"
-#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2209
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:994
msgid "Some files failed to download"
msgstr "有一些文件下载失败"
-#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2218
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1001
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -882,47 +904,47 @@ msgstr ""
"有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项"
"再试试?"
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:1005
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)"
-#: cmdline/apt-get.cc:995
+#: cmdline/apt-get.cc:1010
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: cmdline/apt-get.cc:996
+#: cmdline/apt-get.cc:1011
msgid "Aborting install."
msgstr "放弃安装。"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1045
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "注意,我选了 %s 而非 %s\n"
-#: cmdline/apt-get.cc:1040
+#: 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:1058
+#: cmdline/apt-get.cc:1073
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "软件包 %s 还未安装,因而不会被卸载\n"
-#: cmdline/apt-get.cc:1069
+#: cmdline/apt-get.cc:1084
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包:\n"
-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1096
msgid " [Installed]"
msgstr " [已安装]"
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1101
msgid "You should explicitly select one to install."
msgstr "请您明确地选择一个来进行安装。"
-#: cmdline/apt-get.cc:1091
+#: cmdline/apt-get.cc:1106
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -933,74 +955,114 @@ msgstr ""
"这可能意味着这个缺失的软件包可能已被废弃,\n"
"或者只能在其他发布源中找到\n"
-#: cmdline/apt-get.cc:1110
+#: cmdline/apt-get.cc:1125
msgid "However the following packages replace it:"
msgstr "可是下列的软件包取代了它:"
-#: cmdline/apt-get.cc:1113
+#: cmdline/apt-get.cc:1128
#, c-format
msgid "Package %s has no installation candidate"
msgstr "软件包 %s 还没有可供安装的候选者"
-#: cmdline/apt-get.cc:1133
+#: 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:1141
+#: cmdline/apt-get.cc:1156
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1185
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: cmdline/apt-get.cc:1170
+#: cmdline/apt-get.cc:1187
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: cmdline/apt-get.cc:1176
+#: cmdline/apt-get.cc:1193
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "选定了版本为 %s (%s) 的 %s\n"
-#: cmdline/apt-get.cc:1313
+#: cmdline/apt-get.cc:1330
msgid "The update command takes no arguments"
msgstr " update 命令是不需任何参数的"
-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1343
msgid "Unable to lock the list directory"
msgstr "无法对状态列表目录加锁"
-#: cmdline/apt-get.cc:1384
+#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
"有一些索引文件不能下载,它们可能被忽略了,也可能转而使用了旧的索引文件。"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1433
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1465
+#, fuzzy
+msgid ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr "下列【新】软件包将被安装:"
+
+#: cmdline/apt-get.cc:1467
+msgid "Use 'apt-get autoremove' to remove them."
+msgstr ""
+
+#: cmdline/apt-get.cc:1472
+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:1475 cmdline/apt-get.cc:1736
+msgid "The following information may help to resolve the situation:"
+msgstr "下列的信息可能会对解决问题有所帮助:"
+
+#: cmdline/apt-get.cc:1479
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "内部错误,problem resolver 坏事了"
+
+#: cmdline/apt-get.cc:1498
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部错误,AllUpgrade 坏事了"
-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1543
+#, fuzzy, c-format
+msgid "Couldn't find task %s"
+msgstr "无法找到软件包 %s"
+
+#: cmdline/apt-get.cc:1642 cmdline/apt-get.cc:1678
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1665
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意,根据正则表达式“%2$s”选中了 %1$s\n"
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1695
+#, fuzzy, c-format
+msgid "%s set to manual installed.\n"
+msgstr "但是 %s 正要被安装"
+
+#: cmdline/apt-get.cc:1708
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误:"
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1711
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1008,7 +1070,7 @@ msgstr ""
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1561
+#: cmdline/apt-get.cc:1723
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"
@@ -1019,7 +1081,7 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们还在新到(incoming)目录中。"
-#: cmdline/apt-get.cc:1569
+#: cmdline/apt-get.cc:1731
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1028,126 +1090,122 @@ msgstr ""
"您仅要求对单一软件包进行操作,这极有可能是因为该软件包安装不上,同时,\n"
"您最好提交一个针对这个软件包的故障报告。"
-#: cmdline/apt-get.cc:1574
-msgid "The following information may help to resolve the situation:"
-msgstr "下列的信息可能会对解决问题有所帮助:"
-
-#: cmdline/apt-get.cc:1577
+#: cmdline/apt-get.cc:1739
msgid "Broken packages"
msgstr "无法安装的软件包"
-#: cmdline/apt-get.cc:1603
+#: cmdline/apt-get.cc:1770
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包:"
-#: cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1859
msgid "Suggested packages:"
msgstr "建议安装的软件包:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1860
msgid "Recommended packages:"
msgstr "推荐安装的软件包:"
-#: cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1888
msgid "Calculating upgrade... "
msgstr "正在筹划升级... "
-#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1891 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1896
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
+#: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:1971
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误,problem resolver 坏事了"
-#: cmdline/apt-get.cc:1876
+#: cmdline/apt-get.cc:2071
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码,必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
+#: cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2330
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:2145
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的空余空间"
-#: cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:2174
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
-#: cmdline/apt-get.cc:1982
+#: cmdline/apt-get.cc:2177
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:1988
+#: cmdline/apt-get.cc:2183
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:2019
+#: cmdline/apt-get.cc:2214
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2242
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
-#: cmdline/apt-get.cc:2059
+#: cmdline/apt-get.cc:2254
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2255
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:2077
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2291
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2307
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系(builddeps),必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2335
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
-#: cmdline/apt-get.cc:2160
+#: cmdline/apt-get.cc:2355
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2212
+#: cmdline/apt-get.cc:2407
#, 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:2264
+#: cmdline/apt-get.cc:2459
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1156,30 +1214,30 @@ msgstr ""
"由于无法找到符合要求的软件包 %3$s 的可用版本,因此不能满足 %2$s 所要求的 %1"
"$s 依赖关系"
-#: cmdline/apt-get.cc:2299
+#: cmdline/apt-get.cc:2494
#, 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:2324
+#: cmdline/apt-get.cc:2519
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
-#: cmdline/apt-get.cc:2338
+#: cmdline/apt-get.cc:2533
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2537
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2569
msgid "Supported modules:"
msgstr "被支持模块:"
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2610
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1356,19 +1414,19 @@ msgstr "正在合并现有信息"
msgid "Failed to create pipes"
msgstr "无法创建管道"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "无法执行 gzip"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "包文件已被损坏"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "tar 的校验码不符,包文件已被损坏"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "未知的 TAR 数据头类型 %u,成员 %s"
@@ -1513,9 +1571,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:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:752
+#: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826
+#: apt-pkg/pkgcachegen.cc:949
msgid "Reading package lists"
msgstr "正在读取软件包列表"
@@ -1634,25 +1692,26 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "错误的光盘"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "无法卸载现在挂载于 %s 的 CD-ROM,它可能正在使用中。"
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "找不到光盘。"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "无法找到该文件"
-#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
-#: methods/gzip.cc:142
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
+#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "无法读取状态"
-#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
+#: methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -1863,49 +1922,49 @@ msgstr "解析“%s:%s”时,出现了某些故障 (%i)"
msgid "Unable to connect to %s %s:"
msgstr "不能连接上 %s %s:"
-#: methods/gpgv.cc:64
-#, fuzzy, c-format
+#: methods/gpgv.cc:65
+#, c-format
msgid "Couldn't access keyring: '%s'"
-msgstr "无法解析域名“%s”"
+msgstr "无法访问密匙:“%s”"
-#: methods/gpgv.cc:99
+#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "错误:Acquire::gpgv::Options 的参数列表超长。结束运行。"
-#: methods/gpgv.cc:198
+#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部错误:签名正确无误,但是无法确认密钥的指纹(key fingerprint)?!"
-#: methods/gpgv.cc:203
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr "至少发现一个无效的签名。"
-#: methods/gpgv.cc:207
-#, fuzzy, c-format
+#: methods/gpgv.cc:213
+#, c-format
msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
-msgstr "用于验证签名(您安装了 gnupg 么?)"
+msgstr "无法运行\"%s\"以便验证签名(您安装了 gnupg 么?)"
-#: methods/gpgv.cc:212
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr "运行 gpgv 时发生未知错误"
-#: methods/gpgv.cc:243
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
msgstr "下列签名无效:\n"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr "由于没有公钥,下列签名无法进行验证:\n"
-#: 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:109
#, c-format
msgid "Read error from %s process"
msgstr "从 %s 进程读取数据出错"
@@ -1992,7 +2051,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"
@@ -2052,12 +2111,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:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... 有错误!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... 完成"
@@ -2189,93 +2248,112 @@ msgstr "用 unlink 删除文件时出错"
msgid "Problem syncing the file"
msgstr "同步文件时出错"
-#: apt-pkg/pkgcache.cc:126
+#: apt-pkg/pkgcache.cc:132
msgid "Empty package cache"
msgstr "软件包缓存区是空的"
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:138
msgid "The package cache file is corrupted"
msgstr "软件包缓存区文件损坏了"
-#: apt-pkg/pkgcache.cc:137
+#: apt-pkg/pkgcache.cc:143
msgid "The package cache file is an incompatible version"
msgstr "软件包缓存区文件的版本不兼容"
-#: apt-pkg/pkgcache.cc:142
+#: 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:153
msgid "The package cache was built for a different architecture"
msgstr "软件包缓存区是为其它架构的主机构造的"
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:224
msgid "Depends"
msgstr "依赖"
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:224
msgid "PreDepends"
msgstr "预依赖"
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:224
msgid "Suggests"
msgstr "建议"
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:225
msgid "Recommends"
msgstr "推荐"
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:225
msgid "Conflicts"
msgstr "冲突"
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:225
msgid "Replaces"
msgstr "替换"
-#: apt-pkg/pkgcache.cc:220
+#: apt-pkg/pkgcache.cc:226
msgid "Obsoletes"
msgstr "废弃"
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:226
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:237
msgid "important"
msgstr "重要"
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:237
msgid "required"
msgstr "必要"
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:237
msgid "standard"
msgstr "标准"
-#: apt-pkg/pkgcache.cc:232
+#: apt-pkg/pkgcache.cc:238
msgid "optional"
msgstr "可选"
-#: apt-pkg/pkgcache.cc:232
+#: apt-pkg/pkgcache.cc:238
msgid "extra"
msgstr "额外"
-#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:98 apt-pkg/depcache.cc:127
msgid "Building dependency tree"
msgstr "正在分析软件包的依赖关系树"
-#: apt-pkg/depcache.cc:62
+#: apt-pkg/depcache.cc:99
msgid "Candidate versions"
msgstr "候选版本"
-#: apt-pkg/depcache.cc:91
+#: apt-pkg/depcache.cc:128
msgid "Dependency generation"
msgstr "生成依赖关系"
-#: apt-pkg/tagfile.cc:72
+#: 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:196
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "无法打开 %s"
+
+#: apt-pkg/depcache.cc:202
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "无法写入文件 %s"
+
+#: apt-pkg/tagfile.cc:106
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "无法解析软件包文件 %s (1)"
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:193
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "无法解析软件包文件 %s (2)"
@@ -2310,7 +2388,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 行超长了。"
@@ -2330,7 +2408,7 @@ msgstr "无法识别在安装源列表 %3$s 里,第 %2$u 行中的软件包类
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)"
-#: apt-pkg/packagemanager.cc:402
+#: apt-pkg/packagemanager.cc:403
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2346,13 +2424,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "不支持索引文件类型“%s”"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:248
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "软件包 %s 需要重新安装,但是我无法找到相应的安装文件。"
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1104
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2360,7 +2438,7 @@ msgstr ""
"错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的"
"缘故。"
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1106
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关"
@@ -2378,15 +2456,15 @@ msgstr "找不到“%spartial”这个目录。"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
-#, fuzzy, c-format
+#: apt-pkg/acquire.cc:830
+#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "正在下载第 %li 个文件(共 %li 个,尚需 %s)"
+msgstr "正在下载 %li 个文件中的第 %li 个(还有 %s 个)"
-#: apt-pkg/acquire.cc:825
-#, fuzzy, c-format
+#: apt-pkg/acquire.cc:832
+#, c-format
msgid "Retrieving file %li of %li"
-msgstr "正在读取文件列表"
+msgstr "正在下载 %2$li 个文件中的 %1$li 个"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2398,17 +2476,17 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
msgid "Method %s did not start correctly"
msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:120
+#: apt-pkg/init.cc:125
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:136
+#: apt-pkg/init.cc:141
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
@@ -2429,112 +2507,128 @@ msgstr "无法解析或打开软件包的列表或是状态文件。"
msgid "You may want to run apt-get update to correct these problems"
msgstr "您可能需要运行 apt-get update 来解决这些问题"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "偏好设定(preferences)文件中发现有无效的记录,无 Package 字段头"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "无法识别锁定的类型(pin type) %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76
msgid "Cache has an incompatible versioning system"
msgstr "软件包暂存区使用的是不兼容的版本控制系统"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "处理 %s (NewPackage)时出错"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:134
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "处理 %s (UsePackage1)时出错"
-#: apt-pkg/pkgcachegen.cc:150
+#: 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:154
+#: apt-pkg/pkgcachegen.cc:186
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "处理 %s (NewFileVer1)时出错"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:217
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "处理 %s (NewVersion1)时出错"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:221
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "处理 %s (UsePackage3)时出错"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:225
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "处理 %s (NewVersion2)时出错"
-#: apt-pkg/pkgcachegen.cc:207
+#: 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:210
+#: apt-pkg/pkgcachegen.cc:258
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "糟了,软件包版本的数量了超出本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:213
+#: 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:241
+#: apt-pkg/pkgcachegen.cc:292
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "处理 %s (FindPkg)时出错"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:305
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "处理 %s (CollectFileProvides)时出错"
-#: apt-pkg/pkgcachegen.cc:260
+#: 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:574
+#: apt-pkg/pkgcachegen.cc:682
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:767
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901
msgid "IO Error saving source cache"
msgstr "无法写入来源缓存文件"
-#: apt-pkg/acquire-item.cc:126
+#: apt-pkg/acquire-item.cc:127
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:405 apt-pkg/acquire-item.cc:662
+#: apt-pkg/acquire-item.cc:1412
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:640
-msgid "There are no public key available for the following key IDs:\n"
+#: apt-pkg/acquire-item.cc:1107
+msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 key ID 没有可用的公钥:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:1220
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2543,7 +2637,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:1279
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2551,13 +2645,13 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:1315
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:1402
msgid "Size mismatch"
msgstr "大小不符"
@@ -2566,7 +2660,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"
@@ -2575,47 +2669,54 @@ 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
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "存档标签:%s \n"
+
+#: apt-pkg/cdrom.cc:739
msgid "That is not a valid name, try again.\n"
msgstr "这不是一个有效的名字,请再次命名。\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid ""
"This disc is called: \n"
@@ -2624,38 +2725,39 @@ msgstr ""
"这张光盘现在的名字是:\n"
"“%s”\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:759
msgid "Copying package lists..."
msgstr "正在复制软件包列表……"
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:785
msgid "Writing new source list\n"
msgstr "正在写入新的软件包源列表\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:794
msgid "Source list entries for this disc are:\n"
msgstr "对应于该光盘的软件包源设置项是:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:836
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
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"
@@ -2701,39 +2803,25 @@ msgid "Removed %s"
msgstr "已删除 %s"
#: apt-pkg/deb/dpkgpm.cc:378
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to completely remove %s"
-msgstr "正在准备配置 %s"
+msgstr "正在准备完全删除 %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, fuzzy, c-format
+#, c-format
msgid "Completely removed %s"
-msgstr "无法删除 %s"
+msgstr "完全删除了 %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "连接被永久关闭"
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-
-#: ftparchive/writer.cc:623
-#, fuzzy, c-format
-msgid " %s has no source override entry\n"
-msgstr " %s 中没有 override 项\n"
-
-#: ftparchive/writer.cc:627
-#, fuzzy, c-format
-msgid " %s has no binary override entry either\n"
-msgstr " %s 中没有 override 项\n"
-
#: methods/rred.cc:219
-#, fuzzy
msgid "Could not patch file"
-msgstr "无法打开文件 %s"
+msgstr "无法打开补丁文件"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "文件 %s 的时间已被改动"
#~ msgid "Reading file list"
#~ msgstr "正在读取文件列表"