Compare commits

...

No commits in common. "c8" and "c9s" have entirely different histories.
c8 ... c9s

6 changed files with 384 additions and 35 deletions

56
.gitignore vendored
View File

@ -1 +1,55 @@
SOURCES/network-manager-applet-1.26.0.tar.xz
/network-manager-applet-0.9.3.997.git20120319.tar.bz2
/network-manager-applet-0.9.4.0.git20120328.tar.bz2
/network-manager-applet-0.9.4.0.git20120502.tar.bz2
/network-manager-applet-0.9.4.1.git20120521.tar.bz2
/network-manager-applet-0.9.5.95.git20120713.tar.bz2
/network-manager-applet-0.9.5.96.tar.bz2
/network-manager-applet-0.9.7.0.git20120820.tar.bz2
/network-manager-applet-0.9.7.0.git20121004.tar.bz2
/network-manager-applet-0.9.7.0.git20121016.tar.bz2
/network-manager-applet-0.9.7.0.git20121211.tar.bz2
/network-manager-applet-0.9.8.0.tar.bz2
/network-manager-applet-0.9.8.1.git20130327.tar.bz2
/network-manager-applet-0.9.8.1.git20130430.tar.bz2
/network-manager-applet-0.9.9.0.git20130515.tar.bz2
/network-manager-applet-0.9.9.0.git20131028.tar.bz2
/network-manager-applet-0.9.9.0.git20140121.07a8138.tar.bz2
/network-manager-applet-0.9.9.0.git20140123.5d4f17e.tar.bz2
/network-manager-applet-0.9.9.0.git20140424.9ba9c3e.tar.bz2
/network-manager-applet-0.9.10.1.git20141201.be5a9db.tar.bz2
/network-manager-applet-1.0.0.tar.xz
/network-manager-applet-1.0.2.tar.xz
/network-manager-applet-1.0.4.git20160615.28a0e28.tar.bz2
/network-manager-applet-1.0.4.git20160702.25368df.tar.bz2
/network-manager-applet-1.0.4.tar.xz
/network-manager-applet-1.0.6.tar.xz
/network-manager-applet-1.2.0.tar.xz
/network-manager-applet-1.1.90.tar.xz
/network-manager-applet-1.1.91.tar.xz
/network-manager-applet-1.1.92.tar.xz
/network-manager-applet-1.1.93.tar.xz
/network-manager-applet-1.2.2.tar.xz
/network-manager-applet-1.2.4.tar.xz
/network-manager-applet-1.4.0.tar.xz
/network-manager-applet-1.4.4.tar.xz
/network-manager-applet-1.4.6.tar.xz
/network-manager-applet-1.7.1.tar.xz
/network-manager-applet-1.8.0.tar.xz
/network-manager-applet-1.8.2.tar.xz
/network-manager-applet-1.8.4.tar.xz
/network-manager-applet-1.8.6.tar.xz
/network-manager-applet-1.8.8.tar.xz
/network-manager-applet-1.8.10.tar.xz
/network-manager-applet-1.8.12.tar.xz
/network-manager-applet-1.8.14.tar.xz
/network-manager-applet-1.8.16.tar.xz
/network-manager-applet-1.8.18.tar.xz
/network-manager-applet-1.8.20.tar.xz
/network-manager-applet-1.8.22.tar.xz
/network-manager-applet-1.8.24.tar.xz
/network-manager-applet-1.16.0.tar.xz
/network-manager-applet-1.18.0.tar.xz
/network-manager-applet-1.20.0.tar.xz
/network-manager-applet-1.22.0.tar.xz
/network-manager-applet-1.24.0.tar.xz
/network-manager-applet-1.26.0.tar.xz

View File

@ -1 +0,0 @@
c65b00c6b9280a1ad50f656234edcea28afc77cc SOURCES/network-manager-applet-1.26.0.tar.xz

View File

