Release 1.9.0 to experimental1.9.0

1 files changed, 168 insertions, 179 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index f7800af8a..c4fc1b498 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.7.x\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-02-04 15:34+0100\n"
+"POT-Creation-Date: 2019-06-17 11:37+0200\n"
 "PO-Revision-Date: 2019-01-12 00:00+0000\n"
 "Last-Translator: Mo Zhou <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -22,176 +22,6 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.0.8\n"
 
-#: apt-inst/contrib/arfile.cc
-msgid "Invalid archive signature"
-msgstr "无效的归档签名"
-
-#: apt-inst/contrib/arfile.cc
-msgid "Error reading archive member header"
-msgstr "读取归档成员文件头出错"
-
-#: apt-inst/contrib/arfile.cc
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "归档文件中成员文件头 %s 无效"
-
-#: apt-inst/contrib/arfile.cc
-msgid "Invalid archive member header"
-msgstr "归档文件中成员文件头无效"
-
-#: apt-inst/contrib/arfile.cc
-msgid "Archive is too short"
-msgstr "归档文件太短"
-
-#: apt-inst/contrib/arfile.cc
-msgid "Failed to read the archive headers"
-msgstr "无法读取归档文件的数据头"
-
-#: apt-inst/contrib/extracttar.cc
-#, c-format
-msgid "Cannot find a configured compressor for '%s'"
-msgstr "找不到对应于 '%s' 的已配置压缩工具"
-
-#: apt-inst/contrib/extracttar.cc
-msgid "Corrupted archive"
-msgstr "包文件已被损坏"
-
-#: apt-inst/contrib/extracttar.cc
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar 的校验和不符，文件已损坏"
-
-#: apt-inst/contrib/extracttar.cc
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "未知的 TAR 数据头类型 %u，成员 %s"
-
-#: apt-inst/deb/debfile.cc
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
-
-#: apt-inst/deb/debfile.cc
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "内部错误，无法定位包内文件 %s"
-
-#: apt-inst/deb/debfile.cc
-msgid "Unparsable control file"
-msgstr "不能解析的主控文件"
-
-#: apt-inst/dirstream.cc
-#, c-format
-msgid "Failed to write file %s"
-msgstr "无法写入文件 %s"
-
-#: apt-inst/dirstream.cc
-#, c-format
-msgid "Failed to close file %s"
-msgstr "无法关闭文件 %s"
-
-#: apt-inst/extract.cc
-#, c-format
-msgid "The path %s is too long"
-msgstr "路径名 %s 太长"
-
-#: apt-inst/extract.cc
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr "%s 被解压了不只一次"
-
-#: apt-inst/extract.cc
-#, c-format
-msgid "The directory %s is diverted"
-msgstr "目录 %s 已被转移"
-
-#: apt-inst/extract.cc
-#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "该软件包正尝试写入转移对象 %s/%s"
-
-#: apt-inst/extract.cc
-msgid "The diversion path is too long"
-msgstr "该转移路径太长"
-
-#: apt-inst/extract.cc apt-pkg/acquire-item.cc ftparchive/cachedb.cc
-#: methods/rred.cc
-#, c-format
-msgid "Failed to stat %s"
-msgstr "无法获得 %s 的状态"
-
-#: apt-inst/extract.cc ftparchive/multicompress.cc
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "无法将 %s 重命名为 %s"
-
-#: apt-inst/extract.cc
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "目录 %s 要被一个非目录的文件替换"
-
-#: apt-inst/extract.cc
-msgid "Failed to locate node in its hash bucket"
-msgstr "无法在其散列桶中分配节点"
-
-#: apt-inst/extract.cc
-msgid "The path is too long"
-msgstr "路径名太长"
-
-#: apt-inst/extract.cc
-#, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "用来覆盖的软件包不属于 %s 的任何版本"
-
-#: apt-inst/extract.cc
-#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
-
-#. Only warn if there are no sources.list.d.
-#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
-#: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
-#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc
-#, c-format
-msgid "Unable to read %s"
-msgstr "无法读取 %s"
-
-#: apt-inst/extract.cc
-#, c-format
-msgid "Unable to stat %s"
-msgstr "无法读取 %s 的状态"
-
-#: apt-inst/filelist.cc
-msgid "DropNode called on still linked node"
-msgstr "把 DropNode 用在了仍在链表中的节点上"
-
-#: apt-inst/filelist.cc
-msgid "Failed to locate the hash element!"
-msgstr "无法定位哈希表元素！"
-
-#: apt-inst/filelist.cc
-msgid "Failed to allocate diversion"
-msgstr "无法分配转移项"
-
-#: apt-inst/filelist.cc
-msgid "Internal error in AddDiversion"
-msgstr "内部错误，出现在 AddDiversion"
-
-#: apt-inst/filelist.cc
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s"
-
-#: apt-inst/filelist.cc
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "添加了两个转移项 %s-> %s"
-
-#: apt-inst/filelist.cc
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "重复的配置文件 %s/%s"
-
 #: apt-pkg/acquire-item.cc
 msgid ""
 "Updating from such a repository can't be done securely, and is therefore "
