releasing package apt version 0.9.15

[apt.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1d0e1ccfb289565f212fded24e410b4d8079a543..4f3edaafcc2128483a28debcaf53212fd2adf58b 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-12-07 14:40+0100\n"
+"POT-Creation-Date: 2014-01-25 22:21+0100\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"


@@ -93,7 +93,7 @@ msgid "Total space accounted for: "
 msgstr "总占用空间："
 
 #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
 msgstr "总占用空间："
 
 #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146

-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55

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


@@ -101,7 +101,7 @@ msgstr "软件包文件 %s 尚未同步。"
 #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
 #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221

-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169

 msgid "No packages found"
 msgstr "没有发现匹配的软件包"
 
 msgid "No packages found"
 msgstr "没有发现匹配的软件包"
 


@@ -157,8 +157,8 @@ msgid "  Version table:"
 msgstr "  版本列表："
 
 #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
 msgstr "  版本列表："
 
 #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83

-#: cmdline/apt-get.cc:1524 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591

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


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

-#: cmdline/apt-get.cc:313
+#: cmdline/apt-get.cc:244
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
+
+#: cmdline/apt-get.cc:326
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
+
+#: cmdline/apt-get.cc:329
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
+
+#: cmdline/apt-get.cc:366

 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "选择 %s 作为源代码包而非 %s\n"
 
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "选择 %s 作为源代码包而非 %s\n"
 

-#: cmdline/apt-get.cc:367
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
+#: cmdline/apt-get.cc:422
+#, fuzzy, c-format
+msgid "Can not find version '%s' of package '%s'"

 msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
 
 msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
 

-#: cmdline/apt-get.cc:398
+#: cmdline/apt-get.cc:453

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 

-#: cmdline/apt-get.cc:403 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 

-#: cmdline/apt-get.cc:405 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72

 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 

-#: cmdline/apt-get.cc:413 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116

 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 

-#: cmdline/apt-get.cc:482 cmdline/apt-get.cc:490
+#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545

 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部错误，问题解决工具坏事了"
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部错误，问题解决工具坏事了"
 

-#: cmdline/apt-get.cc:518 cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610

 msgid "Unable to lock the download directory"
 msgstr "无法锁定下载目录"
 
 msgid "Unable to lock the download directory"
 msgstr "无法锁定下载目录"
 

-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:722

 msgid "Must specify at least one package to fetch source for"
 msgstr "要下载源代码，必须指定至少一个对应的软件包"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "要下载源代码，必须指定至少一个对应的软件包"
 

-#: cmdline/apt-get.cc:707 cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "无法找到与 %s 对应的源代码包"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "无法找到与 %s 对应的源代码包"
 

-#: cmdline/apt-get.cc:724
+#: cmdline/apt-get.cc:779

 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"


@@ -352,7 +367,7 @@ msgstr ""
 "提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n"
 "%s\n"
 
 "提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n"
 "%s\n"
 

-#: cmdline/apt-get.cc:729
+#: cmdline/apt-get.cc:784

 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"


@@ -363,114 +378,114 @@ msgstr ""
 "bzr get %s\n"
 "获得该软件包的最近更新(可能尚未正式发布)。\n"
 
 "bzr get %s\n"
 "获得该软件包的最近更新(可能尚未正式发布)。\n"
 

-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:837

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "忽略已下载过的文件“%s”\n"
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "忽略已下载过的文件“%s”\n"
 

-#: cmdline/apt-get.cc:805 cmdline/apt-get.cc:808
+#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863

 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "无法获知您在 %s 上的可用空间"
 
 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "无法获知您在 %s 上的可用空间"
 

-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:874

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "您在 %s 上没有足够的可用空间"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "您在 %s 上没有足够的可用空间"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB

-#: cmdline/apt-get.cc:828
+#: cmdline/apt-get.cc:883

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下载 %sB/%sB 的源代码包。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下载 %sB/%sB 的源代码包。\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB

-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:888

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下载 %sB 的源代码包。\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下载 %sB 的源代码包。\n"
 

-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:894

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下载源代码 %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下载源代码 %s\n"
 

-#: cmdline/apt-get.cc:860
+#: cmdline/apt-get.cc:915

 msgid "Failed to fetch some archives."
 msgstr "有一些包文件无法下载。"
 
 msgid "Failed to fetch some archives."
 msgstr "有一些包文件无法下载。"
 

-#: cmdline/apt-get.cc:865 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325

 msgid "Download complete and in download only mode"
 msgstr "下载完毕，目前是“仅下载”模式"
 
 msgid "Download complete and in download only mode"
 msgstr "下载完毕，目前是“仅下载”模式"
 

-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:946

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "忽略已经被解包到 %s 目录的源代码包\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "忽略已经被解包到 %s 目录的源代码包\n"
 

-#: cmdline/apt-get.cc:903
+#: cmdline/apt-get.cc:958

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "运行解包的命令“%s”出错。\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "运行解包的命令“%s”出错。\n"
 

-#: cmdline/apt-get.cc:904
+#: cmdline/apt-get.cc:959

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 

-#: cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:981

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s”失败。\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s”失败。\n"
 

-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:1001

 msgid "Child process failed"
 msgstr "子进程出错"
 
 msgid "Child process failed"
 msgstr "子进程出错"
 

-#: cmdline/apt-get.cc:965
+#: cmdline/apt-get.cc:1020

 msgid "Must specify at least one package to check builddeps for"
 msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包"
 

-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:1045

 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 

-#: cmdline/apt-get.cc:1014 cmdline/apt-get.cc:1017
+#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "无法获得 %s 的构建依赖关系信息"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "无法获得 %s 的构建依赖关系信息"
 

-#: cmdline/apt-get.cc:1037
+#: cmdline/apt-get.cc:1092

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 

-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1262

 #, 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:1225
+#: cmdline/apt-get.cc:1280

 #, 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:1248
+#: cmdline/apt-get.cc:1303

 #, 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:1287
+#: cmdline/apt-get.cc:1342

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


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

-#: cmdline/apt-get.cc:1293
+#: cmdline/apt-get.cc:1348

 #, 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:1316
+#: cmdline/apt-get.cc:1371

 #, 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:1331
+#: cmdline/apt-get.cc:1386

 #, 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:1336
+#: cmdline/apt-get.cc:1391

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

-#: cmdline/apt-get.cc:1429 cmdline/apt-get.cc:1441
+#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496

 #, 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:1529
+#: cmdline/apt-get.cc:1582

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

-#: cmdline/apt-get.cc:1570
+#: cmdline/apt-get.cc:1623

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


@@ -623,8 +638,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s 已经是最新的版本了。\n"
 
 #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
 msgstr "%s 已经是最新的版本了。\n"
 
 #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328

-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1174
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
+#: apt-pkg/deb/dpkgpm.cc:1183

 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待子进程 %s 的退出，但是它并不存在"
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待子进程 %s 的退出，但是它并不存在"


@@ -653,6 +668,11 @@ msgid ""
 "Commands:\n"
 "   auto - Mark the given packages as automatically installed\n"
 "   manual - Mark the given packages as manually installed\n"
 "Commands:\n"
 "   auto - Mark the given packages as automatically installed\n"
 "   manual - Mark the given packages as manually installed\n"

+"   hold - Mark a package as held back\n"
+"   unhold - Unset a package set as held back\n"
+"   showauto - Print the list of automatically installed packages\n"
+"   showmanual - Print the list of manually installed packages\n"
+"   showhold - Print the list of package on hold\n"

 "\n"
 "Options:\n"
 "  -h  This help text.\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"


@@ -670,14 +690,18 @@ msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"

-"Commands: \n"
+"Basic commands: \n"

 " list - list packages based on package names\n"
 " search - search in package descriptions\n"
 " show - show package details\n"
 "\n"
 " update - update list of available packages\n"
 " list - list packages based on package names\n"
 " search - search in package descriptions\n"
 " show - show package details\n"
 "\n"
 " update - update list of available packages\n"

+"\n"

 " install - install packages\n"
 " install - install packages\n"

-" upgrade - upgrade the systems packages\n"
+" remove  - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"

 "\n"
 " edit-sources - edit the source information file\n"
 msgstr ""
 "\n"
 " edit-sources - edit the source information file\n"
 msgstr ""


@@ -713,11 +737,11 @@ msgid "File not found"
 msgstr "无法找到该文件"
 
 #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
 msgstr "无法找到该文件"
 
 #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114

-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:618 methods/rred.cc:627

 msgid "Failed to stat"
 msgstr "无法读取状态"
 
 msgid "Failed to stat"
 msgstr "无法读取状态"
 

-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624

 msgid "Failed to set modification time"
 msgstr "无法设置文件的修改日期"
 
 msgid "Failed to set modification time"
 msgstr "无法设置文件的修改日期"
 


@@ -791,9 +815,9 @@ msgstr "回应超出了缓存区大小。"
 msgid "Protocol corruption"
 msgstr "协议有误"
 
 msgid "Protocol corruption"
 msgstr "协议有误"
 

-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425

 msgid "Write error"
 msgstr "写出错"
 
 msgid "Write error"
 msgstr "写出错"
 


@@ -805,7 +829,7 @@ msgstr "无法创建套接字"
 msgid "Could not connect data socket, connection timed out"
 msgstr "无法连接上数据套接字，连接超时"
 
 msgid "Could not connect data socket, connection timed out"
 msgstr "无法连接上数据套接字，连接超时"
 

-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22

 msgid "Failed"
 msgstr "失败"
 
 msgid "Failed"
 msgstr "失败"
 


@@ -1047,7 +1071,7 @@ msgstr "连接失败"
 msgid "Internal error"
 msgstr "内部错误"
 
 msgid "Internal error"
 msgstr "内部错误"
 

-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147

 msgid "Listing"
 msgstr ""
 
 msgid "Listing"
 msgstr ""
 


@@ -1279,101 +1303,101 @@ msgstr "不经验证就安装这些软件包吗？"
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"
 
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"
 

-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200

 msgid "installed,upgradable to: "
 msgstr ""
 
 msgid "installed,upgradable to: "
 msgstr ""
 

-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206

 #, fuzzy
 msgid "[installed,local]"
 msgstr " [已安装]"
 
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [已安装]"
 

-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:209

 msgid "[installed,auto-removable]"
 msgstr ""
 
 msgid "[installed,auto-removable]"
 msgstr ""
 

-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:211

 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [已安装]"
 
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [已安装]"
 

-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:213

 #, fuzzy
 msgid "[installed]"
 msgstr " [已安装]"
 
 #, fuzzy
 msgid "[installed]"
 msgstr " [已安装]"
 

-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219

 msgid "[upgradable from: "
 msgstr ""
 
 msgid "[upgradable from: "
 msgstr ""
 

-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:225

 msgid "[residual-config]"
 msgstr ""
 
 msgid "[residual-config]"
 msgstr ""
 

-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:316

 msgid "The following packages have unmet dependencies:"
 msgstr "下列软件包有未满足的依赖关系："
 
 msgid "The following packages have unmet dependencies:"
 msgstr "下列软件包有未满足的依赖关系："
 

-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:406

 #, c-format
 msgid "but %s is installed"
 msgstr "但是 %s 已经安装"
 
 #, c-format
 msgid "but %s is installed"
 msgstr "但是 %s 已经安装"
 

-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:408

 #, c-format
 msgid "but %s is to be installed"
 msgstr "但是 %s 正要被安装"
 
 #, c-format
 msgid "but %s is to be installed"
 msgstr "但是 %s 正要被安装"
 

-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:415

 msgid "but it is not installable"
 msgstr "但无法安装它"
 
 msgid "but it is not installable"
 msgstr "但无法安装它"
 

-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:417

 msgid "but it is a virtual package"
 msgstr "但是它是虚拟软件包"
 
 msgid "but it is a virtual package"
 msgstr "但是它是虚拟软件包"
 

-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420

 msgid "but it is not installed"
 msgstr "但是它还没有被安装"
 
 msgid "but it is not installed"
 msgstr "但是它还没有被安装"
 

-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:420

 msgid "but it is not going to be installed"
 msgstr "但是它将不会被安装"
 
 msgid "but it is not going to be installed"
 msgstr "但是它将不会被安装"
 

-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:425

 msgid " or"
 msgstr " 或"
 
 msgid " or"
 msgstr " 或"
 

-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:454

 msgid "The following NEW packages will be installed:"
 msgstr "下列【新】软件包将被安装："
 
 msgid "The following NEW packages will be installed:"
 msgstr "下列【新】软件包将被安装："
 

-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:480

 msgid "The following packages will be REMOVED:"
 msgstr "下列软件包将被【卸载】："
 
 msgid "The following packages will be REMOVED:"
 msgstr "下列软件包将被【卸载】："
 

-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:502

 msgid "The following packages have been kept back:"
 msgstr "下列软件包的版本将保持不变："
 
 msgid "The following packages have been kept back:"
 msgstr "下列软件包的版本将保持不变："
 

-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:523

 msgid "The following packages will be upgraded:"
 msgstr "下列软件包将被升级："
 
 msgid "The following packages will be upgraded:"
 msgstr "下列软件包将被升级："
 

-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:544

 msgid "The following packages will be DOWNGRADED:"
 msgstr "下列软件包将被【降级】："
 
 msgid "The following packages will be DOWNGRADED:"
 msgstr "下列软件包将被【降级】："
 

-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:564

 msgid "The following held packages will be changed:"
 msgstr "下列被要求保持版本不变的软件包将被改变："
 
 msgid "The following held packages will be changed:"
 msgstr "下列被要求保持版本不变的软件包将被改变："
 

-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:619

 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (是由于 %s) "
 
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (是由于 %s) "
 

-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:627

 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"


@@ -1381,27 +1405,27 @@ msgstr ""
 "【警告】：下列基础软件包将被卸载。\n"
 "请勿尝试，除非您确实知道您在做什么！"
 
 "【警告】：下列基础软件包将被卸载。\n"
 "请勿尝试，除非您确实知道您在做什么！"
 

-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:658

 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
 
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
 

-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:662

 #, c-format
 msgid "%lu reinstalled, "
 msgstr "重新安装了 %lu 个软件包，"
 
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "重新安装了 %lu 个软件包，"
 

-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:664

 #, c-format
 msgid "%lu downgraded, "
 msgstr "降级了 %lu 个软件包，"
 
 #, c-format
 msgid "%lu downgraded, "
 msgstr "降级了 %lu 个软件包，"
 

-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:666

 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
 
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
 

-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:670

 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"


@@ -1410,7 +1434,7 @@ msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
 #. e.g. "Do you want to continue? [Y/n] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.
 #. e.g. "Do you want to continue? [Y/n] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.

-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:692

 msgid "[Y/n]"
 msgstr ""
 
 msgid "[Y/n]"
 msgstr ""
 


@@ -1418,21 +1442,21 @@ msgstr ""
 #. e.g. "Should this file be removed? [y/N] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.
 #. e.g. "Should this file be removed? [y/N] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.

-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:698

 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set

-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:709

 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set

-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:715

 msgid "N"
 msgstr ""
 
 msgid "N"
 msgstr ""
 

-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "编译正则表达式时出错 - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "编译正则表达式时出错 - %s"


@@ -1473,16 +1497,16 @@ msgstr ""
 msgid "The update command takes no arguments"
 msgstr " update 命令不需要参数"
 
 msgid "The update command takes no arguments"
 msgstr " update 命令不需要参数"
 

-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19

 msgid "Calculating upgrade... "
 msgstr "正在对升级进行计算... "
 
 msgid "Calculating upgrade... "
 msgstr "正在对升级进行计算... "
 

-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24

 #, fuzzy
 msgid "Internal error, Upgrade broke stuff"
 msgstr "内部错误，全部升级工具坏事了"
 
 #, fuzzy
 msgid "Internal error, Upgrade broke stuff"
 msgstr "内部错误，全部升级工具坏事了"
 

-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26

 msgid "Done"
 msgstr "完成"
 
 msgid "Done"
 msgstr "完成"
 


@@ -1490,7 +1514,18 @@ msgstr "完成"
 msgid "Full Text Search"
 msgstr ""
 
 msgid "Full Text Search"
 msgstr ""
 

-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:159

 msgid "not a real package (virtual)"
 msgstr ""
 
 msgid "not a real package (virtual)"
 msgstr ""
 


@@ -1505,12 +1540,12 @@ msgstr ""
 "　　　apt-get 需要 root 特权进行实际的执行。\n"
 "　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！"
 
 "　　　apt-get 需要 root 特权进行实际的执行。\n"
 "　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！"
 

-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45

 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "无法将 %s 重命名为 %s"
 
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "无法将 %s 重命名为 %s"
 

-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57

 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""


@@ -1556,8 +1591,8 @@ msgstr ""
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:464
 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:464
 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406

-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
+#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100

 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
 #, c-format
 msgid "Unable to read %s"
 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
 #, c-format
 msgid "Unable to read %s"


@@ -1595,20 +1630,6 @@ msgstr "没有找到镜像文件 %s"
 msgid "[Mirror: %s]"
 msgstr "[镜像：%s]"
 
 msgid "[Mirror: %s]"
 msgstr "[镜像：%s]"
 

-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"
-

 #: methods/rsh.cc:99 ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "无法为子进程创建 IPC 管道"
 #: methods/rsh.cc:99 ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "无法为子进程创建 IPC 管道"


@@ -1651,12 +1672,12 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们，
 msgid "Merging available information"
 msgstr "正在合并可用信息"
 
 msgid "Merging available information"
 msgstr "正在合并可用信息"
 

-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100

 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s 不是一个有效的 DEB 软件包。"
 
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s 不是一个有效的 DEB 软件包。"
 

-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234

 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"


@@ -1680,12 +1701,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388

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

-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308

 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
 
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
 


@@ -2471,12 +2492,12 @@ msgstr "子进程 %s 发生了段错误"
 msgid "Sub-process %s received signal %u."
 msgstr "子进程 %s 收到信号 %u。"
 
 msgid "Sub-process %s received signal %u."
 msgstr "子进程 %s 收到信号 %u。"
 

-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237

 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子进程 %s 返回了一个错误号 (%u)"
 
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子进程 %s 返回了一个错误号 (%u)"
 

-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230

 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子进程 %s 异常退出"
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子进程 %s 异常退出"


@@ -2529,7 +2550,7 @@ msgid "Problem syncing the file"
 msgstr "同步文件出错"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 msgstr "同步文件出错"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory

-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70

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


@@ -2652,76 +2673,86 @@ msgstr "无法解析软件包文件 %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "无法解析软件包文件 %s (2)"
 
 msgid "Unable to parse package file %s (2)"
 msgstr "无法解析软件包文件 %s (2)"
 

-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:118
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
+
+#: apt-pkg/sourcelist.cc:161

 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
 

-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:164

 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
 

-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:175

 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
 

-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:181

 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"
 

-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:184

 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)"
 

