# Chinese/Simplified translation of apt.
# This file is put in the public domain.
-# Tchaikov <chaisave@263.net>, 2004.
-# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004.
-#
+# 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: 2005-09-13 15:16+0200\n"
-"PO-Revision-Date: 2005-02-09 17:34+0800\n"
-"Last-Translator: Tchaikov <chaisave@263.net>\n"
-"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
+"POT-Creation-Date: 2008-01-07 19:11+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"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:135
+#: cmdline/apt-cache.cc:143
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
-#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
-#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
-#: cmdline/apt-cache.cc:1508
+#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
+#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
+#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
#, c-format
msgid "Unable to locate package %s"
msgstr "未发现软件包 %s"
-#: cmdline/apt-cache.cc:232
+#: cmdline/apt-cache.cc:247
msgid "Total package names : "
msgstr "软件包总数(按名称计)："
-#: cmdline/apt-cache.cc:272
+#: cmdline/apt-cache.cc:287
msgid " Normal packages: "
msgstr " 普通软件包："
-#: cmdline/apt-cache.cc:273
+#: cmdline/apt-cache.cc:288
msgid " Pure virtual packages: "
msgstr " 完全虚拟软件包："
-#: cmdline/apt-cache.cc:274
+#: cmdline/apt-cache.cc:289
msgid " Single virtual packages: "
msgstr " 单虚拟软件包："
-#: cmdline/apt-cache.cc:275
+#: cmdline/apt-cache.cc:290
msgid " Mixed virtual packages: "
msgstr " 混合虚拟软件包："
-#: cmdline/apt-cache.cc:276
+#: cmdline/apt-cache.cc:291
msgid " Missing: "
msgstr " 缺漏的："
-#: cmdline/apt-cache.cc:278
+#: cmdline/apt-cache.cc:293
msgid "Total distinct versions: "
msgstr "按版本共计："
-#: cmdline/apt-cache.cc:280
+#: cmdline/apt-cache.cc:295
+#, fuzzy
+msgid "Total Distinct Descriptions: "
+msgstr "按版本共计："
+
+#: cmdline/apt-cache.cc:297
msgid "Total dependencies: "
msgstr "按依赖关系共计："
-#: cmdline/apt-cache.cc:283
+#: cmdline/apt-cache.cc:300
msgid "Total ver/file relations: "
msgstr "按版本/文件关系共计："
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:302
+#, fuzzy
+msgid "Total Desc/File relations: "
+msgstr "按版本/文件关系共计："
+
+#: cmdline/apt-cache.cc:304
msgid "Total Provides mappings: "
msgstr "提供映射共计："
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:316
msgid "Total globbed strings: "
msgstr "Glob 字串共计："
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:330
msgid "Total dependency version space: "
msgstr "依赖关系版本名所占空间共计："
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:335
msgid "Total slack space: "
msgstr "Slack 空间共计："
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:343
msgid "Total space accounted for: "
msgstr "总占用空间："
-#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
#, c-format
msgid "Package file %s is out of sync."
msgstr "软件包文件 %s 尚未同步(sync)。"
-#: cmdline/apt-cache.cc:1231
+#: cmdline/apt-cache.cc:1293
msgid "You must give exactly one pattern"
msgstr "您必须明确地给出一个表达式"
-#: cmdline/apt-cache.cc:1385
+#: cmdline/apt-cache.cc:1447
msgid "No packages found"
msgstr "没有发现吻合的软件包"
-#: cmdline/apt-cache.cc:1462
+#: cmdline/apt-cache.cc:1524
msgid "Package files:"
msgstr "软件包文件："
-#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
+#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "缓存尚未同步(sync)，无法交差引证(x-ref)一个软件包文件"
-#: cmdline/apt-cache.cc:1470
+#: cmdline/apt-cache.cc:1532
#, c-format
msgid "%4i %s\n"
msgstr "%4i %s\n"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1482
+#: cmdline/apt-cache.cc:1544
msgid "Pinned packages:"
msgstr "被锁定(pinned)的软件包："
-#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
+#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
msgid "(not found)"
msgstr "(没有找到)"
#. Installed version
-#: cmdline/apt-cache.cc:1515
+#: cmdline/apt-cache.cc:1577
msgid " Installed: "
msgstr " 已安装："
-#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
msgid "(none)"
msgstr "(无)"
#. Candidate Version
-#: cmdline/apt-cache.cc:1522
+#: cmdline/apt-cache.cc:1584
msgid " Candidate: "
msgstr " 候选的软件包："
-#: cmdline/apt-cache.cc:1532
+#: cmdline/apt-cache.cc:1594
msgid " Package pin: "
msgstr " 软件包锁(Pin)："
#. Show the priority tables
-#: cmdline/apt-cache.cc:1541
+#: cmdline/apt-cache.cc:1603
msgid " Version table:"
msgstr " 版本列表："
-#: cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1618
#, c-format
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2324 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
+#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s %s ，编译于 %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1721
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
" showsrc - 显示源文件的各项记录\n"
" stats - 显示一些基本的统计信息\n"
" dump - 简要显示整个缓存文件的内容\n"
-" dumpavail - 把所有有效的包文件列表打印到 stdout\n"
+" dumpavail - 把所有有效的包文件列表打印到标准输出\n"
" unmet - 显示所有未满足的依赖关系\n"
" search - 根据正则表达式搜索软件包列表\n"
-" show - 显示关于该软件包的便于阅读的一个报告\n"
-" depends - 原原本本的显示该软件包的依赖关系的信息\n"
+" show - 以便于阅读的格式介绍该软件包\n"
+" depends - 原原本本地显示该软件包的依赖信息\n"
" rdepends - 显示所有依赖于该软件包的软件包名字\n"
" pkgnames - 列出所有软件包的名字\n"
" dotty - 生成可用 GraphVis 处理的软件包关系图\n"
" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
"若要深入了解，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "请给这张光盘起个名字，比如说“Debian 2.1r1 Disk 1”"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "请把光盘碟片插入驱动器再按回车键"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "请对您的光盘套件中的其它光盘重复相同的操作。"
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "参数没有成对"
"\n"
"选项：\n"
" -h 本帮助文本\n"
-" -t 设置temp目录\n"
+" -t 设置 temp 目录\n"
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?"
-#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
+#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
msgid "Package extension list is too long"
msgstr "软件包的扩展列表超长"
-#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
-#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
-#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
+#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
+#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
+#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
#, c-format
msgid "Error processing directory %s"
msgstr "处理目录 %s 时出错"
-#: ftparchive/apt-ftparchive.cc:254
+#: ftparchive/apt-ftparchive.cc:251
msgid "Source extension list is too long"
msgstr "源扩展列表超长"
-#: ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:368
msgid "Error writing header to contents file"
msgstr "将 header 写到 contents 文件时出错"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:398
#, c-format
msgid "Error processing contents %s"
msgstr "处理 Contents %s 时出错"
-#: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
+#: ftparchive/apt-ftparchive.cc:553
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
" clean 配置文件\n"
"\n"
"apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n"
-"å¤\9aç§\8dç\94\9fæ\88\90ç´¢å¼\95ç\9a\84æ\96¹å¼\8fï¼\8cä»\8eå\85¨è\87ªå\8a¨ç\9a\84ç\94\9fæ\88\90å\88°å\9c¨å\8a\9fè\83½ä¸\8a对 dpkg-scanpackages \n"
-"和 dpkg-scansources 的替代，都能游刃有余\n"
+"å¤\9aç§\8dç\94\9fæ\88\90ç´¢å¼\95ç\9a\84æ\96¹å¼\8fï¼\8cä»\8eå\85¨è\87ªå\8a¨ç\9a\84ç´¢å¼\95ç\94\9fæ\88\90å\88°å\9c¨å\8a\9fè\83½ä¸\8aå\8f\96代 dpkg-scanpackages \n"
+"和 dpkg-scansources，都能游刃有余\n"
"\n"
"apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
"Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n"
" -h 本帮助文档\n"
" --md5 使之生成 MD5 校验和\n"
" -s=? 源代码包 override 文件\n"
-" -q 输出精简信息 -d=? 指定可选的缓存数据库\n"
+" -q 输出精简信息\n"
+" -d=? 指定可选的缓存数据库\n"
" -d=? 使用另一个可选的缓存数据库\n"
" --no-delink 开启delink的调试模式\n"
" --contents 使之生成控制内容文件\n"
" -c=? 读取指定配置文件\n"
" -o=? 设置任意指定的配置选项"
-#: ftparchive/apt-ftparchive.cc:762
+#: ftparchive/apt-ftparchive.cc:759
msgid "No selections matched"
msgstr "没有任何选定项是匹配的"
-#: ftparchive/apt-ftparchive.cc:835
+#: ftparchive/apt-ftparchive.cc:832
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "软件包文件组“%s”中缺少一些文件"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:43
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "缓存数据库被损坏了，该数据库文件的文件名已改成 %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:61
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB 已过时，现试图进行升级 %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:72
+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:77
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "无法打开 DB 文件 %s：%s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
+#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
#, c-format
-msgid "File date has changed %s"
-msgstr "æ\96\87件 %s ç\9a\84æ\97¶é\97´å·²è¢«æ\94¹å\8a¨"
+msgid "Failed to stat %s"
+msgstr "æ\97 æ³\95读å\8f\96 %s ç\9a\84ç\8a¶æ\80\81"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:238
msgid "Archive has no control record"
msgstr "存档没有包含控制字段"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:444
msgid "Unable to get a cursor"
msgstr "无法获得游标(cursor)"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:76
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告：无法读取目录 %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:81
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告：无法对 %s 进行统计\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:132
msgid "E: "
msgstr "错误："
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:134
msgid "W: "
msgstr "警告："
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:141
msgid "E: Errors apply to file "
msgstr "错误：处理文件时出错 "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
#, c-format
msgid "Failed to resolve %s"
msgstr "无法解析路径 %s"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:170
msgid "Tree walking failed"
msgstr "无法遍历目录树"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:195
#, c-format
msgid "Failed to open %s"
msgstr "无法打开 %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:254
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:262
#, c-format
msgid "Failed to readlink %s"
msgstr "无法读取符号链接 %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:266
#, c-format
msgid "Failed to unlink %s"
msgstr "无法 unlink %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:273
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 无法将 %s 链接到 %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:283
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " 达到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "无法读取 %s 的状态"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:387
msgid "Archive had no package field"
msgstr "存档没有包含软件包(package)字段"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
-#: ftparchive/contents.cc:317
+#: ftparchive/writer.cc:620
+#, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s 没有源代码的 override 项\n"
+
+#: ftparchive/writer.cc:624
+#, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s 中没有二进制文件的 override 项\n"
+
+#: ftparchive/contents.cc:321
#, c-format
msgid "Internal error, could not locate member %s"
msgstr "内部错误，无法定位包内文件 %s"
-#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
msgid "realloc - Failed to allocate memory"
msgstr "realloc - 无法再分配内存"
-#: ftparchive/override.cc:38 ftparchive/override.cc:146
+#: ftparchive/override.cc:34 ftparchive/override.cc:142
#, c-format
msgid "Unable to open %s"
msgstr "无法打开 %s"
-#: ftparchive/override.cc:64 ftparchive/override.cc:170
+#: ftparchive/override.cc:60 ftparchive/override.cc:166
#, c-format
msgid "Malformed override %s line %lu #1"
msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
-#: ftparchive/override.cc:78 ftparchive/override.cc:182
+#: ftparchive/override.cc:74 ftparchive/override.cc:178
#, c-format
msgid "Malformed override %s line %lu #2"
msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
-#: ftparchive/override.cc:92 ftparchive/override.cc:195
+#: ftparchive/override.cc:88 ftparchive/override.cc:191
#, c-format
msgid "Malformed override %s line %lu #3"
msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
-#: ftparchive/override.cc:131 ftparchive/override.cc:205
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
#, c-format
msgid "Failed to read the override file %s"
msgstr "无法读取 override 文件 %s"
-#: ftparchive/multicompress.cc:75
+#: ftparchive/multicompress.cc:72
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "未知的压缩算法“%s”"
-#: ftparchive/multicompress.cc:105
+#: ftparchive/multicompress.cc:102
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
-#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
msgstr "无法为子进程创建 IPC 管道"
-#: ftparchive/multicompress.cc:198
+#: ftparchive/multicompress.cc:195
msgid "Failed to create FILE*"
msgstr "无法创建 FILE*"
-#: ftparchive/multicompress.cc:201
+#: ftparchive/multicompress.cc:198
msgid "Failed to fork"
msgstr "无法 fork"
-#: ftparchive/multicompress.cc:215
+#: ftparchive/multicompress.cc:212
msgid "Compress child"
msgstr "压缩子进程"
-#: ftparchive/multicompress.cc:238
+#: ftparchive/multicompress.cc:235
#, c-format
msgid "Internal error, failed to create %s"
msgstr "内部错误，无法建立 %s"
-#: ftparchive/multicompress.cc:289
+#: ftparchive/multicompress.cc:286
msgid "Failed to create subprocess IPC"
msgstr "无法建立子进程的 IPC 管道"
-#: ftparchive/multicompress.cc:324
+#: ftparchive/multicompress.cc:321
msgid "Failed to exec compressor "
msgstr "无法执行压缩程序"
-#: ftparchive/multicompress.cc:363
+#: ftparchive/multicompress.cc:360
msgid "decompressor"
msgstr "解压程序"
-#: ftparchive/multicompress.cc:406
+#: ftparchive/multicompress.cc:403
msgid "IO to subprocess/file failed"
msgstr "无法对子进程或文件进行读写"
-#: ftparchive/multicompress.cc:458
+#: ftparchive/multicompress.cc:455
msgid "Failed to read while computing MD5"
msgstr "在计算 MD5 校验和时，无法读取数据"
-#: ftparchive/multicompress.cc:475
+#: ftparchive/multicompress.cc:472
#, c-format
msgid "Problem unlinking %s"
msgstr "在 unlink %s 时出错"
-#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
#, c-format
msgid "Failed to rename %s to %s"
msgstr "无法将 %s 重命名为 %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:124
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:241
msgid "The following packages have unmet dependencies:"
msgstr "下列的软件包有不能满足的依赖关系："
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:331
#, c-format
msgid "but %s is installed"
msgstr "但是 %s 已经安装了"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:333
#, c-format
msgid "but %s is to be installed"
msgstr "但是 %s 正要被安装"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:340
msgid "but it is not installable"
msgstr "但却无法安装它"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:342
msgid "but it is a virtual package"
msgstr "但是它只是个虚拟软件包"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:345
msgid "but it is not installed"
msgstr "但是它还没有被安装"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:345
msgid "but it is not going to be installed"
msgstr "但是它将不会被安装"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:350
msgid " or"
msgstr " 或"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:379
msgid "The following NEW packages will be installed:"
msgstr "下列【新】软件包将被安装："
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:405
msgid "The following packages will be REMOVED:"
msgstr "下列软件包将被【卸载】："
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:427
msgid "The following packages have been kept back:"
msgstr "下列的软件包的版本将保持不变："
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:448
msgid "The following packages will be upgraded:"
msgstr "下列的软件包将被升级："
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:469
msgid "The following packages will be DOWNGRADED:"
msgstr "下列软件包将被【降级】："
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:489
msgid "The following held packages will be changed:"
msgstr "下列被要求保持版本不变的软件包将被改变："
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:542
#, c-format
msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: cmdline/apt-get.cc:550
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
"【警告】：下列的重要软件包将被卸载 \n"
-"请勿尝试，除非您确实清楚您正在执行的操作！"
+"请勿尝试，除非您确实知道您在做什么！"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，"
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:585
#, c-format
msgid "%lu reinstalled, "
msgstr "共重新安装了 %lu 个软件包，"
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu downgraded, "
msgstr "降级了 %lu 个软件包，"
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:593
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:667
msgid "Correcting dependencies..."
msgstr "正在更正依赖关系..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:670
msgid " failed."
msgstr " 失败。"
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:673
msgid "Unable to correct dependencies"
msgstr "无法更正依赖关系"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:676
msgid "Unable to minimize the upgrade set"
-msgstr "无法使升级的软件包集最小化"
+msgstr "无法最小化要升级的软件包集合"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:678
msgid " Done"
msgstr " 完成"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:682
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。"
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:685
msgid "Unmet dependencies. Try using -f."
msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:707
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "【警告】：下列的软件包不能通过认证！"
+msgstr "【警告】：下列的软件包不能通过验证！"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:711
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "忽略了认证警告。\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:718
msgid "Install these packages without verification [y/N]? "
msgstr "不经验证就安装这些软件包么？[y/N] "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:720
msgid "Some packages could not be authenticated"
msgstr "有些软件包不能通过验证"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
msgid "There are problems and -y was used without --force-yes"
-msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes。"
+msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:773
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:782
msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:793
msgid "Internal error, Ordering didn't finish"
-msgstr "添加 diversion 时出现内部错误"
+msgstr "内部错误，Ordering 未能完成"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014
msgid "Unable to lock the download directory"
msgstr "无法对下载目录加锁"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2072
-#: apt-pkg/cachefile.cc:67
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335
+#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "无法读取安装源列表。"
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:834
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需要下载 %sB/%sB 的软件包。\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:842
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需要下载 %sB 的软件包。\n"
-#: cmdline/apt-get.cc:827
-#, c-format
-msgid "After unpacking %sB of additional disk space will be used.\n"
+#: cmdline/apt-get.cc:847
+#, fuzzy, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
-#: cmdline/apt-get.cc:830
-#, c-format
-msgid "After unpacking %sB disk space will be freed.\n"
+#: cmdline/apt-get.cc:850
+#, fuzzy, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "æ\82¨å\9c¨ %s ä¸\8a没æ\9c\89足å¤\9f的空余空间"
+msgstr "æ\97 æ³\95è\8e·ç\9f¥æ\82¨å\9c¨ %s ä¸\8a的空余空间"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:871
#, c-format
msgid "You don't have enough free space in %s."
msgstr "您在 %s 中没有足够的空余空间。"
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:889
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:891
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"您的操作会导致潜在的危害\n"
+"您的操作会导致潜在的危害。\n"
"若还想继续的话，就输入下面的短句“%s”\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
msgid "Abort."
msgstr "中止执行。"
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:912
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗？[Y/n]"
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:1002
msgid "Some files failed to download"
msgstr "有一些文件下载失败"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241
msgid "Download complete and in download only mode"
msgstr "下载完毕，目前是“仅下载”模式"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:1009
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
"有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
"再试试？"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:1013
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:1018
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:1019
msgid "Aborting install."
msgstr "放弃安装。"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1053
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "注意，我选了 %s 而非 %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1063
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1081
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "软件包 %s 还未安装，因而不会被卸载\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1092
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1104
msgid " [Installed]"
msgstr " [已安装]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1109
msgid "You should explicitly select one to install."
msgstr "请您明确地选择一个来进行安装。"
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1114
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
"这可能意味着这个缺失的软件包可能已被废弃，\n"
"或者只能在其他发布源中找到\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1133
msgid "However the following packages replace it:"
msgstr "可是下列的软件包取代了它："
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1136
#, c-format
msgid "Package %s has no installation candidate"
msgstr "软件包 %s 还没有可供安装的候选者"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1156
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "不能重新安装 %s，因为无法下载它。\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1193
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1195
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1201
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "选定了版本为 %s (%s) 的 %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1338
msgid "The update command takes no arguments"
msgstr " update 命令是不需任何参数的"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1351
msgid "Unable to lock the list directory"
msgstr "无法对状态列表目录加锁"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1402
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1434
+#, fuzzy
msgid ""
-"Some index files failed to download, they have been ignored, or old ones "
-"used instead."
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr "下列【新】软件包将被安装："
+
+#: cmdline/apt-get.cc:1436
+msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-"有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1441
+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:1444 cmdline/apt-get.cc:1724
+msgid "The following information may help to resolve the situation:"
+msgstr "下列的信息可能会对解决问题有所帮助："
+
+#: cmdline/apt-get.cc:1448
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "内部错误，problem resolver 坏事了"
+
+#: cmdline/apt-get.cc:1467
msgid "Internal error, AllUpgrade broke stuff"
-msgstr "内部错误，AllUpgrade 造成某些故障"
+msgstr "内部错误，AllUpgrade 坏事了"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1514
+#, fuzzy, c-format
+msgid "Couldn't find task %s"
+msgstr "无法找到软件包 %s"
+
+#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1652
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1683
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "但是 %s 正要被安装"
+
+#: cmdline/apt-get.cc:1696
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1699
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1711
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"
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们还在新到(incoming)目录中。"
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1719
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"
"您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n"
"您最好提交一个针对这个软件包的故障报告。"
-#: cmdline/apt-get.cc:1554
-msgid "The following information may help to resolve the situation:"
-msgstr "下列的信息可能会对问题的解决有所帮助："
-
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1727
msgid "Broken packages"
-msgstr "受损安装包"
+msgstr "无法安装的软件包"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1756
msgid "The following extra packages will be installed:"
-msgstr "将会安装下列的额外的软件包："
+msgstr "将会安装下列额外的软件包："
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1845
msgid "Suggested packages:"
msgstr "建议安装的软件包："
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1846
msgid "Recommended packages:"
msgstr "推荐安装的软件包："
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1874
msgid "Calculating upgrade... "
msgstr "正在筹划升级... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1882
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957
msgid "Internal error, problem resolver broke stuff"
-msgstr "内部错误，AllUpgrade 造成某些故障"
+msgstr "内部错误，problem resolver 坏事了"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:2057
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码，必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2090
+#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:2103
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2108
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possible unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2163
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "忽略已下载过的文件“%s”\n"
+
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的空余空间"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:2200
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:2206
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2237
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2265
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2032
+#: cmdline/apt-get.cc:2278
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
+
+#: cmdline/apt-get.cc:2295
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2314
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2067
+#: cmdline/apt-get.cc:2330
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
-#: cmdline/apt-get.cc:2115
+#: cmdline/apt-get.cc:2378
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2167
+#: cmdline/apt-get.cc:2430
#, 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:2219
+#: cmdline/apt-get.cc:2483
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
"$s 依赖关系"
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2519
#, 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:2279
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
-#: cmdline/apt-get.cc:2293
+#: cmdline/apt-get.cc:2558
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:2297
+#: cmdline/apt-get.cc:2562
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2594
msgid "Supported modules:"
msgstr "被支持模块："
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2635
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
" upgrade - Perform an upgrade\n"
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
+" autoremove - Remove all automatic unused packages\n"
+" purge - Remove and purge packages\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
msgid "Merging available information"
msgstr "正在合并现有信息"
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:114
msgid "Failed to create pipes"
msgstr "无法创建管道"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:141
msgid "Failed to exec gzip "
msgstr "无法执行 gzip"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
msgid "Corrupted archive"
msgstr "包文件已被损坏"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:193
msgid "Tar checksum failed, archive corrupted"
msgstr "tar 的校验码不符，包文件已被损坏"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:296
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "未知的 TAR 数据头类型 %u，成员 %s"
-#: apt-inst/contrib/arfile.cc:73
+#: apt-inst/contrib/arfile.cc:70
msgid "Invalid archive signature"
msgstr "无效的打包文件特征号(signature)"
-#: apt-inst/contrib/arfile.cc:81
+#: apt-inst/contrib/arfile.cc:78
msgid "Error reading archive member header"
msgstr "读取打包文件中的成员文件头出错"
-#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
+#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
msgstr "打包文件中成员文件头无效"
-#: apt-inst/contrib/arfile.cc:131
+#: apt-inst/contrib/arfile.cc:128
msgid "Archive is too short"
msgstr "存档太短了"
-#: apt-inst/contrib/arfile.cc:135
+#: apt-inst/contrib/arfile.cc:132
msgid "Failed to read the archive headers"
msgstr "无法读取打包文件的数据头"
-#: apt-inst/filelist.cc:384
+#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "把 DropNode 用在了仍在链表中的节点上"
-#: apt-inst/filelist.cc:416
+#: apt-inst/filelist.cc:412
msgid "Failed to locate the hash element!"
msgstr "无法分配散列表项！"
-#: apt-inst/filelist.cc:463
+#: apt-inst/filelist.cc:459
msgid "Failed to allocate diversion"
msgstr "无法分配转移项(diversion)"
-#: apt-inst/filelist.cc:468
+#: apt-inst/filelist.cc:464
msgid "Internal error in AddDiversion"
msgstr "内部错误，出现在 AddDiversion"
-#: apt-inst/filelist.cc:481
+#: apt-inst/filelist.cc:477
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
msgstr "试图覆盖一个转移项(diversion)，%s -> %s 即 %s/%s"
-#: apt-inst/filelist.cc:510
+#: apt-inst/filelist.cc:506
#, c-format
msgid "Double add of diversion %s -> %s"
msgstr "添加了两个转移项(diversion) %s-> %s"
-#: apt-inst/filelist.cc:553
+#: apt-inst/filelist.cc:549
#, c-format
msgid "Duplicate conf file %s/%s"
msgstr "重复的配置文件 %s/%s"
-#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
+#, c-format
msgid "Failed to write file %s"
msgstr "无法写入文件 %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
#, c-format
msgid "Failed to close file %s"
msgstr "无法关闭文件 %s"
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
#, c-format
msgid "The path %s is too long"
msgstr "路径名 %s 过长"
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:124
#, c-format
msgid "Unpacking %s more than once"
msgstr "%s 被解包了不只一次"
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:134
#, c-format
msgid "The directory %s is diverted"
msgstr "目录 %s 已被转移(diverted)"
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:144
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "该软件包正尝试写入转移对象(diversion target) %s/%s"
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
msgid "The diversion path is too long"
msgstr "该转移路径(diversion path)过长"
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:240
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "目录 %s 要被一个非目录的文件替换"
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:280
msgid "Failed to locate node in its hash bucket"
msgstr "无法在其散列桶(hash bucket)中分配节点"
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:284
msgid "The path is too long"
msgstr "路径名过长"
-#: apt-inst/extract.cc:417
+#: apt-inst/extract.cc:414
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "用来覆盖的软件包不属于 %s 的任何版本"
-#: apt-inst/extract.cc:434
+#: 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:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753
+#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
-#: apt-inst/extract.cc:494
+#: apt-inst/extract.cc:491
#, c-format
msgid "Unable to stat %s"
msgstr "无法读取 %s 的状态"
-#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
+#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
#, c-format
msgid "Failed to remove %s"
msgstr "无法删除 %s"
-#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
+#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
#, c-format
msgid "Unable to create %s"
msgstr "无法创建 %s "
-#: apt-inst/deb/dpkgdb.cc:118
+#: apt-inst/deb/dpkgdb.cc:114
#, c-format
msgid "Failed to stat %sinfo"
msgstr "无法读取 %sinfo 的状态"
-#: apt-inst/deb/dpkgdb.cc:123
+#: apt-inst/deb/dpkgdb.cc:119
msgid "The info and temp directories need to be on the same filesystem"
msgstr "info 和 temp 目录要求处于同一文件系统之下"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748
+#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
+#: apt-pkg/pkgcachegen.cc:945
msgid "Reading package lists"
msgstr "正在读取软件包列表"
-#: apt-inst/deb/dpkgdb.cc:180
+#: apt-inst/deb/dpkgdb.cc:176
#, c-format
msgid "Failed to change to the admin dir %sinfo"
msgstr "无法切换工作目录到 admin 目录 %sinfo"
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
-#: apt-inst/deb/dpkgdb.cc:448
+#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
+#: apt-inst/deb/dpkgdb.cc:444
msgid "Internal error getting a package name"
msgstr "在获取软件包名字时出现内部错误"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
msgid "Reading file listing"
msgstr "正在读取文件列表"
-#: apt-inst/deb/dpkgdb.cc:216
+#: apt-inst/deb/dpkgdb.cc:212
#, c-format
msgid ""
"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
"无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，那么就清空该文件，再马上"
"重新安装相同版本的这个软件包！"
-#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
#, c-format
msgid "Failed reading the list file %sinfo/%s"
msgstr "无法读取列表文件 %sinfo/%s"
-#: apt-inst/deb/dpkgdb.cc:266
+#: apt-inst/deb/dpkgdb.cc:262
msgid "Internal error getting a node"
msgstr "获得一个节点时出现内部错误"
-#: apt-inst/deb/dpkgdb.cc:309
+#: apt-inst/deb/dpkgdb.cc:305
#, c-format
msgid "Failed to open the diversions file %sdiversions"
msgstr "无法打开转移配置文件(diversions file) %sdiversions"
-#: apt-inst/deb/dpkgdb.cc:324
+#: apt-inst/deb/dpkgdb.cc:320
msgid "The diversion file is corrupted"
msgstr "该转移配置文件(diversion file)被损坏了"
-#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
-#: apt-inst/deb/dpkgdb.cc:341
+#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
+#: apt-inst/deb/dpkgdb.cc:337
#, c-format
msgid "Invalid line in the diversion file: %s"
msgstr "转移配置文件中有一行是无效的：%s"
-#: apt-inst/deb/dpkgdb.cc:362
+#: apt-inst/deb/dpkgdb.cc:358
msgid "Internal error adding a diversion"
msgstr "添加 diversion 时出现内部错误"
-#: apt-inst/deb/dpkgdb.cc:383
+#: apt-inst/deb/dpkgdb.cc:379
msgid "The pkg cache must be initialized first"
msgstr "必须首先初始化软件包缓存"
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "正在读取文件列表"
-
-#: apt-inst/deb/dpkgdb.cc:443
+#: apt-inst/deb/dpkgdb.cc:439
#, c-format
msgid "Failed to find a Package: header, offset %lu"
msgstr "无法找到某个软件包：包头，于偏移位置 %lu"
-#: apt-inst/deb/dpkgdb.cc:465
+#: apt-inst/deb/dpkgdb.cc:461
#, c-format
msgid "Bad ConfFile section in the status file. Offset %lu"
msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu"
-#: apt-inst/deb/dpkgdb.cc:470
+#: apt-inst/deb/dpkgdb.cc:466
#, c-format
msgid "Error parsing MD5. Offset %lu"
msgstr "无法解析 MD5 码。文件内偏移量为 %lu"
-#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
-#: apt-inst/deb/debfile.cc:52
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”或者“%s”"
-#: apt-inst/deb/debfile.cc:112
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "无法切换工作目录到 %s"
-#: apt-inst/deb/debfile.cc:138
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "内部错误，无法定位包内文件"
-#: apt-inst/deb/debfile.cc:171
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "无法在打包文件中找到有效的主控文件"
-#: apt-inst/deb/debfile.cc:256
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "不能解析的主控文件"
msgid "Wrong CD-ROM"
msgstr "错误的光盘"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "æ\97 æ³\95å\8d¸è½½ç\8e°å\9c¨æ\8c\82è½½äº\8e %s ç\9a\84 CD-ROMï¼\8cå\8f¯è\83½å®\83正在使用中。"
+msgstr "æ\97 æ³\95å\8d¸è½½ç\8e°å\9c¨æ\8c\82è½½äº\8e %s ç\9a\84 CD-ROMï¼\8cå®\83å\8f¯è\83½正在使用中。"
-#: methods/cdrom.cc:169
-#, fuzzy
+#: methods/cdrom.cc:171
msgid "Disk not found."
-msgstr "æ\97 æ³\95æ\89¾å\88°è¯¥æ\96\87件"
+msgstr "æ\89¾ä¸\8då\88°å\85\89ç\9b\98ã\80\82"
-#: 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:265 methods/gzip.cc:133
-#: methods/gzip.cc:142
+#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "无法读取状态"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
msgid "Server closed the connection"
msgstr "服务器关闭了连接"
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190
msgid "Read error"
msgstr "读错误"
msgid "Protocol corruption"
msgstr "协议有误"
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232
msgid "Write error"
msgstr "写文件出错"
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "把文件加入散列表时出错"
msgid "Query"
msgstr "查询"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "无法调用 "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "正在连接 %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, 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:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "无法发起与 %s:%s (%s) 的连接"
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "无法连接上 %s:%s (%s)，连接超时"
-#: methods/connect.cc:106
+#: methods/connect.cc:107
#, 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:134 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "正在连接 %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "无法解析域名“%s”"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "暂时不能解析域名“%s”"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "解析“%s:%s”时，出现了某些故障 (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "不能连接上 %s %s："
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "无法访问密匙：“%s”"
+
+#: methods/gpgv.cc:101
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。"
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:205
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！"
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:210
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "至少发现一个无效的签名。"
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "无法获得锁 %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:214
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr "无法运行\"%s\"以便验证签名(您安装了 gnupg 么？)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:219
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "运行 gpgv 时发生未知错误"
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:250
msgid "The following signatures were invalid:\n"
-msgstr "将会安装下列的额外的软件包："
+msgstr "下列签名无效：\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:257
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
-msgstr ""
+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:344
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/http.cc:490
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
-#: methods/http.cc:498
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "错误的报头条目"
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "该 http 服务器发送了一个无效的应答报头"
-#: methods/http.cc:553
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
-#: methods/http.cc:568
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
-#: methods/http.cc:570
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "该 http 服务器的 range 支持不正常"
-#: methods/http.cc:594
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:741
+#: methods/http.cc:773
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:746
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "连接服务器超时"
-#: methods/http.cc:769
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:797
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "写文件时出错"
-#: methods/http.cc:822
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "写文件时出错"
-#: methods/http.cc:836
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错，对方关闭了连接"
-#: methods/http.cc:838
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:1069
+#: methods/http.cc:1106
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1086
+#: methods/http.cc:1123 methods/http.cc:1178
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1177
+#: methods/http.cc:1230
msgid "Internal error"
msgstr "内部错误"
-#: apt-pkg/contrib/mmap.cc:82
+#: apt-pkg/contrib/mmap.cc:80
msgid "Can't mmap an empty file"
msgstr "无法 mmap 一个空文件"
-#: apt-pkg/contrib/mmap.cc:87
+#: apt-pkg/contrib/mmap.cc:85
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "无法 mmap %lu 字节的数据"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:978
#, c-format
msgid "Selection %s not found"
msgstr "没有发现您的所选 %s"
-#: apt-pkg/contrib/configuration.cc:436
+#: apt-pkg/contrib/configuration.cc:439
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "无法识别的类型缩写：“%c”"
-#: apt-pkg/contrib/configuration.cc:494
+#: apt-pkg/contrib/configuration.cc:497
#, c-format
msgid "Opening configuration file %s"
msgstr "正在打开配置文件 %s"
-#: apt-pkg/contrib/configuration.cc:512
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:515
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。"
-#: apt-pkg/contrib/configuration.cc:608
+#: apt-pkg/contrib/configuration.cc:611
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "语法错误 %s:%u：配置小节没有以名字开头"
-#: apt-pkg/contrib/configuration.cc:627
+#: apt-pkg/contrib/configuration.cc:630
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "语法错误 %s:%u：标签格式有误"
-#: apt-pkg/contrib/configuration.cc:644
+#: apt-pkg/contrib/configuration.cc:647
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:687
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
-#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
+#: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:703
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "语法错误 %s:%u: Included from here"
-#: apt-pkg/contrib/configuration.cc:704
+#: apt-pkg/contrib/configuration.cc:707
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "语法错误 %s:%u: 不支持的指令“%s”"
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:741
#, c-format
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:153
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... 有错误!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... 完成"
-#: apt-pkg/contrib/cmndline.cc:80
+#: apt-pkg/contrib/cmndline.cc:77
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "未知的命令行选项“%c”[来自 %s]"
-#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
+#: apt-pkg/contrib/cmndline.cc:119
#, c-format
msgid "Command line option %s is not understood"
msgstr "无法识别命令行选项 %s"
-#: apt-pkg/contrib/cmndline.cc:127
+#: apt-pkg/contrib/cmndline.cc:124
#, c-format
msgid "Command line option %s is not boolean"
msgstr "命令行选项 %s 不是个布尔值"
-#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
#, c-format
msgid "Option %s requires an argument."
msgstr "选项 %s 要求有一个参数"
-#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
+#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定"
-#: apt-pkg/contrib/cmndline.cc:237
+#: apt-pkg/contrib/cmndline.cc:234
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"
-#: apt-pkg/contrib/cmndline.cc:268
+#: apt-pkg/contrib/cmndline.cc:265
#, c-format
msgid "Option '%s' is too long"
msgstr "选项“%s”超长"
-#: apt-pkg/contrib/cmndline.cc:301
+#: apt-pkg/contrib/cmndline.cc:298
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "不能识别参数 %s，请用 true 或 false"
-#: apt-pkg/contrib/cmndline.cc:351
+#: apt-pkg/contrib/cmndline.cc:348
#, c-format
msgid "Invalid operation %s"
msgstr "无效的操作 %s"
-#: apt-pkg/contrib/cdromutl.cc:55
+#: apt-pkg/contrib/cdromutl.cc:52
#, c-format
msgid "Unable to stat the mount point %s"
msgstr "无法读取文件系统挂载点 %s 的状态"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:91
#, c-format
msgid "Unable to change to %s"
msgstr "无法切换工作目录到 %s"
-#: apt-pkg/contrib/cdromutl.cc:190
+#: apt-pkg/contrib/cdromutl.cc:187
msgid "Failed to stat the cdrom"
msgstr "无法读取光盘的状态"
-#: apt-pkg/contrib/fileutl.cc:82
+#: apt-pkg/contrib/fileutl.cc:147
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "由于文件系统为只读，因而无法使用文件锁%s"
-#: apt-pkg/contrib/fileutl.cc:87
+#: apt-pkg/contrib/fileutl.cc:152
#, c-format
msgid "Could not open lock file %s"
msgstr "无法打开锁文件 %s"
-#: apt-pkg/contrib/fileutl.cc:105
+#: apt-pkg/contrib/fileutl.cc:170
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "无法在 nfs 文件系统上使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:109
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Could not get lock %s"
msgstr "无法获得锁 %s"
-#: apt-pkg/contrib/fileutl.cc:377
+#: apt-pkg/contrib/fileutl.cc:442
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出，但是它并不存在"
-#: apt-pkg/contrib/fileutl.cc:387
+#: apt-pkg/contrib/fileutl.cc:452
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子进程 %s 发生了段错误"
-#: apt-pkg/contrib/fileutl.cc:390
+#: apt-pkg/contrib/fileutl.cc:455
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:392
+#: apt-pkg/contrib/fileutl.cc:457
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出了"
-#: apt-pkg/contrib/fileutl.cc:436
+#: apt-pkg/contrib/fileutl.cc:501
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: apt-pkg/contrib/fileutl.cc:492
+#: apt-pkg/contrib/fileutl.cc:557
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "读文件时出错，还剩 %lu 字节没有读出"
-#: apt-pkg/contrib/fileutl.cc:522
+#: apt-pkg/contrib/fileutl.cc:587
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "写文件时出错，还剩 %lu 字节没有保存"
-#: apt-pkg/contrib/fileutl.cc:597
+#: apt-pkg/contrib/fileutl.cc:662
msgid "Problem closing the file"
msgstr "关闭文件时出错"
-#: apt-pkg/contrib/fileutl.cc:603
+#: apt-pkg/contrib/fileutl.cc:668
msgid "Problem unlinking the file"
msgstr "用 unlink 删除文件时出错"
-#: apt-pkg/contrib/fileutl.cc:614
+#: apt-pkg/contrib/fileutl.cc:679
msgid "Problem syncing the file"
msgstr "同步文件时出错"
-#: apt-pkg/pkgcache.cc:126
+#: apt-pkg/pkgcache.cc:132
msgid "Empty package cache"
msgstr "软件包缓存区是空的"
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:138
msgid "The package cache file is corrupted"
msgstr "软件包缓存区文件损坏了"
-#: apt-pkg/pkgcache.cc:137
+#: apt-pkg/pkgcache.cc:143
msgid "The package cache file is an incompatible version"
msgstr "软件包缓存区文件的版本不兼容"
-#: apt-pkg/pkgcache.cc:142
+#: apt-pkg/pkgcache.cc:148
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "本程序目前不支持“%s”这个版本控制系统"
-#: apt-pkg/pkgcache.cc:147
+#: apt-pkg/pkgcache.cc:153
msgid "The package cache was built for a different architecture"
msgstr "软件包缓存区是为其它架构的主机构造的"
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:224
msgid "Depends"
msgstr "依赖"
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:224
msgid "PreDepends"
msgstr "预依赖"
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:224
msgid "Suggests"
msgstr "建议"
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:225
msgid "Recommends"
msgstr "推荐"
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:225
msgid "Conflicts"
msgstr "冲突"
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:225
msgid "Replaces"
msgstr "替换"
-#: apt-pkg/pkgcache.cc:220
+#: apt-pkg/pkgcache.cc:226
msgid "Obsoletes"
msgstr "废弃"
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:226
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:237
msgid "important"
msgstr "重要"
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:237
msgid "required"
msgstr "必要"
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:237
msgid "standard"
msgstr "标准"
-#: apt-pkg/pkgcache.cc:232
+#: apt-pkg/pkgcache.cc:238
msgid "optional"
msgstr "可选"
-#: apt-pkg/pkgcache.cc:232
+#: apt-pkg/pkgcache.cc:238
msgid "extra"
msgstr "额外"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "正在分析软件包的依赖关系树"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "候选版本"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "生成依赖关系"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#, fuzzy
+msgid "Reading state information"
+msgstr "正在合并现有信息"
+
+#: apt-pkg/depcache.cc:219
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "无法打开 %s"
+
+#: apt-pkg/depcache.cc:225
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "无法写入文件 %s"
+
+#: apt-pkg/tagfile.cc:102
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "无法解析软件包文件 %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:189
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "无法解析软件包文件 %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:90
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:95
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:108
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr "正在打开 %s"
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
#, c-format
msgid "Line %u too long in source list %s."
msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。"
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)"
-#: apt-pkg/packagemanager.cc:402
+#: apt-pkg/packagemanager.cc:428
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
"少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::"
"Force-LoopBreak 选项。"
-#: apt-pkg/pkgrecords.cc:37
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "不支持索引文件类型“%s”"
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:247
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1105
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
"缘故。"
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1107
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
"系。"
-#: apt-pkg/acquire.cc:62
+#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr ""
+"有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
+
+#: apt-pkg/acquire.cc:59
#, c-format
msgid "Lists directory %spartial is missing."
msgstr "软件包列表的目录 %spartial 不见了。"
-#: apt-pkg/acquire.cc:66
+#: apt-pkg/acquire.cc:63
#, c-format
msgid "Archive directory %spartial is missing."
msgstr "找不到“%spartial”这个目录。"
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:827
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "正在下载 %li 个文件中的第 %li 个(还有 %s 个)"
+
+#: apt-pkg/acquire.cc:829
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "正在下载 %2$li 个文件中的 %1$li 个"
-#: apt-pkg/acquire-worker.cc:113
+#: apt-pkg/acquire-worker.cc:110
#, c-format
msgid "The method driver %s could not be found."
msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
-#: apt-pkg/acquire-worker.cc:162
+#: apt-pkg/acquire-worker.cc:159
#, c-format
msgid "Method %s did not start correctly"
msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#: apt-pkg/acquire-worker.cc:399
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"更换介质：请把标有\n"
-"“%s”\n"
-"的碟片插入驱动器“%s”再按回车键\n"
+msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:125
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:141
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
-#: apt-pkg/clean.cc:61
+#: apt-pkg/clean.cc:57
#, c-format
msgid "Unable to stat %s."
msgstr "无法读取 %s 的状态。"
-#: apt-pkg/srcrecords.cc:48
+#: apt-pkg/srcrecords.cc:44
msgid "You must put some 'source' URIs in your sources.list"
-msgstr "您必须在您的 sources.list 输入一些“软件包源”的 URL"
+msgstr "您必须在您的 sources.list 写入一些“软件包源”的 URI"
-#: apt-pkg/cachefile.cc:73
+#: apt-pkg/cachefile.cc:71
msgid "The package lists or status file could not be parsed or opened."
msgstr "无法解析或打开软件包的列表或是状态文件。"
-#: apt-pkg/cachefile.cc:77
+#: apt-pkg/cachefile.cc:75
msgid "You may want to run apt-get update to correct these problems"
msgstr "您可能需要运行 apt-get update 来解决这些问题"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:267
msgid "Invalid record in the preferences file, no Package header"
msgstr "偏好设定(preferences)文件中发现有无效的记录，无 Package 字段头"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:289
#, c-format
msgid "Did not understand pin type %s"
msgstr "无法识别锁定的类型(pin type) %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:297
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:72
msgid "Cache has an incompatible versioning system"
msgstr "软件包暂存区使用的是不兼容的版本控制系统"
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:115
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "处理 %s (NewPackage)时出错"
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:130
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "处理 %s (UsePackage1)时出错"
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:153
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc1)"
+msgstr "处理 %s (NewFileVer1)时出错"
+
+#: apt-pkg/pkgcachegen.cc:178
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "处理 %s (UsePackage2)时出错"
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:182
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "处理 %s (NewFileVer1)时出错"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:213
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "处理 %s (NewVersion1)时出错"
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:217
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "处理 %s (UsePackage3)时出错"
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:221
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "处理 %s (NewVersion2)时出错"
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:245
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc2)"
+msgstr "处理 %s (NewFileVer1)时出错"
+
+#: apt-pkg/pkgcachegen.cc:251
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "糟了，软件包的数量了超出本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:254
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "糟了，软件包版本的数量了超出本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:257
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "糟了，软件包版本的数量了超出本程序的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:260
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "糟了，依赖关系的数量超出了本程序的处理能力。"
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:288
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "处理 %s (FindPkg)时出错"
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:301
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "处理 %s (CollectFileProvides)时出错"
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:307
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:678
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:763
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
msgid "IO Error saving source cache"
msgstr "无法写入来源缓存文件"
-#: apt-pkg/acquire-item.cc:126
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件，%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:907
+#: apt-pkg/acquire-item.cc:451
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:721
+#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "MD5 校验和不符"
+
+#: apt-pkg/acquire-item.cc:1150
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "以下 key ID 没有可用的公钥：\n"
+
+#: apt-pkg/acquire-item.cc:1264
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:774
+#: apt-pkg/acquire-item.cc:1323
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:810
+#: apt-pkg/acquire-item.cc:1364
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
-msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段"
+msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:897
+#: apt-pkg/acquire-item.cc:1451
msgid "Size mismatch"
msgstr "大小不符"
msgid "Vendor block %s contains no fingerprint"
msgstr "软件提供者数据块内 %s 没有包含指纹信息"
-#: apt-pkg/cdrom.cc:504
+#: apt-pkg/cdrom.cc:529
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"现把 %s 作为了 CD-ROM 的挂载点\n"
"正在挂载 CD-ROM\n"
-#: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595
+#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627
msgid "Identifying.. "
msgstr "正在鉴别.. "
-#: apt-pkg/cdrom.cc:538
+#: apt-pkg/cdrom.cc:563
#, c-format
-msgid "Stored label: %s \n"
+msgid "Stored label: %s\n"
msgstr "存档标签：%s \n"
-#: apt-pkg/cdrom.cc:558
+#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "正在卸载 CD-ROM 文件系统……"
+
+#: apt-pkg/cdrom.cc:590
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
-#: apt-pkg/cdrom.cc:576
+#: apt-pkg/cdrom.cc:608
msgid "Unmounting CD-ROM\n"
msgstr "正在卸载 CD-ROM 文件系统\n"
-#: apt-pkg/cdrom.cc:580
+#: apt-pkg/cdrom.cc:612
msgid "Waiting for disc...\n"
msgstr "等待插入盘片……\n"
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:620
msgid "Mounting CD-ROM...\n"
msgstr "正在挂载 CD-ROM 文件系统……\n"
-#: apt-pkg/cdrom.cc:606
+#: apt-pkg/cdrom.cc:638
msgid "Scanning disc for index files..\n"
msgstr "正在光盘中查找索引文件..\n"
-#: apt-pkg/cdrom.cc:644
-#, c-format
-msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+#: apt-pkg/cdrom.cc:678
+#, fuzzy, c-format
+msgid ""
+"Found %u package indexes, %u source indexes, %u translation indexes and %u "
+"signatures\n"
msgstr "找到了 %i 个软件包索引、%i 个源代码包索引，和 %i 个数字签名\n"
-#: apt-pkg/cdrom.cc:707
+#: apt-pkg/cdrom.cc:715
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "存档标签：%s \n"
+
+#: apt-pkg/cdrom.cc:744
msgid "That is not a valid name, try again.\n"
msgstr "这不是一个有效的名字，请再次命名。\n"
-#: apt-pkg/cdrom.cc:723
+#: apt-pkg/cdrom.cc:760
#, c-format
msgid ""
"This disc is called: \n"
"这张光盘现在的名字是：\n"
"“%s”\n"
-#: apt-pkg/cdrom.cc:727
+#: apt-pkg/cdrom.cc:764
msgid "Copying package lists..."
msgstr "正在复制软件包列表……"
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:790
msgid "Writing new source list\n"
msgstr "正在写入新的软件包源列表\n"
-#: apt-pkg/cdrom.cc:760
+#: apt-pkg/cdrom.cc:799
msgid "Source list entries for this disc are:\n"
msgstr "对应于该光盘的软件包源设置项是：\n"
-#: apt-pkg/cdrom.cc:800
-msgid "Unmounting CD-ROM..."
-msgstr "正在卸载 CD-ROM 文件系统……"
-
-#: apt-pkg/indexcopy.cc:261
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "已写入 %i 条记录。\n"
-#: apt-pkg/indexcopy.cc:263
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
-#: apt-pkg/indexcopy.cc:266
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "已写入 %i 条记录，并有 %i 个文件不吻合\n"
-#: apt-pkg/indexcopy.cc:269
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n"
-#: apt-pkg/deb/dpkgpm.cc:358
+#: apt-pkg/deb/dpkgpm.cc:454
#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "软件包列表的目录 %spartial 不见了。"
+
+#: apt-pkg/deb/dpkgpm.cc:537
+#, c-format
msgid "Preparing %s"
-msgstr "正在打开 %s"
+msgstr "正在准备 %s"
-#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:538
+#, c-format
msgid "Unpacking %s"
-msgstr "正在打开 %s"
+msgstr "正在解压缩 %s"
-#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:543
+#, c-format
msgid "Preparing to configure %s"
-msgstr "正在打开配置文件 %s"
+msgstr "正在准备配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:365
+#: apt-pkg/deb/dpkgpm.cc:544
#, c-format
msgid "Configuring %s"
-msgstr ""
+msgstr "正在配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:366
+#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547
#, fuzzy, c-format
+msgid "Processing triggers for %s"
+msgstr "处理目录 %s 时出错"
+
+#: apt-pkg/deb/dpkgpm.cc:549
+#, c-format
msgid "Installed %s"
-msgstr " 已安装："
+msgstr "已安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:371
+#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556
+#: apt-pkg/deb/dpkgpm.cc:557
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "正在准备 %s 的删除操作"
-#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:559
+#, c-format
msgid "Removing %s"
-msgstr "正在打开 %s"
+msgstr "正在删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:373
+#: apt-pkg/deb/dpkgpm.cc:560
#, c-format
msgid "Removed %s"
-msgstr ""
+msgstr "已删除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:565
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "正在准备完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:378
+#: apt-pkg/deb/dpkgpm.cc:566
#, c-format
-msgid "Preparing for remove with config %s"
+msgid "Completely removed %s"
+msgstr "完全删除了 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:716
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:379
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:170
#, c-format
-msgid "Removed with config %s"
+msgid "No mirror file '%s' found "
msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "无法打开补丁文件"
+
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "连接被永久关闭"
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "处理 %s (NewFileVer1)时出错"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "处理 %s (NewFileVer1)时出错"
+
+#, fuzzy
+#~ msgid "Stored label: %s \n"
+#~ msgstr "存档标签：%s \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
+#~ "i signatures\n"
+#~ msgstr "找到了 %i 个软件包索引、%i 个源代码包索引，和 %i 个数字签名\n"
+
+#, fuzzy
+#~ msgid "openpty failed\n"
+#~ msgstr "select 调用出错"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "文件 %s 的时间已被改动"
+
+#~ msgid "Reading file list"
+#~ msgstr "正在读取文件列表"
+
+#~ msgid "Could not execute "
+#~ msgstr "未能执行 "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "正在准备连同配置文件的删除 %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "连同配置文件一同删除 %s "
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr ""
#~ "在安装源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%"
projects / apt.git / blobdiff