@@ -248,6 +78,11 @@ msgstr "仓库 '%s' 只提供了低强度的安全信息。"
 msgid "Failed to readlink %s"
 msgstr "无法读取符号链接 %s"
 
+#: apt-pkg/acquire-item.cc ftparchive/cachedb.cc methods/rred.cc
+#, c-format
+msgid "Failed to stat %s"
+msgstr "无法获得 %s 的状态"
+
 #: apt-pkg/acquire-item.cc
 msgid "Hash Sum mismatch"
 msgstr "Hash 校验和不符"
@@ -475,6 +310,15 @@ msgstr "由于文件'%s'无法被用户'%s'访问，已脱离沙盒并提权为�
 msgid "Clean of %s is not supported"
 msgstr "%s 的 Clean (清理)不被支持"
 
+#. Only warn if there are no sources.list.d.
+#. Only warn if there is no sources.list file.
+#: apt-pkg/acquire.cc apt-pkg/clean.cc apt-pkg/contrib/cdromutl.cc
+#: apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc apt-pkg/init.cc
+#: apt-pkg/policy.cc apt-pkg/sourcelist.cc
+#, c-format
+msgid "Unable to read %s"
+msgstr "无法读取 %s"
+
 #: apt-pkg/acquire.cc
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
@@ -663,14 +507,34 @@ msgstr "对应于该盘片的软件源设置项是：\n"
 
 #: apt-pkg/clean.cc
 #, c-format
-msgid "Unable to change to %s"
-msgstr "无法切换工作目录到 %s"
-
-#: apt-pkg/clean.cc
-#, c-format
 msgid "Unable to stat %s."
 msgstr "无法读取 %s 的状态。"
 
+#: apt-pkg/contrib/arfile.cc
+msgid "Invalid archive signature"
+msgstr "无效的归档签名"
+
+#: apt-pkg/contrib/arfile.cc
+msgid "Error reading archive member header"
+msgstr "读取归档成员文件头出错"
+
+#: apt-pkg/contrib/arfile.cc
+#, c-format
+msgid "Invalid archive member header %s"
+msgstr "归档文件中成员文件头 %s 无效"
+
+#: apt-pkg/contrib/arfile.cc
+msgid "Invalid archive member header"
+msgstr "归档文件中成员文件头无效"
+
+#: apt-pkg/contrib/arfile.cc
+msgid "Archive is too short"
+msgstr "归档文件太短"
+
+#: apt-pkg/contrib/arfile.cc
+msgid "Failed to read the archive headers"
+msgstr "无法读取归档文件的数据头"
+
 #: apt-pkg/contrib/cdromutl.cc
 #, c-format
 msgid "Unable to stat the mount point %s"
@@ -779,6 +643,24 @@ msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数"
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"
 
+#: apt-pkg/contrib/extracttar.cc
+#, c-format
+msgid "Cannot find a configured compressor for '%s'"
+msgstr "找不到对应于 '%s' 的已配置压缩工具"
+
+#: apt-pkg/contrib/extracttar.cc
+msgid "Corrupted archive"
+msgstr "包文件已被损坏"
+
+#: apt-pkg/contrib/extracttar.cc
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar 的校验和不符，文件已损坏"
+
+#: apt-pkg/contrib/extracttar.cc
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "未知的 TAR 数据头类型 %u，成员 %s"
+
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Problem unlinking the file %s"
@@ -1022,6 +904,26 @@ msgstr "%li秒"
 msgid "Selection %s not found"
 msgstr "找不到您选则的 %s"
 
+#: apt-pkg/deb/debfile.cc
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
+
+#: apt-pkg/deb/debfile.cc
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "内部错误，无法定位包内文件 %s"
+
+#: apt-pkg/deb/debfile.cc
+msgid "Unparsable control file"
+msgstr "不能解析的主控文件"
+
+#: apt-pkg/deb/debindexfile.cc
+#, fuzzy, c-format
+#| msgid "Could not get lock %s"
+msgid "Could not read meta data from %s"
+msgstr "无法获得锁 %s"
+
 #. 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
@@ -1275,6 +1177,16 @@ msgstr "无法打开状态文件 %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "无法写入临时状态文件 %s"
 
+#: apt-pkg/dirstream.cc
+#, c-format
+msgid "Failed to write file %s"
+msgstr "无法写入文件 %s"
+
+#: apt-pkg/dirstream.cc
+#, c-format
+msgid "Failed to close file %s"
+msgstr "无法关闭文件 %s"
+
 #: apt-pkg/edsp.cc
 msgid "Send scenario to solver"
 msgstr "向依赖解决器发送情景"
