From 12b56b9cdc0b7028817504fdce8a60c61069d077 Mon Sep 17 00:00:00 2001 From: desert-sailor Date: Thu, 30 Mar 2023 10:59:08 +0800 Subject: [PATCH] =?UTF-8?q?bugfix=20for=20issue:I6QI18=20nmcli=20device=20?= =?UTF-8?q?connect=20=E6=89=93=E5=8D=B0=E5=86=85=E5=AE=B9=E6=9C=89?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NetworkManager.spec | 9 ++++++- ...orrect-info-for-nmcli-device-connect.patch | 25 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 bugfix-correct-info-for-nmcli-device-connect.patch diff --git a/NetworkManager.spec b/NetworkManager.spec index 25d58a7..9fcf415 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -50,7 +50,7 @@ Name: NetworkManager Version: 1.32.12 Epoch: 1 -Release: 17 +Release: 18 Summary: Network Link Manager and User Applications License: GPLv2+ URL: https://networkmanager.dev/ @@ -69,6 +69,7 @@ Patch6003: backport-libnm-fix-warning-when-setting-wrong-ethtool-ternary- Patch6004: fix-minor-written-mistake.patch Patch6005: NetworkManager-Add-sw64-architecture.patch Patch6006: delete-lease-file-when-connection-deleted.patch +Patch6007: bugfix-correct-info-for-nmcli-device-connect.patch BuildRequires: gcc libtool pkgconfig automake autoconf intltool gettext-devel ppp-devel gnutls-devel BuildRequires: dbus-devel dbus-glib-devel glib2-devel gobject-introspection-devel jansson-devel @@ -489,6 +490,12 @@ fi %{_datadir}/gtk-doc/html/NetworkManager/* %changelog +* Thu Mar 30 2023 Dongxing Wang - 1:1.32.12-18 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:correct the info for nmcli device connect + * Mon Mar 20 2023 sunsuwan - 1:1.32.12-17 - Type:bugfix - CVE:NA diff --git a/bugfix-correct-info-for-nmcli-device-connect.patch b/bugfix-correct-info-for-nmcli-device-connect.patch new file mode 100644 index 0000000..8e3662d --- /dev/null +++ b/bugfix-correct-info-for-nmcli-device-connect.patch @@ -0,0 +1,25 @@ +From 50ffde33c10ad5c536857bcdfcd815b9a25b9de7 Mon Sep 17 00:00:00 2001 +From: desert-sailor +Date: Thu, 30 Mar 2023 15:24:14 +0800 +Subject: [PATCH] bugfix for incorrect translations + +--- + po/zh_CN.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 6df2d6a..de279f8 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -12456,7 +12456,7 @@ msgstr "错误：超时时间 %d 秒已到。" + #: ../src/nmcli/devices.c:2076 + #, c-format + msgid "Device '%s' successfully activated with '%s'.\n" +-msgstr "成功用 \"%s%s\" 激活了设备 \"\"。\n" ++msgstr "设备 \"%s\" 成功以 \"%s\" 激活。\n" + + #: ../src/nmcli/devices.c:2082 + #, c-format +-- +2.33.0 + -- Gitee