Compare commits

..

No commits in common. 'i10c-beta' and 'c9' have entirely different histories.

2
.gitignore vendored

@ -1 +1 @@
SOURCES/network-manager-applet-1.36.0.tar.xz
SOURCES/network-manager-applet-1.26.0.tar.xz

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

@ -1,13 +0,0 @@
diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in
index 9e2887e..4f8c16a 100644
--- a/org.gnome.nm-applet.gschema.xml.in
+++ b/org.gnome.nm-applet.gschema.xml.in
@@ -17,7 +17,7 @@
<description>Set this to true to disable notifications when connecting to or disconnecting from a VPN.</description>
</key>
<key name="suppress-wireless-networks-available" type="b">
- <default>false</default>
+ <default>true</default>
<summary>Suppress networks available notifications</summary>
<description>Set this to true to disable notifications when Wi-Fi networks are available.</description>
</key>

@ -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

@ -5,6 +5,12 @@
%global libnma_version 1.8.27
%global obsoletes_ver 1:0.9.7
%global rpm_version 1.26.0
%global real_version 1.26.0
%global release_version 2
%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} > 8
%bcond_with libnma_gtk4
%else
@ -19,16 +25,18 @@
Name: network-manager-applet
Summary: A network control and status applet for NetworkManager
Version: 1.36.0
Release: 3%{?dist}
License: GPL-2.0-or-later
Version: %{rpm_version}
Release: %{release_version}%{?dist}
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
Source: https://download.gnome.org/sources/network-manager-applet/1.36/%{name}-%{version}.tar.xz
Patch1: 0001-nm-applet-no-notifications.patch
Source: https://download.gnome.org/sources/network-manager-applet/%{real_version_major}/%{name}-%{real_version}.tar.xz
# Patch1: 0001-sample-name.patch
Patch1: 0001-po-ja-update-Japanese-translation.patch
Requires: NetworkManager >= %{nm_version}
Requires: libnotify >= 0.4.3
Requires: nm-connection-editor%{?_isa} = %{version}-%{release}
Requires: libnma%{?_isa} >= %{libnma_version}
@ -44,11 +52,13 @@ BuildRequires: gobject-introspection-devel >= 0.10.3
BuildRequires: gettext-devel
BuildRequires: /usr/bin/autopoint
BuildRequires: pkgconfig
BuildRequires: libnotify-devel >= 0.4
BuildRequires: meson
BuildRequires: intltool
BuildRequires: gtk-doc
BuildRequires: desktop-file-utils
BuildRequires: iso-codes-devel
BuildRequires: libgudev1-devel >= 147
BuildRequires: libsecret-devel >= 0.12
BuildRequires: jansson-devel
BuildRequires: gcr-devel
@ -85,13 +95,13 @@ environment.
%prep
%autosetup -p1
%autosetup -p1 -n "%{name}-%{real_version}"
%build
%meson \
-Dselinux=true \
%if %{with appindicator}
-Dappindicator=auto
-Dappindicator=yes
%else
-Dappindicator=no
%endif
@ -116,7 +126,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%{_bindir}/nm-applet
%{_datadir}/applications/nm-applet.desktop
%{_datadir}/icons/hicolor/22x22/apps/nm-adhoc.png
%{_datadir}/icons/hicolor/22x22/apps/nm-insecure-warn.png
%{_datadir}/icons/hicolor/22x22/apps/nm-mb-roam.png
%{_datadir}/icons/hicolor/22x22/apps/nm-secure-lock.png
%{_datadir}/icons/hicolor/22x22/apps/nm-signal-*.png
@ -126,7 +135,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%{_datadir}/icons/hicolor/22x22/apps/nm-vpn-connecting*.png
%{_datadir}/icons/hicolor/22x22/apps/nm-wwan-tower.png
%{_datadir}/icons/hicolor/scalable/apps/*.svg
%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
%{_datadir}/icons/hicolor/22x22/apps/nm-insecure-warn.png
%{_datadir}/GConf/gsettings/nm-applet.convert
%{_sysconfdir}/xdg/autostart/nm-applet.desktop
%{_mandir}/man1/nm-applet*
@ -150,67 +159,32 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%changelog
* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.36.0-3
- Rebuilt for MSVSphere 10
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.36.0-3
- Bump release for June 2024 mass rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.36.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Íñigo Huguet <ihuguet@redhat.com> - 1.36.0-1
- Update to 1.36.0 release
* Thu Nov 2 2023 Íñigo Huguet <ihuguet@redhat.com> - 1.34.0-2
- migrate to SPDX license
* Mon Oct 16 2023 Beniamino Galvani <bgalvani@redhat.com> - 1.34.0-1
- Update to 1.34.0 release
* Fri Oct 07 2022 Lubomir Rintel <lkundrak@v3.sk> - 1.26.0-2
- Update Japanese translation (rh #2083047)
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.32.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Mar 22 2022 Ana Cabral <acabral@redhat.com> - 1.26.0-1
- Update to 1.26.0 release (rh #2066750)
* Sun Apr 16 2023 Lubomir Rintel <lkundrak@v3.sk> - 1.32.0-1
- Update to 1.32.0 release
* Tue Feb 22 2022 Ana Cabral <acabral@redhat.com> - 1.24.0-2
- Fix OWE settings disappearing on nm-connection-editor (rh #2057004)
* Fri Feb 17 2023 Lubomir Rintel <lkundrak@v3.sk> - 1.30.0-3
- applet: use appindicator if we can outside of X11
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.30.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Nov 07 2022 Lubomir Rintel <lkundrak@v3.sk> - 1.30.0-1
- Update to 1.30.0 release
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.28.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Jun 07 2022 Lubomir Rintel <lkundrak@v3.sk> - 1.28.0-1
- Update to 1.28.0 release
* Fri May 13 2022 Thomas Haller <thaller@redhat.com> - 1.26.0-2
- Rebuild and spec file cleanup
* Tue Mar 29 2022 Ana Cabral <acabral@redhat.com> - 1.26.0-1.1
- Update to 1.26.0 release
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.0-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Aug 19 2021 Beniamino Galvani <bgalvani@redhat.com> - 1.24.0-1.1
* Tue Aug 17 2021 Beniamino Galvani <bgalvani@redhat.com> - 1.24.0-1
- Update to 1.24.0 release
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* 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 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 May 10 2021 Beniamino Galvani <bgalvani@redhat.com> - 1.22.0-1
- Update to 1.22.0 release
- editor: fix crash evaluating secondary connections (rh #1942905)
* 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
* Wed Feb 3 2021 Thomas Haller <thaller@redhat.com> - 1.20.0-4
* Wed Feb 3 2021 Thomas Haller <thaller@redhat.com> - 1.20.0-1
- Update to 1.20.0 release
- editor: drop NotShowIn=GNOME
- Drop NotShowIn=GNOME
- Use wireless-security code from libnma
- Add flatpak build configuration
- applet: hide unmanaged ethernet devices in nm-applet

Loading…
Cancel
Save