@@ -2435,6 +2347,12 @@ msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个
 
 #: apt-private/private-source.cc
 #, c-format
+msgid ""
+"Invalid operator '%c' at offset %d, did you mean '%c%c' or '%c='? - in: %s"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
 msgid "Note, using directory '%s' to get the build dependencies\n"
 msgstr "注意，正使用 '%s' 目录下载编译依赖\n"
 
@@ -2786,6 +2704,12 @@ msgid "Configure build-dependencies for source packages"
 msgstr "为源码包配置所需的编译依赖关系"
 
 #: cmdline/apt-get.cc
+#, fuzzy
+#| msgid "Building dependency tree"
+msgid "Satisfy dependency strings"
+msgstr "正在分析软件包的依赖关系树"
+
+#: cmdline/apt-get.cc
 msgid "Erase downloaded archive files"
 msgstr "删除所有已下载的包文件"
 
@@ -3083,6 +3007,12 @@ msgstr "通过 卸载/安装/升级 来更新系统"
 msgid "edit the source information file"
 msgstr "编辑软件源信息文件"
 
+#: cmdline/apt.cc
+#, fuzzy
+#| msgid "Failed to satisfy %s dependency for %s: %s"
+msgid "satisfy dependency strings"
+msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
+
 #: dselect/install
 msgid "Bad default setting!"
 msgstr "错误的默认设置！"
@@ -3300,6 +3230,11 @@ msgstr "无法对子进程或文件进行读写"
 msgid "Failed to read while computing MD5"
 msgstr "在计算 MD5 校验和时无法读取数据"
 
+#: ftparchive/multicompress.cc
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "无法将 %s 重命名为 %s"
+
 #: ftparchive/override.cc
 #, c-format
 msgid "Unable to open %s"
@@ -3792,6 +3727,63 @@ msgstr "连接被永久关闭"
 msgid "Empty files can't be valid archives"
 msgstr "空文件不是有效归档"
 
+#~ msgid "The path %s is too long"
+#~ msgstr "路径名 %s 太长"
+
+#~ msgid "Unpacking %s more than once"
+#~ msgstr "%s 被解压了不只一次"
+
+#~ msgid "The directory %s is diverted"
+#~ msgstr "目录 %s 已被转移"
+
+#~ msgid "The package is trying to write to the diversion target %s/%s"
+#~ msgstr "该软件包正尝试写入转移对象 %s/%s"
+
+#~ msgid "The diversion path is too long"
+#~ msgstr "该转移路径太长"
+
+#~ msgid "The directory %s is being replaced by a non-directory"
+#~ msgstr "目录 %s 要被一个非目录的文件替换"
+
+#~ msgid "Failed to locate node in its hash bucket"
+#~ msgstr "无法在其散列桶中分配节点"
+
+#~ msgid "The path is too long"
+#~ msgstr "路径名太长"
+
+#~ msgid "Overwrite package match with no version for %s"
+#~ msgstr "用来覆盖的软件包不属于 %s 的任何版本"
+
+#~ msgid "File %s/%s overwrites the one in the package %s"
+#~ msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
+
+#~ msgid "Unable to stat %s"
+#~ msgstr "无法读取 %s 的状态"
+
+#~ msgid "DropNode called on still linked node"
+#~ msgstr "把 DropNode 用在了仍在链表中的节点上"
+
+#~ msgid "Failed to locate the hash element!"
+#~ msgstr "无法定位哈希表元素！"
+
+#~ msgid "Failed to allocate diversion"
+#~ msgstr "无法分配转移项"
+
+#~ msgid "Internal error in AddDiversion"
+#~ msgstr "内部错误，出现在 AddDiversion"
+
+#~ msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+#~ msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s"
+
+#~ msgid "Double add of diversion %s -> %s"
+#~ msgstr "添加了两个转移项 %s-> %s"
+
+#~ msgid "Duplicate conf file %s/%s"
+#~ msgstr "重复的配置文件 %s/%s"
+
+#~ msgid "Unable to change to %s"
+#~ msgstr "无法切换工作目录到 %s"
+
 #~ msgid "Removed %s"
 #~ msgstr "已删除 %s"
 
@@ -3871,9 +3863,6 @@ msgstr "空文件不是有效归档"
 #~ "candidate version"
 #~ msgstr "软件包 %3$s 没有可用的候选版本，因此 %2$s 的 %1$s 依赖无法满足"
 
-#~ msgid "Failed to satisfy %s dependency for %s: %s"
-#~ msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
-
 #~ msgid "Build-dependencies for %s could not be satisfied."
 #~ msgstr "不能满足软件包 %s 所要求的构建依赖关系。"