Merging upstream version 2.9.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 92 insertions, 80 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 536a0c6..04de20b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,14 +10,14 @@
 # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.
 # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
 # Mo Zhou <cdluminate@gmail.com>, 2014, 2015, 2016, 2017, 2019.
-# Boyuan Yang <073plan@gmail.com>, 2018, 2020, 2022.
+# Boyuan Yang <073plan@gmail.com>, 2018, 2020, 2022, 2024.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.5.3\n"
+"Project-Id-Version: apt 2.9.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-04-14 16:52+0000\n"
-"PO-Revision-Date: 2022-10-05 17:20-0400\n"
+"POT-Creation-Date: 2024-04-22 17:39+0000\n"
+"PO-Revision-Date: 2024-04-16 13:15-0400\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
 "Language: zh_CN\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.1.1\n"
+"X-Generator: Poedit 2.4.3\n"
 
 #: apt-pkg/acquire-item.cc
 msgid ""
@@ -229,6 +229,13 @@ msgstr "无法下载 %s  %s"
 #: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
+"Repositories should provide a clear-signed InRelease file, but none found at "
+"%s."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
@@ -642,6 +649,30 @@ msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数"
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"
 
+#. TRANSLATOR: This is a warning level displayed before the message
+#: apt-pkg/contrib/error.cc
+msgid "Error:"
+msgstr ""
+
+#. TRANSLATOR: This is a warning level displayed before the message
+#: apt-pkg/contrib/error.cc
+msgid "Warning:"
+msgstr ""
+
+#. TRANSLATOR: This is a warning level displayed before the message
+#: apt-pkg/contrib/error.cc
+msgid "Notice:"
+msgstr ""
+
+#: apt-pkg/contrib/error.cc
+msgid "Audit:"
+msgstr ""
+
+#. TRANSLATOR: This is a warning level displayed before the message
+#: apt-pkg/contrib/error.cc
+msgid "Debug:"
+msgstr ""
+
 #: apt-pkg/contrib/extracttar.cc
 #, c-format
 msgid "Cannot find a configured compressor for '%s'"
@@ -772,7 +803,7 @@ msgstr "无法创建子进程的 IPC 管道"
 
 #: apt-pkg/contrib/fileutl.cc
 msgid "Failed to exec compressor "
-msgstr "无法执行压缩程序"
+msgstr "无法执行压缩程序 "
 
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
@@ -811,7 +842,7 @@ msgstr "同步文件出错"
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "Unable to mkstemp %s"
-msgstr "无法建立临时文件(mkstemp) %s "
+msgstr "无法建立临时文件(mkstemp) %s"
 
 #: apt-pkg/contrib/fileutl.cc
 #, c-format
@@ -838,7 +869,7 @@ msgstr "无法关闭 mmap"
 
 #: apt-pkg/contrib/mmap.cc
 msgid "Unable to synchronize mmap"
-msgstr "无法同步 mmap "
+msgstr "无法同步 mmap"
 
 #: apt-pkg/contrib/mmap.cc
 #, c-format
@@ -1151,7 +1182,7 @@ msgstr "操作在完成之前被打断"
 
 #: apt-pkg/deb/dpkgpm.cc
 msgid "No apport report written because MaxReports is reached already"
-msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。"
+msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告"
 
 #. check if its not a follow up error
 #: apt-pkg/deb/dpkgpm.cc
@@ -1168,13 +1199,13 @@ msgstr "因为错误消息指示这是由于上一个问题导致的错误，没
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
-msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
+msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告"
 
 #: apt-pkg/deb/dpkgpm.cc
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
-msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
+msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告"
 
 #: apt-pkg/deb/dpkgpm.cc
 msgid ""
@@ -1185,7 +1216,7 @@ msgstr "错误信息显示本地系统有一些问题，因此没有写入 appor
 #: apt-pkg/deb/dpkgpm.cc
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
-msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"
+msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告"
 
 #: apt-pkg/depcache.cc
 msgid "Building dependency tree"
