!152 fix issue:I6QI18 nmcli device connect 打印内容有误

From: @desert-sailor 
Reviewed-by: @robertxw, @gebidelidaye 
Signed-off-by: @gebidelidaye
This commit is contained in:
openeuler-ci-bot 2023-04-03 06:11:22 +00:00 committed by Gitee
commit 46b0224553
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 33 additions and 1 deletions

View File

@ -50,7 +50,7 @@
Name: NetworkManager Name: NetworkManager
Version: 1.32.12 Version: 1.32.12
Epoch: 1 Epoch: 1
Release: 17 Release: 18
Summary: Network Link Manager and User Applications Summary: Network Link Manager and User Applications
License: GPLv2+ License: GPLv2+
URL: https://networkmanager.dev/ URL: https://networkmanager.dev/
@ -69,6 +69,7 @@ Patch6003: backport-libnm-fix-warning-when-setting-wrong-ethtool-ternary-
Patch6004: fix-minor-written-mistake.patch Patch6004: fix-minor-written-mistake.patch
Patch6005: NetworkManager-Add-sw64-architecture.patch Patch6005: NetworkManager-Add-sw64-architecture.patch
Patch6006: delete-lease-file-when-connection-deleted.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: 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 BuildRequires: dbus-devel dbus-glib-devel glib2-devel gobject-introspection-devel jansson-devel
@ -489,6 +490,12 @@ fi
%{_datadir}/gtk-doc/html/NetworkManager/* %{_datadir}/gtk-doc/html/NetworkManager/*
%changelog %changelog
* Thu Mar 30 2023 Dongxing Wang <dxwangk@isoftstone.com> - 1:1.32.12-18
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:correct the info for nmcli device connect
* Mon Mar 20 2023 sunsuwan <sunsuwan3@huawei.com> - 1:1.32.12-17 * Mon Mar 20 2023 sunsuwan <sunsuwan3@huawei.com> - 1:1.32.12-17
- Type:bugfix - Type:bugfix
- CVE:NA - CVE:NA

View File

@ -0,0 +1,25 @@
From 50ffde33c10ad5c536857bcdfcd815b9a25b9de7 Mon Sep 17 00:00:00 2001
From: desert-sailor <dxwangk@isoftstone.com>
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