remove double list include

[apt.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index b5e3a8c2af20a485cbb786627348dc999e6fef02..50e1eca86b815a11c8dfc9026cfb0362559d5c6f 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2013-04-03 14:20+0200\n"
+"POT-Creation-Date: 2013-05-16 11:28+0200\n"

 "PO-Revision-Date: 2010-08-26 14:42+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "PO-Revision-Date: 2010-08-26 14:42+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"


@@ -156,7 +156,7 @@ msgstr "  版本列表："
 
 #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
 
 #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
 #: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375

-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591

 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"


@@ -629,7 +629,7 @@ msgstr "中止执行。"
 msgid "Do you want to continue [Y/n]? "
 msgstr "您希望继续执行吗？[Y/n]"
 
 msgid "Do you want to continue [Y/n]? "
 msgstr "您希望继续执行吗？[Y/n]"
 

-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1560

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"


@@ -1515,31 +1515,31 @@ msgstr "该 HTTP 服务器的 range 支持不正常"
 msgid "Unknown date format"
 msgstr "无法识别的日期格式"
 
 msgid "Unknown date format"
 msgstr "无法识别的日期格式"
 

-#: methods/http.cc:822
+#: methods/http.cc:827

 msgid "Select failed"
 msgstr "select 调用出错"
 
 msgid "Select failed"
 msgstr "select 调用出错"
 

-#: methods/http.cc:827
+#: methods/http.cc:832

 msgid "Connection timed out"
 msgstr "连接超时"
 
 msgid "Connection timed out"
 msgstr "连接超时"
 

-#: methods/http.cc:850
+#: methods/http.cc:855

 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 
 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 

-#: methods/http.cc:881
+#: methods/http.cc:886

 msgid "Error writing to file"
 msgstr "写入文件出错"
 
 msgid "Error writing to file"
 msgstr "写入文件出错"
 

-#: methods/http.cc:909
+#: methods/http.cc:914

 msgid "Error writing to the file"
 msgstr "写入文件出错"
 
 msgid "Error writing to the file"
 msgstr "写入文件出错"
 

-#: methods/http.cc:923
+#: methods/http.cc:928

 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 

-#: methods/http.cc:925
+#: methods/http.cc:930

 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 
 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 


@@ -1557,7 +1557,7 @@ msgstr "内部错误"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.

-#: methods/mirror.cc:95 apt-inst/extract.cc:465
+#: methods/mirror.cc:95 apt-inst/extract.cc:464

 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108


@@ -1678,7 +1678,7 @@ msgstr ""
 "  -c=? 读指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 
 "  -c=? 读指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 

-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386

 #, c-format
 msgid "Unable to write to %s"
 msgstr "无法写入 %s"
 #, c-format
 msgid "Unable to write to %s"
 msgstr "无法写入 %s"


@@ -1687,31 +1687,31 @@ msgstr "无法写入 %s"
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
 
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
 

-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349

 msgid "Package extension list is too long"
 msgstr "软件包的扩展列表太长"
 
 #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
 msgid "Package extension list is too long"
 msgstr "软件包的扩展列表太长"
 
 #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190

-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263
-#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
+#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
+#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300

 #, c-format
 msgid "Error processing directory %s"
 msgstr "处理目录 %s 时出错"
 
 #, c-format
 msgid "Error processing directory %s"
 msgstr "处理目录 %s 时出错"
 

-#: ftparchive/apt-ftparchive.cc:261
+#: ftparchive/apt-ftparchive.cc:262

 msgid "Source extension list is too long"
 msgstr "源扩展列表太长"
 
 msgid "Source extension list is too long"
 msgstr "源扩展列表太长"
 

-#: ftparchive/apt-ftparchive.cc:378
+#: ftparchive/apt-ftparchive.cc:379

 msgid "Error writing header to contents file"
 msgstr "将头写入到目录文件时出错"
 
 msgid "Error writing header to contents file"
 msgstr "将头写入到目录文件时出错"
 

-#: ftparchive/apt-ftparchive.cc:408
+#: ftparchive/apt-ftparchive.cc:409

 #, c-format
 msgid "Error processing contents %s"
 msgstr "处理目录 %s 时出错"
 
 #, c-format
 msgid "Error processing contents %s"
 msgstr "处理目录 %s 时出错"
 

-#: ftparchive/apt-ftparchive.cc:596
+#: ftparchive/apt-ftparchive.cc:597

 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"


@@ -1791,11 +1791,11 @@ msgstr ""
 "  -c=?  读取指定配置文件\n"
 "  -o=?  设置任意指定的配置选项"
 
 "  -c=?  读取指定配置文件\n"
 "  -o=?  设置任意指定的配置选项"
 

-#: ftparchive/apt-ftparchive.cc:802
+#: ftparchive/apt-ftparchive.cc:803

 msgid "No selections matched"
 msgstr "没有任何选定项是匹配的"
 
 msgid "No selections matched"
 msgstr "没有任何选定项是匹配的"
 

-#: ftparchive/apt-ftparchive.cc:880
+#: ftparchive/apt-ftparchive.cc:881

 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "软件包文件组“%s”中缺少一些文件"
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "软件包文件组“%s”中缺少一些文件"


@@ -1822,8 +1822,8 @@ msgstr ""
 msgid "Unable to open DB file %s: %s"
 msgstr "无法打开数据库文件 %s：%s"
 
 msgid "Unable to open DB file %s: %s"
 msgstr "无法打开数据库文件 %s：%s"
 

-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209

 #, c-format
 msgid "Failed to stat %s"
 msgstr "无法获得 %s 的状态"
 #, c-format
 msgid "Failed to stat %s"
 msgstr "无法获得 %s 的状态"


@@ -1901,22 +1901,22 @@ msgstr " 达到了 DeLink 的上限 %sB。\n"
 msgid "Archive had no package field"
 msgstr "归档文件没有包含 package 字段"
 
 msgid "Archive had no package field"
 msgstr "归档文件没有包含 package 字段"
 

-#: ftparchive/writer.cc:411 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:411 ftparchive/writer.cc:701

 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s 中没有 override 项\n"
 
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s 中没有 override 项\n"
 

-#: ftparchive/writer.cc:479 ftparchive/writer.cc:814
+#: ftparchive/writer.cc:479 ftparchive/writer.cc:845

 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s 的维护者 %s 并非 %s\n"
 
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s 的维护者 %s 并非 %s\n"
 

-#: ftparchive/writer.cc:708
+#: ftparchive/writer.cc:711

 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s 没有源代码的 override 项\n"
 
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s 没有源代码的 override 项\n"
 

-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:715

 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s 中没有二进制文件的 override 项\n"
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s 中没有二进制文件的 override 项\n"


@@ -1990,7 +1990,7 @@ msgstr "在计算 MD5 校验和时无法读取数据"
 msgid "Problem unlinking %s"
 msgstr "在使用 unlink 删除 %s 时出错"
 
 msgid "Problem unlinking %s"
 msgstr "在使用 unlink 删除 %s 时出错"
 

-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187

 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "无法将 %s 重命名为 %s"
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "无法将 %s 重命名为 %s"


@@ -2135,54 +2135,54 @@ msgstr "无法写入文件 %s"
 msgid "Failed to close file %s"
 msgstr "无法关闭文件 %s"
 
 msgid "Failed to close file %s"
 msgstr "无法关闭文件 %s"
 

-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165

 #, c-format
 msgid "The path %s is too long"
 msgstr "路径名 %s 太长"
 
 #, c-format
 msgid "The path %s is too long"
 msgstr "路径名 %s 太长"
 

-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:125

 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s 被解包了不只一次"
 
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s 被解包了不只一次"
 

-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:135

 #, c-format
 msgid "The directory %s is diverted"
 msgstr "目录 %s 已被转移"
 
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "目录 %s 已被转移"
 

-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:145

 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "该软件包正尝试写入转移对象 %s/%s"
 
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "该软件包正尝试写入转移对象 %s/%s"
 

-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299

 msgid "The diversion path is too long"
 msgstr "该转移路径太长"
 
 msgid "The diversion path is too long"
 msgstr "该转移路径太长"
 

-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:242

 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "目录 %s 要被一个非目录的文件替换"
 
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "目录 %s 要被一个非目录的文件替换"
 

-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:282

 msgid "Failed to locate node in its hash bucket"
 msgstr "无法在其散列桶中分配节点"
 
 msgid "Failed to locate node in its hash bucket"
 msgstr "无法在其散列桶中分配节点"
 

-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:286

 msgid "The path is too long"
 msgstr "路径名太长"
 
 msgid "The path is too long"
 msgstr "路径名太长"
 

-#: apt-inst/extract.cc:415
+#: apt-inst/extract.cc:414

 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "用来覆盖的软件包不属于 %s 的任何版本"
 
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "用来覆盖的软件包不属于 %s 的任何版本"
 

-#: apt-inst/extract.cc:432
+#: apt-inst/extract.cc:431

 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 

-#: apt-inst/extract.cc:492
+#: apt-inst/extract.cc:491

 #, c-format
 msgid "Unable to stat %s"
 msgstr "无法读取 %s 的状态"
 #, c-format
 msgid "Unable to stat %s"
 msgstr "无法读取 %s 的状态"


@@ -2563,59 +2563,59 @@ msgstr "本程序目前不支持“%s”版本系统"
 msgid "The package cache was built for a different architecture"
 msgstr "软件包缓存区是为其它架构的硬件构建的"
 
 msgid "The package cache was built for a different architecture"
 msgstr "软件包缓存区是为其它架构的硬件构建的"
 

-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314

 msgid "Depends"
 msgstr "依赖"
 
 msgid "Depends"
 msgstr "依赖"
 

-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314

 msgid "PreDepends"
 msgstr "预依赖"
 
 msgid "PreDepends"
 msgstr "预依赖"
 

-#: apt-pkg/pkgcache.cc:305
+#: apt-pkg/pkgcache.cc:314

 msgid "Suggests"
 msgstr "建议"
 
 msgid "Suggests"
 msgstr "建议"
 

-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315

 msgid "Recommends"
 msgstr "推荐"
 
 msgid "Recommends"
 msgstr "推荐"
 

-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315

 msgid "Conflicts"
 msgstr "冲突"
 
 msgid "Conflicts"
 msgstr "冲突"
 

-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:315

 msgid "Replaces"
 msgstr "替换"
 
 msgid "Replaces"
 msgstr "替换"
 

-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316

 msgid "Obsoletes"
 msgstr "废弃"
 
 msgid "Obsoletes"
 msgstr "废弃"
 

-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316

 msgid "Breaks"
 msgstr "破坏"
 
 msgid "Breaks"
 msgstr "破坏"
 

-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:316

 msgid "Enhances"
 msgstr "增强"
 
 msgid "Enhances"
 msgstr "增强"
 

-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327

 msgid "important"
 msgstr "重要"
 
 msgid "important"
 msgstr "重要"
 

-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327

 msgid "required"
 msgstr "必需"
 
 msgid "required"
 msgstr "必需"
 

-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:327

 msgid "standard"
 msgstr "标准"
 
 msgid "standard"
 msgstr "标准"
 

-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328

 msgid "optional"
 msgstr "可选"
 
 msgid "optional"
 msgstr "可选"
 

-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:328

 msgid "extra"
 msgstr "额外"
 
 msgid "extra"
 msgstr "额外"
 


@@ -2715,12 +2715,12 @@ msgstr "正在打开 %s"
 msgid "Line %u too long in source list %s."
 msgstr "源列表 %2$s 的第 %1$u 行太长了。"
 
 msgid "Line %u too long in source list %s."
 msgstr "源列表 %2$s 的第 %1$u 行太长了。"
 

-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289

 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
 
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
 

-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:293

 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"


@@ -2761,7 +2761,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
 
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
 

-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1234

 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."


@@ -2769,13 +2769,13 @@ msgstr ""
 "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
 "缘故。"
 
 "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
 "缘故。"
 

-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1236

 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
 "系。"
 
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
 "系。"
 

-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1586 apt-pkg/algorithms.cc:1588

 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "


@@ -2820,7 +2820,7 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
 msgid "Method %s did not start correctly"
 msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 
 msgid "Method %s did not start correctly"
 msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 

-#: apt-pkg/acquire-worker.cc:440
+#: apt-pkg/acquire-worker.cc:447

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"


@@ -2883,14 +2883,14 @@ msgstr "软件包暂存区使用的是不兼容的版本控制系统"
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228

-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
-#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
-#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
-#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
+#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
+#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
+#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
+#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
+#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
+#: apt-pkg/pkgcachegen.cc:561

 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "处理 %s (FindPkg)时出错"
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "处理 %s (FindPkg)时出错"


@@ -2911,26 +2911,26 @@ msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
 
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
 

-#: apt-pkg/pkgcachegen.cc:577
+#: apt-pkg/pkgcachegen.cc:568

 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
 
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
 

-#: apt-pkg/pkgcachegen.cc:1150
+#: apt-pkg/pkgcachegen.cc:1197

 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "无法获取源软件包列表 %s 的状态"
 
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "无法获取源软件包列表 %s 的状态"
 

-#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
-#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
+#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
+#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552

 msgid "Reading package lists"
 msgstr "正在读取软件包列表"
 
 msgid "Reading package lists"
 msgstr "正在读取软件包列表"
 

-#: apt-pkg/pkgcachegen.cc:1255
+#: apt-pkg/pkgcachegen.cc:1302

 msgid "Collecting File Provides"
 msgstr "正在收集文件所提供的软件包"
 
 msgid "Collecting File Provides"
 msgstr "正在收集文件所提供的软件包"
 

-#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
+#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501

 msgid "IO Error saving source cache"
 msgstr "无法读取或写入软件源缓存"
 
 msgid "IO Error saving source cache"
 msgstr "无法读取或写入软件源缓存"
 


@@ -2979,7 +2979,7 @@ msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
 #: apt-pkg/acquire-item.cc:1518
 #, c-format
 msgid ""
 #: apt-pkg/acquire-item.cc:1518
 #, c-format
 msgid ""

-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "

 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"


@@ -3137,22 +3137,22 @@ msgstr "正在写入新的源列表\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "对应于该盘片的软件源设置项是：\n"
 
 msgid "Source list entries for this disc are:\n"
 msgstr "对应于该盘片的软件源设置项是：\n"
 

-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764

 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "已写入 %i 条记录。\n"
 
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "已写入 %i 条记录。\n"
 

-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:768
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766

 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
 
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
 

-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:771
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769

 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"
 
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"
 

-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:774
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772

 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"