@@ -1649,7 +1680,7 @@ msgstr "虚拟软件包 %s 由下面的软件包提供：\n"
 
 #: apt-private/private-cacheset.cc
 msgid " [Installed]"
-msgstr "[已安装]"
+msgstr " [已安装]"
 
 #: apt-private/private-cacheset.cc
 msgid " [Not candidate version]"
@@ -1811,13 +1842,14 @@ msgid ""
 "Unmerged usr is no longer supported, use usrmerge to convert to a merged-usr "
 "system."
 msgstr ""
+"系统 usr 未合并的布局已不再受到支持。请使用 usrmerge 工具将系统转换为 merged-"
+"usr 布局。"
 
 #. TRANSLATORS: %s is a url to a page describing merged-usr (bookworm release notes)
 #: apt-private/private-install.cc
-#, fuzzy, c-format
-#| msgid "Selected %s for removal.\n"
+#, c-format
 msgid "See %s for more details."
-msgstr "选中 %s 以待卸载。\n"
+msgstr "更多细节请参阅 %s。"
 
 #: apt-private/private-install.cc
 msgid ""
@@ -1863,10 +1895,9 @@ msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr "怪了……文件大小不符，请发邮件给 apt@packages.debian.org 吧"
 
 #: apt-private/private-install.cc
-#, fuzzy, c-format
-#| msgid "Download Failed"
+#, c-format
 msgid "  Download size: %sB / %sB\n"
-msgstr "下载失败"
+msgstr "  下载大小：%sB / %sB\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
@@ -1876,10 +1907,9 @@ msgid "Need to get %sB/%sB of archives.\n"
 msgstr "需要下载 %sB/%sB 的归档。\n"
 
 #: apt-private/private-install.cc
-#, fuzzy, c-format
-#| msgid "Download Failed"
+#, c-format
 msgid "  Download size: %sB\n"
-msgstr "下载失败"
+msgstr "  下载大小：%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
@@ -1898,14 +1928,14 @@ msgstr "解压缩后会消耗 %sB 的额外空间。\n"
 #: apt-private/private-install.cc
 #, c-format
 msgid "Space needed: %sB / %sB available\n"
-msgstr ""
+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
 #: apt-private/private-install.cc
 #, c-format
 msgid "More space needed than available: %sB > %sB, installation may fail"
-msgstr ""
+msgstr "所需的空间超出了可用空间：%sB > %sB，安装可能失败"
 
 #. 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 -
@@ -1915,7 +1945,7 @@ msgstr ""
 #: apt-private/private-install.cc
 #, c-format
 msgid "in %s:  %sB / %sB available\n"
-msgstr ""
+msgstr "在 %s 中：%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
@@ -1924,18 +1954,17 @@ msgstr ""
 #, c-format
 msgid ""
 "More space needed in %s than available: %sB > %sB, installation may fail"
-msgstr ""
+msgstr "在 %s 中，所需的空间超出了可用空间：%sB > %sB，安装可能失败"
 
 #: apt-private/private-install.cc
 #, c-format
 msgid "Space needed: %sB\n"
-msgstr ""
+msgstr "所需的空间：%sB\n"
 
 #: apt-private/private-install.cc
-#, fuzzy, c-format
-#| msgid "Stored label: %s\n"
+#, c-format
 msgid "  Freed space: %sB\n"
-msgstr "已归档文件的标签：%s\n"
+msgstr "  将释放的空间：%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
@@ -1956,11 +1985,11 @@ msgstr "不允许移除系统必需的关键软件包。这么做可能损坏系
 
 #: apt-private/private-install.cc
 msgid "Continue anyway?"
-msgstr ""
+msgstr "仍然继续吗？"
 
 #: apt-private/private-install.cc
 msgid "Continue?"
-msgstr ""
+msgstr "是否继续？"
 
 #: apt-private/private-install.cc cmdline/apt-mark.cc
 msgid "Do you want to continue?"
