Merging upstream version 1.22.7.

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

1 files changed, 253 insertions, 177 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a1e8949..74bf30e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.21.20\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2024-03-10 20:20+0100\n"
+"POT-Creation-Date: 2024-07-17 01:09+0200\n"
 "PO-Revision-Date: 2023-01-27 15:39-0500\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -361,131 +361,6 @@ msgstr "无效的压缩等级 %d"
 msgid "unknown compression strategy"
 msgstr "未知的压缩策略"
 
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid ""
-"updates directory contains file '%.250s' whose name is too long (length=%d, "
-"max=%d)"
-msgstr "更新目录中包含文件 %.250s，其文件名过长（长度为 %d，最大为 %d）"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid ""
-"updates directory contains files with different length names (both %d and %d)"
-msgstr "更新目录中的文件长度名称不一致（分别为 %d 和 %d）"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "cannot create the dpkg updates directory %s"
-msgstr "无法创建 dpkg 更新目录 %s"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "cannot scan updates directory '%.255s'"
-msgstr "无法扫描更新目录 %.255s"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "failed to remove incorporated update file %.255s"
-msgstr "删除合并后的更新文件 %.255s 失败"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to fill %.250s with padding"
-msgstr "无法补齐 %.250s"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to flush %.250s after padding"
-msgstr "无法在补齐后清空 %.250s"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to seek to start of %.250s after padding"
-msgstr "补齐后无法找到 %.250s 的起始位置"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to check lock file for dpkg database directory %s"
-msgstr "无法检查 dpkg 数据库目录 '%s' 的锁文件"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open/create dpkg frontend lock for directory %s"
-msgstr "无法为目录 '%s' 打开或创建 dpkg 前端锁"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open/create dpkg database lock file for directory %s"
-msgstr "无法为目录 '%s' 打开或创建 dpkg 锁文件"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "you do not have permission to lock the dpkg database directory %s"
-msgstr "您没有锁定 dpkg 数据库目录 '%s' 的权限"
-
-#: lib/dpkg/dbmodify.c
-msgid "dpkg frontend lock"
-msgstr "dpkg 前端锁"
-
-#: lib/dpkg/dbmodify.c
-msgid "dpkg database lock"
-msgstr "dpkg 数据库锁"
-
-#: lib/dpkg/dbmodify.c
-msgid "requested operation requires superuser privilege"
-msgstr "所请求的操作需要超级用户权限"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "cannot create the dpkg database directory %s"
-msgstr "无法创建 dpkg 数据库目录 %s"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to access the dpkg database directory %s"
-msgstr "无法访问 dpkg 数据库目录 %s"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "required read/write access to the dpkg database directory %s"
-msgstr "需要对于 dpkg 数据库目录 %s 的读/写权限"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "failed to remove my own update file %.255s"
-msgstr "删除自身的更新文件 %.255s 时失败"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to write updated status of '%.250s'"
-msgstr "无法写入 %.250s 的新状态"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to flush updated status of '%.250s'"
-msgstr "无法刷新 %.250s 的新状态"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to truncate for updated status of '%.250s'"
-msgstr "无法截断 %.250s 的新状态"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to fsync updated status of '%.250s'"
-msgstr "无法同步 %.250s 的新状态"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to close updated status of '%.250s'"
-msgstr "无法关闭 %.250s 的新状态"
-
-#: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to install updated status of '%.250s'"
-msgstr "无法安装 %.250s 的新状态"
-
 #: lib/dpkg/db-ctrl-access.c
 #, c-format
 msgid "unable to check existence of '%.250s'"
@@ -551,20 +426,22 @@ msgid "loading control file '%s' for package '%s'"
 msgstr "正在读取软件包 '%2$s' 的 '%1$s' 控制文件"
 
 #: lib/dpkg/db-fsys-divert.c
-msgid "failed to open diversions file"
-msgstr "无法打开转移文件"
-
-#: lib/dpkg/db-fsys-divert.c
-msgid "failed to fstat diversions file"
-msgstr "无法 fstat 转移文件"
-
-#: lib/dpkg/db-fsys-divert.c
 #, c-format
 msgid "conflicting diversions involving '%.250s' or '%.250s'"
 msgstr "转移项间存在着冲突关系， %.250s 和 %.250s 中只能取其一"
 
 #: lib/dpkg/db-fsys-files.c
 #, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "软件包 %.250s 的文件列表缺少最后结尾的换行符"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "软件包 %.250s 的文件列表含有空的文件名"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
 msgid "loading files list file for package '%s'"
 msgstr "正在载入软件包 %s 的文件列表"
 