@ -0,0 +1,203 @@
From 032167e00e8e4227446d3bc48a59c6687d8f3c65 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Thu, 6 Oct 2022 12:15:01 +0200
Subject: [PATCH] po/ja: update Japanese translation
https://bugzilla.redhat.com/show_bug.cgi?id=2083047
---
po/ja.po | 65 +++++++++++++++++++++++++++-----------------------------
1 file changed, 31 insertions(+), 34 deletions(-)
diff --git a/po/ja.po b/po/ja.po
index ae378c9..3e7d403 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -19,7 +19,7 @@ msgstr ""
"Project-Id-Version: network-manager-applet 1.8.22\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
"applet/\n"
-"POT-Creation-Date: 2022-03-22 11:36+0100\n"
+"POT-Creation-Date: 2022-10-06 12:14+0200\n"
"PO-Revision-Date: 2020-05-07 21:00+0000\n"
"Last-Translator: sicklylife <translation@sicklylife.jp>\n"
"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -35,7 +35,7 @@ msgstr "ネットワーク"
#: nm-applet.desktop.in:4
msgid "Manage your network connections"
-msgstr "ネットワーク接続を管理"
+msgstr "ネットワーク接続の管理"
#: nm-connection-editor.appdata.xml.in:7
msgid "NetworkManager"
@@ -153,12 +153,11 @@ msgstr "アドホック"
#: src/ap-menu-item.c:73
msgid "secure."
-msgstr "セキュア。"
+msgstr "セキュアです。"
#: src/ap-menu-item.c:77
-#, fuzzy
msgid "insecure."
-msgstr "セキュア。"
+msgstr "セキュアではありません。"
#: src/applet-device-broadband.c:147
msgid "Wrong PUK code; please contact your provider."
@@ -364,9 +363,8 @@ msgid "Wi-Fi is disabled by hardware switch"
msgstr "Wi-Fi はハードウェアのスイッチで無効になっています"
#: src/applet-device-wifi.c:887
-#, fuzzy
msgid "_Available networks"
-msgstr "利用可能"
+msgstr "利用可能なネットワーク(_A)"
#: src/applet-device-wifi.c:1083
msgid "Wi-Fi Networks Available"
@@ -1087,8 +1085,8 @@ msgid ""
msgstr ""
"新規接続で使用する接続の種類を選択してください。\n"
"\n"
-"VPN 接続の一覧に、作成したい VPN 接続がにない場合は、正しい VPN プラグインが"
-"インストールされていない可能性があります。"
+"作成する VPN 接続が VPN 接続の一覧にない場合は、正しい VPN プラグインがインス"
+"トールされていない可能性があります。"
#: src/connection-editor/ce-page-bluetooth.ui:35
#: src/connection-editor/ce-page-ethernet.ui:129
@@ -1198,13 +1196,12 @@ msgid "_Primary"
msgstr "プライマリー(_P)"
#: src/connection-editor/ce-page-bond.ui:495
-#, fuzzy
msgid ""
"The interface name of the primary device. If set, this device will always be "
"the active port when it is available."
msgstr ""
-"プライマリーデバイスのインターフェース名を指定した場合、そのデバイスが利用可"
-"能である時、常にアクティブなスレーブになります。"
+"プライマリーデバイスのインターフェース名。設定すると、このデバイスが利用可能"
+"な場合に、常にアクティブなポートになります。"
#: src/connection-editor/ce-page-bond.ui:507
#: src/connection-editor/ce-page-ethernet.ui:188
@@ -1953,7 +1950,7 @@ msgstr ""
#: src/connection-editor/ce-page-ip4.ui:288
msgid "Require IPv_4 addressing for this connection to complete"
-msgstr "この接続を完了するには、IPv4 アドレスが必要 (_4)"
+msgstr "この接続を完了するには、IPv4 アドレスが必要"
#: src/connection-editor/ce-page-ip4.ui:292
msgid ""
@@ -2014,11 +2011,17 @@ msgstr "IPv6 のプライバシー拡張(_P)"
msgid ""
"If enabled, it makes the kernel generate a temporary IPv6 address in "
"addition to the public one generated from MAC address. This enhances "
-"privacy, but could cause problems in some applications. If set to \"Default"
-"\", the value from NetworkManager global configuration is used. If that is "
-"also unset, use the kernel default value read from file \"/proc/sys/net/ipv6/"
-"conf/default/use_tempaddr\""
+"privacy, but could cause problems in some applications. If set to "
+"\"Default\", the value from NetworkManager global configuration is used. If "
+"that is also unset, use the kernel default value read from file \"/proc/sys/"
+"net/ipv6/conf/default/use_tempaddr\""
msgstr ""
+"有効にすると、MACアドレスから生成される公開アドレスに加えて、カーネルが一時的"
+"な IPv6 アドレスを生成されます。これにより、セキュリティーが向上しますが、一"
+"部のアプリケーションで問題が発生する可能性があります。Default に設定すると、"
+"NetworkManager のグローバル設定からの値が使用されます。これも未設定の場"
+"合、\"/proc/sys/net/ipv6/conf/default/use_tempaddr\" ファイルから読み込んだ"
+"カーネルのデフォルト値が使用されます"
#: src/connection-editor/ce-page-ip6.ui:323
msgid "IPv6 address _generation mode"
@@ -2026,7 +2029,7 @@ msgstr "IPv6 アドレス生成モード(_G)"
#: src/connection-editor/ce-page-ip6.ui:360
msgid "Require IPv_6 addressing for this connection to complete"
-msgstr "この接続が完了するには、IPv6 アドレスが必要 (_6)"
+msgstr "この接続が完了するには、IPv6 アドレスが必要"
#: src/connection-editor/ce-page-ip6.ui:364
msgid ""
@@ -2110,7 +2113,6 @@ msgid "C_KN"
msgstr "CKN(_K)"
#: src/connection-editor/ce-page-macsec.ui:206
-#, fuzzy
msgid "The pre-shared Connectivity-association Key Name"
msgstr "共有前の接続に関連するキー名"
@@ -3570,7 +3572,7 @@ msgstr "Bluetooth デバイスの MAC アドレス。例: 00:11:22:33:44:55"
#: src/connection-editor/page-bluetooth.c:108
msgid "Could not load Bluetooth user interface."
-msgstr "Bluetooth ユーザーインターフェースを読み込めませんでした。"
+msgstr "Bluetooth ユーザーインターフェースを読み込めませんでした。"
#: src/connection-editor/page-bluetooth.c:156
#, c-format
@@ -3857,28 +3859,27 @@ msgstr "MACSEC 接続 %d"
#: src/connection-editor/page-master.c:221
#: src/connection-editor/page-master.c:232
-#, fuzzy
msgid "Duplicate ports"
-msgstr "重複するスレーブ"
+msgstr "重複するポート"
#: src/connection-editor/page-master.c:222
-#, fuzzy, c-format
+#, c-format
msgid "Ports “%s” and “%s” both apply to device “%s”"
-msgstr "スレーブ '%s' と '%s' は、両方ともデバイス '%s' へ適用されます。"
+msgstr "ポート \"%s\" と \"%s\" は両方ともデバイス \"%s\" に適用されます"
#: src/connection-editor/page-master.c:233
-#, fuzzy, c-format
+#, c-format
msgid ""
"Ports “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
"same physical device."
msgstr ""
-"スレーブ '%s' と '%s' は、それぞれ同じ物理デバイスの異なる仮想ポート ('%s' "
-"と '%s') へ適用されます。"
+"ポート \"%s\" と \"%s\" は、それぞれ同じ物理デバイスの異なる仮想ポート "
+"(\"%s\" と \"%s\") に適用されます。"
#: src/connection-editor/page-master.c:357
#, c-format
msgid "%s port %d"
-msgstr ""
+msgstr "%s ポート %d"
#: src/connection-editor/page-mobile.c:297
msgid "Could not load mobile broadband user interface."
@@ -4216,12 +4217,11 @@ msgid "Usage:"
msgstr "使用法:"
#: src/main.c:30
-#, fuzzy
msgid ""
"This program is a component of NetworkManager (https://networkmanager.dev)."
msgstr ""
-"このプログラムは、NetworkManager (https://wiki.gnome.org/Projects/"
-"NetworkManager/) のコンポーネントです。"
+"このプログラムは、NetworkManager (https://networkmanager.dev) のコンポーネン"
+"トです。"
#: src/main.c:31
msgid ""
@@ -4957,6 +4957,3 @@ msgstr "DER か、PEM、 PKCS#12 の秘密鍵 (*.der, *.pem, *.p12, *.key)"
#~ msgid "Wi-Fi _adapter:"
#~ msgstr "Wi-Fi アダプター(_A):"
-
-#~ msgid "CKN"
-#~ msgstr "CKN"
--
2.37.3

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -7,11 +7,11 @@
%global rpm_version 1.26.0
%global real_version 1.26.0
%global release_version 1
%global release_version 3
%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p')
%if 0%{?fedora} > 31 || 0%{?rhel} > 7
%if 0%{?fedora} > 31 || 0%{?rhel} > 8
%bcond_with libnma_gtk4
%else
%bcond_without libnma_gtk4
@ -32,7 +32,8 @@ URL: http://www.gnome.org/projects/NetworkManager/
Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
Source: https://download.gnome.org/sources/network-manager-applet/%{real_version_major}/%{name}-%{real_version}.tar.xz
# Patch1: 0001-Patch.patch
# Patch1: 0001-sample-name.patch
Patch1: 0001-po-ja-update-Japanese-translation.patch
Requires: NetworkManager >= %{nm_version}
Requires: libnotify >= 0.4.3
@ -83,14 +84,22 @@ This package contains a network configuration editor and Bluetooth modem
utility for use with NetworkManager.
%package -n nm-connection-editor-desktop
Summary: The desktop file for nm-connection-editor
Requires: nm-connection-editor%{?_isa} = %{version}-%{release}
%description -n nm-connection-editor-desktop
This package contains the desktop file and appdata for nm-connection-editor.
Without it, the nm-connection-editor cannot be started from the desktop
environment.
%prep
%autosetup -p1 -n "%{name}-%{real_version}"
%build
%meson \
-Dgcr=true \
-Dselinux=true \
-Ddisable-static=true \
%if %{with appindicator}
-Dappindicator=yes
%else
@ -137,57 +146,134 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
# is the RPM that everything else depends on
%files -n nm-connection-editor -f %{name}.lang
%{_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
%{_mandir}/man1/nm-connection-editor*
%dir %{_datadir}/gnome-vpn-properties
%files -n nm-connection-editor-desktop
%{_datadir}/applications/nm-connection-editor.desktop
%{_datadir}/metainfo/nm-connection-editor.appdata.xml
%changelog
* Mon May 03 2024 Stanislas Faye <sfaye@redhat.com> - 1.26.0-3
- Deprecate nm-applet on RHEL-9 (RHEL-35523)
* Fri Oct 07 2022 Lubomir Rintel <lkundrak@v3.sk> - 1.26.0-2
- Update Japanese translation (rh #2083047)
* Tue Mar 22 2022 Ana Cabral <acabral@redhat.com> - 1.26.0-1
- Update to 1.26.0 release (rh #2066746)
- Update to 1.26.0 release (rh #2066750)
* Tue Feb 22 2022 Ana Cabral <acabral@redhat.com> - 1.24.0-4
- Fix OWE settings disappearing on nm-connection-editor (rh #2023162)
* Tue Feb 22 2022 Ana Cabral <acabral@redhat.com> - 1.24.0-2
- Fix OWE settings disappearing on nm-connection-editor (rh #2057004)
* Mon Nov 22 2021 Ana Cabral <acabral@redhat.com> - 1.24.0-3
- Update the spec file
* Tue Aug 17 2021 Beniamino Galvani <bgalvani@redhat.com> - 1.24.0-1
- Update to 1.24.0 release
* Tue Sep 14 2021 Ana Cabral <acabral@redhat.com> - 1.24.0-2
- Rebuild package
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.22.0-1.2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Mon Sep 6 2021 Ana Cabral <acabral@redhat.com> - 1.24.0-1
- Update to 1.24.0 release (rh #2001638)
* Mon Jul 5 2021 Wen Liang <wenliang@redhat.com> - 1.22.0-1
- Update to 1.22.0 release.
- editor: show missing toggle in the 8021x-security page.
* Mon Aug 16 2021 Ana Cabral <acabral@redhat.com> - 1.18.0-3
- Fix German translation (rh #1938625, rh #1938627)
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.20.0-4.1
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Mon Jul 20 2020 Beniamino Galvani <bgalvani@redhat.com> - 1.18.0-2
- Import translations (rh #1820554)
* Wed Feb 3 2021 Thomas Haller <thaller@redhat.com> - 1.20.0-1
- Update to 1.20.0 release
- Drop NotShowIn=GNOME
- Use wireless-security code from libnma
- Add flatpak build configuration
- applet: hide unmanaged ethernet devices in nm-applet
- applet: fix Wi-Fi scan requests with appindicator
- editor: fix drop down list for connection.secondaries
* Mon Jun 22 2020 Beniamino Galvani <bgalvani@redhat.com> - 1.18.0-1
- Update to 1.18.0 release (rh #1814748)
* Tue Feb 2 2021 Thomas Haller <thaller@redhat.com> - 1.18.0-4
- Move desktop file to new nm-connection-editor-desktop package (rh #1923262)
* Mon May 18 2020 Beniamino Galvani <bgalvani@redhat.com> - 1.8.22-3
- Drop gschema XML which conflicts with new libnma package
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-3.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Aug 15 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.8.22-2
- Update translations (rh #1690001)
* Wed Jan 6 2021 Thomas Haller <thaller@redhat.com> - 1.18.0-3
- Build without libdbusmenu-gtk3-devel on RHEL >=9
* Thu May 30 2019 Beniamino Galvani <bgalvani@redhat.com> - 1.8.22-1
* Wed Nov 18 2020 Antonio Cardace <acardace@redhat.com> - 1.18.0-2
- Build without libappindicator-gtk3-devel on RHEL >=9
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Jul 11 2020 Thomas Haller <thaller@redhat.com> - 1.18.0-1
- Update to 1.18.0 release
- Enable build with appindicator by default.
- Add WireGuard support to the editor.
- Support OWE (Opportunistic Wireless Encryption) in the editor.
- Fix crash when disposing VPN secret dialog.
* Thu Apr 30 2020 Ivan Mironov <mironov.ivan@gmail.com> - 1.16.0-2
- Build with libappindicator which enables Status Notifier Item support
* Sat Mar 7 2020 Thomas Haller <thaller@redhat.com> - 1.16.0-1
- Update to 1.16.0 release
- Move libnma to separate, independent project
- move org.gnome.nm-applet.gschema.xml to libnma
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.24-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Oct 09 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.8.24-1
- Update to 1.8.24 release
- Enable experimental GTK4 build on Rawhide
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.22-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed May 29 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.8.22-1
- Update to 1.8.22 release
* Wed Feb 20 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.8.10-5
- One more translation update (rh #1608325)
* Wed Feb 27 2019 Beniamino Galvani <bgalvani@redhat.com> - 1.8.20-2
- Fix parsing of hints in wifi secret dialog (rh #1679251)
- Import other upstream fixes after 1.8.20
* Tue Oct 16 2018 Lubomir Rintel <lkundrak@v3.sk> - 1.8.10-4
- Update translations (rh #1608325)
* Fri Feb 08 2019 Beniamino Galvani <bgalvani@redhat.com> - 1.8.20-1
- Update to 1.8.20 release
* Fri Sep 28 2018 Beniamino Galvani <bgalvani@redhat.com> - 1.8.10-3
- Rebuild with updated annobin (rh #1630604)
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.18-3.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jan 19 2019 Beniamino Galvani <bgalvani@redhat.com> - 1.8.18-3
- wifi-dialog: fix widget hiding logic (rh #1665653)
* Fri Sep 21 2018 Thomas Haller <thaller@redhat.com> - 1.8.18-2
- libnma: fix wrongly showing hidden GUI elements (rh #1626397) (2)
* Fri Sep 7 2018 Thomas Haller <thaller@redhat.com> - 1.8.18-1
- Update to 1.8.18 release
- libnma: fix wrongly showing hidden GUI elements (rh #1626397)
* Sat Aug 11 2018 Lubomir Rintel <lkundrak@v3.sk> - 1.8.16-1
- Update to 1.8.16 release
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.14-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Jun 25 2018 Lubomir Rintel <lkundrak@v3.sk> - 1.8.14-1
- Update to 1.8.14 release
* Mon Jun 4 2018 Thomas Haller <thaller@redhat.com> - 1.8.12-4
- applet: fix double-free in ap-menu-item (rh #1585302)
* Fri Jun 01 2018 Adam Williamson <awilliam@redhat.com> - 1.8.12-3
- Fix GGO #1 (nm-connection-editor --keep-above fails with any other arg)
* Mon May 28 2018 Lubomir Rintel <lkundrak@v3.sk> - 1.8.12-2
- Update to 1.8.12 release
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.8.10-2.2
- Escape macros in %%changelog

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (network-manager-applet-1.26.0.tar.xz) = ae3c4f8e55a2cd13093161e1e28873d3cda1c531168ee18115f3f710816f1bdfcf669cd2f796bd38f226d3f6be76407fccbcb19cf9c994b99969b688397b2c71