diff --git a/6001-Fix-Add-team-Chinese-translation.patch b/6001-Fix-Add-team-Chinese-translation.patch new file mode 100644 index 0000000..7f130bd --- /dev/null +++ b/6001-Fix-Add-team-Chinese-translation.patch @@ -0,0 +1,39 @@ +From 78f14332da6aee7c87027d6b18e9ac960ef25006 Mon Sep 17 00:00:00 2001 +From: wangshuo +Date: Thu, 15 Aug 2024 11:32:16 +0800 +Subject: [PATCH] Fix Add team Chinese translation + +--- + dist/networkmanager/po.zh_CN.js | 2 +- + po/zh_CN.po | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dist/networkmanager/po.zh_CN.js b/dist/networkmanager/po.zh_CN.js +index 1d31e70..b504f3b 100644 +--- a/dist/networkmanager/po.zh_CN.js ++++ b/dist/networkmanager/po.zh_CN.js +@@ -226,7 +226,7 @@ cockpit.locale({ + ], + "Add team": [ + null, +- "添加绑定" ++ "添加组合" + ], + "Add zone": [ + null, +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 13f2c6c..08ff14d 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -817,7 +817,7 @@ msgstr "添加系统服务到安全区域 $0" + + #: pkg/networkmanager/team.jsx:154 pkg/networkmanager/network-main.jsx:143 + msgid "Add team" +-msgstr "添加绑定" ++msgstr "添加组合" + + #: pkg/networkmanager/firewall.jsx:810 pkg/networkmanager/firewall.jsx:815 + msgid "Add zone" +-- +2.27.0 + diff --git a/cockpit.spec b/cockpit.spec index 04f571a..40be7a0 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -10,13 +10,14 @@ Name: cockpit Version: 309 -Release: 2 +Release: 3 Summary: A easy-to-use, integrated, glanceable, and open web-based interface for Linux servers License: LGPLv2+ URL: https://cockpit-project.org/ Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz Patch6000: backport-CVE-2024-6126.patch +Patch6001: 6001-Fix-Add-team-Chinese-translation.patch %define build_basic 1 %define build_optional 1 @@ -61,7 +62,12 @@ Recommends: polkit NetworkManager-team setroubleshoot-server >= 3.3.3 sscg > Recommends: udisks2-lvm2 >= 2.6 udisks2-iscsi >= 2.6 device-mapper-multipath clevis-luks virt-install %prep -%autosetup -n cockpit-%{version} -p1 +%setup -n cockpit-%{version} +%patch 6000 -p1 + +gzip -d ./dist/networkmanager/po.zh_CN.js.gz +%patch 6001 -p1 +gzip ./dist/networkmanager/po.zh_CN.js %build %configure \ @@ -323,6 +329,12 @@ fi %doc %{_mandir}/man8/{cockpit-ws.8.gz,remotectl.8.gz,pam_ssh_add.8.gz,cockpit-tls.8.gz} %changelog +* Thu Aug 15 2024 wangshuo - 309-3 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Fix Add team Chinese translation + * Thu Jul 04 2024 lingsheng - 309-2 - Type:CVE - ID:CVE-2024-6126