merge from lp:~donkult/apt/sid

[apt.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7e2865552428276242f784dc423c6c1fe8b42dd8..59f51dd870f23789d01efb916451917f5c69ffdf 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: 2012-06-27 11:17+0200\n"
+"POT-Creation-Date: 2012-10-15 09:49+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"


@@ -92,77 +92,77 @@ msgstr "Slack 空间共计："
 msgid "Total space accounted for: "
 msgstr "总占用空间："
 
 msgid "Total space accounted for: "
 msgstr "总占用空间："
 

-#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147

 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "软件包文件 %s 尚未同步。"
 
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "软件包文件 %s 尚未同步。"
 

-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
-#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
+#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46

 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "没有发现匹配的软件包"
 
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "没有发现匹配的软件包"
 

-#: cmdline/apt-cache.cc:1222
+#: cmdline/apt-cache.cc:1226

 msgid "You must give at least one search pattern"
 msgstr "您必须明确地给出至少一个表达式"
 
 msgid "You must give at least one search pattern"
 msgstr "您必须明确地给出至少一个表达式"
 

-#: cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1361

 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 

-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508
+#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510

 #, c-format
 msgid "Unable to locate package %s"
 msgstr "未发现软件包 %s"
 
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "未发现软件包 %s"
 

-#: cmdline/apt-cache.cc:1482
+#: cmdline/apt-cache.cc:1486

 msgid "Package files:"
 msgstr "软件包文件："
 
 msgid "Package files:"
 msgstr "软件包文件："
 

-#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
+#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584

 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件"
 
 #. Show any packages have explicit pins
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件"
 
 #. Show any packages have explicit pins

-#: cmdline/apt-cache.cc:1503
+#: cmdline/apt-cache.cc:1507

 msgid "Pinned packages:"
 msgstr "被锁定的软件包："
 
 msgid "Pinned packages:"
 msgstr "被锁定的软件包："
 

-#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
+#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564

 msgid "(not found)"
 msgstr "(没有找到)"
 
 msgid "(not found)"
 msgstr "(没有找到)"
 

-#: cmdline/apt-cache.cc:1523
+#: cmdline/apt-cache.cc:1527

 msgid "  Installed: "
 msgstr "  已安装："
 
 msgid "  Installed: "
 msgstr "  已安装："
 

-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528

 msgid "  Candidate: "
 msgstr "  候选软件包："
 
 msgid "  Candidate: "
 msgstr "  候选软件包："
 

-#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
+#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554

 msgid "(none)"
 msgstr "(无)"
 
 msgid "(none)"
 msgstr "(无)"
 

-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1561

 msgid "  Package pin: "
 msgstr "  软件包锁："
 
 #. Show the priority tables
 msgid "  Package pin: "
 msgstr "  软件包锁："
 
 #. Show the priority tables

-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1570

 msgid "  Version table:"
 msgstr "  版本列表："
 
 msgid "  Version table:"
 msgstr "  版本列表："
 

-#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363
+#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375

 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s，用于 %s 构架，编译于 %s %s\n"
 
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s，用于 %s 构架，编译于 %s %s\n"
 

-#: cmdline/apt-cache.cc:1686
+#: cmdline/apt-cache.cc:1690

 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"


@@ -627,7 +627,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:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548

 #, 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"


@@ -938,26 +938,26 @@ msgstr "无法获得 %s 的构建依赖关系信息"
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 

-#: cmdline/apt-get.cc:2997
+#: cmdline/apt-get.cc:3008

 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 

-#: cmdline/apt-get.cc:3015
+#: cmdline/apt-get.cc:3026

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
 #, 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:3038
+#: cmdline/apt-get.cc:3049

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新"
 
 #, 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:3077
+#: cmdline/apt-get.cc:3088

 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "


@@ -966,37 +966,37 @@ msgstr ""
 "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 "
 "%1$s 依赖关系"
 
 "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 "
 "%1$s 依赖关系"
 

-#: cmdline/apt-get.cc:3083
+#: cmdline/apt-get.cc:3094

 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 

-#: cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3117

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
 

-#: cmdline/apt-get.cc:3122
+#: cmdline/apt-get.cc:3133

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
 

-#: cmdline/apt-get.cc:3127
+#: cmdline/apt-get.cc:3138

 msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 
 msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 

-#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243

 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "正在连接 %s (%s)"
 
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "正在连接 %s (%s)"
 

-#: cmdline/apt-get.cc:3355
+#: cmdline/apt-get.cc:3366

 msgid "Supported modules:"
 msgstr "支持的模块："
 
 msgid "Supported modules:"
 msgstr "支持的模块："
 

-#: cmdline/apt-get.cc:3396
+#: cmdline/apt-get.cc:3407

 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"


@@ -1084,7 +1084,7 @@ msgstr ""
 "以获取更多信息和选项。\n"
 "                       本 APT 具有超级牛力。\n"
 
 "以获取更多信息和选项。\n"
 "                       本 APT 具有超级牛力。\n"
 

-#: cmdline/apt-get.cc:3561
+#: cmdline/apt-get.cc:3572

 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"


@@ -1157,27 +1157,27 @@ msgstr "%s 已经是最新的版本了。\n"
 msgid "%s was already not hold.\n"
 msgstr "%s 已经是最新的版本了。\n"
 
 msgid "%s was already not hold.\n"
 msgstr "%s 已经是最新的版本了。\n"
 

-#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314
+#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326

 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待子进程 %s 的退出，但是它并不存在"
 
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待子进程 %s 的退出，但是它并不存在"
 

-#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:297
+#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309

 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s 已设置为手动安装。\n"
 
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s 已设置为手动安装。\n"
 

-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:302
+#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314

 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "无法打开 %s"
 
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "无法打开 %s"
 

-#: cmdline/apt-mark.cc:320
+#: cmdline/apt-mark.cc:332

 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 

-#: cmdline/apt-mark.cc:367
+#: cmdline/apt-mark.cc:379

 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"


@@ -1553,7 +1553,7 @@ msgstr "内部错误"
 #: 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

-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362

 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"
 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"


@@ -1561,7 +1561,7 @@ msgstr "无法读取 %s"
 #: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179
 #: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491
 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
 #: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179
 #: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491
 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60

-#: apt-pkg/clean.cc:122
+#: apt-pkg/clean.cc:123

 #, c-format
 msgid "Unable to change to %s"
 msgstr "无法切换工作目录到 %s"
 #, c-format
 msgid "Unable to change to %s"
 msgstr "无法切换工作目录到 %s"


@@ -1670,7 +1670,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:1277
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335

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


@@ -2203,34 +2203,34 @@ msgstr "不能解析的主控文件"
 msgid "Can't mmap an empty file"
 msgstr "无法 mmap 一个空文件"
 
 msgid "Can't mmap an empty file"
 msgstr "无法 mmap 一个空文件"
 

-#: apt-pkg/contrib/mmap.cc:110
+#: apt-pkg/contrib/mmap.cc:111

 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "无法为复制文件描述符 %i"
 
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "无法为复制文件描述符 %i"
 

-#: apt-pkg/contrib/mmap.cc:118
+#: apt-pkg/contrib/mmap.cc:119

 #, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 
 #, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 

-#: apt-pkg/contrib/mmap.cc:145
+#: apt-pkg/contrib/mmap.cc:146

 msgid "Unable to close mmap"
 msgstr "无法关闭 mmap"
 
 msgid "Unable to close mmap"
 msgstr "无法关闭 mmap"
 

-#: apt-pkg/contrib/mmap.cc:173 apt-pkg/contrib/mmap.cc:201
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202

 msgid "Unable to synchronize mmap"
 msgstr "无法同步 mmap "
 
 msgid "Unable to synchronize mmap"
 msgstr "无法同步 mmap "
 

-#: apt-pkg/contrib/mmap.cc:279
+#: apt-pkg/contrib/mmap.cc:290

 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 

-#: apt-pkg/contrib/mmap.cc:311
+#: apt-pkg/contrib/mmap.cc:322

 msgid "Failed to truncate file"
 msgstr "无法截断文件"
 
 msgid "Failed to truncate file"
 msgstr "无法截断文件"
 

-#: apt-pkg/contrib/mmap.cc:330
+#: apt-pkg/contrib/mmap.cc:341

 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "


@@ -2239,14 +2239,14 @@ msgstr ""
 "动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值：%lu。(man 5 "
 "apt.conf)"
 
 "动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值：%lu。(man 5 "
 "apt.conf)"
 

-#: apt-pkg/contrib/mmap.cc:429
+#: apt-pkg/contrib/mmap.cc:440

 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。"
 
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。"
 

-#: apt-pkg/contrib/mmap.cc:432
+#: apt-pkg/contrib/mmap.cc:443

 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"


@@ -2466,7 +2466,7 @@ msgstr "子进程 %s 返回了一个错误号 (%u)"
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子进程 %s 异常退出"
 
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子进程 %s 异常退出"
 

-#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:655
+#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661

 #, c-format
 msgid "Could not open file %s"
 msgstr "无法打开文件 %s"
 #, c-format
 msgid "Could not open file %s"
 msgstr "无法打开文件 %s"


@@ -2509,7 +2509,7 @@ msgstr "重命名文件 %s 为 %s 出错"
 msgid "Problem unlinking the file %s"
 msgstr "用 unlink 删除文件 %s 出错"
 
 msgid "Problem unlinking the file %s"
 msgstr "用 unlink 删除文件 %s 出错"
 

-#: apt-pkg/contrib/fileutl.cc:1755
+#: apt-pkg/contrib/fileutl.cc:1754

 msgid "Problem syncing the file"
 msgstr "同步文件出错"
 
 msgid "Problem syncing the file"
 msgstr "同步文件出错"
 


@@ -2686,7 +2686,7 @@ msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
 msgid "Opening %s"
 msgstr "正在打开 %s"
 
 msgid "Opening %s"
 msgstr "正在打开 %s"
 

-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:469
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495

 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "源列表 %2$s 的第 %1$u 行太长了。"
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "源列表 %2$s 的第 %1$u 行太长了。"


@@ -2701,7 +2701,7 @@ msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
 msgid "Type '%s' is not known 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/packagemanager.cc:297 apt-pkg/packagemanager.cc:891
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896

 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "


@@ -2731,13 +2731,13 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr "不支持索引文件类型“%s”"
 
 msgid "Index file type '%s' is not supported"
 msgstr "不支持索引文件类型“%s”"
 

-#: apt-pkg/algorithms.cc:261
+#: apt-pkg/algorithms.cc:266

 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
 
 #, 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:1223
+#: apt-pkg/algorithms.cc:1228

 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."


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

-#: apt-pkg/algorithms.cc:1225
+#: apt-pkg/algorithms.cc:1230

 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:1569 apt-pkg/algorithms.cc:1571
+#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576

 #, 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 "


@@ -2831,81 +2831,82 @@ msgstr "您可能需要运行 apt-get update 来解决这些问题"
 msgid "The list of sources could not be read."
 msgstr "无法读取源列表。"
 
 msgid "The list of sources could not be read."
 msgstr "无法读取源列表。"
 

-#: apt-pkg/policy.cc:74
+#: apt-pkg/policy.cc:75

 #, c-format
 msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
 "available in the sources"
 msgstr ""
 
 #, c-format
 msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
 "available in the sources"
 msgstr ""
 

-#: apt-pkg/policy.cc:396
+#: apt-pkg/policy.cc:399

 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头"
 
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头"
 

-#: apt-pkg/policy.cc:418
+#: apt-pkg/policy.cc:421

 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "无法识别锁定的类型 %s"
 
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "无法识别锁定的类型 %s"
 

-#: apt-pkg/policy.cc:426
+#: apt-pkg/policy.cc:429

 msgid "No priority (or zero) specified for pin"
 msgstr "没有为版本锁定指定优先级(或为零)"
 
 msgid "No priority (or zero) specified for pin"
 msgstr "没有为版本锁定指定优先级(或为零)"
 

-#: apt-pkg/pkgcachegen.cc:85
+#: apt-pkg/pkgcachegen.cc:87

 msgid "Cache has an incompatible versioning system"
 msgstr "软件包暂存区使用的是不兼容的版本控制系统"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 msgid "Cache has an incompatible versioning system"
 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:211 apt-pkg/pkgcachegen.cc:277
-#: apt-pkg/pkgcachegen.cc:308 apt-pkg/pkgcachegen.cc:316
-#: apt-pkg/pkgcachegen.cc:358 apt-pkg/pkgcachegen.cc:362
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:389
-#: apt-pkg/pkgcachegen.cc:393 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
-#: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
-#: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
+#: 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

 #, 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)时出错"
 

-#: apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:251

 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "哇，软件包数量超出了本 APT 的处理能力。"
 
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "哇，软件包数量超出了本 APT 的处理能力。"
 

-#: apt-pkg/pkgcachegen.cc:237
+#: apt-pkg/pkgcachegen.cc:254

 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
 
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
 

-#: apt-pkg/pkgcachegen.cc:240
+#: apt-pkg/pkgcachegen.cc:257

 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
 
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
 

-#: apt-pkg/pkgcachegen.cc:243
+#: apt-pkg/pkgcachegen.cc:260

 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:523
+#: apt-pkg/pkgcachegen.cc:577

 #, 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:1088
+#: apt-pkg/pkgcachegen.cc:1146

 #, 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:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
+#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338
+#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501

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

-#: apt-pkg/pkgcachegen.cc:1193
+#: apt-pkg/pkgcachegen.cc:1251

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

-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450

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


@@ -3022,7 +3023,7 @@ msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
 msgid "Vendor block %s contains no fingerprint"
 msgstr "软件提供者数据块内 %s 没有包含指纹信息"
 
 msgid "Vendor block %s contains no fingerprint"
 msgstr "软件提供者数据块内 %s 没有包含指纹信息"
 

-#: apt-pkg/cdrom.cc:550
+#: apt-pkg/cdrom.cc:576

 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"


@@ -3031,41 +3032,41 @@ msgstr ""
 "现把 %s 作为了 CD-ROM 的挂载点\n"
 "正在挂载 CD-ROM\n"
 
 "现把 %s 作为了 CD-ROM 的挂载点\n"
 "正在挂载 CD-ROM\n"
 

-#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:656
+#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682

 msgid "Identifying.. "
 msgstr "正在鉴别.. "
 
 msgid "Identifying.. "
 msgstr "正在鉴别.. "
 

-#: apt-pkg/cdrom.cc:587
+#: apt-pkg/cdrom.cc:613

 #, c-format
 msgid "Stored label: %s\n"
 msgstr "已归档文件的标签：%s\n"
 
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "已归档文件的标签：%s\n"
 

-#: apt-pkg/cdrom.cc:596 apt-pkg/cdrom.cc:879
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907

 msgid "Unmounting CD-ROM...\n"
 msgstr "正在卸载 CD-ROM...\n"
 
 msgid "Unmounting CD-ROM...\n"
 msgstr "正在卸载 CD-ROM...\n"
 

-#: apt-pkg/cdrom.cc:616
+#: apt-pkg/cdrom.cc:642

 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
 
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
 

-#: apt-pkg/cdrom.cc:634
+#: apt-pkg/cdrom.cc:660

 msgid "Unmounting CD-ROM\n"
 msgstr "正在卸载 CD-ROM 文件系统\n"
 
 msgid "Unmounting CD-ROM\n"
 msgstr "正在卸载 CD-ROM 文件系统\n"
 

-#: apt-pkg/cdrom.cc:639
+#: apt-pkg/cdrom.cc:665

 msgid "Waiting for disc...\n"
 msgstr "等待插入盘片……\n"
 
 msgid "Waiting for disc...\n"
 msgstr "等待插入盘片……\n"
 

-#: apt-pkg/cdrom.cc:648
+#: apt-pkg/cdrom.cc:674

 msgid "Mounting CD-ROM...\n"
 msgstr "正在挂载 CD-ROM 文件系统……\n"
 
 msgid "Mounting CD-ROM...\n"
 msgstr "正在挂载 CD-ROM 文件系统……\n"
 

-#: apt-pkg/cdrom.cc:667
+#: apt-pkg/cdrom.cc:693

 msgid "Scanning disc for index files..\n"
 msgstr "正在盘片中查找索引文件..\n"
 
 msgid "Scanning disc for index files..\n"
 msgstr "正在盘片中查找索引文件..\n"
 

-#: apt-pkg/cdrom.cc:716
+#: apt-pkg/cdrom.cc:744

 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "


@@ -3074,7 +3075,7 @@ msgstr ""
 "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
 "名\n"
 
 "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
 "名\n"
 

-#: apt-pkg/cdrom.cc:727
+#: apt-pkg/cdrom.cc:755

 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"


@@ -3082,16 +3083,16 @@ msgstr ""
 "无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构"
 "架。"
 
 "无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构"
 "架。"
 

-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:782

 #, c-format
 msgid "Found label '%s'\n"
 msgstr "找到标签 '%s'\n"
 
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "找到标签 '%s'\n"
 

-#: apt-pkg/cdrom.cc:783
+#: apt-pkg/cdrom.cc:811

 msgid "That is not a valid name, try again.\n"
 msgstr "这不是一个有效的名字，请重试。\n"
 
 msgid "That is not a valid name, try again.\n"
 msgstr "这不是一个有效的名字，请重试。\n"
 

-#: apt-pkg/cdrom.cc:800
+#: apt-pkg/cdrom.cc:828

 #, c-format
 msgid ""
 "This disc is called: \n"
 #, c-format
 msgid ""
 "This disc is called: \n"


@@ -3100,107 +3101,102 @@ msgstr ""
 "这张盘片现在的名字是：\n"
 "“%s”\n"
 
 "这张盘片现在的名字是：\n"
 "“%s”\n"
 

-#: apt-pkg/cdrom.cc:802
+#: apt-pkg/cdrom.cc:830

 msgid "Copying package lists..."
 msgstr "正在复制软件包列表……"
 
 msgid "Copying package lists..."
 msgstr "正在复制软件包列表……"
 

-#: apt-pkg/cdrom.cc:829
+#: apt-pkg/cdrom.cc:857

 msgid "Writing new source list\n"
 msgstr "正在写入新的源列表\n"
 
 msgid "Writing new source list\n"
 msgstr "正在写入新的源列表\n"
 

-#: apt-pkg/cdrom.cc:837
+#: apt-pkg/cdrom.cc:865

 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:873
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884

 #, 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:875
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886

 #, 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:878
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889

 #, 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:881
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892

 #, 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"
 

-#: apt-pkg/indexcopy.cc:503
-#, c-format
-msgid "Skipping nonexistent file %s"
-msgstr "跳过不存在的文件 %s"
-
-#: apt-pkg/indexcopy.cc:509
+#: apt-pkg/indexcopy.cc:515

 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "无法找到认证记录：%s"
 
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "无法找到认证记录：%s"
 

-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/indexcopy.cc:521

 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash 校验和不符：%s"
 
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash 校验和不符：%s"
 

-#: apt-pkg/indexcopy.cc:659
+#: apt-pkg/indexcopy.cc:665

 #, c-format
 msgid "File %s doesn't start with a clearsigned message"
 msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #, c-format
 msgid "File %s doesn't start with a clearsigned message"
 msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory

-#: apt-pkg/indexcopy.cc:690
+#: apt-pkg/indexcopy.cc:696

 #, c-format
 msgid "No keyring installed in %s."
 msgstr "%s 中没有安装密钥环。"
 
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "%s 中没有安装密钥环。"
 

-#: apt-pkg/cacheset.cc:401
+#: apt-pkg/cacheset.cc:403

 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”发布版本"
 
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”发布版本"
 

-#: apt-pkg/cacheset.cc:404
+#: apt-pkg/cacheset.cc:406

 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”版本"
 
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”版本"
 

-#: apt-pkg/cacheset.cc:515
+#: apt-pkg/cacheset.cc:517

 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "无法找到任务 %s"
 
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "无法找到任务 %s"
 

-#: apt-pkg/cacheset.cc:521
+#: apt-pkg/cacheset.cc:523

 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "无法按照正则表达式 %s 找到任何软件包"
 
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "无法按照正则表达式 %s 找到任何软件包"
 

-#: apt-pkg/cacheset.cc:532
+#: apt-pkg/cacheset.cc:534

 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "无法从完全虚拟的软件包 %s 中选择版本"
 
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "无法从完全虚拟的软件包 %s 中选择版本"
 

-#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546
+#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548

 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择"
 
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择"
 

-#: apt-pkg/cacheset.cc:553
+#: apt-pkg/cacheset.cc:555

 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
 
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
 

-#: apt-pkg/cacheset.cc:561
+#: apt-pkg/cacheset.cc:563

 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "因为软件包 %s 没有候选版本，无法进行选择"
 
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "因为软件包 %s 没有候选版本，无法进行选择"
 

-#: apt-pkg/cacheset.cc:569
+#: apt-pkg/cacheset.cc:571

 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"


@@ -3213,15 +3209,15 @@ msgstr ""
 msgid "Send request to solver"
 msgstr ""
 
 msgid "Send request to solver"
 msgstr ""
 

-#: apt-pkg/edsp.cc:277
+#: apt-pkg/edsp.cc:279

 msgid "Prepare for receiving solution"
 msgstr ""
 
 msgid "Prepare for receiving solution"
 msgstr ""
 

-#: apt-pkg/edsp.cc:284
+#: apt-pkg/edsp.cc:286

 msgid "External solver failed without a proper error message"
 msgstr ""
 
 msgid "External solver failed without a proper error message"
 msgstr ""
 

-#: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565

 msgid "Execute external solver"
 msgstr ""
 
 msgid "Execute external solver"
 msgstr ""
 


@@ -3306,46 +3302,46 @@ msgstr "正在准备完全删除 %s"
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:1209
+#: apt-pkg/deb/dpkgpm.cc:1213

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ？)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ？)\n"
 

