From 819abbc3412675ae9b77f08825cfbbff6ec92fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B2=82=E8=85=BE?= Date: Wed, 28 May 2025 10:17:43 +0800 Subject: [PATCH] upgrade zh_CN.po form zanata --- 0002-upgrade-zh_CN.po-form-zanata.patch | 219 ++++++++++++++++++++++++ libdnf.spec | 6 +- 2 files changed, 224 insertions(+), 1 deletion(-) create mode 100644 0002-upgrade-zh_CN.po-form-zanata.patch diff --git a/0002-upgrade-zh_CN.po-form-zanata.patch b/0002-upgrade-zh_CN.po-form-zanata.patch new file mode 100644 index 0000000..769eb84 --- /dev/null +++ b/0002-upgrade-zh_CN.po-form-zanata.patch @@ -0,0 +1,219 @@ +From 0e4ad5da75e020b6c6380214399c6f0059f62cf2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E5=BC=A0=E6=B2=82=E8=85=BE?= + +Date: Wed, 28 May 2025 10:47:04 +0800 +Subject: [PATCH] upgrade zh_CN.po form zanata + +--- + po/zh_CN.po | 52 ++++++++++++++++----------------- + 1 file changed, 26 insertions(+), 26 deletions(-) + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 787086b..90276dc 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -163,7 +163,7 @@ msgstr "没有可用的模块数据" + #: libdnf/dnf-context.cpp:3373 + #, c-format + msgid "Ignoring unneeded information in argument: '%s'" +-msgstr "忽略参数:\"%s\" 中不需要的信息" ++msgstr "忽略参数中不需要的信息:'%s'" + + #: libdnf/dnf-context.cpp:3411 + #, c-format +@@ -174,45 +174,45 @@ msgstr "为模块 '%1$s' 流 '%2$s' 启用依赖树时出现问题: %3$s" + + #: libdnf/dnf-context.cpp:3423 + msgid "Problems appeared for module enable request:" +-msgstr "" ++msgstr "模块启用请求出现问题:" + + #: libdnf/dnf-context.cpp:3518 + #, c-format + msgid "No active module packages found for module spec '%s'" +-msgstr "" ++msgstr "未找到模块规范 '%s' 的活动模块包" + + #: libdnf/dnf-context.cpp:3523 + #, fuzzy, c-format + #| msgid "cannot install both modules %s and %s" + msgid "Cannot install module '%s' from fail-safe repository" +-msgstr "无法同时安装模块 %s 和 %s" ++msgstr "无法从故障保护存储库安装模块 '%s'" + + #: libdnf/dnf-context.cpp:3530 + #, c-format + msgid "No profile found matching '%s'" +-msgstr "" ++msgstr "未找到匹配 '%s' 的配置文件" + + #: libdnf/dnf-context.cpp:3584 + #, c-format + msgid "No match for package '%s' for module spec %s" +-msgstr "" ++msgstr "没有匹配模块规范 %s 的包 '%s'" + + #: libdnf/dnf-context.cpp:3595 + #, c-format + msgid "Problem during install for module '%1$s' stream '%2$s': %3$s" +-msgstr "" ++msgstr "在安装模块 '%1$s' 流 '%2$s'时的问题:%3$s" + + #: libdnf/dnf-context.cpp:3604 + msgid "Problems appeared for module install request:" +-msgstr "" ++msgstr "模块安装请求出现问题:" + + #: libdnf/dnf-context.cpp:3663 + msgid "Problems appeared for module reset request:" +-msgstr "" ++msgstr "模块重置请求出现问题:" + + #: libdnf/dnf-context.cpp:3664 libdnf/dnf-context.cpp:3723 + msgid "Problems appeared for module disable request:" +-msgstr "" ++msgstr "模块禁用请求出现问题:" + + #: libdnf/dnf-context.cpp:3755 + #, c-format +@@ -316,7 +316,7 @@ msgstr "添加 solv 失败" + #: libdnf/dnf-sack.cpp:414 + #, c-format + msgid "no %1$s string for %2$s" +-msgstr "没有为 %2$s 的 %1$s 字符串" ++msgstr "没有 %2$s 的 %1$s 字符串" + + #: libdnf/dnf-sack.cpp:424 + #, c-format +@@ -354,7 +354,7 @@ msgstr "write_ext(%1$d) 已失败: %2$d" + + #: libdnf/dnf-sack.cpp:680 + msgid "null repo md file" +-msgstr "null repo md 文件" ++msgstr "null 存储库 md 文件" + + #: libdnf/dnf-sack.cpp:689 + #, c-format +@@ -423,7 +423,7 @@ msgstr "在尝试确保软件包 %s 时源没有设置" + #: libdnf/dnf-transaction.cpp:326 + #, c-format + msgid "Failed to ensure %1$s as repo %2$s not found(%3$i repos loaded)" +-msgstr "无法确保 %1$s,因为 repo %2$s 没有找到 (%3$i repos 已加载)" ++msgstr "无法确保 %1$s,因为存储库 %2$s 没有找到 (%3$i 存储库已加载)" + + #: libdnf/dnf-transaction.cpp:367 + msgid "Failed to check untrusted: " +@@ -437,7 +437,7 @@ msgstr "没有找到下载的文件 %s" + #: libdnf/dnf-transaction.cpp:397 + #, c-format + msgid "package %1$s cannot be verified and repo %2$s is GPG enabled: %3$s" +-msgstr "软件包 %1$s 不能被验证,repo %2$s 启用了 GPG: %3$s" ++msgstr "软件包 %1$s 不能被验证,存储库 %2$s 启用了 GPG: %3$s" + + #: libdnf/dnf-transaction.cpp:831 libdnf/dnf-transaction.cpp:903 + msgid "Failed to get value for CacheDir" +@@ -470,7 +470,7 @@ msgstr "错误 %i 运行事务测试" + #: libdnf/dnf-transaction.cpp:1456 + #, c-format + msgid "Error %i running transaction" +-msgstr "错误 %i 运行事务" ++msgstr "运行事务时错误 %i" + + #: libdnf/dnf-transaction.cpp:1472 + #, c-format +@@ -773,7 +773,7 @@ msgstr "无法为模块 '%s' 启用多个流" + #: libdnf/module/ModulePackageContainer.cpp:346 + #, c-format + msgid "Conflicting defaults with repo '%s': %s" +-msgstr "默认设置与 repo '%s' 冲突 : %s" ++msgstr "默认设置与存储库 '%s' 冲突 : %s" + + #: libdnf/module/ModulePackageContainer.cpp:917 + msgid "Installing module profiles:\n" +@@ -822,7 +822,7 @@ msgstr "无法把模块 Fail Safe 数据保存到 '%s'" + #: libdnf/module/ModulePackageContainer.cpp:1830 + #, c-format + msgid "Unable to remove a modular Fail Safe data in '%s'" +-msgstr "无法删除 '%s' 处的模块 Fail Safe 数据" ++msgstr "无法删除 '%s' 中的模块 Fail Safe 数据" + + #: libdnf/module/ModulePackageContainer.cpp:1862 + #, c-format +@@ -919,7 +919,7 @@ msgstr "仓库 '%s' 有不被支持的类型: 'type=%s', 忽略。" + #: libdnf/repo/Repo.cpp:1400 + #, c-format + msgid "repo '%s': 'basecachedir' is not set" +-msgstr "Repo '%s': 'basecachedir' 没有设置" ++msgstr "存储库 '%s': 'basecachedir' 没有设置" + + #: libdnf/repo/Repo.cpp:512 + msgid "" +@@ -930,7 +930,7 @@ msgstr "最大下载速度低于最小值。请修改 minrate 或 throttle 的 + #: libdnf/repo/Repo.cpp:546 + #, c-format + msgid "repo '%s': 'proxy_username' is set but not 'proxy_password'" +-msgstr "Repo '%s': 'proxy_username' 已被设置,但没有设置 'proxy_password'" ++msgstr "存储库 '%s': 'proxy_username' 已被设置,但没有设置 'proxy_password'" + + #: libdnf/repo/Repo.cpp:548 + msgid "'proxy_username' is set but not 'proxy_password'" +@@ -939,7 +939,7 @@ msgstr "'proxy_username' 已被设置,但没有设置 'proxy_password'" + #: libdnf/repo/Repo.cpp:629 + #, c-format + msgid "Cannot find a valid baseurl for repo: %s" +-msgstr "无法为仓库 %s 找到一个有效的 baseurl" ++msgstr "无法为存储库找到一个有效的 baseurl:%s" + + #: libdnf/repo/Repo.cpp:660 libdnf/repo/Repo.cpp:682 + #, c-format +@@ -975,7 +975,7 @@ msgstr "为仓库 '%s' 获取 GPG 密钥失败 : %s" + #: libdnf/repo/Repo.cpp:890 + #, c-format + msgid "repo %s: 0x%s already imported" +-msgstr "repo %s: 0x%s 已被导入" ++msgstr "存储库 %s: 0x%s 已被导入" + + #: libdnf/repo/Repo.cpp:904 libdnf/utils/filesystem.cpp:79 + #, c-format +@@ -985,7 +985,7 @@ msgstr "无法创建目录 \"%s\": %d - %s" + #: libdnf/repo/Repo.cpp:924 + #, c-format + msgid "repo %s: imported key 0x%s." +-msgstr "repo %s: 已导入密钥 0x%s。" ++msgstr "存储库 %s: 已导入密钥 0x%s。" + + #: libdnf/repo/Repo.cpp:1176 + #, c-format +@@ -1035,17 +1035,17 @@ msgstr "无法把目录 \"%s\" 重命名为 \"%s\": %s" + #: libdnf/repo/Repo.cpp:1339 + #, c-format + msgid "repo: using cache for: %s" +-msgstr "仓库: 正在为 %s 使用缓存" ++msgstr "存储库:使用缓存用于:%s" + + #: libdnf/repo/Repo.cpp:1351 + #, c-format + msgid "Cache-only enabled but no cache for '%s'" +-msgstr "仅使用缓存已开启但没有 '%s' 的缓存" ++msgstr "仅启用缓存,但没有 '%s' 的缓存" + + #: libdnf/repo/Repo.cpp:1355 + #, c-format + msgid "repo: downloading from remote: %s" +-msgstr "repo: 从远程下载: %s" ++msgstr "存储库: 从远程下载: %s" + + #: libdnf/repo/Repo.cpp:1362 + #, c-format +@@ -1108,7 +1108,7 @@ msgstr "数据库损坏:表 'config' 中没有 'version' 行" + + #: libdnf/transaction/Transformer.cpp:681 + msgid "Transformer: can't open history persist dir" +-msgstr "Transformer: 无法打开 history persist dir" ++msgstr "转换程序: 无法打开历史持久目录" + + #: libdnf/transaction/Transformer.cpp:694 + msgid "Couldn't find a history database" +-- +2.43.0 + diff --git a/libdnf.spec b/libdnf.spec index ca00832..a4fc415 100644 --- a/libdnf.spec +++ b/libdnf.spec @@ -18,7 +18,7 @@ Name: libdnf Version: 0.70.2 -Release: 7 +Release: 8 Summary: Library providing simplified C and Python API to libsolv License: LGPL-2.1-or-later URL: https://github.com/rpm-software-management/libdnf @@ -54,6 +54,7 @@ Patch6008: backport-MergedTransaction-Fix-invalid-memory-access- Patch6009: backport-Fix-countme-bucket-calculation.patch Patch6010: backport-Fix-up-some-comments-in-addCountmeFlag.patch Patch6011: backport-Fix-a-memory-leak-in-glob_for_cachedir.patch +Patch6012: 0002-upgrade-zh_CN.po-form-zanata.patch %description A Library providing simplified C and Python API to libsolv. @@ -124,6 +125,9 @@ Python 3 bindings for the hawkey library. %{python3_sitearch}/hawkey/ %changelog +* Wed May 28 2025 Yiteng Zhang - 0.70.2-8 +- upgrade zh_CN.po from zanata + * Mon Nov 11 2024 Funda Wang - 0.70.2-7 - adopt to new cmake macro -- Gitee