-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:197

 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
 

-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:199

 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
 

-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:202

 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
 

-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:208

 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
 

-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:215

 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
 

-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:326

 #, c-format
 msgid "Opening %s"
 msgstr "正在打开 %s"
 
 #, c-format
 msgid "Opening %s"
 msgstr "正在打开 %s"
 

-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:338 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 行太长了。"
 

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

 #, 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:293
+#: apt-pkg/sourcelist.cc:366

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

+#: apt-pkg/sourcelist.cc:407
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
+

 #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
 #, c-format
 msgid ""
 #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
 #, c-format
 msgid ""


@@ -2851,17 +2882,17 @@ msgid ""
 "available in the sources"
 msgstr ""
 
 "available in the sources"
 msgstr ""
 

-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414

 #, 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:432
+#: apt-pkg/policy.cc:436

 #, 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:440
+#: apt-pkg/policy.cc:444

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


@@ -2941,35 +2972,35 @@ msgstr "大小不符"
 msgid "Invalid file format"
 msgstr "无效的操作 %s"
 
 msgid "Invalid file format"
 msgstr "无效的操作 %s"
 

-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1561

 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1577

 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "无法解析软件包仓库 Release 文件 %s"
 
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "无法解析软件包仓库 Release 文件 %s"
 

-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1619

 msgid "There is no public key available for the following key IDs:\n"
 msgstr "以下 ID 的密钥没有可用的公钥：\n"
 
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "以下 ID 的密钥没有可用的公钥：\n"
 