@@ -578,16 +455,6 @@ msgstr ""
 "里"
 
 #: lib/dpkg/db-fsys-files.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "软件包 %.250s 的文件列表缺少最后结尾的换行符"
-
-#: lib/dpkg/db-fsys-files.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "软件包 %.250s 的文件列表含有空的文件名"
-
-#: lib/dpkg/db-fsys-files.c
 msgid "(Reading database ... "
 msgstr "(正在读取数据库 ... "
 
@@ -597,6 +464,18 @@ msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] "系统当前共安装有 %d 个文件和目录。)\n"
 
+#: lib/dpkg/db-fsys-load.c
+#, fuzzy, c-format
+#| msgid "cannot open %s"
+msgid "cannot open %s file"
+msgstr "无法打开 %s"
+
+#: lib/dpkg/db-fsys-load.c
+#, fuzzy, c-format
+#| msgid "unable to get file '%s%s' metadata"
+msgid "cannot get %s file metadata"
+msgstr "无法获取文件 '%s%s' 的元数据"
+
 #: lib/dpkg/db-fsys-override.c
 #, c-format
 msgid "invalid statoverride uid %s"
@@ -613,14 +492,6 @@ msgid "invalid statoverride mode %s"
 msgstr "无效的 statoverride 权限位(mode) %s"
 
 #: lib/dpkg/db-fsys-override.c
-msgid "failed to open statoverride file"
-msgstr "无法打开 statoverride 文件"
-
-#: lib/dpkg/db-fsys-override.c
-msgid "failed to fstat statoverride file"
-msgstr "无法 fstat statoverride 文件"
-
-#: lib/dpkg/db-fsys-override.c
 #, c-format
 msgid "reading statoverride file '%.250s'"
 msgstr "读取 statoverride 文件 '%.250s'"
@@ -668,6 +539,131 @@ msgstr ""
 msgid "multiple statoverrides present for file '%.250s'"
 msgstr "存在多个 statoverride 用于文件  %.250s"
 
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid ""
+"updates directory contains file '%.250s' whose name is too long (length=%d, "
+"max=%d)"
+msgstr "更新目录中包含文件 %.250s，其文件名过长（长度为 %d，最大为 %d）"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid ""
+"updates directory contains files with different length names (both %d and %d)"
+msgstr "更新目录中的文件长度名称不一致（分别为 %d 和 %d）"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "cannot create the dpkg updates directory %s"
+msgstr "无法创建 dpkg 更新目录 %s"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "cannot scan updates directory '%.255s'"
+msgstr "无法扫描更新目录 %.255s"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "failed to remove incorporated update file %.255s"
+msgstr "删除合并后的更新文件 %.255s 失败"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to fill %.250s with padding"
+msgstr "无法补齐 %.250s"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to flush %.250s after padding"
+msgstr "无法在补齐后清空 %.250s"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to seek to start of %.250s after padding"
+msgstr "补齐后无法找到 %.250s 的起始位置"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "无法检查 dpkg 数据库目录 '%s' 的锁文件"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to open/create dpkg frontend lock for directory %s"
+msgstr "无法为目录 '%s' 打开或创建 dpkg 前端锁"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "无法为目录 '%s' 打开或创建 dpkg 锁文件"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "you do not have permission to lock the dpkg database directory %s"
+msgstr "您没有锁定 dpkg 数据库目录 '%s' 的权限"
+
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr "dpkg 前端锁"
+
+#: lib/dpkg/dbmodify.c
+msgid "dpkg database lock"
+msgstr "dpkg 数据库锁"
+
+#: lib/dpkg/dbmodify.c
+msgid "requested operation requires superuser privilege"
+msgstr "所请求的操作需要超级用户权限"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "cannot create the dpkg database directory %s"
+msgstr "无法创建 dpkg 数据库目录 %s"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to access the dpkg database directory %s"
+msgstr "无法访问 dpkg 数据库目录 %s"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "required read/write access to the dpkg database directory %s"
+msgstr "需要对于 dpkg 数据库目录 %s 的读/写权限"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "failed to remove my own update file %.255s"
+msgstr "删除自身的更新文件 %.255s 时失败"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to write updated status of '%.250s'"
+msgstr "无法写入 %.250s 的新状态"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to flush updated status of '%.250s'"
+msgstr "无法刷新 %.250s 的新状态"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to truncate for updated status of '%.250s'"
+msgstr "无法截断 %.250s 的新状态"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to fsync updated status of '%.250s'"
+msgstr "无法同步 %.250s 的新状态"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to close updated status of '%.250s'"
+msgstr "无法关闭 %.250s 的新状态"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to install updated status of '%.250s'"
+msgstr "无法安装 %.250s 的新状态"
+
 #: lib/dpkg/deb-version.c
 msgid "format version with too big major component"
 msgstr "格式版本的主版本部分过大"
