commit 9bad82e47b41a8bc17ba9d3de889a66ac33a352a Author: CentOS Sources Date: Tue Jun 9 19:57:14 2020 +0000 import network-manager-applet-1.8.22-3.el8 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..41e14ad --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/network-manager-applet-1.8.22.tar.xz diff --git a/.network-manager-applet.metadata b/.network-manager-applet.metadata new file mode 100644 index 0000000..e298943 --- /dev/null +++ b/.network-manager-applet.metadata @@ -0,0 +1 @@ +052e371469ed3840a9b9015001e3bc2873c5a962 SOURCES/network-manager-applet-1.8.22.tar.xz diff --git a/SOURCES/0001-nm-applet-no-notifications.patch b/SOURCES/0001-nm-applet-no-notifications.patch new file mode 100644 index 0000000..be6b6bf --- /dev/null +++ b/SOURCES/0001-nm-applet-no-notifications.patch @@ -0,0 +1,13 @@ +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 @@ + Set this to true to disable notifications when connecting to or disconnecting from a VPN. + + +- false ++ true + Suppress networks available notifications + Set this to true to disable notifications when Wi-Fi networks are available. + diff --git a/SOURCES/0001-po-RHEL-8.1-translations-rh1690001.patch b/SOURCES/0001-po-RHEL-8.1-translations-rh1690001.patch new file mode 100644 index 0000000..ecb2057 --- /dev/null +++ b/SOURCES/0001-po-RHEL-8.1-translations-rh1690001.patch @@ -0,0 +1,3232 @@ +From 2fd244bc10d213f929faee4d257bbf897c5ed0ba Mon Sep 17 00:00:00 2001 +From: Ludek Janda +Date: Thu, 15 Aug 2019 11:54:25 +0200 +Subject: [PATCH] po: RHEL 8.1 translations + +https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/57 +--- + po/fr.po | 45 ++--- + po/ja.po | 546 ++++++++++++++++++---------------------------------- + po/ko.po | 51 +---- + po/zh_CN.po | 532 ++++++++++++++++++-------------------------------- + 4 files changed, 389 insertions(+), 785 deletions(-) + +diff --git a/po/fr.po b/po/fr.po +index 7937895a..b5fa1bc9 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -12,21 +12,23 @@ + # Bruno Brouard , 2010-2012. + # Alain Lojewski , 2013-2014. + # Yvan Masson , 2017. +-# ++# croe , 2019. #zanata ++# ljanda , 2019. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: fr\n" ++"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: 2019-05-29 11:09+0200\n" +-"PO-Revision-Date: 2019-01-15 14:51+0100\n" +-"Last-Translator: Claude Paroz \n" ++"POT-Creation-Date: 2019-08-15 18:52+0200\n" ++"PO-Revision-Date: 2019-08-14 11:37+0000\n" ++"Last-Translator: croe \n" + "Language-Team: GNOME French TEAM \n" + "Language: fr\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=n>1;\n" ++"X-Generator: Zanata 4.6.2\n" + + #: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737 + #: src/libnma/nma-bar-code-widget.c:144 +@@ -39,7 +41,7 @@ msgstr "Gérer vos connexions réseau" + + #: nm-applet.desktop.in:5 + msgid "nm-device-wireless" +-msgstr "" ++msgstr "nm-device-wireless" + + #: nm-connection-editor.desktop.in:3 + msgid "Advanced Network Configuration" +@@ -51,7 +53,7 @@ msgstr "Gérer et modifier les paramètres des connexions réseau" + + #: nm-connection-editor.desktop.in:5 + msgid "preferences-system-network" +-msgstr "" ++msgstr "preferences-system-network" + + #: org.gnome.nm-applet.gschema.xml.in:6 + msgid "Disable connected notifications" +@@ -108,7 +110,6 @@ msgstr "" + "version." + + #: org.gnome.nm-applet.gschema.xml.in:31 +-#, fuzzy + msgid "Disable WiFi Create" + msgstr "Désactiver la création Wi-Fi" + +@@ -889,18 +890,16 @@ msgid "Subnet Mask" + msgstr "Masque de sous-réseau " + + #: src/applet-dialogs.c:440 +-#, fuzzy + msgid "Primary DNS" +-msgstr "_Principal" ++msgstr "DNS Principal" + + #: src/applet-dialogs.c:440 +-#, fuzzy + msgid "Secondary DNS" +-msgstr "Mot de passe _secondaire :" ++msgstr "DNS Secondaire" + + #: src/applet-dialogs.c:440 + msgid "Tertiary DNS" +-msgstr "" ++msgstr "DNS Tertiaire" + + #: src/applet-dialogs.c:519 + #, c-format +@@ -948,9 +947,8 @@ msgid "Speed" + msgstr "Vitesse " + + #: src/applet-dialogs.c:616 +-#, fuzzy + msgid "Security" +-msgstr "Sécurité :" ++msgstr "Sécurité" + + #. --- IPv4 --- + #: src/applet-dialogs.c:641 src/applet-dialogs.c:904 +@@ -972,9 +970,8 @@ msgid "Hotspot" + msgstr "Hotspot" + + #: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161 +-#, fuzzy + msgid "Password" +-msgstr "Mot de passe :" ++msgstr "Mot de passe" + + #: src/applet-dialogs.c:878 + msgid "VPN Type" +@@ -4222,7 +4219,7 @@ msgstr "_Fermer" + + #: src/libnma/nma-bar-code-widget.ui:36 + msgid "Scan with your phone or Print" +-msgstr "" ++msgstr "Scanner avec votre portable ou Print" + + #: src/libnma/nma-file-cert-chooser.c:108 + #: src/libnma/nma-pkcs11-cert-chooser.c:152 +@@ -4331,9 +4328,8 @@ msgid "Set up a Mobile Broadband Connection" + msgstr "Configuration d'une connexion mobile" + + #: src/libnma/nma-mobile-wizard.ui:189 +-#, fuzzy + msgid "Country or region:" +-msgstr "Pays ou région" ++msgstr "Pays ou région :" + + #: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127 + msgid "Choose your Provider’s Country or Region" +@@ -5099,12 +5095,3 @@ msgstr "" + #: src/wireless-security/ws-wpa-psk.ui:48 + msgid "_Type" + msgstr "_Type" +- +-#~ msgid "%s (default)" +-#~ msgstr "%s (par défaut)" +- +-#~ msgid "Ignored" +-#~ msgstr "Ignoré" +- +-#~ msgid "Active Network Connections" +-#~ msgstr "Connexions réseau actives" +diff --git a/po/ja.po b/po/ja.po +index 995fc0be..d6d5106c 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -11,24 +11,23 @@ + # Takayoshi OKANO , 2011. + # Jiro Matsuzawa , 2013. + # Hajime Taira , 2013. +-# amoewaki , 2017. #zanata +-# lrintel , 2017. #zanata +-# amoewaki , 2018. #zanata ++# kemorigu , 2019. #zanata ++# ljanda , 2019. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: PACKAGE VERSION\n" ++"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: 2019-05-29 11:09+0200\n" +-"PO-Revision-Date: 2018-01-30 12:06+0000\n" +-"Last-Translator: amoewaki \n" ++"POT-Creation-Date: 2019-08-15 18:52+0200\n" ++"PO-Revision-Date: 2019-08-15 04:55+0000\n" ++"Last-Translator: kemorigu \n" + "Language-Team: Japanese \n" + "Language: ja\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=1; plural=0;\n" +-"X-Generator: Zanata 4.3.2\n" ++"X-Generator: Zanata 4.6.2\n" + + #: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737 + #: src/libnma/nma-bar-code-widget.c:144 +@@ -41,12 +40,11 @@ msgstr "ネットワーク接続を管理" + + #: nm-applet.desktop.in:5 + msgid "nm-device-wireless" +-msgstr "" ++msgstr "nm-device-wireless" + + #: nm-connection-editor.desktop.in:3 +-#, fuzzy + msgid "Advanced Network Configuration" +-msgstr "Raw 設定" ++msgstr "高度なネットワーク設定" + + #: nm-connection-editor.desktop.in:4 + msgid "Manage and change your network connection settings" +@@ -54,7 +52,7 @@ msgstr "ネットワーク接続セッティングの管理と変更" + + #: nm-connection-editor.desktop.in:5 + msgid "preferences-system-network" +-msgstr "" ++msgstr "preferences-system-network" + + #: org.gnome.nm-applet.gschema.xml.in:6 + msgid "Disable connected notifications" +@@ -105,7 +103,6 @@ msgid "Used to determine whether settings should be migrated to a new version." + msgstr "設定を、新規バージョンに移行すべきかどうかの判定に使用されます。" + + #: org.gnome.nm-applet.gschema.xml.in:31 +-#, fuzzy + msgid "Disable WiFi Create" + msgstr "Wi-Fi の作成を無効にする" + +@@ -245,9 +242,8 @@ msgid "C_onnect" + msgstr "接続(_O)" + + #: src/8021x.ui:122 src/libnma/wifi.ui:129 +-#, fuzzy + msgid "_Network name" +-msgstr "ネットワーク名(_N):" ++msgstr "ネットワーク名(_N)" + + #: src/ap-menu-item.c:82 + msgid "ad-hoc" +@@ -877,18 +873,16 @@ msgid "Subnet Mask" + msgstr "サブネットマスク" + + #: src/applet-dialogs.c:440 +-#, fuzzy + msgid "Primary DNS" +-msgstr "プライマリー(_P):" ++msgstr "プライマリー DNS" + + #: src/applet-dialogs.c:440 +-#, fuzzy + msgid "Secondary DNS" +-msgstr "セカンダリーパスワード(_S):" ++msgstr "セカンダリー DNS" + + #: src/applet-dialogs.c:440 + msgid "Tertiary DNS" +-msgstr "" ++msgstr "ターシャリー DNS" + + #: src/applet-dialogs.c:519 + #, c-format +@@ -936,9 +930,8 @@ msgid "Speed" + msgstr "速度" + + #: src/applet-dialogs.c:616 +-#, fuzzy + msgid "Security" +-msgstr "セキュリティー:" ++msgstr "セキュリティー" + + #. --- IPv4 --- + #: src/applet-dialogs.c:641 src/applet-dialogs.c:904 +@@ -960,9 +953,8 @@ msgid "Hotspot" + msgstr "ホットスポット" + + #: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161 +-#, fuzzy + msgid "Password" +-msgstr "パスワード:" ++msgstr "パスワード" + + #: src/applet-dialogs.c:878 + msgid "VPN Type" +@@ -1193,9 +1185,8 @@ msgstr "" + #: src/connection-editor/ce-page-ethernet.ui:129 + #: src/connection-editor/ce-page-infiniband.ui:50 + #: src/connection-editor/ce-page-wifi.ui:139 +-#, fuzzy + msgid "_Device" +-msgstr "デバイス(_D):" ++msgstr "デバイス(_D)" + + #: src/connection-editor/ce-page-bond.ui:24 + #: src/connection-editor/ce-page-team.ui:433 +@@ -1237,15 +1228,13 @@ msgid "ARP" + msgstr "ARP" + + #: src/connection-editor/ce-page-bond.ui:91 +-#, fuzzy + msgid "Bonded _connections" +-msgstr "Bond 接続(_C):" ++msgstr "Bond 接続(_C)" + + #: src/connection-editor/ce-page-bond.ui:105 + #: src/connection-editor/ce-page-wifi.ui:400 +-#, fuzzy + msgid "M_ode" +-msgstr "モード(_O):" ++msgstr "モード(_O)" + + #: src/connection-editor/ce-page-bond.ui:194 + #: src/connection-editor/ce-page-bridge.ui:134 +@@ -1255,9 +1244,8 @@ msgid "_Edit" + msgstr "編集(_E)" + + #: src/connection-editor/ce-page-bond.ui:238 +-#, fuzzy + msgid "Monitoring _frequency" +-msgstr "監視周期(_F):" ++msgstr "監視周期(_F)" + + #: src/connection-editor/ce-page-bond.ui:272 + #: src/connection-editor/ce-page-bond.ui:422 +@@ -1268,19 +1256,16 @@ msgstr "ms" + #: src/connection-editor/ce-page-bond.ui:291 + #: src/connection-editor/ce-page-bridge.ui:192 + #: src/connection-editor/ce-page-team.ui:292 +-#, fuzzy + msgid "_Interface name" +-msgstr "インターフェース名(_I):" ++msgstr "インターフェース名(_I)" + + #: src/connection-editor/ce-page-bond.ui:316 +-#, fuzzy + msgid "_Link Monitoring" + msgstr "リンク監視(_L)" + + #: src/connection-editor/ce-page-bond.ui:347 +-#, fuzzy + msgid "ARP _targets" +-msgstr "ARP 対象(_T):" ++msgstr "ARP 対象(_T)" + + #: src/connection-editor/ce-page-bond.ui:361 + msgid "" +@@ -1291,19 +1276,16 @@ msgstr "" + "のリスト。" + + #: src/connection-editor/ce-page-bond.ui:373 +-#, fuzzy + msgid "Link _up delay" +-msgstr "接続遅延(_U):" ++msgstr "接続遅延(_U)" + + #: src/connection-editor/ce-page-bond.ui:387 +-#, fuzzy + msgid "Link _down delay" +-msgstr "接断遅延(_D):" ++msgstr "接断遅延(_D)" + + #: src/connection-editor/ce-page-bond.ui:481 +-#, fuzzy + msgid "_Primary" +-msgstr "プライマリー(_P):" ++msgstr "プライマリー(_P)" + + #: src/connection-editor/ce-page-bond.ui:495 + msgid "" +@@ -1319,9 +1301,8 @@ msgstr "" + #: src/connection-editor/ce-page-team.ui:319 + #: src/connection-editor/ce-page-vlan.ui:87 + #: src/connection-editor/ce-page-wifi.ui:111 +-#, fuzzy + msgid "_MTU" +-msgstr "MTU(_M):" ++msgstr "MTU(_M)" + + #: src/connection-editor/ce-page-bond.ui:540 + #: src/connection-editor/ce-page-ethernet.ui:223 +@@ -1333,35 +1314,29 @@ msgid "bytes" + msgstr "バイト" + + #: src/connection-editor/ce-page-bridge-port.ui:42 +-#, fuzzy + msgid "Path _cost" +-msgstr "経路のコスト(_C):" ++msgstr "経路のコスト(_C)" + + #: src/connection-editor/ce-page-bridge-port.ui:55 + #: src/connection-editor/ce-page-bridge.ui:178 +-#, fuzzy + msgid "_Priority" +-msgstr "優先度(_P):" ++msgstr "優先度(_P)" + + #: src/connection-editor/ce-page-bridge-port.ui:97 +-#, fuzzy + msgid "_Hairpin mode" +-msgstr "ヘアピンモード(_H):" ++msgstr "ヘアピンモード(_H)" + + #: src/connection-editor/ce-page-bridge.ui:62 +-#, fuzzy + msgid "Bridged _connections" +-msgstr "ブリッジ接続(_C):" ++msgstr "ブリッジ接続(_C)" + + #: src/connection-editor/ce-page-bridge.ui:218 +-#, fuzzy + msgid "_Forward delay" +-msgstr "転送遅延(_F):" ++msgstr "転送遅延(_F)" + + #: src/connection-editor/ce-page-bridge.ui:232 +-#, fuzzy + msgid "_Hello time" +-msgstr "Hello タイム(_H):" ++msgstr "Hello タイム(_H)" + + #: src/connection-editor/ce-page-bridge.ui:252 + msgid "STP forwarding delay, in seconds" +@@ -1412,27 +1387,24 @@ msgstr "" + "が一番低いブリッジが root ブリッジに選択されます。" + + #: src/connection-editor/ce-page-bridge.ui:378 +-#, fuzzy + msgid "_Max age" +-msgstr "最大エイジ(_M):" ++msgstr "最大エイジ(_M)" + + #: src/connection-editor/ce-page-bridge.ui:398 + msgid "STP maximum message age, in seconds" + msgstr "STP メッセージの最大エイジ (秒単位)" + + #: src/connection-editor/ce-page-bridge.ui:434 +-#, fuzzy + msgid "_Aging time" +-msgstr "エージング時間(_A):" ++msgstr "エージング時間(_A)" + + #: src/connection-editor/ce-page-bridge.ui:454 + msgid "The Ethernet MAC address aging time, in seconds" + msgstr "イーサネット MAC アドレスのエージングタイム (秒単位)" + + #: src/connection-editor/ce-page-bridge.ui:490 +-#, fuzzy + msgid "Group _forward mask" +-msgstr "グループの転送マスク(_F):" ++msgstr "グループの転送マスク(_F)" + + #: src/connection-editor/ce-page-bridge.ui:504 + msgid "" +@@ -1614,9 +1586,8 @@ msgstr "各ユーザー優先度の優先ポーズ転送を、有効もしくは + #: src/connection-editor/ce-page-dcb.ui:1822 + #: src/connection-editor/ce-page-dcb.ui:2154 + #: src/connection-editor/ce-page-dcb.ui:2486 +-#, fuzzy + msgid "0" +-msgstr "0:" ++msgstr "0" + + #: src/connection-editor/ce-page-dcb.ui:694 + #: src/connection-editor/ce-page-dcb.ui:1135 +@@ -1624,9 +1595,8 @@ msgstr "0:" + #: src/connection-editor/ce-page-dcb.ui:1862 + #: src/connection-editor/ce-page-dcb.ui:2194 + #: src/connection-editor/ce-page-dcb.ui:2536 +-#, fuzzy + msgid "1" +-msgstr "1:" ++msgstr "1" + + #: src/connection-editor/ce-page-dcb.ui:735 + #: src/connection-editor/ce-page-dcb.ui:1184 +@@ -1634,9 +1604,8 @@ msgstr "1:" + #: src/connection-editor/ce-page-dcb.ui:1902 + #: src/connection-editor/ce-page-dcb.ui:2234 + #: src/connection-editor/ce-page-dcb.ui:2586 +-#, fuzzy + msgid "2" +-msgstr "2:" ++msgstr "2" + + #: src/connection-editor/ce-page-dcb.ui:776 + #: src/connection-editor/ce-page-dcb.ui:1233 +@@ -1644,9 +1613,8 @@ msgstr "2:" + #: src/connection-editor/ce-page-dcb.ui:1942 + #: src/connection-editor/ce-page-dcb.ui:2274 + #: src/connection-editor/ce-page-dcb.ui:2636 +-#, fuzzy + msgid "3" +-msgstr "3:" ++msgstr "3" + + #: src/connection-editor/ce-page-dcb.ui:817 + #: src/connection-editor/ce-page-dcb.ui:1282 +@@ -1654,9 +1622,8 @@ msgstr "3:" + #: src/connection-editor/ce-page-dcb.ui:1982 + #: src/connection-editor/ce-page-dcb.ui:2314 + #: src/connection-editor/ce-page-dcb.ui:2686 +-#, fuzzy + msgid "4" +-msgstr "4:" ++msgstr "4" + + #: src/connection-editor/ce-page-dcb.ui:858 + #: src/connection-editor/ce-page-dcb.ui:1331 +@@ -1664,9 +1631,8 @@ msgstr "4:" + #: src/connection-editor/ce-page-dcb.ui:2022 + #: src/connection-editor/ce-page-dcb.ui:2354 + #: src/connection-editor/ce-page-dcb.ui:2736 +-#, fuzzy + msgid "5" +-msgstr "5:" ++msgstr "5" + + #: src/connection-editor/ce-page-dcb.ui:899 + #: src/connection-editor/ce-page-dcb.ui:1380 +@@ -1674,9 +1640,8 @@ msgstr "5:" + #: src/connection-editor/ce-page-dcb.ui:2062 + #: src/connection-editor/ce-page-dcb.ui:2394 + #: src/connection-editor/ce-page-dcb.ui:2786 +-#, fuzzy + msgid "6" +-msgstr "6:" ++msgstr "6" + + #: src/connection-editor/ce-page-dcb.ui:940 + #: src/connection-editor/ce-page-dcb.ui:1429 +@@ -1684,34 +1649,28 @@ msgstr "6:" + #: src/connection-editor/ce-page-dcb.ui:2102 + #: src/connection-editor/ce-page-dcb.ui:2434 + #: src/connection-editor/ce-page-dcb.ui:2836 +-#, fuzzy + msgid "7" +-msgstr "7:" ++msgstr "7" + + #: src/connection-editor/ce-page-dcb.ui:1069 +-#, fuzzy + msgid "Traffic Class" +-msgstr "トラフィッククラス:" ++msgstr "トラフィッククラス" + + #: src/connection-editor/ce-page-dcb.ui:1473 +-#, fuzzy + msgid "Strict Bandwidth" +-msgstr "厳密な帯域幅:" ++msgstr "厳密な帯域幅" + + #: src/connection-editor/ce-page-dcb.ui:1805 +-#, fuzzy + msgid "Priority Bandwidth" +-msgstr "優先帯域幅:" ++msgstr "優先帯域幅" + + #: src/connection-editor/ce-page-dcb.ui:2137 +-#, fuzzy + msgid "Group Bandwidth" +-msgstr "グループ帯域幅:" ++msgstr "グループ帯域幅" + + #: src/connection-editor/ce-page-dcb.ui:2469 +-#, fuzzy + msgid "Group ID" +-msgstr "グループ ID:" ++msgstr "グループ ID" + + #: src/connection-editor/ce-page-dcb.ui:2881 + msgid "Enter the priority group ID for each User Priority." +@@ -1745,9 +1704,8 @@ msgstr "各ユーザー優先度にトラフィッククラスを入力してく + #: src/wireless-security/eap-method-leap.ui:21 + #: src/wireless-security/eap-method-simple.ui:21 + #: src/wireless-security/ws-leap.ui:21 +-#, fuzzy + msgid "_Username" +-msgstr "ユーザー名(_U):" ++msgstr "ユーザー名(_U)" + + #: src/connection-editor/ce-page-dsl.ui:33 + msgid "Username used to authenticate with the PPPoE service." +@@ -1762,9 +1720,8 @@ msgstr "" + "す。多くのプロバイダーでは、これを空白にする必要があります。" + + #: src/connection-editor/ce-page-dsl.ui:59 +-#, fuzzy + msgid "_Service" +-msgstr "サービス(_S):" ++msgstr "サービス(_S)" + + #: src/connection-editor/ce-page-dsl.ui:71 + #: src/libnma/nma-file-cert-chooser.c:347 +@@ -1783,19 +1740,16 @@ msgstr "PPPoE サービスでの認証に使用されるパスワード。" + #: src/wireless-security/eap-method-leap.ui:35 + #: src/wireless-security/eap-method-simple.ui:35 + #: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20 +-#, fuzzy + msgid "_Password" +-msgstr "パスワード(_P):" ++msgstr "パスワード(_P)" + + #: src/connection-editor/ce-page-dsl.ui:116 +-#, fuzzy + msgid "PPP _interface" +-msgstr "PPP インスタンス(_I):" ++msgstr "PPP インターフェース(_I)" + + #: src/connection-editor/ce-page-dsl.ui:130 +-#, fuzzy + msgid "P_arent interface" +-msgstr "親インスタンス(_A):" ++msgstr "親インターフェース(_A)" + + #: src/connection-editor/ce-page-dsl.ui:144 + msgid "An arbitrary name to assign to the newly created PPP interface." +@@ -1806,9 +1760,8 @@ msgid "The interface on which the PPP connection will be established." + msgstr "PPP 接続が確立されるインターフェース。" + + #: src/connection-editor/ce-page-dsl.ui:171 +-#, fuzzy + msgid "C_laim interface" +-msgstr "親インスタンス(_A):" ++msgstr "Claim インターフェース(_L)" + + #: src/connection-editor/ce-page-dsl.ui:175 + msgid "" +@@ -1817,6 +1770,10 @@ msgid "" + "option can only be used for Ethernet interfaces. nm-applet is able to " + "activate the connection only if this option is selected." + msgstr "" ++"選択された場合、接続はインターフェースを排他制御し、別の接続を有効化すること" ++"はできません。このオプションは、Ethernet のインターフェースでのみ使用可能で" ++"す。このオプションが選択されている場合に限り、nm-applet は接続を有効化できま" ++"す。" + + #: src/connection-editor/ce-page-ethernet.ui:17 + #: src/connection-editor/ce-page-ethernet.ui:77 +@@ -1883,20 +1840,17 @@ msgid "Manual" + msgstr "手動" + + #: src/connection-editor/ce-page-ethernet.ui:97 +-#, fuzzy + msgid "_Port" +-msgstr "ポート(_P):" ++msgstr "ポート(_P)" + + #: src/connection-editor/ce-page-ethernet.ui:156 + #: src/connection-editor/ce-page-wifi.ui:169 +-#, fuzzy + msgid "C_loned MAC address" +-msgstr "クローンした MAC アドレス(_L):" ++msgstr "クローンした MAC アドレス(_L)" + + #: src/connection-editor/ce-page-ethernet.ui:242 +-#, fuzzy + msgid "Wake on LAN" +-msgstr "Wake on LAN:" ++msgstr "Wake on LAN" + + #: src/connection-editor/ce-page-ethernet.ui:258 + msgid "De_fault" +@@ -1931,9 +1885,8 @@ msgid "Ma_gic" + msgstr "Magic(_G)" + + #: src/connection-editor/ce-page-ethernet.ui:388 +-#, fuzzy + msgid "_Wake on LAN password" +-msgstr "Wake on LAN パスワード(_W):" ++msgstr "Wake on LAN パスワード(_W)" + + #: src/connection-editor/ce-page-ethernet.ui:402 + msgid "" +@@ -1941,9 +1894,8 @@ msgid "" + msgstr "Wake-on-LAN パスワード (Ethernet MAC)。magic packet にのみ有効です。" + + #: src/connection-editor/ce-page-ethernet.ui:414 +-#, fuzzy + msgid "Lin_k negotiation" +-msgstr "リンクネゴシエーション(_K):" ++msgstr "リンクネゴシエーション(_K)" + + #: src/connection-editor/ce-page-ethernet.ui:428 + msgid "" +@@ -1956,9 +1908,8 @@ msgstr "" + "にしておくか「自動」を選択してください。" + + #: src/connection-editor/ce-page-ethernet.ui:448 +-#, fuzzy + msgid "_Speed" +-msgstr "スピード(_S):" ++msgstr "スピード(_S)" + + #: src/connection-editor/ce-page-ethernet.ui:462 + msgid "" +@@ -1971,9 +1922,8 @@ msgstr "" + "ポートしていることを確認してください。" + + #: src/connection-editor/ce-page-ethernet.ui:482 +-#, fuzzy + msgid "Duple_x" +-msgstr "二重(_X):" ++msgstr "二重(_X)" + + #: src/connection-editor/ce-page-ethernet.ui:496 + msgid "" +@@ -1987,31 +1937,27 @@ msgstr "" + + #: src/connection-editor/ce-page-general.ui:29 + msgid "Yes" +-msgstr "" ++msgstr "はい" + + #: src/connection-editor/ce-page-general.ui:32 +-#, fuzzy + msgid "No" +-msgstr "なし" ++msgstr "いいえ" + + #: src/connection-editor/ce-page-general.ui:65 + msgid "All _users may connect to this network" + msgstr "全ユーザーがこのネットワークに接続可能とする(_U)" + + #: src/connection-editor/ce-page-general.ui:80 +-#, fuzzy + msgid "Automatically connect to _VPN" +-msgstr "この接続を使用したときは自動的に VPN に接続する(_V)" ++msgstr "自動的に VPN に接続する(_V)" + + #: src/connection-editor/ce-page-general.ui:96 +-#, fuzzy + msgid "Firewall _zone" +-msgstr "ファイアウォールゾーン(_Z):" ++msgstr "ファイアウォールゾーン(_Z)" + + #: src/connection-editor/ce-page-general.ui:121 +-#, fuzzy + msgid "_Metered connection" +-msgstr "チーム接続(_T):" ++msgstr "測定接続(_M)" + + #: src/connection-editor/ce-page-general.ui:134 + msgid "" +@@ -2020,11 +1966,14 @@ msgid "" + "“No”) to indicate to applications, or “Automatic” to use a default value " + "based on the connection type and other heuristics." + msgstr "" ++"NetworkManager は、接続が測定されているかどうかをアプリケーションに示すので、" ++"データの使用は制限されなければなりません。アプリケーションに示す値 (「はい」 " ++"または「いいえ」) がどちらなのかを選択するか、または「自動」を選択して接続の" ++"種類とその他のヒューリスティックをもとにデフォルトの値を使用します。" + + #: src/connection-editor/ce-page-general.ui:150 +-#, fuzzy + msgid "Connect _automatically with priority" +-msgstr "自動取得したルートを無視する(_N)" ++msgstr "優先的に自動接続する(_A)" + + #: src/connection-editor/ce-page-general.ui:167 + msgid "" +@@ -2077,9 +2026,8 @@ msgid "Connected" + msgstr "コネクション型" + + #: src/connection-editor/ce-page-infiniband.ui:37 +-#, fuzzy + msgid "_Transport mode" +-msgstr "転送モード(_T):" ++msgstr "転送モード(_T)" + + #: src/connection-editor/ce-page-ip-tunnel.ui:17 + msgid "IPIP" +@@ -2119,46 +2067,38 @@ msgstr "VTI6" + + #: src/connection-editor/ce-page-ip-tunnel.ui:61 + #: src/connection-editor/ce-page-macsec.ui:58 +-#, fuzzy + msgid "Device name" +-msgstr "デバイス名:" ++msgstr "デバイス名" + + #: src/connection-editor/ce-page-ip-tunnel.ui:85 + #: src/connection-editor/ce-page-macsec.ui:83 +-#, fuzzy + msgid "Parent device" +-msgstr "親デバイス:" ++msgstr "親デバイス" + + #: src/connection-editor/ce-page-ip-tunnel.ui:115 + #: src/connection-editor/ce-page-macsec.ui:180 +-#, fuzzy + msgid "Mode" +-msgstr "モード:" ++msgstr "モード" + + #: src/connection-editor/ce-page-ip-tunnel.ui:128 +-#, fuzzy + msgid "Local IP" +-msgstr "ローカル IP:" ++msgstr "ローカル IP" + + #: src/connection-editor/ce-page-ip-tunnel.ui:140 +-#, fuzzy + msgid "Remote IP" +-msgstr "リモート IP:" ++msgstr "リモート IP" + + #: src/connection-editor/ce-page-ip-tunnel.ui:152 +-#, fuzzy + msgid "Input key" +-msgstr "入力キー:" ++msgstr "入力キー" + + #: src/connection-editor/ce-page-ip-tunnel.ui:164 +-#, fuzzy + msgid "Output key" +-msgstr "出力キー:" ++msgstr "出力キー" + + #: src/connection-editor/ce-page-ip-tunnel.ui:245 +-#, fuzzy + msgid "MTU" +-msgstr "MTU:" ++msgstr "MTU" + + #: src/connection-editor/ce-page-ip4.ui:15 + #: src/connection-editor/ce-page-ip6.ui:15 +@@ -2178,9 +2118,8 @@ msgstr "他のコンピューターへ共有" + + #: src/connection-editor/ce-page-ip4.ui:47 + #: src/connection-editor/ce-page-ip6.ui:78 +-#, fuzzy + msgid "_Method" +-msgstr "方式(_M):" ++msgstr "メソッド(_M)" + + #: src/connection-editor/ce-page-ip4.ui:202 + msgid "" +@@ -2202,23 +2141,20 @@ msgstr "" + "使います。" + + #: src/connection-editor/ce-page-ip4.ui:228 +-#, fuzzy + msgid "D_HCP client ID" +-msgstr "DHCP クライアント ID(_H):" ++msgstr "DHCP クライアント ID(_H)" + + #: src/connection-editor/ce-page-ip4.ui:242 + #: src/connection-editor/ce-page-ip6.ui:246 + #: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347 +-#, fuzzy + msgid "S_earch domains" +-msgstr "ドメインを検索(_E):" ++msgstr "ドメインを検索(_E)" + + #: src/connection-editor/ce-page-ip4.ui:256 + #: src/connection-editor/ce-page-ip6.ui:260 + #: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338 +-#, fuzzy + msgid "DNS ser_vers" +-msgstr "DNS サーバー(_V):" ++msgstr "DNS サーバー(_V)" + + #: src/connection-editor/ce-page-ip4.ui:270 + msgid "" +@@ -2278,14 +2214,12 @@ msgstr "" + "ンクローカルアドレスは、接続中のインターフェースに自動的にスコープされます。" + + #: src/connection-editor/ce-page-ip6.ui:287 +-#, fuzzy + msgid "IPv6 _privacy extensions" +-msgstr "IPv6 のプライバシー拡張(_P):" ++msgstr "IPv6 のプライバシー拡張(_P)" + + #: src/connection-editor/ce-page-ip6.ui:319 +-#, fuzzy + msgid "IPv6 address _generation mode" +-msgstr "IPv6 アドレス生成モード(_G):" ++msgstr "IPv6 アドレス生成モード(_G)" + + #: src/connection-editor/ce-page-ip6.ui:356 + msgid "Require IPv_6 addressing for this connection to complete" +@@ -2353,34 +2287,28 @@ msgstr "" + "モードでは、802.1X セキュリティーページにパラメーターを追加します。" + + #: src/connection-editor/ce-page-macsec.ui:154 +-#, fuzzy + msgid "CKN" +-msgstr "CKN:" ++msgstr "CKN" + + #: src/connection-editor/ce-page-macsec.ui:167 +-#, fuzzy + msgid "CAK" +-msgstr "CAK:" ++msgstr "CAK" + + #: src/connection-editor/ce-page-macsec.ui:191 +-#, fuzzy + msgid "Keys" +-msgstr "キー:" ++msgstr "キー" + + #: src/connection-editor/ce-page-macsec.ui:207 +-#, fuzzy + msgid "Parameters" +-msgstr "パラメーター:" ++msgstr "パラメーター" + + #: src/connection-editor/ce-page-macsec.ui:224 +-#, fuzzy + msgid "Validation" +-msgstr "検証:" ++msgstr "検証" + + #: src/connection-editor/ce-page-macsec.ui:236 +-#, fuzzy + msgid "SCI port" +-msgstr "SCI ポート:" ++msgstr "SCI ポート" + + #: src/connection-editor/ce-page-macsec.ui:247 + msgid "Specifies the validation mode for incoming frames" +@@ -2404,32 +2332,28 @@ msgid "Basic" + msgstr "基本" + + #: src/connection-editor/ce-page-mobile.ui:48 +-#, fuzzy + msgid "Nu_mber" +-msgstr "番号(_M):" ++msgstr "番号(_M)" + + #: src/connection-editor/ce-page-mobile.ui:142 + msgid "Advanced" + msgstr "高度" + + #: src/connection-editor/ce-page-mobile.ui:165 +-#, fuzzy + msgid "_APN" +-msgstr "APN(_A):" ++msgstr "APN(_A)" + + #: src/connection-editor/ce-page-mobile.ui:179 +-#, fuzzy + msgid "N_etwork ID" +-msgstr "ネットワーク ID(_E):" ++msgstr "ネットワーク ID(_E)" + + #: src/connection-editor/ce-page-mobile.ui:221 + msgid "Change…" + msgstr "変更..." + + #: src/connection-editor/ce-page-mobile.ui:242 +-#, fuzzy + msgid "P_IN" +-msgstr "PIN 番号(_I):" ++msgstr "PIN (_I)" + + #: src/connection-editor/ce-page-mobile.ui:266 + msgid "Allow _roaming if home network is not available" +@@ -2445,9 +2369,8 @@ msgid "Authentication" + msgstr "認証" + + #: src/connection-editor/ce-page-ppp.ui:53 +-#, fuzzy + msgid "Allowed methods" +-msgstr "利用可能な認証方法:" ++msgstr "利用可能なメソッド" + + # "auth_methods_button"ボタンのラベル + #: src/connection-editor/ce-page-ppp.ui:89 +@@ -2505,14 +2428,12 @@ msgstr "" + "このプロキシ設定を、ブラウザーのクライアント/スキームにのみ使用します。" + + #: src/connection-editor/ce-page-proxy.ui:52 +-#, fuzzy + msgid "PAC URL" +-msgstr "PAC URL:" ++msgstr "PAC URL" + + #: src/connection-editor/ce-page-proxy.ui:64 +-#, fuzzy + msgid "PAC script" +-msgstr "PAC スクリプト:" ++msgstr "PAC スクリプト" + + #: src/connection-editor/ce-page-proxy.ui:76 + msgid "URL from where the PAC script is to be obtained." +@@ -2523,9 +2444,8 @@ msgid "Import script from a file…" + msgstr "ファイルからスクリプトをインポート..." + + #: src/connection-editor/ce-page-proxy.ui:101 +-#, fuzzy + msgid "Method" +-msgstr "方式:" ++msgstr "メソッド" + + #: src/connection-editor/ce-page-team-port.ui:47 + #: src/connection-editor/ce-page-team.ui:400 +@@ -2557,9 +2477,8 @@ msgid "Team Advanced Options" + msgstr "チームの高度なオプション" + + #: src/connection-editor/ce-page-team-port.ui:225 +-#, fuzzy + msgid "_Queue ID" +-msgstr "キュー ID(_ID):" ++msgstr "キュー ID(_Q)" + + #: src/connection-editor/ce-page-team-port.ui:239 + #: src/connection-editor/ce-page-team.ui:662 +@@ -2579,9 +2498,8 @@ msgid "Active-Backup runner options" + msgstr "Active-Backup ランナーオプション" + + #: src/connection-editor/ce-page-team-port.ui:271 +-#, fuzzy + msgid "_Port priority" +-msgstr "ポート優先度(_P):" ++msgstr "ポート優先度(_P)" + + #: src/connection-editor/ce-page-team-port.ui:284 + #: src/connection-editor/ce-page-team.ui:712 +@@ -2602,20 +2520,19 @@ msgstr "ポート付箋(_S)" + #: src/connection-editor/ce-page-team-port.ui:301 + msgid "Do not unselect the port if a better one becomes available." + msgstr "" ++"より良いポートが使用可能となった場合、ポートの選択を解除しないでください。" + + #: src/connection-editor/ce-page-team-port.ui:316 + msgid "LACP runner options" + msgstr "LACP ランナーオプション" + + #: src/connection-editor/ce-page-team-port.ui:332 +-#, fuzzy + msgid "_LACP port priority" +-msgstr "LACP ポート優先度(_L):" ++msgstr "LACP ポート優先度(_L)" + + #: src/connection-editor/ce-page-team-port.ui:346 +-#, fuzzy + msgid "LACP port _key" +-msgstr "LACP ポートキー(_K):" ++msgstr "LACP ポートキー(_K)" + + #: src/connection-editor/ce-page-team-port.ui:359 + #: src/connection-editor/ce-page-team.ui:675 +@@ -2650,51 +2567,43 @@ msgstr "LACP 標準に準拠したポートキー。同じキーのポートだ + + #: src/connection-editor/ce-page-team-port.ui:416 + #: src/connection-editor/ce-page-team.ui:1142 +-#, fuzzy + msgid "_Link watcher" +-msgstr "リンクウォッチャー(_L):" ++msgstr "リンクウォッチャー(_L)" + + #: src/connection-editor/ce-page-team-port.ui:431 + #: src/connection-editor/ce-page-team.ui:1157 +-#, fuzzy + msgid "_Up delay" +-msgstr "アップ遅延(_U):" ++msgstr "アップ遅延(_U)" + + #: src/connection-editor/ce-page-team-port.ui:446 + #: src/connection-editor/ce-page-team.ui:1172 +-#, fuzzy + msgid "_Down delay" +-msgstr "ダウン遅延(_D):" ++msgstr "ダウン遅延(_D)" + + #: src/connection-editor/ce-page-team-port.ui:461 + #: src/connection-editor/ce-page-team.ui:1187 +-#, fuzzy + msgid "Send _interval" +-msgstr "送信間隔(_I):" ++msgstr "送信間隔(_I)" + + #: src/connection-editor/ce-page-team-port.ui:476 + #: src/connection-editor/ce-page-team.ui:1202 +-#, fuzzy + msgid "Delay _before first send" +-msgstr "初回送信までの遅延(_B):" ++msgstr "初回送信までの遅延(_B)" + + #: src/connection-editor/ce-page-team-port.ui:491 + #: src/connection-editor/ce-page-team.ui:1217 +-#, fuzzy + msgid "_Maximum missed replies" +-msgstr "不在着信となった返信の最大数(_M):" ++msgstr "不在着信となった返信の最大数(_M)" + + #: src/connection-editor/ce-page-team-port.ui:506 + #: src/connection-editor/ce-page-team.ui:1232 +-#, fuzzy + msgid "_Source host" +-msgstr "ソースホスト(_S):" ++msgstr "ソースホスト(_S)" + + #: src/connection-editor/ce-page-team-port.ui:521 + #: src/connection-editor/ce-page-team.ui:1247 +-#, fuzzy + msgid "_Target host" +-msgstr "ターゲットホスト(_T):" ++msgstr "ターゲットホスト(_T)" + + #: src/connection-editor/ce-page-team-port.ui:535 + #: src/connection-editor/ce-page-team.ui:1261 +@@ -2805,9 +2714,8 @@ msgstr "ファイルからチーム設定をインポートする(_P)..." + + #: src/connection-editor/ce-page-team-port.ui:826 + #: src/connection-editor/ce-page-team.ui:1552 +-#, fuzzy + msgid "Edit _JSON configuration" +-msgstr "JSON 設定の編集(_J):" ++msgstr "JSON 設定の編集(_J)" + + #: src/connection-editor/ce-page-team-port.ui:845 + #: src/connection-editor/ce-page-team.ui:1571 +@@ -2847,9 +2755,8 @@ msgid "From active to team device" + msgstr "アクティブからチームデバイスへ" + + #: src/connection-editor/ce-page-team.ui:174 +-#, fuzzy + msgid "_Teamed connections" +-msgstr "チーム接続(_T):" ++msgstr "チーム接続(_T)" + + #: src/connection-editor/ce-page-team.ui:441 + msgid "Load balance" +@@ -2897,29 +2804,24 @@ msgid "Any L4 protocol" + msgstr "すべての L4 プロトコル" + + #: src/connection-editor/ce-page-team.ui:603 +-#, fuzzy + msgid "_Peer notification count" +-msgstr "ピア通知数(_P):" ++msgstr "ピア通知数(_P)" + + #: src/connection-editor/ce-page-team.ui:618 +-#, fuzzy + msgid "Peer _notification interval" +-msgstr "ピア通知間隔(_N):" ++msgstr "ピア通知間隔(_N)" + + #: src/connection-editor/ce-page-team.ui:633 +-#, fuzzy + msgid "_Multicast rejoin count" +-msgstr "マルチキャスト再参加数(_M):" ++msgstr "マルチキャスト再参加数(_M)" + + #: src/connection-editor/ce-page-team.ui:648 +-#, fuzzy + msgid "Multicast _rejoin interval" +-msgstr "マルチキャスト再参加間隔(_R):" ++msgstr "マルチキャスト再参加間隔(_R)" + + #: src/connection-editor/ce-page-team.ui:739 +-#, fuzzy + msgid "_Hardware Address" +-msgstr "ハードウェアアドレス(_H):" ++msgstr "ハードウェアアドレス(_H)" + + #: src/connection-editor/ce-page-team.ui:752 + msgid "" +@@ -2930,14 +2832,12 @@ msgstr "" + "す。" + + #: src/connection-editor/ce-page-team.ui:798 +-#, fuzzy + msgid "_Runner" +-msgstr "ランナー(_R):" ++msgstr "ランナー(_R)" + + #: src/connection-editor/ce-page-team.ui:813 +-#, fuzzy + msgid "_Hardware address policy" +-msgstr "ハードウェアアドレスポリシー(_H):" ++msgstr "ハードウェアアドレスポリシー(_H)" + + #: src/connection-editor/ce-page-team.ui:827 + msgid "Name of runner to be used." +@@ -2978,19 +2878,16 @@ msgstr "" + "入れない場合は、30 秒ごとに送信されます。" + + #: src/connection-editor/ce-page-team.ui:903 +-#, fuzzy + msgid "_System priority" +-msgstr "システム優先度(_S):" ++msgstr "システム優先度(_S)" + + #: src/connection-editor/ce-page-team.ui:918 +-#, fuzzy + msgid "_Minimum ports" +-msgstr "最小ポート数(_M):" ++msgstr "最小ポート数(_M)" + + #: src/connection-editor/ce-page-team.ui:933 +-#, fuzzy + msgid "_Aggregator selection policy" +-msgstr "アグリゲーター選択ポリシー(_A):" ++msgstr "アグリゲーター選択ポリシー(_A)" + + #: src/connection-editor/ce-page-team.ui:947 + msgid "System priority, value can be 0 – 65535." +@@ -3030,41 +2927,34 @@ msgstr "" + "効になっています。" + + #: src/connection-editor/ce-page-team.ui:1085 +-#, fuzzy + msgid "Transmission _balancing interval" +-msgstr "転送バランシングの間隔(_B):" ++msgstr "転送バランシングの間隔(_B)" + + #: src/connection-editor/ce-page-team.ui:1100 +-#, fuzzy + msgid "_Transmission balancer" +-msgstr "転送バランサー(_T):" ++msgstr "転送バランサー(_T)" + + #: src/connection-editor/ce-page-team.ui:1119 + msgid "Runner" + msgstr "ランナー" + + #: src/connection-editor/ce-page-vlan.ui:28 +-#, fuzzy + msgid "_Parent interface" +-msgstr "親インターフェース(_P):" ++msgstr "親インターフェース(_P)" + + #: src/connection-editor/ce-page-vlan.ui:41 +-#, fuzzy + msgid "VLAN inter_face name" +-msgstr "VLAN インターフェース名(_F):" ++msgstr "VLAN インターフェース名(_F)" + + #: src/connection-editor/ce-page-vlan.ui:55 +-#, fuzzy + msgid "Cloned MAC _address" +-msgstr "クローンの MAC アドレス(_A):" ++msgstr "クローンの MAC アドレス(_A)" + + #: src/connection-editor/ce-page-vlan.ui:140 +-#, fuzzy + msgid "VLAN _id" +-msgstr "VLAN ID(_I):" ++msgstr "VLAN ID(_I)" + + #: src/connection-editor/ce-page-vlan.ui:197 +-#, fuzzy + msgid "Flags" + msgstr "フラグ" + +@@ -3095,9 +2985,8 @@ msgid "\"vlan\" + number" + msgstr "\"vlan\" + 番号" + + #: src/connection-editor/ce-page-wifi-security.ui:29 +-#, fuzzy + msgid "S_ecurity" +-msgstr "セキュリティー(_E):" ++msgstr "セキュリティー(_E)" + + #: src/connection-editor/ce-page-wifi.ui:35 + msgid "A (5 GHz)" +@@ -3120,38 +3009,32 @@ msgid "mW" + msgstr "mW" + + #: src/connection-editor/ce-page-wifi.ui:222 +-#, fuzzy + msgid "Transmission po_wer" +-msgstr "送信パワー(_W):" ++msgstr "送信パワー(_W)" + + #: src/connection-editor/ce-page-wifi.ui:256 + msgid "Mb/s" + msgstr "Mb/s" + + #: src/connection-editor/ce-page-wifi.ui:275 +-#, fuzzy + msgid "_Rate" +-msgstr "レート(_R):" ++msgstr "レート(_R)" + + #: src/connection-editor/ce-page-wifi.ui:311 +-#, fuzzy + msgid "_BSSID" +-msgstr "BSSID(_B):" ++msgstr "BSSID(_B)" + + #: src/connection-editor/ce-page-wifi.ui:336 +-#, fuzzy + msgid "C_hannel" +-msgstr "チャンネル(_H):" ++msgstr "チャンネル(_H)" + + #: src/connection-editor/ce-page-wifi.ui:368 +-#, fuzzy + msgid "Ban_d" +-msgstr "バンド(_D):" ++msgstr "バンド(_D)" + + #: src/connection-editor/ce-page-wifi.ui:414 +-#, fuzzy + msgid "SS_ID" +-msgstr "SSID(_I):" ++msgstr "SSID(_I)" + + #: src/connection-editor/ce-polkit.c:63 + #: src/connection-editor/ce-polkit-button.c:74 +@@ -3270,15 +3153,11 @@ msgstr "VPN" + + #: src/connection-editor/connection-helpers.c:204 + msgid "No VPN service type." +-msgstr "" ++msgstr "VPN サービスの種類はありません。" + + #: src/connection-editor/connection-helpers.c:209 +-#, fuzzy + msgid "The VPN plugin failed to import the VPN connection correctly: " +-msgstr "" +-"VPN プラグインは、VPN 接続の正常なインポートに失敗しました\n" +-"\n" +-"エラー: VPN サービスタイプがありません。" ++msgstr "VPN プラグインは、VPN 接続の正常なインポートに失敗しました:" + + #: src/connection-editor/connection-helpers.c:293 + #: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341 +@@ -3326,13 +3205,12 @@ msgid "Are you sure you wish to delete the connection %s?" + msgstr "接続 %s を削除してもよろしいですか?" + + #: src/connection-editor/gtk/menus.ui:6 +-#, fuzzy + msgid "_New Connection" +-msgstr "VPN 接続(_V)" ++msgstr "新しい接続(_N)" + + #: src/connection-editor/gtk/menus.ui:13 + msgid "_Quit" +-msgstr "" ++msgstr "終了(_Q)" + + #: src/connection-editor/ip4-routes-dialog.c:697 + #: src/connection-editor/ip6-routes-dialog.c:718 +@@ -3451,9 +3329,8 @@ msgstr "" + "す。" + + #: src/connection-editor/nm-connection-editor.ui:110 +-#, fuzzy + msgid "Connection _name" +-msgstr "接続名(_N):" ++msgstr "接続名(_N)" + + #: src/connection-editor/nm-connection-editor.ui:170 + msgid "_Export…" +@@ -3561,19 +3438,17 @@ msgid "Authenticate to delete the selected connection" + msgstr "選択した接続の削除を認証する" + + #: src/connection-editor/nm-connection-list.c:1059 +-#, fuzzy + msgid "Unrecognized connection type" +-msgstr "サポートされていないモバイルブロードバンドの接続タイプ。" ++msgstr "認識されない接続タイプ" + + #: src/connection-editor/nm-connection-list.c:1064 +-#, fuzzy, c-format ++#, c-format + msgid "Don’t know how to import “%s” connections" +-msgstr "接続 '%s' の作成方法がわかりません" ++msgstr "接続 “%s” のインポート方法がわかりません" + + #: src/connection-editor/nm-connection-list.c:1068 +-#, fuzzy + msgid "Error importing connection" +-msgstr "接続の編集エラー" ++msgstr "接続のインポートエラー" + + #: src/connection-editor/nm-connection-list.c:1075 + #: src/connection-editor/nm-connection-list.c:1090 +@@ -3582,9 +3457,8 @@ msgid "Error creating connection" + msgstr "接続の作成中にエラー" + + #: src/connection-editor/nm-connection-list.c:1075 +-#, fuzzy + msgid "Connection type not specified." +-msgstr "接続を変更できません" ++msgstr "接続タイプは指定されていません。" + + #: src/connection-editor/nm-connection-list.c:1091 + msgid "No VPN plugins are installed." +@@ -3836,14 +3710,12 @@ msgid "Link-Local Only" + msgstr "ローカルへのリンク専用" + + #: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336 +-#, fuzzy + msgid "Additional DNS ser_vers" +-msgstr "追加の DNS サーバー(_V):" ++msgstr "追加の DNS サーバー(_V)" + + #: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345 +-#, fuzzy + msgid "Additional s_earch domains" +-msgstr "追加の検索ドメイン(_E):" ++msgstr "追加の検索ドメイン(_E)" + + #: src/connection-editor/page-ip4.c:1033 + #, c-format +@@ -4265,7 +4137,7 @@ msgstr "閉じる(_C)" + + #: src/libnma/nma-bar-code-widget.ui:36 + msgid "Scan with your phone or Print" +-msgstr "" ++msgstr "電話でスキャンするか、印刷します" + + #: src/libnma/nma-file-cert-chooser.c:108 + #: src/libnma/nma-pkcs11-cert-chooser.c:152 +@@ -4285,15 +4157,15 @@ msgstr "%s 証明書のキーを選択する" + + #: src/libnma/nma-file-cert-chooser.c:250 + #: src/libnma/nma-pkcs11-cert-chooser.c:386 +-#, fuzzy, c-format ++#, c-format + msgid "%s private _key" +-msgstr "%s プライベートキー(_K):" ++msgstr "%s プライベートキー(_K)" + + #: src/libnma/nma-file-cert-chooser.c:254 + #: src/libnma/nma-pkcs11-cert-chooser.c:390 +-#, fuzzy, c-format ++#, c-format + msgid "%s key _password" +-msgstr "%s キーパスワード(_P):" ++msgstr "%s キーパスワード(_P)" + + #: src/libnma/nma-file-cert-chooser.c:258 + #, c-format +@@ -4302,9 +4174,9 @@ msgstr "%s 証明書を選択する" + + #: src/libnma/nma-file-cert-chooser.c:262 + #: src/libnma/nma-pkcs11-cert-chooser.c:398 +-#, fuzzy, c-format ++#, c-format + msgid "%s _certificate" +-msgstr "%s 証明書(_C):" ++msgstr "%s 証明書(_C)" + + #: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077 + msgid "My country is not listed" +@@ -4372,9 +4244,8 @@ msgid "Set up a Mobile Broadband Connection" + msgstr "モバイルブロードバンド接続のセットアップ" + + #: src/libnma/nma-mobile-wizard.ui:189 +-#, fuzzy + msgid "Country or region:" +-msgstr "国や地域" ++msgstr "国または地域:" + + #: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127 + msgid "Choose your Provider’s Country or Region" +@@ -4385,9 +4256,8 @@ msgid "Select your provider from a _list:" + msgstr "プロバイダーを一覧から選択(_L):" + + #: src/libnma/nma-mobile-wizard.ui:289 +-#, fuzzy + msgid "I can’t find my provider and I wish to set up the connection _manually:" +-msgstr "プロバイダーが見つからないので手動で入力します(_M):" ++msgstr "プロバイダーが見つからないので手動で接続を設定します(_M):" + + #: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779 + msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)" +@@ -4502,9 +4372,9 @@ msgid "Choose a %s Certificate" + msgstr "%s 証明書を選択する" + + #: src/libnma/nma-pkcs11-cert-chooser.c:402 +-#, fuzzy, c-format ++#, c-format + msgid "%s certificate _password" +-msgstr "%s 証明書のパスワード(_P):" ++msgstr "%s 証明書のパスワード(_P)" + + #: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255 + msgid "Error logging in: " +@@ -4636,19 +4506,16 @@ msgstr "" + "接続する Wi-Fi ネットワークの名前とセキュリティー詳細を入力してください。" + + #: src/libnma/wifi.ui:97 +-#, fuzzy + msgid "Wi-Fi _security" +-msgstr "Wi-Fi セキュリティー(_S):" ++msgstr "Wi-Fi セキュリティー(_S)" + + #: src/libnma/wifi.ui:154 +-#, fuzzy + msgid "C_onnection" +-msgstr "接続(_O):" ++msgstr "接続(_O)" + + #: src/libnma/wifi.ui:179 +-#, fuzzy + msgid "Wi-Fi _adapter" +-msgstr "Wi-Fi アダプター(_A):" ++msgstr "Wi-Fi アダプター(_A)" + + #: src/libnm-gtk/nm-mobile-wizard.c:749 + msgid "I can’t find my provider and I wish to enter it _manually:" +@@ -4907,21 +4774,18 @@ msgstr "両方" + #: src/wireless-security/eap-method-fast.ui:48 + #: src/wireless-security/eap-method-peap.ui:48 + #: src/wireless-security/eap-method-ttls.ui:118 +-#, fuzzy + msgid "Anony_mous identity" +-msgstr "匿名の識別子(_M):" ++msgstr "匿名の識別子(_M)" + + #: src/wireless-security/eap-method-fast.ui:74 +-#, fuzzy + msgid "PAC _file" +-msgstr "PAC ファイル(_F):" ++msgstr "PAC ファイル(_F)" + + #: src/wireless-security/eap-method-fast.ui:113 + #: src/wireless-security/eap-method-peap.ui:120 + #: src/wireless-security/eap-method-ttls.ui:77 +-#, fuzzy + msgid "_Inner authentication" +-msgstr "内部認証(_I):" ++msgstr "内部認証(_I)" + + # see http://www.cisco.com/cisco/web/support/JP/100/1005/1005630_eapfast-wlc-rad-config.html#PAC + #: src/wireless-security/eap-method-fast.ui:142 +@@ -4957,9 +4821,8 @@ msgid "No CA certificate is _required" + msgstr "CA 証明書は必要ありません(_R)" + + #: src/wireless-security/eap-method-peap.ui:89 +-#, fuzzy + msgid "PEAP _version" +-msgstr "PEAP バージョン(_V):" ++msgstr "PEAP バージョン(_V)" + + #: src/wireless-security/eap-method-peap.ui:166 + #: src/wireless-security/eap-method-tls.ui:62 +@@ -4970,9 +4833,8 @@ msgstr "サーバー証明書名のサフィックス" + #: src/wireless-security/eap-method-peap.ui:167 + #: src/wireless-security/eap-method-tls.ui:63 + #: src/wireless-security/eap-method-ttls.ui:133 +-#, fuzzy + msgid "_Domain" +-msgstr "ドメイン(_D):" ++msgstr "ドメイン(_D)" + + #: src/wireless-security/eap-method-simple.c:90 + msgid "missing EAP username" +@@ -4984,17 +4846,15 @@ msgstr "EAP パスワードがありません" + + #: src/wireless-security/eap-method-simple.c:120 + msgid "missing EAP client Private Key passphrase" +-msgstr "" ++msgstr "EAP クライアントの秘密鍵のパスフレーズがありません" + + #: src/wireless-security/eap-method-simple.ui:103 +-#, fuzzy + msgid "P_rivate Key Passphrase" +-msgstr "WEP 128-bit パスフレーズ" ++msgstr "秘密鍵のパスフレーズ(_R)" + + #: src/wireless-security/eap-method-simple.ui:128 +-#, fuzzy + msgid "Sh_ow passphrase" +-msgstr "パスワードを表示(_O)" ++msgstr "パスフレーズの表示(_O)" + + #: src/wireless-security/eap-method-tls.c:64 + msgid "missing EAP-TLS identity" +@@ -5019,9 +4879,8 @@ msgstr "選択されたキーファイルは存在しません" + # とりあえずこのように訳しておくが "Identity" のままの方が適切かもしれない。 + # (WPA-EAP Identity 認証方式: ユーザ ID とパスワードの組で認証) + #: src/wireless-security/eap-method-tls.ui:20 +-#, fuzzy + msgid "I_dentity" +-msgstr "アイデンティティー(_D):" ++msgstr "ID(_D)" + + #: src/wireless-security/eap-method-ttls.c:337 + msgid "MSCHAPv2 (no EAP)" +@@ -5053,14 +4912,13 @@ msgstr "保護つき EAP (PEAP)" + + #: src/wireless-security/wireless-security.c:523 + msgid "Externally configured" +-msgstr "" ++msgstr "外部で設定" + + #: src/wireless-security/ws-dynamic-wep.ui:31 + #: src/wireless-security/ws-wep-key.ui:97 + #: src/wireless-security/ws-wpa-eap.ui:31 +-#, fuzzy + msgid "Au_thentication" +-msgstr "認証(_T):" ++msgstr "認証(_T)" + + #: src/wireless-security/ws-leap.c:64 + msgid "missing leap-username" +@@ -5115,18 +4973,16 @@ msgid "1 (Default)" + msgstr "1 (デフォルト)" + + #: src/wireless-security/ws-wep-key.ui:54 +-#, fuzzy + msgid "_Key" +-msgstr "キー(_K):" ++msgstr "キー(_K)" + + #: src/wireless-security/ws-wep-key.ui:80 + msgid "Sho_w key" + msgstr "キーを表示(_W)" + + #: src/wireless-security/ws-wep-key.ui:129 +-#, fuzzy + msgid "WEP inde_x" +-msgstr "WEP インデックス(_X):" ++msgstr "WEP インデックス(_X)" + + #: src/wireless-security/ws-wpa-psk.c:76 + #, c-format +@@ -5142,43 +4998,5 @@ msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" + msgstr "無効な wpa-psk: 16 進数の 64 バイトでキーを解釈できません" + + #: src/wireless-security/ws-wpa-psk.ui:48 +-#, fuzzy + msgid "_Type" +-msgstr "タイプ(_T):" +- +-#~ msgid "%s (default)" +-#~ msgstr "%s (デフォルト)" +- +-#~ msgid "Ignored" +-#~ msgstr "無視" +- +-#~ msgid "Active Network Connections" +-#~ msgstr "有効なネットワーク接続" +- +-#~ msgid "Failed to update connection secrets due to an unknown error." +-#~ msgstr "不明なエラーのため、接続シークレットを更新できませんでした。" +- +-#~ msgid "Priority:" +-#~ msgstr "優先度:" +- +-#~ msgid "_Automatically connect to this network when it is available" +-#~ msgstr "この接続が利用可能になったときに自動的に接続する(_A)" +- +-#~ msgid "Connection _priority for auto-activation:" +-#~ msgstr "自動アクティベーションの接続優先度(_P)" +- +-#~ msgid "Cannot import VPN connection" +-#~ msgstr "VPN 接続をインポートできません" +- +-#~ msgid "" +-#~ "The file “%s” could not be read or does not contain recognized VPN " +-#~ "connection information\n" +-#~ "\n" +-#~ "Error: %s." +-#~ msgstr "" +-#~ "ファイル '%s' が読み込めなかったか、認識される VPN 接続情報がありません\n" +-#~ "\n" +-#~ "エラー: %s" +- +-#~ msgid "unknown error" +-#~ msgstr "不明なエラー" ++msgstr "種類(_T)" +diff --git a/po/ko.po b/po/ko.po +index 505e6402..b89dd452 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -17,14 +17,14 @@ + # - VPN은 "가상 사설망"으로 풀어서 번역 + # - bond는 "본딩"으로 번역 (여러 네트워크를 묶어서 사용) + # - bridged network는 "브릿지 네트워크"로 번역 +-# lrintel , 2017. #zanata ++# ljanda , 2019. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: PACKAGE VERSION\n" ++"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: 2019-05-29 11:09+0200\n" +-"PO-Revision-Date: 2017-11-07 06:44+0000\n" ++"POT-Creation-Date: 2019-08-15 18:52+0200\n" ++"PO-Revision-Date: 2019-08-13 10:26+0000\n" + "Last-Translator: Copied by Zanata \n" + "Language-Team: GNOME Korea \n" + "Language: ko\n" +@@ -32,7 +32,7 @@ msgstr "" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=1; plural=0;\n" +-"X-Generator: Zanata 4.3.2\n" ++"X-Generator: Zanata 4.6.2\n" + + #: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737 + #: src/libnma/nma-bar-code-widget.c:144 +@@ -5159,44 +5159,3 @@ msgstr "" + #, fuzzy + msgid "_Type" + msgstr "형식(_T):" +- +-#~ msgid "%s (default)" +-#~ msgstr "%s (기본값)" +- +-#~ msgid "Ignored" +-#~ msgstr "무시함" +- +-#~ msgid "Active Network Connections" +-#~ msgstr "사용 중인 네트워크 연결" +- +-#~ msgid "Failed to update connection secrets due to an unknown error." +-#~ msgstr "알려지지 않은 오류로 비밀 정보를 업데이트하는 데 실패했습니다." +- +-#~ msgid "Priority:" +-#~ msgstr "우선 순위:" +- +-#~ msgid "_Automatically connect to this network when it is available" +-#~ msgstr "사용 가능하면 자동으로 이 네트워크에 연결(_A)" +- +-#, fuzzy +-#~ msgid "Connection _priority for auto-activation:" +-#~ msgstr "연결 정보(_I)" +- +-#~ msgid "Cannot import VPN connection" +-#~ msgstr "가상 사설망 연결을 가져올 수 없음" +- +-#, fuzzy +-#~ msgid "" +-#~ "The file “%s” could not be read or does not contain recognized VPN " +-#~ "connection information\n" +-#~ "\n" +-#~ "Error: %s." +-#~ msgstr "" +-#~ "'%s' 파일을 읽을 수 없거나, 파일안에 알아볼 수 있는 가상 사설망 연결 정보" +-#~ "가 없습니다.\n" +-#~ "\n" +-#~ "오류: %s." +- +-#, fuzzy +-#~ msgid "unknown error" +-#~ msgstr "알 수 없는 오류" +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 58b48b07..b297e0d0 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -12,15 +12,16 @@ + # Edison Zhao , 2011. + # EL8LatSPQ , 2012. + # YunQiang Su , 2012. +-# lrintel , 2017. #zanata ++# ljanda , 2019. #zanata ++# tfu , 2019. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: PACKAGE VERSION\n" ++"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: 2019-05-29 11:09+0200\n" +-"PO-Revision-Date: 2017-11-07 06:44+0000\n" +-"Last-Translator: Copied by Zanata \n" ++"POT-Creation-Date: 2019-08-15 18:52+0200\n" ++"PO-Revision-Date: 2019-08-15 01:36+0000\n" ++"Last-Translator: tfu \n" + "Language-Team: Chinese (simplified) \n" + "Language: zh_CN\n" + "MIME-Version: 1.0\n" +@@ -28,7 +29,7 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=1; plural=0;\n" + "X-Launchpad-Export-Date: 2016-03-22 13:39+0000\n" +-"X-Generator: Zanata 4.3.2\n" ++"X-Generator: Zanata 4.6.2\n" + + #: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737 + #: src/libnma/nma-bar-code-widget.c:144 +@@ -41,12 +42,11 @@ msgstr "管理网络连接" + + #: nm-applet.desktop.in:5 + msgid "nm-device-wireless" +-msgstr "" ++msgstr "nm-device-wireless" + + #: nm-connection-editor.desktop.in:3 +-#, fuzzy + msgid "Advanced Network Configuration" +-msgstr "活动的网络连接" ++msgstr "高级网络配置" + + #: nm-connection-editor.desktop.in:4 + msgid "Manage and change your network connection settings" +@@ -54,7 +54,7 @@ msgstr "管理或更改您的网络连接设置" + + #: nm-connection-editor.desktop.in:5 + msgid "preferences-system-network" +-msgstr "" ++msgstr "preferences-system-network" + + #: org.gnome.nm-applet.gschema.xml.in:6 + msgid "Disable connected notifications" +@@ -101,9 +101,8 @@ msgid "Used to determine whether settings should be migrated to a new version." + msgstr "用于决定设置是否应被迁移至一个新版本。" + + #: org.gnome.nm-applet.gschema.xml.in:31 +-#, fuzzy + msgid "Disable WiFi Create" +-msgstr "禁用 Wi-Fi 建立" ++msgstr "禁用 Wi-Fi 创建" + + #: org.gnome.nm-applet.gschema.xml.in:32 + msgid "" +@@ -223,9 +222,8 @@ msgid "C_onnect" + msgstr "连接(_O)" + + #: src/8021x.ui:122 src/libnma/wifi.ui:129 +-#, fuzzy + msgid "_Network name" +-msgstr "网络名称(_N)：" ++msgstr "网络名称(_N)" + + #: src/ap-menu-item.c:82 + msgid "ad-hoc" +@@ -856,18 +854,16 @@ msgid "Subnet Mask" + msgstr "子网掩码" + + #: src/applet-dialogs.c:440 +-#, fuzzy + msgid "Primary DNS" +-msgstr "主要(_P)：" ++msgstr "主 DNS" + + #: src/applet-dialogs.c:440 +-#, fuzzy + msgid "Secondary DNS" +-msgstr "次要密码(_S)：" ++msgstr "二级 DNS" + + #: src/applet-dialogs.c:440 + msgid "Tertiary DNS" +-msgstr "" ++msgstr "三级 DNS" + + #: src/applet-dialogs.c:519 + #, c-format +@@ -915,9 +911,8 @@ msgid "Speed" + msgstr "速度" + + #: src/applet-dialogs.c:616 +-#, fuzzy + msgid "Security" +-msgstr "安全性：" ++msgstr "安全性" + + #. --- IPv4 --- + #: src/applet-dialogs.c:641 src/applet-dialogs.c:904 +@@ -939,9 +934,8 @@ msgid "Hotspot" + msgstr "热点" + + #: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161 +-#, fuzzy + msgid "Password" +-msgstr "密码：" ++msgstr "密码" + + #: src/applet-dialogs.c:878 + msgid "VPN Type" +@@ -1175,9 +1169,8 @@ msgstr "" + #: src/connection-editor/ce-page-ethernet.ui:129 + #: src/connection-editor/ce-page-infiniband.ui:50 + #: src/connection-editor/ce-page-wifi.ui:139 +-#, fuzzy + msgid "_Device" +-msgstr "设备(_D):" ++msgstr "设备(_D)" + + #: src/connection-editor/ce-page-bond.ui:24 + #: src/connection-editor/ce-page-team.ui:433 +@@ -1219,15 +1212,13 @@ msgid "ARP" + msgstr "ARP" + + #: src/connection-editor/ce-page-bond.ui:91 +-#, fuzzy + msgid "Bonded _connections" +-msgstr "已绑定连接(_C)：" ++msgstr "绑定的连接(_c)：" + + #: src/connection-editor/ce-page-bond.ui:105 + #: src/connection-editor/ce-page-wifi.ui:400 +-#, fuzzy + msgid "M_ode" +-msgstr "模式(_O)：" ++msgstr "模式(_o)：" + + #: src/connection-editor/ce-page-bond.ui:194 + #: src/connection-editor/ce-page-bridge.ui:134 +@@ -1237,9 +1228,8 @@ msgid "_Edit" + msgstr "编辑(_E)" + + #: src/connection-editor/ce-page-bond.ui:238 +-#, fuzzy + msgid "Monitoring _frequency" +-msgstr "监控频率(_F)：" ++msgstr "监控频率(_f)：" + + #: src/connection-editor/ce-page-bond.ui:272 + #: src/connection-editor/ce-page-bond.ui:422 +@@ -1250,19 +1240,16 @@ msgstr "毫秒" + #: src/connection-editor/ce-page-bond.ui:291 + #: src/connection-editor/ce-page-bridge.ui:192 + #: src/connection-editor/ce-page-team.ui:292 +-#, fuzzy + msgid "_Interface name" + msgstr "接口名称(_I)：" + + #: src/connection-editor/ce-page-bond.ui:316 +-#, fuzzy + msgid "_Link Monitoring" + msgstr "链路监视(_L)：" + + #: src/connection-editor/ce-page-bond.ui:347 +-#, fuzzy + msgid "ARP _targets" +-msgstr "ARP 目标(_T)：" ++msgstr "ARP 目标(_t)：" + + #: src/connection-editor/ce-page-bond.ui:361 + msgid "" +@@ -1271,19 +1258,16 @@ msgid "" + msgstr "检测连接状态时使用的 IP 地址，或以逗号分隔的 IP 地址列表。" + + #: src/connection-editor/ce-page-bond.ui:373 +-#, fuzzy + msgid "Link _up delay" +-msgstr "链接建立延时(_U)：" ++msgstr "链接建立延时(_u)" + + #: src/connection-editor/ce-page-bond.ui:387 +-#, fuzzy + msgid "Link _down delay" +-msgstr "链接断开延时(_D)：" ++msgstr "链接断开延时(_d)" + + #: src/connection-editor/ce-page-bond.ui:481 +-#, fuzzy + msgid "_Primary" +-msgstr "主要(_P)：" ++msgstr "主要(_P)" + + #: src/connection-editor/ce-page-bond.ui:495 + msgid "" +@@ -1297,9 +1281,8 @@ msgstr "主设备的接口名称。如果设置，在此设备可用时将一直 + #: src/connection-editor/ce-page-team.ui:319 + #: src/connection-editor/ce-page-vlan.ui:87 + #: src/connection-editor/ce-page-wifi.ui:111 +-#, fuzzy + msgid "_MTU" +-msgstr "_MTU：" ++msgstr "_MTU" + + #: src/connection-editor/ce-page-bond.ui:540 + #: src/connection-editor/ce-page-ethernet.ui:223 +@@ -1311,35 +1294,29 @@ msgid "bytes" + msgstr "字节" + + #: src/connection-editor/ce-page-bridge-port.ui:42 +-#, fuzzy + msgid "Path _cost" +-msgstr "路径成本(_C):" ++msgstr "路径成本(_c)" + + #: src/connection-editor/ce-page-bridge-port.ui:55 + #: src/connection-editor/ce-page-bridge.ui:178 +-#, fuzzy + msgid "_Priority" +-msgstr "优先级(_P)：" ++msgstr "优先级(_P)" + + #: src/connection-editor/ce-page-bridge-port.ui:97 +-#, fuzzy + msgid "_Hairpin mode" +-msgstr "_Hairpin 模式：" ++msgstr "_Hairpin 模式" + + #: src/connection-editor/ce-page-bridge.ui:62 +-#, fuzzy + msgid "Bridged _connections" +-msgstr "桥接连接(_C)：" ++msgstr "桥接连接(_c)" + + #: src/connection-editor/ce-page-bridge.ui:218 +-#, fuzzy + msgid "_Forward delay" +-msgstr "转发延时(_F)：" ++msgstr "转发延时(_F)" + + #: src/connection-editor/ce-page-bridge.ui:232 +-#, fuzzy + msgid "_Hello time" +-msgstr "问候时间(_H)：" ++msgstr "问候时间(_H)" + + #: src/connection-editor/ce-page-bridge.ui:252 + msgid "STP forwarding delay, in seconds" +@@ -1385,18 +1362,16 @@ msgid "" + msgstr "STP优先这座桥。较低的值是“更好”;优先级最低的桥将被选为根桥。" + + #: src/connection-editor/ce-page-bridge.ui:378 +-#, fuzzy + msgid "_Max age" +-msgstr "最大老化时间(_M)：" ++msgstr "最大老化时间(_M)" + + #: src/connection-editor/ce-page-bridge.ui:398 + msgid "STP maximum message age, in seconds" + msgstr "STP最大消息年龄，单位为秒" + + #: src/connection-editor/ce-page-bridge.ui:434 +-#, fuzzy + msgid "_Aging time" +-msgstr "老化时间(_A)：" ++msgstr "老化时间(_A)" + + #: src/connection-editor/ce-page-bridge.ui:454 + msgid "The Ethernet MAC address aging time, in seconds" +@@ -1404,7 +1379,7 @@ msgstr "以太网MAC地址老化时间，以秒" + + #: src/connection-editor/ce-page-bridge.ui:490 + msgid "Group _forward mask" +-msgstr "" ++msgstr "组转发掩码( _f)" + + #: src/connection-editor/ce-page-bridge.ui:504 + msgid "" +@@ -1585,9 +1560,8 @@ msgstr "对每个用户优先级启用或禁用按优先级暂停传输。" + #: src/connection-editor/ce-page-dcb.ui:1822 + #: src/connection-editor/ce-page-dcb.ui:2154 + #: src/connection-editor/ce-page-dcb.ui:2486 +-#, fuzzy + msgid "0" +-msgstr "0：" ++msgstr "0" + + #: src/connection-editor/ce-page-dcb.ui:694 + #: src/connection-editor/ce-page-dcb.ui:1135 +@@ -1595,9 +1569,8 @@ msgstr "0：" + #: src/connection-editor/ce-page-dcb.ui:1862 + #: src/connection-editor/ce-page-dcb.ui:2194 + #: src/connection-editor/ce-page-dcb.ui:2536 +-#, fuzzy + msgid "1" +-msgstr "1：" ++msgstr "1" + + #: src/connection-editor/ce-page-dcb.ui:735 + #: src/connection-editor/ce-page-dcb.ui:1184 +@@ -1605,9 +1578,8 @@ msgstr "1：" + #: src/connection-editor/ce-page-dcb.ui:1902 + #: src/connection-editor/ce-page-dcb.ui:2234 + #: src/connection-editor/ce-page-dcb.ui:2586 +-#, fuzzy + msgid "2" +-msgstr "2：" ++msgstr "2" + + #: src/connection-editor/ce-page-dcb.ui:776 + #: src/connection-editor/ce-page-dcb.ui:1233 +@@ -1615,9 +1587,8 @@ msgstr "2：" + #: src/connection-editor/ce-page-dcb.ui:1942 + #: src/connection-editor/ce-page-dcb.ui:2274 + #: src/connection-editor/ce-page-dcb.ui:2636 +-#, fuzzy + msgid "3" +-msgstr "3：" ++msgstr "3" + + #: src/connection-editor/ce-page-dcb.ui:817 + #: src/connection-editor/ce-page-dcb.ui:1282 +@@ -1625,9 +1596,8 @@ msgstr "3：" + #: src/connection-editor/ce-page-dcb.ui:1982 + #: src/connection-editor/ce-page-dcb.ui:2314 + #: src/connection-editor/ce-page-dcb.ui:2686 +-#, fuzzy + msgid "4" +-msgstr "4：" ++msgstr "4" + + #: src/connection-editor/ce-page-dcb.ui:858 + #: src/connection-editor/ce-page-dcb.ui:1331 +@@ -1635,9 +1605,8 @@ msgstr "4：" + #: src/connection-editor/ce-page-dcb.ui:2022 + #: src/connection-editor/ce-page-dcb.ui:2354 + #: src/connection-editor/ce-page-dcb.ui:2736 +-#, fuzzy + msgid "5" +-msgstr "5：" ++msgstr "5" + + #: src/connection-editor/ce-page-dcb.ui:899 + #: src/connection-editor/ce-page-dcb.ui:1380 +@@ -1645,9 +1614,8 @@ msgstr "5：" + #: src/connection-editor/ce-page-dcb.ui:2062 + #: src/connection-editor/ce-page-dcb.ui:2394 + #: src/connection-editor/ce-page-dcb.ui:2786 +-#, fuzzy + msgid "6" +-msgstr "6：" ++msgstr "6" + + #: src/connection-editor/ce-page-dcb.ui:940 + #: src/connection-editor/ce-page-dcb.ui:1429 +@@ -1655,34 +1623,28 @@ msgstr "6：" + #: src/connection-editor/ce-page-dcb.ui:2102 + #: src/connection-editor/ce-page-dcb.ui:2434 + #: src/connection-editor/ce-page-dcb.ui:2836 +-#, fuzzy + msgid "7" +-msgstr "7：" ++msgstr "7" + + #: src/connection-editor/ce-page-dcb.ui:1069 +-#, fuzzy + msgid "Traffic Class" +-msgstr "流量等级：" ++msgstr "流量等级" + + #: src/connection-editor/ce-page-dcb.ui:1473 +-#, fuzzy + msgid "Strict Bandwidth" +-msgstr "严格带宽：" ++msgstr "严格带宽" + + #: src/connection-editor/ce-page-dcb.ui:1805 +-#, fuzzy + msgid "Priority Bandwidth" +-msgstr "优先级带宽：" ++msgstr "优先级带宽" + + #: src/connection-editor/ce-page-dcb.ui:2137 +-#, fuzzy + msgid "Group Bandwidth" +-msgstr "组带宽：" ++msgstr "组带宽" + + #: src/connection-editor/ce-page-dcb.ui:2469 +-#, fuzzy + msgid "Group ID" +-msgstr "组标识：" ++msgstr "组 ID" + + #: src/connection-editor/ce-page-dcb.ui:2881 + msgid "Enter the priority group ID for each User Priority." +@@ -1713,9 +1675,8 @@ msgstr "为各个 用户优先级 输入流量等级。" + #: src/wireless-security/eap-method-leap.ui:21 + #: src/wireless-security/eap-method-simple.ui:21 + #: src/wireless-security/ws-leap.ui:21 +-#, fuzzy + msgid "_Username" +-msgstr "用户名(_U)：" ++msgstr "用户名(_U)" + + #: src/connection-editor/ce-page-dsl.ui:33 + msgid "Username used to authenticate with the PPPoE service." +@@ -1728,9 +1689,8 @@ msgid "" + msgstr "只有启动与接入集中器可提供指定服务会话。对于大多数供应商这应该是空白。" + + #: src/connection-editor/ce-page-dsl.ui:59 +-#, fuzzy + msgid "_Service" +-msgstr "服务(_S)：" ++msgstr "服务(_S)" + + #: src/connection-editor/ce-page-dsl.ui:71 + #: src/libnma/nma-file-cert-chooser.c:347 +@@ -1749,32 +1709,28 @@ msgstr "用于 PPPoE 服务验证的密码。" + #: src/wireless-security/eap-method-leap.ui:35 + #: src/wireless-security/eap-method-simple.ui:35 + #: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20 +-#, fuzzy + msgid "_Password" +-msgstr "密码(_P)：" ++msgstr "密码(_P)" + + #: src/connection-editor/ce-page-dsl.ui:116 +-#, fuzzy + msgid "PPP _interface" +-msgstr "上级接口(_P)：" ++msgstr "PPP 接口(_i)：" + + #: src/connection-editor/ce-page-dsl.ui:130 +-#, fuzzy + msgid "P_arent interface" +-msgstr "上级接口(_P)：" ++msgstr "上级接口(_P)" + + #: src/connection-editor/ce-page-dsl.ui:144 + msgid "An arbitrary name to assign to the newly created PPP interface." +-msgstr "的任意名称分配给新创建的PPP接口。" ++msgstr "分配给新创建的PPP接口的任意名称。" + + #: src/connection-editor/ce-page-dsl.ui:160 + msgid "The interface on which the PPP connection will be established." + msgstr "在其上PPP连接将被建立的接口。" + + #: src/connection-editor/ce-page-dsl.ui:171 +-#, fuzzy + msgid "C_laim interface" +-msgstr "上级接口(_P)：" ++msgstr "声明接口(_l)" + + #: src/connection-editor/ce-page-dsl.ui:175 + msgid "" +@@ -1783,6 +1739,8 @@ msgid "" + "option can only be used for Ethernet interfaces. nm-applet is able to " + "activate the connection only if this option is selected." + msgstr "" ++"如果选择，连接将会完全控制此端口，其他连接不会在这个端口上被激活。请注意，这" ++"个选择只适用于以太网接口。只有在选择了这个选项时 nm-applet 才可以激活连接。" + + #: src/connection-editor/ce-page-ethernet.ui:17 + #: src/connection-editor/ce-page-ethernet.ui:77 +@@ -1849,20 +1807,17 @@ msgid "Manual" + msgstr "手动" + + #: src/connection-editor/ce-page-ethernet.ui:97 +-#, fuzzy + msgid "_Port" +-msgstr "端口(_P)：" ++msgstr "端口(_P)" + + #: src/connection-editor/ce-page-ethernet.ui:156 + #: src/connection-editor/ce-page-wifi.ui:169 +-#, fuzzy + msgid "C_loned MAC address" +-msgstr "克隆 MAC 地址(_L)：" ++msgstr "克隆 MAC 地址(_L)" + + #: src/connection-editor/ce-page-ethernet.ui:242 +-#, fuzzy + msgid "Wake on LAN" +-msgstr "私钥密码(_P)：" ++msgstr "LAN 唤醒" + + #: src/connection-editor/ce-page-ethernet.ui:258 + msgid "De_fault" +@@ -1897,9 +1852,8 @@ msgid "Ma_gic" + msgstr "Ma_gic" + + #: src/connection-editor/ce-page-ethernet.ui:388 +-#, fuzzy + msgid "_Wake on LAN password" +-msgstr "私钥密码(_P)：" ++msgstr "LAN 唤醒密码(_W)" + + #: src/connection-editor/ce-page-ethernet.ui:402 + msgid "" +@@ -1908,7 +1862,7 @@ msgstr "网络唤醒密码（以太网MAC）。它仅适用于魔术包。" + + #: src/connection-editor/ce-page-ethernet.ui:414 + msgid "Lin_k negotiation" +-msgstr "" ++msgstr "连接谈判(_k)" + + #: src/connection-editor/ce-page-ethernet.ui:428 + msgid "" +@@ -1920,9 +1874,8 @@ msgstr "" + "制。如果不确定，离开这里“忽略”或选择“自动”。" + + #: src/connection-editor/ce-page-ethernet.ui:448 +-#, fuzzy + msgid "_Speed" +-msgstr "速度(_S)：" ++msgstr "速度(_S)" + + #: src/connection-editor/ce-page-ethernet.ui:462 + msgid "" +@@ -1934,9 +1887,8 @@ msgstr "" + "在你的设备支持它。" + + #: src/connection-editor/ce-page-ethernet.ui:482 +-#, fuzzy + msgid "Duple_x" +-msgstr "全双工(_X)" ++msgstr "双工(_X)" + + #: src/connection-editor/ce-page-ethernet.ui:496 + msgid "" +@@ -1949,31 +1901,27 @@ msgstr "" + + #: src/connection-editor/ce-page-general.ui:29 + msgid "Yes" +-msgstr "" ++msgstr "是" + + #: src/connection-editor/ce-page-general.ui:32 +-#, fuzzy + msgid "No" +-msgstr "无" ++msgstr "否" + + #: src/connection-editor/ce-page-general.ui:65 + msgid "All _users may connect to this network" +-msgstr "所有用户都可以连接这个网络(_U)" ++msgstr "所有用户都可以连接这个网络(_u)" + + #: src/connection-editor/ce-page-general.ui:80 +-#, fuzzy + msgid "Automatically connect to _VPN" +-msgstr "使用此连接时自动连接 _VPN" ++msgstr "自动连接到 VPN(_V)" + + #: src/connection-editor/ce-page-general.ui:96 +-#, fuzzy + msgid "Firewall _zone" +-msgstr "防火墙区(_Z)：" ++msgstr "防火墙区(_z)" + + #: src/connection-editor/ce-page-general.ui:121 +-#, fuzzy + msgid "_Metered connection" +-msgstr "已组队的连接(_T)：" ++msgstr "记费的连接(_M)" + + #: src/connection-editor/ce-page-general.ui:134 + msgid "" +@@ -1982,11 +1930,12 @@ msgid "" + "“No”) to indicate to applications, or “Automatic” to use a default value " + "based on the connection type and other heuristics." + msgstr "" ++"NetworkManager 向应用程序指示连接是否被记费，数据的使用应该被限制。选择 " ++"“Yes” 或 “No”，或选择 “Automatic” 来根据连接类型及其他情况使用默认设置。" + + #: src/connection-editor/ce-page-general.ui:150 +-#, fuzzy + msgid "Connect _automatically with priority" +-msgstr "忽略自动获取的路由(_N)" ++msgstr "根据优先级自动连接(_a)" + + #: src/connection-editor/ce-page-general.ui:167 + msgid "" +@@ -2038,9 +1987,8 @@ msgid "Connected" + msgstr "已连接" + + #: src/connection-editor/ce-page-infiniband.ui:37 +-#, fuzzy + msgid "_Transport mode" +-msgstr "传输模式(_T)：" ++msgstr "传输模式(_T)" + + #: src/connection-editor/ce-page-ip-tunnel.ui:17 + msgid "IPIP" +@@ -2080,41 +2028,38 @@ msgstr "VTI6" + + #: src/connection-editor/ce-page-ip-tunnel.ui:61 + #: src/connection-editor/ce-page-macsec.ui:58 +-#, fuzzy + msgid "Device name" +-msgstr "设备名称 + 编号" ++msgstr "设备名称" + + #: src/connection-editor/ce-page-ip-tunnel.ui:85 + #: src/connection-editor/ce-page-macsec.ui:83 +-#, fuzzy + msgid "Parent device" +-msgstr "以太网设备" ++msgstr "上级设备" + + #: src/connection-editor/ce-page-ip-tunnel.ui:115 + #: src/connection-editor/ce-page-macsec.ui:180 + msgid "Mode" +-msgstr "" ++msgstr "模式" + + #: src/connection-editor/ce-page-ip-tunnel.ui:128 + msgid "Local IP" +-msgstr "" ++msgstr "本地 IP" + + #: src/connection-editor/ce-page-ip-tunnel.ui:140 + msgid "Remote IP" +-msgstr "" ++msgstr "远程 IP" + + #: src/connection-editor/ce-page-ip-tunnel.ui:152 + msgid "Input key" +-msgstr "" ++msgstr "输入密钥" + + #: src/connection-editor/ce-page-ip-tunnel.ui:164 + msgid "Output key" +-msgstr "" ++msgstr "输出密钥" + + #: src/connection-editor/ce-page-ip-tunnel.ui:245 +-#, fuzzy + msgid "MTU" +-msgstr "_MTU：" ++msgstr "MTU" + + #: src/connection-editor/ce-page-ip4.ui:15 + #: src/connection-editor/ce-page-ip6.ui:15 +@@ -2134,9 +2079,8 @@ msgstr "与其它计算机共享" + + #: src/connection-editor/ce-page-ip4.ui:47 + #: src/connection-editor/ce-page-ip6.ui:78 +-#, fuzzy + msgid "_Method" +-msgstr "方法(_M)：" ++msgstr "方法(_M)" + + #: src/connection-editor/ce-page-ip4.ui:202 + msgid "" +@@ -2155,23 +2099,20 @@ msgid "" + msgstr "解析主机名时使用的域。用逗号分隔多个域。" + + #: src/connection-editor/ce-page-ip4.ui:228 +-#, fuzzy + msgid "D_HCP client ID" +-msgstr "D_HCP 客户端 ID：" ++msgstr "D_HCP 客户端 ID" + + #: src/connection-editor/ce-page-ip4.ui:242 + #: src/connection-editor/ce-page-ip6.ui:246 + #: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347 +-#, fuzzy + msgid "S_earch domains" +-msgstr "搜索域(_E)：" ++msgstr "搜索域(_e)" + + #: src/connection-editor/ce-page-ip4.ui:256 + #: src/connection-editor/ce-page-ip6.ui:260 + #: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338 +-#, fuzzy + msgid "DNS ser_vers" +-msgstr "_DNS 服务器：" ++msgstr "_DNS 服务器" + + #: src/connection-editor/ce-page-ip4.ui:270 + msgid "" +@@ -2228,13 +2169,12 @@ msgstr "" + "地址会自动配置到连接中的接口。" + + #: src/connection-editor/ce-page-ip6.ui:287 +-#, fuzzy + msgid "IPv6 _privacy extensions" +-msgstr "IPv6 隐私扩展(_P)：" ++msgstr "IPv6 隐私扩展(_p)" + + #: src/connection-editor/ce-page-ip6.ui:319 + msgid "IPv6 address _generation mode" +-msgstr "" ++msgstr "IPv6 地址产生模式(_g)" + + #: src/connection-editor/ce-page-ip6.ui:356 + msgid "Require IPv_6 addressing for this connection to complete" +@@ -2300,27 +2240,27 @@ msgstr "" + + #: src/connection-editor/ce-page-macsec.ui:154 + msgid "CKN" +-msgstr "" ++msgstr "CKN" + + #: src/connection-editor/ce-page-macsec.ui:167 + msgid "CAK" +-msgstr "" ++msgstr "CAK" + + #: src/connection-editor/ce-page-macsec.ui:191 + msgid "Keys" +-msgstr "" ++msgstr "Key" + + #: src/connection-editor/ce-page-macsec.ui:207 + msgid "Parameters" +-msgstr "" ++msgstr "参数" + + #: src/connection-editor/ce-page-macsec.ui:224 + msgid "Validation" +-msgstr "" ++msgstr "验证" + + #: src/connection-editor/ce-page-macsec.ui:236 + msgid "SCI port" +-msgstr "" ++msgstr "SCI 端口" + + #: src/connection-editor/ce-page-macsec.ui:247 + msgid "Specifies the validation mode for incoming frames" +@@ -2344,50 +2284,45 @@ msgid "Basic" + msgstr "基本" + + #: src/connection-editor/ce-page-mobile.ui:48 +-#, fuzzy + msgid "Nu_mber" +-msgstr "编号(_M)：" ++msgstr "编号(_m)" + + #: src/connection-editor/ce-page-mobile.ui:142 + msgid "Advanced" + msgstr "高级" + + #: src/connection-editor/ce-page-mobile.ui:165 +-#, fuzzy + msgid "_APN" +-msgstr "_APN：" ++msgstr "_APN" + + #: src/connection-editor/ce-page-mobile.ui:179 +-#, fuzzy + msgid "N_etwork ID" +-msgstr "网络 ID (_E)：" ++msgstr "网络 ID (_e)" + + #: src/connection-editor/ce-page-mobile.ui:221 + msgid "Change…" + msgstr "更改..." + + #: src/connection-editor/ce-page-mobile.ui:242 +-#, fuzzy + msgid "P_IN" + msgstr "P_IN：" + + #: src/connection-editor/ce-page-mobile.ui:266 + msgid "Allow _roaming if home network is not available" +-msgstr "如果主网络不可用则允许漫游(_R)" ++msgstr "如果主网络不可用则允许漫游(_r)" + + #: src/connection-editor/ce-page-mobile.ui:303 + #: src/libnma/nma-pkcs11-cert-chooser.c:454 + msgid "Sho_w passwords" +-msgstr "显示密码(_W)" ++msgstr "显示密码(_w)" + + #: src/connection-editor/ce-page-ppp.ui:24 + msgid "Authentication" + msgstr "认证" + + #: src/connection-editor/ce-page-ppp.ui:53 +-#, fuzzy + msgid "Allowed methods" +-msgstr "允许的方法：" ++msgstr "允许的方法" + + #: src/connection-editor/ce-page-ppp.ui:89 + msgid "Configure _Methods…" +@@ -2444,11 +2379,11 @@ msgstr "使用仅用于浏览器客户端/方案此代理配置。" + + #: src/connection-editor/ce-page-proxy.ui:52 + msgid "PAC URL" +-msgstr "" ++msgstr "PAC URL" + + #: src/connection-editor/ce-page-proxy.ui:64 + msgid "PAC script" +-msgstr "" ++msgstr "PAC 脚本" + + #: src/connection-editor/ce-page-proxy.ui:76 + msgid "URL from where the PAC script is to be obtained." +@@ -2459,9 +2394,8 @@ msgid "Import script from a file…" + msgstr "从一个文件中导入脚本..." + + #: src/connection-editor/ce-page-proxy.ui:101 +-#, fuzzy + msgid "Method" +-msgstr "方法(_M)：" ++msgstr "方法" + + #: src/connection-editor/ce-page-team-port.ui:47 + #: src/connection-editor/ce-page-team.ui:400 +@@ -2494,14 +2428,14 @@ msgstr "管理团队高级选项" + + #: src/connection-editor/ce-page-team-port.ui:225 + msgid "_Queue ID" +-msgstr "" ++msgstr "队列 ID(_Q)" + + #: src/connection-editor/ce-page-team-port.ui:239 + #: src/connection-editor/ce-page-team.ui:662 + msgid "" + "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after " + "port is enabled or disabled." +-msgstr "不请自来的港定居人士及港后发送免费ARP报文的突发数启用或禁用。" ++msgstr "在端口被启用或禁用后，发送的未请求的 NA 和免费ARP数据包的数量。" + + #: src/connection-editor/ce-page-team-port.ui:241 + msgid "ID of queue which this port should be mapped to." +@@ -2512,9 +2446,8 @@ msgid "Active-Backup runner options" + msgstr "有源备份选项亚军" + + #: src/connection-editor/ce-page-team-port.ui:271 +-#, fuzzy + msgid "_Port priority" +-msgstr "优先级(_P)：" ++msgstr "优先级(_P)" + + #: src/connection-editor/ce-page-team-port.ui:284 + #: src/connection-editor/ce-page-team.ui:712 +@@ -2529,25 +2462,23 @@ msgstr "端口优先级。该数字越大，意味着更高的优先级。" + + #: src/connection-editor/ce-page-team-port.ui:297 + msgid "Port _sticky" +-msgstr "端口_sticky" ++msgstr "端口粘连 (_s)" + + #: src/connection-editor/ce-page-team-port.ui:301 + msgid "Do not unselect the port if a better one becomes available." +-msgstr "" ++msgstr "在一个更好的可用时不取消选择端口" + + #: src/connection-editor/ce-page-team-port.ui:316 + msgid "LACP runner options" +-msgstr "LACP亚军选项" ++msgstr "LACP runner 选项" + + #: src/connection-editor/ce-page-team-port.ui:332 +-#, fuzzy + msgid "_LACP port priority" +-msgstr "优先级(_P)：" ++msgstr "_LACP 端口优先级" + + #: src/connection-editor/ce-page-team-port.ui:346 +-#, fuzzy + msgid "LACP port _key" +-msgstr "私钥(_K)：" ++msgstr "LACP 端口 _key" + + #: src/connection-editor/ce-page-team-port.ui:359 + #: src/connection-editor/ce-page-team.ui:675 +@@ -2578,47 +2509,42 @@ msgstr "根据LACP标准端口关键。它只能使用相同的密钥来聚合 + #: src/connection-editor/ce-page-team-port.ui:416 + #: src/connection-editor/ce-page-team.ui:1142 + msgid "_Link watcher" +-msgstr "" ++msgstr "_Link watcher" + + #: src/connection-editor/ce-page-team-port.ui:431 + #: src/connection-editor/ce-page-team.ui:1157 +-#, fuzzy + msgid "_Up delay" +-msgstr "链接建立延时(_U)：" ++msgstr "建立延时(_U)" + + #: src/connection-editor/ce-page-team-port.ui:446 + #: src/connection-editor/ce-page-team.ui:1172 +-#, fuzzy + msgid "_Down delay" +-msgstr "链接断开延时(_D)：" ++msgstr "断开延时(_D)" + + #: src/connection-editor/ce-page-team-port.ui:461 + #: src/connection-editor/ce-page-team.ui:1187 +-#, fuzzy + msgid "Send _interval" +-msgstr "上级接口(_P)：" ++msgstr "发送间隔(_i)" + + #: src/connection-editor/ce-page-team-port.ui:476 + #: src/connection-editor/ce-page-team.ui:1202 + msgid "Delay _before first send" +-msgstr "" ++msgstr "第一次发送前延迟(_b)" + + #: src/connection-editor/ce-page-team-port.ui:491 + #: src/connection-editor/ce-page-team.ui:1217 + msgid "_Maximum missed replies" +-msgstr "" ++msgstr "最多错过的回复(_M)" + + #: src/connection-editor/ce-page-team-port.ui:506 + #: src/connection-editor/ce-page-team.ui:1232 +-#, fuzzy + msgid "_Source host" +-msgstr "ARP 目标(_T)：" ++msgstr "源主机(_S)" + + #: src/connection-editor/ce-page-team-port.ui:521 + #: src/connection-editor/ce-page-team.ui:1247 +-#, fuzzy + msgid "_Target host" +-msgstr "ARP 目标(_T)：" ++msgstr "目标主机(_T)" + + #: src/connection-editor/ce-page-team-port.ui:535 + #: src/connection-editor/ce-page-team.ui:1261 +@@ -2721,9 +2647,8 @@ msgstr "从文件导入组配置(_p)..." + + #: src/connection-editor/ce-page-team-port.ui:826 + #: src/connection-editor/ce-page-team.ui:1552 +-#, fuzzy + msgid "Edit _JSON configuration" +-msgstr "_JSON 配置：" ++msgstr "编辑_JSON 配置" + + #: src/connection-editor/ce-page-team-port.ui:845 + #: src/connection-editor/ce-page-team.ui:1571 +@@ -2763,9 +2688,8 @@ msgid "From active to team device" + msgstr "从活动端口到组设备" + + #: src/connection-editor/ce-page-team.ui:174 +-#, fuzzy + msgid "_Teamed connections" +-msgstr "已组队的连接(_T)：" ++msgstr "已组队的连接(_T)" + + #: src/connection-editor/ce-page-team.ui:441 + msgid "Load balance" +@@ -2814,24 +2738,23 @@ msgstr "任何L4协议" + + #: src/connection-editor/ce-page-team.ui:603 + msgid "_Peer notification count" +-msgstr "" ++msgstr "_Peer通知计数" + + #: src/connection-editor/ce-page-team.ui:618 + msgid "Peer _notification interval" +-msgstr "" ++msgstr "Peer 通知间隔(_n)" + + #: src/connection-editor/ce-page-team.ui:633 + msgid "_Multicast rejoin count" +-msgstr "" ++msgstr "多播重新加入计数(_M)" + + #: src/connection-editor/ce-page-team.ui:648 + msgid "Multicast _rejoin interval" +-msgstr "" ++msgstr "多播重新加入间隔(_r)" + + #: src/connection-editor/ce-page-team.ui:739 +-#, fuzzy + msgid "_Hardware Address" +-msgstr "硬件地址：" ++msgstr "硬件地址(_H)" + + #: src/connection-editor/ce-page-team.ui:752 + msgid "" +@@ -2841,16 +2764,15 @@ msgstr "新的团队所需的设备的硬件地址。通常MAC地址的格式被 + + #: src/connection-editor/ce-page-team.ui:798 + msgid "_Runner" +-msgstr "" ++msgstr "_Runner" + + #: src/connection-editor/ce-page-team.ui:813 +-#, fuzzy + msgid "_Hardware address policy" +-msgstr "硬件地址：" ++msgstr "硬件地址策略(_H)" + + #: src/connection-editor/ce-page-team.ui:827 + msgid "Name of runner to be used." +-msgstr "使用亚军的名称。" ++msgstr "使用的 runner 的名称。" + + #: src/connection-editor/ce-page-team.ui:848 + msgid "" +@@ -2885,17 +2807,16 @@ msgstr "" + "次发送。否则，他们将每隔30秒发送。" + + #: src/connection-editor/ce-page-team.ui:903 +-#, fuzzy + msgid "_System priority" +-msgstr "优先级(_P)：" ++msgstr "系统优先级(_S)" + + #: src/connection-editor/ce-page-team.ui:918 + msgid "_Minimum ports" +-msgstr "" ++msgstr "最少端口(_M)" + + #: src/connection-editor/ce-page-team.ui:933 + msgid "_Aggregator selection policy" +-msgstr "" ++msgstr "_Aggregator 选择策略" + + #: src/connection-editor/ce-page-team.ui:947 + msgid "System priority, value can be 0 – 65535." +@@ -2930,43 +2851,36 @@ msgid "Name of active Tx balancer. Active Tx balancing is disabled by default." + msgstr "活跃的Tx平衡器的名称。活动的Tx平衡默认情况下禁用。" + + #: src/connection-editor/ce-page-team.ui:1085 +-#, fuzzy + msgid "Transmission _balancing interval" +-msgstr "传输功率(_W)：" ++msgstr "传输均衡间隔(_b)" + + #: src/connection-editor/ce-page-team.ui:1100 +-#, fuzzy + msgid "_Transmission balancer" +-msgstr "传输功率(_W)：" ++msgstr "传输均衡器(_T)：" + + #: src/connection-editor/ce-page-team.ui:1119 + msgid "Runner" + msgstr "运行者" + + #: src/connection-editor/ce-page-vlan.ui:28 +-#, fuzzy + msgid "_Parent interface" +-msgstr "上级接口(_P)：" ++msgstr "上级接口(_P)" + + #: src/connection-editor/ce-page-vlan.ui:41 +-#, fuzzy + msgid "VLAN inter_face name" +-msgstr "VLAN 接口名称(_N)：" ++msgstr "VLAN 接口名称(_f)" + + #: src/connection-editor/ce-page-vlan.ui:55 +-#, fuzzy + msgid "Cloned MAC _address" +-msgstr "克隆 MAC 地址(_C)：" ++msgstr "克隆 MAC 地址(_a)" + + #: src/connection-editor/ce-page-vlan.ui:140 +-#, fuzzy + msgid "VLAN _id" +-msgstr "VLAN 标签(_I)：" ++msgstr "VLAN ID(_i)" + + #: src/connection-editor/ce-page-vlan.ui:197 +-#, fuzzy + msgid "Flags" +-msgstr "标志:" ++msgstr "标志" + + #: src/connection-editor/ce-page-vlan.ui:213 + msgid "_Reorder headers" +@@ -2995,9 +2909,8 @@ msgid "\"vlan\" + number" + msgstr "vlan + 数字" + + #: src/connection-editor/ce-page-wifi-security.ui:29 +-#, fuzzy + msgid "S_ecurity" +-msgstr "安全(_E)：" ++msgstr "安全(_e)" + + #: src/connection-editor/ce-page-wifi.ui:35 + msgid "A (5 GHz)" +@@ -3020,38 +2933,32 @@ msgid "mW" + msgstr "mW" + + #: src/connection-editor/ce-page-wifi.ui:222 +-#, fuzzy + msgid "Transmission po_wer" +-msgstr "传输功率(_W)：" ++msgstr "传输功率(_w)" + + #: src/connection-editor/ce-page-wifi.ui:256 + msgid "Mb/s" + msgstr "Mb/秒" + + #: src/connection-editor/ce-page-wifi.ui:275 +-#, fuzzy + msgid "_Rate" +-msgstr "速率(_R)：" ++msgstr "速率(_R)" + + #: src/connection-editor/ce-page-wifi.ui:311 +-#, fuzzy + msgid "_BSSID" +-msgstr "_BSSID：" ++msgstr "_BSSID" + + #: src/connection-editor/ce-page-wifi.ui:336 +-#, fuzzy + msgid "C_hannel" +-msgstr "频道(_H)：" ++msgstr "频道(_H)" + + #: src/connection-editor/ce-page-wifi.ui:368 +-#, fuzzy + msgid "Ban_d" +-msgstr "波段(_D)：" ++msgstr "波段(_d)" + + #: src/connection-editor/ce-page-wifi.ui:414 +-#, fuzzy + msgid "SS_ID" +-msgstr "SS_ID：" ++msgstr "SS_ID" + + #: src/connection-editor/ce-polkit.c:63 + #: src/connection-editor/ce-polkit-button.c:74 +@@ -3166,15 +3073,11 @@ msgstr "VPN" + + #: src/connection-editor/connection-helpers.c:204 + msgid "No VPN service type." +-msgstr "" ++msgstr "没有 VPN 服务类型。" + + #: src/connection-editor/connection-helpers.c:209 +-#, fuzzy + msgid "The VPN plugin failed to import the VPN connection correctly: " +-msgstr "" +-"VPN 插件无法正确导入 VPN 连接。\n" +-"\n" +-"错误：没有 VPN 服务类型。" ++msgstr "VPN 插件无法正确导入 VPN 连接：" + + #: src/connection-editor/connection-helpers.c:293 + #: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341 +@@ -3221,13 +3124,12 @@ msgid "Are you sure you wish to delete the connection %s?" + msgstr "是否确认删除连接 %s？" + + #: src/connection-editor/gtk/menus.ui:6 +-#, fuzzy + msgid "_New Connection" +-msgstr "_VPN 连接" ++msgstr "新连接(_N)" + + #: src/connection-editor/gtk/menus.ui:13 + msgid "_Quit" +-msgstr "" ++msgstr "退出(_Q)" + + #: src/connection-editor/ip4-routes-dialog.c:697 + #: src/connection-editor/ip6-routes-dialog.c:718 +@@ -3339,9 +3241,8 @@ msgid "" + msgstr "安全标签可能会阻止一些文件和证书认证一起使用。" + + #: src/connection-editor/nm-connection-editor.ui:110 +-#, fuzzy + msgid "Connection _name" +-msgstr "连接名称(_N)：" ++msgstr "连接名称(_n)" + + #: src/connection-editor/nm-connection-editor.ui:170 + msgid "_Export…" +@@ -3447,19 +3348,17 @@ msgid "Authenticate to delete the selected connection" + msgstr "进行认证以删除选中的连接" + + #: src/connection-editor/nm-connection-list.c:1059 +-#, fuzzy + msgid "Unrecognized connection type" +-msgstr "不支持的移动宽带连接类型。" ++msgstr "不支持的连接类型" + + #: src/connection-editor/nm-connection-list.c:1064 +-#, fuzzy, c-format ++#, c-format + msgid "Don’t know how to import “%s” connections" +-msgstr "不知道如何创建“%s”连接" ++msgstr "不知道如何导入“%s”连接" + + #: src/connection-editor/nm-connection-list.c:1068 +-#, fuzzy + msgid "Error importing connection" +-msgstr "编辑连接出错" ++msgstr "导入连接出错" + + #: src/connection-editor/nm-connection-list.c:1075 + #: src/connection-editor/nm-connection-list.c:1090 +@@ -3468,9 +3367,8 @@ msgid "Error creating connection" + msgstr "创建连接出错" + + #: src/connection-editor/nm-connection-list.c:1075 +-#, fuzzy + msgid "Connection type not specified." +-msgstr "连接不能被修改" ++msgstr "未指定连接类型。" + + #: src/connection-editor/nm-connection-list.c:1091 + msgid "No VPN plugins are installed." +@@ -3719,14 +3617,12 @@ msgid "Link-Local Only" + msgstr "仅本地连接" + + #: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336 +-#, fuzzy + msgid "Additional DNS ser_vers" +-msgstr "附加 _DNS 服务器：" ++msgstr "额外的 DNS 服务器(_v)" + + #: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345 +-#, fuzzy + msgid "Additional s_earch domains" +-msgstr "附加搜索域(_E)：" ++msgstr "额外的搜索域(_e)" + + #: src/connection-editor/page-ip4.c:1033 + #, c-format +@@ -4136,7 +4032,7 @@ msgstr "关闭（_C）" + + #: src/libnma/nma-bar-code-widget.ui:36 + msgid "Scan with your phone or Print" +-msgstr "" ++msgstr "使用手机扫描或 打印" + + #: src/libnma/nma-file-cert-chooser.c:108 + #: src/libnma/nma-pkcs11-cert-chooser.c:152 +@@ -4156,15 +4052,15 @@ msgstr "为 %s 证书选择一个密钥" + + #: src/libnma/nma-file-cert-chooser.c:250 + #: src/libnma/nma-pkcs11-cert-chooser.c:386 +-#, fuzzy, c-format ++#, c-format + msgid "%s private _key" +-msgstr "私钥(_K)：" ++msgstr "%s 私钥(_k)" + + #: src/libnma/nma-file-cert-chooser.c:254 + #: src/libnma/nma-pkcs11-cert-chooser.c:390 +-#, fuzzy, c-format ++#, c-format + msgid "%s key _password" +-msgstr "私钥密码(_P)：" ++msgstr "%s 密钥密码(_p)" + + #: src/libnma/nma-file-cert-chooser.c:258 + #, c-format +@@ -4173,9 +4069,9 @@ msgstr "选择 %s 证书" + + #: src/libnma/nma-file-cert-chooser.c:262 + #: src/libnma/nma-pkcs11-cert-chooser.c:398 +-#, fuzzy, c-format ++#, c-format + msgid "%s _certificate" +-msgstr "用户证书(_U)：" ++msgstr "%s 证书(_c)" + + #: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077 + msgid "My country is not listed" +@@ -4241,9 +4137,8 @@ msgid "Set up a Mobile Broadband Connection" + msgstr "设置一个移动宽带连接" + + #: src/libnma/nma-mobile-wizard.ui:189 +-#, fuzzy + msgid "Country or region:" +-msgstr "国家或地区" ++msgstr "国家或地区:" + + #: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127 + msgid "Choose your Provider’s Country or Region" +@@ -4254,9 +4149,8 @@ msgid "Select your provider from a _list:" + msgstr "从列表中选择您的提供商(_L)：" + + #: src/libnma/nma-mobile-wizard.ui:289 +-#, fuzzy + msgid "I can’t find my provider and I wish to set up the connection _manually:" +-msgstr "找不到我的提供商，希望手动输入(_M)：" ++msgstr "找不到我的提供商，希望手动设置连接(_m)：" + + #: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779 + msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)" +@@ -4368,9 +4262,9 @@ msgid "Choose a %s Certificate" + msgstr "选择一个 %s 证书" + + #: src/libnma/nma-pkcs11-cert-chooser.c:402 +-#, fuzzy, c-format ++#, c-format + msgid "%s certificate _password" +-msgstr "用户证书(_U)：" ++msgstr "%s 证书密码(_p)" + + #: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255 + msgid "Error logging in: " +@@ -4499,19 +4393,16 @@ msgid "" + msgstr "输入您要连接的隐藏的 Wi-Fi 网络的名称及安全性详细信息。" + + #: src/libnma/wifi.ui:97 +-#, fuzzy + msgid "Wi-Fi _security" +-msgstr "Wi-Fi 安全性(_S)：" ++msgstr "Wi-Fi 安全性(_s)" + + #: src/libnma/wifi.ui:154 +-#, fuzzy + msgid "C_onnection" +-msgstr "连接(_O)：" ++msgstr "连接(_o)" + + #: src/libnma/wifi.ui:179 +-#, fuzzy + msgid "Wi-Fi _adapter" +-msgstr "Wi-Fi 适配器(_A)：" ++msgstr "Wi-Fi 适配器(_a)" + + #: src/libnm-gtk/nm-mobile-wizard.c:749 + msgid "I can’t find my provider and I wish to enter it _manually:" +@@ -4768,21 +4659,18 @@ msgstr "两者兼用" + #: src/wireless-security/eap-method-fast.ui:48 + #: src/wireless-security/eap-method-peap.ui:48 + #: src/wireless-security/eap-method-ttls.ui:118 +-#, fuzzy + msgid "Anony_mous identity" +-msgstr "匿名身份(_M)：" ++msgstr "匿名身份(_m)" + + #: src/wireless-security/eap-method-fast.ui:74 +-#, fuzzy + msgid "PAC _file" +-msgstr "PAC 文件(_F)：" ++msgstr "PAC 文件(_f)" + + #: src/wireless-security/eap-method-fast.ui:113 + #: src/wireless-security/eap-method-peap.ui:120 + #: src/wireless-security/eap-method-ttls.ui:77 +-#, fuzzy + msgid "_Inner authentication" +-msgstr "内部认证(_I)：" ++msgstr "内部认证(_I)" + + #: src/wireless-security/eap-method-fast.ui:142 + msgid "Allow automatic PAC pro_visioning" +@@ -4817,9 +4705,8 @@ msgid "No CA certificate is _required" + msgstr "不需要 CA 证书(_R)" + + #: src/wireless-security/eap-method-peap.ui:89 +-#, fuzzy + msgid "PEAP _version" +-msgstr "PEAP 版本(_V)：" ++msgstr "PEAP 版本(_v)" + + #: src/wireless-security/eap-method-peap.ui:166 + #: src/wireless-security/eap-method-tls.ui:62 +@@ -4831,7 +4718,7 @@ msgstr "服务器证书名称的后缀。" + #: src/wireless-security/eap-method-tls.ui:63 + #: src/wireless-security/eap-method-ttls.ui:133 + msgid "_Domain" +-msgstr "" ++msgstr "域(_d)" + + #: src/wireless-security/eap-method-simple.c:90 + msgid "missing EAP username" +@@ -4843,17 +4730,15 @@ msgstr "缺少 EAP 密码" + + #: src/wireless-security/eap-method-simple.c:120 + msgid "missing EAP client Private Key passphrase" +-msgstr "" ++msgstr "缺少 EAP 客户端私钥密码口令" + + #: src/wireless-security/eap-method-simple.ui:103 +-#, fuzzy + msgid "P_rivate Key Passphrase" +-msgstr "WEP 128 位密码句" ++msgstr "私钥密码口令(_r)" + + #: src/wireless-security/eap-method-simple.ui:128 +-#, fuzzy + msgid "Sh_ow passphrase" +-msgstr "显示密码(_O)" ++msgstr "显示密码(_o)" + + #: src/wireless-security/eap-method-tls.c:64 + msgid "missing EAP-TLS identity" +@@ -4876,9 +4761,8 @@ msgid "selected key file does not exist" + msgstr "选择的关键文件不存在" + + #: src/wireless-security/eap-method-tls.ui:20 +-#, fuzzy + msgid "I_dentity" +-msgstr "身份(_D)：" ++msgstr "身份(_d)" + + #: src/wireless-security/eap-method-ttls.c:337 + msgid "MSCHAPv2 (no EAP)" +@@ -4910,14 +4794,13 @@ msgstr "受保护的 EAP (PEAP)" + + #: src/wireless-security/wireless-security.c:523 + msgid "Externally configured" +-msgstr "" ++msgstr "外部配置" + + #: src/wireless-security/ws-dynamic-wep.ui:31 + #: src/wireless-security/ws-wep-key.ui:97 + #: src/wireless-security/ws-wpa-eap.ui:31 +-#, fuzzy + msgid "Au_thentication" +-msgstr "认证(_T)：" ++msgstr "认证(_t)" + + #: src/wireless-security/ws-leap.c:64 + msgid "missing leap-username" +@@ -4972,18 +4855,16 @@ msgid "1 (Default)" + msgstr "1 (默认)" + + #: src/wireless-security/ws-wep-key.ui:54 +-#, fuzzy + msgid "_Key" +-msgstr "密钥(_K)：" ++msgstr "密钥(_K)" + + #: src/wireless-security/ws-wep-key.ui:80 + msgid "Sho_w key" + msgstr "显示密钥(_W)" + + #: src/wireless-security/ws-wep-key.ui:129 +-#, fuzzy + msgid "WEP inde_x" +-msgstr "WEP 索引(_X)：" ++msgstr "WEP 索引(_x)" + + #: src/wireless-security/ws-wpa-psk.c:76 + #, c-format +@@ -4998,46 +4879,5 @@ msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" + msgstr "无效的 wpa-psk：不能用 64 个字节作为十六进制解释密钥" + + #: src/wireless-security/ws-wpa-psk.ui:48 +-#, fuzzy + msgid "_Type" +-msgstr "类型(_T)：" +- +-#~ msgid "%s (default)" +-#~ msgstr "%s (默认)" +- +-#~ msgid "Ignored" +-#~ msgstr "已忽略" +- +-#~ msgid "Active Network Connections" +-#~ msgstr "活动的网络连接" +- +-#~ msgid "Failed to update connection secrets due to an unknown error." +-#~ msgstr "由于一个未知错误，更新连接 secret 时失败。" +- +-#~ msgid "Priority:" +-#~ msgstr "优先级：" +- +-#~ msgid "_Automatically connect to this network when it is available" +-#~ msgstr "可用时自动链接到这个网络(_A)" +- +-#, fuzzy +-#~ msgid "Connection _priority for auto-activation:" +-#~ msgstr "连接信息(_I)" +- +-#~ msgid "Cannot import VPN connection" +-#~ msgstr "无法导入 VPN 连接" +- +-#, fuzzy +-#~ msgid "" +-#~ "The file “%s” could not be read or does not contain recognized VPN " +-#~ "connection information\n" +-#~ "\n" +-#~ "Error: %s." +-#~ msgstr "" +-#~ "无法读取 %s 或文件中不包含可识别的 VPN 连接信息\n" +-#~ "\n" +-#~ "错误：%s。" +- +-#, fuzzy +-#~ msgid "unknown error" +-#~ msgstr "未知错误" ++msgstr "类型(_T)" +-- +2.21.0 + diff --git a/SOURCES/0003-drop-gschema.patch b/SOURCES/0003-drop-gschema.patch new file mode 100644 index 0000000..bce0b17 --- /dev/null +++ b/SOURCES/0003-drop-gschema.patch @@ -0,0 +1,151 @@ +From 446e1936f5798ba38683fe910469ad995abfdfa8 Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani +Date: Mon, 18 May 2020 17:04:37 +0200 +Subject: [PATCH] gschema: move "org.gnome.nm-applet.gschema.xml" from + network-manager-applet to libnma + +The schema is also used by libnma's "src/nma-ws/nma-eap.c" (formerly +"src/wireless-security/eap-method.c") and g-c-c's +"panels/network/wireless-security/eap-method.c". + +That means, despite the name of the schema, it really belongs to libnma. + +Move it to libnma ([1]). + +[1] https://gitlab.gnome.org/GNOME/libnma/-/commit/50cda26ae4beab31f30fb93fd36a7bcc5435adc1 + +See-also: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/881 +See-also: https://gitlab.gnome.org/GNOME/libnma/-/merge_requests/11 +(cherry-picked from commit 6b1aaade74cf9d2cc5f02433cf34525b279011de) +--- + Makefile.am | 3 -- + configure.ac | 1 - + meson.build | 13 -------- + org.gnome.nm-applet.gschema.xml.in | 52 ------------------------------ + po/POTFILES.in | 1 - + 5 files changed, 70 deletions(-) + delete mode 100644 org.gnome.nm-applet.gschema.xml.in + +diff --git a/Makefile.am b/Makefile.am +index c863e8d4..09d258af 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1128,9 +1128,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + nm-connection-editor.desktop: nm-connection-editor.desktop.in + $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +-gsettings_SCHEMAS = org.gnome.nm-applet.gschema.xml +-@GSETTINGS_RULES@ +- + appdatadir = $(datadir)/metainfo + appdata_DATA = $(appdata_in_files:.xml.in=.xml) + appdata_in_files = nm-connection-editor.appdata.xml.in +diff --git a/configure.ac b/configure.ac +index 5f6a24c0..2144415d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -339,7 +339,6 @@ src/libnma/libnma.pc + po/Makefile.in + man/nm-applet.1 + man/nm-connection-editor.1 +-org.gnome.nm-applet.gschema.xml + src/libnma/nma-version.h + ]) + AC_OUTPUT +diff --git a/meson.build b/meson.build +index cf5d02f7..7f7ad12e 100644 +--- a/meson.build ++++ b/meson.build +@@ -419,19 +419,6 @@ if appstream_util.found() + ) + endif + +-schema_conf = configuration_data() +-schema_conf.set('GETTEXT_PACKAGE', nma_name) +- +-schema = 'org.gnome.nm-applet.gschema.xml' +- +-configure_file( +- input: schema + '.in', +- output: schema, +- install: true, +- install_dir: join_paths(nma_datadir, 'glib-2.0', 'schemas'), +- configuration: schema_conf +-) +- + install_data( + 'nm-applet.convert', + install_dir: join_paths(nma_datadir, 'GConf', 'gsettings') +diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in +deleted file mode 100644 +index 4f8c16af..00000000 +--- a/org.gnome.nm-applet.gschema.xml.in ++++ /dev/null +@@ -1,52 +0,0 @@ +- +- +- +- +- false +- Disable connected notifications +- Set this to true to disable notifications when connecting to a network. +- +- +- false +- Disable disconnected notifications +- Set this to true to disable notifications when disconnecting from a network. +- +- +- false +- Disable VPN notifications +- Set this to true to disable notifications when connecting to or disconnecting from a VPN. +- +- +- true +- Suppress networks available notifications +- Set this to true to disable notifications when Wi-Fi networks are available. +- +- +- 0 +- Stamp +- Used to determine whether settings should be migrated to a new version. +- +- +- false +- Disable WiFi Create +- Set to true to disable creation of adhoc networks when using the applet. +- +- +- true +- Show the applet in notification area +- Set to FALSE to disable displaying the applet in the notification area. +- +- +- +- +- false +- Ignore CA certificate +- Set this to true to disable warnings about CA certificates in EAP authentication. +- +- +- false +- Ignore CA certificate +- Set this to true to disable warnings about CA certificates in phase 2 of EAP authentication. +- +- +- +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 31cfdef8..7a7b546d 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -2,7 +2,6 @@ + # Please keep this file sorted alphabetically. + nm-applet.desktop.in + nm-connection-editor.desktop.in +-org.gnome.nm-applet.gschema.xml.in + nm-connection-editor.appdata.xml.in + shared/nm-utils/nm-shared-utils.c + src/8021x.ui +-- +2.25.3 + diff --git a/SPECS/network-manager-applet.spec b/SPECS/network-manager-applet.spec new file mode 100644 index 0000000..2948eca --- /dev/null +++ b/SPECS/network-manager-applet.spec @@ -0,0 +1,529 @@ +%global gtk3_version %(pkg-config --modversion gtk+-3.0 2>/dev/null || echo bad) +%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) +%global nm_version 1:1.1.0 +%global obsoletes_ver 1:0.9.7 + +%global rpm_version 1.8.22 +%global real_version 1.8.22 +%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} > 28 || 0%{?rhel} > 7 +%bcond_with libnm_gtk +%else +%bcond_without libnm_gtk +%endif + +Name: network-manager-applet +Summary: A network control and status applet for NetworkManager +Version: %{rpm_version} +Release: %{release_version}%{?dist} +Group: Applications/System +License: GPLv2+ +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-nm-applet-no-notifications.patch +Patch2: 0001-po-RHEL-8.1-translations-rh1690001.patch +Patch3: 0003-drop-gschema.patch + +Requires: NetworkManager >= %{nm_version} +Requires: libnotify >= 0.4.3 +Requires: nm-connection-editor = %{version}-%{release} + +%if %{with libnm_gtk} +BuildRequires: NetworkManager-devel >= %{nm_version} +BuildRequires: NetworkManager-glib-devel >= %{nm_version} +%endif +BuildRequires: NetworkManager-libnm-devel >= %{nm_version} +BuildRequires: ModemManager-glib-devel >= 1.0 +BuildRequires: glib2-devel >= 2.32 +BuildRequires: gtk3-devel >= 3.10 +BuildRequires: libsecret-devel +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 +BuildRequires: libselinux-devel +BuildRequires: mobile-broadband-provider-info-devel + +%description +This package contains a network control and status notification area applet +for use with NetworkManager. + +%package -n nm-connection-editor +Summary: A network connection configuration editor for NetworkManager + +%description -n nm-connection-editor +This package contains a network configuration editor and Bluetooth modem +utility for use with NetworkManager. + + +%package -n libnm-gtk +Summary: Private libraries for NetworkManager GUI support +Group: Development/Libraries +Requires: gtk3 >= %{gtk3_version} +Requires: mobile-broadband-provider-info >= 0.20090602 +Obsoletes: NetworkManager-gtk < %{obsoletes_ver} + +%description -n libnm-gtk +This package contains private libraries to be used only by nm-applet, +nm-connection editor, and the GNOME Control Center. + +%package -n libnm-gtk-devel +Summary: Private header files for NetworkManager GUI support +Group: Development/Libraries +Requires: NetworkManager-devel >= %{nm_version} +Requires: NetworkManager-glib-devel >= %{nm_version} +Obsoletes: NetworkManager-gtk-devel < %{obsoletes_ver} +Requires: libnm-gtk = %{version}-%{release} +Requires: gtk3-devel +Requires: pkgconfig + +%description -n libnm-gtk-devel +This package contains private header and pkg-config files to be used only by +GNOME control center. + +This package is obsoleted by libnma. + + +%package -n libnma +Summary: Private libraries for NetworkManager GUI support +Group: Development/Libraries +Requires: gtk3 >= %{gtk3_version} +Requires: mobile-broadband-provider-info >= 0.20090602 +Obsoletes: NetworkManager-gtk < %{obsoletes_ver} + +%description -n libnma +This package contains private libraries to be used only by nm-applet, +nm-connection editor, and the GNOME Control Center. + +%package -n libnma-devel +Summary: Private header files for NetworkManager GUI support +Group: Development/Libraries +Requires: NetworkManager-libnm-devel >= %{nm_version} +Obsoletes: NetworkManager-gtk-devel < %{obsoletes_ver} +Requires: libnma = %{version}-%{release} +Requires: gtk3-devel +Requires: pkgconfig + +%description -n libnma-devel +This package contains private header and pkg-config files to be used only by +nm-applet, nm-connection-editor, and the GNOME control center. + +This package deprecates libnm-gtk. + +%prep +%setup -q -n "%{name}-%{real_version}" +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 + +%build +%meson \ + -Dgcr=true \ + -Dselinux=true \ + -Ddisable-static=true \ +%if %{with libnm_gtk} + -Dlibnm_gtk=true +%else + -Dlibnm_gtk=false +%endif +%meson_build + +%install +%meson_install +mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties + +%find_lang nm-applet +cat nm-applet.lang >> %{name}.lang + +# validate .desktop and autostart files +desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-editor.desktop + +%check +%meson_test + +%post -n libnma -p /sbin/ldconfig +%postun -n libnma -p /sbin/ldconfig + +%post -n libnm-gtk -p /sbin/ldconfig +%postun -n libnm-gtk -p /sbin/ldconfig + +%files +%{_bindir}/nm-applet +%{_datadir}/applications/nm-applet.desktop +%{_datadir}/icons/hicolor/22x22/apps/nm-adhoc.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 +%{_datadir}/icons/hicolor/22x22/apps/nm-stage*-connecting*.png +%{_datadir}/icons/hicolor/22x22/apps/nm-tech-*.png +%{_datadir}/icons/hicolor/22x22/apps/nm-vpn-active-lock.png +%{_datadir}/icons/hicolor/22x22/apps/nm-vpn-connecting*.png +%{_datadir}/icons/hicolor/22x22/apps/nm-wwan-tower.png +%{_datadir}/GConf/gsettings/nm-applet.convert +%{_sysconfdir}/xdg/autostart/nm-applet.desktop +%{_mandir}/man1/nm-applet* +%doc NEWS CONTRIBUTING +%license COPYING + +# Yes, lang files for the applet go in nm-connection-editor RPM since it +# 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 + +%if %{with libnm_gtk} +%files -n libnm-gtk +%{_libdir}/libnm-gtk.so.* +%{_libdir}/girepository-1.0/NMGtk-1.0.typelib +%endif + +%if %{with libnm_gtk} +%files -n libnm-gtk-devel +%dir %{_includedir}/libnm-gtk +%{_includedir}/libnm-gtk/*.h +%{_libdir}/pkgconfig/libnm-gtk.pc +%{_libdir}/libnm-gtk.so +%{_datadir}/gir-1.0/NMGtk-1.0.gir +%endif + +%files -n libnma +%{_libdir}/libnma.so.* +%{_libdir}/girepository-1.0/NMA-1.0.typelib + +%files -n libnma-devel +%dir %{_includedir}/libnma +%{_includedir}/libnma/*.h +%{_libdir}/pkgconfig/libnma.pc +%{_libdir}/libnma.so +%{_datadir}/gir-1.0/NMA-1.0.gir +%{_datadir}/gtk-doc + + +%changelog +* Mon May 18 2020 Beniamino Galvani - 1.8.22-3 +- Drop gschema XML which conflicts with new libnma package + +* Thu Aug 15 2019 Lubomir Rintel - 1.8.22-2 +- Update translations (rh #1690001) + +* Thu May 30 2019 Beniamino Galvani - 1.8.22-1 +- Update to 1.8.22 release + +* Wed Feb 20 2019 Lubomir Rintel - 1.8.10-5 +- One more translation update (rh #1608325) + +* Tue Oct 16 2018 Lubomir Rintel - 1.8.10-4 +- Update translations (rh #1608325) + +* Fri Sep 28 2018 Beniamino Galvani - 1.8.10-3 +- Rebuild with updated annobin (rh #1630604) + +* Fri Feb 09 2018 Igor Gnatenko - 1.8.10-2.2 +- Escape macros in %%changelog + +* Thu Feb 08 2018 Fedora Release Engineering - 1.8.10-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Feb 4 2018 Thomas Haller - 1.8.10-2 +- fix double-free handling VPN data in nm-applet (rh #1541565) +- fix certificate chooser for no available modules (bgo #785674) + +* Sat Feb 03 2018 Igor Gnatenko - 1.8.10-1.2 +- Switch to %%ldconfig_scriptlets + +* Thu Jan 18 2018 Igor Gnatenko - 1.8.10-1.1 +- Remove obsolete scriptlets + +* Tue Dec 19 2017 Lubomir Rintel - 1.8.10-1 +- Update to 1.8.10 release + +* Mon Dec 18 2017 Lubomir Rintel - 1.8.8-1 +- Update to 1.8.8 release + +* Mon Nov 13 2017 Kalev Lember - 1.8.6-3 +- Backport an upstream patch to fix generated .pc file + +* Wed Nov 08 2017 Lubomir Rintel - 1.8.6-2 +- Meson build fixups + +* Tue Nov 07 2017 Lubomir Rintel - 1.8.6-1 +- Update to 1.8.6 release +- Switch to Meson build system + +* Wed Sep 20 2017 Thomas Haller - 1.8.4-1 +- Update to 1.8.4 release + +* Mon Sep 18 2017 Beniamino Galvani - 1.8.2-4 +- applet: fix status icon when a VPN has the default route (rh#1471510) + +* Wed Aug 23 2017 Thomas Haller - 1.8.2-3 +- libnma: fix certificate picker for empty certificates (rh#1469852) + +* Thu Aug 03 2017 Fedora Release Engineering - 1.8.2-2.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.8.2-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Jun 22 2017 Lubomir Rintel - 1.8.2-2 +- editor: fix a crash on connection save + +* Tue Jun 13 2017 Lubomir Rintel - 1.8.2-1 +- Update to network-manager-applet 1.8.2 release + +* Fri Jun 09 2017 Lubomir Rintel - 1.8.0-2 +- editor: fix crash when destroying 802.1x page (rh #1458567) +- po: update Japanese translation (rh #1379642) + +* Wed May 10 2017 Thomas Haller - 1.8.0-1 +- Update to 1.8.0 release + +* Fri Mar 24 2017 Lubomir Rintel - 1.8.0-0.1 +- Update to a snapshot of network-manager-applet 1.8 release + +* Mon Mar 06 2017 Lubomir Rintel - 1.4.6-1 +- Update to network-manager-applet 1.4.6 release + +* Fri Feb 10 2017 Fedora Release Engineering - 1.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Jan 25 2017 Lubomir Rintel - 1.4.4-1 +- Update to network-manager-applet 1.4.4 release + +* Wed Aug 24 2016 Lubomir Rintel - 1.4.0-1 +- Update to network-manager-applet 1.4.0 release + +* Thu Aug 4 2016 Francesco Giudici - 1.2.4-1 +- Update to network-manager-applet 1.2.4 release + +* Wed May 11 2016 Lubomir Rintel - 1.2.2-1 +- Update to network-manager-applet 1.2.2 release + +* Wed Apr 20 2016 Lubomir Rintel - 1.2.0-1 +- Update to network-manager-applet 1.2.0 release + +* Tue Apr 5 2016 Lubomir Rintel - 1.2.0-0.3.rc1 +- Update to network-manager-applet 1.2-rc1 + +* Tue Mar 29 2016 Lubomir Rintel - 1.2.0-0.3.beta3 +- Update to network-manager-applet 1.2-beta3 + +* Mon Mar 07 2016 Lubomir Rintel - 1.2.0-0.3.beta2 +- Update to network-manager-applet 1.2-beta2 + +* Thu Feb 04 2016 Fedora Release Engineering - 1.2.0-0.3.beta1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jan 19 2016 Lubomir Rintel - 1.2.0-0.2.beta1 +- Update to network-manager-applet 1.2-beta1 + +* Thu Sep 3 2015 Lubomir Rintel - 1.2.0-0.1.20150903git807cbdf +- Update to 1.2 git snapshot: +- Add libnma subpackages +- Add support for libnm-based properties plugins + +* Wed Sep 2 2015 Thomas Haller - 1.0.6-4 +- show tooltip when connect button is disabled due to invalid connection (rh #1247885) + +* Tue Sep 1 2015 Jiří Klimeš - 1.0.6-3 +- libnm-gtk: fix a possible crash on password widget destroy (rh #1254043) + +* Thu Aug 27 2015 Lubomir Rintel - 1.0.6-2 +- Re-add an accidentally removed patch + +* Thu Aug 27 2015 Lubomir Rintel - 1.0.6-1 +- Update to 1.0.6 release + +* Wed Jul 15 2015 Lubomir Rintel - 1.0.4-2 +- Version the newly added ABI + +* Tue Jul 14 2015 Lubomir Rintel - 1.0.4-1 +- Update to 1.0.4 release + +* Tue Jul 07 2015 Lubomir Rintel - 1.0.4-0.1.git20160702.25368df +- Update to a later Git snapshot + +* Thu Jun 18 2015 Lubomir Rintel - 1.0.4-0.1.git20160615.28a0e28 +- Update to a later Git snapshot + +* Wed Jun 17 2015 Fedora Release Engineering - 1.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue May 5 2015 Lubomir Rintel - 1.0.2-1 +- Update to 1.0.2 release + +* Sat Feb 21 2015 Till Maas - 1.0.0-2 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Mon Dec 22 2014 Dan Williams - 1.0.0-1 +- Update to 1.0 + +* Mon Dec 1 2014 Jiří Klimeš - 0.9.10.1-1.git20141201.be5a9db +- update to latest git snapshot of 0.9.10 (git20141201 sha:be5a9db) + +* Wed Sep 03 2014 Kalev Lember - 0.9.9.0-15.git20140424 +- Backport a patch to hide nm-connection-editor launcher in GNOME + +* Sun Aug 17 2014 Fedora Release Engineering - 0.9.9.0-14.git20140424 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jul 22 2014 Kalev Lember - 0.9.9.0-13.git20140424 +- Rebuilt for gobject-introspection 1.41.4 + +* Sat Jun 07 2014 Fedora Release Engineering - 0.9.9.0-12.git20140424 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 07 2014 Kalev Lember - 0.9.9.0-11.git20140424 +- Drop gnome-icon-theme dependency + +* Thu Apr 24 2014 Jiří Klimeš - 0.9.9.0-10.git20140424 +- update to latest git snapshot (git20140424 sha:9ba9c3e) + +* Mon Mar 24 2014 Dan Winship - 0.9.9.0-9.git20140123 +- Add ModemManager-glib-devel to BuildRequires + +* Thu Jan 23 2014 Jiří Klimeš - 0.9.9.0-8.git20140123 +- update to latest git snapshot (git20140123 sha:5d4f17e) +- applet: fix crash when "CA certificate is not required" (rh #1055535) + +* Fri Dec 20 2013 Kevin Fenzi 0.9.9.0-8.git20131028 +- Remove bluetooth plugin, doesn't work with new gnome-bluetooth/bluez5 + +* Mon Oct 28 2013 Dan Winship - 0.9.9.0-7.git20131028 +- update to latest git snapshot +- re-enable nm-applet on certain non-GNOME-Shell desktops (rh #1017471) + +* Fri Sep 13 2013 Dan Williams - 0.9.9.0-6.git20130906 +- libnm-gtk: fix for enabling the Apply button for PEAP and TTLS (rh #1000564) +- libnm-gtk: only save CA certificate ignored value when connection is saved +- editor: fix display of VLAN parent interface + +* Fri Sep 06 2013 Dan Williams - 0.9.9.0-5.git20130906 +- editor: fix missing user/password when re-editing a connection (rh #1000564) +- editor: fix handling of missing CA certificate prompts (rh #758076) (rh #809489) +- editor: fix handling of bonding modes (rh #953076) +- applet/editor: add InfiniBand device support (rh #867273) + +* Tue Aug 06 2013 Dennis Gilmore - 0.9.9.0-4.git20130515 +- rebuild for soname bump in gnome-bluetooth + +* Sat Aug 03 2013 Fedora Release Engineering - 0.9.9.0-3.git20130515 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Dan Williams - 0.9.9.0-2 +- Disable migration tool and remove dependencies on GConf and gnome-keyring + +* Wed May 15 2013 Dan Williams - 0.9.9.0-1.git20130515 +- Update to 0.9.10 snapshot + +* Tue Apr 30 2013 Dan Williams - 0.9.8.1-3.git20130430 +- editor: fix possible crash canceling connection edit dialog +- applet: only request secrets from the user when allowed to +- applet: fix signal icons with newer libpng +- applet: fix possible crash getting secrets with libsecret + +* Thu Apr 18 2013 Jiří Klimeš - 0.9.8.1-2.git20130327 +- applet: fix crash while getting a PIN to unlock a modem (rh #950925) + +* Wed Mar 27 2013 Dan Williams - 0.9.8.1-1.git20130327 +- Update to 0.9.8.2 snapshot +- Updated translations +- editor: don't overwrite bridge/bond master interface name with UUID +- applet: fix WWAN PIN dialog invalid "label1" entry widget +- editor: fix allowed values for VLAN ID and MTU +- editor: preserve existing PPP connection LCP echo failure and reply values +- editor: ensure changes to the STP checkbox are saved +- editor: hide BSSID for AdHoc connection (rh #906133) +- editor: fix random data sneaking into IPv6 route gateway fields +- editor: fix handling of initial entry for MAC address widgets + +* Wed Feb 27 2013 Jiří Klimeš - 0.9.8.0-1 +- Update to 0.9.8.0 + +* Fri Feb 8 2013 Dan Williams - 0.9.7.997-1 +- Update to 0.9.7.997 (0.9.8-beta2) +- editor: better handling of gateway entry for IPv4 +- editor: fix some mnemonics (rh #893466) +- editor: fix saving connection when ignoring CA certificate +- editor: enable Bridge connection editing +- editor: hide widgets not relevant for VPN connections + +* Tue Dec 11 2012 Jiří Klimeš - 0.9.7.0-6.git20121211 +- editor: fix populating Firewall zone in 'General' tab + +* Tue Dec 11 2012 Jiří Klimeš - 0.9.7.0-5.git20121211 +- Update to git snapshot (git20121211) without bridges + +* Thu Nov 08 2012 Kalev Lember - 0.9.7.0-4.git20121016 +- Update the versioned obsoletes for the new F17 NM build + +* Tue Oct 16 2012 Jiří Klimeš - 0.9.7.0-3.git20121016 +- Update to git snapshot (git20121016) +- editor: fix a crash when no VPN plugins are installed + +* Thu Oct 4 2012 Dan Winship - 0.9.7.0-3.git20121004 +- Update to git snapshot + +* Wed Sep 12 2012 Jiří Klimeš - 0.9.7.0-3.git20120820 +- move GSettings schema XML to nm-connection-editor rpm (rh #852792) + +* Thu Aug 30 2012 Jiří Klimeš - 0.9.7.0-2.git20120820 +- run glib-compile-schemas in %%post scriplet (rh #852792) + +* Tue Aug 21 2012 Dan Winship - 0.9.7.0-1.git20120820 +- Update to 0.9.7.0 snapshot + +* Tue Aug 14 2012 Daniel Drake - 0.9.5.96-2 +- Rebuild for libgnome-bluetooth.so.11 + +* Mon Jul 23 2012 Dan Williams - 0.9.5.96-1 +- Update to 0.9.6-rc2 +- lib: recognize PKCS#12 files exported from Firefox +- lib: fix some wireless dialog crashes + +* Fri Jul 20 2012 Fedora Release Engineering - 0.9.5.95-3.git20120713 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jul 14 2012 Kalev Lember - 0.9.5.95-2.git20120713 +- Fix the versioned obsoletes + +* Fri Jul 13 2012 Jiří Klimeš - 0.9.5.95-1.git20120713 +- update to 0.9.5.95 (0.9.6-rc1) snapshot +- editor: fixed UI mnemonics +- editor: fix defaults for PPP echo values +- applet: various crash and stability fixes +- applet: show IPv6 addressing page for VPN plugins that support it +- applet: port to GSettings and split out 0.8 -> 0.9 migration code into standalone tool + +* Mon May 21 2012 Jiří Klimeš - 0.9.4-4 +- update to git snapshot + +* Wed May 2 2012 Jiří Klimeš - 0.9.4-3 +- update to git snapshot + +* Mon Mar 19 2012 Dan Williams - 0.9.3.997-1 +- Initial package split from NetworkManager +