-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1657

 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1679

 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
 
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
 

-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1709

 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "


@@ -2978,12 +3009,12 @@ msgstr ""
 "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
 "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)

-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724

 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG 错误：%s: %s"
 
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG 错误：%s: %s"
 

-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1847

 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "


@@ -2992,12 +3023,12 @@ msgstr ""
 "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
 "包。(缘于架构缺失)"
 
 "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
 "包。(缘于架构缺失)"
 

-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1913

 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1971

 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."


@@ -3220,12 +3251,12 @@ msgstr ""
 msgid "Execute external solver"
 msgstr ""
 
 msgid "Execute external solver"
 msgstr ""
 

-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51

 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 

-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168

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


@@ -3237,139 +3268,143 @@ msgid ""
 msgstr ""
 "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 
 msgstr ""
 "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 

-#: apt-pkg/deb/dpkgpm.cc:90
+#: apt-pkg/deb/dpkgpm.cc:91

 #, c-format
 msgid "Installing %s"
 msgstr "正在安装 %s"
 
 #, c-format
 msgid "Installing %s"
 msgstr "正在安装 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:91 apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978

 #, c-format
 msgid "Configuring %s"
 msgstr "正在配置 %s"
 
 #, c-format
 msgid "Configuring %s"
 msgstr "正在配置 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985

 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
 
 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:93