@@ -1069,15 +1065,26 @@ msgstr ""
 "%s"
 
 #: lib/dpkg/file.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s was locked by another process with pid %d\n"
+#| "%s"
 msgid ""
-"%s was locked by another process with pid %d\n"
+"%s was locked by %s process with pid %d\n"
 "%s"
 msgstr ""
 "%s 已被另一个 pid 为 %d 的进程加锁\n"
 "%s"
 
 #: lib/dpkg/file.c
+#, fuzzy
+#| msgctxt "architecture"
+#| msgid "<unknown>"
+msgctxt "process"
+msgid "<unknown>"
+msgstr "<未知>"
+
+#: lib/dpkg/file.c
 #, c-format
 msgid "cannot open file %s"
 msgstr "无法打开文件 %s"
@@ -2007,11 +2014,11 @@ msgstr ""
 "【警告】- 使用标记有 [!] 的选项会严重破坏您的安装。\n"
 "标记有 [*] 的强制选项默认为开启。\n"
 
-#: src/common/force.c src/deb/build.c src/deb/extract.c src/deb/info.c
-#: src/deb/main.c src/split/info.c src/split/main.c src/split/queue.c
-#: src/divert/main.c src/statoverride/main.c src/trigger/main.c
-#: src/query/main.c src/main/archives.c src/main/enquiry.c src/main/main.c
-#: src/main/packages.c src/main/select.c src/main/verify.c
+#: src/common/force.c src/realpath/main.c src/deb/build.c src/deb/extract.c
+#: src/deb/info.c src/deb/main.c src/split/info.c src/split/main.c
+#: src/split/queue.c src/divert/main.c src/statoverride/main.c
+#: src/trigger/main.c src/query/main.c src/main/archives.c src/main/enquiry.c
+#: src/main/main.c src/main/packages.c src/main/select.c src/main/verify.c
 msgid "<standard output>"
 msgstr "<标准输出>"
 
@@ -2053,6 +2060,79 @@ msgstr "无法获得安全标签句柄"
 msgid "cannot set security context for file object '%s'"
 msgstr "无法为文件对象 '%s' 设置安全上下文"
 
