srv test: do 100 pulls twice and compare list

[apt.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d3789ec2b64feb8efbf2704279295b00e8dcbae2..6706bb88a2aa53af154f9a5dcc7ed5ac8131d90e 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,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: 2015-08-21 06:13-0400\n"
+"POT-Creation-Date: 2015-09-11 23:36+0200\n"

 "PO-Revision-Date: 2014-12-04 04:42+0000\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "PO-Revision-Date: 2014-12-04 04:42+0000\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"


@@ -115,7 +115,7 @@ msgstr "您必须明确地给出至少一个表达式"
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "该命令已废弃。请使用‘apt-mark showauto’。"
 
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "该命令已废弃。请使用‘apt-mark showauto’。"
 

-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:754

 #, c-format
 msgid "Unable to locate package %s"
 msgstr "无法定位软件包 %s"
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "无法定位软件包 %s"


@@ -326,7 +326,7 @@ msgid "Couldn't find package %s"
 msgstr "找不到软件包 %s"
 
 #: cmdline/apt-get.cc:422 cmdline/apt-mark.cc:78
 msgstr "找不到软件包 %s"
 
 #: cmdline/apt-get.cc:422 cmdline/apt-mark.cc:78

-#: apt-private/private-install.cc:839
+#: apt-private/private-install.cc:851

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


@@ -350,16 +350,16 @@ msgstr "内部错误，问题解决工具坏事了"
 msgid "Unable to lock the download directory"
 msgstr "无法锁定下载目录"
 
 msgid "Unable to lock the download directory"
 msgstr "无法锁定下载目录"
 

-#: cmdline/apt-get.cc:688
+#: cmdline/apt-get.cc:685

 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:725 cmdline/apt-get.cc:1035
+#: cmdline/apt-get.cc:722 cmdline/apt-get.cc:1029

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

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


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

-#: cmdline/apt-get.cc:750
+#: cmdline/apt-get.cc:747

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


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

-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:795

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "忽略已下载的文件“%s”\n"
 
 #. 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 "Skipping already downloaded file '%s'\n"
 msgstr "忽略已下载的文件“%s”\n"
 
 #. 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:825

 #, 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:830

 #, 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:836

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

-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:858

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

-#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+#: cmdline/apt-get.cc:863 apt-private/private-install.cc:300

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:970

 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:994
+#: cmdline/apt-get.cc:988

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


@@ -448,27 +448,27 @@ msgstr ""
 "找不到关于 %s 的有效体系结构信息。请参见 apt.conf(5) APT::Architectures for "
 "setup"
 
 "找不到关于 %s 的有效体系结构信息。请参见 apt.conf(5) APT::Architectures for "
 "setup"
 

-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1006

 #, c-format
 msgid "Note, using directory '%s' to get the build dependencies\n"
 msgstr ""
 
 #, c-format
 msgid "Note, using directory '%s' to get the build dependencies\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1016

 #, fuzzy, c-format
 msgid "Note, using file '%s' to get the build dependencies\n"
 msgstr "无法处理构建依赖关系"
 
 #, fuzzy, c-format
 msgid "Note, using file '%s' to get the build dependencies\n"
 msgstr "无法处理构建依赖关系"
 

-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1041 cmdline/apt-get.cc:1044

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

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

 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "


@@ -476,19 +476,19 @@ msgid ""
 msgstr ""
 "由于 %3$s 不被软件包 %4$s 所允许，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
 msgstr ""
 "由于 %3$s 不被软件包 %4$s 所允许，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 

-#: cmdline/apt-get.cc:1258
+#: cmdline/apt-get.cc:1252

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

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

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


@@ -496,32 +496,32 @@ msgid ""
 msgstr ""
 "软件包 %3$s 的候选版本不能满足版本要求，因此 %2$s 软件包的 %1$s 依赖无法满足"
 
 msgstr ""
 "软件包 %3$s 的候选版本不能满足版本要求，因此 %2$s 软件包的 %1$s 依赖无法满足"
 

-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1320

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "软件包 %3$s 没有可用的候选版本，因此 %2$s 的 %1$s 依赖无法满足"
 
 #, 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:1349
+#: cmdline/apt-get.cc:1343

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

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

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

-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1553

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

-#: cmdline/apt-get.cc:1595
+#: cmdline/apt-get.cc:1594

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -616,21 +616,16 @@ msgstr "需要一个 URL 作为参数"
 msgid "Must specify at least one pair url/filename"
 msgstr "必须指定至少一对URL或者文件名"
 
 msgid "Must specify at least one pair url/filename"
 msgstr "必须指定至少一对URL或者文件名"
 

-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77

 msgid "Download Failed"
 msgstr "下载失败"
 
 msgid "Download Failed"
 msgstr "下载失败"
 

-#: cmdline/apt-helper.cc:88
-#, fuzzy
-msgid "Must specifc at least one srv record"
-msgstr "必须指定至少一对URL或者文件名"
-
-#: cmdline/apt-helper.cc:95
+#: cmdline/apt-helper.cc:98 cmdline/apt-helper.cc:101

 #, c-format
 msgid "GetSrvRec failed for %s"
 msgstr ""
 
 #, c-format
 msgid "GetSrvRec failed for %s"
 msgstr ""
 

-#: cmdline/apt-helper.cc:118
+#: cmdline/apt-helper.cc:117

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


@@ -682,8 +677,8 @@ msgid "%s was already not hold.\n"
 msgstr "%s 已经设置为不保留。\n"
 
 #: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
 msgstr "%s 已经设置为不保留。\n"
 
 #: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397

-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:207
-#: apt-pkg/deb/dpkgpm.cc:1302
+#: apt-pkg/deb/dpkgpm.cc:1302 apt-pkg/contrib/fileutl.cc:850
+#: apt-pkg/contrib/gpgv.cc:207

 #, 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 的退出，但是它并不存在"


@@ -823,12 +818,12 @@ msgstr "找不到盘片。"
 msgid "File not found"
 msgstr "无法找到该文件"
 
 msgid "File not found"
 msgstr "无法找到该文件"
 

-#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
-#: methods/rred.cc:664
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:663
+#: methods/rred.cc:673

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

-#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:670

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


@@ -918,7 +913,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:718 methods/connect.cc:120 methods/rsh.cc:102
+#: methods/ftp.cc:718 methods/connect.cc:119 methods/rsh.cc:102

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


@@ -991,64 +986,64 @@ msgstr "查询"
 msgid "Unable to invoke "
 msgstr "无法调用 "
 
 msgid "Unable to invoke "
 msgstr "无法调用 "
 

-#: methods/connect.cc:80
+#: methods/connect.cc:79

 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "正在连接 %s (%s)"
 
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "正在连接 %s (%s)"
 

-#: methods/connect.cc:91
+#: methods/connect.cc:90

 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 

-#: methods/connect.cc:98
+#: methods/connect.cc:97

 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"
 
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"
 

-#: methods/connect.cc:104
+#: methods/connect.cc:103

 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "无法发起与 %s:%s (%s) 的连接"
 
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "无法发起与 %s:%s (%s) 的连接"
 

-#: methods/connect.cc:112
+#: methods/connect.cc:111

 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "无法连接上 %s:%s (%s)，连接超时"
 
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "无法连接上 %s:%s (%s)，连接超时"
 

-#: methods/connect.cc:130
+#: methods/connect.cc:129

 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "无法连接上 %s:%s (%s)。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "无法连接上 %s:%s (%s)。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going

-#: methods/connect.cc:155 methods/rsh.cc:460
+#: methods/connect.cc:153 methods/rsh.cc:460

 #, c-format
 msgid "Connecting to %s"
 msgstr "正在连接 %s"
 
 #, c-format
 msgid "Connecting to %s"
 msgstr "正在连接 %s"
 

-#: methods/connect.cc:181 methods/connect.cc:200
+#: methods/connect.cc:179 methods/connect.cc:198

 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "无法解析域名“%s”"
 
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "无法解析域名“%s”"
 

-#: methods/connect.cc:206
+#: methods/connect.cc:204

 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "暂时不能解析域名“%s”"
 
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "暂时不能解析域名“%s”"
 

-#: methods/connect.cc:210
+#: methods/connect.cc:208

 #, c-format
 msgid "System error resolving '%s:%s'"
 msgstr "解析“%s:%s”时出现系统故障"
 
 #, c-format
 msgid "System error resolving '%s:%s'"
 msgstr "解析“%s:%s”时出现系统故障"
 

-#: methods/connect.cc:212
+#: methods/connect.cc:210

 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"
 
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"
 

-#: methods/connect.cc:259
+#: methods/connect.cc:257

 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "不能连接到 %s：%s："
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "不能连接到 %s：%s："


@@ -1067,7 +1062,7 @@ msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr "无法运行 apt-key 以验证签名(您安装了 gnupg 吗？)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
 msgstr "无法运行 apt-key 以验证签名(您安装了 gnupg 吗？)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'

-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:650

 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "


@@ -1230,12 +1225,12 @@ msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "类似 %s 的虚拟软件包可以卸载\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 msgstr "类似 %s 的虚拟软件包可以卸载\n"
 
 #. TRANSLATORS: Note, this is not an interactive question

-#: apt-private/private-cacheset.cc:238 apt-private/private-install.cc:915
+#: apt-private/private-cacheset.cc:238 apt-private/private-install.cc:927

 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "软件包 %s 还未安装，因而不会被卸载。您的意思是 ‘%s’ 吗？\n"
 
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "软件包 %s 还未安装，因而不会被卸载。您的意思是 ‘%s’ 吗？\n"
 

-#: apt-private/private-cacheset.cc:244 apt-private/private-install.cc:921
+#: apt-private/private-cacheset.cc:244 apt-private/private-install.cc:933

 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "软件包 %s 还未安装，因而不会被卸载\n"
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "软件包 %s 还未安装，因而不会被卸载\n"


@@ -1253,7 +1248,7 @@ msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
 
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
 

-#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:69

 msgid ""
 "--force-yes is deprecated, use one of the options starting with --allow "
 "instead."
 msgid ""
 "--force-yes is deprecated, use one of the options starting with --allow "
 "instead."


@@ -1454,46 +1449,46 @@ msgstr ""
 msgid "Broken packages"
 msgstr "破损的软件包"
 
 msgid "Broken packages"
 msgstr "破损的软件包"
 

-#: apt-private/private-install.cc:685
+#: apt-private/private-install.cc:697

 #, fuzzy
 msgid "The following additional packages will be installed:"
 msgstr "将会安装下列额外的软件包："
 
 #, fuzzy
 msgid "The following additional packages will be installed:"
 msgstr "将会安装下列额外的软件包："
 

-#: apt-private/private-install.cc:774
+#: apt-private/private-install.cc:786

 msgid "Suggested packages:"
 msgstr "建议安装的软件包："
 
 msgid "Suggested packages:"
 msgstr "建议安装的软件包："
 

-#: apt-private/private-install.cc:776
+#: apt-private/private-install.cc:788

 msgid "Recommended packages:"
 msgstr "推荐安装的软件包："
 
 msgid "Recommended packages:"
 msgstr "推荐安装的软件包："
 

-#: apt-private/private-install.cc:798
+#: apt-private/private-install.cc:810

 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
 
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
 

-#: apt-private/private-install.cc:802
+#: apt-private/private-install.cc:814

 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n"
 
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n"
 

-#: apt-private/private-install.cc:814
+#: apt-private/private-install.cc:826

 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "不能重新安装 %s，因为无法下载它。\n"
 
 #. TRANSLATORS: First string is package name, second is version
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "不能重新安装 %s，因为无法下载它。\n"
 
 #. TRANSLATORS: First string is package name, second is version

-#: apt-private/private-install.cc:820
+#: apt-private/private-install.cc:832

 #, fuzzy, c-format
 msgid "%s is already the newest version (%s).\n"
 msgstr "%s 已经是最新的版本。\n"
 
 #, fuzzy, c-format
 msgid "%s is already the newest version (%s).\n"
 msgstr "%s 已经是最新的版本。\n"
 

-#: apt-private/private-install.cc:868
+#: apt-private/private-install.cc:880

 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
 
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
 

-#: apt-private/private-install.cc:873
+#: apt-private/private-install.cc:885

 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "由于 %4$s，为 %3$s 选定了版本 %1$s (%2$s)\n"
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "由于 %4$s，为 %3$s 选定了版本 %1$s (%2$s)\n"


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

-#: apt-private/private-download.cc:62
-#, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
+#: apt-private/private-download.cc:45

 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "【警告】：下列软件包不能通过验证！"
 
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "【警告】：下列软件包不能通过验证！"
 

-#: apt-private/private-download.cc:101
+#: apt-private/private-download.cc:52

 msgid "Authentication warning overridden.\n"
 msgstr "忽略了认证警告。\n"
 
 msgid "Authentication warning overridden.\n"
 msgstr "忽略了认证警告。\n"
 

-#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#: apt-private/private-download.cc:57 apt-private/private-download.cc:64

 msgid "Some packages could not be authenticated"
 msgstr "有些软件包不能通过验证"
 
 msgid "Some packages could not be authenticated"
 msgstr "有些软件包不能通过验证"
 

-#: apt-private/private-download.cc:111
+#: apt-private/private-download.cc:62

 msgid "Install these packages without verification?"
 msgstr "不经验证就安装这些软件包吗？"
 
 msgid "Install these packages without verification?"
 msgstr "不经验证就安装这些软件包吗？"
 

-#: apt-private/private-download.cc:122
+#: apt-private/private-download.cc:73

 #, fuzzy
 msgid ""
 "There were unauthenticated packages and -y was used without --allow-"
 "unauthenticated"
 msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
 
 #, fuzzy
 msgid ""
 "There were unauthenticated packages and -y was used without --allow-"
 "unauthenticated"
 msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
 

-#: apt-private/private-download.cc:154
+#: apt-private/private-download.cc:105

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

-#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#: apt-private/private-download.cc:127 apt-private/private-download.cc:130

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "无法获知您在 %s 上的可用空间"
 
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "无法获知您在 %s 上的可用空间"
 

-#: apt-private/private-download.cc:193
+#: apt-private/private-download.cc:144

 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "您在 %s 上没有足够的可用空间。"
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "您在 %s 上没有足够的可用空间。"


@@ -1846,17 +1834,17 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141

-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412
-#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/acquire.cc:622 apt-pkg/clean.cc:43 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:318 apt-pkg/sourcelist.cc:324

 #: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
 #: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"
 
 #: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
 #: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"
 

-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:628
+#: apt-pkg/acquire.cc:653 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201

 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"


@@ -1977,15 +1965,15 @@ msgstr "无法找到认证记录：%s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash 校验和不符：%s"
 
 msgid "Hash mismatch for: %s"
 msgstr "Hash 校验和不符：%s"
 

-#: apt-pkg/cachefile.cc:101
+#: apt-pkg/cachefile.cc:98

 msgid "The package lists or status file could not be parsed or opened."
 msgstr "无法解析或打开软件包的列表或是状态文件。"
 
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "无法解析或打开软件包的列表或是状态文件。"
 

-#: apt-pkg/cachefile.cc:105
+#: apt-pkg/cachefile.cc:102

 msgid "You may want to run apt-get update to correct these problems"
 msgstr "您可能需要运行 apt-get update 来解决这些问题"
 
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "您可能需要运行 apt-get update 来解决这些问题"
 

-#: apt-pkg/cachefile.cc:123
+#: apt-pkg/cachefile.cc:120

 msgid "The list of sources could not be read."
 msgstr "无法读取源列表。"
 
 msgid "The list of sources could not be read."
 msgstr "无法读取源列表。"
 


@@ -2071,6 +2059,10 @@ msgstr "可选"
 msgid "extra"
 msgstr "额外"
 
 msgid "extra"
 msgstr "额外"
 

+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "正在对升级进行计算"
+

 #: apt-pkg/acquire-worker.cc:111
 #, c-format
 msgid "The method driver %s could not be found."
 #: apt-pkg/acquire-worker.cc:111
 #, c-format
 msgid "The method driver %s could not be found."


@@ -2086,17 +2078,12 @@ 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:536
+#: apt-pkg/acquire-worker.cc:543

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

-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "不支持索引文件类型“%s”"
-

 #: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
 msgid "Building dependency tree"
 msgstr "正在分析软件包的依赖关系树"
 #: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
 msgid "Building dependency tree"
 msgstr "正在分析软件包的依赖关系树"


@@ -2123,33 +2110,33 @@ msgstr "无法打开状态文件 %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "无法写入临时状态文件 %s"
 
 msgid "Failed to write temporary StateFile %s"
 msgstr "无法写入临时状态文件 %s"
 

-#: apt-pkg/acquire-item.cc:116
+#: apt-pkg/acquire-item.cc:156

 msgid "Use --allow-insecure-repositories to force the update"
 msgstr ""
 
 msgid "Use --allow-insecure-repositories to force the update"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2161
+#: apt-pkg/acquire-item.cc:607 apt-pkg/contrib/fileutl.cc:2189

 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "无法重命名文件，%s (%s -> %s)。"
 
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "无法重命名文件，%s (%s -> %s)。"
 

-#: apt-pkg/acquire-item.cc:585
+#: apt-pkg/acquire-item.cc:631

 msgid "Hash Sum mismatch"
 msgstr "Hash 校验和不符"
 
 msgid "Hash Sum mismatch"
 msgstr "Hash 校验和不符"
 

-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:636

 msgid "Size mismatch"
 msgstr "大小不符"
 
 msgid "Size mismatch"
 msgstr "大小不符"
 

-#: apt-pkg/acquire-item.cc:595
+#: apt-pkg/acquire-item.cc:641

 msgid "Invalid file format"
 msgstr "无效的文件格式 %s"
 
 msgid "Invalid file format"
 msgstr "无效的文件格式 %s"
 

-#: apt-pkg/acquire-item.cc:600
+#: apt-pkg/acquire-item.cc:646

 #, fuzzy
 msgid "Signature error"
 msgstr "写出错"
 
 #, fuzzy
 msgid "Signature error"
 msgstr "写出错"
 

-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/acquire-item.cc:835

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


@@ -2158,12 +2145,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:799 apt-pkg/acquire-item.cc:805
+#: apt-pkg/acquire-item.cc:845 apt-pkg/acquire-item.cc:851

 #, 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:970
+#: apt-pkg/acquire-item.cc:1016

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


@@ -2171,14 +2158,14 @@ msgid ""
 msgstr ""
 "在 Release 文件中找不到期望的条目 %s（sources.list条目有误，或者文件有误）"
 
 msgstr ""
 "在 Release 文件中找不到期望的条目 %s（sources.list条目有误，或者文件有误）"
 

-#: apt-pkg/acquire-item.cc:1026
+#: apt-pkg/acquire-item.cc:1122

 msgid "There is no public key available for the following key IDs:\n"
 msgstr "以下 ID 的密钥没有可用的公钥：\n"
 
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
 #. the time since then the file is invalid - formatted in the same way as in
 #. the download progress display (e.g. 7d 3h 42min 1s)
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "以下 ID 的密钥没有可用的公钥：\n"
 
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
 #. the time since then the file is invalid - formatted in the same way as in
 #. the download progress display (e.g. 7d 3h 42min 1s)

-#: apt-pkg/acquire-item.cc:1066
+#: apt-pkg/acquire-item.cc:1162

 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "


@@ -2186,37 +2173,37 @@ msgid ""
 msgstr ""
 "%s 的 Release 文件已经过期(invalid since %s)。该仓库的更新将不会被应用。"
 
 msgstr ""
 "%s 的 Release 文件已经过期(invalid since %s)。该仓库的更新将不会被应用。"
 

-#: apt-pkg/acquire-item.cc:1107
+#: apt-pkg/acquire-item.cc:1203

 #, 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:1224 apt-pkg/acquire-item.cc:1480
+#: apt-pkg/acquire-item.cc:1320 apt-pkg/acquire-item.cc:1576

 #, c-format
 msgid ""
 "The data from '%s' is not signed. Packages from that repository can not be "
 "authenticated."
 msgstr ""
 
 #, c-format
 msgid ""
 "The data from '%s' is not signed. Packages from that repository can not be "
 "authenticated."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:1422

 #, c-format
 msgid ""
 "The repository '%s' does not have a Release file. This is deprecated, please "
 "contact the owner of the repository."
 msgstr ""
 
 #, c-format
 msgid ""
 "The repository '%s' does not have a Release file. This is deprecated, please "
 "contact the owner of the repository."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1459
+#: apt-pkg/acquire-item.cc:1555

 #, fuzzy, c-format
 msgid "The repository '%s' is no longer signed."
 msgstr "目录 %s 已被转移"
 
 #, fuzzy, c-format
 msgid "The repository '%s' is no longer signed."
 msgstr "目录 %s 已被转移"
 

-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1562

 msgid ""
 "This is normally not allowed, but the option Acquire::"
 "AllowDowngradeToInsecureRepositories was given to override it."
 msgstr ""
 
 msgid ""
 "This is normally not allowed, but the option Acquire::"
 "AllowDowngradeToInsecureRepositories was given to override it."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:2611
+#: apt-pkg/acquire-item.cc:2685

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


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

-#: apt-pkg/acquire-item.cc:2677
+#: apt-pkg/acquire-item.cc:2751

 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "没有源可以用来下载 %s 版本的 %s"
 
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "没有源可以用来下载 %s 版本的 %s"
 

-#: apt-pkg/acquire-item.cc:2715
+#: apt-pkg/acquire-item.cc:2789

 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
 
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
 
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1

-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3054
+#: apt-pkg/acquire-item.cc:2990 apt-pkg/acquire-item.cc:3132

 #, fuzzy, c-format
 msgid "Changelog unavailable for %s=%s"
 msgstr "%s (%s) 的 Changelog"
 
 #, fuzzy, c-format
 msgid "Changelog unavailable for %s=%s"
 msgstr "%s (%s) 的 Changelog"
 

-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
-#, c-format
-msgid "Clean of %s is not supported"
-msgstr "%s 的 Clean (清理)不被支持"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "无法读取 %s 的状态。"
-

 #: apt-pkg/pkgcachegen.cc:112
 msgid "Cache has an incompatible versioning system"
 msgstr "软件包暂存区使用的是不兼容的版本控制系统"
 #: apt-pkg/pkgcachegen.cc:112
 msgid "Cache has an incompatible versioning system"
 msgstr "软件包暂存区使用的是不兼容的版本控制系统"


@@ -2284,44 +2261,50 @@ 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:1400 apt-pkg/pkgcachegen.cc:1526
-#: apt-pkg/pkgcachegen.cc:1552 apt-pkg/pkgcachegen.cc:1671
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681

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

-#: apt-pkg/pkgcachegen.cc:1471 apt-pkg/pkgcachegen.cc:1478
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497

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

-#: apt-pkg/pkgcachegen.cc:1570 apt-pkg/pkgcachegen.cc:1572
-#: apt-pkg/contrib/fileutl.cc:2151 cmdline/apt-extracttemplates.cc:263
-#, c-format
-msgid "Unable to write to %s"
-msgstr "无法写入 %s"
-
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+#: apt-pkg/acquire.cc:127 apt-pkg/acquire.cc:147 apt-pkg/cdrom.cc:833

 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "软件包列表的目录 %spartial 缺失。"
 
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "软件包列表的目录 %spartial 缺失。"
 

-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#: apt-pkg/acquire.cc:130 apt-pkg/acquire.cc:152

 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "仓库目录 %spartial 确实。"
 
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "仓库目录 %spartial 确实。"
 

-#: apt-pkg/acquire.cc:162
+#: apt-pkg/acquire.cc:163

 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "无法对目录 %s 加锁"
 
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "无法对目录 %s 加锁"
 

+#: apt-pkg/acquire.cc:500
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc:618 apt-pkg/clean.cc:39
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr "%s 的 Clean (清理)不被支持"
+

 #. only show the ETA if it makes sense
 #. two days
 #. only show the ETA if it makes sense
 #. two days

-#: apt-pkg/acquire.cc:1081
+#: apt-pkg/acquire.cc:1146

 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
 
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
 

-#: apt-pkg/acquire.cc:1083
+#: apt-pkg/acquire.cc:1148

 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "正在下载第 %li 个文件，共 %li 个"
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "正在下载第 %li 个文件，共 %li 个"


@@ -2341,6 +2324,11 @@ msgstr "部分索引文件下载失败。如果忽略它们，那将转而使用
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
 
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
 

+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "无法读取 %s 的状态。"
+

 #: apt-pkg/policy.cc:77
 #, c-format
 msgid ""
 #: apt-pkg/policy.cc:77
 #, c-format
 msgid ""


@@ -2368,7 +2356,7 @@ msgstr ""
 msgid "No priority (or zero) specified for pin"
 msgstr "没有为版本锁定指定优先级(或为零)"
 
 msgid "No priority (or zero) specified for pin"
 msgstr "没有为版本锁定指定优先级(或为零)"
 

-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:983
+#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018

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


@@ -2377,12 +2365,12 @@ msgstr ""
 "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
 "(%d)"
 
 "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
 "(%d)"
 

-#: apt-pkg/packagemanager.cc:562 apt-pkg/packagemanager.cc:592
+#: apt-pkg/packagemanager.cc:589 apt-pkg/packagemanager.cc:627

 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "无法配置 %s。"
 
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "无法配置 %s。"
 

-#: apt-pkg/packagemanager.cc:642
+#: apt-pkg/packagemanager.cc:677

 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "


@@ -2475,10 +2463,6 @@ 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/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
-msgid "Calculating upgrade"
-msgstr "正在对升级进行计算"
-

 #: apt-pkg/algorithms.cc:263
 #, c-format
 msgid ""
 #: apt-pkg/algorithms.cc:263
 #, c-format
 msgid ""


@@ -2519,6 +2503,11 @@ msgstr "外部solver出错，错误信息不恰当"
 msgid "Execute external solver"
 msgstr "执行外部solver"
 
 msgid "Execute external solver"
 msgstr "执行外部solver"
 

+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "不支持索引文件类型“%s”"
+

 #: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
 #, c-format
 msgid "Unable to parse package file %s (%d)"
 #: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
 #, c-format
 msgid "Unable to parse package file %s (%d)"


@@ -2530,123 +2519,304 @@ msgid "Cannot convert %s to integer"
 msgstr ""
 
 #. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
 msgstr ""
 
 #. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports

-#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
-#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
-#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
-#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
-#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
-#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
-#: apt-pkg/sourcelist.cc:251
+#: apt-pkg/sourcelist.cc:140 apt-pkg/sourcelist.cc:147
+#: apt-pkg/sourcelist.cc:150 apt-pkg/sourcelist.cc:158
+#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:209
+#: apt-pkg/sourcelist.cc:212 apt-pkg/sourcelist.cc:223
+#: apt-pkg/sourcelist.cc:229 apt-pkg/sourcelist.cc:232
+#: apt-pkg/sourcelist.cc:245 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:250 apt-pkg/sourcelist.cc:256
+#: apt-pkg/sourcelist.cc:263

 #, fuzzy, c-format
 msgid "Malformed entry %u in %s file %s (%s)"
 msgstr "override 文件 %s 第 %llu (%s) 行的格式有误"
 
 #, fuzzy, c-format
 msgid "Malformed entry %u in %s file %s (%s)"
 msgstr "override 文件 %s 第 %llu (%s) 行的格式有误"
 

-#: apt-pkg/sourcelist.cc:355
+#: apt-pkg/sourcelist.cc:367

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

-#: apt-pkg/sourcelist.cc:389
+#: apt-pkg/sourcelist.cc:401

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

 #, 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:413 apt-pkg/sourcelist.cc:419
+#: apt-pkg/sourcelist.cc:425 apt-pkg/sourcelist.cc:431

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

-#: apt-pkg/sourcelist.cc:429
+#: apt-pkg/sourcelist.cc:441

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

-#: apt-pkg/cacheset.cc:500
+#: apt-pkg/cacheset.cc:492

 #, 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:503
+#: apt-pkg/cacheset.cc:495

 #, 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:738
+#: apt-pkg/cacheset.cc:730

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

-#: apt-pkg/cacheset.cc:744
+#: apt-pkg/cacheset.cc:736

 #, 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:750
+#: apt-pkg/cacheset.cc:742

 #, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "无法按照 glob ‘%s’ 找到任何软件包"
 
 #, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "无法按照 glob ‘%s’ 找到任何软件包"
 

-#: apt-pkg/cacheset.cc:789
+#: apt-pkg/cacheset.cc:781

 #, 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:828
+#: apt-pkg/cacheset.cc:820

 #, 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:836
+#: apt-pkg/cacheset.cc:828

 #, 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:844
+#: apt-pkg/cacheset.cc:836

 #, 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 没有安装，无法选择它的已安装版本"
 

-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
+#: apt-pkg/cacheset.cc:844 apt-pkg/cacheset.cc:852

 #, 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 没有已安装或候选的版本，无法进行选择"
 

-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc:215

 #, c-format
 #, c-format

-msgid "%lid %lih %limin %lis"
-msgstr "%li天 %li小时 %li分 %li秒"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""

 
 

-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc:234

 #, c-format
 #, c-format

-msgid "%lih %limin %lis"
-msgstr "%li小时 %li分 %li秒"
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""

 
 

-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
+#: apt-pkg/deb/debmetaindex.cc:314

 #, c-format
 #, c-format

-msgid "%limin %lis"
-msgstr "%li分 %li秒"
+msgid "Unable to parse Release file %s"
+msgstr "无法解析软件包仓库 Release 文件 %s"

 
 

-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
+#: apt-pkg/deb/debmetaindex.cc:323

 #, c-format
 #, c-format

-msgid "%lis"
-msgstr "%li秒"
+msgid "No sections in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"

 
 

-#: apt-pkg/contrib/strutl.cc:1279
+#: apt-pkg/deb/debmetaindex.cc:363

 #, c-format
 #, c-format

-msgid "Selection %s not found"
-msgstr "找不到您选则的 %s"
+msgid "No Hash entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
+
+#: apt-pkg/deb/debmetaindex.cc:371
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
+
+#: apt-pkg/deb/debmetaindex.cc:392
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
+
+#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
+#: apt-pkg/deb/debmetaindex.cc:521 apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:537 apt-pkg/deb/debmetaindex.cc:545
+#: apt-pkg/deb/debmetaindex.cc:568
+#, c-format
+msgid "Conflicting values set for option %s concerning source %s %s"
+msgstr ""
+
+#: apt-pkg/deb/debmetaindex.cc:563
+#, c-format
+msgid "Invalid value set for option %s concerning source %s %s (%s)"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:110
+#, c-format
+msgid "Installing %s"
+msgstr "正在安装 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Configuring %s"
+msgstr "正在配置 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Removing %s"
+msgstr "正在删除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113
+#, c-format
+msgid "Completely removing %s"
+msgstr "完全删除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "注意到 %s 已经消失"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "执行安装后执行的触发器 %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:838
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "目录 %s 缺失"
+
+#: apt-pkg/deb/dpkgpm.cc:853 apt-pkg/deb/dpkgpm.cc:875
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "无法打开文件 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1000
+#, c-format
+msgid "Preparing %s"
+msgstr "正在准备 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Unpacking %s"
+msgstr "正在解压缩 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1006
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "正在准备配置 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Installed %s"
+msgstr "已安装 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1013
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "正在准备 %s 的删除操作"
+
+#: apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removed %s"
+msgstr "已删除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1020
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "正在准备完全删除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Completely removed %s"
+msgstr "完全删除了 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#, c-format
+msgid "Can not write log (%s)"
+msgstr "无法写入日志 (%s)"
+
+#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+msgid "Is /dev/pts mounted?"
+msgstr "/dev/pts 挂载了吗？"
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "操作在完成之前被打断"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+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:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "依赖问题 - 保持未配置"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+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:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr "错误信息显示本地系统有一些问题，因此没有写入 apport 报告"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"
+
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:107
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg 被中断，您必须手工运行 ‘%s’ 解决此问题。"
+
+#: apt-pkg/deb/debsystem.cc:125
+msgid "Not locked"
+msgstr "未锁定"

 
 #: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 
 #: apt-pkg/contrib/fileutl.cc:197
 #, c-format


@@ -2724,7 +2894,7 @@ msgstr "无法打开文件 %s"
 msgid "Could not open file descriptor %d"
 msgstr "无法打开文件描述符 %d"
 
 msgid "Could not open file descriptor %d"
 msgstr "无法打开文件描述符 %d"
 

-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2176
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2204

 msgid "Failed to create subprocess IPC"
 msgstr "无法创建子进程的 IPC 管道"
 
 msgid "Failed to create subprocess IPC"
 msgstr "无法创建子进程的 IPC 管道"
 


@@ -2747,25 +2917,30 @@ msgstr "还剩 %llu 字节没有写入，但无法写入操作"
 msgid "Problem closing the file %s"
 msgstr "关闭文件 %s 出错"
 
 msgid "Problem closing the file %s"
 msgstr "关闭文件 %s 出错"
 

-#: apt-pkg/contrib/fileutl.cc:2019
+#: apt-pkg/contrib/fileutl.cc:2020

 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "重命名文件 %s 为 %s 出错"
 
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "重命名文件 %s 为 %s 出错"
 

-#: apt-pkg/contrib/fileutl.cc:2030
+#: apt-pkg/contrib/fileutl.cc:2031

 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "用 unlink 删除文件 %s 出错"
 
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "用 unlink 删除文件 %s 出错"
 

-#: apt-pkg/contrib/fileutl.cc:2043
+#: apt-pkg/contrib/fileutl.cc:2044

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

-#: apt-pkg/contrib/fileutl.cc:2146 cmdline/apt-extracttemplates.cc:258
+#: apt-pkg/contrib/fileutl.cc:2174 cmdline/apt-extracttemplates.cc:258

 #, c-format
 msgid "Unable to mkstemp %s"
 msgstr "无法建立临时文件(mkstemp) %s "
 
 #, c-format
 msgid "Unable to mkstemp %s"
 msgstr "无法建立临时文件(mkstemp) %s "
 

+#: apt-pkg/contrib/fileutl.cc:2179 cmdline/apt-extracttemplates.cc:263
+#, c-format
+msgid "Unable to write to %s"
+msgstr "无法写入 %s"
+

 #: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Error!"
 #: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Error!"


@@ -2786,6 +2961,35 @@ msgstr "..."
 msgid "%c%s... %u%%"
 msgstr "%c%s... %u%%"
 
 msgid "%c%s... %u%%"
 msgstr "%c%s... %u%%"
 

+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li天 %li小时 %li分 %li秒"
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li小时 %li分 %li秒"
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
+#, c-format
+msgid "%limin %lis"
+msgstr "%li分 %li秒"
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
+#, c-format
+msgid "%lis"
+msgstr "%li秒"
+
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "找不到您选则的 %s"
+

 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "无法 mmap 一个空文件"
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "无法 mmap 一个空文件"


@@ -2952,200 +3156,6 @@ msgstr "不能识别参数 %s，请用 true 或 false"
 msgid "Invalid operation %s"
 msgstr "无效的操作 %s"
 
 msgid "Invalid operation %s"
 msgstr "无效的操作 %s"
 

-#: apt-pkg/deb/debmetaindex.cc:229
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "无法解析软件包仓库 Release 文件 %s"
-
-#: apt-pkg/deb/debmetaindex.cc:238
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-
-#: apt-pkg/deb/debmetaindex.cc:278
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-
-#: apt-pkg/deb/debmetaindex.cc:286
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
-
-#: apt-pkg/deb/debmetaindex.cc:307
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
-
-#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
-#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
-#: apt-pkg/deb/debmetaindex.cc:485
-#, c-format
-msgid "Conflicting values set for option %s concerning source %s %s"
-msgstr ""
-
-#: apt-pkg/deb/debmetaindex.cc:480
-#, c-format
-msgid "Invalid value set for option %s concerning source %s %s (%s)"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Installing %s"
-msgstr "正在安装 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1007
-#, c-format
-msgid "Configuring %s"
-msgstr "正在配置 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1014
-#, c-format
-msgid "Removing %s"
-msgstr "正在删除 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:113
-#, c-format
-msgid "Completely removing %s"
-msgstr "完全删除 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:114
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "注意到 %s 已经消失"
-
-#: apt-pkg/deb/dpkgpm.cc:115
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "执行安装后执行的触发器 %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:838
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "目录 %s 缺失"
-
-#: apt-pkg/deb/dpkgpm.cc:853 apt-pkg/deb/dpkgpm.cc:875
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "无法打开文件 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1000
-#, c-format
-msgid "Preparing %s"
-msgstr "正在准备 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1001
-#, c-format
-msgid "Unpacking %s"
-msgstr "正在解压缩 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1006
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "正在准备配置 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1008
-#, c-format
-msgid "Installed %s"
-msgstr "已安装 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1013
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "正在准备 %s 的删除操作"
-
-#: apt-pkg/deb/dpkgpm.cc:1015
-#, c-format
-msgid "Removed %s"
-msgstr "已删除 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1020
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "正在准备完全删除 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1021
-#, c-format
-msgid "Completely removed %s"
-msgstr "完全删除了 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
-#, c-format
-msgid "Can not write log (%s)"
-msgstr "无法写入日志 (%s)"
-
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
-msgid "Is /dev/pts mounted?"
-msgstr "/dev/pts 挂载了吗？"
-
-#: apt-pkg/deb/dpkgpm.cc:1656
-msgid "Operation was interrupted before it could finish"
-msgstr "操作在完成之前被打断"
-
-#: apt-pkg/deb/dpkgpm.cc:1718
-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:1723
-msgid "dependency problems - leaving unconfigured"
-msgstr "依赖问题 - 保持未配置"
-
-#: apt-pkg/deb/dpkgpm.cc:1725
-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:1731
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
-
-#: apt-pkg/deb/dpkgpm.cc:1738
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
-
-#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr "错误信息显示本地系统有一些问题，因此没有写入 apport 报告"
-
-#: apt-pkg/deb/dpkgpm.cc:1773
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"
-
-#: apt-pkg/deb/debsystem.cc:88
-#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"
-
-#: apt-pkg/deb/debsystem.cc:91
-#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:107
-#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg 被中断，您必须手工运行 ‘%s’ 解决此问题。"
-
-#: apt-pkg/deb/debsystem.cc:125
-msgid "Not locked"
-msgstr "未锁定"
-

 #: cmdline/apt-extracttemplates.cc:228
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 #: cmdline/apt-extracttemplates.cc:228
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"


@@ -3327,87 +3337,87 @@ msgstr "归档文件没有包含控制字段"
 msgid "Unable to get a cursor"
 msgstr "无法获得游标"
 
 msgid "Unable to get a cursor"
 msgstr "无法获得游标"
 

-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:106

 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "警告：无法读取目录 %s\n"
 
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "警告：无法读取目录 %s\n"
 

-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:111

 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "警告：无法获得 %s 的状态\n"
 
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "警告：无法获得 %s 的状态\n"
 

-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:167

 msgid "E: "
 msgstr "错误："
 
 msgid "E: "
 msgstr "错误："
 

-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:169

 msgid "W: "
 msgstr "警告："
 
 msgid "W: "
 msgstr "警告："
 

-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:176

 msgid "E: Errors apply to file "
 msgstr "错误：处理文件时出错 "
 
 msgid "E: Errors apply to file "
 msgstr "错误：处理文件时出错 "
 

-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:194 ftparchive/writer.cc:226

 #, c-format
 msgid "Failed to resolve %s"
 msgstr "无法解析 %s"
 
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "无法解析 %s"
 

-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:207

 msgid "Tree walking failed"
 msgstr "无法遍历目录树"
 
 msgid "Tree walking failed"
 msgstr "无法遍历目录树"
 

-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:234

 #, c-format
 msgid "Failed to open %s"
 msgstr "无法打开 %s"
 
 #, c-format
 msgid "Failed to open %s"
 msgstr "无法打开 %s"
 

-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:293

 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 

-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:301

 #, c-format
 msgid "Failed to readlink %s"
 msgstr "无法读取符号链接 %s"
 
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "无法读取符号链接 %s"
 

-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:305

 #, c-format
 msgid "Failed to unlink %s"
 msgstr "无法使用 unlink 删除 %s"
 
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "无法使用 unlink 删除 %s"
 

-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:313

 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** 无法将 %s 链接到 %s"
 
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** 无法将 %s 链接到 %s"
 

-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:323

 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " 达到了 DeLink 的上限 %sB。\n"
 
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " 达到了 DeLink 的上限 %sB。\n"
 

-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc:428

 msgid "Archive had no package field"
 msgstr "归档文件没有包含 package 字段"
 
 msgid "Archive had no package field"
 msgstr "归档文件没有包含 package 字段"
 

-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:436 ftparchive/writer.cc:700

 #, 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:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:503 ftparchive/writer.cc:857

 #, 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:712
+#: ftparchive/writer.cc:714

 #, 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:716
+#: ftparchive/writer.cc:718

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


@@ -3674,27 +3684,34 @@ msgstr "归档文件太短"
 msgid "Failed to read the archive headers"
 msgstr "无法读取归档文件的数据头"
 
 msgid "Failed to read the archive headers"
 msgstr "无法读取归档文件的数据头"
 

-#: apt-inst/contrib/extracttar.cc:123
-msgid "Failed to create pipes"
-msgstr "无法创建管道"
-
-#: apt-inst/contrib/extracttar.cc:150
-msgid "Failed to exec gzip "
-msgstr "无法执行 gzip"
+#: apt-inst/contrib/extracttar.cc:110
+#, fuzzy, c-format
+msgid "Cannot find a configured compressor for '%s'"
+msgstr "无法找到认证记录：%s"

 
 

-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:142 apt-inst/contrib/extracttar.cc:172

 msgid "Corrupted archive"
 msgstr "包文件已被损坏"
 
 msgid "Corrupted archive"
 msgstr "包文件已被损坏"
 

-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:157

 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar 的校验和不符，文件已损坏"
 
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar 的校验和不符，文件已损坏"
 

-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:262

 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "未知的 TAR 数据头类型 %u，成员 %s"
 
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "未知的 TAR 数据头类型 %u，成员 %s"
 

+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "必须指定至少一对URL或者文件名"
+
+#~ msgid "Failed to create pipes"
+#~ msgstr "无法创建管道"
+
+#~ msgid "Failed to exec gzip "
+#~ msgstr "无法执行 gzip"
+

 #~ msgid "%s %s for %s compiled on %s %s\n"
 #~ msgstr "%s %s，用于 %s 体系结构，编译于 %s %s\n"
 
 #~ msgid "%s %s for %s compiled on %s %s\n"
 #~ msgstr "%s %s，用于 %s 体系结构，编译于 %s %s\n"