+#: apt-pkg/deb/dpkgpm.cc:94

 #, c-format
 msgid "Completely removing %s"
 msgstr "完全删除 %s"
 
 #, c-format
 msgid "Completely removing %s"
 msgstr "完全删除 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:95

 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "注意到 %s 已经消失"
 
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "注意到 %s 已经消失"
 

-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:96

 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "执行安装后执行的触发器 %s"
 
 #. FIXME: use a better string after freeze
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "执行安装后执行的触发器 %s"
 
 #. FIXME: use a better string after freeze

-#: apt-pkg/deb/dpkgpm.cc:808
+#: apt-pkg/deb/dpkgpm.cc:809

 #, c-format
 msgid "Directory '%s' missing"
 msgstr "目录 %s 缺失"
 
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "目录 %s 缺失"
 

-#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
+#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846

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

-#: apt-pkg/deb/dpkgpm.cc:970
+#: apt-pkg/deb/dpkgpm.cc:971

 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 
 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:972

 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:977

 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:979

 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 
 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:984

 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在准备 %s 的删除操作"
 
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在准备 %s 的删除操作"
 

-#: apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:986

 #, c-format
 msgid "Removed %s"
 msgstr "已删除 %s"
 
 #, c-format
 msgid "Removed %s"
 msgstr "已删除 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:991

 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在准备完全删除 %s"
 
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在准备完全删除 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:992

 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 
 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:1041 apt-pkg/deb/dpkgpm.cc:1062