-#: apt-pkg/deb/dpkgpm.cc:1239
+#: apt-pkg/deb/dpkgpm.cc:1243

 msgid "Running dpkg"
 msgstr "正在运行 dpkg"
 
 msgid "Running dpkg"
 msgstr "正在运行 dpkg"
 

-#: apt-pkg/deb/dpkgpm.cc:1411
+#: apt-pkg/deb/dpkgpm.cc:1415

 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1473
+#: apt-pkg/deb/dpkgpm.cc:1477

 msgid "No apport report written because MaxReports is reached already"
 msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。"
 
 #. check if its not a follow up error
 msgid "No apport report written because MaxReports is reached already"
 msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。"
 
 #. check if its not a follow up error

-#: apt-pkg/deb/dpkgpm.cc:1478
+#: apt-pkg/deb/dpkgpm.cc:1482

 msgid "dependency problems - leaving unconfigured"
 msgstr "依赖问题 - 保持未配置"
 
 msgid "dependency problems - leaving unconfigured"
 msgstr "依赖问题 - 保持未配置"
 

-#: apt-pkg/deb/dpkgpm.cc:1480
+#: apt-pkg/deb/dpkgpm.cc:1484

 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。"
 
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。"
 

-#: apt-pkg/deb/dpkgpm.cc:1486
+#: apt-pkg/deb/dpkgpm.cc:1490

 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
 
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
 

-#: apt-pkg/deb/dpkgpm.cc:1492
+#: apt-pkg/deb/dpkgpm.cc:1496

 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
 
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
 

-#: apt-pkg/deb/dpkgpm.cc:1499
+#: apt-pkg/deb/dpkgpm.cc:1503

 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"


@@ -3374,6 +3370,9 @@ msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。"
 msgid "Not locked"
 msgstr "未锁定"
 
 msgid "Not locked"
 msgstr "未锁定"
 

+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "跳过不存在的文件 %s"
+

 #~ msgid "Failed to remove %s"
 #~ msgstr "无法卸载 %s"
 
 #~ msgid "Failed to remove %s"
 #~ msgstr "无法卸载 %s"