Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
0ecddb83d3
!32 add chinese translation
From: @ikernel-mryao 
Reviewed-by: @gebidelidaye 
Signed-off-by: @gebidelidaye
2023-05-19 01:59:34 +00:00
yaoguangzhong
a7e3d9c882 [PATCH]nm: add chinese translate
category: bugfix
bugzilla: https://gitee.com/src-openeuler/network-manager-applet/issues/I663NN#note_15133796

Signed-off-by: Guangzhong Yao <yaoguangzhong@xfusion.com>
2023-05-05 19:59:52 +08:00
openeuler-ci-bot
e910fd2dcd
!25 [sync] PR-24: Modify the prompt for cloning a MAC address
From: @openeuler-sync-bot 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
2023-01-03 07:25:48 +00:00
xuxinyu
9ee0e921e6 Modify the prompt for cloning a MAC address
Signed-off-by: xuxinyu <xuxinyu@xfusion.com>
(cherry picked from commit 7de13d3706ccef101c6c26885ba9b810b921747d)
2023-01-03 15:13:27 +08:00
openeuler-ci-bot
96dcc49f04
!21 【轻量级 PR】:rebuild for next release
From: @kerongw 
Reviewed-by: @gebidelidaye 
Signed-off-by: @gebidelidaye
2022-10-26 03:09:57 +00:00
kerongw
cf04402468
rebuild for next release
Signed-off-by: kerongw <wangkerong@h-partners.com>
2022-10-26 02:54:58 +00:00
openeuler-ci-bot
c85cc27136
!18 【轻量级 PR】:fix bogus date
From: @zhangshaoning_uniontech 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
2022-06-15 09:10:50 +00:00
zhangshaoning
5c97ed4b3b
fix bogus date 2022-06-14 09:17:22 +00:00
openeuler-ci-bot
adf4e3f8b2
!16 fix duplicate packaging
From: @xing_xing1992 
Reviewed-by: @zengwefeng 
Signed-off-by: @zengwefeng
2022-03-01 13:25:53 +00:00
xinyingchao
6781123c91 fix dulicate packaging 2022-03-01 19:30:44 +08:00
3 changed files with 80 additions and 5 deletions

View File

@ -0,0 +1,28 @@
From f8c68e81d69c8447120ade01115c39a811061b60 Mon Sep 17 00:00:00 2001
From: liyuanyuan <liyuanyuan@xfusion.com>
Date: Thu, 15 Dec 2022 15:49:57 +0800
Subject: [PATCH] Modify the prompt for cloning a MAC address
---
po/zh_CN.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 93789f0..7944ff6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2937,8 +2937,8 @@ msgid ""
"network device this connection is activated on. This feature is known as MAC "
"cloning or spoofing. Example: 00:11:22:33:44:55"
msgstr ""
-"此处输入的 MAC 地址将用作此连接激活所在的网络设备的硬件地址。该特性被称为 "
-"MAC 克隆或欺骗。例如00:11:22:33:44:55"
+"此处输入的 MAC 地址将用作此连接激活所在网络设备的硬件地址。该特性被称作 "
+"MAC 克隆或 MAC 地址欺骗。例如00:11:22:33:44:55"
#: src/connection-editor/ce-page.c:315
msgid "MAC address"
--
2.27.0

View File

@ -0,0 +1,27 @@
From d08a6a91896f3e3db961fe66ac754361e09d1ddb Mon Sep 17 00:00:00 2001
From: yaoguangzhong <yaoguangzhong@xfusion.com>
Date: Mon, 26 Dec 2022 16:36:29 +0800
Subject: [PATCH] [PATCH]nm: add chinese translate
---
po/zh_CN.po | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 93789f0..d0ef292 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1981,6 +1981,10 @@ msgid ""
"also unset, use the kernel default value read from file \"/proc/sys/net/ipv6/"
"conf/default/use_tempaddr\""
msgstr ""
+"如果启用,则内核从 MAC 地址生成一个公共 IPv6 地址之外,还会生成一个临时的"
+"IPv6 地址。这可以加强隐私保护,但可能会在某些应用程序中引起问题。如果设"
+"为“Default”则使用 NetworkManager 的全局配置。如果全局配置也未设置,则读取并使用"
+"“/proc/sys/net/ipv6/conf/default/use_tempaddr”的内核默认值。"
#: src/connection-editor/ce-page-ip6.ui:323
msgid "IPv6 address _generation mode"
--
2.27.0

View File

@ -11,7 +11,7 @@
Name: network-manager-applet
Summary: A network control and status applet for NetworkManager
Version: 1.24.0
Release: 1
Release: 5
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
@ -19,6 +19,9 @@ Source: https://download.gnome.org/sources/network-manager-applet/1.24/%{name}-
Requires: NetworkManager >= %{nm_version} libnotify >= 0.4.3 nm-connection-editor libnma
Patch1: Modify-the-prompt-for-cloning-a-MAC-address.patch
Patch2: backport-Update-Chinese-translation.patch
BuildRequires: NetworkManager-libnm-devel >= %{nm_version} libnma-devel ModemManager-glib-devel >= 1.0 glib2-devel >= 2.32 gtk3-devel >= 3.10
BuildRequires: gobject-introspection-devel >= 0.10.3 gettext-devel pkgconfig libnotify-devel >= 0.4 meson intltool gtk-doc
BuildRequires: /usr/bin/autopoint mobile-broadband-provider-info-devel libselinux-devel libappindicator-gtk3-devel libdbusmenu-gtk3-devel
@ -49,6 +52,9 @@ environment.
%prep
%autosetup -n %{name}-%{real_version} -p1
cd po/
rm -f zh_CN.gmo && msgfmt zh_CN.po -o zh_CN.gmo
cd -
%build
%meson \
@ -92,11 +98,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%files -n nm-connection-editor -f %{name}.lang
%defattr(-,root,root)
%{_bindir}/nm-connection-editor
%{_datadir}/applications/nm-connection-editor.desktop
%{_datadir}/icons/hicolor/*/apps/nm-device-*.*
%{_datadir}/icons/hicolor/*/apps/nm-no-connection.*
%{_datadir}/icons/hicolor/16x16/apps/nm-vpn-standalone-lock.png
%{_datadir}/metainfo/nm-connection-editor.appdata.xml
%dir %{_datadir}/gnome-vpn-properties
%files help
@ -108,11 +112,27 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%{_datadir}/applications/nm-connection-editor.desktop
%{_datadir}/metainfo/nm-connection-editor.appdata.xml
%changelog
%changelog
* Tue Apr 25 2023 yaoguangzhong <yaoguangzhong@xfusion.com> - 1.24.0-5
- Type:bugfix
- CVE:
- DESC:add chinese translation
* Mon Dec 19 2022 xuxinyu <xuxinyu@xfusion.com> - 1.24.0-4
- Type:bugfix
- CVE:
- DESC:Modify the prompt for cloning a MAC address
* Tue Oct 25 2022 wangkerong <wangkerong@h-partners.com> - 1.24.0-3
- rebuild for next release
* Tue Mar 01 2021 xingxing <xingxing9@huawei.com> - 1.24.0-2
- fix dulicate packaging
* Mon Dec 06 2021 xingxing <xingxing9@huawei.com> - 1.24.0-1
- Update to 1.24.0
* Tue Sep 10 2020 chengguipeng<chengguipeng1@huawei.com> - 1.18.0-2
* Thu Sep 10 2020 chengguipeng<chengguipeng1@huawei.com> - 1.18.0-2
- Type:bugfix
- ID:NA
- SUG:NA