# Chinese/Simplified translation of apt.
# This file is put in the public domain.
-#
-# Initially converted from zh_TW.po
-#
-# Tchaikov <chaisave@263.net>, 2004
-# Carlos Z.F. Liu <carlos_liu@yahoo.com>, 2004
+# Tchaikov <chaisave@263.net>, 2004.
+# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004.
#
msgid ""
msgstr ""
-"Project-Id-Version: apt 0.5.21\n"
+"Project-Id-Version: apt 0.5.23\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-08 23:31-0800\n"
-"PO-Revision-Date: 2004-02-05 03:01+1300\n"
+"POT-Creation-Date: 2005-09-22 23:07+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"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
#: cmdline/apt-cache.cc:135
#, c-format
msgstr "未发现软件包 %s"
#: cmdline/apt-cache.cc:232
-msgid "Total Package Names : "
+msgid "Total package names : "
msgstr "软件包总数(按名称计)："
#: cmdline/apt-cache.cc:272
-msgid " Normal Packages: "
+msgid " Normal packages: "
msgstr " 普通软件包："
#: cmdline/apt-cache.cc:273
-msgid " Pure Virtual Packages: "
+msgid " Pure virtual packages: "
msgstr " 完全虚拟软件包："
#: cmdline/apt-cache.cc:274
-msgid " Single Virtual Packages: "
+msgid " Single virtual packages: "
msgstr " 单虚拟软件包："
#: cmdline/apt-cache.cc:275
-msgid " Mixed Virtual Packages: "
+msgid " Mixed virtual packages: "
msgstr " 混合虚拟软件包："
#: cmdline/apt-cache.cc:276
msgstr " 缺漏的："
#: cmdline/apt-cache.cc:278
-msgid "Total Distinct Versions: "
+msgid "Total distinct versions: "
msgstr "按版本共计："
#: cmdline/apt-cache.cc:280
-msgid "Total Dependencies: "
+msgid "Total dependencies: "
msgstr "按依赖关系共计："
#: cmdline/apt-cache.cc:283
-msgid "Total Ver/File relations: "
+msgid "Total ver/file relations: "
msgstr "按版本/文件关系共计："
#: cmdline/apt-cache.cc:285
-msgid "Total Provides Mappings: "
+msgid "Total Provides mappings: "
msgstr "提供映射共计："
#: cmdline/apt-cache.cc:297
-msgid "Total Globbed Strings: "
+msgid "Total globbed strings: "
msgstr "Glob 字串共计："
#: cmdline/apt-cache.cc:311
-msgid "Total Dependency Version space: "
+msgid "Total dependency version space: "
msgstr "依赖关系版本名所占空间共计："
#: cmdline/apt-cache.cc:316
-msgid "Total Slack space: "
+msgid "Total slack space: "
msgstr "Slack 空间共计："
#: cmdline/apt-cache.cc:324
-msgid "Total Space Accounted for: "
+msgid "Total space accounted for: "
msgstr "总占用空间："
#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
msgstr "没有发现吻合的软件包"
#: cmdline/apt-cache.cc:1462
-msgid "Package Files:"
+msgid "Package files:"
msgstr "软件包文件："
#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
#: cmdline/apt-cache.cc:1470
#, c-format
msgid "%4i %s\n"
-msgstr ""
+msgstr "%4i %s\n"
#. Show any packages have explicit pins
#: cmdline/apt-cache.cc:1482
-msgid "Pinned Packages:"
+msgid "Pinned packages:"
msgstr "被锁定(pinned)的软件包："
#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgstr " 候选的软件包："
#: cmdline/apt-cache.cc:1532
-msgid " Package Pin: "
+msgid " Package pin: "
msgstr " 软件包锁(Pin)："
#. Show the priority tables
#: cmdline/apt-cache.cc:1541
-msgid " Version Table:"
+msgid " Version table:"
msgstr " 版本列表："
#: cmdline/apt-cache.cc:1556
#, c-format
msgid " %4i %s\n"
-msgstr ""
+msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2255 cmdline/apt-sortpkgs.cc:144
+#: 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:2325 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s ，编译于 %s %s\n"
-#: cmdline/apt-cache.cc:1653
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
" -q Disable progress indicator.\n"
" -i Show only important deps for the unmet command.\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
"用法： apt-cache [选项] 命令\n"
" apt-cache [选项] showsrc 软件包甲 [软件包乙 ...]\n"
"\n"
"apt-cache 是一个底层的工具，我们用它来操纵 APT 的二进制\n"
-"缓存文件，也用来从那些文件查询相关信息\n"
+"缓存文件，也用来在那些文件中查询相关信息\n"
"\n"
"命令：\n"
" add - 往源缓存加入一个软件包文件\n"
" search - 根据正则表达式搜索软件包列表\n"
" show - 显示关于该软件包的便于阅读的一个报告\n"
" depends - 原原本本的显示该软件包的依赖关系的信息\n"
-" rdepends - 显示所有依赖于该软件包的软件包名字"
+" rdepends - 显示所有依赖于该软件包的软件包名字\n"
" pkgnames - 列出所有软件包的名字\n"
" dotty - 生成可用 GraphVis 处理的软件包关系图\n"
" xvcg - 生成可用 xvcg 处理的软件包的关系图\n"
-" policy - 显示软件包的安装设置状态"
+" policy - 显示软件包的安装设置状态\n"
"\n"
"选项：\n"
" -h 本帮助文档。\n"
"Options:\n"
" -h This help text.\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
"用法：apt-config [选项] 命令\n"
"\n"
" -h This help text\n"
" -t Set the temp dir\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
"\n"
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, 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:163 ftparchive/apt-ftparchive.cc:337
+#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
msgid "Package extension list is too long"
msgstr "软件包的扩展列表超长"
-#: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179
-#: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
-#: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
+#: 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
#, c-format
-msgid "Error Processing directory %s"
+msgid "Error processing directory %s"
msgstr "处理目录 %s 时出错"
-#: ftparchive/apt-ftparchive.cc:250
+#: ftparchive/apt-ftparchive.cc:254
msgid "Source extension list is too long"
msgstr "源扩展列表超长"
-#: ftparchive/apt-ftparchive.cc:367
+#: ftparchive/apt-ftparchive.cc:371
msgid "Error writing header to contents file"
msgstr "将 header 写到 contents 文件时出错"
-#: ftparchive/apt-ftparchive.cc:397
+#: ftparchive/apt-ftparchive.cc:401
#, c-format
-msgid "Error Processing Contents %s"
+msgid "Error processing contents %s"
msgstr "处理 Contents %s 时出错"
-#: ftparchive/apt-ftparchive.cc:551
+#: ftparchive/apt-ftparchive.cc:556
+#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
" --no-delink Enable delinking debug mode\n"
" --contents Control contents file generation\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option"
+" -o=? Set an arbitrary configuration option"
msgstr ""
"用法： apt-ftparchive [选项] 命令\n"
"命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"
"\n"
"apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
"Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n"
-"还有软件包的所有控制字段的内容。该软件同时支持覆盖(override)文件，\n"
+"还有软件包的所有控制字段的内容。该软件同时支持 override 文件，\n"
"通过它可以强制指定软件包的优先级及其所属的软件类别。\n"
"\n"
"与上面类似，apt-ftparchive 也能由 .dsc 的文件树生成 Source 文件。\n"
-"可以通过使用 --source-override 选项来指定一个覆盖(override)文件\n"
+"可以通过使用 --source-override 选项来指定一个 override 文件\n"
"\n"
"使用“packages”和“source”命令时，必须在文件树的根部执行本程序。\n"
-"\n"
-"二进制包的搜索路径一定要是递归搜索的底层，而且覆盖(override)文件里\n"
+"二进制包的搜索路径一定要是递归搜索的底层，而且 override 文件里\n"
"应该注明 override 的标志。若指定了路径前缀，那么它会被加到文件名前面。\n"
"下面有个来自 Debian 文档的例子：\n"
" apt-ftparchive packages dists/potato/main/binary-i386 > \\\n"
"选项:\n"
" -h 本帮助文档\n"
" --md5 使之生成 MD5 校验和\n"
-" -s=? 源代码包覆盖(override)文件\n"
-" -q 输出精简信息"
-" -d=? 指定可选的缓存数据库\n"
+" -s=? 源代码包 override 文件\n"
+" -q 输出精简信息 -d=? 指定可选的缓存数据库\n"
+" -d=? 使用另一个可选的缓存数据库\n"
" --no-delink 开启delink的调试模式\n"
" --contents 使之生成控制内容文件\n"
" -c=? 读取指定配置文件\n"
" -o=? 设置任意指定的配置选项"
-#: ftparchive/apt-ftparchive.cc:757
+#: ftparchive/apt-ftparchive.cc:762
msgid "No selections matched"
msgstr "没有任何选定项是匹配的"
-#: ftparchive/apt-ftparchive.cc:830
+#: ftparchive/apt-ftparchive.cc:835
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "软件包文件组“%s”中缺少一些文件"
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:45
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "缓存数据库被损坏了，该数据库文件的文件名已改成 %s.old"
-#: ftparchive/cachedb.cc:59
+#: ftparchive/cachedb.cc:63
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB 已过时，现试图进行升级 %s"
+
+#: ftparchive/cachedb.cc:73
#, c-format
-msgid "Unable to open DB2 file %s"
-msgstr "无法打开 DB2 文件 %s"
+msgid "Unable to open DB file %s: %s"
+msgstr "无法打开 DB 文件 %s：%s"
-#: ftparchive/cachedb.cc:99
+#: ftparchive/cachedb.cc:114
#, c-format
msgid "File date has changed %s"
msgstr "文件 %s 的时间已被改动"
-#: ftparchive/cachedb.cc:140
+#: ftparchive/cachedb.cc:155
msgid "Archive has no control record"
msgstr "存档没有包含控制字段"
-#: ftparchive/cachedb.cc:253 ftparchive/cachedb.cc:257
+#: ftparchive/cachedb.cc:267
msgid "Unable to get a cursor"
msgstr "无法获得游标(cursor)"
-#: ftparchive/writer.cc:79
+#: ftparchive/writer.cc:78
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告：无法读取目录 %s\n"
-#: ftparchive/writer.cc:84
+#: ftparchive/writer.cc:83
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告：无法对 %s 进行统计\n"
-#: ftparchive/writer.cc:126
+#: ftparchive/writer.cc:125
msgid "E: "
msgstr "错误："
-#: ftparchive/writer.cc:128
+#: ftparchive/writer.cc:127
msgid "W: "
msgstr "警告："
-#: ftparchive/writer.cc:135
+#: ftparchive/writer.cc:134
msgid "E: Errors apply to file "
msgstr "错误：处理文件时出错 "
-#: ftparchive/writer.cc:152 ftparchive/writer.cc:182
+#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
#, c-format
msgid "Failed to resolve %s"
msgstr "无法解析路径 %s"
-#: ftparchive/writer.cc:164
+#: ftparchive/writer.cc:163
msgid "Tree walking failed"
msgstr "无法遍历目录树"
-#: ftparchive/writer.cc:189
+#: ftparchive/writer.cc:188
#, c-format
msgid "Failed to open %s"
msgstr "无法打开 %s"
-#: ftparchive/writer.cc:246
+#: ftparchive/writer.cc:245
#, c-format
msgid " DeLink %s [%s]\n"
-msgstr ""
+msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:254
+#: ftparchive/writer.cc:253
#, c-format
msgid "Failed to readlink %s"
msgstr "无法读取符号链接 %s"
-#: ftparchive/writer.cc:258
+#: ftparchive/writer.cc:257
#, c-format
msgid "Failed to unlink %s"
msgstr "无法 unlink %s"
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:264
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 无法将 %s 链接到 %s"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:274
#, 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
+#: 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:378
+#: ftparchive/writer.cc:386
msgid "Archive had no package field"
msgstr "存档没有包含软件包(package)字段"
-#: ftparchive/writer.cc:386 ftparchive/writer.cc:595
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
#, c-format
msgid " %s has no override entry\n"
-msgstr " %s 中没有覆盖(override)项\n"
+msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:429 ftparchive/writer.cc:677
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "内部错误，无法定位包内文件 %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - 无法再分配内存"
#: ftparchive/override.cc:64 ftparchive/override.cc:170
#, c-format
msgid "Malformed override %s line %lu #1"
-msgstr "在覆盖(override)文件 %s 中第 %lu 行的格式有误 #1"
+msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
#: ftparchive/override.cc:78 ftparchive/override.cc:182
#, c-format
msgid "Malformed override %s line %lu #2"
-msgstr "在覆盖(override)文件 %s 中第 %lu 行的格式有误 #2"
+msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
#: ftparchive/override.cc:92 ftparchive/override.cc:195
#, c-format
msgid "Malformed override %s line %lu #3"
-msgstr "在覆盖(override)文件 %s 中第 %lu 行的格式有误 #3"
+msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
#: ftparchive/override.cc:131 ftparchive/override.cc:205
#, c-format
msgid "Failed to read the override file %s"
-msgstr "无法读取在覆盖(override)文件 %s"
+msgstr "无法读取 override 文件 %s"
#: ftparchive/multicompress.cc:75
#, c-format
-msgid "Unknown Compresison Algorithm '%s'"
+msgid "Unknown compression algorithm '%s'"
msgstr "未知的压缩算法“%s”"
#: ftparchive/multicompress.cc:105
msgstr "无法 fork"
#: ftparchive/multicompress.cc:215
-msgid "Compress Child"
+msgid "Compress child"
msgstr "压缩子进程"
#: ftparchive/multicompress.cc:238
#, c-format
-msgid "Internal Error, Failed to create %s"
+msgid "Internal error, failed to create %s"
msgstr "内部错误，无法建立 %s"
#: ftparchive/multicompress.cc:289
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
#: cmdline/apt-get.cc:325
#, c-format
msgid "but %s is installed"
-msgstr "但是，%s 已经安装了"
+msgstr "但是 %s 已经安装了"
#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is to be installed"
-msgstr "但是，%s 正要被安装"
+msgstr "但是 %s 正要被安装"
#: cmdline/apt-get.cc:334
msgid "but it is not installable"
-msgstr "但是，它无法被安装"
+msgstr "但却无法安装它"
#: cmdline/apt-get.cc:336
msgid "but it is a virtual package"
-msgstr "但是，它只是个虚拟软件包"
+msgstr "但是它只是个虚拟软件包"
#: cmdline/apt-get.cc:339
msgid "but it is not installed"
-msgstr "但是，它还没有被安装"
+msgstr "但是它还没有被安装"
#: cmdline/apt-get.cc:339
msgid "but it is not going to be installed"
-msgstr "但是，它将不会被安装"
+msgstr "但是它将不会被安装"
#: cmdline/apt-get.cc:344
msgid " or"
#: cmdline/apt-get.cc:421
msgid "The following packages have been kept back:"
-msgstr "下列的软件包的版本将保持持不变："
+msgstr "下列的软件包的版本将保持不变："
#: cmdline/apt-get.cc:442
msgid "The following packages will be upgraded:"
msgstr "%s (是由于 %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"注意：下列的重要软件包将被卸载 \n"
+"【警告】：下列的重要软件包将被卸载 \n"
"请勿尝试，除非您确实清楚您正在执行的操作！"
-#: cmdline/apt-get.cc:574
+#: cmdline/apt-get.cc:575
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，"
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:579
#, c-format
msgid "%lu reinstalled, "
msgstr "共重新安装了 %lu 个软件包，"
-#: cmdline/apt-get.cc:580
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu downgraded, "
msgstr "降级了 %lu 个软件包，"
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n"
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647
msgid "Correcting dependencies..."
msgstr "正在更正依赖关系..."
-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:650
msgid " failed."
msgstr " 失败。"
-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:653
msgid "Unable to correct dependencies"
msgstr "无法更正依赖关系"
-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:656
msgid "Unable to minimize the upgrade set"
msgstr "无法使升级的软件包集最小化"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
msgid " Done"
msgstr " 完成"
-#: cmdline/apt-get.cc:661
+#: cmdline/apt-get.cc:662
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。"
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:665
msgid "Unmet dependencies. Try using -f."
msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-#: cmdline/apt-get.cc:718
-msgid "Packages need to be removed but Remove is disabled."
+#: cmdline/apt-get.cc:687
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "【警告】：下列的软件包不能通过认证！"
+
+#: cmdline/apt-get.cc:691
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification [y/N]? "
+msgstr "不经验证就安装这些软件包么？[y/N] "
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr "有些软件包不能通过验证"
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+msgid "There are problems and -y was used without --force-yes"
+msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes。"
+
+#: cmdline/apt-get.cc:753
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
+
+#: cmdline/apt-get.cc:762
+msgid "Packages need to be removed but remove is disabled."
msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1711 cmdline/apt-get.cc:1744
+#: cmdline/apt-get.cc:773
+#, fuzzy
+msgid "Internal error, Ordering didn't finish"
+msgstr "添加 diversion 时出现内部错误"
+
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
msgid "Unable to lock the download directory"
msgstr "无法对下载目录加锁"
-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1792 cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "无法读取安装源列表。"
-#: cmdline/apt-get.cc:774
+#: cmdline/apt-get.cc:814
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+
+#: cmdline/apt-get.cc:819
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "需要下载 %sB/%sB 的软件包。\n"
-#: cmdline/apt-get.cc:777
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "需要下载 %sB 的软件包。\n"
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:827
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:830
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:802
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#, fuzzy, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "您在 %s 上没有足够的空余空间"
+
+#: cmdline/apt-get.cc:847
#, c-format
msgid "You don't have enough free space in %s."
msgstr "您在 %s 中没有足够的空余空间。"
-#: cmdline/apt-get.cc:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr "碰到了一些问题，您使用了 -y 选项但是没有用 --force-yes。"
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:864
msgid "Yes, do as I say!"
-msgstr "是的，就照着我说的做！"
+msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:821
-#, c-format
+#: cmdline/apt-get.cc:866
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
"若还想继续的话，就输入下面的短句“%s”\n"
" ?] "
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
msgid "Abort."
msgstr "中止执行。"
-#: cmdline/apt-get.cc:842
-msgid "Do you want to continue? [Y/n] "
+#: cmdline/apt-get.cc:887
+msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗？[Y/n]"
-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1901
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:977
msgid "Some files failed to download"
msgstr "有一些文件下载失败"
-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
msgid "Download complete and in download only mode"
msgstr "下载完毕，目前是“仅下载”模式"
-#: cmdline/apt-get.cc:936
+#: cmdline/apt-get.cc:984
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:940
+#: cmdline/apt-get.cc:988
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:993
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: cmdline/apt-get.cc:946
-msgid "Aborting Install."
+#: cmdline/apt-get.cc:994
+msgid "Aborting install."
msgstr "放弃安装。"
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1028
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "注意，我选了 %s 而非 %s\n"
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1038
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1056
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "软件包 %s 还未安装，因而不会被卸载\n"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1067
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1079
msgid " [Installed]"
msgstr " [已安装]"
-#: cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:1084
msgid "You should explicitly select one to install."
msgstr "请您明确地选择一个来进行安装。"
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1089
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
"这可能意味着这个缺失的软件包可能已被废弃，\n"
"或者只能在其他发布源中找到\n"
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1108
msgid "However the following packages replace it:"
msgstr "可是下列的软件包取代了它："
-#: cmdline/apt-get.cc:1062
+#: cmdline/apt-get.cc:1111
#, c-format
msgid "Package %s has no installation candidate"
msgstr "软件包 %s 还没有可供安装的候选者"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1131
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "不能重新安装 %s，因为无法下载它。\n"
-#: cmdline/apt-get.cc:1090
+#: cmdline/apt-get.cc:1139
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-get.cc:1117
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1174
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "选定了版本为 %s (%s) 的 %s\n"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1284
msgid "The update command takes no arguments"
msgstr " update 命令是不需任何参数的"
-#: cmdline/apt-get.cc:1248
+#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
msgid "Unable to lock the list directory"
msgstr "无法对状态列表目录加锁"
-#: cmdline/apt-get.cc:1300
+#: cmdline/apt-get.cc:1355
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
"有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
-#: cmdline/apt-get.cc:1319
-msgid "Internal Error, AllUpgrade broke stuff"
+#: cmdline/apt-get.cc:1374
+msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部错误，AllUpgrade 造成某些故障"
-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1432
+#: cmdline/apt-get.cc:1496
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
-#: cmdline/apt-get.cc:1462
+#: cmdline/apt-get.cc:1526
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
-#: cmdline/apt-get.cc:1465
+#: cmdline/apt-get.cc:1529
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1477
+#: cmdline/apt-get.cc:1541
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:1485
+#: cmdline/apt-get.cc:1549
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:1490
+#: cmdline/apt-get.cc:1554
msgid "The following information may help to resolve the situation:"
msgstr "下列的信息可能会对问题的解决有所帮助："
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1557
msgid "Broken packages"
msgstr "受损安装包"
-#: cmdline/apt-get.cc:1519
+#: cmdline/apt-get.cc:1583
msgid "The following extra packages will be installed:"
msgstr "将会安装下列的额外的软件包："
-#: cmdline/apt-get.cc:1585
+#: cmdline/apt-get.cc:1654
msgid "Suggested packages:"
msgstr "建议安装的软件包："
-#: cmdline/apt-get.cc:1586
+#: cmdline/apt-get.cc:1655
msgid "Recommended packages:"
msgstr "推荐安装的软件包："
-#: cmdline/apt-get.cc:1606
-msgid "Calculating Upgrade... "
+#: cmdline/apt-get.cc:1675
+msgid "Calculating upgrade... "
msgstr "正在筹划升级... "
-#: cmdline/apt-get.cc:1609 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1683
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#, fuzzy
+msgid "Internal error, problem resolver broke stuff"
+msgstr "内部错误，AllUpgrade 造成某些故障"
+
+#: cmdline/apt-get.cc:1856
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码，必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:1814 cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:1861
+#: cmdline/apt-get.cc:1930
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的空余空间"
-#: cmdline/apt-get.cc:1866
+#: cmdline/apt-get.cc:1935
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
-#: cmdline/apt-get.cc:1869
+#: cmdline/apt-get.cc:1938
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1944
#, c-format
-msgid "Fetch Source %s\n"
+msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1975
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:1934
+#: cmdline/apt-get.cc:2003
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
-#: cmdline/apt-get.cc:1946
+#: cmdline/apt-get.cc:2015
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:2016
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2033
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:1982
+#: cmdline/apt-get.cc:2052
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:1998
+#: cmdline/apt-get.cc:2068
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:2096
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2116
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2098
+#: cmdline/apt-get.cc:2168
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-msgstr ""
-"由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:2150
+#: cmdline/apt-get.cc:2220
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 "
-"%1$s 依赖关系"
+"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
+"$s 依赖关系"
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2255
#, 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:2210
+#: cmdline/apt-get.cc:2280
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
-#: cmdline/apt-get.cc:2224
+#: cmdline/apt-get.cc:2294
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:2298
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:2260
-msgid "Supported Modules:"
+#: cmdline/apt-get.cc:2330
+msgid "Supported modules:"
msgstr "被支持模块："
-#: cmdline/apt-get.cc:2301
+#: cmdline/apt-get.cc:2371
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
" -b Build the source package after fetching it\n"
" -V Show verbose version numbers\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
" remove - 卸载软件包\n"
" source - 下载源码包文件\n"
" build-dep - 为源码包配置所需的构建依赖关系\n"
-" dist-upgrade - 发布版升级，见 apt-get(8)"
-" dselect-upgrade - 根据 dselect 的选择来进行升级\n"
+" dist-upgrade - 发布版升级，见 apt-get(8)\n"
+" dselect-upgrade - 根据 dselect的选择来进行升级\n"
" clean - 删除所有已下载的包文件\n"
-" auto-clean - 删除老版本的已下载的包文件\n"
-" check - 核对以确认系统的依赖关系的完整性"
-"\n"
+" autoclean - 删除老版本的已下载的包文件\n"
+" check - 核对以确认系统的依赖关系的完整性\n"
"选项：\n"
" -h 本帮助文档。\n"
" -q 让输出可作为日志 - 不显示进度\n"
" -f 当没有通过完整性测试时，程序仍试图继续执行\n"
" -m 当有包文件无法找到时，程序仍试图继续执行\n"
" -u 显示已升级的软件包列表\n"
-" -b 在下载完源码包后，编译生成相应的软件包"
+" -b 在下载完源码包后，编译生成相应的软件包\n"
" -V 显示详尽的版本号\n"
" -c=? 读取指定配置文件\n"
" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
"请查阅 apt-get(8)、sources.list(5) 和 apt.conf(5)的参考手册\n"
-"以猎取更多信息和选项。\n"
+"以获取更多信息和选项。\n"
" 本 APT 有着超级牛力。\n"
#: cmdline/acqprogress.cc:55
#: cmdline/acqprogress.cc:271
#, c-format
msgid ""
-"Media Change: Please insert the disc labeled\n"
+"Media change: please insert the disc labeled\n"
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
"更换介质：请把标有\n"
"“%s”\n"
"的碟片插入驱动器“%s”再按回车键\n"
-""
#: cmdline/apt-sortpkgs.cc:86
msgid "Unknown package record!"
" -h This help text\n"
" -s Use source file sorting\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
"用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
"\n"
#: dselect/install:103
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
-msgstr ""
-"这个提示之前的错误消息才值得您注意。请更正它们，然后再次执行 [I]nstall"
+msgstr "这个提示之前的错误消息才值得您注意。请更正它们，然后再次执行 [I]nstall"
#: dselect/update:30
-msgid "Merging Available information"
+msgid "Merging available information"
msgstr "正在合并现有信息"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "无法创建管道"
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "无法执行 gzip"
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "包文件已被损坏"
-#: apt-inst/contrib/extracttar.cc:193
-msgid "Tar Checksum failed, archive corrupted"
+#: apt-inst/contrib/extracttar.cc:195
+msgid "Tar checksum failed, archive corrupted"
msgstr "tar 的校验码不符，包文件已被损坏"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "未知的 TAR 数据头类型 %u，成员 %s"
msgstr "无法分配转移项(diversion)"
#: apt-inst/filelist.cc:468
-msgid "Internal Error in AddDiversion"
+msgid "Internal error in AddDiversion"
msgstr "内部错误，出现在 AddDiversion"
#: apt-inst/filelist.cc:481
msgstr "重复的配置文件 %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "无法写入文件 %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
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:705
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:412 apt-pkg/clean.cc:38
+#: 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
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
-msgid "Reading Package Lists"
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
+msgid "Reading package lists"
msgstr "正在读取软件包列表"
#: apt-inst/deb/dpkgdb.cc:180
#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
#: apt-inst/deb/dpkgdb.cc:448
-msgid "Internal Error getting a Package Name"
+msgid "Internal error getting a package name"
msgstr "在获取软件包名字时出现内部错误"
#: apt-inst/deb/dpkgdb.cc:205
-msgid "Reading File Listing"
+msgid "Reading file listing"
msgstr "正在读取文件列表"
#: apt-inst/deb/dpkgdb.cc:216
"then make it empty and immediately re-install the same version of the "
"package!"
msgstr ""
-"无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，"
-"é\82£ä¹\88å°±æ¸\85空该æ\96\87件ï¼\8cå\86\8d马ä¸\8aé\87\8dæ\96°å®\89è£\85ç\9b¸å\90\8cç\89\88æ\9c¬ç\9a\84è¿\99个软件å\8c\85ï¼\81"
+"无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，那么就清空该文件，再马上"
+"重新安装相同版本的这个软件包！"
#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
#, c-format
msgstr "无法读取列表文件 %sinfo/%s"
#: apt-inst/deb/dpkgdb.cc:266
-msgid "Internal Error getting a Node"
+msgid "Internal error getting a node"
msgstr "获得一个节点时出现内部错误"
#: apt-inst/deb/dpkgdb.cc:309
msgstr "转移配置文件中有一行是无效的：%s"
#: apt-inst/deb/dpkgdb.cc:362
-msgid "Internal Error adding a diversion"
+msgid "Internal error adding a diversion"
msgstr "添加 diversion 时出现内部错误"
#: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialize first"
+msgid "The pkg cache must be initialized first"
msgstr "必须首先初始化软件包缓存"
#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading File List"
+msgid "Reading file list"
msgstr "正在读取文件列表"
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
-msgid "Failed to find a Package: Header, offset %lu"
+msgid "Failed to find a Package: header, offset %lu"
msgstr "无法找到某个软件包：包头，于偏移位置 %lu"
#: apt-inst/deb/dpkgdb.cc:465
msgid "Error parsing MD5. Offset %lu"
msgstr "无法解析 MD5 码。文件内偏移量为 %lu"
-#: apt-inst/deb/debfile.cc:55
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
-#: apt-inst/deb/debfile.cc:72
+#: apt-inst/deb/debfile.cc:52
#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "内部错误，无法定位包内文件 %s"
+msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”或者“%s”"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
-msgstr "无法切换工作到 %s"
+msgstr "无法切换工作目录到 %s"
-#: apt-inst/deb/debfile.cc:125
-msgid "Internal Error, could not locate member"
+#: apt-inst/deb/debfile.cc:138
+msgid "Internal error, could not locate member"
msgstr "内部错误，无法定位包内文件"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "无法在打包文件中找到有效的主控文件"
-#: apt-inst/deb/debfile.cc:243
-msgid "Unparsible control file"
-msgstr "不能解析的 control 文件"
+#: apt-inst/deb/debfile.cc:256
+msgid "Unparsable control file"
+msgstr "不能解析的主控文件"
-#: methods/cdrom.cc:113
+#: methods/cdrom.cc:114
#, c-format
msgid "Unable to read the cdrom database %s"
msgstr "无法读取光盘数据库 %s"
-#: methods/cdrom.cc:122
+#: methods/cdrom.cc:123
msgid ""
-"Please use apt-cdrom to make this CD recognized by APT. apt-get update "
-"cannot be used to add new CDs"
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
msgstr ""
-"请使用 apt-cdrom 来让此光盘能被 APT 所识别。apt-get upgdate "
-"不能被用来加入新的光盘。"
+"请使用 apt-cdrom，通过它就可以让 APT 能识别该光盘。apt-get upgdate 不能被用来"
+"加入新的光盘。"
-#: methods/cdrom.cc:130 methods/cdrom.cc:168
-msgid "Wrong CD"
+#: methods/cdrom.cc:131
+msgid "Wrong CD-ROM"
msgstr "错误的光盘"
-#: methods/cdrom.cc:163
+#: methods/cdrom.cc:164
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "无法卸载现在挂载于 %s 的 CD-ROM，可能它正在使用中。"
-#: methods/cdrom.cc:177 methods/file.cc:77
+#: methods/cdrom.cc:169
+#, fuzzy
+msgid "Disk not found."
+msgstr "无法找到该文件"
+
+#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
-msgstr "无法找到文件"
+msgstr "无法找到该文件"
-#: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142
+#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "无法读取状态"
-#: methods/copy.cc:79 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
-#: methods/file.cc:42
+#: methods/file.cc:44
msgid "Invalid URI, local URIS must not start with //"
msgstr "无效的 URI，本地的 URI 不能以 // 开头"
#: methods/ftp.cc:168
msgid "Unable to determine the peer name"
-msgstr "无法获知无端主机名"
+msgstr "无法获知对方主机名"
#: methods/ftp.cc:173
msgid "Unable to determine the local name"
#: methods/ftp.cc:204 methods/ftp.cc:232
#, c-format
-msgid "Server refused our connection and said: %s"
-msgstr "服务器拒绝让我们的连接，它的回应是：%s"
+msgid "The server refused the connection and said: %s"
+msgstr "服务器拒绝了我们的连接，它响应道：%s"
#: methods/ftp.cc:210
#, c-format
msgid "USER failed, server said: %s"
-msgstr "USER æ\8c\87令å\87ºé\94\99ï¼\8cæ\9c\8då\8a¡å\99¨å\9b\9eåº\94：%s"
+msgstr "USER æ\8c\87令å\87ºé\94\99ï¼\8cæ\9c\8då\8a¡å\99¨å\93\8dåº\94é\81\93：%s"
#: methods/ftp.cc:217
#, c-format
msgid "PASS failed, server said: %s"
-msgstr "PASS æ\8c\87令å\87ºé\94\99ï¼\8cæ\9c\8då\8a¡å\99¨å\9b\9eåº\94：%s"
+msgstr "PASS æ\8c\87令å\87ºé\94\99ï¼\8cæ\9c\8då\8a¡å\99¨å\93\8dåº\94é\81\93：%s"
#: methods/ftp.cc:237
msgid ""
#: methods/ftp.cc:265
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "ç\99»å½\95è\84\9aæ\9c¬å\91½ä»¤â\80\9c%sâ\80\9då\87ºé\94\99ï¼\8cæ\9c\8då\8a¡å\99¨å\9b\9eåº\94：%s"
+msgstr "ç\99»å½\95è\84\9aæ\9c¬å\91½ä»¤â\80\9c%sâ\80\9då\87ºé\94\99ï¼\8cæ\9c\8då\8a¡å\99¨å\93\8dåº\94é\81\93：%s"
#: methods/ftp.cc:291
#, c-format
#: methods/ftp.cc:335
msgid "Server closed the connection"
-msgstr "æ\9c\8då\8a¡å\99¨å\88\87æ\96äº\86è¿\9eæ\8e¥"
+msgstr "æ\9c\8då\8a¡å\99¨å\85³é\97äº\86è¿\9eæ\8e¥"
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:452 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
msgid "Read error"
msgstr "读错误"
msgid "Protocol corruption"
msgstr "协议有误"
-#: methods/ftp.cc:446 methods/rsh.cc:232
-msgid "Write Error"
-msgstr "写错误"
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+msgid "Write error"
+msgstr "写文件出错"
#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
msgid "Could not create a socket"
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:864 methods/http.cc:912 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "把文件加入散列表时出错"
#: methods/ftp.cc:877
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "æ\97 æ³\95è\8e·å\8f\96æ\96\87件ï¼\8cæ\9c\8då\8a¡å\99¨å\9b\9eåº\94“%s”"
+msgstr "æ\97 æ³\95è\8e·å\8f\96æ\96\87件ï¼\8cæ\9c\8då\8a¡å\99¨å\93\8dåº\94é\81\93“%s”"
#: methods/ftp.cc:892 methods/rsh.cc:322
msgid "Data socket timed out"
#: methods/ftp.cc:922
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "数据传送出错，服务器的响应为“%s”"
+msgstr "数据传送出错，服务器响应道“%s”"
#. Get the files information
#: methods/ftp.cc:997
msgid "Query"
msgstr "查询"
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "无法调用 "
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "无法发起与 %s:%s (%s) 的连接"
-#: methods/connect.cc:92
+#: methods/connect.cc:93
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "无法连接上 %s:%s (%s)，连接超时"
-#: methods/connect.cc:104
+#: methods/connect.cc:106
#, 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:132 methods/rsh.cc:425
+#: methods/connect.cc:134 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "正在连接 %s"
-#: methods/connect.cc:163
+#: methods/connect.cc:165
#, c-format
msgid "Could not resolve '%s'"
msgstr "无法解析域名“%s”"
-#: methods/connect.cc:167
+#: methods/connect.cc:171
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "暂时不能解析域名“%s”"
-#: methods/connect.cc:169
+#: methods/connect.cc:174
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "解析“%s:%s”时，出现了某些故障 (%i)"
-#: methods/connect.cc:216
+#: methods/connect.cc:221
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "不能连接上 %s %s："
+#: methods/gpgv.cc:92
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr ""
+
+#: methods/gpgv.cc:191
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""
+
+#: methods/gpgv.cc:196
+msgid "At least one invalid signature was encountered."
+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:206
+msgid "Unknown error executing gpgv"
+msgstr ""
+
+#: methods/gpgv.cc:237
+#, fuzzy
+msgid "The following signatures were invalid:\n"
+msgstr "将会安装下列的额外的软件包："
+
+#: methods/gpgv.cc:244
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+
#: methods/gzip.cc:57
#, c-format
msgid "Couldn't open pipe for %s"
msgid "Read error from %s process"
msgstr "从 %s 进程读取数据出错"
-#: methods/http.cc:340
+#: methods/http.cc:344
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/http.cc:486
+#: methods/http.cc:490
#, c-format
msgid "Got a single header line over %u chars"
msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
-#: methods/http.cc:494
+#: methods/http.cc:498
msgid "Bad header line"
msgstr "错误的报头条目"
-#: methods/http.cc:513 methods/http.cc:520
-msgid "The http server sent an invalid reply header"
+#: methods/http.cc:517 methods/http.cc:524
+msgid "The HTTP server sent an invalid reply header"
msgstr "该 http 服务器发送了一个无效的应答报头"
-#: methods/http.cc:549
-msgid "The http server sent an invalid Content-Length header"
+#: methods/http.cc:553
+msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
-#: methods/http.cc:564
-msgid "The http server sent an invalid Content-Range header"
+#: methods/http.cc:568
+msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
-#: methods/http.cc:566
-msgid "This http server has broken range support"
+#: methods/http.cc:570
+msgid "This HTTP server has broken range support"
msgstr "该 http 服务器的 range 支持不正常"
-#: methods/http.cc:590
+#: methods/http.cc:594
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:733
+#: methods/http.cc:741
msgid "Select failed"
-msgstr "Select 调用出错"
+msgstr "select 调用出错"
-#: methods/http.cc:738
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "连接服务器超时"
-#: methods/http.cc:761
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:789
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "写文件时出错"
-#: methods/http.cc:814
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "写文件时出错"
-#: methods/http.cc:828
-msgid "Error reading from server Remote end closed connection"
+#: methods/http.cc:836
+msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错，对方关闭了连接"
-#: methods/http.cc:830
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:1061
-msgid "Bad header Data"
-msgstr "错误的包头数据"
+#: methods/http.cc:1069
+msgid "Bad header data"
+msgstr "错误的报头数据"
-#: methods/http.cc:1078
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1169
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "内部错误"
msgid "Selection %s not found"
msgstr "没有发现您的所选 %s"
-#: apt-pkg/contrib/configuration.cc:395
+#: apt-pkg/contrib/configuration.cc:436
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "无法识别的类型缩写：“%c”"
-#: apt-pkg/contrib/configuration.cc:453
+#: apt-pkg/contrib/configuration.cc:494
#, c-format
msgid "Opening configuration file %s"
msgstr "正在打开配置文件 %s"
-#: apt-pkg/contrib/configuration.cc:563
+#: apt-pkg/contrib/configuration.cc:512
+#, c-format
+msgid "Line %d too long (max %d)"
+msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。"
+
+#: apt-pkg/contrib/configuration.cc:608
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "语法错误 %s:%u：配置小节没有以名字开头"
-#: apt-pkg/contrib/configuration.cc:582
+#: apt-pkg/contrib/configuration.cc:627
#, c-format
-msgid "Syntax error %s:%u: Malformed Tag"
+msgid "Syntax error %s:%u: Malformed tag"
msgstr "语法错误 %s:%u：标签格式有误"
-#: apt-pkg/contrib/configuration.cc:599
+#: apt-pkg/contrib/configuration.cc:644
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据"
-#: apt-pkg/contrib/configuration.cc:639
+#: apt-pkg/contrib/configuration.cc:684
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
-#: apt-pkg/contrib/configuration.cc:646
+#: apt-pkg/contrib/configuration.cc:691
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
-#: apt-pkg/contrib/configuration.cc:650 apt-pkg/contrib/configuration.cc:655
+#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "语法错误 %s:%u: Included from here"
-#: apt-pkg/contrib/configuration.cc:659
+#: apt-pkg/contrib/configuration.cc:704
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "语法错误 %s:%u: 不支持的指令“%s”"
-#: apt-pkg/contrib/configuration.cc:693
+#: apt-pkg/contrib/configuration.cc:738
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "语法错误 %s:%u: 文件尾部有无意义的数据"
+msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"
#: apt-pkg/contrib/progress.cc:154
#, c-format
msgid "Unable to stat the mount point %s"
msgstr "无法读取文件系统挂载点 %s 的状态"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
-msgstr "无法改变工作目录至 %s"
+msgstr "无法切换工作目录到 %s"
#: apt-pkg/contrib/cdromutl.cc:190
msgid "Failed to stat the cdrom"
msgstr "无法读取光盘的状态"
-#: apt-pkg/contrib/fileutl.cc:80
+#: apt-pkg/contrib/fileutl.cc:82
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "由于文件系统为只读，因而无法使用文件锁%s"
-#: apt-pkg/contrib/fileutl.cc:85
+#: apt-pkg/contrib/fileutl.cc:87
#, c-format
msgid "Could not open lock file %s"
msgstr "无法打开锁文件 %s"
-#: apt-pkg/contrib/fileutl.cc:103
+#: apt-pkg/contrib/fileutl.cc:105
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "无法在 nfs 文件系统上使用文件锁 %s"
-#: apt-pkg/contrib/fileutl.cc:107
+#: apt-pkg/contrib/fileutl.cc:109
#, c-format
msgid "Could not get lock %s"
msgstr "无法获得锁 %s"
-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:377
#, c-format
-msgid "Waited, for %s but it wasn't there"
+msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出，但是它并不存在"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:387
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "子进程 %s 发生了段错误"
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:390
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:373
+#: apt-pkg/contrib/fileutl.cc:392
#, c-format
msgid "Sub-process %s exited unexpectedly"
-msgstr "子进程 %s 异常结束了"
+msgstr "子进程 %s 异常退出了"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:436
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: apt-pkg/contrib/fileutl.cc:473
+#: apt-pkg/contrib/fileutl.cc:492
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "读文件时出错，还剩 %lu 字节没有读出"
-#: apt-pkg/contrib/fileutl.cc:491
-msgid "Write error"
-msgstr "写文件出错"
-
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:522
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "写文件时出错，还剩 %lu 字节没有保存"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:597
msgid "Problem closing the file"
msgstr "关闭文件时出错"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:603
msgid "Problem unlinking the file"
msgstr "用 unlink 删除文件时出错"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:614
msgid "Problem syncing the file"
msgstr "同步文件时出错"
#: apt-pkg/pkgcache.cc:142
#, c-format
-msgid "This APT does not support the Versioning System '%s'"
+msgid "This APT does not support the versioning system '%s'"
msgstr "本程序目前不支持“%s”这个版本控制系统"
#: apt-pkg/pkgcache.cc:147
msgstr "额外"
#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
-msgid "Building Dependency Tree"
+msgid "Building dependency tree"
msgstr "正在分析软件包的依赖关系树"
#: apt-pkg/depcache.cc:61
-msgid "Candidate Versions"
+msgid "Candidate versions"
msgstr "候选版本"
#: apt-pkg/depcache.cc:90
-msgid "Dependency Generation"
+msgid "Dependency generation"
msgstr "生成依赖关系"
-#: apt-pkg/tagfile.cc:71
+#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "无法解析软件包文件 %s (1)"
-#: apt-pkg/tagfile.cc:158
+#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "无法解析软件包文件 %s (2)"
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:87
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:89
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist)"
-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98
#, c-format
-msgid "Malformed line %lu in source list %s (Absolute dist)"
+msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)"
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)"
-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr "Vendor 块 %s 是无效的"
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156
#, c-format
msgid "Opening %s"
msgstr "正在打开 %s"
-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。"
-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191
#, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
-msgstr "无法识别在安装源列表 %3$s 第 %2$u 行中的软件包类别“%1$s”"
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)"
-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr "在安装源列表 %3$s 的第 %2$u 行发现了无法识别的提供 vendnor ID “%1$s”"
-
#: apt-pkg/packagemanager.cc:402
#, c-format
msgid ""
"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-"由于这次安装存在着一个 Conflicts/Pre-Depends 循环，因而需要暂时"
-"å\88 é\99¤ä¸\80个å¿\85ä¸\8då\8f¯å°\91ç\9a\84软件å\8c\85 %sã\80\82é\80\9a常并ä¸\8d建议è¿\99æ ·å\81\9aï¼\8cä½\86æ\98¯å¦\82æ\9e\9c"
-"您确实希望如此，可以打开 APT::Force-LoopBreak 选项。"
+"由于这次安装存在着一个 Conflicts/Pre-Depends 循环，因而需要暂时删除一个必不可"
+"å°\91ç\9a\84软件å\8c\85 %sã\80\82é\80\9a常并ä¸\8d建议è¿\99æ ·å\81\9aï¼\8cä½\86æ\98¯å¦\82æ\9e\9cæ\82¨ç¡®å®\9eå¸\8cæ\9c\9bå¦\82æ¤ï¼\8cå\8f¯ä»¥æ\89\93å¼\80 APT::"
+"Force-LoopBreak 选项。"
#: apt-pkg/pkgrecords.cc:37
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "不支持索引文件类型“%s”"
-#: apt-pkg/algorithms.cc:238
+#: apt-pkg/algorithms.cc:241
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-"错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状"
-"ç\9a\84ç¼\98æ\95\85ã\80\82"
+"错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
+"缘故。"
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-"无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关系。"
+"无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
+"系。"
-#: apt-pkg/acquire.cc:61
+#: apt-pkg/acquire.cc:62
#, c-format
msgid "Lists directory %spartial is missing."
msgstr "软件包列表的目录 %spartial 不见了。"
-#: apt-pkg/acquire.cc:65
+#: apt-pkg/acquire.cc:66
#, c-format
msgid "Archive directory %spartial is missing."
msgstr "找不到“%spartial”这个目录。"
-#: apt-pkg/acquire-worker.cc:112
+#: apt-pkg/acquire.cc:817
+#, c-format
+msgid "Downloading file %li of %li (%s remaining)"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
-#: apt-pkg/acquire-worker.cc:161
+#: apt-pkg/acquire-worker.cc:162
#, c-format
msgid "Method %s did not start correctly"
msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
+#: apt-pkg/acquire-worker.cc:377
+#, fuzzy, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"更换介质：请把标有\n"
+"“%s”\n"
+"的碟片插入驱动器“%s”再按回车键\n"
+
#: apt-pkg/init.cc:119
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
#: apt-pkg/init.cc:135
-msgid "Unable to determine a suitable system type"
+msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
#: apt-pkg/clean.cc:61
msgid "Unable to stat %s."
msgstr "无法读取 %s 的状态。"
-#: apt-pkg/srcrecords.cc:49
+#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
msgstr "您必须在您的 sources.list 输入一些“软件包源”的 URL"
#: apt-pkg/pkgcachegen.cc:117
#, c-format
-msgid "Error occured while processing %s (NewPackage)"
+msgid "Error occurred while processing %s (NewPackage)"
msgstr "处理 %s (NewPackage)时出错"
#: apt-pkg/pkgcachegen.cc:129
#, c-format
-msgid "Error occured while processing %s (UsePackage1)"
+msgid "Error occurred while processing %s (UsePackage1)"
msgstr "处理 %s (UsePackage1)时出错"
#: apt-pkg/pkgcachegen.cc:150
#, c-format
-msgid "Error occured while processing %s (UsePackage2)"
+msgid "Error occurred while processing %s (UsePackage2)"
msgstr "处理 %s (UsePackage2)时出错"
#: apt-pkg/pkgcachegen.cc:154
#, c-format
-msgid "Error occured while processing %s (NewFileVer1)"
+msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "处理 %s (NewFileVer1)时出错"
#: apt-pkg/pkgcachegen.cc:184
#, c-format
-msgid "Error occured while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion1)"
msgstr "处理 %s (NewVersion1)时出错"
#: apt-pkg/pkgcachegen.cc:188
#, c-format
-msgid "Error occured while processing %s (UsePackage3)"
+msgid "Error occurred while processing %s (UsePackage3)"
msgstr "处理 %s (UsePackage3)时出错"
#: apt-pkg/pkgcachegen.cc:192
#, c-format
-msgid "Error occured while processing %s (NewVersion2)"
+msgid "Error occurred while processing %s (NewVersion2)"
msgstr "处理 %s (NewVersion2)时出错"
#: apt-pkg/pkgcachegen.cc:207
#: apt-pkg/pkgcachegen.cc:241
#, c-format
-msgid "Error occured while processing %s (FindPkg)"
+msgid "Error occurred while processing %s (FindPkg)"
msgstr "处理 %s (FindPkg)时出错"
#: apt-pkg/pkgcachegen.cc:254
#, c-format
-msgid "Error occured while processing %s (CollectFileProvides)"
+msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "处理 %s (CollectFileProvides)时出错"
#: apt-pkg/pkgcachegen.cc:260
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "无法写入来源缓存文件"
-#: apt-pkg/acquire-item.cc:124
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件，%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+msgid "MD5Sum mismatch"
+msgstr "MD5 校验和不符"
+
+#: apt-pkg/acquire-item.cc:722
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件包"
-"。(缘于架构缺失)"
+"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
+"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:388
+#: apt-pkg/acquire-item.cc:775
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-"我无法找到对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件包。"
+"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:419
+#: apt-pkg/acquire-item.cc:811
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段"
-#: apt-pkg/acquire-item.cc:501
+#: apt-pkg/acquire-item.cc:898
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr "MD5 校验和不符"
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "软件提供者数据块内 %s 没有包含指纹信息"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "无法找到该文件"
+#: apt-pkg/cdrom.cc:507
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+"现把 %s 作为了 CD-ROM 的挂载点\n"
+"正在挂载 CD-ROM\n"
+
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+msgid "Identifying.. "
+msgstr "正在鉴别.. "
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Stored label: %s \n"
+msgstr "存档标签：%s \n"
+
+#: apt-pkg/cdrom.cc:561
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
+
+#: apt-pkg/cdrom.cc:579
+msgid "Unmounting CD-ROM\n"
+msgstr "正在卸载 CD-ROM 文件系统\n"
+
+#: apt-pkg/cdrom.cc:583
+msgid "Waiting for disc...\n"
+msgstr "等待插入盘片……\n"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:591
+msgid "Mounting CD-ROM...\n"
+msgstr "正在挂载 CD-ROM 文件系统……\n"
+
+#: apt-pkg/cdrom.cc:609
+msgid "Scanning disc for index files..\n"
+msgstr "正在光盘中查找索引文件..\n"
+
+#: apt-pkg/cdrom.cc:647
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr "找到了 %i 个软件包索引、%i 个源代码包索引，和 %i 个数字签名\n"
+
+#: apt-pkg/cdrom.cc:710
+msgid "That is not a valid name, try again.\n"
+msgstr "这不是一个有效的名字，请再次命名。\n"
+
+#: apt-pkg/cdrom.cc:726
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"这张光盘现在的名字是：\n"
+"“%s”\n"
+
+#: apt-pkg/cdrom.cc:730
+msgid "Copying package lists..."
+msgstr "正在复制软件包列表……"
+
+#: apt-pkg/cdrom.cc:754
+msgid "Writing new source list\n"
+msgstr "正在写入新的软件包源列表\n"
+
+#: apt-pkg/cdrom.cc:763
+msgid "Source list entries for this disc are:\n"
+msgstr "对应于该光盘的软件包源设置项是：\n"
+
+#: apt-pkg/cdrom.cc:803
+msgid "Unmounting CD-ROM..."
+msgstr "正在卸载 CD-ROM 文件系统……"
+
+#: apt-pkg/indexcopy.cc:261
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "已写入 %i 条记录。\n"
+
+#: apt-pkg/indexcopy.cc:263
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
+
+#: apt-pkg/indexcopy.cc:266
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "已写入 %i 条记录，并有 %i 个文件不吻合\n"
+
+#: apt-pkg/indexcopy.cc:269
+#, 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
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "正在打开 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:359
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "正在打开 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:364
+#, fuzzy, c-format
+msgid "Preparing to configure %s"
+msgstr "正在打开配置文件 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:365
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "正在连接 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:366
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr " 已安装："
+
+#: apt-pkg/deb/dpkgpm.cc:371
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:372
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "正在打开 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:373
+#, fuzzy, c-format
+msgid "Removed %s"
+msgstr "推荐"
+
+#: apt-pkg/deb/dpkgpm.cc:378
+#, c-format
+msgid "Preparing for remove with config %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:379
+#, c-format
+msgid "Removed with config %s"
+msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "连接被永久关闭"
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr ""
+#~ "在安装源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%"
+#~ "1$s”"
projects / apt.git / blobdiff