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.po405
1 files changed, 207 insertions, 198 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8f25691e9..4ddab31a0 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-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+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"
@@ -155,7 +155,7 @@ msgid " Version table:"
msgstr " 版本列表:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 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
@@ -629,7 +629,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:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
@@ -807,7 +807,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "正在对升级进行计算... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "失败"
@@ -994,11 +994,11 @@ msgstr "无法处理构建依赖关系"
msgid "Changelog for %s (%s)"
msgstr "正在连接 %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "支持的模块:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1086,7 +1086,7 @@ msgstr ""
"以获取更多信息和选项。\n"
" 本 APT 具有超级牛力。\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1160,8 +1160,7 @@ 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/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出,但是它并不存在"
@@ -1298,8 +1297,8 @@ msgstr "连接超时"
msgid "Server closed the connection"
msgstr "服务器关闭了连接"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: 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
msgid "Read error"
msgstr "读错误"
@@ -1312,8 +1311,8 @@ msgid "Protocol corruption"
msgstr "协议有误"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "写出错"
@@ -1367,7 +1366,7 @@ msgstr "数据套接字连接超时"
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "把文件加入哈希表时出错"
@@ -1394,90 +1393,85 @@ msgstr "查询"
msgid "Unable to invoke "
msgstr "无法调用 "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "正在连接 %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, 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:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "无法发起与 %s:%s (%s) 的连接"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "无法连接上 %s:%s (%s),连接超时"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, 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:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "正在连接 %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "无法解析域名“%s”"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "暂时不能解析域名“%s”"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "不能连接到 %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部错误:签名正确无误,但是无法确认密钥指纹?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "至少发现一个无效的签名。"
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "运行 gpgv 时发生未知错误"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "下列签名无效:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1515,53 +1509,53 @@ msgstr "该 HTTP 服务器的 range 支持不正常"
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "连接超时"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "写入文件出错"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "写入文件出错"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错,对方关闭了连接"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
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:464
+#: 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:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: 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
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
@@ -1678,7 +1672,7 @@ msgstr ""
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
@@ -1822,8 +1816,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "无法打开数据库文件 %s:%s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "无法获得 %s 的状态"
@@ -1836,87 +1830,87 @@ msgstr "归档文件没有包含控制字段"
msgid "Unable to get a cursor"
msgstr "无法获得游标"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告:无法读取目录 %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告:无法获得 %s 的状态\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "错误:"
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "警告:"
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "错误:处理文件时出错 "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "无法解析 %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "无法遍历目录树"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "无法打开 %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "无法读取符号链接 %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "无法使用 unlink 删除 %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 无法将 %s 链接到 %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " 达到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "归档文件没有包含 package 字段"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 没有源代码的 override 项\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 中没有二进制文件的 override 项\n"
@@ -1990,7 +1984,7 @@ msgstr "在计算 MD5 校验和时无法读取数据"
msgid "Problem unlinking %s"
msgstr "在使用 unlink 删除 %s 时出错"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "无法将 %s 重命名为 %s"
@@ -2135,54 +2129,54 @@ msgstr "无法写入文件 %s"
msgid "Failed to close file %s"
msgstr "无法关闭文件 %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "路径名 %s 太长"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "%s 被解包了不只一次"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "目录 %s 已被转移"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "该软件包正尝试写入转移对象 %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "该转移路径太长"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "目录 %s 要被一个非目录的文件替换"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "无法在其散列桶中分配节点"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "路径名太长"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "用来覆盖的软件包不属于 %s 的任何版本"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "无法读取 %s 的状态"
@@ -2260,30 +2254,30 @@ msgid ""
msgstr "无法增加 MMap 大小,因为用户已禁用自动增加。"
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, 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:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%li小时 %li分 %li秒"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%li分 %li秒"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "找不到您选则的 %s"
@@ -2353,16 +2347,6 @@ 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."
@@ -2474,69 +2458,63 @@ msgstr "子进程 %s 发生了段错误"
msgid "Sub-process %s received signal %u."
msgstr "子进程 %s 收到信号 %u。"
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "无法打开文件描述符 %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "无法创建子进程的 IPC 管道"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "无法执行压缩程序"
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "读取文件出错,还剩 %lu 字节没有读出"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "写入文件出错,还剩 %lu 字节没有保存"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "关闭文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "重命名文件 %s 为 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "用 unlink 删除文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
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 "软件包缓存区是空的"
@@ -2563,59 +2541,59 @@ msgstr "本程序目前不支持“%s”版本系统"
msgid "The package cache was built for a different architecture"
msgstr "软件包缓存区是为其它架构的硬件构建的"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "依赖"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "预依赖"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "建议"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "推荐"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "冲突"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "替换"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "废弃"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "破坏"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "增强"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "重要"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "必需"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "标准"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "可选"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "额外"
@@ -2715,12 +2693,12 @@ msgstr "正在打开 %s"
msgid "Line %u too long in source list %s."
msgstr "源列表 %2$s 的第 %1$u 行太长了。"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”"
@@ -2761,7 +2739,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "软件包 %s 需要重新安装,但是我无法找到相应的安装文件。"
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2769,13 +2747,13 @@ msgstr ""
"错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的"
"缘故。"
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关"
"系。"
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2825,12 +2803,12 @@ msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
@@ -2883,14 +2861,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:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: 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
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "处理 %s (FindPkg)时出错"
@@ -2911,26 +2889,26 @@ msgstr "哇,软件包说明数量超出了本 APT 的处理能力。"
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "哇,依赖关系数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "当处理文件依赖关系时,无法找到软件包 %s %s"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "正在读取软件包列表"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "无法读取或写入软件源缓存"
@@ -2943,54 +2921,54 @@ msgstr "无法重命名文件,%s (%s -> %s)。"
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, 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:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 ID 的密钥没有可用的公钥:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, 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:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "冲突的发行版:%s (期望 %s 但得到 %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A 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:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 错误:%s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2999,7 +2977,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3007,37 +2985,37 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
@@ -3137,22 +3115,22 @@ msgstr "正在写入新的源列表\n"
msgid "Source list entries for this disc are:\n"
msgstr "对应于该盘片的软件源设置项是:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "已写入 %i 条记录。\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "已写入 %i 条记录,并有 %i 个文件缺失。\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个文件不匹配\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个缺失,以及 %i 个文件不匹配\n"
@@ -3167,6 +3145,17 @@ 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"
@@ -3230,119 +3219,119 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "正在安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "正在配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "正在删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "注意到 %s 已经消失"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "执行安装后执行的触发器 %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "目录 %s 缺失"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "无法打开文件 %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "正在准备 %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "正在解压缩 %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "正在准备配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "已安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在准备 %s 的删除操作"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "已删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在准备完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "完全删除了 %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "正在运行 dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
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:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "依赖问题 - 保持未配置"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
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:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3354,7 +3343,13 @@ msgid ""
"error"
msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: 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
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。"
@@ -3383,6 +3378,20 @@ 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"