+#: src/realpath/main.c
+#, fuzzy
+#| msgid "Type dpkg-trigger --help for help about this utility."
+msgid "Use --help for help about this utility."
+msgstr "输入 'dpkg-trigger --help' 以获取此功能的帮助信息。"
+
+#: src/realpath/main.c src/divert/main.c src/statoverride/main.c
+#, c-format
+msgid "Debian %s version %s.\n"
+msgstr "Debian %s 版本 %s。\n"
+
+#: src/realpath/main.c src/deb/main.c src/split/main.c src/divert/main.c
+#: src/statoverride/main.c src/trigger/main.c src/query/main.c src/main/main.c
+#: utils/update-alternatives.c
+#, c-format
+msgid ""
+"This is free software; see the GNU General Public License version 2 or\n"
+"later for copying conditions. There is NO warranty.\n"
+msgstr ""
+"本软件是自由软件；要获知复制该软件的条件，请参阅 GNU 公共许可证\n"
+"第二版或其更新的版本。本软件【不】提供任何担保。\n"
+
+#: src/realpath/main.c
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option>...] <command>\n"
+#| "\n"
+msgid ""
+"Usage: %s [<option>...] <pathname>\n"
+"\n"
+msgstr ""
+"用法：%s [<选项>...] <命令>\n"
+"\n"
+
+#: src/realpath/main.c
+#, c-format
+msgid ""
+"Options:\n"
+"  -z, --zero                   end output line with NUL, not newline.\n"
+"      --instdir <directory>    set the root directory.\n"
+"      --root <directory>       set the root directory.\n"
+"      --version                show the version.\n"
+"      --help                   show this help message.\n"
+"\n"
+msgstr ""
+
+#: src/realpath/main.c
+msgid "too many levels of symbolic links"
+msgstr ""
+
+#: src/realpath/main.c
+#, fuzzy, c-format
+#| msgid "cannot read %s"
+msgid "cannot read link '%s'"
+msgstr "无法读取 %s"
+
+#: src/realpath/main.c
+#, fuzzy, c-format
+#| msgid "symbolic link '%.250s' size has changed from %jd to %zd"
+msgid "symbolic link '%s' size has changed from %jd to %zd"
+msgstr "符号链接 '%.250s' 尺寸从 %jd 变更至 %zd"
+
+#: src/realpath/main.c
+#, fuzzy
+#| msgid "--%s needs a single argument"
+msgid "need a pathname argument"
+msgstr "--%s 需要一个参数"
+
+#: src/realpath/main.c
+#, c-format
+msgid "link '%s' includes root prefix '%s'"
+msgstr ""
+
 #: src/deb/build.c
 #, c-format
 msgid "failed to write filename to tar pipe (%s)"
@@ -2536,17 +2616,6 @@ msgstr "--%s 需要且仅需一个参数"
 msgid "Debian '%s' package archive backend version %s.\n"
 msgstr "Debian %s 软件包后端打包程序 %s 版。\n"
 
-#: src/deb/main.c src/split/main.c src/divert/main.c src/statoverride/main.c
-#: src/trigger/main.c src/query/main.c src/main/main.c
-#: utils/update-alternatives.c
-#, c-format
-msgid ""
-"This is free software; see the GNU General Public License version 2 or\n"
-"later for copying conditions. There is NO warranty.\n"
-msgstr ""
-"本软件是自由软件；要获知复制该软件的条件，请参阅 GNU 公共许可证\n"
-"第二版或其更新的版本。本软件【不】提供任何担保。\n"
-
 #: src/deb/main.c src/divert/main.c src/query/main.c src/main/main.c
 #, c-format
 msgid ""
@@ -3251,11 +3320,6 @@ msgstr "--split 需要至多一个原始文件，以及目标文件的文件名�
 msgid "Use --help for help about diverting files."
 msgstr "使用 --help 查看关于转移文件的帮助。"
 
-#: src/divert/main.c src/statoverride/main.c
-#, c-format
-msgid "Debian %s version %s.\n"
-msgstr "Debian %s 版本 %s。\n"
-
 #: src/divert/main.c
 #, c-format
 msgid ""
@@ -4000,8 +4064,8 @@ msgstr "conffile '%s' 已标记为升级时移除，但在软件包中提供"
 #: src/main/archives.c
 #, c-format
 msgid ""
-"trying to overwrite '%.250s', which is the diverted version of "
-"'%.250s' (package: %.100s)"
+"trying to overwrite '%.250s', which is the diverted version of '%.250s' "
+"(package: %.100s)"
 msgstr "正在尝试覆盖 %.250s，它是 %.250s 的转移版本(软件包：%.100s)"
 
 #: src/main/archives.c
@@ -6755,6 +6819,18 @@ msgstr "运行 update-alternatives 工具以修改系统可选项的选择情况
 msgid "Authentication is required to run update-alternatives"
 msgstr "需要认证后才能执行 update-alternatives"
 
+#~ msgid "failed to open diversions file"
+#~ msgstr "无法打开转移文件"
+
+#~ msgid "failed to fstat diversions file"
+#~ msgstr "无法 fstat 转移文件"
+
+#~ msgid "failed to open statoverride file"
+#~ msgstr "无法打开 statoverride 文件"
+
+#~ msgid "failed to fstat statoverride file"
+#~ msgstr "无法 fstat statoverride 文件"
+
 #, c-format
 #~ msgid "There is only one alternative in link group %s (providing %s): %s"
 #~ msgstr "链接组 %s (提供 %s)中只有一个候选项：%s"