summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-05-02 13:40:45 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2007-05-02 13:40:45 +0200
commit66c8f0766ef9f2d660251ece524fcb82d5ea3813 (patch)
tree561f837db522d16779fd1201cdc0719345671911 /po/zh_CN.po
parenteaa204a9808eb2392f4a03d703b585ba3aa3b018 (diff)
parent3036f1e491ec1c71fb8fe9ff35954cebb2574320 (diff)
* apt-pkg/acquire.{cc,h}:
* Fix broken use of awk in apt-key that caused removal of the wrong keys from the keyring. Closes: #412572 * merged from Christian Perrier: * mr.po: New Marathi translation Closes: #416806 * zh_CN.po: Updated by Eric Pareja Closes: #416822 * tl.po: Updated by Eric Pareja Closes: #416638 * gl.po: Updated by Jacobo Tarrio Closes: #412828 * da.po: Updated by Claus Hindsgaul Closes: #409483 * fr.po: Remove a non-breakable space for usability issues. Closes: #408877 * ru.po: Updated Russian translation. Closes: #405476 * *.po: Unfuzzy after upstream typo corrections * apt-pkg/policy.cc: - allow multiple packages (thanks to David Foerster) * NMU * Fix broken use of awk in apt-key that caused removal of the wrong keys from the keyring. Closes: #412572
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po486
1 files changed, 230 insertions, 256 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c76a4abd9..1f48d1baa 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,15 +1,15 @@
# 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-08-09 23: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: 2006-12-19 11:37+0100\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"
@@ -148,7 +148,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1652 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
+#: cmdline/apt-get.cc:2387 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"
@@ -300,7 +300,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:710
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
@@ -437,6 +437,7 @@ 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
@@ -533,14 +534,14 @@ msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
#: ftparchive/writer.cc:623
-#, fuzzy, c-format
+#, c-format
msgid " %s has no source override entry\n"
-msgstr " %s 中没有 override 项\n"
+msgstr " %s 没有源代码的 override 项\n"
#: ftparchive/writer.cc:627
-#, fuzzy, c-format
+#, c-format
msgid " %s has no binary override entry either\n"
-msgstr " %s 中没有 override 项\n"
+msgstr " %s 中没有二进制文件的 override 项\n"
#: ftparchive/contents.cc:317
#, c-format
@@ -637,79 +638,79 @@ msgstr "在 unlink %s 时出错"
msgid "Failed to rename %s to %s"
msgstr "无法将 %s 重命名为 %s"
-#: cmdline/apt-get.cc:121
+#: cmdline/apt-get.cc:120
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
-#: cmdline/apt-get.cc:238
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "下列的软件包有不能满足的依赖关系:"
-#: cmdline/apt-get.cc:328
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "但是 %s 已经安装了"
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "但是 %s 正要被安装"
-#: cmdline/apt-get.cc:337
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "但却无法安装它"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "但是它只是个虚拟软件包"
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "但是它还没有被安装"
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "但是它将不会被安装"
-#: cmdline/apt-get.cc:347
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " 或"
-#: cmdline/apt-get.cc:376
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "下列【新】软件包将被安装:"
-#: cmdline/apt-get.cc:402
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "下列软件包将被【卸载】:"
-#: cmdline/apt-get.cc:424
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "下列的软件包的版本将保持不变:"
-#: cmdline/apt-get.cc:445
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "下列的软件包将被升级:"
-#: cmdline/apt-get.cc:466
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "下列软件包将被【降级】:"
-#: cmdline/apt-get.cc:486
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "下列被要求保持版本不变的软件包将被改变:"
-#: cmdline/apt-get.cc:539
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
-#: cmdline/apt-get.cc:547
+#: cmdline/apt-get.cc:546
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -717,143 +718,143 @@ msgstr ""
"【警告】:下列的重要软件包将被卸载 \n"
"请勿尝试,除非您确实知道您在做什么!"
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "共升级了 %lu 个软件包,新安装了 %lu 个软件包,"
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "共重新安装了 %lu 个软件包,"
-#: cmdline/apt-get.cc:584
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "降级了 %lu 个软件包,"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:585
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "要卸载 %lu 个软件包,有 %lu 个软件未被升级。\n"
-#: cmdline/apt-get.cc:590
+#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr "正在更正依赖关系..."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " 失败。"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "无法更正依赖关系"
-#: cmdline/apt-get.cc:659
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "无法最小化要升级的软件包集合"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " 完成"
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:664
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:667
msgid "Unmet dependencies. Try using -f."
msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-#: cmdline/apt-get.cc:690
+#: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "【警告】:下列的软件包不能通过验证!"
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
msgstr "忽略了认证警告。\n"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
msgstr "不经验证就安装这些软件包么?[y/N] "
-#: cmdline/apt-get.cc:703
+#: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
msgstr "有些软件包不能通过验证"
-#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
msgid "There are problems and -y was used without --force-yes"
msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes"
-#: cmdline/apt-get.cc:756
+#: cmdline/apt-get.cc:755
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上!"
-#: cmdline/apt-get.cc:765
+#: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止。"
-#: cmdline/apt-get.cc:776
+#: cmdline/apt-get.cc:775
msgid "Internal error, Ordering didn't finish"
-msgstr "内部错误,Ordering 没有完成"
+msgstr "内部错误,Ordering 未能完成"
-#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
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:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "无法读取安装源列表。"
-#: cmdline/apt-get.cc:817
+#: cmdline/apt-get.cc:816
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:821
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需要下载 %sB/%sB 的软件包。\n"
-#: cmdline/apt-get.cc:825
+#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需要下载 %sB 的软件包。\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:829
#, 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:832
#, 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:846 cmdline/apt-get.cc:1989
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的空余空间"
-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:849
#, 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:864 cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "虽然您指定了 Trivial Only,但这不是个日常(trivial)操作。"
-#: cmdline/apt-get.cc:867
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:869
+#: cmdline/apt-get.cc:868
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -864,28 +865,28 @@ msgstr ""
"若还想继续的话,就输入下面的短句“%s”\n"
" ?] "
-#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "中止执行。"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:979
msgid "Some files failed to download"
msgstr "有一些文件下载失败"
-#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -893,47 +894,47 @@ msgstr ""
"有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项"
"再试试?"
-#: cmdline/apt-get.cc:991
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)"
-#: cmdline/apt-get.cc:996
+#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: cmdline/apt-get.cc:997
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "放弃安装。"
-#: cmdline/apt-get.cc:1031
+#: cmdline/apt-get.cc:1030
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "注意,我选了 %s 而非 %s\n"
-#: cmdline/apt-get.cc:1041
+#: cmdline/apt-get.cc:1040
#, 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:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "软件包 %s 还未安装,因而不会被卸载\n"
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包:\n"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1081
msgid " [Installed]"
msgstr " [已安装]"
-#: cmdline/apt-get.cc:1087
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr "请您明确地选择一个来进行安装。"
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -944,93 +945,74 @@ msgstr ""
"这可能意味着这个缺失的软件包可能已被废弃,\n"
"或者只能在其他发布源中找到\n"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr "可是下列的软件包取代了它:"
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
msgstr "软件包 %s 还没有可供安装的候选者"
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1133
#, 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:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-get.cc:1171
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: cmdline/apt-get.cc:1173
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: cmdline/apt-get.cc:1179
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "选定了版本为 %s (%s) 的 %s\n"
-#: cmdline/apt-get.cc:1316
+#: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
msgstr " update 命令是不需任何参数的"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1326
msgid "Unable to lock the list directory"
msgstr "无法对状态列表目录加锁"
-#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1384
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
"有一些索引文件不能下载,它们可能被忽略了,也可能转而使用了旧的索引文件。"
-#: cmdline/apt-get.cc:1412
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: cmdline/apt-get.cc:1437
-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
-msgid "The following information may help to resolve the situation:"
-msgstr "下列的信息可能会对解决问题有所帮助:"
-
-#: cmdline/apt-get.cc:1444
-#, fuzzy
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "内部错误,problem resolver 坏事了"
-
-#: cmdline/apt-get.cc:1463
+#: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部错误,AllUpgrade 坏事了"
-#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1516
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意,根据正则表达式“%2$s”选中了 %1$s\n"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1546
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误:"
-#: cmdline/apt-get.cc:1617
+#: cmdline/apt-get.cc:1549
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1038,7 +1020,7 @@ msgstr ""
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1629
+#: cmdline/apt-get.cc:1561
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"
@@ -1049,7 +1031,7 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们还在新到(incoming)目录中。"
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1569
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"
@@ -1058,122 +1040,126 @@ msgstr ""
"您仅要求对单一软件包进行操作,这极有可能是因为该软件包安装不上,同时,\n"
"您最好提交一个针对这个软件包的故障报告。"
-#: cmdline/apt-get.cc:1645
+#: cmdline/apt-get.cc:1574
+msgid "The following information may help to resolve the situation:"
+msgstr "下列的信息可能会对解决问题有所帮助:"
+
+#: cmdline/apt-get.cc:1577
msgid "Broken packages"
msgstr "无法安装的软件包"
-#: cmdline/apt-get.cc:1676
+#: cmdline/apt-get.cc:1603
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包:"
-#: cmdline/apt-get.cc:1765
+#: cmdline/apt-get.cc:1692
msgid "Suggested packages:"
msgstr "建议安装的软件包:"
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1693
msgid "Recommended packages:"
msgstr "推荐安装的软件包:"
-#: cmdline/apt-get.cc:1786
+#: cmdline/apt-get.cc:1713
msgid "Calculating upgrade... "
msgstr "正在筹划升级... "
-#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:1794
+#: cmdline/apt-get.cc:1721
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
+#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误,problem resolver 坏事了"
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1894
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码,必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:1968
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:2067
+#: cmdline/apt-get.cc:1992
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的空余空间"
-#: cmdline/apt-get.cc:2072
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2000
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2081
+#: cmdline/apt-get.cc:2006
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2037
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2065
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
-#: cmdline/apt-get.cc:2152
+#: cmdline/apt-get.cc:2077
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2153
+#: cmdline/apt-get.cc:2078
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:2170
+#: cmdline/apt-get.cc:2095
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2114
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2130
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系(builddeps),必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2158
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
-#: cmdline/apt-get.cc:2253
+#: cmdline/apt-get.cc:2178
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2230
#, 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:2357
+#: cmdline/apt-get.cc:2282
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1182,30 +1168,30 @@ msgstr ""
"由于无法找到符合要求的软件包 %3$s 的可用版本,因此不能满足 %2$s 所要求的 %1"
"$s 依赖关系"
-#: cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:2317
#, 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:2417
+#: cmdline/apt-get.cc:2342
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
-#: cmdline/apt-get.cc:2431
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2360
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2392
msgid "Supported modules:"
msgstr "被支持模块:"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2433
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1539,9 +1525,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:643
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading package lists"
msgstr "正在读取软件包列表"
@@ -1643,12 +1629,12 @@ msgstr "无法在打包文件中找到有效的主控文件"
msgid "Unparsable control file"
msgstr "不能解析的主控文件"
-#: methods/cdrom.cc:114
+#: methods/cdrom.cc:115
#, c-format
msgid "Unable to read the cdrom database %s"
msgstr "无法读取光盘数据库 %s"
-#: methods/cdrom.cc:123
+#: methods/cdrom.cc:124
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
@@ -1656,29 +1642,29 @@ msgstr ""
"请使用 apt-cdrom,通过它就可以让 APT 能识别该光盘。apt-get upgdate 不能被用来"
"加入新的光盘。"
-#: methods/cdrom.cc:131
+#: methods/cdrom.cc:132
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:281 methods/gzip.cc:133
-#: methods/gzip.cc:142
+#: methods/copy.cc:42 methods/gpgv.cc:281 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/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -1805,7 +1791,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:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "把文件加入散列表时出错"
@@ -1890,9 +1876,9 @@ msgid "Unable to connect to %s %s:"
msgstr "不能连接上 %s %s:"
#: methods/gpgv.cc:65
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't access keyring: '%s'"
-msgstr "无法解析域名“%s”"
+msgstr "无法访问密匙:“%s”"
#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
@@ -1908,9 +1894,9 @@ msgid "At least one invalid signature was encountered."
msgstr "至少发现一个无效的签名。"
#: methods/gpgv.cc:213
-#, fuzzy, c-format
+#, c-format
msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
-msgstr "用于验证签名(您安装了 gnupg 么?)"
+msgstr "无法运行\"%s\"以便验证签名(您安装了 gnupg 么?)"
#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
@@ -1926,86 +1912,86 @@ msgid ""
"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 进程读取数据出错"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "受到了一行报头条目,它的长度超过了 %u 个字符"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "错误的报头条目"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "该 http 服务器发送了一个无效的应答报头"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "该 http 服务器的 range 支持不正常"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "连接服务器超时"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "写文件时出错"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "写文件时出错"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错,对方关闭了连接"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "内部错误"
@@ -2078,12 +2064,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... 完成"
@@ -2284,39 +2270,24 @@ msgstr "可选"
msgid "extra"
msgstr "额外"
-#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
msgid "Building dependency tree"
msgstr "正在分析软件包的依赖关系树"
-#: apt-pkg/depcache.cc:102
+#: apt-pkg/depcache.cc:62
msgid "Candidate versions"
msgstr "候选版本"
-#: apt-pkg/depcache.cc:131
+#: apt-pkg/depcache.cc:91
msgid "Dependency generation"
msgstr "生成依赖关系"
-#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
-#, fuzzy
-msgid "Reading state information"
-msgstr "正在合并现有信息"
-
-#: apt-pkg/depcache.cc:199
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "无法打开 %s"
-
-#: apt-pkg/depcache.cc:205
-#, 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:106
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "无法解析软件包文件 %s (1)"
-#: apt-pkg/tagfile.cc:186
+#: apt-pkg/tagfile.cc:193
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "无法解析软件包文件 %s (2)"
@@ -2387,13 +2358,13 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "不支持索引文件类型“%s”"
-#: apt-pkg/algorithms.cc:245
+#: apt-pkg/algorithms.cc:241
#, 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:1075
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2401,7 +2372,7 @@ msgstr ""
"错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的"
"缘故。"
-#: apt-pkg/algorithms.cc:1077
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关"
@@ -2420,14 +2391,14 @@ msgstr "找不到“%spartial”这个目录。"
#. only show the ETA if it makes sense
#. two days
#: apt-pkg/acquire.cc:823
-#, fuzzy, c-format
+#, 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
+#, c-format
msgid "Retrieving file %li of %li"
-msgstr "正在读取文件列表"
+msgstr "正在下载 %2$li 个文件中的 %1$li 个"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2439,17 +2410,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:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:138
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
@@ -2483,82 +2454,82 @@ msgstr "无法识别锁定的类型(pin type) %s"
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
-#: apt-pkg/pkgcachegen.cc:76
+#: apt-pkg/pkgcachegen.cc:74
msgid "Cache has an incompatible versioning system"
msgstr "软件包暂存区使用的是不兼容的版本控制系统"
-#: apt-pkg/pkgcachegen.cc:119
+#: apt-pkg/pkgcachegen.cc:117
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "处理 %s (NewPackage)时出错"
-#: apt-pkg/pkgcachegen.cc:131
+#: apt-pkg/pkgcachegen.cc:129
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "处理 %s (UsePackage1)时出错"
-#: apt-pkg/pkgcachegen.cc:152
+#: apt-pkg/pkgcachegen.cc:150
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "处理 %s (UsePackage2)时出错"
-#: apt-pkg/pkgcachegen.cc:156
+#: apt-pkg/pkgcachegen.cc:154
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "处理 %s (NewFileVer1)时出错"
-#: apt-pkg/pkgcachegen.cc:186
+#: apt-pkg/pkgcachegen.cc:184
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "处理 %s (NewVersion1)时出错"
-#: apt-pkg/pkgcachegen.cc:190
+#: apt-pkg/pkgcachegen.cc:188
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "处理 %s (UsePackage3)时出错"
-#: apt-pkg/pkgcachegen.cc:194
+#: apt-pkg/pkgcachegen.cc:192
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "处理 %s (NewVersion2)时出错"
-#: apt-pkg/pkgcachegen.cc:209
+#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "糟了,软件包的数量了超出本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:212
+#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "糟了,软件包版本的数量了超出本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:215
+#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "糟了,依赖关系的数量超出了本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:243
+#: apt-pkg/pkgcachegen.cc:241
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "处理 %s (FindPkg)时出错"
-#: apt-pkg/pkgcachegen.cc:256
+#: apt-pkg/pkgcachegen.cc:254
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "处理 %s (CollectFileProvides)时出错"
-#: apt-pkg/pkgcachegen.cc:262
+#: apt-pkg/pkgcachegen.cc:260
#, 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:574
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
-#: apt-pkg/pkgcachegen.cc:662
+#: apt-pkg/pkgcachegen.cc:658
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "无法写入来源缓存文件"
@@ -2567,15 +2538,15 @@ msgstr "无法写入来源缓存文件"
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:236 apt-pkg/acquire-item.cc:945
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:646
-msgid "There are no public key available for the following key IDs:\n"
+#: apt-pkg/acquire-item.cc:640
+msgid "There is 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:753
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2584,7 +2555,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:818
+#: apt-pkg/acquire-item.cc:812
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2592,13 +2563,13 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:854
+#: apt-pkg/acquire-item.cc:848
#, 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:935
msgid "Size mismatch"
msgstr "大小不符"
@@ -2616,47 +2587,47 @@ msgstr ""
"现把 %s 作为了 CD-ROM 的挂载点\n"
"正在挂载 CD-ROM\n"
-#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+#: apt-pkg/cdrom.cc:518 apt-pkg/cdrom.cc:600
msgid "Identifying.. "
msgstr "正在鉴别.. "
-#: apt-pkg/cdrom.cc:541
+#: apt-pkg/cdrom.cc:543
#, c-format
msgid "Stored label: %s \n"
msgstr "存档标签:%s \n"
-#: apt-pkg/cdrom.cc:561
+#: apt-pkg/cdrom.cc:563
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
-#: apt-pkg/cdrom.cc:579
+#: apt-pkg/cdrom.cc:581
msgid "Unmounting CD-ROM\n"
msgstr "正在卸载 CD-ROM 文件系统\n"
-#: apt-pkg/cdrom.cc:583
+#: apt-pkg/cdrom.cc:585
msgid "Waiting for disc...\n"
msgstr "等待插入盘片……\n"
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:593
msgid "Mounting CD-ROM...\n"
msgstr "正在挂载 CD-ROM 文件系统……\n"
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:611
msgid "Scanning disc for index files..\n"
msgstr "正在光盘中查找索引文件..\n"
-#: apt-pkg/cdrom.cc:647
+#: apt-pkg/cdrom.cc:649
#, c-format
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "找到了 %i 个软件包索引、%i 个源代码包索引,和 %i 个数字签名\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:714
msgid "That is not a valid name, try again.\n"
msgstr "这不是一个有效的名字,请再次命名。\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:730
#, c-format
msgid ""
"This disc is called: \n"
@@ -2665,19 +2636,19 @@ msgstr ""
"这张光盘现在的名字是:\n"
"“%s”\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:734
msgid "Copying package lists..."
msgstr "正在复制软件包列表……"
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:758
msgid "Writing new source list\n"
msgstr "正在写入新的软件包源列表\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:767
msgid "Source list entries for this disc are:\n"
msgstr "对应于该光盘的软件包源设置项是:\n"
-#: apt-pkg/cdrom.cc:803
+#: apt-pkg/cdrom.cc:810
msgid "Unmounting CD-ROM..."
msgstr "正在卸载 CD-ROM 文件系统……"
@@ -2742,19 +2713,22 @@ 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 "连接被永久关闭"
+#~ msgid "Could not patch file"
+#~ msgstr "无法打开补丁文件"
+
#~ msgid "File date has changed %s"
#~ msgstr "文件 %s 的时间已被改动"