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.po612
1 files changed, 312 insertions, 300 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4ddab31a0..51bfebd4f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-11 14:52+0200\n"
+"POT-Creation-Date: 2013-06-26 07:37+0200\n"
"PO-Revision-Date: 2010-08-26 14:42+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -97,72 +97,72 @@ msgstr "总占用空间:"
msgid "Package file %s is out of sync."
msgstr "软件包文件 %s 尚未同步。"
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
-#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422
+#: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46
#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
msgid "No packages found"
msgstr "没有发现匹配的软件包"
-#: cmdline/apt-cache.cc:1226
+#: cmdline/apt-cache.cc:1243
msgid "You must give at least one search pattern"
msgstr "您必须明确地给出至少一个表达式"
-#: cmdline/apt-cache.cc:1361
+#: cmdline/apt-cache.cc:1401
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510
#, c-format
msgid "Unable to locate package %s"
msgstr "未发现软件包 %s"
-#: cmdline/apt-cache.cc:1486
+#: cmdline/apt-cache.cc:1526
msgid "Package files:"
msgstr "软件包文件:"
-#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "缓存尚未同步,无法交差引证(x-ref)一个软件包文件"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1507
+#: cmdline/apt-cache.cc:1547
msgid "Pinned packages:"
msgstr "被锁定的软件包:"
-#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604
msgid "(not found)"
msgstr "(没有找到)"
-#: cmdline/apt-cache.cc:1527
+#: cmdline/apt-cache.cc:1567
msgid " Installed: "
msgstr " 已安装:"
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1568
msgid " Candidate: "
msgstr " 候选软件包:"
-#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594
msgid "(none)"
msgstr "(无)"
-#: cmdline/apt-cache.cc:1561
+#: cmdline/apt-cache.cc:1601
msgid " Package pin: "
msgstr " 软件包锁:"
#. Show the priority tables
-#: cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:1610
msgid " Version table:"
msgstr " 版本列表:"
-#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s,用于 %s 构架,编译于 %s %s\n"
-#: cmdline/apt-cache.cc:1690
+#: cmdline/apt-cache.cc:1730
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -236,20 +236,28 @@ msgstr ""
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
"若要了解更多信息,您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n"
-#: cmdline/apt-cdrom.cc:79
+#. }}}
+#: cmdline/apt-cdrom.cc:43
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:85
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "请给这张盘片起个名字,比如“Debian 5.0.3 Disk 1”"
-#: cmdline/apt-cdrom.cc:94
+#: cmdline/apt-cdrom.cc:100
msgid "Please insert a Disc in the drive and press enter"
msgstr "请把盘片插入驱动器再按回车键"
-#: cmdline/apt-cdrom.cc:129
+#: cmdline/apt-cdrom.cc:135
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "无法将 %s 挂载到 %s"
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:170
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
@@ -482,7 +490,7 @@ msgstr "不能重新安装 %s,因为无法下载它。\n"
msgid "%s is already the newest version.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被设置为手动安装。\n"
@@ -589,8 +597,8 @@ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:2593
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的可用空间"
@@ -629,7 +637,7 @@ msgstr "中止执行。"
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗?[Y/n]"
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
@@ -638,7 +646,7 @@ msgstr "无法下载 %s %s\n"
msgid "Some files failed to download"
msgstr "有一些文件无法下载"
-#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
+#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
@@ -715,7 +723,7 @@ msgstr "似乎自动卸载工具损坏了一些软件,这不应该发生。请
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988
msgid "The following information may help to resolve the situation:"
msgstr "下列信息可能会对解决问题有所帮助:"
@@ -760,7 +768,7 @@ msgstr ""
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1973
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"
@@ -771,78 +779,78 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
-#: cmdline/apt-get.cc:1995
+#: cmdline/apt-get.cc:1994
msgid "Broken packages"
msgstr "破损的软件包"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2020
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包:"
-#: cmdline/apt-get.cc:2111
+#: cmdline/apt-get.cc:2110
msgid "Suggested packages:"
msgstr "建议安装的软件包:"
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2111
msgid "Recommended packages:"
msgstr "推荐安装的软件包:"
-#: cmdline/apt-get.cc:2154
+#: cmdline/apt-get.cc:2153
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2184
msgid "Calculating upgrade... "
msgstr "正在对升级进行计算... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2192
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误,问题解决工具坏事了"
-#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331
msgid "Unable to lock the download directory"
msgstr "无法锁定下载目录"
-#: cmdline/apt-get.cc:2388
+#: cmdline/apt-get.cc:2387
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2392
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2453
+#: cmdline/apt-get.cc:2452
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码,必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
+#: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:2510
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -851,7 +859,7 @@ msgstr ""
"提示:%s 的打包工作被维护于以下位置的 %s 版本控制系统中:\n"
"%s\n"
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2514
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -862,104 +870,104 @@ msgstr ""
"bzr get %s\n"
"获得该软件包的最近更新(可能尚未正式发布)。\n"
-#: cmdline/apt-get.cc:2568
+#: cmdline/apt-get.cc:2567
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2604
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的可用空间"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2613
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2618
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2625
+#: cmdline/apt-get.cc:2624
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:2663
+#: cmdline/apt-get.cc:2662
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2694
+#: cmdline/apt-get.cc:2693
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "忽略已经被解包到 %s 目录的源代码包\n"
-#: cmdline/apt-get.cc:2706
+#: cmdline/apt-get.cc:2705
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2707
+#: cmdline/apt-get.cc:2706
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:2729
+#: cmdline/apt-get.cc:2728
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2749
+#: cmdline/apt-get.cc:2748
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2768
+#: cmdline/apt-get.cc:2767
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系,必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2793
+#: cmdline/apt-get.cc:2792
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
+#: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系信息"
-#: cmdline/apt-get.cc:2840
+#: cmdline/apt-get.cc:2839
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:3010
+#: cmdline/apt-get.cc:3009
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:3028
+#: cmdline/apt-get.cc:3027
#, 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:3051
+#: cmdline/apt-get.cc:3050
#, 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:3090
+#: cmdline/apt-get.cc:3089
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -968,37 +976,37 @@ msgstr ""
"由于无法找到符合要求的软件包 %3$s 的可用版本,因此不能满足 %2$s 所要求的 "
"%1$s 依赖关系"
-#: cmdline/apt-get.cc:3096
+#: cmdline/apt-get.cc:3095
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:3119
+#: cmdline/apt-get.cc:3118
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
-#: cmdline/apt-get.cc:3135
+#: cmdline/apt-get.cc:3133
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:3140
+#: cmdline/apt-get.cc:3138
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "正在连接 %s (%s)"
-#: cmdline/apt-get.cc:3371
+#: cmdline/apt-get.cc:3366
msgid "Supported modules:"
msgstr "支持的模块:"
-#: cmdline/apt-get.cc:3412
+#: cmdline/apt-get.cc:3407
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1086,7 +1094,7 @@ msgstr ""
"以获取更多信息和选项。\n"
" 本 APT 具有超级牛力。\n"
-#: cmdline/apt-get.cc:3577
+#: cmdline/apt-get.cc:3572
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1160,7 +1168,8 @@ msgid "%s was already not hold.\n"
msgstr "%s 已经是最新的版本了。\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出,但是它并不存在"
@@ -1297,8 +1306,8 @@ msgstr "连接超时"
msgid "Server closed the connection"
msgstr "服务器关闭了连接"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263
+#: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275
msgid "Read error"
msgstr "读错误"
@@ -1311,8 +1320,8 @@ msgid "Protocol corruption"
msgstr "协议有误"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368
+#: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396
msgid "Write error"
msgstr "写出错"
@@ -1366,7 +1375,7 @@ msgstr "数据套接字连接超时"
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "把文件加入哈希表时出错"
@@ -1393,85 +1402,98 @@ msgstr "查询"
msgid "Unable to invoke "
msgstr "无法调用 "
-#: methods/connect.cc:75
+#: methods/connect.cc:76
#, c-format
msgid "Connecting to %s (%s)"
msgstr "正在连接 %s (%s)"
-#: methods/connect.cc:86
+#: methods/connect.cc:87
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:93
+#: methods/connect.cc:94
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"
-#: methods/connect.cc:99
+#: methods/connect.cc:100
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "无法发起与 %s:%s (%s) 的连接"
-#: methods/connect.cc:107
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "无法连接上 %s:%s (%s),连接超时"
-#: methods/connect.cc:125
+#: methods/connect.cc:126
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "无法连接上 %s:%s (%s)。"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:153 methods/rsh.cc:433
+#: methods/connect.cc:154 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "正在连接 %s"
-#: methods/connect.cc:172 methods/connect.cc:191
+#: methods/connect.cc:180 methods/connect.cc:199
#, c-format
msgid "Could not resolve '%s'"
msgstr "无法解析域名“%s”"
-#: methods/connect.cc:197
+#: methods/connect.cc:205
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "暂时不能解析域名“%s”"
-#: methods/connect.cc:200
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
+
+#: methods/connect.cc:211
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
-#: methods/connect.cc:247
+#: methods/connect.cc:258
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "不能连接到 %s:%s:"
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:166
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部错误:签名正确无误,但是无法确认密钥指纹?!"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:170
msgid "At least one invalid signature was encountered."
msgstr "至少发现一个无效的签名。"
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:172
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗?)"
-#: methods/gpgv.cc:194
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
+
+#: methods/gpgv.cc:182
msgid "Unknown error executing gpgv"
msgstr "运行 gpgv 时发生未知错误"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
msgid "The following signatures were invalid:\n"
msgstr "下列签名无效:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:229
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1509,53 +1531,53 @@ msgstr "该 HTTP 服务器的 range 支持不正常"
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:818
+#: methods/http.cc:827
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:823
+#: methods/http.cc:832
msgid "Connection timed out"
msgstr "连接超时"
-#: methods/http.cc:846
+#: methods/http.cc:855
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:877
+#: methods/http.cc:886
msgid "Error writing to file"
msgstr "写入文件出错"
-#: methods/http.cc:905
+#: methods/http.cc:914
msgid "Error writing to the file"
msgstr "写入文件出错"
-#: methods/http.cc:919
+#: methods/http.cc:928
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错,对方关闭了连接"
-#: methods/http.cc:921
+#: methods/http.cc:930
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:1194
+#: methods/http.cc:1198
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1215 methods/http.cc:1270
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1358
+#: methods/http.cc:1362
msgid "Internal error"
msgstr "内部错误"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401
+#: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
@@ -1582,7 +1604,12 @@ msgstr "没有找到镜像文件 %s"
msgid "Can not read mirror file '%s'"
msgstr "没有找到镜像文件 %s"
-#: methods/mirror.cc:442
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "没有找到镜像文件 %s"
+
+#: methods/mirror.cc:445
#, c-format
msgid "[Mirror: %s]"
msgstr "[镜像:%s]"
@@ -1672,7 +1699,7 @@ msgstr ""
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
@@ -1816,8 +1843,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "无法打开数据库文件 %s:%s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
#, c-format
msgid "Failed to stat %s"
msgstr "无法获得 %s 的状态"
@@ -1830,87 +1857,87 @@ msgstr "归档文件没有包含控制字段"
msgid "Unable to get a cursor"
msgstr "无法获得游标"
-#: ftparchive/writer.cc:80
+#: ftparchive/writer.cc:82
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告:无法读取目录 %s\n"
-#: ftparchive/writer.cc:85
+#: ftparchive/writer.cc:87
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告:无法获得 %s 的状态\n"
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
msgid "E: "
msgstr "错误:"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:145
msgid "W: "
msgstr "警告:"
-#: ftparchive/writer.cc:150
+#: ftparchive/writer.cc:152
msgid "E: Errors apply to file "
msgstr "错误:处理文件时出错 "
-#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
#, c-format
msgid "Failed to resolve %s"
msgstr "无法解析 %s"
-#: ftparchive/writer.cc:181
+#: ftparchive/writer.cc:183
msgid "Tree walking failed"
msgstr "无法遍历目录树"
-#: ftparchive/writer.cc:208
+#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
msgstr "无法打开 %s"
-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:269
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:277
#, c-format
msgid "Failed to readlink %s"
msgstr "无法读取符号链接 %s"
-#: ftparchive/writer.cc:279
+#: ftparchive/writer.cc:281
#, c-format
msgid "Failed to unlink %s"
msgstr "无法使用 unlink 删除 %s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:288
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 无法将 %s 链接到 %s"
-#: ftparchive/writer.cc:296
+#: ftparchive/writer.cc:298
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " 达到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:401
+#: ftparchive/writer.cc:403
msgid "Archive had no package field"
msgstr "归档文件没有包含 package 字段"
-#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:711
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 没有源代码的 override 项\n"
-#: ftparchive/writer.cc:728
+#: ftparchive/writer.cc:715
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 中没有二进制文件的 override 项\n"
@@ -1984,7 +2011,7 @@ msgstr "在计算 MD5 校验和时无法读取数据"
msgid "Problem unlinking %s"
msgstr "在使用 unlink 删除 %s 时出错"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "无法将 %s 重命名为 %s"
@@ -2042,23 +2069,23 @@ msgstr ""
" -c=? 读取指定配置文件\n"
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:116
msgid "Failed to create pipes"
msgstr "无法创建管道"
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "无法执行 gzip"
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
msgid "Corrupted archive"
msgstr "包文件已被损坏"
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:195
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar 的校验和不符,文件已损坏"
-#: apt-inst/contrib/extracttar.cc:303
+#: apt-inst/contrib/extracttar.cc:302
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "未知的 TAR 数据头类型 %u,成员 %s"
@@ -2129,54 +2156,54 @@ msgstr "无法写入文件 %s"
msgid "Failed to close file %s"
msgstr "无法关闭文件 %s"
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
#, c-format
msgid "The path %s is too long"
msgstr "路径名 %s 太长"
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125
#, c-format
msgid "Unpacking %s more than once"
msgstr "%s 被解包了不只一次"
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135
#, c-format
msgid "The directory %s is diverted"
msgstr "目录 %s 已被转移"
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "该软件包正尝试写入转移对象 %s/%s"
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
msgid "The diversion path is too long"
msgstr "该转移路径太长"
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "目录 %s 要被一个非目录的文件替换"
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282
msgid "Failed to locate node in its hash bucket"
msgstr "无法在其散列桶中分配节点"
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286
msgid "The path is too long"
msgstr "路径名太长"
-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "用来覆盖的软件包不属于 %s 的任何版本"
-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491
#, c-format
msgid "Unable to stat %s"
msgstr "无法读取 %s 的状态"
@@ -2254,30 +2281,30 @@ msgid ""
msgstr "无法增加 MMap 大小,因为用户已禁用自动增加。"
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li天 %li小时 %li分 %li秒"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%lih %limin %lis"
msgstr "%li小时 %li分 %li秒"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:392
#, c-format
msgid "%limin %lis"
msgstr "%li分 %li秒"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:397
#, c-format
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1173
#, c-format
msgid "Selection %s not found"
msgstr "找不到您选则的 %s"
@@ -2347,6 +2374,16 @@ msgstr "%c%s... 有错误!"
msgid "%c%s... Done"
msgstr "%c%s... 完成"
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... 完成"
+
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2407,114 +2444,120 @@ msgstr "无法读取盘片的状态"
msgid "Problem closing the gzip file %s"
msgstr "关闭 gzip %s 文件出错"
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:226
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "由于文件系统为只读,因而无法使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:230
+#: apt-pkg/contrib/fileutl.cc:231
#, c-format
msgid "Could not open lock file %s"
msgstr "无法打开锁文件 %s"
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:249
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "无法在 nfs 文件系统上使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:252
+#: apt-pkg/contrib/fileutl.cc:253
#, c-format
msgid "Could not get lock %s"
msgstr "无法获得锁 %s"
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:427
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:445
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:454
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:841
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子进程 %s 发生了段错误"
-#: apt-pkg/contrib/fileutl.cc:842
+#: apt-pkg/contrib/fileutl.cc:843
#, c-format
msgid "Sub-process %s received signal %u."
msgstr "子进程 %s 收到信号 %u。"
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出"
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:985
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1062
#, c-format
msgid "Could not open file descriptor %d"
msgstr "无法打开文件描述符 %d"
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1147
msgid "Failed to create subprocess IPC"
msgstr "无法创建子进程的 IPC 管道"
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1202
msgid "Failed to exec compressor "
msgstr "无法执行压缩程序"
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1297
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "读取文件出错,还剩 %lu 字节没有读出"
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "写入文件出错,还剩 %lu 字节没有保存"
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1681
#, c-format
msgid "Problem closing the file %s"
msgstr "关闭文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1693
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "重命名文件 %s 为 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1704
#, c-format
msgid "Problem unlinking the file %s"
msgstr "用 unlink 删除文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1717
msgid "Problem syncing the file"
msgstr "同步文件出错"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:76
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s 中没有安装密钥环。"
+
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "软件包缓存区是空的"
@@ -2541,59 +2584,59 @@ msgstr "本程序目前不支持“%s”版本系统"
msgid "The package cache was built for a different architecture"
msgstr "软件包缓存区是为其它架构的硬件构建的"
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
msgid "Depends"
msgstr "依赖"
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
msgid "PreDepends"
msgstr "预依赖"
-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314
msgid "Suggests"
msgstr "建议"
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
msgid "Recommends"
msgstr "推荐"
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
msgid "Conflicts"
msgstr "冲突"
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315
msgid "Replaces"
msgstr "替换"
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
msgid "Obsoletes"
msgstr "废弃"
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
msgid "Breaks"
msgstr "破坏"
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316
msgid "Enhances"
msgstr "增强"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
msgid "important"
msgstr "重要"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
msgid "required"
msgstr "必需"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327
msgid "standard"
msgstr "标准"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
msgid "optional"
msgstr "可选"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328
msgid "extra"
msgstr "额外"
@@ -2693,17 +2736,17 @@ msgstr "正在打开 %s"
msgid "Line %u too long in source list %s."
msgstr "源列表 %2$s 的第 %1$u 行太长了。"
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”"
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2712,12 +2755,12 @@ msgstr ""
"无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
"(%d)"
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
+#: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "无法打开文件 %s"
-#: apt-pkg/packagemanager.cc:546
+#: apt-pkg/packagemanager.cc:569
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2739,7 +2782,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "软件包 %s 需要重新安装,但是我无法找到相应的安装文件。"
-#: apt-pkg/algorithms.cc:1228
+#: apt-pkg/algorithms.cc:1234
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2747,13 +2790,13 @@ msgstr ""
"错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的"
"缘故。"
-#: apt-pkg/algorithms.cc:1230
+#: apt-pkg/algorithms.cc:1236
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关"
"系。"
-#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
+#: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2761,7 +2804,7 @@ msgid ""
msgstr ""
"有一些索引文件不能下载,它们可能被忽略了,也可能转而使用了旧的索引文件。"
-#: apt-pkg/acquire.cc:81
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
#, c-format
msgid "List directory %spartial is missing."
msgstr "软件包列表的目录 %spartial 缺失。"
@@ -2798,17 +2841,17 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
msgid "Method %s did not start correctly"
msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
@@ -2861,14 +2904,14 @@ msgstr "软件包暂存区使用的是不兼容的版本控制系统"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "处理 %s (FindPkg)时出错"
@@ -2889,26 +2932,26 @@ msgstr "哇,软件包说明数量超出了本 APT 的处理能力。"
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "哇,依赖关系数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "当处理文件依赖关系时,无法找到软件包 %s %s"
-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1199
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
msgid "Reading package lists"
msgstr "正在读取软件包列表"
-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1304
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
msgid "IO Error saving source cache"
msgstr "无法读取或写入软件源缓存"
@@ -2921,54 +2964,54 @@ msgstr "无法重命名文件,%s (%s -> %s)。"
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876
+#: apt-pkg/acquire-item.cc:2019
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1377
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1393
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1435
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 ID 的密钥没有可用的公钥:\n"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1473
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1495
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "冲突的发行版:%s (期望 %s 但得到 %s)"
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1525
#, c-format
msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 错误:%s: %s"
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1652
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2977,7 +3020,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1711
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2985,37 +3028,37 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1770
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1868
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/indexrecords.cc:64
+#: apt-pkg/indexrecords.cc:68
#, c-format
msgid "Unable to parse Release file %s"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/indexrecords.cc:74
+#: apt-pkg/indexrecords.cc:78
#, c-format
msgid "No sections in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-#: apt-pkg/indexrecords.cc:121
+#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
-#: apt-pkg/indexrecords.cc:140
+#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
@@ -3043,7 +3086,7 @@ msgstr "正在鉴别.. "
msgid "Stored label: %s\n"
msgstr "已归档文件的标签:%s\n"
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
msgid "Unmounting CD-ROM...\n"
msgstr "正在卸载 CD-ROM...\n"
@@ -3107,30 +3150,30 @@ msgstr ""
msgid "Copying package lists..."
msgstr "正在复制软件包列表……"
-#: apt-pkg/cdrom.cc:857
+#: apt-pkg/cdrom.cc:865
msgid "Writing new source list\n"
msgstr "正在写入新的源列表\n"
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:873
msgid "Source list entries for this disc are:\n"
msgstr "对应于该盘片的软件源设置项是:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774
#, c-format
msgid "Wrote %i records.\n"
msgstr "已写入 %i 条记录。\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "已写入 %i 条记录,并有 %i 个文件缺失。\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个文件不匹配\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个缺失,以及 %i 个文件不匹配\n"
@@ -3145,17 +3188,6 @@ msgstr "无法找到认证记录:%s"
msgid "Hash mismatch for: %s"
msgstr "Hash 校验和不符:%s"
-#: apt-pkg/indexcopy.cc:662
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s 中没有安装密钥环。"
-
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3219,119 +3251,119 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
#, c-format
msgid "Installing %s"
msgstr "正在安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Configuring %s"
msgstr "正在配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removing %s"
msgstr "正在删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Completely removing %s"
msgstr "完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Noting disappearance of %s"
msgstr "注意到 %s 已经消失"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
#, c-format
msgid "Running post-installation trigger %s"
msgstr "执行安装后执行的触发器 %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
#, c-format
msgid "Directory '%s' missing"
msgstr "目录 %s 缺失"
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
#, c-format
msgid "Could not open file '%s'"
msgstr "无法打开文件 %s"
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Preparing %s"
msgstr "正在准备 %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
#, c-format
msgid "Unpacking %s"
msgstr "正在解压缩 %s"
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Preparing to configure %s"
msgstr "正在准备配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
#, c-format
msgid "Installed %s"
msgstr "已安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在准备 %s 的删除操作"
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
#, c-format
msgid "Removed %s"
msgstr "已删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在准备完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
#, c-format
msgid "Completely removed %s"
msgstr "完全删除了 %s"
-#: apt-pkg/deb/dpkgpm.cc:1212
+#: apt-pkg/deb/dpkgpm.cc:1213
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1242
+#: apt-pkg/deb/dpkgpm.cc:1243
msgid "Running dpkg"
msgstr "正在运行 dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1414
+#: apt-pkg/deb/dpkgpm.cc:1415
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1476
+#: apt-pkg/deb/dpkgpm.cc:1477
msgid "No apport report written because MaxReports is reached already"
msgstr "由于已经达到 MaxReports 限制,没有写入 apport 报告。"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1481
+#: apt-pkg/deb/dpkgpm.cc:1482
msgid "dependency problems - leaving unconfigured"
msgstr "依赖问题 - 保持未配置"
-#: apt-pkg/deb/dpkgpm.cc:1483
+#: apt-pkg/deb/dpkgpm.cc:1484
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr "因为错误消息指示这是由于上一个问题导致的错误,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1489
+#: apt-pkg/deb/dpkgpm.cc:1490
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3343,13 +3375,7 @@ msgid ""
"error"
msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1530
+#: apt-pkg/deb/dpkgpm.cc:1503
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。"
@@ -3378,20 +3404,6 @@ msgstr "dpkg 被中断,您必须手工运行 %s 解决此问题。"
msgid "Not locked"
msgstr "未锁定"
-#, fuzzy
-#~ msgid "System error resolving '%s:%s'"
-#~ msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
-
-#, fuzzy
-#~ msgid "%c%s... %u%%"
-#~ msgstr "%c%s... 完成"
-
-#~ msgid ""
-#~ "An error occurred during the signature verification. The repository is "
-#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
-#~ msgstr ""
-#~ "校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n"
-
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "跳过不存在的文件 %s"