@@ -2018,6 +2047,12 @@ msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部错误，自动卸载工具坏事了"
 
 #: apt-private/private-install.cc
+#, c-format
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] "使用'%s'来卸载它(它们)。"
+
+#: apt-private/private-install.cc
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -2033,12 +2068,6 @@ msgid_plural ""
 msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
 
 #: apt-private/private-install.cc
-#, c-format
-msgid "Use '%s' to remove it."
-msgid_plural "Use '%s' to remove them."
-msgstr[0] "使用'%s'来卸载它(它们)。"
-
-#: apt-private/private-install.cc
 msgid "Suggested packages:"
 msgstr "建议安装："
 
@@ -2179,50 +2208,40 @@ msgid "The following packages have unmet dependencies:"
 msgstr "下列软件包有未满足的依赖关系："
 
 #: apt-private/private-output.cc
-#, fuzzy
-#| msgid "satisfy dependency strings"
 msgid "Unsatisfied dependencies:"
-msgstr "使系统满足依赖关系字符串"
+msgstr "无法满足的依赖关系："
 
 #: apt-private/private-output.cc
 msgid "The following NEW packages will be installed:"
 msgstr "下列【新】软件包将被安装："
 
 #: apt-private/private-output.cc
-#, fuzzy
-#| msgid "Installing %s"
 msgid "Installing:"
-msgstr "正在安装 %s"
+msgstr "将要安装："
 
 #: apt-private/private-output.cc
-#, fuzzy
-#| msgid "Total dependencies: "
 msgid "Installing dependencies:"
-msgstr "按依赖关系共计："
+msgstr "将要安装的依赖："
 
 #: apt-private/private-output.cc
 msgid "REMOVING:"
-msgstr ""
+msgstr "【将要卸载】："
 
 #: apt-private/private-output.cc
 msgid "The following packages will be REMOVED:"
 msgstr "下列软件包将被【卸载】："
 
 #: apt-private/private-output.cc
-#, fuzzy
-#| msgid "The following packages have been kept back:"
 msgid "The following upgrades have been deferred due to phasing:"
-msgstr "下列软件包的版本将保持不变："
+msgstr "下列软件包新版本的升级因阶段更新而被推迟："
 
 #: apt-private/private-output.cc
-#, fuzzy
-#| msgid "The following packages have been kept back:"
 msgid "Not upgrading yet due to phasing:"
-msgstr "下列软件包的版本将保持不变："
+msgstr "因阶段更新暂不升级："
 
 #: apt-private/private-output.cc
 msgid "Not upgrading:"
-msgstr ""
+msgstr "暂不升级："
 
 #: apt-private/private-output.cc
 msgid "The following packages have been kept back:"
@@ -2234,21 +2253,19 @@ msgstr "下列软件包将被升级："
 
 #: apt-private/private-output.cc
 msgid "Upgrading:"
-msgstr ""
+msgstr "将被升级："
 
 #: apt-private/private-output.cc
 msgid "DOWNGRADING:"
-msgstr ""
+msgstr "【将被降级】："
 
 #: apt-private/private-output.cc
 msgid "The following packages will be DOWNGRADED:"
 msgstr "下列软件包将被【降级】："
 
 #: apt-private/private-output.cc
-#, fuzzy
-#| msgid "Pinned packages:"
 msgid "Changing held packages:"
-msgstr "被锁定的软件包："
+msgstr "将改变原先被要求版本不变的软件包："
 
 #: apt-private/private-output.cc
 msgid "The following held packages will be changed:"
@@ -2269,7 +2286,7 @@ msgstr ""
 
 #: apt-private/private-output.cc
 msgid "Summary:"
-msgstr ""
+msgstr "摘要："
 
 #: apt-private/private-output.cc
 #, c-format
@@ -2277,10 +2294,9 @@ msgid "%lu upgraded, %lu newly installed, "
 msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
 
 #: apt-private/private-output.cc
-#, fuzzy, c-format
-#| msgid "Installing %s"
+#, c-format
 msgid "Upgrading: %lu, Installing: %lu, "