+#: apt-pkg/deb/dpkgpm.cc:1047
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071

 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "无法写入 %s"
 
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "无法写入 %s"
 

-#: apt-pkg/deb/dpkgpm.cc:1041
+#: apt-pkg/deb/dpkgpm.cc:1050

 msgid "Is /dev/pts mounted?"
 msgstr ""
 
 msgid "Is /dev/pts mounted?"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1062
+#: apt-pkg/deb/dpkgpm.cc:1071

 msgid "Is stdout a terminal?"
 msgstr ""
 
 msgid "Is stdout a terminal?"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1545
+#: apt-pkg/deb/dpkgpm.cc:1559

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

-#: apt-pkg/deb/dpkgpm.cc:1607
+#: apt-pkg/deb/dpkgpm.cc:1621

 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:1612
+#: apt-pkg/deb/dpkgpm.cc:1626

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

-#: apt-pkg/deb/dpkgpm.cc:1614
+#: apt-pkg/deb/dpkgpm.cc:1628

 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:1620
+#: apt-pkg/deb/dpkgpm.cc:1634

 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:1627
+#: apt-pkg/deb/dpkgpm.cc:1641

 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:1634 apt-pkg/deb/dpkgpm.cc:1640
+#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654

 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
 
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
 

-#: apt-pkg/deb/dpkgpm.cc:1661
+#: apt-pkg/deb/dpkgpm.cc:1675

 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 报告。"


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

+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"
+

 #~ msgid "Note, selecting '%s' for task '%s'\n"
 #~ msgstr "注意，为任务 %2$s 选中了 %1$s\n"
 
 #~ msgid "Note, selecting '%s' for task '%s'\n"
 #~ msgstr "注意，为任务 %2$s 选中了 %1$s\n"