-msgstr "正在安装 %s"
+msgstr "升级：%lu，安装：%lu，"
 
 #: apt-private/private-output.cc
 #, c-format
@@ -2288,10 +2304,9 @@ msgid "%lu reinstalled, "
 msgstr "重新安装了 %lu 个软件包，"
 
 #: apt-private/private-output.cc
-#, fuzzy, c-format
-#| msgid "Installing %s"
+#, c-format
 msgid "Reinstalling: %lu, "
-msgstr "正在安装 %s"
+msgstr "重新安装：%lu，"
 
 #: apt-private/private-output.cc
 #, c-format
@@ -2301,7 +2316,7 @@ msgstr "降级了 %lu 个软件包，"
 #: apt-private/private-output.cc
 #, c-format
 msgid "Downgrading: %lu, "
-msgstr ""
+msgstr "降级：%lu，"
 
 #: apt-private/private-output.cc
 #, c-format
@@ -2311,7 +2326,7 @@ msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
 #: apt-private/private-output.cc
 #, c-format
 msgid "Removing: %lu, Not Upgrading: %lu\n"
-msgstr ""
+msgstr "卸载：%lu，不升级：%lu\n"
 
 #: apt-private/private-output.cc
 #, c-format
@@ -2580,7 +2595,7 @@ msgstr "您应当优先考虑使用 %s 而非直接把账户信息直接写在 %
 #: apt-private/private-update.cc
 #, c-format
 msgid "Missing Signed-By in the %s entry for '%s'"
-msgstr ""
+msgstr "对‘%2$s’在 %1$s 一项中缺失了 Signed-By"
 
 #: apt-private/private-update.cc
 #, c-format
@@ -3174,10 +3189,8 @@ msgid "remove packages"
 msgstr "移除软件包"
 
 #: cmdline/apt.cc
-#, fuzzy
-#| msgid "Remove automatically all unused packages"
 msgid "automatically remove all unused packages"
-msgstr "卸载所有自动安装且不再使用的软件包"
+msgstr "自动卸载所有不再使用的软件包"
 
 #. system wide stuff
 #: cmdline/apt.cc
@@ -3593,7 +3606,7 @@ msgid ""
 "cannot be used to add new CD-ROMs"
 msgstr ""
 "请使用 apt-cdrom，通过它可以让 APT 识别该盘片。apt-get update 不能被用来加入"
-"新的盘片。"
+"新的盘片"
 
 #: methods/cdrom.cc
 msgid "Wrong CD-ROM"
@@ -3641,7 +3654,7 @@ msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"
 #: methods/connect.cc
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "无法发起与 %s:%s (%s) 的连接"
+msgstr "无法发起与 %s:%s (%s) 的连接。"
 
 #: methods/connect.cc methods/ftp.cc methods/rsh.cc
 msgid "Failed"
@@ -3838,7 +3851,7 @@ msgstr "无法调用 "
 #: methods/gpgv.cc
 #, c-format
 msgid "untrusted public key algorithm: %s"
-msgstr ""
+msgstr "不受信任的公钥算法：%s"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
 #: methods/gpgv.cc
@@ -3875,10 +3888,9 @@ msgstr ""
 
 #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners.
 #: methods/gpgv.cc
-#, fuzzy, c-format
-#| msgid "Signature by key %s uses weak digest algorithm (%s)"
+#, c-format
 msgid "Signature by key %s uses weak algorithm (%s)"
-msgstr "密钥 %s 生成的数字签名使用了弱安全性摘要算法(%s)"
+msgstr "密钥 %s 生成的数字签名使用了弱安全性的算法（%s）"
 
 #: methods/gpgv.cc
 msgid "The following signatures were invalid:\n"
@@ -3904,7 +3916,7 @@ msgstr "写入文件出错"
 
 #: methods/http.cc
 msgid "Select failed"
-msgstr "select 调用出错"
+msgstr "Select 调用出错"
 
 #: methods/http.cc
 msgid "Connection timed out"