diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ce8fdf4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/network-manager-applet-1.8.6.tar.xz diff --git a/.network-manager-applet.metadata b/.network-manager-applet.metadata new file mode 100644 index 0000000..a053e03 --- /dev/null +++ b/.network-manager-applet.metadata @@ -0,0 +1 @@ +ff3894625094a463f3b0800d09a596d95bf612c8 SOURCES/network-manager-applet-1.8.6.tar.xz diff --git a/SOURCES/0001-po-import-translations-rh1481187.patch b/SOURCES/0001-po-import-translations-rh1481187.patch new file mode 100644 index 0000000..e12fa50 --- /dev/null +++ b/SOURCES/0001-po-import-translations-rh1481187.patch @@ -0,0 +1,26843 @@ +From 7485e2f3ee8a071096c4a241c1c1309cc63c82a7 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Mon, 29 May 2017 19:17:34 +0200 +Subject: [PATCH 1/2] po: add zanata.xml + +--- + zanata.xml | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + create mode 100644 zanata.xml + +diff --git a/zanata.xml b/zanata.xml +new file mode 100644 +index 0000000..534636e +--- /dev/null ++++ b/zanata.xml +@@ -0,0 +1,16 @@ ++ ++ ++ ++ ++ ++ https://vendors.zanata.redhat.com/ ++ nm-applet ++ RHEL-7.5 ++ gettext ++ po ++ po ++ ++ +-- +2.14.3 + + +From ac8baaec479954378d5a41317422573031965b71 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Tue, 12 Dec 2017 11:11:37 +0100 +Subject: [PATCH 2/2] po: import translations + +https://bugzilla.redhat.com/show_bug.cgi?id=1481187 + +--- + po/de.po | 108 ++-- + po/es.po | 1149 ++++++++----------------------------- + po/fr.po | 1587 +++++++++++++++++++++++---------------------------- + po/it.po | 592 +++---------------- + po/ja.po | 1540 ++++++++++++++++++++++++++++--------------------- + po/ko.po | 1582 +++++++++++++++++++++++---------------------------- + po/pt_BR.po | 1398 ++++++++++++++++++--------------------------- + po/ru.po | 1773 +++++++++++++++++++++++---------------------------------- + po/zh_CN.po | 1549 +++++++++++++++++++++++--------------------------- + po/zh_TW.po | 1825 +++++++++++++++++++++++------------------------------------ + 10 files changed, 5346 insertions(+), 7757 deletions(-) + +diff --git a/po/de.po b/po/de.po +index 677db90..d731711 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -17,22 +17,21 @@ + # Hedda Peters , 2012. + # Christian Kirbach , 2009-2013, 2013. + # Bernd Homuth , 2015. +-# ++# lrintel , 2017. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: network-manager-applet master\n" +-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" +-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n" +-"POT-Creation-Date: 2017-09-22 19:31+0000\n" +-"PO-Revision-Date: 2017-10-10 20:06+0200\n" +-"Last-Translator: Mario Blättermann \n" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2017-11-07 19:40+0100\n" ++"PO-Revision-Date: 2017-11-07 06:45+0000\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: Deutsch \n" + "Language: de\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: Poedit 2.0.3\n" ++"X-Generator: Zanata 4.3.2\n" + + #: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191 + msgid "Network" +@@ -267,7 +266,6 @@ msgstr "Hinzufügen/Aktivierung der Verbindung schlug fehl" + msgid "Unknown error" + msgstr "Unbekannter Fehler" + +-# + #: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539 + #: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414 + msgid "Connection failure" +@@ -281,7 +279,6 @@ msgstr "Trennen des Gerätes schlug fehl" + msgid "Disconnect failure" + msgstr "Trennen schlug fehl" + +-# + #: ../src/applet.c:481 + msgid "Connection activation failed" + msgstr "Aktivierung der Verbindung fehlgeschlagen" +@@ -411,7 +408,6 @@ msgstr "Die VPN-Verbindung wurde erfolgreich eingerichtet.\n" + msgid "VPN Login Message" + msgstr "VPN-Anmeldemitteilung" + +-# + #: ../src/applet.c:959 ../src/applet.c:999 + msgid "VPN Connection Failed" + msgstr "VPN-Verbindung fehlgeschlagen" +@@ -1131,7 +1127,7 @@ msgstr "" + #: ../src/connection-editor/ce-page-bond.ui.h:12 + #: ../src/connection-editor/ce-page-bridge.ui.h:2 + #: ../src/connection-editor/ce-page-ip4.ui.h:7 +-#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++#: ../src/connection-editor/ce-page-ip6.ui.h:12 + #: ../src/connection-editor/ce-page-team.ui.h:13 + #: ../src/connection-editor/nm-connection-list.ui.h:3 + msgid "_Add" +@@ -1142,7 +1138,7 @@ msgstr "_Hinzufügen" + #: ../src/connection-editor/ce-page-bond.ui.h:14 + #: ../src/connection-editor/ce-page-bridge.ui.h:4 + #: ../src/connection-editor/ce-page-ip4.ui.h:8 +-#: ../src/connection-editor/ce-page-ip6.ui.h:11 ++#: ../src/connection-editor/ce-page-ip6.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:15 + #: ../src/connection-editor/connection-helpers.c:772 + #: ../src/connection-editor/nm-connection-list.ui.h:4 +@@ -1732,7 +1728,7 @@ msgstr "Die Schnittstelle, über die die PPP-Verbindung aufgebaut wird." + #: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-wifi.ui.h:1 + #: ../src/connection-editor/page-ip4.c:131 +-#: ../src/connection-editor/page-ip6.c:136 ++#: ../src/connection-editor/page-ip6.c:142 + #: ../src/wireless-security/eap-method-peap.ui.h:1 + msgid "Automatic" + msgstr "Automatisch" +@@ -1778,7 +1774,7 @@ msgid "Full" + msgstr "Voll" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:12 +-#: ../src/connection-editor/page-ip6.c:149 ++#: ../src/connection-editor/page-ip6.c:155 + msgid "Ignore" + msgstr "Ignorieren" + +@@ -1786,7 +1782,7 @@ msgstr "Ignorieren" + #: ../src/connection-editor/ce-page-ip4.ui.h:3 + #: ../src/connection-editor/ce-page-ip6.ui.h:3 + #: ../src/connection-editor/page-ip4.c:168 +-#: ../src/connection-editor/page-ip6.c:185 ++#: ../src/connection-editor/page-ip6.c:191 + msgid "Manual" + msgstr "Manuell" + +@@ -2057,12 +2053,12 @@ msgstr "Link-Local" + #: ../src/connection-editor/ce-page-ip4.ui.h:5 + #: ../src/connection-editor/ce-page-ip6.ui.h:5 + #: ../src/connection-editor/page-ip4.c:188 +-#: ../src/connection-editor/page-ip6.c:205 ++#: ../src/connection-editor/page-ip6.c:211 + msgid "Shared to other computers" + msgstr "Gemeinsam mit anderen Rechnern" + + #: ../src/connection-editor/ce-page-ip4.ui.h:6 +-#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++#: ../src/connection-editor/ce-page-ip6.ui.h:11 + msgid "_Method:" + msgstr "_Methode:" + +@@ -2077,7 +2073,7 @@ msgstr "" + "ein, wenn Sie ihn verwenden möchten." + + #: ../src/connection-editor/ce-page-ip4.ui.h:10 +-#: ../src/connection-editor/ce-page-ip6.ui.h:12 ++#: ../src/connection-editor/ce-page-ip6.ui.h:14 + msgid "" + "Domains used when resolving host names. Use commas to separate multiple " + "domains." +@@ -2090,16 +2086,16 @@ msgid "D_HCP client ID:" + msgstr "D_HCP Client-Kennung:" + + #: ../src/connection-editor/ce-page-ip4.ui.h:12 +-#: ../src/connection-editor/ce-page-ip6.ui.h:13 ++#: ../src/connection-editor/ce-page-ip6.ui.h:15 + #: ../src/connection-editor/page-ip4.c:372 +-#: ../src/connection-editor/page-ip6.c:335 ++#: ../src/connection-editor/page-ip6.c:346 + msgid "S_earch domains:" + msgstr "_Suchdomänen:" + + #: ../src/connection-editor/ce-page-ip4.ui.h:13 +-#: ../src/connection-editor/ce-page-ip6.ui.h:14 ++#: ../src/connection-editor/ce-page-ip6.ui.h:16 + #: ../src/connection-editor/page-ip4.c:363 +-#: ../src/connection-editor/page-ip6.c:326 ++#: ../src/connection-editor/page-ip6.c:337 + msgid "DNS ser_vers:" + msgstr "_DNS-Server:" + +@@ -2125,7 +2121,7 @@ msgstr "" + "Konfiguration dagegen erfolgreich ist." + + #: ../src/connection-editor/ce-page-ip4.ui.h:17 +-#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++#: ../src/connection-editor/ce-page-ip6.ui.h:22 + msgid "_Routes…" + msgstr "_Routen …" + +@@ -2143,7 +2139,15 @@ msgstr "Aktivieren (öffentliche Adresse bevorzugen)" + msgid "Enabled (prefer temporary address)" + msgstr "Aktivieren (temporäre Adresse bevorzugen)" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:15 ++#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++msgid "EUI64" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++msgid "Stable privacy" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:17 + msgid "" + "IP addresses of domain name servers used to resolve host names. Use commas " + "to separate multiple domain name server addresses. Link-local addresses will " +@@ -2154,15 +2158,19 @@ msgstr "" + "Adressen. Link-lokal-Adressen werden automatisch zur entsprechenden " + "Schnittstelle weitergeleitet." + +-#: ../src/connection-editor/ce-page-ip6.ui.h:16 ++#: ../src/connection-editor/ce-page-ip6.ui.h:18 + msgid "IPv6 _privacy extensions:" + msgstr "IPv6 Erweiterungen zum Schutz der _Privatsphäre:" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:17 ++#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++msgid "IPv6 address _generation mode:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:20 + msgid "Require IPv_6 addressing for this connection to complete" + msgstr "IPv_6-Adressierung zur Fertigstellung dieser Verbindung erforderlich" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:18 ++#: ../src/connection-editor/ce-page-ip6.ui.h:21 + msgid "" + "When connecting to IPv4-capable networks, allows the connection to complete " + "if IPv6 configuration fails but IPv4 configuration succeeds." +@@ -3164,7 +3172,6 @@ msgstr "" + msgid "Could not create new connection" + msgstr "Neue Verbindung konnte nicht erstellt werden" + +-# + #: ../src/connection-editor/connection-helpers.c:720 + msgid "Connection delete failed" + msgstr "Löschen der Verbindung fehlgeschlagen" +@@ -3177,7 +3184,7 @@ msgstr "Sind Sie sicher, dass Sie die Verbindung %s löschen möchten?" + #: ../src/connection-editor/ip4-routes-dialog.c:697 + #: ../src/connection-editor/ip6-routes-dialog.c:718 + #: ../src/connection-editor/page-ip4.c:1136 +-#: ../src/connection-editor/page-ip6.c:1095 ++#: ../src/connection-editor/page-ip6.c:1118 + msgid "Address" + msgstr "Adresse" + +@@ -3189,7 +3196,7 @@ msgstr "Netzmaske" + #: ../src/connection-editor/ip4-routes-dialog.c:735 + #: ../src/connection-editor/ip6-routes-dialog.c:756 + #: ../src/connection-editor/page-ip4.c:1174 +-#: ../src/connection-editor/page-ip6.c:1133 ++#: ../src/connection-editor/page-ip6.c:1156 + msgid "Gateway" + msgstr "Gateway" + +@@ -3199,7 +3206,7 @@ msgid "Metric" + msgstr "Metrik" + + #: ../src/connection-editor/ip6-routes-dialog.c:737 +-#: ../src/connection-editor/page-ip6.c:1114 ++#: ../src/connection-editor/page-ip6.c:1137 + msgid "Prefix" + msgstr "Präfix" + +@@ -3220,7 +3227,6 @@ msgstr "Fehlender Verbindungsname" + msgid "Editor initializing…" + msgstr "Editor wird initialisiert …" + +-# + #: ../src/connection-editor/nm-connection-editor.c:360 + #: ../src/connection-editor/nm-connection-list.c:443 + msgid "Connection cannot be modified" +@@ -3280,7 +3286,6 @@ msgstr "" + msgid "Error initializing editor" + msgstr "Fehler beim Initialisieren des Editors" + +-# + #: ../src/connection-editor/nm-connection-editor.c:1157 + msgid "Connection add failed" + msgstr "Hinzufügen der Verbindung fehlgeschlagen" +@@ -3370,7 +3375,6 @@ msgid_plural "%d years ago" + msgstr[0] "vor %d Jahr" + msgstr[1] "vor %d Jahren" + +-# + #: ../src/connection-editor/nm-connection-list.c:445 + msgid "Connection cannot be deleted" + msgstr "Verbindung kann nicht gelöscht werden" +@@ -3630,27 +3634,27 @@ msgid "IP tunnel connection %d" + msgstr "IP-Tunnel-Verbindung %d" + + #: ../src/connection-editor/page-ip4.c:127 +-#: ../src/connection-editor/page-ip6.c:130 ++#: ../src/connection-editor/page-ip6.c:136 + msgid "Automatic (VPN)" + msgstr "Automatisch (VPN)" + + #: ../src/connection-editor/page-ip4.c:128 +-#: ../src/connection-editor/page-ip6.c:131 ++#: ../src/connection-editor/page-ip6.c:137 + msgid "Automatic (VPN) addresses only" + msgstr "Automatisch (VPN), nur Adressen" + + #: ../src/connection-editor/page-ip4.c:132 +-#: ../src/connection-editor/page-ip6.c:137 ++#: ../src/connection-editor/page-ip6.c:143 + msgid "Automatic, addresses only" + msgstr "Automatisch, nur Adressen" + + #: ../src/connection-editor/page-ip4.c:134 +-#: ../src/connection-editor/page-ip6.c:133 ++#: ../src/connection-editor/page-ip6.c:139 + msgid "Automatic (PPPoE)" + msgstr "Automatisch (PPPoE)" + + #: ../src/connection-editor/page-ip4.c:135 +-#: ../src/connection-editor/page-ip6.c:134 ++#: ../src/connection-editor/page-ip6.c:140 + msgid "Automatic (PPPoE) addresses only" + msgstr "Automatisch (PPPoE), nur Adressen" + +@@ -3663,17 +3667,17 @@ msgid "Automatic (DHCP) addresses only" + msgstr "Automatisch (DHCP), nur Adressen" + + #: ../src/connection-editor/page-ip4.c:181 +-#: ../src/connection-editor/page-ip6.c:198 ++#: ../src/connection-editor/page-ip6.c:204 + msgid "Link-Local Only" + msgstr "Nur per Link-Local" + + #: ../src/connection-editor/page-ip4.c:361 +-#: ../src/connection-editor/page-ip6.c:324 ++#: ../src/connection-editor/page-ip6.c:335 + msgid "Additional DNS ser_vers:" + msgstr "Zusätzliche _DNS-Server:" + + #: ../src/connection-editor/page-ip4.c:370 +-#: ../src/connection-editor/page-ip6.c:333 ++#: ../src/connection-editor/page-ip6.c:344 + msgid "Additional s_earch domains:" + msgstr "Zusätzliche Suchdomän_en:" + +@@ -3710,39 +3714,39 @@ msgstr "IPv4-Gateway »%s« ist ungültig" + msgid "IPv4 DNS server “%s” invalid" + msgstr "IPv4-DNS-Server »%s« ist ungültig" + +-#: ../src/connection-editor/page-ip6.c:173 ++#: ../src/connection-editor/page-ip6.c:179 + msgid "Automatic, DHCP only" + msgstr "Automatisch, nur DHCP" + +-#: ../src/connection-editor/page-ip6.c:993 ++#: ../src/connection-editor/page-ip6.c:1016 + #, c-format + msgid "Editing IPv6 routes for %s" + msgstr "IPv6-Routen für »%s« bearbeiten" + +-#: ../src/connection-editor/page-ip6.c:1184 ++#: ../src/connection-editor/page-ip6.c:1208 + msgid "IPv6 Settings" + msgstr "IPv6-Einstellungen" + +-#: ../src/connection-editor/page-ip6.c:1186 ++#: ../src/connection-editor/page-ip6.c:1210 + msgid "Could not load IPv6 user interface." + msgstr "IPv6-Benutzerschnittstelle konnte nicht geladen werden." + +-#: ../src/connection-editor/page-ip6.c:1277 ++#: ../src/connection-editor/page-ip6.c:1302 + #, c-format + msgid "IPv6 address “%s” invalid" + msgstr "IPv6-Adresse »%s« ist ungültig" + +-#: ../src/connection-editor/page-ip6.c:1285 ++#: ../src/connection-editor/page-ip6.c:1310 + #, c-format + msgid "IPv6 prefix “%s” invalid" + msgstr "IPv6-Präfix »%s« ist ungültig" + +-#: ../src/connection-editor/page-ip6.c:1294 ++#: ../src/connection-editor/page-ip6.c:1319 + #, c-format + msgid "IPv6 gateway “%s” invalid" + msgstr "IPv6-Gateway »%s« ist ungültig" + +-#: ../src/connection-editor/page-ip6.c:1336 ++#: ../src/connection-editor/page-ip6.c:1361 + #, c-format + msgid "IPv6 DNS server “%s” invalid" + msgstr "IPv6-DNS-Server »%s« ist ungültig" +@@ -3941,7 +3945,6 @@ msgstr "VPN-Plugin für »%s« konnte nicht gefunden werden." + msgid "Could not load editor VPN plugin for “%s” (%s)." + msgstr "Editor-VPN-Plugin für »%s« konnte nicht gefunden werden (%s)." + +-# + #: ../src/connection-editor/page-vpn.c:123 + msgid "unknown failure" + msgstr "Fehlgeschlagen, Grund unbekannt" +@@ -3951,7 +3954,6 @@ msgstr "Fehlgeschlagen, Grund unbekannt" + msgid "VPN connection %d" + msgstr "VPN-Verbindung %d" + +-# + #: ../src/connection-editor/page-vpn.c:211 + msgid "Choose a VPN Connection Type" + msgstr "VPN-Verbindungstyp wählen" +diff --git a/po/es.po b/po/es.po +index b0dd155..a224d55 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -9,24 +9,23 @@ + # Gladys Guerrero , 2010. + # Jorge González , 2007, 2008, 2009, 2010, 2011. + # Daniel Mustieles , 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017. +-# ++# lrintel , 2017. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: networkmanager-applet.master\n" +-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" +-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n" +-"POT-Creation-Date: 2017-07-28 11:47+0000\n" +-"PO-Revision-Date: 2017-08-01 13:02+0200\n" +-"Last-Translator: Daniel Mustieles \n" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2017-11-07 19:40+0100\n" ++"PO-Revision-Date: 2017-11-07 06:45+0000\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: es \n" + "Language: es\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Generator: Gtranslator 2.91.6\n" ++"X-Generator: Zanata 4.3.2\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + +-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3186 ++#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191 + msgid "Network" + msgstr "Red" + +@@ -165,17 +164,17 @@ msgstr "" + msgid "The NetworkManager Developers" + msgstr "Los desarrolladores de NetworkManager" + +-#: ../shared/nm-utils/nm-shared-utils.c:185 ++#: ../shared/nm-utils/nm-shared-utils.c:477 + #, c-format + msgid "object class '%s' has no property named '%s'" + msgstr "el objeto de clase «%s» no tiene ninguna propiedad llamada «%s»" + +-#: ../shared/nm-utils/nm-shared-utils.c:192 ++#: ../shared/nm-utils/nm-shared-utils.c:484 + #, c-format + msgid "property '%s' of object class '%s' is not writable" + msgstr "la propiedad «%s» del objeto de la clase «%s» no se puede escribir" + +-#: ../shared/nm-utils/nm-shared-utils.c:199 ++#: ../shared/nm-utils/nm-shared-utils.c:491 + #, c-format + msgid "" + "construct property \"%s\" for object '%s' can't be set after construction" +@@ -183,20 +182,20 @@ msgstr "" + "no se puede establecer la propiedad «%s» del constructor para el objeto «%s» " + "después de la construcción" + +-#: ../shared/nm-utils/nm-shared-utils.c:207 ++#: ../shared/nm-utils/nm-shared-utils.c:499 + #, c-format + msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" + msgstr "" + "«%s::%s» no es un nombre de propiedad válido; «%s» no es un subtipo de " + "GObject" + +-#: ../shared/nm-utils/nm-shared-utils.c:216 ++#: ../shared/nm-utils/nm-shared-utils.c:508 + #, c-format + msgid "unable to set property '%s' of type '%s' from value of type '%s'" + msgstr "" + "no se puede establecer la propiedad «%s» de tipo «%s» al valor de tipo «%s»" + +-#: ../shared/nm-utils/nm-shared-utils.c:227 ++#: ../shared/nm-utils/nm-shared-utils.c:519 + #, c-format + msgid "" + "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " +@@ -205,7 +204,6 @@ msgstr "" + "el valor «%s» de tipo «%s» no es válido o está fuera de rango para la " + "propiedad «%s» de tipo «%s»" + +-#. *************************************************************************** + #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99 + msgid "802.1X authentication" + msgstr "Autenticación 802.1x" +@@ -250,37 +248,37 @@ msgstr "ad-hoc" + msgid "secure." + msgstr "segura." + +-#: ../src/applet.c:387 ++#: ../src/applet.c:392 + msgid "Failed to add/activate connection" + msgstr "Falló al añadir/activar la conexión" + +-#: ../src/applet.c:389 ../src/applet.c:443 ../src/applet.c:478 +-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410 ++#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483 ++#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411 + msgid "Unknown error" + msgstr "Error desconocido" + +-#: ../src/applet.c:392 ../src/applet.c:481 ../src/applet-device-wifi.c:539 +-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413 ++#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539 ++#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414 + msgid "Connection failure" + msgstr "Falló la conexión" + +-#: ../src/applet.c:441 ++#: ../src/applet.c:446 + msgid "Device disconnect failed" + msgstr "Falló al desconectar el dispositivo" + +-#: ../src/applet.c:446 ++#: ../src/applet.c:451 + msgid "Disconnect failure" + msgstr "Falló al desconectar" + +-#: ../src/applet.c:476 ++#: ../src/applet.c:481 + msgid "Connection activation failed" + msgstr "Falló al activar la conexión" + +-#: ../src/applet.c:804 ../src/applet-device-wifi.c:1126 ++#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127 + msgid "Don’t show this message again" + msgstr "No mostrar este mensaje de nuevo" + +-#: ../src/applet.c:894 ++#: ../src/applet.c:899 + #, c-format + msgid "" + "\n" +@@ -290,7 +288,7 @@ msgstr "" + "\n" + "La conexión VPN «%s» se desconectó porque se interrumpió la conexión de red." + +-#: ../src/applet.c:896 ++#: ../src/applet.c:901 + #, c-format + msgid "" + "\n" +@@ -300,7 +298,7 @@ msgstr "" + "\n" + "La conexión VPN «%s» ha fallado porque se interrumpió la conexión de red." + +-#: ../src/applet.c:898 ++#: ../src/applet.c:903 + #, c-format + msgid "" + "\n" +@@ -310,7 +308,7 @@ msgstr "" + "La conexión de red «%s» ha fallado porque el servicio VPN se interrumpió " + "inesperadamente." + +-#: ../src/applet.c:900 ++#: ../src/applet.c:905 + #, c-format + msgid "" + "\n" +@@ -321,7 +319,7 @@ msgstr "" + "La conexión VPN «%s» ha fallado porque el servicio VPN devolvió una " + "configuración no válida." + +-#: ../src/applet.c:902 ++#: ../src/applet.c:907 + #, c-format + msgid "" + "\n" +@@ -330,7 +328,7 @@ msgstr "" + "\n" + "La conexión VPN «%s» ha fallado porque expiró el tiempo de conexión." + +-#: ../src/applet.c:904 ++#: ../src/applet.c:909 + #, c-format + msgid "" + "\n" +@@ -339,7 +337,7 @@ msgstr "" + "\n" + "La conexión VPN «%s» ha fallado porque el servicio VPN no se inició a tiempo." + +-#: ../src/applet.c:906 ++#: ../src/applet.c:911 + #, c-format + msgid "" + "\n" +@@ -348,7 +346,7 @@ msgstr "" + "\n" + "La conexión VPN «%s» ha fallado porque el servició VPN no pudo iniciarse." + +-#: ../src/applet.c:908 ++#: ../src/applet.c:913 + #, c-format + msgid "" + "\n" +@@ -357,7 +355,7 @@ msgstr "" + "\n" + "La conexión VPN «%s» falló porque no había secretos VPN válidos." + +-#: ../src/applet.c:910 ++#: ../src/applet.c:915 + #, c-format + msgid "" + "\n" +@@ -366,7 +364,7 @@ msgstr "" + "\n" + "La conexión VPN «%s» falló porque los secretos VPN no eran válidos." + +-#: ../src/applet.c:915 ++#: ../src/applet.c:920 + #, c-format + msgid "" + "\n" +@@ -375,7 +373,7 @@ msgstr "" + "\n" + "La conexión VPN «%s» ha fallado." + +-#: ../src/applet.c:942 ++#: ../src/applet.c:947 + #, c-format + msgid "" + "VPN connection has been successfully established.\n" +@@ -386,19 +384,19 @@ msgstr "" + "\n" + "%s\n" + +-#: ../src/applet.c:944 ++#: ../src/applet.c:949 + msgid "VPN connection has been successfully established.\n" + msgstr "La conexión VPN se ha establecido con éxito.\n" + +-#: ../src/applet.c:946 ++#: ../src/applet.c:951 + msgid "VPN Login Message" + msgstr "Mensaje de acceso VPN" + +-#: ../src/applet.c:954 ../src/applet.c:994 ++#: ../src/applet.c:959 ../src/applet.c:999 + msgid "VPN Connection Failed" + msgstr "Falló la conexión VPN" + +-#: ../src/applet.c:998 ++#: ../src/applet.c:1003 + #, c-format + msgid "" + "\n" +@@ -411,7 +409,7 @@ msgstr "" + "\n" + "%s" + +-#: ../src/applet.c:1001 ++#: ../src/applet.c:1006 + #, c-format + msgid "" + "\n" +@@ -424,144 +422,144 @@ msgstr "" + "\n" + "%s" + +-#: ../src/applet.c:1290 ++#: ../src/applet.c:1295 + msgid "device not ready (firmware missing)" + msgstr "el dispositivo no está listo (falta el firmware)" + +-#: ../src/applet.c:1292 ++#: ../src/applet.c:1297 + msgid "device not ready" + msgstr "el dispositivo no está listo" + + #. Notify user of unmanaged or unavailable device +-#: ../src/applet.c:1302 ../src/applet-device-ethernet.c:109 ++#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109 + msgid "disconnected" + msgstr "desconectado" + +-#: ../src/applet.c:1318 ++#: ../src/applet.c:1323 + msgid "Disconnect" + msgstr "Desconectar" + +-#: ../src/applet.c:1332 ++#: ../src/applet.c:1337 + msgid "device not managed" + msgstr "el dispositivo no está gestionado" + +-#: ../src/applet.c:1405 ++#: ../src/applet.c:1410 + msgid "No network devices available" + msgstr "No hay dispositivos de red disponibles" + +-#: ../src/applet.c:1459 ++#: ../src/applet.c:1464 + msgid "_VPN Connections" + msgstr "Conexiones _VPN" + +-#: ../src/applet.c:1503 ++#: ../src/applet.c:1508 + msgid "_Configure VPN…" + msgstr "_Configurar VPN…" + +-#: ../src/applet.c:1506 ++#: ../src/applet.c:1511 + msgid "_Add a VPN connection…" + msgstr "_Añadir una conexión VPN…" + +-#: ../src/applet.c:1612 ++#: ../src/applet.c:1617 + msgid "NetworkManager is not running…" + msgstr "El Gestor de la red no se está ejecutando…" + +-#: ../src/applet.c:1617 ../src/applet.c:2682 ++#: ../src/applet.c:1622 ../src/applet.c:2687 + msgid "Networking disabled" + msgstr "Red desactivada" + + #. 'Enable Networking' item +-#: ../src/applet.c:1827 ++#: ../src/applet.c:1832 + msgid "Enable _Networking" + msgstr "Activar _red" + + #. 'Enable Wi-Fi' item +-#: ../src/applet.c:1836 ++#: ../src/applet.c:1841 + msgid "Enable _Wi-Fi" + msgstr "Activar _inalámbrica" + + #. 'Enable Mobile Broadband' item +-#: ../src/applet.c:1845 ++#: ../src/applet.c:1850 + msgid "Enable _Mobile Broadband" + msgstr "Activar la banda ancha _móvil" + + #. Toggle notifications item +-#: ../src/applet.c:1857 ++#: ../src/applet.c:1862 + msgid "Enable N_otifications" + msgstr "Activar n_otificaciones" + + #. 'Connection Information' item +-#: ../src/applet.c:1869 ++#: ../src/applet.c:1874 + msgid "Connection _Information" + msgstr "_Información de la conexión" + + #. 'Edit Connections...' item +-#: ../src/applet.c:1877 ++#: ../src/applet.c:1882 + msgid "Edit Connections…" + msgstr "Editar las conexiones…" + +-#: ../src/applet.c:1891 ++#: ../src/applet.c:1896 + msgid "_About" + msgstr "_Acerca de" + +-#: ../src/applet.c:2202 ++#: ../src/applet.c:2207 + #, c-format + msgid "You are now connected to “%s”." + msgstr "Ahora está conectado a «%s»." + +-#: ../src/applet.c:2242 ++#: ../src/applet.c:2247 + msgid "Disconnected" + msgstr "Desconectado" + +-#: ../src/applet.c:2243 ++#: ../src/applet.c:2248 + msgid "The network connection has been disconnected." + msgstr "La conexión de red se ha desconectado." + +-#: ../src/applet.c:2545 ++#: ../src/applet.c:2550 + #, c-format + msgid "Preparing network connection “%s”…" + msgstr "Preparando la conexión de red «%s»…" + +-#: ../src/applet.c:2548 ++#: ../src/applet.c:2553 + #, c-format + msgid "User authentication required for network connection “%s”…" + msgstr "Se necesita autenticación de usuario para la conexión de red «%s»…" + +-#: ../src/applet.c:2551 ../src/applet-device-bt.c:125 ++#: ../src/applet.c:2556 ../src/applet-device-bt.c:125 + #: ../src/mobile-helpers.c:607 + #, c-format + msgid "Requesting a network address for “%s”…" + msgstr "Solicitando una dirección de red para «%s»…" + +-#: ../src/applet.c:2554 ++#: ../src/applet.c:2559 + #, c-format + msgid "Network connection “%s” active" + msgstr "Conexión de red «%s» activa" + +-#: ../src/applet.c:2627 ++#: ../src/applet.c:2632 + #, c-format + msgid "Starting VPN connection “%s”…" + msgstr "Iniciando conexión VPN «%s»…" + +-#: ../src/applet.c:2630 ++#: ../src/applet.c:2635 + #, c-format + msgid "User authentication required for VPN connection “%s”…" + msgstr "Se necesita autenticación de usuario para la conexión VPN «%s»…" + +-#: ../src/applet.c:2633 ++#: ../src/applet.c:2638 + #, c-format + msgid "Requesting a VPN address for “%s”…" + msgstr "Solicitando una dirección VPN para «%s»…" + +-#: ../src/applet.c:2636 ++#: ../src/applet.c:2641 + #, c-format + msgid "VPN connection active" + msgstr "Conexión VPN activa" + +-#: ../src/applet.c:2686 ++#: ../src/applet.c:2691 + msgid "No network connection" + msgstr "Sin conexión de red" + +-#: ../src/applet.c:3287 ++#: ../src/applet.c:3292 + msgid "NetworkManager Applet" + msgstr "Miniaplicación Gestor de la red" + +@@ -578,46 +576,46 @@ msgstr "Código PIN erróneo; contacte con el proveedor de su servicio." + msgid "Sending unlock code…" + msgstr "Enviando código de desbloqueo…" + +-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:507 ++#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507 + #, c-format + msgid "Mobile Broadband (%s)" + msgstr "Banda ancha móvil (%s)" + +-#: ../src/applet-device-broadband.c:738 ++#: ../src/applet-device-broadband.c:739 + #: ../src/connection-editor/connection-helpers.c:108 + #: ../src/connection-editor/page-mobile.c:308 + #: ../src/libnm-gtk/nm-ui-utils.c:329 + msgid "Mobile Broadband" + msgstr "Banda ancha móvil" + +-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75 +-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906 ++#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75 ++#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907 + msgid "Available" + msgstr "Disponible" + + #. Default connection item +-#: ../src/applet-device-broadband.c:803 ++#: ../src/applet-device-broadband.c:805 + msgid "New Mobile Broadband connection…" + msgstr "Conexión de banda ancha móvil nueva…" + +-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87 +-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308 ++#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87 ++#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309 + msgid "Connection Established" + msgstr "Se ha establecido la conexión" + +-#: ../src/applet-device-broadband.c:818 ++#: ../src/applet-device-broadband.c:820 + msgid "You are now connected to the Mobile Broadband network." + msgstr "Ahora está conectado a la red de banda ancha móvil." + +-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964 ++#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966 + msgid "Mobile Broadband network." + msgstr "Red de banda ancha móvil." + +-#: ../src/applet-device-broadband.c:959 ++#: ../src/applet-device-broadband.c:961 + msgid "You are now registered on the home network." + msgstr "Ahora está registrado en la red de casa." + +-#: ../src/applet-device-broadband.c:965 ++#: ../src/applet-device-broadband.c:967 + msgid "You are now registered on a roaming network." + msgstr "Ahora está registrado en una red de «roaming»." + +@@ -726,7 +724,7 @@ msgstr "Crear una red inalámbrica _nueva…" + msgid "(none)" + msgstr "(ninguna)" + +-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408 ++#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409 + msgid "Failed to add new connection" + msgstr "Falló al añadir la conexión nueva" + +@@ -734,80 +732,80 @@ msgstr "Falló al añadir la conexión nueva" + msgid "Insufficient privileges." + msgstr "Privilegios insuficientes." + +-#: ../src/applet-device-wifi.c:838 ++#: ../src/applet-device-wifi.c:839 + #, c-format + msgid "Wi-Fi Networks (%s)" + msgstr "Redes inalámbricas (%s)" + +-#: ../src/applet-device-wifi.c:840 ++#: ../src/applet-device-wifi.c:841 + #, c-format + msgid "Wi-Fi Network (%s)" + msgstr "Red inalámbrica (%s)" + +-#: ../src/applet-device-wifi.c:842 ++#: ../src/applet-device-wifi.c:843 + msgid "Wi-Fi Network" + msgid_plural "Wi-Fi Networks" + msgstr[0] "Red inalámbrica" + msgstr[1] "Redes inalámbricas" + +-#: ../src/applet-device-wifi.c:871 ++#: ../src/applet-device-wifi.c:872 + msgid "Wi-Fi is disabled" + msgstr "La red inalámbrica está desactivada" + +-#: ../src/applet-device-wifi.c:872 ++#: ../src/applet-device-wifi.c:873 + msgid "Wi-Fi is disabled by hardware switch" + msgstr "Red inalámbrica desactivada por el interruptor físico" + +-#: ../src/applet-device-wifi.c:933 ++#: ../src/applet-device-wifi.c:934 + msgid "More networks" + msgstr "Más redes" + +-#: ../src/applet-device-wifi.c:1122 ++#: ../src/applet-device-wifi.c:1123 + msgid "Wi-Fi Networks Available" + msgstr "Redes inalámbricas disponibles" + +-#: ../src/applet-device-wifi.c:1123 ++#: ../src/applet-device-wifi.c:1124 + msgid "Use the network menu to connect to a Wi-Fi network" + msgstr "Usar el menú de red para conectarse a una red inalámbrica" + +-#: ../src/applet-device-wifi.c:1307 ++#: ../src/applet-device-wifi.c:1308 + #, c-format + msgid "You are now connected to the Wi-Fi network “%s”." + msgstr "Ahora está conectado a la red inalámbrica «%s»." + +-#: ../src/applet-device-wifi.c:1342 ++#: ../src/applet-device-wifi.c:1343 + #, c-format + msgid "Preparing Wi-Fi network connection “%s”…" + msgstr "Preparando la conexión de red inalámbrica «%s»…" + +-#: ../src/applet-device-wifi.c:1345 ++#: ../src/applet-device-wifi.c:1346 + #, c-format + msgid "Configuring Wi-Fi network connection “%s”…" + msgstr "Configurando la conexión de red inalámbrica «%s»…" + +-#: ../src/applet-device-wifi.c:1348 ++#: ../src/applet-device-wifi.c:1349 + #, c-format + msgid "User authentication required for Wi-Fi network “%s”…" + msgstr "" + "Se necesita autenticación de usuario para la conexión de red inalámbrica " + "«%s»…" + +-#: ../src/applet-device-wifi.c:1351 ++#: ../src/applet-device-wifi.c:1352 + #, c-format + msgid "Requesting a Wi-Fi network address for “%s”…" + msgstr "Solicitando una dirección de red inalámbrica para «%s»…" + +-#: ../src/applet-device-wifi.c:1362 ++#: ../src/applet-device-wifi.c:1363 + #, c-format + msgid "Wi-Fi network connection “%s” active: %s (%d%%)" + msgstr "La conexión de red inalámbrica a «%s» está activa: %s (%d%%)" + +-#: ../src/applet-device-wifi.c:1366 ++#: ../src/applet-device-wifi.c:1367 + #, c-format + msgid "Wi-Fi network connection “%s” active" + msgstr "La conexión de red inalámbrica «%s» está activa" + +-#: ../src/applet-device-wifi.c:1385 ++#: ../src/applet-device-wifi.c:1386 + msgid "Failed to activate connection" + msgstr "Falló al activar la conexión" + +@@ -815,8 +813,7 @@ msgstr "Falló al activar la conexión" + msgid "Error displaying connection information:" + msgstr "Ha ocurrido un error al mostrar información de la conexión:" + +-#: ../src/applet-dialogs.c:73 +-#: ../src/connection-editor/page-wifi-security.c:381 ++#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381 + #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948 + #: ../src/wireless-security/wireless-security.c:448 + msgid "LEAP" +@@ -984,10 +981,6 @@ msgid "No valid active connections found!" + msgstr "No se encontró ninguna conexión activa válida" + + #: ../src/applet-dialogs.c:1007 +-#| msgid "" +-#| "Copyright © 2004-2014 Red Hat, Inc.\n" +-#| "Copyright © 2005-2008 Novell, Inc.\n" +-#| "and many other community contributors and translators" + msgid "" + "Copyright © 2004-2017 Red Hat, Inc.\n" + "Copyright © 2005-2008 Novell, Inc.\n" +@@ -1120,7 +1113,7 @@ msgstr "" + #: ../src/connection-editor/ce-page-bond.ui.h:12 + #: ../src/connection-editor/ce-page-bridge.ui.h:2 + #: ../src/connection-editor/ce-page-ip4.ui.h:7 +-#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++#: ../src/connection-editor/ce-page-ip6.ui.h:12 + #: ../src/connection-editor/ce-page-team.ui.h:13 + #: ../src/connection-editor/nm-connection-list.ui.h:3 + msgid "_Add" +@@ -1131,7 +1124,7 @@ msgstr "_Añadir" + #: ../src/connection-editor/ce-page-bond.ui.h:14 + #: ../src/connection-editor/ce-page-bridge.ui.h:4 + #: ../src/connection-editor/ce-page-ip4.ui.h:8 +-#: ../src/connection-editor/ce-page-ip6.ui.h:11 ++#: ../src/connection-editor/ce-page-ip6.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:15 + #: ../src/connection-editor/connection-helpers.c:772 + #: ../src/connection-editor/nm-connection-list.ui.h:4 +@@ -1158,7 +1151,6 @@ msgstr "" + "predeterminada." + + #: ../src/connection-editor/ce-new-connection.ui.h:2 +-#| msgid "Create…" + msgid "C_reate…" + msgstr "C_rear" + +@@ -1327,36 +1319,76 @@ msgid "_Hello time:" + msgstr "_Tiempo de saludo:" + + #: ../src/connection-editor/ce-page-bridge.ui.h:9 ++msgid "STP forwarding delay, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:10 + msgid "s" + msgstr "s" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:10 ++#: ../src/connection-editor/ce-page-bridge.ui.h:11 ++msgid "STP hello time, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:12 + msgid "Enable I_GMP snooping" + msgstr "Activar snooping I_GMP" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:11 ++#: ../src/connection-editor/ce-page-bridge.ui.h:13 ++msgid "" ++"Controls whether IGMP snooping is enabled for this bridge. Note that if " ++"snooping was automatically disabled due to hash collisions, the system may " ++"refuse to enable the feature until the collisions are resolved." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:14 + msgid "Enable _STP (Spanning Tree Protocol)" + msgstr "Activar _STP (Spanning Tree Protocol)" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:12 ++#: ../src/connection-editor/ce-page-bridge.ui.h:15 ++msgid "" ++"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:16 ++msgid "" ++"STP priority for this bridge. Lower values are “better”; the lowest priority " ++"bridge will be elected the root bridge." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:17 + msgid "_Max age:" + msgstr "Edad _máxima:" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:13 ++#: ../src/connection-editor/ce-page-bridge.ui.h:18 ++msgid "STP maximum message age, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:19 + msgid "_Aging time:" + msgstr "_Tiempo de de caducidad:" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:14 ++#: ../src/connection-editor/ce-page-bridge.ui.h:20 ++msgid "The Ethernet MAC address aging time, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:21 + msgid "Group _forward mask:" + msgstr "" + +-#: ../src/connection-editor/ce-page.c:78 +-#: ../src/connection-editor/ce-page.c:112 ++#: ../src/connection-editor/ce-page-bridge.ui.h:22 ++msgid "" ++"A mask of 16 bits, each corresponding to a group address in the range from " ++"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask " ++"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause " ++"frames and LACP." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112 + msgid "automatic" + msgstr "automático" + +-#: ../src/connection-editor/ce-page.c:86 +-#: ../src/connection-editor/ce-page.c:121 ++#: ../src/connection-editor/ce-page.c:86 ../src/connection-editor/ce-page.c:121 + #: ../src/connection-editor/ce-page-dcb.ui.h:13 + #: ../src/connection-editor/page-wifi.c:168 + #: ../src/connection-editor/page-wifi.c:172 +@@ -1415,13 +1447,11 @@ msgstr "%s no válido (%s)" + + #: ../src/connection-editor/ce-page.c:388 + #, c-format +-#| msgid "invalid interface-name for %s (%s)" + msgid "invalid interface-name for %s (%s): " + msgstr "nombre de interfaz no válido para %s (%s): " + + #: ../src/connection-editor/ce-page.c:392 + #, c-format +-#| msgid "invalid interface-name (%s)" + msgid "invalid interface-name (%s): " + msgstr "nombre de interfaz no válido (%s): " + +@@ -1430,13 +1460,11 @@ msgid "can’t parse device name" + msgstr "no se puede analizar el nombre del dispositivo" + + #: ../src/connection-editor/ce-page.c:589 +-#| msgid "Hardware Address:" + msgid "invalid hardware address" + msgstr "dirección hardware no válida" + + #: ../src/connection-editor/ce-page.c:611 + #, c-format +-#| msgid "invalid %s (%s)" + msgid "invalid %s (%s): " + msgstr "%s no válido (%s): " + +@@ -1447,7 +1475,6 @@ msgstr "dispositivo" + + #: ../src/connection-editor/ce-page.c:616 + #, c-format +-#| msgid "invalid %s (%s)" + msgid "invalid %s (%s) " + msgstr "%s no válido (%s)" + +@@ -1458,7 +1485,6 @@ msgstr "" + "desconocido." + + #: ../src/connection-editor/ce-page-dcb.ui.h:1 +-#| msgid "Use Data Center Bridging (DCB) for this connection" + msgid "_Use Data Center Bridging (DCB) for this connection" + msgstr "_Usar «Data Center Bridging» (DCB) para esta conexión" + +@@ -1620,10 +1646,20 @@ msgid "_Username:" + msgstr "Nombre de _usuario:" + + #: ../src/connection-editor/ce-page-dsl.ui.h:2 ++msgid "Username used to authenticate with the PPPoE service." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:3 ++msgid "" ++"Only initiate sessions with access concentrators that provide the specified " ++"service. For most providers this should be left blank." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:4 + msgid "_Service:" + msgstr "_Servicio:" + +-#: ../src/connection-editor/ce-page-dsl.ui.h:3 ++#: ../src/connection-editor/ce-page-dsl.ui.h:5 + #: ../src/wireless-security/eap-method-leap.ui.h:3 + #: ../src/wireless-security/eap-method-simple.ui.h:3 + #: ../src/wireless-security/ws-leap.ui.h:3 +@@ -1631,7 +1667,11 @@ msgstr "_Servicio:" + msgid "Sho_w password" + msgstr "_Mostrar la contraseña" + +-#: ../src/connection-editor/ce-page-dsl.ui.h:4 ++#: ../src/connection-editor/ce-page-dsl.ui.h:6 ++msgid "Password used to authenticate with the PPPoE service." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:7 + #: ../src/connection-editor/ce-page-mobile.ui.h:4 + #: ../src/libnma/nma-vpn-password-dialog.c:97 + #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97 +@@ -1642,13 +1682,29 @@ msgstr "_Mostrar la contraseña" + msgid "_Password:" + msgstr "Contrase_ña:" + ++#: ../src/connection-editor/ce-page-dsl.ui.h:8 ++msgid "PPP _interface:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:9 ++msgid "P_arent interface:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:10 ++msgid "An arbitrary name to assign to the newly created PPP interface." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:11 ++msgid "The interface on which the PPP connection will be established." ++msgstr "" ++ + #: ../src/connection-editor/ce-page-ethernet.ui.h:1 + #: ../src/connection-editor/ce-page-ip4.ui.h:1 + #: ../src/connection-editor/ce-page-ip6.ui.h:1 + #: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-wifi.ui.h:1 + #: ../src/connection-editor/page-ip4.c:131 +-#: ../src/connection-editor/page-ip6.c:136 ++#: ../src/connection-editor/page-ip6.c:142 + #: ../src/wireless-security/eap-method-peap.ui.h:1 + msgid "Automatic" + msgstr "Automático" +@@ -1694,7 +1750,7 @@ msgid "Full" + msgstr "Completa" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:12 +-#: ../src/connection-editor/page-ip6.c:149 ++#: ../src/connection-editor/page-ip6.c:155 + msgid "Ignore" + msgstr "Ignorar" + +@@ -1702,7 +1758,7 @@ msgstr "Ignorar" + #: ../src/connection-editor/ce-page-ip4.ui.h:3 + #: ../src/connection-editor/ce-page-ip6.ui.h:3 + #: ../src/connection-editor/page-ip4.c:168 +-#: ../src/connection-editor/page-ip6.c:185 ++#: ../src/connection-editor/page-ip6.c:191 + msgid "Manual" + msgstr "Manual" + +@@ -1814,7 +1870,6 @@ msgid "_Automatically connect to this network when it is available" + msgstr "Conectarse _automáticamente a esta red cuando esté disponible" + + #: ../src/connection-editor/ce-page-general.ui.h:4 +-#| msgid "Connection _Information" + msgid "Connection _priority for auto-activation:" + msgstr "_Prioridad de la conexión para la activación automática:" + +@@ -1831,9 +1886,6 @@ msgstr "_Zona del cortafuegos:" + + #: ../src/connection-editor/ce-page.h:111 + #, fuzzy +-#| msgid "" +-#| "IP addresses identify your computer on the network. Click the \"Add\" " +-#| "button to add an IP address." + msgid "" + "IP addresses identify your computer on the network. Click the “Add” button " + "to add static IP address to be configured in addition to the automatic ones." +@@ -1843,9 +1895,6 @@ msgstr "" + + #: ../src/connection-editor/ce-page.h:116 + #, fuzzy +-#| msgid "" +-#| "IP addresses identify your computer on the network. Click the \"Add\" " +-#| "button to add an IP address." + msgid "" + "The IP address identify your computer on the network and determines the " + "address range distributed to other computers. Click the “Add” button to add " +@@ -1919,44 +1968,36 @@ msgstr "VTI6" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10 + #: ../src/connection-editor/ce-page-macsec.ui.h:6 +-#| msgid "Device name" + msgid "Device name:" + msgstr "Nombre del dispositivo:" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11 + #: ../src/connection-editor/ce-page-macsec.ui.h:8 +-#| msgid "Parent device" + msgid "Parent device:" + msgstr "Dispositivo padre:" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12 + #: ../src/connection-editor/ce-page-macsec.ui.h:16 +-#| msgid "M_ode:" + msgid "Mode:" + msgstr "Modo:" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13 +-#| msgid "Local IP" + msgid "Local IP:" + msgstr "IP local:" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14 +-#| msgid "Remote IP" + msgid "Remote IP:" + msgstr "IP remota:" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15 +-#| msgid "Input key" + msgid "Input key:" + msgstr "Clave de entrada:" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16 +-#| msgid "Output key" + msgid "Output key:" + msgstr "Clave de salida:" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17 +-#| msgid "_MTU:" + msgid "MTU:" + msgstr "MTU:" + +@@ -1973,12 +2014,12 @@ msgstr "Enlace local" + #: ../src/connection-editor/ce-page-ip4.ui.h:5 + #: ../src/connection-editor/ce-page-ip6.ui.h:5 + #: ../src/connection-editor/page-ip4.c:188 +-#: ../src/connection-editor/page-ip6.c:205 ++#: ../src/connection-editor/page-ip6.c:211 + msgid "Shared to other computers" + msgstr "Compartida con otros equipos" + + #: ../src/connection-editor/ce-page-ip4.ui.h:6 +-#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++#: ../src/connection-editor/ce-page-ip6.ui.h:11 + msgid "_Method:" + msgstr "_Método:" + +@@ -1993,7 +2034,7 @@ msgstr "" + "de cliente DHCP introdúzcalo aquí." + + #: ../src/connection-editor/ce-page-ip4.ui.h:10 +-#: ../src/connection-editor/ce-page-ip6.ui.h:12 ++#: ../src/connection-editor/ce-page-ip6.ui.h:14 + msgid "" + "Domains used when resolving host names. Use commas to separate multiple " + "domains." +@@ -2006,16 +2047,16 @@ msgid "D_HCP client ID:" + msgstr "ID del cliente D_HCP:" + + #: ../src/connection-editor/ce-page-ip4.ui.h:12 +-#: ../src/connection-editor/ce-page-ip6.ui.h:13 ++#: ../src/connection-editor/ce-page-ip6.ui.h:15 + #: ../src/connection-editor/page-ip4.c:372 +-#: ../src/connection-editor/page-ip6.c:335 ++#: ../src/connection-editor/page-ip6.c:346 + msgid "S_earch domains:" + msgstr "Dominios de bú_squeda:" + + #: ../src/connection-editor/ce-page-ip4.ui.h:13 +-#: ../src/connection-editor/ce-page-ip6.ui.h:14 ++#: ../src/connection-editor/ce-page-ip6.ui.h:16 + #: ../src/connection-editor/page-ip4.c:363 +-#: ../src/connection-editor/page-ip6.c:326 ++#: ../src/connection-editor/page-ip6.c:337 + msgid "DNS ser_vers:" + msgstr "Servidores _DNS:" + +@@ -2041,7 +2082,7 @@ msgstr "" + "configuración IPv4 falla pero la configuración IPv6 tiene éxito. " + + #: ../src/connection-editor/ce-page-ip4.ui.h:17 +-#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++#: ../src/connection-editor/ce-page-ip6.ui.h:22 + msgid "_Routes…" + msgstr "_Rutas…" + +@@ -2059,7 +2100,15 @@ msgstr "Activado (preferir dirección pública)" + msgid "Enabled (prefer temporary address)" + msgstr "Activado (preferir dirección temporal)" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:15 ++#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++msgid "EUI64" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++msgid "Stable privacy" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:17 + msgid "" + "IP addresses of domain name servers used to resolve host names. Use commas " + "to separate multiple domain name server addresses. Link-local addresses will " +@@ -2070,15 +2119,19 @@ msgstr "" + "nombres de dominio múltiples. El ámbito de las direcciones de enlaces " + "locales se definirá automáticamente al conectar la interfaz." + +-#: ../src/connection-editor/ce-page-ip6.ui.h:16 ++#: ../src/connection-editor/ce-page-ip6.ui.h:18 + msgid "IPv6 _privacy extensions:" + msgstr "Extensiones de _privacidad IPv6:" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:17 ++#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++msgid "IPv6 address _generation mode:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:20 + msgid "Require IPv_6 addressing for this connection to complete" + msgstr "Requiere dirección IPv_6 para que esta conexión complete" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:18 ++#: ../src/connection-editor/ce-page-ip6.ui.h:21 + msgid "" + "When connecting to IPv4-capable networks, allows the connection to complete " + "if IPv6 configuration fails but IPv4 configuration succeeds." +@@ -2143,22 +2196,18 @@ msgid "CAK:" + msgstr "CAK:" + + #: ../src/connection-editor/ce-page-macsec.ui.h:17 +-#| msgid "Keys" + msgid "Keys:" + msgstr "Claves:" + + #: ../src/connection-editor/ce-page-macsec.ui.h:18 +-#| msgid "Parameters" + msgid "Parameters:" + msgstr "Parámetros:" + + #: ../src/connection-editor/ce-page-macsec.ui.h:19 +-#| msgid "Validation" + msgid "Validation:" + msgstr "Validación:" + + #: ../src/connection-editor/ce-page-macsec.ui.h:20 +-#| msgid "SCI port" + msgid "SCI port:" + msgstr "Puerto SCI:" + +@@ -2533,7 +2582,6 @@ msgstr "" + + #: ../src/connection-editor/ce-page-team-port.ui.h:46 + #: ../src/connection-editor/ce-page-team.ui.h:93 +-#| msgid "Im_port team configuration from a file..." + msgid "Im_port team configuration from a file…" + msgstr "I_mportar configuración redundada desde un archivo…" + +@@ -2568,7 +2616,6 @@ msgid "Port priority" + msgstr "Prioridad del puerto" + + #: ../src/connection-editor/ce-page-team.ui.h:6 +-#| msgid "Ethernet device" + msgid "From the team device" + msgstr "Del dispositivo redundado" + +@@ -2924,9 +2971,9 @@ msgid "Bluetooth" + msgstr "Bluetooth" + + #: ../src/connection-editor/connection-helpers.c:115 +-#: ../src/connection-editor/page-dsl.c:127 +-msgid "DSL" +-msgstr "DSL" ++#: ../src/connection-editor/page-dsl.c:201 ++msgid "DSL/PPPoE" ++msgstr "" + + #: ../src/connection-editor/connection-helpers.c:116 + #: ../src/connection-editor/page-infiniband.c:148 +@@ -2941,13 +2988,13 @@ msgid "Bond" + msgstr "Bond" + + #: ../src/connection-editor/connection-helpers.c:118 +-#: ../src/connection-editor/page-team.c:1031 +-#: ../src/libnm-gtk/nm-ui-utils.c:335 ../src/libnm-gtk/nm-ui-utils.c:579 ++#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335 ++#: ../src/libnm-gtk/nm-ui-utils.c:579 + msgid "Team" + msgstr "Unir" + + #: ../src/connection-editor/connection-helpers.c:119 +-#: ../src/connection-editor/page-bridge.c:221 ++#: ../src/connection-editor/page-bridge.c:233 + #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581 + msgid "Bridge" + msgstr "Puente" +@@ -3049,7 +3096,7 @@ msgstr "¿Está seguro de que quiere eliminar la conexión %s?" + #: ../src/connection-editor/ip4-routes-dialog.c:697 + #: ../src/connection-editor/ip6-routes-dialog.c:718 + #: ../src/connection-editor/page-ip4.c:1136 +-#: ../src/connection-editor/page-ip6.c:1095 ++#: ../src/connection-editor/page-ip6.c:1118 + msgid "Address" + msgstr "Dirección" + +@@ -3061,7 +3108,7 @@ msgstr "Máscara de red" + #: ../src/connection-editor/ip4-routes-dialog.c:735 + #: ../src/connection-editor/ip6-routes-dialog.c:756 + #: ../src/connection-editor/page-ip4.c:1174 +-#: ../src/connection-editor/page-ip6.c:1133 ++#: ../src/connection-editor/page-ip6.c:1156 + msgid "Gateway" + msgstr "Puerta de enlace" + +@@ -3071,7 +3118,7 @@ msgid "Metric" + msgstr "Métrica" + + #: ../src/connection-editor/ip6-routes-dialog.c:737 +-#: ../src/connection-editor/page-ip6.c:1114 ++#: ../src/connection-editor/page-ip6.c:1137 + msgid "Prefix" + msgstr "Prefijo" + +@@ -3146,7 +3193,7 @@ msgstr "" + msgid "Error initializing editor" + msgstr "Error al inicializar el editor" + +-#: ../src/connection-editor/nm-connection-editor.c:1159 ++#: ../src/connection-editor/nm-connection-editor.c:1157 + msgid "Connection add failed" + msgstr "Falló al añadir la conexión" + +@@ -3156,9 +3203,6 @@ msgstr "Corregir" + + #: ../src/connection-editor/nm-connection-editor.ui.h:2 + #, fuzzy +-#| msgid "" +-#| "Set this to true to disable warnings about CA certificates in EAP " +-#| "authentication." + msgid "" + "Security labels may prevent some files from being used with certificate " + "authentication." +@@ -3242,17 +3286,14 @@ msgstr[0] "hace %d año" + msgstr[1] "hace %d años" + + #: ../src/connection-editor/nm-connection-list.c:445 +-#| msgid "Connection cannot be modified" + msgid "Connection cannot be deleted" + msgstr "No se puede eliminar la conexión" + + #: ../src/connection-editor/nm-connection-list.c:448 +-#| msgid "Team connection %d" + msgid "Select a connection to edit" + msgstr "Seleccionar una conexión que editar" + + #: ../src/connection-editor/nm-connection-list.c:450 +-#| msgid "Team connection %d" + msgid "Select a connection to delete" + msgstr "Seleccionar una conexión que eliminar" + +@@ -3305,7 +3346,6 @@ msgid "Did not find a connection with UUID “%s”" + msgstr "No se encontró una conexión con UUID «%s»" + + #: ../src/connection-editor/nm-connection-list.ui.h:2 +-#| msgid "_Add a VPN connection…" + msgid "Add a new connection" + msgstr "Añadir una conexión nueva" + +@@ -3368,11 +3408,11 @@ msgstr "primario" + msgid "Bond connection %d" + msgstr "Conexión Bond %d" + +-#: ../src/connection-editor/page-bridge.c:224 ++#: ../src/connection-editor/page-bridge.c:236 + msgid "Could not load bridge user interface." + msgstr "No se pudo cargar la interfaz puente de usuario." + +-#: ../src/connection-editor/page-bridge.c:328 ++#: ../src/connection-editor/page-bridge.c:352 + #, c-format + msgid "Bridge connection %d" + msgstr "Conexión puente %d" +@@ -3396,11 +3436,15 @@ msgstr "DCB" + msgid "Could not load DCB user interface." + msgstr "No se pudo cargar la interfaz de usuario para DCB." + +-#: ../src/connection-editor/page-dsl.c:129 ++#: ../src/connection-editor/page-dsl.c:203 + msgid "Could not load DSL user interface." + msgstr "No se pudo cargar la interfaz de usuario para DSL." + +-#: ../src/connection-editor/page-dsl.c:219 ++#: ../src/connection-editor/page-dsl.c:298 ++msgid "missing parent interface" ++msgstr "" ++ ++#: ../src/connection-editor/page-dsl.c:343 + #, c-format + msgid "DSL connection %d" + msgstr "Conexión DSL %d" +@@ -3499,27 +3543,27 @@ msgid "IP tunnel connection %d" + msgstr "Conexión por túnel IP %d" + + #: ../src/connection-editor/page-ip4.c:127 +-#: ../src/connection-editor/page-ip6.c:130 ++#: ../src/connection-editor/page-ip6.c:136 + msgid "Automatic (VPN)" + msgstr "Automático (VPN)" + + #: ../src/connection-editor/page-ip4.c:128 +-#: ../src/connection-editor/page-ip6.c:131 ++#: ../src/connection-editor/page-ip6.c:137 + msgid "Automatic (VPN) addresses only" + msgstr "Sólo direcciones automáticas (VPN)" + + #: ../src/connection-editor/page-ip4.c:132 +-#: ../src/connection-editor/page-ip6.c:137 ++#: ../src/connection-editor/page-ip6.c:143 + msgid "Automatic, addresses only" + msgstr "Automático, sólo direcciones" + + #: ../src/connection-editor/page-ip4.c:134 +-#: ../src/connection-editor/page-ip6.c:133 ++#: ../src/connection-editor/page-ip6.c:139 + msgid "Automatic (PPPoE)" + msgstr "Automático (PPPoE)" + + #: ../src/connection-editor/page-ip4.c:135 +-#: ../src/connection-editor/page-ip6.c:134 ++#: ../src/connection-editor/page-ip6.c:140 + msgid "Automatic (PPPoE) addresses only" + msgstr "Sólo direcciones automáticas (PPPoE)" + +@@ -3532,17 +3576,17 @@ msgid "Automatic (DHCP) addresses only" + msgstr "Sólo direcciones automáticas (DHCP)" + + #: ../src/connection-editor/page-ip4.c:181 +-#: ../src/connection-editor/page-ip6.c:198 ++#: ../src/connection-editor/page-ip6.c:204 + msgid "Link-Local Only" + msgstr "Sólo enlace local" + + #: ../src/connection-editor/page-ip4.c:361 +-#: ../src/connection-editor/page-ip6.c:324 ++#: ../src/connection-editor/page-ip6.c:335 + msgid "Additional DNS ser_vers:" + msgstr "Servidores _DNS adicionales:" + + #: ../src/connection-editor/page-ip4.c:370 +-#: ../src/connection-editor/page-ip6.c:333 ++#: ../src/connection-editor/page-ip6.c:344 + msgid "Additional s_earch domains:" + msgstr "Dominios de bú_squeda adicionales:" + +@@ -3579,39 +3623,39 @@ msgstr "Puerta de enlace IPV4 «%s» no válida" + msgid "IPv4 DNS server “%s” invalid" + msgstr "Servido DNS IPV4 «%s» no válido" + +-#: ../src/connection-editor/page-ip6.c:173 ++#: ../src/connection-editor/page-ip6.c:179 + msgid "Automatic, DHCP only" + msgstr "Automático, DHCP únicamente" + +-#: ../src/connection-editor/page-ip6.c:993 ++#: ../src/connection-editor/page-ip6.c:1016 + #, c-format + msgid "Editing IPv6 routes for %s" + msgstr "Editando las rutas IPv6 para %s" + +-#: ../src/connection-editor/page-ip6.c:1184 ++#: ../src/connection-editor/page-ip6.c:1208 + msgid "IPv6 Settings" + msgstr "Ajustes de IPv6" + +-#: ../src/connection-editor/page-ip6.c:1186 ++#: ../src/connection-editor/page-ip6.c:1210 + msgid "Could not load IPv6 user interface." + msgstr "No se pudo cargar la interfaz de usuario para IPv6." + +-#: ../src/connection-editor/page-ip6.c:1277 ++#: ../src/connection-editor/page-ip6.c:1302 + #, c-format + msgid "IPv6 address “%s” invalid" + msgstr "Dirección IPV6 «%s» no válida" + +-#: ../src/connection-editor/page-ip6.c:1285 ++#: ../src/connection-editor/page-ip6.c:1310 + #, c-format + msgid "IPv6 prefix “%s” invalid" + msgstr "Prefijo IPV6 «%s» no válido" + +-#: ../src/connection-editor/page-ip6.c:1294 ++#: ../src/connection-editor/page-ip6.c:1319 + #, c-format + msgid "IPv6 gateway “%s” invalid" + msgstr "Puerta de enlace IPV6 «%s» no válida" + +-#: ../src/connection-editor/page-ip6.c:1336 ++#: ../src/connection-editor/page-ip6.c:1361 + #, c-format + msgid "IPv6 DNS server “%s” invalid" + msgstr "Servido DNS IPV6 «%s» no válido" +@@ -3969,31 +4013,30 @@ msgid "Active Network Connections" + msgstr "Conexiones de red activas" + + #: ../src/libnma/nma-file-cert-chooser.c:108 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:146 + #, fuzzy +-#| msgid "No CA certificate is _required" + msgid "No certificate set" + msgstr "No se necesita ningún ce_rtificado CA" + + #: ../src/libnma/nma-file-cert-chooser.c:126 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:170 + msgid "No key set" + msgstr "" + + #: ../src/libnma/nma-file-cert-chooser.c:246 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:370 + #, c-format + msgid "Choose a key for %s Certificate" + msgstr "Elija una clave para el certificado %s" + + #: ../src/libnma/nma-file-cert-chooser.c:250 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:374 + #, c-format + msgid "%s private _key:" + msgstr "Clave pri_vada %s:" + + #: ../src/libnma/nma-file-cert-chooser.c:254 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:378 + #, c-format + msgid "%s key _password:" + msgstr "_Contraseña de la clave %s:" +@@ -4004,7 +4047,7 @@ msgid "Choose %s Certificate" + msgstr "Elija un certificado %s:" + + #: ../src/libnma/nma-file-cert-chooser.c:262 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:386 + #, c-format + msgid "%s _certificate:" + msgstr "_Certificado %s:" +@@ -4239,12 +4282,12 @@ msgstr "Cancelar" + msgid "Select from file…" + msgstr "Seleccionar desde un archivo…" + +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:382 + #, c-format + msgid "Choose a %s Certificate" + msgstr "Elija un certificado %s" + +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:390 + #, c-format + msgid "%s certificate _password:" + msgstr "Contraseña del certificado %s:" +@@ -4827,693 +4870,3 @@ msgstr "" + #: ../src/wireless-security/ws-wpa-psk.ui.h:2 + msgid "_Type:" + msgstr "_Tipo:" +- +-#~ msgid "Mode" +-#~ msgstr "Modo" +- +-#~ msgid "MTU" +-#~ msgstr "MTU" +- +-#~ msgid "CKN" +-#~ msgstr "CKN" +- +-#~ msgid "CAK" +-#~ msgstr "CAK" +- +-#~ msgid "" +-#~ "\n" +-#~ "The VPN connection “%s” disconnected because the VPN service stopped." +-#~ msgstr "" +-#~ "\n" +-#~ "La conexión VPN «%s» se desconectó porque se detuvo el servicio VPN." +- +-#~ msgid "" +-#~ "\n" +-#~ "The VPN connection “%s” disconnected." +-#~ msgstr "" +-#~ "\n" +-#~ "La conexión VPN «%s» se ha desconectado." +- +-#~ msgid "unspecified error validating eap-method file" +-#~ msgstr "error no especificado al validar el archivo de método eap" +- +-#~ msgid "invalid EAP-PEAP CA certificate: %s" +-#~ msgstr "certificado CA de EAP-LEAP no válido: %s" +- +-#~ msgid "invalid EAP-PEAP CA certificate: no certificate specified" +-#~ msgstr "" +-#~ "certificado CA de EAP-PEAP no válido: no se ha especificado ningún " +-#~ "certificado" +- +-#~ msgid "Choose a Certificate Authority certificate" +-#~ msgstr "Elija un certificado CA" +- +-#~ msgid "invalid EAP-TLS CA certificate: %s" +-#~ msgstr "Certificado EAP-TLS CA no válido: %s" +- +-#~ msgid "invalid EAP-TLS CA certificate: no certificate specified" +-#~ msgstr "" +-#~ "certificado CA de EAP-TLS no válido: no se ha especificado ningún " +-#~ "certificado" +- +-#~ msgid "invalid EAP-TLS password: missing" +-#~ msgstr "contraseña de EAP-TLS no válida: falta" +- +-#~ msgid "invalid EAP-TLS private-key: %s" +-#~ msgstr "clave privada de EAP-TLS no válida: %s" +- +-#~ msgid "invalid EAP-TLS user-certificate: %s" +-#~ msgstr "certificado de usuario de EAP-TLS no válido: %s" +- +-#~ msgid "Unencrypted private keys are insecure" +-#~ msgstr "Las claves privadas sin cifrar son inseguras" +- +-#~ msgid "" +-#~ "The selected private key does not appear to be protected by a password. " +-#~ "This could allow your security credentials to be compromised. Please " +-#~ "select a password-protected private key.\n" +-#~ "\n" +-#~ "(You can password-protect your private key with openssl)" +-#~ msgstr "" +-#~ "La clave privada seleccionada no parece estar protegida por una " +-#~ "contraseña. Esto podría permitir que sus credenciales de seguridad se " +-#~ "comprometiesen. Seleccione una clave privada protegida por contraseña.\n" +-#~ "\n" +-#~ "(Puede proteger su clave privada con una contraseña con openssl)" +- +-#~ msgid "Choose your personal certificate" +-#~ msgstr "Elija su certificado personal" +- +-#~ msgid "Choose your private key" +-#~ msgstr "Elija su clave privada" +- +-#~ msgid "invalid EAP-TTLS CA certificate: %s" +-#~ msgstr "certificado CA de usuario de EAP-TTLS no válido: %s" +- +-#~ msgid "invalid EAP-TTLS CA certificate: no certificate specified" +-#~ msgstr "" +-#~ "certificado CA de usuario de EAP-TTLS no válido: no se ha especificado " +-#~ "ningún certificado" +- +-#~ msgid "New Mobile Broadband connection..." +-#~ msgstr "Conexión de banda ancha móvil nueva…" +- +-#~ msgid "_Connect to Hidden Wi-Fi Network..." +-#~ msgstr "_Conectar a una red inalámbrica oculta…" +- +-#~ msgid "Create _New Wi-Fi Network..." +-#~ msgstr "Crear una red inalámbrica _nueva…" +- +-#~ msgid " " +-#~ msgstr " " +- +-#~ msgid "0" +-#~ msgstr "0" +- +-#~ msgid "1" +-#~ msgstr "1" +- +-#~ msgid "2" +-#~ msgstr "2" +- +-#~ msgid "3" +-#~ msgstr "3" +- +-#~ msgid "4" +-#~ msgstr "4" +- +-#~ msgid "5" +-#~ msgstr "5" +- +-#~ msgid "6" +-#~ msgstr "6" +- +-#~ msgid "7" +-#~ msgstr "7" +- +-#~ msgid "15" +-#~ msgstr "15" +- +-#~ msgid "Aut_onegotiate" +-#~ msgstr "Aut_onegociar" +- +-#~ msgid "Ad_vanced..." +-#~ msgstr "Avanzada…" +- +-#~ msgid "FirewallD is not running." +-#~ msgstr "FirewallD no se está ejecutando." +- +-#~ msgid "New..." +-#~ msgstr "Nueva…" +- +-#~ msgid "NetworkManager for GNOME" +-#~ msgstr "Gestor de la red para GNOME" +- +-#~ msgid "_Disconnect VPN" +-#~ msgstr "_Desconectar VPN" +- +-#~ msgid "_Help" +-#~ msgstr "Ay_uda" +- +-#~ msgid "bdaddr" +-#~ msgstr "bdaddr" +- +-#~ msgid "Infrastructure" +-#~ msgstr "Infraestructura" +- +-#~ msgid "I_mport team configuration from a file..." +-#~ msgstr "I_mportar configuración redundada desde un archivo…" +- +-#~ msgid "Enable WiMA_X Mobile Broadband" +-#~ msgstr "Activar la banda ancha móvil WiMA_X" +- +-#~ msgid "You are now connected to the bonded network." +-#~ msgstr "Ahora está conectado a la red redundada." +- +-#~ msgid "Preparing bond connection '%s'..." +-#~ msgstr "Preparando la conexión redundada «%s»…" +- +-#~ msgid "Configuring bond connection '%s'..." +-#~ msgstr "Configurando la conexión redundada «%s»…" +- +-#~ msgid "User authentication required for bond connection '%s'..." +-#~ msgstr "" +-#~ "Se necesita autenticación de usuario para la conexión redundada «%s»…" +- +-#~ msgid "Requesting address for '%s'..." +-#~ msgstr "Solicitando una dirección para «%s»…" +- +-#~ msgid "Bond connection '%s' active" +-#~ msgstr "Conexión redundada «%s» activa" +- +-#~ msgid "You are now connected to the bridged network." +-#~ msgstr "Ahora está conectado a la red puente." +- +-#~ msgid "Preparing bridge connection '%s'..." +-#~ msgstr "Preparando la conexión puente «%s»…" +- +-#~ msgid "Configuring bridge connection '%s'..." +-#~ msgstr "Configurando la conexión puente «%s»…" +- +-#~ msgid "User authentication required for bridge connection '%s'..." +-#~ msgstr "Se necesita autenticación de usuario para la conexión puente «%s»…" +- +-#~ msgid "Bridge connection '%s' active" +-#~ msgstr "Conexión puente «%s» activa" +- +-#~ msgid "Auto InfiniBand" +-#~ msgstr "Auto InfiniBand" +- +-#~ msgid "InfiniBand Networks (%s)" +-#~ msgstr "Redes InfiniBand (%s)" +- +-#~ msgid "InfiniBand Network (%s)" +-#~ msgstr "Red InfiniBand (%s)" +- +-#~ msgid "InfiniBand Networks" +-#~ msgstr "Redes InfiniBand" +- +-#~ msgid "InfiniBand Network" +-#~ msgstr "Red InfiniBand" +- +-#~ msgid "You are now connected to the InfiniBand network." +-#~ msgstr "Ahora está conectado a la red InfiniBand." +- +-#~ msgid "Preparing InfiniBand connection '%s'..." +-#~ msgstr "Preparando la conexión InfiniBand «%s»…" +- +-#~ msgid "Configuring InfiniBand connection '%s'..." +-#~ msgstr "Configurando la conexión InfiniBand «%s»…" +- +-#~ msgid "User authentication required for InfiniBand connection '%s'..." +-#~ msgstr "" +-#~ "Se necesita autenticación de usuario para la conexión InfiniBand «%s»…" +- +-#~ msgid "InfiniBand connection '%s' active" +-#~ msgstr "Conexión InfiniBand «%s» activa" +- +-#~ msgid "You are now connected to the teamed network." +-#~ msgstr "Ahora está conectado a la red redundada." +- +-#~ msgid "Preparing team connection '%s'..." +-#~ msgstr "Preparando la conexión redundada «%s»…" +- +-#~ msgid "Configuring team connection '%s'..." +-#~ msgstr "Configurando la conexión redundada «%s»…" +- +-#~ msgid "User authentication required for team connection '%s'..." +-#~ msgstr "" +-#~ "Se necesita autenticación de usuario para la conexión redundada «%s»…" +- +-#~ msgid "Team connection '%s' active" +-#~ msgstr "Conexión redundada «%s» activa" +- +-#~ msgid "You are now connected to the VLAN." +-#~ msgstr "Ahora está conectado a la VLAN." +- +-#~ msgid "Preparing VLAN connection '%s'..." +-#~ msgstr "Preparando la conexión VLAN «%s»…" +- +-#~ msgid "Configuring VLAN connection '%s'..." +-#~ msgstr "Configurando la conexión VLAN «%s»…" +- +-#~ msgid "User authentication required for VLAN connection '%s'..." +-#~ msgstr "Se necesita autenticación de usuario para la conexión VLAN «%s»…" +- +-#~ msgid "VLAN connection '%s' active" +-#~ msgstr "Conexión VLAN «%s» activa" +- +-#~ msgid "WiMAX Mobile Broadband (%s)" +-#~ msgstr "Banda ancha móvil WiMAX (%s)" +- +-#~ msgid "WiMAX Mobile Broadband" +-#~ msgstr "Banda ancha móvil WiMAX" +- +-#~ msgid "WiMAX is disabled" +-#~ msgstr "WiMAX está desactivada" +- +-#~ msgid "WiMAX is disabled by hardware switch" +-#~ msgstr "WiMAX está desactivada por el interruptor físico" +- +-#~ msgid "You are now connected to the WiMAX network." +-#~ msgstr "Ahora está conectado a la red WiMAX." +- +-#~ msgid "%d dB" +-#~ msgstr "%d dB" +- +-#~ msgctxt "WiMAX CINR" +-#~ msgid "unknown" +-#~ msgstr "Desconocido" +- +-#~ msgctxt "WiMAX Base Station ID" +-#~ msgid "unknown" +-#~ msgstr "Desconocido" +- +-#~ msgid "WiMAX (%s)" +-#~ msgstr "WiMAX (%s)" +- +-#~ msgid "CINR:" +-#~ msgstr "CINR:" +- +-#~ msgid "BSID:" +-#~ msgstr "BSID:" +- +-#~ msgid "WiMAX" +-#~ msgstr "WiMAX" +- +-#~ msgid "_Device MAC address:" +-#~ msgstr "Dirección MAC del _dispositivo:" +- +-#~ msgid "New Mobile Broadband (CDMA) connection..." +-#~ msgstr "Conexión de banda ancha móvil (CDMA) nueva…" +- +-#~ msgid "You are now connected to the CDMA network." +-#~ msgstr "Ahora está conectado a la red CDMA." +- +-#~ msgid "CDMA network." +-#~ msgstr "Red CDMA." +- +-#~ msgid "New Mobile Broadband (GSM) connection..." +-#~ msgstr "Conexión de banda ancha móvil (GSM) nueva…" +- +-#~ msgid "You are now connected to the GSM network." +-#~ msgstr "Ahora está conectado a la red GSM." +- +-#~ msgid "GSM network." +-#~ msgstr "Red GSM." +- +-#~ msgid "Any" +-#~ msgstr "Cualquiera" +- +-#~ msgid "3G (UMTS/HSPA)" +-#~ msgstr "3G (UMTS/HSPA)" +- +-#~ msgid "2G (GPRS/EDGE)" +-#~ msgstr "2G (GPRS/EDGE)" +- +-#~ msgid "Prefer 3G (UMTS/HSPA)" +-#~ msgstr "Preferir 3G (UMTS/HSPA)" +- +-#~ msgid "Prefer 2G (GPRS/EDGE)" +-#~ msgstr "Preferir 2G (GPRS/EDGE)" +- +-#~ msgid "Prefer 4G (LTE)" +-#~ msgstr "Preferir 4G (LTE)" +- +-#~ msgid "Use only 4G (LTE)" +-#~ msgstr "Usar sólo 4G (LTE)" +- +-#~ msgid "Error saving connection" +-#~ msgstr "Error al guardar la conexión" +- +-#~ msgid "The property '%s' / '%s' is invalid: %d" +-#~ msgstr "La propiedad «%s» / «%s» no es válida: %d" +- +-#~ msgid "" +-#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) " +-#~ "%s)." +-#~ msgstr "" +-#~ "La configuración de Bluetooth no es posible (No se pudo conectar a D-Bus: " +-#~ "(%s) %s)." +- +-#~ msgid "" +-#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) " +-#~ "%s)." +-#~ msgstr "" +-#~ "La configuración de Bluetooth no es posible (error al buscar " +-#~ "NetworkManager: (%s) %s)." +- +-#~ msgid "Use your mobile phone as a network device (PAN/NAP)" +-#~ msgstr "Usar su teléfono móvil como un dispositivo de red (PAN/NAP)" +- +-#~ msgid "Access the Internet using your mobile phone (DUN)" +-#~ msgstr "Acceder a Internet usando su teléfono móvil (DUN)" +- +-#~ msgid "Error: %s" +-#~ msgstr "Error: %s" +- +-#~ msgid "Failed to create DUN connection: %s" +-#~ msgstr "Falló al crear la conexión DUN: %s" +- +-#~ msgid "Your phone is now ready to use!" +-#~ msgstr "Su teléfono está listo para usarse" +- +-#~ msgid "Mobile wizard was canceled" +-#~ msgstr "Se canceló el asistente móvil" +- +-#~ msgid "Unknown phone device type (not GSM or CDMA)" +-#~ msgstr "Tipo de dispositivo de teléfono desconocido (no es GSM ni CDMA)" +- +-#~ msgid "failed to connect to the phone." +-#~ msgstr "falló al conectar con el teléfono." +- +-#~ msgid "error getting bus connection" +-#~ msgstr "error al obtener la conexión al bus" +- +-#~ msgid "unexpectedly disconnected from the phone." +-#~ msgstr "el teléfono se desconectó de forma inesperada." +- +-#~ msgid "timed out detecting phone details." +-#~ msgstr "expiró el tiempo al detectar los detalles del teléfono." +- +-#~ msgid "Detecting phone configuration..." +-#~ msgstr "Detectando la configuración del teléfono…" +- +-#~ msgid "" +-#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-" +-#~ "Networking connection." +-#~ msgstr "" +-#~ "El adaptador de Bluetooth predeterminado debe estar activado antes de " +-#~ "configurar una conexión de red de marcado telefónico." +- +-#~ msgid "Failed to create PAN connection: %s" +-#~ msgstr "Falló al crear la conexión PAN: %s" +- +-#~ msgid "%s Network" +-#~ msgstr "Red %s" +- +-#~ msgid "Primary DNS:" +-#~ msgstr "DNS primario:" +- +-#~ msgid "Secondary DNS:" +-#~ msgstr "DNS secundario:" +- +-#~ msgid "Ternary DNS:" +-#~ msgstr "DNS terciario:" +- +-#~ msgid "Automatic (PPP)" +-#~ msgstr "Automático (PPP)" +- +-#~ msgid "Automatic (PPP) addresses only" +-#~ msgstr "Sólo direcciones automáticas (PPP)" +- +-#~ msgid "unknown modem type." +-#~ msgstr "tipo de módem desconocido." +- +-#~ msgid "_Save..." +-#~ msgstr "_Guardar…" +- +-#~ msgid "_Edit..." +-#~ msgstr "_Editar…" +- +-#~ msgid "_Delete..." +-#~ msgstr "_Eliminar…" +- +-#~ msgid "No Certificate Authority certificate chosen" +-#~ msgstr "No se ha elegido ningún certificado CA" +- +-#~ msgid "" +-#~ "Not using a Certificate Authority (CA) certificate can result in " +-#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +-#~ "a Certificate Authority certificate?" +-#~ msgstr "" +-#~ "No usar un certificado de Certificate Authority (CA) puede dar lugar a " +-#~ "conexiones inseguras a redes inalámbricas promiscuas. ¿Quiere elegir un " +-#~ "certificado Certificate Authority?" +- +-#~ msgid "No" +-#~ msgstr "No" +- +-#~ msgid "Yes" +-#~ msgstr "Sí" +- +-#~ msgid "Connect _automatically" +-#~ msgstr "Conectar _automáticamente" +- +-#~ msgid "A_vailable to all users" +-#~ msgstr "Disponible para _todos los usuarios" +- +-#~ msgid "An unknown error occurred." +-#~ msgstr "Ocurrió un error desconocido." +- +-#~ msgid "Could not edit new connection" +-#~ msgstr "No se pudo editar la conexión nueva" +- +-#~ msgid "Wireless Networks (%s)" +-#~ msgstr "Redes inalámbricas (%s)" +- +-#~ msgid "Wireless Network (%s)" +-#~ msgstr "Red inalámbrica (%s)" +- +-#~ msgid "Wireless Network" +-#~ msgid_plural "Wireless Networks" +-#~ msgstr[0] "Red inalámbrica" +-#~ msgstr[1] "Redes inalámbricas" +- +-#~ msgid "wireless is disabled" +-#~ msgstr "la red inalámbrica está desactivada" +- +-#~ msgid "wireless is disabled by hardware switch" +-#~ msgstr "la red inalámbrica está desactivada por el interruptor físico" +- +-#~ msgid "Preparing wireless network connection '%s'..." +-#~ msgstr "Preparando la conexión de red inalámbrica «%s»…" +- +-#~ msgid "Configuring wireless network connection '%s'..." +-#~ msgstr "Configurando la conexión de red inalámbrica «%s»…" +- +-#~ msgid "Requesting a wireless network address for '%s'..." +-#~ msgstr "Solicitando una dirección de red inalámbrica para «%s»…" +- +-#~ msgid "Wireless network connection '%s' active" +-#~ msgstr "La conexión de red «%s» está activa" +- +-#~ msgid "Wireless" +-#~ msgstr "Inalámbrico" +- +-#~ msgid "Could not load Wired Security security user interface." +-#~ msgstr "No se pudo cargar la interfaz de usuario de seguridad cableada." +- +-#~ msgid "Wireless connection %d" +-#~ msgstr "Conexión inalámbrica %d" +- +-#~ msgid "" +-#~ "failed to find Bluetooth device (unknown gnome-bluetooth proxy object " +-#~ "type)." +-#~ msgstr "" +-#~ "falló al buscar el dispositivo Bluetooth (tipo de objeto de proxy gnome-" +-#~ "bluetooth desconocido)" +- +-#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)." +-#~ msgstr "" +-#~ "La configuración de Bluetooth no es posible (No se pudo crear proxy D-Bus)" +- +-#~ msgid "Could not edit imported connection" +-#~ msgstr "No se pudo editar la conexión importada" +- +-#~ msgid "No VPN plugin available. Please install one to enable this button." +-#~ msgstr "" +-#~ "No existe un complemento de VPN disponible. Instale uno para activar este " +-#~ "botón." +- +-#~ msgid "Don't know how to edit '%s' connections" +-#~ msgstr "Se desconoce cómo editar conexiones «%s»" +- +-#~ msgid "_Security:" +-#~ msgstr "_Seguridad:" +- +-#~ msgid "Click on this icon to connect to a wireless network" +-#~ msgstr "Pulse sobre este icono para conectarse a una red inalámbrica" +- +-#~ msgid "United Kingdom" +-#~ msgstr "Reino Unido" +- +-#~ msgid "Other Wireless Network..." +-#~ msgstr "Otras redes inalámbricas…" +- +-#~ msgid "An instance of nm-applet is already running.\n" +-#~ msgstr "Ya existe una instancia de nm-applet en ejecución.\n" +- +-#~ msgid "Could not acquire the %s service. (%d)\n" +-#~ msgstr "No se pudo adquirir el servicio %s. (%d)\n" +- +-#~ msgid "could not connect to the system bus." +-#~ msgstr "no se pudo conectar con el bus del sistema." +- +-#~ msgid "Cannot start VPN connection '%s'" +-#~ msgstr "No se puede iniciar la conexión VPN «%s»" +- +-#~ msgid "" +-#~ "Could not find the authentication dialog for VPN connection type '%s'. " +-#~ "Contact your system administrator." +-#~ msgstr "" +-#~ "No se ha podido encontrar el diálogo de autenticación para el tipo de " +-#~ "conexión VPN «%s». Póngase en contacto con su administrador de sistemas." +- +-#~ msgid "" +-#~ "There was a problem launching the authentication dialog for VPN " +-#~ "connection type '%s'. Contact your system administrator." +-#~ msgstr "" +-#~ "Ha habido un problema al iniciar el diálogo de autenticación para el tipo " +-#~ "de conexión VPN «%s». Póngase en contacto con su administrador de " +-#~ "sistemas." +- +-#~ msgid "Country" +-#~ msgstr "País" +- +-#~ msgid "Create…" +-#~ msgstr "Crear…" +- +-#~| msgid "" +-#~| "The connection editor could not find some required resources (the " +-#~| "NetworkManager applet glade file was not found)." +-#~ msgid "" +-#~ "The connection editor could not find some required resources (the " +-#~ "NetworkManager applet .ui file was not found)." +-#~ msgstr "" +-#~ "El editor de la conexión no pudo encontrar algunos archivos de recursos " +-#~ "(no se encontró el archivo .iu de la miniaplicación Gestor de red)." +- +-#~ msgid "" +-#~ "Active Network Connections" +-#~ msgstr "" +-#~ "Conexiones de red activas" +- +-#~ msgid "" +-#~ "Automatic\n" +-#~ "Version 0\n" +-#~ "Version 1" +-#~ msgstr "" +-#~ "Automático\n" +-#~ "Versión 0\n" +-#~ "Versión 1" +- +-#~ msgid "Addresses" +-#~ msgstr "Direcciones" +- +-#~ msgid "" +-#~ "Automatic\n" +-#~ "Automatic with manual DNS settings\n" +-#~ "Manual\n" +-#~ "Link-Local\n" +-#~ "Shared to other computers" +-#~ msgstr "" +-#~ "Automático\n" +-#~ "Automático con ajustes DNS manuales\n" +-#~ "Manual\n" +-#~ "Enlace local\n" +-#~ "Compartida con otros equipos" +- +-#~ msgid "Basic" +-#~ msgstr "Básico" +- +-#~ msgid "" +-#~ "Any\n" +-#~ "3G (UMTS/HSPA)\n" +-#~ "2G (GPRS/EDGE)\n" +-#~ "Prefer 3G (UMTS/HSPA)\n" +-#~ "Prefer 2G (GPRS/EDGE)" +-#~ msgstr "" +-#~ "Cualquiera\n" +-#~ "3G (UMTS/HSPA)\n" +-#~ "2G (GPRS/EDGE)\n" +-#~ "Preferir 3G (UMTS/HSPA)\n" +-#~ "Preferir 2G (GPRS/EDGE)" +- +-#~ msgid "Authentication" +-#~ msgstr "Autenticación" +- +-#~ msgid "Echo" +-#~ msgstr "Echo" +- +-#~ msgid "" +-#~ "Automatic\n" +-#~ "10 Mb/s\n" +-#~ "100 Mb/s\n" +-#~ "1 Gb/s\n" +-#~ "10 Gb/s" +-#~ msgstr "" +-#~ "Automático\n" +-#~ "10 Mb/s\n" +-#~ "100 Mb/s\n" +-#~ "1 Gb/s\n" +-#~ "10 Gb/s" +- +-#~ msgid "" +-#~ "Automatic\n" +-#~ "Twisted Pair (TP)\n" +-#~ "Attachment Unit Interface (AUI)\n" +-#~ "BNC\n" +-#~ "Media Independent Interface (MII)" +-#~ msgstr "" +-#~ "Automático\n" +-#~ "Par cruzado (TP)\n" +-#~ "Unidad de interfaz adjunto (AUI)\n" +-#~ "BNC\n" +-#~ "Interfaz de medios independiente (MII)" +- +-#~ msgid "" +-#~ "Automatic\n" +-#~ "A (5 GHz)\n" +-#~ "B/G (2.4 GHz)" +-#~ msgstr "" +-#~ "Automático\n" +-#~ "A (5 GHz)\n" +-#~ "B/G (2.4 GHz)" +- +-#~ msgid "Apply" +-#~ msgstr "Aplicar" +- +-#~ msgid "Apply..." +-#~ msgstr "Aplicar…" +- +-#~ msgid "PUK code required" +-#~ msgstr "Se necesita un código PUK" +- +-#~ msgid "PUK code is needed for the mobile broadband device" +-#~ msgstr "Se necesita un código PUK para el dispositivo de banda ancha móvil" +- +-#~ msgctxt "No wired security used" +-#~ msgid "None" +-#~ msgstr "Ninguna" +- +-#~ msgctxt "Unknown/unrecognized wired or wifi security" +-#~ msgid "Unknown" +-#~ msgstr "Desconocido" +- +-#~| msgid "Sho_w key" +-#~ msgid "Show it" +-#~ msgstr "Mostrarlo" +- +-#~ msgid "Save this connection for all users of this machine." +-#~ msgstr "Guardar esta conexión para todos los usuarios en este equipo." +diff --git a/po/fr.po b/po/fr.po +index 5c3da9a..7459a6f 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -11,22 +11,23 @@ + # Sam Friedmann , 2010. + # Bruno Brouard , 2010-2012. + # Alain Lojewski , 2013-2014. +-# ++# lrintel , 2017. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: fr\n" ++"Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2017-05-10 12:44+0200\n" +-"PO-Revision-Date: 2015-09-01 11:10+0200\n" +-"Last-Translator: Claude Paroz \n" ++"POT-Creation-Date: 2017-11-07 19:40+0100\n" ++"PO-Revision-Date: 2017-11-07 06:45+0000\n" ++"Last-Translator: Copied by Zanata \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.3.2\n" + +-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175 ++#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191 + msgid "Network" + msgstr "Réseau" + +@@ -35,7 +36,7 @@ msgid "Manage your network connections" + msgstr "Gérer vos connexions réseau" + + #: ../nm-connection-editor.desktop.in.h:1 +-#: ../src/connection-editor/nm-connection-editor.ui.h:1 ++#: ../src/connection-editor/nm-connection-list.ui.h:1 + msgid "Network Connections" + msgstr "Connexions réseau" + +@@ -165,55 +166,68 @@ msgstr "" + msgid "The NetworkManager Developers" + msgstr "Applet NetworkManager" + +-#: ../shared/nm-utils/nm-shared-utils.c:185 ++#: ../shared/nm-utils/nm-shared-utils.c:477 + #, c-format + msgid "object class '%s' has no property named '%s'" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:192 ++#: ../shared/nm-utils/nm-shared-utils.c:484 + #, c-format + msgid "property '%s' of object class '%s' is not writable" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:199 ++#: ../shared/nm-utils/nm-shared-utils.c:491 + #, c-format + msgid "" + "construct property \"%s\" for object '%s' can't be set after construction" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:207 ++#: ../shared/nm-utils/nm-shared-utils.c:499 + #, c-format + msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:216 ++#: ../shared/nm-utils/nm-shared-utils.c:508 + #, c-format + msgid "unable to set property '%s' of type '%s' from value of type '%s'" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:227 ++#: ../shared/nm-utils/nm-shared-utils.c:519 + #, c-format + msgid "" + "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " + "type '%s'" + msgstr "" + +-#. *************************************************************************** + #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99 + msgid "802.1X authentication" + msgstr "Authentification 802.1X" + +-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1 ++#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349 ++#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1 + #: ../src/connection-editor/ce-ip6-routes.ui.h:1 + #: ../src/connection-editor/ce-new-connection.ui.h:1 + #: ../src/connection-editor/ce-page-dcb.ui.h:17 + #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1 +-#: ../src/connection-editor/nm-connection-editor.ui.h:8 +-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1 ++#: ../src/connection-editor/connection-helpers.c:308 ++#: ../src/connection-editor/connection-helpers.c:771 ++#: ../src/connection-editor/nm-connection-editor.ui.h:5 ++#: ../src/connection-editor/page-bluetooth.c:311 ++#: ../src/connection-editor/page-mobile.c:543 ++#: ../src/connection-editor/page-proxy.c:121 ++#: ../src/connection-editor/page-team.c:344 ++#: ../src/connection-editor/page-team-port.c:206 ++#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1 ++#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1 ++#: ../src/libnma/nma-vpn-password-dialog.c:209 ++#: ../src/libnma/nma-wifi-dialog.c:1066 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209 ++#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465 + msgid "_Cancel" + msgstr "" + +-#: ../src/8021x.ui.h:3 ++#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072 ++#: ../src/libnm-gtk/nm-wifi-dialog.c:1073 + msgid "C_onnect" + msgstr "Se _connecter" + +@@ -230,38 +244,38 @@ msgstr "Ad hoc" + msgid "secure." + msgstr "" + +-#: ../src/applet.c:381 ++#: ../src/applet.c:392 + msgid "Failed to add/activate connection" + msgstr "Échec de l'ajout/création de la connexion" + +-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472 +-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410 ++#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483 ++#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411 + msgid "Unknown error" + msgstr "Erreur inconnue" + +-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539 +-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413 ++#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539 ++#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414 + msgid "Connection failure" + msgstr "Échec de la connexion" + +-#: ../src/applet.c:435 ++#: ../src/applet.c:446 + msgid "Device disconnect failed" + msgstr "La déconnexion du périphérique a échoué" + +-#: ../src/applet.c:440 ++#: ../src/applet.c:451 + msgid "Disconnect failure" + msgstr "Échec de la déconnexion" + +-#: ../src/applet.c:470 ++#: ../src/applet.c:481 + msgid "Connection activation failed" + msgstr "L'activation de la connexion a échoué" + +-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126 ++#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127 + #, fuzzy + msgid "Don’t show this message again" + msgstr "Ne plus m'avertir" + +-#: ../src/applet.c:883 ++#: ../src/applet.c:899 + #, fuzzy, c-format + msgid "" + "\n" +@@ -272,7 +286,7 @@ msgstr "" + "La connexion VPN « %s » a été déconnectée car la connexion réseau a été " + "interrompue." + +-#: ../src/applet.c:885 ++#: ../src/applet.c:901 + #, fuzzy, c-format + msgid "" + "\n" +@@ -282,7 +296,7 @@ msgstr "" + "\n" + "La connexion VPN « %s » a échoué car la connexion réseau a été interrompue." + +-#: ../src/applet.c:887 ++#: ../src/applet.c:903 + #, fuzzy, c-format + msgid "" + "\n" +@@ -292,7 +306,7 @@ msgstr "" + "La connexion VPN « %s » a échoué car le service VPN a été arrêté de manière " + "inattendue." + +-#: ../src/applet.c:889 ++#: ../src/applet.c:905 + #, fuzzy, c-format + msgid "" + "\n" +@@ -303,7 +317,7 @@ msgstr "" + "La connexion VPN « %s » a échoué car le service VPN a renvoyé une " + "configuration invalide." + +-#: ../src/applet.c:891 ++#: ../src/applet.c:907 + #, fuzzy, c-format + msgid "" + "\n" +@@ -312,7 +326,7 @@ msgstr "" + "\n" + "La connexion VPN « %s » a échoué car le délai de connexion est dépassé." + +-#: ../src/applet.c:893 ++#: ../src/applet.c:909 + #, fuzzy, c-format + msgid "" + "\n" +@@ -321,7 +335,7 @@ msgstr "" + "\n" + "La connexion VPN « %s » a échoué car le service VPN n'a pas démarré à temps." + +-#: ../src/applet.c:895 ++#: ../src/applet.c:911 + #, fuzzy, c-format + msgid "" + "\n" +@@ -330,7 +344,7 @@ msgstr "" + "\n" + "La connexion VPN « %s » a échoué car le démarrage du service VPN a échoué." + +-#: ../src/applet.c:897 ++#: ../src/applet.c:913 + #, fuzzy, c-format + msgid "" + "\n" +@@ -339,7 +353,7 @@ msgstr "" + "\n" + "La connexion VPN « %s » a échoué car il n'y avait pas de secrets VPN valides." + +-#: ../src/applet.c:899 ++#: ../src/applet.c:915 + #, fuzzy, c-format + msgid "" + "\n" +@@ -348,7 +362,7 @@ msgstr "" + "\n" + "La connexion VPN « %s » a échoué en raison de secrets VPN non valides." + +-#: ../src/applet.c:904 ++#: ../src/applet.c:920 + #, fuzzy, c-format + msgid "" + "\n" +@@ -357,7 +371,7 @@ msgstr "" + "\n" + "La connexion VPN « %s » a échoué." + +-#: ../src/applet.c:931 ++#: ../src/applet.c:947 + #, c-format + msgid "" + "VPN connection has been successfully established.\n" +@@ -368,19 +382,19 @@ msgstr "" + "\n" + "%s\n" + +-#: ../src/applet.c:933 ++#: ../src/applet.c:949 + msgid "VPN connection has been successfully established.\n" + msgstr "La connexion VPN a été établie avec succès.\n" + +-#: ../src/applet.c:935 ++#: ../src/applet.c:951 + msgid "VPN Login Message" + msgstr "Message d'identification VPN" + +-#: ../src/applet.c:943 ../src/applet.c:983 ++#: ../src/applet.c:959 ../src/applet.c:999 + msgid "VPN Connection Failed" + msgstr "La connexion VPN a échoué" + +-#: ../src/applet.c:987 ++#: ../src/applet.c:1003 + #, fuzzy, c-format + msgid "" + "\n" +@@ -393,7 +407,7 @@ msgstr "" + "\n" + "%s" + +-#: ../src/applet.c:990 ++#: ../src/applet.c:1006 + #, fuzzy, c-format + msgid "" + "\n" +@@ -406,148 +420,148 @@ msgstr "" + "\n" + "%s" + +-#: ../src/applet.c:1279 ++#: ../src/applet.c:1295 + msgid "device not ready (firmware missing)" + msgstr "périphérique non prêt (micrologiciel manquant)" + +-#: ../src/applet.c:1281 ++#: ../src/applet.c:1297 + msgid "device not ready" + msgstr "périphérique non prêt" + + #. Notify user of unmanaged or unavailable device +-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109 ++#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109 + msgid "disconnected" + msgstr "déconnecté" + +-#: ../src/applet.c:1307 ++#: ../src/applet.c:1323 + msgid "Disconnect" + msgstr "Se déconnecter" + +-#: ../src/applet.c:1321 ++#: ../src/applet.c:1337 + msgid "device not managed" + msgstr "périphérique non géré" + +-#: ../src/applet.c:1394 ++#: ../src/applet.c:1410 + msgid "No network devices available" + msgstr "Aucun périphérique réseau disponible" + +-#: ../src/applet.c:1448 ++#: ../src/applet.c:1464 + msgid "_VPN Connections" + msgstr "_Connexions VPN" + +-#: ../src/applet.c:1492 ++#: ../src/applet.c:1508 + #, fuzzy + msgid "_Configure VPN…" + msgstr "_Configurer le VPN..." + +-#: ../src/applet.c:1495 ++#: ../src/applet.c:1511 + #, fuzzy + msgid "_Add a VPN connection…" + msgstr "_Connexions VPN" + +-#: ../src/applet.c:1601 ++#: ../src/applet.c:1617 + #, fuzzy + msgid "NetworkManager is not running…" + msgstr "NetworkManager n'est pas lancé..." + +-#: ../src/applet.c:1606 ../src/applet.c:2671 ++#: ../src/applet.c:1622 ../src/applet.c:2687 + msgid "Networking disabled" + msgstr "Réseau désactivé" + + #. 'Enable Networking' item +-#: ../src/applet.c:1816 ++#: ../src/applet.c:1832 + msgid "Enable _Networking" + msgstr "Activer le _réseau" + + #. 'Enable Wi-Fi' item +-#: ../src/applet.c:1825 ++#: ../src/applet.c:1841 + msgid "Enable _Wi-Fi" + msgstr "Activer le réseau _Wi-Fi" + + #. 'Enable Mobile Broadband' item +-#: ../src/applet.c:1834 ++#: ../src/applet.c:1850 + msgid "Enable _Mobile Broadband" + msgstr "Activer la connexion _mobile" + + #. Toggle notifications item +-#: ../src/applet.c:1846 ++#: ../src/applet.c:1862 + msgid "Enable N_otifications" + msgstr "Activer les _notifications" + + #. 'Connection Information' item +-#: ../src/applet.c:1858 ++#: ../src/applet.c:1874 + msgid "Connection _Information" + msgstr "_Informations sur la connexion" + + #. 'Edit Connections...' item +-#: ../src/applet.c:1866 ++#: ../src/applet.c:1882 + #, fuzzy + msgid "Edit Connections…" + msgstr "Modification des connexions..." + +-#: ../src/applet.c:1880 ++#: ../src/applet.c:1896 + msgid "_About" + msgstr "À _propos" + +-#: ../src/applet.c:2191 ++#: ../src/applet.c:2207 + #, fuzzy, c-format + msgid "You are now connected to “%s”." + msgstr "Vous êtes maintenant connecté à « %s »." + +-#: ../src/applet.c:2231 ++#: ../src/applet.c:2247 + msgid "Disconnected" + msgstr "Déconnecté" + +-#: ../src/applet.c:2232 ++#: ../src/applet.c:2248 + msgid "The network connection has been disconnected." + msgstr "La connexion réseau a été déconnectée." + +-#: ../src/applet.c:2534 ++#: ../src/applet.c:2550 + #, fuzzy, c-format + msgid "Preparing network connection “%s”…" + msgstr "Préparation de la connexion réseau « %s »..." + +-#: ../src/applet.c:2537 ++#: ../src/applet.c:2553 + #, fuzzy, c-format + msgid "User authentication required for network connection “%s”…" + msgstr "Authentification nécessaire pour la connexion réseau « %s »..." + +-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125 +-#: ../src/mobile-helpers.c:608 ++#: ../src/applet.c:2556 ../src/applet-device-bt.c:125 ++#: ../src/mobile-helpers.c:607 + #, fuzzy, c-format + msgid "Requesting a network address for “%s”…" + msgstr "Obtention d'une adresse réseau pour « %s »..." + +-#: ../src/applet.c:2543 ++#: ../src/applet.c:2559 + #, fuzzy, c-format + msgid "Network connection “%s” active" + msgstr "Connexion réseau « %s » active" + +-#: ../src/applet.c:2616 ++#: ../src/applet.c:2632 + #, fuzzy, c-format + msgid "Starting VPN connection “%s”…" + msgstr "Démarrage de la connexion VPN « %s »..." + +-#: ../src/applet.c:2619 ++#: ../src/applet.c:2635 + #, fuzzy, c-format + msgid "User authentication required for VPN connection “%s”…" + msgstr "Authentification nécessaire pour la connexion VPN « %s »..." + +-#: ../src/applet.c:2622 ++#: ../src/applet.c:2638 + #, fuzzy, c-format + msgid "Requesting a VPN address for “%s”…" + msgstr "Obtention d'une adresse VPN pour « %s »..." + +-#: ../src/applet.c:2625 ++#: ../src/applet.c:2641 + #, fuzzy, c-format + msgid "VPN connection active" + msgstr "Connexion VPN « %s » active" + +-#: ../src/applet.c:2675 ++#: ../src/applet.c:2691 + msgid "No network connection" + msgstr "Aucune connexion réseau" + +-#: ../src/applet.c:3276 ++#: ../src/applet.c:3292 + msgid "NetworkManager Applet" + msgstr "Applet NetworkManager" + +@@ -565,47 +579,47 @@ msgstr "Code PIN erroné ; contactez votre fournisseur." + msgid "Sending unlock code…" + msgstr "Envoi du code de déverrouillage..." + +-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506 ++#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507 + #, c-format + msgid "Mobile Broadband (%s)" + msgstr "Connexion mobile (%s)" + +-#: ../src/applet-device-broadband.c:738 +-#: ../src/connection-editor/connection-helpers.c:107 ++#: ../src/applet-device-broadband.c:739 ++#: ../src/connection-editor/connection-helpers.c:108 + #: ../src/connection-editor/page-mobile.c:308 + #: ../src/libnm-gtk/nm-ui-utils.c:329 + msgid "Mobile Broadband" + msgstr "Connexion mobile" + +-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75 +-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906 ++#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75 ++#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907 + msgid "Available" + msgstr "Disponible" + + #. Default connection item +-#: ../src/applet-device-broadband.c:803 ++#: ../src/applet-device-broadband.c:805 + #, fuzzy + msgid "New Mobile Broadband connection…" + msgstr "Nouvelle connexion mobile" + +-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87 +-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308 ++#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87 ++#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309 + msgid "Connection Established" + msgstr "Connexion établie" + +-#: ../src/applet-device-broadband.c:818 ++#: ../src/applet-device-broadband.c:820 + msgid "You are now connected to the Mobile Broadband network." + msgstr "Vous êtes maintenant connecté au réseau mobile." + +-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964 ++#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966 + msgid "Mobile Broadband network." + msgstr "Réseau mobile." + +-#: ../src/applet-device-broadband.c:959 ++#: ../src/applet-device-broadband.c:961 + msgid "You are now registered on the home network." + msgstr "Vous êtes maintenant enregistré sur le réseau domestique." + +-#: ../src/applet-device-broadband.c:965 ++#: ../src/applet-device-broadband.c:967 + msgid "You are now registered on a roaming network." + msgstr "Vous êtes maintenant enregistré sur un réseau itinérant." + +@@ -613,23 +627,23 @@ msgstr "Vous êtes maintenant enregistré sur un réseau itinérant." + msgid "You are now connected to the mobile broadband network." + msgstr "Vous êtes maintenant connecté au réseau mobile." + +-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599 ++#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598 + #, fuzzy, c-format + msgid "Preparing mobile broadband connection “%s”…" + msgstr "Préparation de la connexion mobile « %s »..." + +-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602 ++#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601 + #, fuzzy, c-format + msgid "Configuring mobile broadband connection “%s”…" + msgstr "Configuration de la connexion mobile « %s »..." + +-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605 ++#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604 + #, fuzzy, c-format + msgid "User authentication required for mobile broadband connection “%s”…" + msgstr "" + "Authentification personnelle nécessaire pour la connexion mobile « %s »..." + +-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627 ++#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626 + #, fuzzy, c-format + msgid "Mobile broadband connection “%s” active" + msgstr "Connexion mobile « %s » active" +@@ -690,6 +704,18 @@ msgstr "Connexion au réseau Ethernet « %s » active" + msgid "DSL authentication" + msgstr "Authentification DSL" + ++#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060 ++#: ../src/connection-editor/ce-ip4-routes.ui.h:2 ++#: ../src/connection-editor/ce-ip6-routes.ui.h:2 ++#: ../src/connection-editor/ce-page-dcb.ui.h:18 ++#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2 ++#: ../src/connection-editor/page-bluetooth.c:313 ++#: ../src/connection-editor/page-mobile.c:545 ++#: ../src/libnma/nma-vpn-password-dialog.c:210 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466 ++msgid "_OK" ++msgstr "" ++ + #: ../src/applet-device-wifi.c:225 + #, fuzzy + msgid "_Connect to Hidden Wi-Fi Network…" +@@ -704,7 +730,7 @@ msgstr "Création d'un nouveau réseau Wi-Fi" + msgid "(none)" + msgstr "(aucun)" + +-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408 ++#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409 + msgid "Failed to add new connection" + msgstr "L'ajout de la nouvelle connexion a échoué" + +@@ -712,78 +738,78 @@ msgstr "L'ajout de la nouvelle connexion a échoué" + msgid "Insufficient privileges." + msgstr "" + +-#: ../src/applet-device-wifi.c:838 ++#: ../src/applet-device-wifi.c:839 + #, c-format + msgid "Wi-Fi Networks (%s)" + msgstr "Réseaux Wi-Fi (%s)" + +-#: ../src/applet-device-wifi.c:840 ++#: ../src/applet-device-wifi.c:841 + #, c-format + msgid "Wi-Fi Network (%s)" + msgstr "Réseau Wi-Fi (%s)" + +-#: ../src/applet-device-wifi.c:842 ++#: ../src/applet-device-wifi.c:843 + msgid "Wi-Fi Network" + msgid_plural "Wi-Fi Networks" + msgstr[0] "Réseau Wi-Fi" + msgstr[1] "Réseaux Wi-Fi" + +-#: ../src/applet-device-wifi.c:871 ++#: ../src/applet-device-wifi.c:872 + msgid "Wi-Fi is disabled" + msgstr "le Wi-Fi est désactivé" + +-#: ../src/applet-device-wifi.c:872 ++#: ../src/applet-device-wifi.c:873 + msgid "Wi-Fi is disabled by hardware switch" + msgstr "le Wi-Fi est désactivé par un commutateur matériel" + +-#: ../src/applet-device-wifi.c:933 ++#: ../src/applet-device-wifi.c:934 + msgid "More networks" + msgstr "Plus de réseaux" + +-#: ../src/applet-device-wifi.c:1122 ++#: ../src/applet-device-wifi.c:1123 + msgid "Wi-Fi Networks Available" + msgstr "Réseaux Wi-Fi disponibles" + +-#: ../src/applet-device-wifi.c:1123 ++#: ../src/applet-device-wifi.c:1124 + msgid "Use the network menu to connect to a Wi-Fi network" + msgstr "Utilisez le menu réseau pour vous connecter à un réseau Wi-Fi" + +-#: ../src/applet-device-wifi.c:1307 ++#: ../src/applet-device-wifi.c:1308 + #, fuzzy, c-format + msgid "You are now connected to the Wi-Fi network “%s”." + msgstr "Vous êtes maintenant connecté au réseau Wi-Fi « %s »." + +-#: ../src/applet-device-wifi.c:1342 ++#: ../src/applet-device-wifi.c:1343 + #, fuzzy, c-format + msgid "Preparing Wi-Fi network connection “%s”…" + msgstr "Préparation de la connexion réseau Wi-Fi « %s »..." + +-#: ../src/applet-device-wifi.c:1345 ++#: ../src/applet-device-wifi.c:1346 + #, fuzzy, c-format + msgid "Configuring Wi-Fi network connection “%s”…" + msgstr "Configuration de la connexion au réseau Wi-Fi « %s »..." + +-#: ../src/applet-device-wifi.c:1348 ++#: ../src/applet-device-wifi.c:1349 + #, fuzzy, c-format + msgid "User authentication required for Wi-Fi network “%s”…" + msgstr "Authentification nécessaire pour le réseau Wi-Fi « %s »..." + +-#: ../src/applet-device-wifi.c:1351 ++#: ../src/applet-device-wifi.c:1352 + #, fuzzy, c-format + msgid "Requesting a Wi-Fi network address for “%s”…" + msgstr "Obtention d'une adresse réseau Wi-Fi pour « %s »..." + +-#: ../src/applet-device-wifi.c:1362 ++#: ../src/applet-device-wifi.c:1363 + #, fuzzy, c-format + msgid "Wi-Fi network connection “%s” active: %s (%d%%)" + msgstr "Connexion au réseau Wi-Fi « %s » active : %s (%d%%)" + +-#: ../src/applet-device-wifi.c:1366 ++#: ../src/applet-device-wifi.c:1367 + #, fuzzy, c-format + msgid "Wi-Fi network connection “%s” active" + msgstr "Connexion au réseau Wi-Fi « %s » active" + +-#: ../src/applet-device-wifi.c:1385 ++#: ../src/applet-device-wifi.c:1386 + msgid "Failed to activate connection" + msgstr "L'activation de la connexion a échoué" + +@@ -791,197 +817,197 @@ msgstr "L'activation de la connexion a échoué" + msgid "Error displaying connection information:" + msgstr "Erreur lors de l'affichage des informations de connexion :" + +-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379 ++#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381 + #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948 + #: ../src/wireless-security/wireless-security.c:448 + msgid "LEAP" + msgstr "LEAP" + +-#: ../src/applet-dialogs.c:74 ++#: ../src/applet-dialogs.c:75 + msgid "Dynamic WEP" + msgstr "WEP dynamique" + +-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228 +-#: ../src/applet-dialogs.c:230 ++#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229 ++#: ../src/applet-dialogs.c:231 + msgid "WPA/WPA2" + msgstr "WPA/WPA2" + + #. Create the expander +-#: ../src/applet-dialogs.c:151 ++#: ../src/applet-dialogs.c:152 + #, fuzzy + msgid "More addresses" + msgstr "Adresses" + +-#: ../src/applet-dialogs.c:226 ++#: ../src/applet-dialogs.c:227 + msgid "WEP" + msgstr "WEP" + +-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243 +-#: ../src/connection-editor/page-wifi-security.c:330 ++#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244 ++#: ../src/connection-editor/page-wifi-security.c:332 + msgctxt "Wi-Fi/Ethernet security" + msgid "None" + msgstr "Aucune" + +-#: ../src/applet-dialogs.c:260 ++#: ../src/applet-dialogs.c:261 + #, c-format + msgid "%s (default)" + msgstr "%s (par défaut)" + +-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580 ++#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581 + #, c-format + msgid "%u Mb/s" + msgstr "%u Mb/s" + +-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582 ++#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583 + msgctxt "Speed" + msgid "Unknown" + msgstr "Inconnue" + + #. Address +-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368 ++#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369 + msgctxt "Address" + msgid "Unknown" + msgstr "Inconnue" + +-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420 ++#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421 + msgid "IP Address:" + msgstr "Adresse IP :" + +-#: ../src/applet-dialogs.c:369 ++#: ../src/applet-dialogs.c:370 + msgid "Broadcast Address:" + msgstr "Adresse de broadcast :" + + #. Prefix +-#: ../src/applet-dialogs.c:381 ++#: ../src/applet-dialogs.c:382 + msgctxt "Subnet Mask" + msgid "Unknown" + msgstr "Inconnu" + +-#: ../src/applet-dialogs.c:382 ++#: ../src/applet-dialogs.c:383 + msgid "Subnet Mask:" + msgstr "Masque de sous-réseau :" + +-#: ../src/applet-dialogs.c:492 ++#: ../src/applet-dialogs.c:493 + #, c-format + msgid "Ethernet (%s)" + msgstr "Ethernet (%s)" + +-#: ../src/applet-dialogs.c:495 ++#: ../src/applet-dialogs.c:496 + #, c-format + msgid "802.11 WiFi (%s)" + msgstr "Wi-Fi 802.11 (%s)" + +-#: ../src/applet-dialogs.c:502 ++#: ../src/applet-dialogs.c:503 + #, c-format + msgid "GSM (%s)" + msgstr "GSM (%s)" + +-#: ../src/applet-dialogs.c:504 ++#: ../src/applet-dialogs.c:505 + #, c-format + msgid "CDMA (%s)" + msgstr "CDMA (%s)" + + #. --- General --- +-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810 ++#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811 + #: ../src/connection-editor/ce-page-team-port.ui.h:23 + #: ../src/connection-editor/ce-page-team.ui.h:48 + #: ../src/connection-editor/page-general.c:367 + msgid "General" + msgstr "Général" + +-#: ../src/applet-dialogs.c:516 ++#: ../src/applet-dialogs.c:517 + msgid "Interface:" + msgstr "Interface :" + +-#: ../src/applet-dialogs.c:536 ++#: ../src/applet-dialogs.c:537 + msgid "Hardware Address:" + msgstr "Adresse matérielle :" + + #. Driver +-#: ../src/applet-dialogs.c:550 ++#: ../src/applet-dialogs.c:551 + msgid "Driver:" + msgstr "Pilote :" + +-#: ../src/applet-dialogs.c:585 ++#: ../src/applet-dialogs.c:586 + msgid "Speed:" + msgstr "Vitesse :" + +-#: ../src/applet-dialogs.c:600 ++#: ../src/applet-dialogs.c:601 + msgid "Security:" + msgstr "Sécurité :" + + #. --- IPv4 --- +-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851 ++#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852 + #: ../src/connection-editor/ce-page-team.ui.h:29 + msgid "IPv4" + msgstr "IPv4" + +-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689 ++#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690 + msgid "Default Route:" + msgstr "Route par défaut :" + + #. --- IPv6 --- +-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873 ++#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874 + #: ../src/connection-editor/ce-page-team.ui.h:30 + msgid "IPv6" + msgstr "IPv6" + +-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882 ++#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883 + msgid "Ignored" + msgstr "Ignoré" + +-#: ../src/applet-dialogs.c:815 ++#: ../src/applet-dialogs.c:816 + msgid "VPN Type:" + msgstr "Type de VPN :" + +-#: ../src/applet-dialogs.c:822 ++#: ../src/applet-dialogs.c:823 + msgid "VPN Gateway:" + msgstr "Passerelle pour le VPN" + +-#: ../src/applet-dialogs.c:828 ++#: ../src/applet-dialogs.c:829 + msgid "VPN Username:" + msgstr "Nom d'utilisateur pour le VPN :" + +-#: ../src/applet-dialogs.c:834 ++#: ../src/applet-dialogs.c:835 + msgid "VPN Banner:" + msgstr "Bannière pour le VPN :" + +-#: ../src/applet-dialogs.c:840 ++#: ../src/applet-dialogs.c:841 + msgid "Base Connection:" + msgstr "Connexion de base :" + +-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343 ++#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343 + msgid "Unknown" + msgstr "Inconnue" + + #. Shouldn't really happen but ... +-#: ../src/applet-dialogs.c:957 ++#: ../src/applet-dialogs.c:958 + msgid "No valid active connections found!" + msgstr "Aucune connexion valide active trouvée !" + +-#: ../src/applet-dialogs.c:985 +-#, fuzzy ++#: ../src/applet-dialogs.c:1007 + msgid "" +-"Copyright © 2004-2014 Red Hat, Inc.\n" ++"Copyright © 2004-2017 Red Hat, Inc.\n" + "Copyright © 2005-2008 Novell, Inc.\n" + "and many other community contributors and translators" + msgstr "" +-"Copyright © 2004-2011 Red Hat, Inc.\n" +-"Copyright © 2005-2008 Novell, Inc.\n" +-"et beaucoup d'autres contributeurs et traducteurs de la communauté" + +-#: ../src/applet-dialogs.c:988 ++#: ../src/applet-dialogs.c:1010 + msgid "" + "Notification area applet for managing your network devices and connections." + msgstr "" + "Une zone de notification pour gérer vos périphériques réseaux et vos " + "connexions." + +-#: ../src/applet-dialogs.c:990 ++#: ../src/applet-dialogs.c:1012 + msgid "NetworkManager Website" + msgstr "Site Web de NetworkManager" + +-#: ../src/applet-dialogs.c:1001 ++#: ../src/applet-dialogs.c:1016 ++msgid "translator-credits" ++msgstr "" ++ ++#: ../src/applet-dialogs.c:1026 + msgid "" + "The NetworkManager Applet could not find some required resources (the .ui " + "file was not found)." +@@ -989,33 +1015,33 @@ msgstr "" + "L'applet NetworkManager n'a pas pu trouver les ressources requises (le " + "fichier .ui n'a pas été trouvé)." + +-#: ../src/applet-dialogs.c:1006 ++#: ../src/applet-dialogs.c:1031 + msgid "Missing resources" + msgstr "Ressources manquantes" + +-#: ../src/applet-dialogs.c:1031 ++#: ../src/applet-dialogs.c:1057 + msgid "Mobile broadband network password" + msgstr "Mot de passe du réseau mobile" + +-#: ../src/applet-dialogs.c:1040 ++#: ../src/applet-dialogs.c:1066 + #, fuzzy, c-format + msgid "A password is required to connect to “%s”." + msgstr "Un mot de passe est requis pour vous connecter à « %s »." + +-#: ../src/applet-dialogs.c:1055 ++#: ../src/applet-dialogs.c:1081 + msgid "Password:" + msgstr "Mot de passe :" + +-#: ../src/applet-dialogs.c:1337 ++#: ../src/applet-dialogs.c:1363 + msgid "SIM PIN unlock required" + msgstr "Déverrouillage SIM PIN requis" + +-#: ../src/applet-dialogs.c:1338 ++#: ../src/applet-dialogs.c:1364 + msgid "SIM PIN Unlock Required" + msgstr "Déverrouillage SIM PIN requis" + + #. FIXME: some warning about # of times you can enter incorrect PIN +-#: ../src/applet-dialogs.c:1340 ++#: ../src/applet-dialogs.c:1366 + #, fuzzy, c-format + msgid "" + "The mobile broadband device “%s” requires a SIM PIN code before it can be " +@@ -1025,25 +1051,25 @@ msgstr "" + "utilisé." + + #. Translators: PIN code entry label +-#: ../src/applet-dialogs.c:1342 ++#: ../src/applet-dialogs.c:1368 + msgid "PIN code:" + msgstr "Code PIN :" + + #. Translators: Show/obscure PIN checkbox label +-#: ../src/applet-dialogs.c:1346 ++#: ../src/applet-dialogs.c:1372 + msgid "Show PIN code" + msgstr "Afficher le code PIN" + +-#: ../src/applet-dialogs.c:1348 ++#: ../src/applet-dialogs.c:1374 + msgid "SIM PUK unlock required" + msgstr "Déverrouillage SIM PUK requis" + +-#: ../src/applet-dialogs.c:1349 ++#: ../src/applet-dialogs.c:1375 + msgid "SIM PUK Unlock Required" + msgstr "Déverrouillage SIM PUK requis" + + #. FIXME: some warning about # of times you can enter incorrect PUK +-#: ../src/applet-dialogs.c:1351 ++#: ../src/applet-dialogs.c:1377 + #, fuzzy, c-format + msgid "" + "The mobile broadband device “%s” requires a SIM PUK code before it can be " +@@ -1053,32 +1079,25 @@ msgstr "" + "utilisé." + + #. Translators: PUK code entry label +-#: ../src/applet-dialogs.c:1353 ++#: ../src/applet-dialogs.c:1379 + msgid "PUK code:" + msgstr "Code PUK :" + + #. Translators: New PIN entry label +-#: ../src/applet-dialogs.c:1356 ++#: ../src/applet-dialogs.c:1382 + msgid "New PIN code:" + msgstr "Nouveau code PIN :" + + #. Translators: New PIN verification entry label +-#: ../src/applet-dialogs.c:1358 ++#: ../src/applet-dialogs.c:1384 + msgid "Re-enter new PIN code:" + msgstr "Resaisissez le nouveau code PIN :" + + #. Translators: Show/obscure PIN/PUK checkbox label +-#: ../src/applet-dialogs.c:1363 ++#: ../src/applet-dialogs.c:1389 + msgid "Show PIN/PUK codes" + msgstr "Afficher les codes PIN/PUK" + +-#: ../src/connection-editor/ce-ip4-routes.ui.h:2 +-#: ../src/connection-editor/ce-ip6-routes.ui.h:2 +-#: ../src/connection-editor/ce-page-dcb.ui.h:18 +-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2 +-msgid "_OK" +-msgstr "" +- + #: ../src/connection-editor/ce-ip4-routes.ui.h:3 + #: ../src/connection-editor/ce-ip6-routes.ui.h:3 + #: ../src/connection-editor/ce-page.h:114 +@@ -1095,21 +1114,21 @@ msgstr "" + #: ../src/connection-editor/ce-page-bond.ui.h:12 + #: ../src/connection-editor/ce-page-bridge.ui.h:2 + #: ../src/connection-editor/ce-page-ip4.ui.h:7 +-#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++#: ../src/connection-editor/ce-page-ip6.ui.h:12 + #: ../src/connection-editor/ce-page-team.ui.h:13 +-#: ../src/connection-editor/nm-connection-editor.ui.h:3 ++#: ../src/connection-editor/nm-connection-list.ui.h:3 + msgid "_Add" + msgstr "" + +-#. Delete + #: ../src/connection-editor/ce-ip4-routes.ui.h:5 + #: ../src/connection-editor/ce-ip6-routes.ui.h:5 + #: ../src/connection-editor/ce-page-bond.ui.h:14 + #: ../src/connection-editor/ce-page-bridge.ui.h:4 + #: ../src/connection-editor/ce-page-ip4.ui.h:8 +-#: ../src/connection-editor/ce-page-ip6.ui.h:11 ++#: ../src/connection-editor/ce-page-ip6.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:15 +-#: ../src/connection-editor/nm-connection-list.c:711 ++#: ../src/connection-editor/connection-helpers.c:772 ++#: ../src/connection-editor/nm-connection-list.ui.h:4 + msgid "_Delete" + msgstr "_Supprimer" + +@@ -1201,11 +1220,10 @@ msgstr "_Connexions liées :" + msgid "M_ode:" + msgstr "M_ode :" + +-#. Edit + #: ../src/connection-editor/ce-page-bond.ui.h:13 + #: ../src/connection-editor/ce-page-bridge.ui.h:3 + #: ../src/connection-editor/ce-page-team.ui.h:14 +-#: ../src/connection-editor/nm-connection-list.c:695 ++#: ../src/connection-editor/nm-connection-list.ui.h:5 + msgid "_Edit" + msgstr "_Modifier" + +@@ -1261,7 +1279,7 @@ msgstr "" + + #: ../src/connection-editor/ce-page-bond.ui.h:25 + #: ../src/connection-editor/ce-page-ethernet.ui.h:17 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:4 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:8 + #: ../src/connection-editor/ce-page-team.ui.h:17 + #: ../src/connection-editor/ce-page-vlan.ui.h:4 + #: ../src/connection-editor/ce-page-wifi.ui.h:8 +@@ -1270,7 +1288,7 @@ msgstr "MT_U :" + + #: ../src/connection-editor/ce-page-bond.ui.h:26 + #: ../src/connection-editor/ce-page-ethernet.ui.h:18 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:3 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:7 + #: ../src/connection-editor/ce-page-team.ui.h:18 + #: ../src/connection-editor/ce-page-vlan.ui.h:5 + #: ../src/connection-editor/ce-page-wifi.ui.h:7 +@@ -1303,26 +1321,72 @@ msgid "_Hello time:" + msgstr "Délai _hello :" + + #: ../src/connection-editor/ce-page-bridge.ui.h:9 ++msgid "STP forwarding delay, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:10 + msgid "s" + msgstr "s" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:10 ++#: ../src/connection-editor/ce-page-bridge.ui.h:11 ++msgid "STP hello time, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:12 + #, fuzzy + msgid "Enable I_GMP snooping" + msgstr "Activer le _réseau" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:11 ++#: ../src/connection-editor/ce-page-bridge.ui.h:13 ++msgid "" ++"Controls whether IGMP snooping is enabled for this bridge. Note that if " ++"snooping was automatically disabled due to hash collisions, the system may " ++"refuse to enable the feature until the collisions are resolved." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:14 + msgid "Enable _STP (Spanning Tree Protocol)" + msgstr "Activer _STP (protocole Spanning Tree)" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:12 ++#: ../src/connection-editor/ce-page-bridge.ui.h:15 ++msgid "" ++"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:16 ++msgid "" ++"STP priority for this bridge. Lower values are “better”; the lowest priority " ++"bridge will be elected the root bridge." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:17 + msgid "_Max age:" + msgstr "_Durée maximum :" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:13 ++#: ../src/connection-editor/ce-page-bridge.ui.h:18 ++msgid "STP maximum message age, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:19 + msgid "_Aging time:" + msgstr "_Durée de vie :" + ++#: ../src/connection-editor/ce-page-bridge.ui.h:20 ++msgid "The Ethernet MAC address aging time, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:21 ++msgid "Group _forward mask:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:22 ++msgid "" ++"A mask of 16 bits, each corresponding to a group address in the range from " ++"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask " ++"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause " ++"frames and LACP." ++msgstr "" ++ + #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112 + msgid "automatic" + msgstr "automatique" +@@ -1596,10 +1660,20 @@ msgid "_Username:" + msgstr "Nom d'_utilisateur :" + + #: ../src/connection-editor/ce-page-dsl.ui.h:2 ++msgid "Username used to authenticate with the PPPoE service." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:3 ++msgid "" ++"Only initiate sessions with access concentrators that provide the specified " ++"service. For most providers this should be left blank." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:4 + msgid "_Service:" + msgstr "_Service :" + +-#: ../src/connection-editor/ce-page-dsl.ui.h:3 ++#: ../src/connection-editor/ce-page-dsl.ui.h:5 + #: ../src/wireless-security/eap-method-leap.ui.h:3 + #: ../src/wireless-security/eap-method-simple.ui.h:3 + #: ../src/wireless-security/ws-leap.ui.h:3 +@@ -1607,7 +1681,11 @@ msgstr "_Service :" + msgid "Sho_w password" + msgstr "A_fficher le mot de passe" + +-#: ../src/connection-editor/ce-page-dsl.ui.h:4 ++#: ../src/connection-editor/ce-page-dsl.ui.h:6 ++msgid "Password used to authenticate with the PPPoE service." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:7 + #: ../src/connection-editor/ce-page-mobile.ui.h:4 + #: ../src/libnma/nma-vpn-password-dialog.c:97 + #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97 +@@ -1618,13 +1696,29 @@ msgstr "A_fficher le mot de passe" + msgid "_Password:" + msgstr "_Mot de passe :" + ++#: ../src/connection-editor/ce-page-dsl.ui.h:8 ++msgid "PPP _interface:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:9 ++msgid "P_arent interface:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:10 ++msgid "An arbitrary name to assign to the newly created PPP interface." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:11 ++msgid "The interface on which the PPP connection will be established." ++msgstr "" ++ + #: ../src/connection-editor/ce-page-ethernet.ui.h:1 + #: ../src/connection-editor/ce-page-ip4.ui.h:1 + #: ../src/connection-editor/ce-page-ip6.ui.h:1 +-#: ../src/connection-editor/ce-page-proxy.ui.h:3 ++#: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-wifi.ui.h:1 + #: ../src/connection-editor/page-ip4.c:131 +-#: ../src/connection-editor/page-ip6.c:136 ++#: ../src/connection-editor/page-ip6.c:142 + #: ../src/wireless-security/eap-method-peap.ui.h:1 + msgid "Automatic" + msgstr "Automatique" +@@ -1670,7 +1764,7 @@ msgid "Full" + msgstr "" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:12 +-#: ../src/connection-editor/page-ip6.c:149 ++#: ../src/connection-editor/page-ip6.c:155 + msgid "Ignore" + msgstr "Ignorer" + +@@ -1678,7 +1772,7 @@ msgstr "Ignorer" + #: ../src/connection-editor/ce-page-ip4.ui.h:3 + #: ../src/connection-editor/ce-page-ip6.ui.h:3 + #: ../src/connection-editor/page-ip4.c:168 +-#: ../src/connection-editor/page-ip6.c:185 ++#: ../src/connection-editor/page-ip6.c:191 + msgid "Manual" + msgstr "Manuel" + +@@ -1687,7 +1781,7 @@ msgid "_Port:" + msgstr "_Port :" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:15 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:2 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:6 + #: ../src/connection-editor/ce-page-wifi.ui.h:9 + #, fuzzy + msgid "_Device:" +@@ -1840,20 +1934,20 @@ msgstr "Adresses" + msgid "Address (optional)" + msgstr "" + +-#: ../src/connection-editor/ce-page-infiniband.ui.h:1 +-msgid "_Transport mode:" +-msgstr "Mode de _transport :" +- + #. IP-over-InfiniBand "datagram mode" +-#: ../src/connection-editor/ce-page-infiniband.ui.h:6 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:2 + msgid "Datagram" + msgstr "Datagramme" + + #. IP-over-InfiniBand "connected mode" +-#: ../src/connection-editor/ce-page-infiniband.ui.h:8 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:4 + msgid "Connected" + msgstr "Connecté" + ++#: ../src/connection-editor/ce-page-infiniband.ui.h:5 ++msgid "_Transport mode:" ++msgstr "Mode de _transport :" ++ + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1 + msgid "IPIP" + msgstr "" +@@ -1891,40 +1985,39 @@ msgid "VTI6" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10 +-#, fuzzy +-msgid "Device name" +-msgstr "Numéro + du nom du périphérique" ++#: ../src/connection-editor/ce-page-macsec.ui.h:6 ++msgid "Device name:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11 +-#, fuzzy +-msgid "Parent device" +-msgstr "Ethernet" ++#: ../src/connection-editor/ce-page-macsec.ui.h:8 ++msgid "Parent device:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12 +-#, fuzzy +-msgid "Mode" +-msgstr "_Mode :" ++#: ../src/connection-editor/ce-page-macsec.ui.h:16 ++msgid "Mode:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13 +-msgid "Local IP" ++msgid "Local IP:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14 +-msgid "Remote IP" ++msgid "Remote IP:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15 +-msgid "Input key" ++msgid "Input key:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16 +-msgid "Output key" ++msgid "Output key:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17 +-#, fuzzy +-msgid "MTU" +-msgstr "MT_U :" ++msgid "MTU:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip4.ui.h:2 + #: ../src/connection-editor/ce-page-ip6.ui.h:2 +@@ -1939,12 +2032,12 @@ msgstr "Lien-local" + #: ../src/connection-editor/ce-page-ip4.ui.h:5 + #: ../src/connection-editor/ce-page-ip6.ui.h:5 + #: ../src/connection-editor/page-ip4.c:188 +-#: ../src/connection-editor/page-ip6.c:205 ++#: ../src/connection-editor/page-ip6.c:211 + msgid "Shared to other computers" + msgstr "Partagé avec d'autres ordinateurs" + + #: ../src/connection-editor/ce-page-ip4.ui.h:6 +-#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++#: ../src/connection-editor/ce-page-ip6.ui.h:11 + msgid "_Method:" + msgstr "_Méthode :" + +@@ -1960,7 +2053,7 @@ msgstr "" + "utiliser un identifiant de client DHCP, ajoutez-le ici." + + #: ../src/connection-editor/ce-page-ip4.ui.h:10 +-#: ../src/connection-editor/ce-page-ip6.ui.h:12 ++#: ../src/connection-editor/ce-page-ip6.ui.h:14 + msgid "" + "Domains used when resolving host names. Use commas to separate multiple " + "domains." +@@ -1973,16 +2066,16 @@ msgid "D_HCP client ID:" + msgstr "ID de client D_HCP :" + + #: ../src/connection-editor/ce-page-ip4.ui.h:12 +-#: ../src/connection-editor/ce-page-ip6.ui.h:13 ++#: ../src/connection-editor/ce-page-ip6.ui.h:15 + #: ../src/connection-editor/page-ip4.c:372 +-#: ../src/connection-editor/page-ip6.c:335 ++#: ../src/connection-editor/page-ip6.c:346 + msgid "S_earch domains:" + msgstr "Do_maines de recherche :" + + #: ../src/connection-editor/ce-page-ip4.ui.h:13 +-#: ../src/connection-editor/ce-page-ip6.ui.h:14 ++#: ../src/connection-editor/ce-page-ip6.ui.h:16 + #: ../src/connection-editor/page-ip4.c:363 +-#: ../src/connection-editor/page-ip6.c:326 ++#: ../src/connection-editor/page-ip6.c:337 + msgid "DNS ser_vers:" + msgstr "Ser_veurs DNS :" + +@@ -2008,11 +2101,12 @@ msgstr "" + "configuration IPv4 échoue." + + #: ../src/connection-editor/ce-page-ip4.ui.h:17 +-#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++#: ../src/connection-editor/ce-page-ip6.ui.h:22 + msgid "_Routes…" + msgstr "_Routes…" + + #: ../src/connection-editor/ce-page-ip6.ui.h:6 ++#: ../src/connection-editor/ce-page-macsec.ui.h:3 + #: ../src/connection-editor/page-ip4.c:198 + msgid "Disabled" + msgstr "Désactivé" +@@ -2025,7 +2119,15 @@ msgstr "Activé (adresse publique préférée)" + msgid "Enabled (prefer temporary address)" + msgstr "Activé (adresse temporaire préférée)" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:15 ++#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++msgid "EUI64" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++msgid "Stable privacy" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:17 + msgid "" + "IP addresses of domain name servers used to resolve host names. Use commas " + "to separate multiple domain name server addresses. Link-local addresses will " +@@ -2035,15 +2137,19 @@ msgstr "" + "Utilisez des virgules pour séparer plusieurs adresses DNS. Les adresses de " + "lien local seront automatiquement liées à l'interface de connexion." + +-#: ../src/connection-editor/ce-page-ip6.ui.h:16 ++#: ../src/connection-editor/ce-page-ip6.ui.h:18 + msgid "IPv6 _privacy extensions:" + msgstr "Extensions de confidentialité IPv6 :" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:17 ++#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++msgid "IPv6 address _generation mode:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:20 + msgid "Require IPv_6 addressing for this connection to complete" + msgstr "Requiert un adressage IPv_6 pour que cette connexion fonctionne" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:18 ++#: ../src/connection-editor/ce-page-ip6.ui.h:21 + msgid "" + "When connecting to IPv4-capable networks, allows the connection to complete " + "if IPv6 configuration fails but IPv4 configuration succeeds." +@@ -2052,6 +2158,94 @@ msgstr "" + "de fonctionner lorsque la configuration IPv4 est réussie, même si la " + "configuration IPv6 échoue." + ++#: ../src/connection-editor/ce-page-macsec.ui.h:1 ++msgid "PSK" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:2 ++#: ../src/connection-editor/page-ppp.c:129 ++msgid "EAP" ++msgstr "EAP" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:4 ++msgid "Check" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:5 ++msgid "Strict" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:7 ++msgid "The name of the MACsec device." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:9 ++msgid "" ++"The parent interface name or parent connection UUID from which this MACSEC " ++"interface should be created." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:10 ++msgid "" ++"The parent interface name or parent connection UUID from which this MACsec " ++"interface should be created" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:11 ++msgid " The pre-shared Connectivity-association Key Name" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:12 ++msgid "The pre-shared Connectivity Association Key" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:13 ++msgid "" ++"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key " ++"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X " ++"security page" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:14 ++msgid "CKN:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:15 ++msgid "CAK:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:17 ++msgid "Keys:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:18 ++msgid "Parameters:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:19 ++msgid "Validation:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:20 ++msgid "SCI port:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:21 ++msgid "Specifies the validation mode for incoming frames" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:22 ++msgid "Encrypt" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:23 ++msgid "Whether the transmitted traffic must be encrypted" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:24 ++msgid "The port component of the SCI (Secure Channel Identifier)" ++msgstr "" ++ + #: ../src/connection-editor/ce-page-mobile.ui.h:1 + #: ../src/connection-editor/ce-page-team.ui.h:26 + msgid "Basic" +@@ -2140,41 +2334,41 @@ msgid "Send PPP _echo packets" + msgstr "Envoyer les pa_quets d'écho PPP" + + #: ../src/connection-editor/ce-page-proxy.ui.h:1 +-#, fuzzy +-msgid "Method:" +-msgstr "_Méthode :" +- +-#: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-team.ui.h:25 + #, fuzzy + msgid "None" + msgstr "Aucune" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:4 ++#: ../src/connection-editor/ce-page-proxy.ui.h:3 + msgid "For browser only" + msgstr "" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:5 ++#: ../src/connection-editor/ce-page-proxy.ui.h:4 + msgid "Use this proxy configuration for only browser clients/schemes." + msgstr "" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:6 ++#: ../src/connection-editor/ce-page-proxy.ui.h:5 + msgid "PAC URL:" + msgstr "" + ++#: ../src/connection-editor/ce-page-proxy.ui.h:6 ++msgid "PAC script:" ++msgstr "" ++ + #: ../src/connection-editor/ce-page-proxy.ui.h:7 + msgid "URL from where the PAC script is to be obtained." + msgstr "" + + #: ../src/connection-editor/ce-page-proxy.ui.h:8 +-msgid "PAC script:" +-msgstr "" +- +-#: ../src/connection-editor/ce-page-proxy.ui.h:9 + #, fuzzy + msgid "Import script from a file…" + msgstr "_Importer une configuration en équipe à partir d'un fichier..." + ++#: ../src/connection-editor/ce-page-proxy.ui.h:9 ++#, fuzzy ++msgid "Method:" ++msgstr "_Méthode :" ++ + #: ../src/connection-editor/ce-page-team-port.ui.h:1 + #: ../src/connection-editor/ce-page-team.ui.h:19 + #, fuzzy +@@ -2222,76 +2416,76 @@ msgid "ID of queue which this port should be mapped to." + msgstr "" + + #: ../src/connection-editor/ce-page-team-port.ui.h:10 ++msgid "Active-Backup runner options" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-team-port.ui.h:11 + #, fuzzy + msgid "_Port priority:" + msgstr "_Priorité :" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:11 +-msgid "Port _sticky" +-msgstr "" +- + #: ../src/connection-editor/ce-page-team-port.ui.h:12 +-#: ../src/connection-editor/ce-page-team.ui.h:82 +-msgid "" +-"Validate received ARP packets on active ports. If this is not checked, all " +-"incoming ARP packets will be considered as a good reply." +-msgstr "" +- +-#: ../src/connection-editor/ce-page-team-port.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:44 + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " + "bursts of notify-peer packets." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:14 ++#: ../src/connection-editor/ce-page-team-port.ui.h:13 + msgid "Port priority. The higher number means higher priority." + msgstr "" + ++#: ../src/connection-editor/ce-page-team-port.ui.h:14 ++msgid "Port _sticky" ++msgstr "" ++ + #: ../src/connection-editor/ce-page-team-port.ui.h:15 +-msgid "Active-Backup runner options" ++#: ../src/connection-editor/ce-page-team.ui.h:82 ++msgid "" ++"Validate received ARP packets on active ports. If this is not checked, all " ++"incoming ARP packets will be considered as a good reply." + msgstr "" + + #: ../src/connection-editor/ce-page-team-port.ui.h:16 ++msgid "LACP runner options" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-team-port.ui.h:17 + #, fuzzy + msgid "_LACP port priority:" + msgstr "_Priorité :" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:17 ++#: ../src/connection-editor/ce-page-team-port.ui.h:18 + #, fuzzy + msgid "LACP port _key:" + msgstr "_Clé privée :" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:18 ++#: ../src/connection-editor/ce-page-team-port.ui.h:19 + #: ../src/connection-editor/ce-page-team.ui.h:43 + msgid "" + "Number of bursts of multicast group rejoin requests sent after port is " + "enabled or disabled." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:19 ++#: ../src/connection-editor/ce-page-team-port.ui.h:20 + msgid "" + "Port priority according to LACP standard. The lower number means higher " + "priority." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:20 ++#: ../src/connection-editor/ce-page-team-port.ui.h:21 + #: ../src/connection-editor/ce-page-team.ui.h:45 + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " + "bursts of multicast group rejoin requests." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:21 ++#: ../src/connection-editor/ce-page-team-port.ui.h:22 + msgid "" + "Port key according to LACP standard. It is only possible to aggregate ports " + "with the same key." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:22 +-msgid "LACP runner options" +-msgstr "" +- + #: ../src/connection-editor/ce-page-team-port.ui.h:24 + #: ../src/connection-editor/ce-page-team.ui.h:70 + msgid "_Link watcher:" +@@ -2484,14 +2678,14 @@ msgid "LACP" + msgstr "" + + #: ../src/connection-editor/ce-page-team.ui.h:27 +-#: ../src/connection-editor/connection-helpers.c:104 ++#: ../src/connection-editor/connection-helpers.c:105 + #: ../src/connection-editor/page-ethernet.c:351 + #: ../src/libnm-gtk/nm-ui-utils.c:321 + msgid "Ethernet" + msgstr "Ethernet" + + #: ../src/connection-editor/ce-page-team.ui.h:28 +-#: ../src/connection-editor/connection-helpers.c:119 ++#: ../src/connection-editor/connection-helpers.c:120 + #: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339 + #: ../src/libnm-gtk/nm-ui-utils.c:583 + msgid "VLAN" +@@ -2753,6 +2947,7 @@ msgstr "Ban_de :" + msgid "SS_ID:" + msgstr "SS_ID :" + ++#: ../src/connection-editor/ce-polkit.c:63 + #: ../src/connection-editor/ce-polkit-button.c:74 + msgid "No polkit authorization to perform the action" + msgstr "" +@@ -2811,58 +3006,63 @@ msgstr "" + "charge toutes les méthodes d'authentification. Si la connexion échoue, " + "essayez d'en désactiver certaines." + +-#: ../src/connection-editor/connection-helpers.c:105 ++#: ../src/connection-editor/connection-helpers.c:106 + #: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323 + msgid "Wi-Fi" + msgstr "Wi-Fi" + +-#: ../src/connection-editor/connection-helpers.c:113 ++#: ../src/connection-editor/connection-helpers.c:114 + #: ../src/connection-editor/page-bluetooth.c:123 + #: ../src/libnm-gtk/nm-ui-utils.c:325 + msgid "Bluetooth" + msgstr "Bluetooth" + +-#: ../src/connection-editor/connection-helpers.c:114 +-#: ../src/connection-editor/page-dsl.c:127 +-msgid "DSL" +-msgstr "DSL" +- + #: ../src/connection-editor/connection-helpers.c:115 ++#: ../src/connection-editor/page-dsl.c:201 ++msgid "DSL/PPPoE" ++msgstr "" ++ ++#: ../src/connection-editor/connection-helpers.c:116 + #: ../src/connection-editor/page-infiniband.c:148 + #: ../src/libnm-gtk/nm-ui-utils.c:331 + msgid "InfiniBand" + msgstr "InfiniBand" + +-#: ../src/connection-editor/connection-helpers.c:116 ++#: ../src/connection-editor/connection-helpers.c:117 + #: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333 + #: ../src/libnm-gtk/nm-ui-utils.c:577 + msgid "Bond" + msgstr "Lien" + +-#: ../src/connection-editor/connection-helpers.c:117 +-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335 ++#: ../src/connection-editor/connection-helpers.c:118 ++#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335 + #: ../src/libnm-gtk/nm-ui-utils.c:579 + msgid "Team" + msgstr "En équipe" + +-#: ../src/connection-editor/connection-helpers.c:118 +-#: ../src/connection-editor/page-bridge.c:212 ++#: ../src/connection-editor/connection-helpers.c:119 ++#: ../src/connection-editor/page-bridge.c:233 + #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581 + msgid "Bridge" + msgstr "Pont" + +-#: ../src/connection-editor/connection-helpers.c:120 ++#: ../src/connection-editor/connection-helpers.c:121 + #: ../src/connection-editor/page-ip-tunnel.c:176 + msgid "IP tunnel" + msgstr "" + + #: ../src/connection-editor/connection-helpers.c:122 +-#: ../src/connection-editor/connection-helpers.c:396 ++#: ../src/connection-editor/page-macsec.c:190 ++msgid "MACsec" ++msgstr "" ++ ++#: ../src/connection-editor/connection-helpers.c:124 ++#: ../src/connection-editor/connection-helpers.c:398 + #: ../src/connection-editor/page-vpn.c:96 + msgid "VPN" + msgstr "VPN" + +-#: ../src/connection-editor/connection-helpers.c:205 ++#: ../src/connection-editor/connection-helpers.c:207 + msgid "" + "The VPN plugin failed to import the VPN connection correctly\n" + "\n" +@@ -2872,11 +3072,11 @@ msgstr "" + "\n" + "Erreur : aucun type de service VPN." + +-#: ../src/connection-editor/connection-helpers.c:217 ++#: ../src/connection-editor/connection-helpers.c:219 + msgid "Cannot import VPN connection" + msgstr "Impossible d'importer la connexion VPN" + +-#: ../src/connection-editor/connection-helpers.c:219 ++#: ../src/connection-editor/connection-helpers.c:221 + #, fuzzy, c-format + msgid "" + "The file “%s” could not be read or does not contain recognized VPN " +@@ -2889,33 +3089,40 @@ msgstr "" + "\n" + "Erreur : %s." + +-#: ../src/connection-editor/connection-helpers.c:220 ++#: ../src/connection-editor/connection-helpers.c:222 + #, fuzzy + msgid "unknown error" + msgstr "Erreur inconnue" + +-#: ../src/connection-editor/connection-helpers.c:303 ++#: ../src/connection-editor/connection-helpers.c:305 + #: ../src/connection-editor/page-proxy.c:118 + #: ../src/connection-editor/page-team.c:341 + #: ../src/connection-editor/page-team-port.c:203 + msgid "Select file to import" + msgstr "Sélectionnez le fichier à importer" + +-#: ../src/connection-editor/connection-helpers.c:338 ++#: ../src/connection-editor/connection-helpers.c:309 ++#: ../src/connection-editor/page-proxy.c:122 ++#: ../src/connection-editor/page-team.c:345 ++#: ../src/connection-editor/page-team-port.c:207 ++msgid "_Open" ++msgstr "" ++ ++#: ../src/connection-editor/connection-helpers.c:340 + msgid "Hardware" + msgstr "Matériel" + +-#: ../src/connection-editor/connection-helpers.c:365 ++#: ../src/connection-editor/connection-helpers.c:367 + msgid "Virtual" + msgstr "Virtuel" + +-#: ../src/connection-editor/connection-helpers.c:514 + #: ../src/connection-editor/connection-helpers.c:516 ++#: ../src/connection-editor/connection-helpers.c:518 + #, fuzzy + msgid "Import a saved VPN configuration…" + msgstr "Importer une configuration VPN enregistrée..." + +-#: ../src/connection-editor/connection-helpers.c:546 ++#: ../src/connection-editor/connection-helpers.c:548 + msgid "" + "The connection editor dialog could not be initialized due to an unknown " + "error." +@@ -2923,15 +3130,15 @@ msgstr "" + "La fenêtre d'édition de connexion n'a pas pu être initialisée en raison " + "d'une erreur inconnue." + +-#: ../src/connection-editor/connection-helpers.c:555 ++#: ../src/connection-editor/connection-helpers.c:557 + msgid "Could not create new connection" + msgstr "Impossible de créer une nouvelle connexion" + +-#: ../src/connection-editor/connection-helpers.c:718 ++#: ../src/connection-editor/connection-helpers.c:720 + msgid "Connection delete failed" + msgstr "La suppression de la connexion a échoué" + +-#: ../src/connection-editor/connection-helpers.c:766 ++#: ../src/connection-editor/connection-helpers.c:768 + #, c-format + msgid "Are you sure you wish to delete the connection %s?" + msgstr "Voulez-vous vraiment supprimer la connexion %s ?" +@@ -2939,7 +3146,7 @@ msgstr "Voulez-vous vraiment supprimer la connexion %s ?" + #: ../src/connection-editor/ip4-routes-dialog.c:697 + #: ../src/connection-editor/ip6-routes-dialog.c:718 + #: ../src/connection-editor/page-ip4.c:1136 +-#: ../src/connection-editor/page-ip6.c:1095 ++#: ../src/connection-editor/page-ip6.c:1118 + msgid "Address" + msgstr "Adresse" + +@@ -2951,7 +3158,7 @@ msgstr "Masque de réseau" + #: ../src/connection-editor/ip4-routes-dialog.c:735 + #: ../src/connection-editor/ip6-routes-dialog.c:756 + #: ../src/connection-editor/page-ip4.c:1174 +-#: ../src/connection-editor/page-ip6.c:1133 ++#: ../src/connection-editor/page-ip6.c:1156 + msgid "Gateway" + msgstr "Passerelle" + +@@ -2961,41 +3168,41 @@ msgid "Metric" + msgstr "Métrique" + + #: ../src/connection-editor/ip6-routes-dialog.c:737 +-#: ../src/connection-editor/page-ip6.c:1114 ++#: ../src/connection-editor/page-ip6.c:1137 + msgid "Prefix" + msgstr "Préfixe" + +-#: ../src/connection-editor/nm-connection-editor.c:108 ++#: ../src/connection-editor/nm-connection-editor.c:109 + #, c-format + msgid "Editing %s" + msgstr "Modification de %s" + +-#: ../src/connection-editor/nm-connection-editor.c:112 ++#: ../src/connection-editor/nm-connection-editor.c:113 + msgid "Editing un-named connection" + msgstr "Modification de la connexion anonyme" + +-#: ../src/connection-editor/nm-connection-editor.c:132 ++#: ../src/connection-editor/nm-connection-editor.c:133 + #, fuzzy + msgid "Missing connection name" + msgstr "_Nom de la connexion :" + +-#: ../src/connection-editor/nm-connection-editor.c:352 ++#: ../src/connection-editor/nm-connection-editor.c:353 + #, fuzzy + msgid "Editor initializing…" + msgstr "Erreur lors de l'initialisation de l'éditeur" + +-#: ../src/connection-editor/nm-connection-editor.c:359 +-#: ../src/connection-editor/nm-connection-list.c:408 ++#: ../src/connection-editor/nm-connection-editor.c:360 ++#: ../src/connection-editor/nm-connection-list.c:443 + #, fuzzy + msgid "Connection cannot be modified" + msgstr "L'ajout de la connexion a échoué" + +-#: ../src/connection-editor/nm-connection-editor.c:374 ++#: ../src/connection-editor/nm-connection-editor.c:375 + #, c-format + msgid "Invalid setting %s: %s" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.c:450 ++#: ../src/connection-editor/nm-connection-editor.c:451 + msgid "" + "The connection editor could not find some required resources (the .ui file " + "was not found)." +@@ -3003,56 +3210,53 @@ msgstr "" + "L'éditeur de connexion n'a pas pu trouver les ressources requises (le " + "fichier .ui n'a pas été trouvé)." + +-#: ../src/connection-editor/nm-connection-editor.c:577 ++#: ../src/connection-editor/nm-connection-editor.c:578 ++#: ../src/connection-editor/vpn-helpers.c:213 + msgid "_Save" + msgstr "_Enregistrer" + +-#: ../src/connection-editor/nm-connection-editor.c:578 ++#: ../src/connection-editor/nm-connection-editor.c:579 + msgid "Save any changes made to this connection." + msgstr "Enregistrer toute modification apportée à cette connexion." + +-#: ../src/connection-editor/nm-connection-editor.c:579 ++#: ../src/connection-editor/nm-connection-editor.c:580 + msgid "Authenticate to save this connection for all users of this machine." + msgstr "" + "S'authentifier pour enregistrer cette connexion pour tous les utilisateurs " + "de cet ordinateur." + +-#: ../src/connection-editor/nm-connection-editor.c:595 ++#: ../src/connection-editor/nm-connection-editor.c:596 + msgid "Could not create connection" + msgstr "Impossible de créer une connexion" + +-#: ../src/connection-editor/nm-connection-editor.c:595 ++#: ../src/connection-editor/nm-connection-editor.c:596 + msgid "Could not edit connection" + msgstr "Impossible de modifier la connexion" + +-#: ../src/connection-editor/nm-connection-editor.c:597 ++#: ../src/connection-editor/nm-connection-editor.c:598 + msgid "Unknown error creating connection editor dialog." + msgstr "" + "Erreur inconnue lors de la création de la fenêtre d'édition de connexion." + +-#: ../src/connection-editor/nm-connection-editor.c:738 ++#: ../src/connection-editor/nm-connection-editor.c:739 + msgid "" + "Warning: the connection contains some properties not supported by the " + "editor. They will be cleared upon save." + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.c:758 ++#: ../src/connection-editor/nm-connection-editor.c:759 + msgid "Error initializing editor" + msgstr "Erreur lors de l'initialisation de l'éditeur" + +-#: ../src/connection-editor/nm-connection-editor.c:1142 ++#: ../src/connection-editor/nm-connection-editor.c:1157 + msgid "Connection add failed" + msgstr "L'ajout de la connexion a échoué" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2 +-msgid "_Close" +-msgstr "" +- +-#: ../src/connection-editor/nm-connection-editor.ui.h:4 ++#: ../src/connection-editor/nm-connection-editor.ui.h:1 + msgid "Fix" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:5 ++#: ../src/connection-editor/nm-connection-editor.ui.h:2 + #, fuzzy + msgid "" + "Security labels may prevent some files from being used with certificate " +@@ -3061,139 +3265,155 @@ msgstr "" + "Définir ce paramètre à vrai (true) pour désactiver les avertissements à " + "propos des certificats CA dans l'authentification EAP." + +-#: ../src/connection-editor/nm-connection-editor.ui.h:6 ++#: ../src/connection-editor/nm-connection-editor.ui.h:3 + msgid "Connection _name:" + msgstr "_Nom de la connexion :" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:7 ++#: ../src/connection-editor/nm-connection-editor.ui.h:4 + #, fuzzy + msgid "_Export…" + msgstr "_Exporter..." + +-#: ../src/connection-editor/nm-connection-editor.ui.h:9 ++#: ../src/connection-editor/nm-connection-editor.ui.h:6 + msgid "File Relabel" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:10 ++#: ../src/connection-editor/nm-connection-editor.ui.h:7 + msgid "_Relabel" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:11 ++#: ../src/connection-editor/nm-connection-editor.ui.h:8 + msgid "" + "The following files are not labelled for use with certificate " + "authentication. Do you wish to adjust the labels?" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:12 ++#: ../src/connection-editor/nm-connection-editor.ui.h:9 + msgid "Relabel" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:13 ++#: ../src/connection-editor/nm-connection-editor.ui.h:10 + msgid "Filename" + msgstr "" + +-#: ../src/connection-editor/nm-connection-list.c:127 ++#: ../src/connection-editor/nm-connection-list.c:151 + msgid "never" + msgstr "jamais" + +-#: ../src/connection-editor/nm-connection-list.c:138 +-#: ../src/connection-editor/nm-connection-list.c:149 ++#: ../src/connection-editor/nm-connection-list.c:162 ++#: ../src/connection-editor/nm-connection-list.c:173 + msgid "now" + msgstr "maintenant" + + #. less than an hour ago +-#: ../src/connection-editor/nm-connection-list.c:156 ++#: ../src/connection-editor/nm-connection-list.c:180 + #, c-format + msgid "%d minute ago" + msgid_plural "%d minutes ago" + msgstr[0] "il y a %d minute" + msgstr[1] "il y a %d minutes" + +-#: ../src/connection-editor/nm-connection-list.c:160 ++#: ../src/connection-editor/nm-connection-list.c:184 + #, c-format + msgid "%d hour ago" + msgid_plural "%d hours ago" + msgstr[0] "il y a %d heure" + msgstr[1] "il y a %d heures" + +-#: ../src/connection-editor/nm-connection-list.c:172 ++#: ../src/connection-editor/nm-connection-list.c:196 + #, c-format + msgid "%d day ago" + msgid_plural "%d days ago" + msgstr[0] "il y a %d jour" + msgstr[1] "il y a %d jours" + +-#: ../src/connection-editor/nm-connection-list.c:178 ++#: ../src/connection-editor/nm-connection-list.c:202 + #, c-format + msgid "%d month ago" + msgid_plural "%d months ago" + msgstr[0] "il y a %d mois" + msgstr[1] "il y a %d mois" + +-#: ../src/connection-editor/nm-connection-list.c:182 ++#: ../src/connection-editor/nm-connection-list.c:206 + #, c-format + msgid "%d year ago" + msgid_plural "%d years ago" + msgstr[0] "il y a %d an" + msgstr[1] "il y a %d ans" + +-#: ../src/connection-editor/nm-connection-list.c:635 ++#: ../src/connection-editor/nm-connection-list.c:445 ++msgid "Connection cannot be deleted" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:448 ++msgid "Select a connection to edit" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:450 ++msgid "Select a connection to delete" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:785 + #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2 + msgid "Name" + msgstr "Nom" + +-#: ../src/connection-editor/nm-connection-list.c:648 ++#: ../src/connection-editor/nm-connection-list.c:798 + msgid "Last Used" + msgstr "Dernière utilisation" + +-#: ../src/connection-editor/nm-connection-list.c:696 ++#: ../src/connection-editor/nm-connection-list.c:836 + msgid "Edit the selected connection" + msgstr "Modifie la connexion sélectionnée" + +-#: ../src/connection-editor/nm-connection-list.c:697 ++#: ../src/connection-editor/nm-connection-list.c:837 + msgid "Authenticate to edit the selected connection" + msgstr "S'authentifier pour modifier la connexion sélectionnée" + +-#: ../src/connection-editor/nm-connection-list.c:712 ++#: ../src/connection-editor/nm-connection-list.c:842 + msgid "Delete the selected connection" + msgstr "Supprime la connexion sélectionnée" + +-#: ../src/connection-editor/nm-connection-list.c:713 ++#: ../src/connection-editor/nm-connection-list.c:843 + msgid "Authenticate to delete the selected connection" + msgstr "S'authentifier pour supprimer la connexion sélectionnée" + +-#: ../src/connection-editor/nm-connection-list.c:935 +-#: ../src/connection-editor/nm-connection-list.c:938 ++#: ../src/connection-editor/nm-connection-list.c:1048 ++#: ../src/connection-editor/nm-connection-list.c:1051 + msgid "Error creating connection" + msgstr "Erreur lors de la création de la connexion" + +-#: ../src/connection-editor/nm-connection-list.c:936 ++#: ../src/connection-editor/nm-connection-list.c:1049 + msgid "No VPN plugins are installed." + msgstr "Aucun greffon VPN n'est installé." + +-#: ../src/connection-editor/nm-connection-list.c:939 ++#: ../src/connection-editor/nm-connection-list.c:1052 + #, fuzzy, c-format + msgid "Don’t know how to create “%s” connections" + msgstr "La méthode pour créer des connexions « %s » est inconnue" + +-#: ../src/connection-editor/nm-connection-list.c:970 ++#: ../src/connection-editor/nm-connection-list.c:1085 + msgid "Error editing connection" + msgstr "Erreur lors de la modification de la connexion" + +-#: ../src/connection-editor/nm-connection-list.c:971 ++#: ../src/connection-editor/nm-connection-list.c:1086 + #, fuzzy, c-format + msgid "Did not find a connection with UUID “%s”" + msgstr "La connexion avec l'UUID « %s » n'a pas été trouvée" + +-#: ../src/connection-editor/page-8021x-security.c:109 ++#: ../src/connection-editor/nm-connection-list.ui.h:2 ++msgid "Add a new connection" ++msgstr "" ++ ++#: ../src/connection-editor/page-8021x-security.c:116 + msgid "802.1X Security" + msgstr "Sécurité 802.1X" + +-#: ../src/connection-editor/page-8021x-security.c:111 ++#: ../src/connection-editor/page-8021x-security.c:118 + msgid "Could not load 802.1X Security user interface." + msgstr "Impossible de charger l'interface utilisateur de sécurité 802.1X." + +-#: ../src/connection-editor/page-8021x-security.c:125 ++#: ../src/connection-editor/page-8021x-security.c:132 + msgid "Use 802.1_X security for this connection" + msgstr "Utiliser la sécurité 802.1_X pour cette connexion" + +@@ -3249,11 +3469,11 @@ msgstr "_Principal :" + msgid "Bond connection %d" + msgstr "Connexion lien %d" + +-#: ../src/connection-editor/page-bridge.c:215 ++#: ../src/connection-editor/page-bridge.c:236 + msgid "Could not load bridge user interface." + msgstr "Impossible de charger l'interface utilisateur du pont." + +-#: ../src/connection-editor/page-bridge.c:317 ++#: ../src/connection-editor/page-bridge.c:352 + #, c-format + msgid "Bridge connection %d" + msgstr "Connexion pont %d" +@@ -3277,11 +3497,15 @@ msgstr "DCB" + msgid "Could not load DCB user interface." + msgstr "Impossible de charger l'interface utilisateur DCB." + +-#: ../src/connection-editor/page-dsl.c:129 ++#: ../src/connection-editor/page-dsl.c:203 + msgid "Could not load DSL user interface." + msgstr "Impossible de charger l'interface utilisateur DSL." + +-#: ../src/connection-editor/page-dsl.c:219 ++#: ../src/connection-editor/page-dsl.c:298 ++msgid "missing parent interface" ++msgstr "" ++ ++#: ../src/connection-editor/page-dsl.c:343 + #, c-format + msgid "DSL connection %d" + msgstr "Connexion DSL %d" +@@ -3383,27 +3607,27 @@ msgid "IP tunnel connection %d" + msgstr "Connexion Ethernet %d" + + #: ../src/connection-editor/page-ip4.c:127 +-#: ../src/connection-editor/page-ip6.c:130 ++#: ../src/connection-editor/page-ip6.c:136 + msgid "Automatic (VPN)" + msgstr "Automatique (VPN)" + + #: ../src/connection-editor/page-ip4.c:128 +-#: ../src/connection-editor/page-ip6.c:131 ++#: ../src/connection-editor/page-ip6.c:137 + msgid "Automatic (VPN) addresses only" + msgstr "Adresses automatiques uniquement (VPN)" + + #: ../src/connection-editor/page-ip4.c:132 +-#: ../src/connection-editor/page-ip6.c:137 ++#: ../src/connection-editor/page-ip6.c:143 + msgid "Automatic, addresses only" + msgstr "Automatique, adresses uniquement" + + #: ../src/connection-editor/page-ip4.c:134 +-#: ../src/connection-editor/page-ip6.c:133 ++#: ../src/connection-editor/page-ip6.c:139 + msgid "Automatic (PPPoE)" + msgstr "Automatique (PPPoE)" + + #: ../src/connection-editor/page-ip4.c:135 +-#: ../src/connection-editor/page-ip6.c:134 ++#: ../src/connection-editor/page-ip6.c:140 + msgid "Automatic (PPPoE) addresses only" + msgstr "Adresses automatiques uniquement (PPPoE)" + +@@ -3416,17 +3640,17 @@ msgid "Automatic (DHCP) addresses only" + msgstr "Adresses automatiques uniquement (DHCP)" + + #: ../src/connection-editor/page-ip4.c:181 +-#: ../src/connection-editor/page-ip6.c:198 ++#: ../src/connection-editor/page-ip6.c:204 + msgid "Link-Local Only" + msgstr "Lien-local uniquement" + + #: ../src/connection-editor/page-ip4.c:361 +-#: ../src/connection-editor/page-ip6.c:324 ++#: ../src/connection-editor/page-ip6.c:335 + msgid "Additional DNS ser_vers:" + msgstr "Ser_veurs DNS supplémentaires :" + + #: ../src/connection-editor/page-ip4.c:370 +-#: ../src/connection-editor/page-ip6.c:333 ++#: ../src/connection-editor/page-ip6.c:344 + msgid "Additional s_earch domains:" + msgstr "Do_maines de recherche supplémentaires :" + +@@ -3463,43 +3687,52 @@ msgstr "" + msgid "IPv4 DNS server “%s” invalid" + msgstr "" + +-#: ../src/connection-editor/page-ip6.c:173 ++#: ../src/connection-editor/page-ip6.c:179 + msgid "Automatic, DHCP only" + msgstr "Automatique, DHCP uniquement" + +-#: ../src/connection-editor/page-ip6.c:993 ++#: ../src/connection-editor/page-ip6.c:1016 + #, c-format + msgid "Editing IPv6 routes for %s" + msgstr "Modification des routes IPv6 pour %s" + +-#: ../src/connection-editor/page-ip6.c:1184 ++#: ../src/connection-editor/page-ip6.c:1208 + msgid "IPv6 Settings" + msgstr "Paramètres IPv6" + +-#: ../src/connection-editor/page-ip6.c:1186 ++#: ../src/connection-editor/page-ip6.c:1210 + msgid "Could not load IPv6 user interface." + msgstr "Impossible de charger l'interface utilisateur IPv6." + +-#: ../src/connection-editor/page-ip6.c:1277 ++#: ../src/connection-editor/page-ip6.c:1302 + #, c-format + msgid "IPv6 address “%s” invalid" + msgstr "" + +-#: ../src/connection-editor/page-ip6.c:1285 ++#: ../src/connection-editor/page-ip6.c:1310 + #, c-format + msgid "IPv6 prefix “%s” invalid" + msgstr "" + +-#: ../src/connection-editor/page-ip6.c:1294 ++#: ../src/connection-editor/page-ip6.c:1319 + #, c-format + msgid "IPv6 gateway “%s” invalid" + msgstr "" + +-#: ../src/connection-editor/page-ip6.c:1336 ++#: ../src/connection-editor/page-ip6.c:1361 + #, c-format + msgid "IPv6 DNS server “%s” invalid" + msgstr "" + ++#: ../src/connection-editor/page-macsec.c:192 ++msgid "Could not load MACsec user interface." ++msgstr "" ++ ++#: ../src/connection-editor/page-macsec.c:331 ++#, c-format ++msgid "MACSEC connection %d" ++msgstr "" ++ + #: ../src/connection-editor/page-master.c:247 + #: ../src/connection-editor/page-master.c:258 + msgid "Duplicate slaves" +@@ -3561,38 +3794,34 @@ msgstr "" + "Mon fournisseur utilise une technologie de type C_DMA (1xRTT, EVOD, etc.)" + + #: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50 +-#: ../src/mobile-helpers.c:283 ++#: ../src/mobile-helpers.c:282 + msgid "CDMA" + msgstr "CDMA" + + #: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54 +-#: ../src/mobile-helpers.c:281 ++#: ../src/mobile-helpers.c:280 + msgid "GSM" + msgstr "GSM" + +-#: ../src/connection-editor/page-ppp.c:129 +-msgid "EAP" +-msgstr "EAP" +- + #: ../src/connection-editor/page-ppp.c:130 +-#: ../src/wireless-security/eap-method-ttls.c:260 ++#: ../src/wireless-security/eap-method-ttls.c:287 + msgid "PAP" + msgstr "PAP" + + #: ../src/connection-editor/page-ppp.c:131 +-#: ../src/wireless-security/eap-method-ttls.c:322 ++#: ../src/wireless-security/eap-method-ttls.c:349 + msgid "CHAP" + msgstr "CHAP" + + #: ../src/connection-editor/page-ppp.c:132 +-#: ../src/wireless-security/eap-method-fast.c:284 +-#: ../src/wireless-security/eap-method-peap.c:273 +-#: ../src/wireless-security/eap-method-ttls.c:290 ++#: ../src/wireless-security/eap-method-fast.c:282 ++#: ../src/wireless-security/eap-method-peap.c:299 ++#: ../src/wireless-security/eap-method-ttls.c:317 + msgid "MSCHAPv2" + msgstr "MSCHAPv2" + + #: ../src/connection-editor/page-ppp.c:133 +-#: ../src/wireless-security/eap-method-ttls.c:275 ++#: ../src/wireless-security/eap-method-ttls.c:302 + msgid "MSCHAP" + msgstr "MSCHAP" + +@@ -3629,11 +3858,11 @@ msgstr "Impossible de charger l'interface utilisateur du lien." + msgid "Error: file doesn’t contain a valid JSON configuration" + msgstr "Erreur : le fichier ne contient pas de configuration JSON valide" + +-#: ../src/connection-editor/page-team.c:1156 ++#: ../src/connection-editor/page-team.c:1034 + msgid "Could not load team user interface." + msgstr "Impossible de charger l'interface utilisateur en équipe." + +-#: ../src/connection-editor/page-team.c:1253 ++#: ../src/connection-editor/page-team.c:1131 + #, c-format + msgid "Team connection %d" + msgstr "Connexion en équipe %d" +@@ -3641,11 +3870,11 @@ msgstr "Connexion en équipe %d" + #. Translators: a "Team Port" is a network + #. * device that is part of a team. + #. +-#: ../src/connection-editor/page-team-port.c:732 ++#: ../src/connection-editor/page-team-port.c:655 + msgid "Team Port" + msgstr "Port d'équipe" + +-#: ../src/connection-editor/page-team-port.c:734 ++#: ../src/connection-editor/page-team-port.c:657 + msgid "Could not load team port user interface." + msgstr "Impossible de charger l'interface utilisateur du port d'équipe." + +@@ -3756,50 +3985,50 @@ msgstr "N'importe quel appareil" + msgid "Wi-Fi connection %d" + msgstr "Connexion Wi-Fi %d" + +-#: ../src/connection-editor/page-wifi-security.c:356 ++#: ../src/connection-editor/page-wifi-security.c:358 + #: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922 + msgid "WEP 40/128-bit Key (Hex or ASCII)" + msgstr "Clé WEP 40/128-bit (Hex ou ASCII)" + +-#: ../src/connection-editor/page-wifi-security.c:366 ++#: ../src/connection-editor/page-wifi-security.c:368 + #: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931 + msgid "WEP 128-bit Passphrase" + msgstr "WEP 128-bit à phrase secrète" + +-#: ../src/connection-editor/page-wifi-security.c:392 ++#: ../src/connection-editor/page-wifi-security.c:394 + msgid "Dynamic WEP (802.1X)" + msgstr "WEP dynamique (802.1X)" + +-#: ../src/connection-editor/page-wifi-security.c:405 ++#: ../src/connection-editor/page-wifi-security.c:407 + #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975 + msgid "WPA & WPA2 Personal" + msgstr "WPA et WPA2 personnel" + +-#: ../src/connection-editor/page-wifi-security.c:418 ++#: ../src/connection-editor/page-wifi-security.c:420 + #: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989 + msgid "WPA & WPA2 Enterprise" + msgstr "WPA et WPA2 entreprise" + +-#: ../src/connection-editor/page-wifi-security.c:461 ++#: ../src/connection-editor/page-wifi-security.c:463 + msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting." + msgstr "" + "Impossible de charger l'interface utilisateur de sécurité Wi-Fi ; paramètre " + "Wi-Fi manquant." + +-#: ../src/connection-editor/page-wifi-security.c:472 ++#: ../src/connection-editor/page-wifi-security.c:474 + msgid "Wi-Fi Security" + msgstr "Sécurité Wi-Fi" + +-#: ../src/connection-editor/page-wifi-security.c:474 ++#: ../src/connection-editor/page-wifi-security.c:476 + msgid "Could not load Wi-Fi security user interface." + msgstr "Impossible de charger l'interface utilisateur de sécurité Wi-Fi." + +-#: ../src/connection-editor/page-wifi-security.c:558 ++#: ../src/connection-editor/page-wifi-security.c:560 + #, c-format + msgid "missing SSID" + msgstr "" + +-#: ../src/connection-editor/page-wifi-security.c:564 ++#: ../src/connection-editor/page-wifi-security.c:566 + #, c-format + msgid "Security not compatible with Ad-Hoc mode" + msgstr "" +@@ -3852,35 +4081,39 @@ msgstr "Déverrouiller automatiquement ce périphérique" + msgid "Connection Information" + msgstr "Informations sur la connexion" + ++#: ../src/info.ui.h:2 ++msgid "_Close" ++msgstr "" ++ + #: ../src/info.ui.h:3 + msgid "Active Network Connections" + msgstr "Connexions réseau actives" + + #: ../src/libnma/nma-file-cert-chooser.c:108 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:146 + #, fuzzy + msgid "No certificate set" + msgstr "Aucun certificat de CA n'est _requis" + + #: ../src/libnma/nma-file-cert-chooser.c:126 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:170 + msgid "No key set" + msgstr "" + + #: ../src/libnma/nma-file-cert-chooser.c:246 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:370 + #, fuzzy, c-format + msgid "Choose a key for %s Certificate" + msgstr "Choisissez votre certificat personnel..." + + #: ../src/libnma/nma-file-cert-chooser.c:250 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:374 + #, fuzzy, c-format + msgid "%s private _key:" + msgstr "_Clé privée :" + + #: ../src/libnma/nma-file-cert-chooser.c:254 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:378 + #, fuzzy, c-format + msgid "%s key _password:" + msgstr "_Mot de passe de la clé privée :" +@@ -3891,7 +4124,7 @@ msgid "Choose %s Certificate" + msgstr "Choisissez votre certificat personnel..." + + #: ../src/libnma/nma-file-cert-chooser.c:262 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:386 + #, fuzzy, c-format + msgid "%s _certificate:" + msgstr "Certificat de l'_utilisateur :" +@@ -4102,47 +4335,47 @@ msgstr "Configuration d'une connexion mobile" + msgid "New Mobile Broadband Connection" + msgstr "Nouvelle connexion mobile" + +-#: ../src/libnma/nma-cert-chooser-button.c:162 ++#: ../src/libnma/nma-cert-chooser-button.c:165 + #, fuzzy + msgid "(None)" + msgstr "(aucun)" + +-#: ../src/libnma/nma-cert-chooser-button.c:170 ++#: ../src/libnma/nma-cert-chooser-button.c:173 + #, c-format + msgid "Key in %s" + msgstr "" + +-#: ../src/libnma/nma-cert-chooser-button.c:171 ++#: ../src/libnma/nma-cert-chooser-button.c:174 + #, fuzzy, c-format + msgid "Certificate in %s" + msgstr "Certificat du C_A :" + +-#: ../src/libnma/nma-cert-chooser-button.c:190 ++#: ../src/libnma/nma-cert-chooser-button.c:193 + #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183 + #, fuzzy + msgid "(Unknown)" + msgstr "Inconnue" + +-#: ../src/libnma/nma-cert-chooser-button.c:212 +-#: ../src/libnma/nma-cert-chooser-button.c:242 ++#: ../src/libnma/nma-cert-chooser-button.c:215 ++#: ../src/libnma/nma-cert-chooser-button.c:245 + msgid "Select" + msgstr "" + +-#: ../src/libnma/nma-cert-chooser-button.c:213 +-#: ../src/libnma/nma-cert-chooser-button.c:243 ++#: ../src/libnma/nma-cert-chooser-button.c:216 ++#: ../src/libnma/nma-cert-chooser-button.c:246 + msgid "Cancel" + msgstr "" + +-#: ../src/libnma/nma-cert-chooser-button.c:469 ++#: ../src/libnma/nma-cert-chooser-button.c:472 + msgid "Select from file…" + msgstr "" + +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:382 + #, fuzzy, c-format + msgid "Choose a %s Certificate" + msgstr "Choisissez votre certificat personnel..." + +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:390 + #, fuzzy, c-format + msgid "%s certificate _password:" + msgstr "Certificat de l'_utilisateur :" +@@ -4209,8 +4442,8 @@ msgstr "Mot de passe _secondaire :" + msgid "_Tertiary Password:" + msgstr "Mot de passe _secondaire :" + +-#: ../src/libnma/nma-vpn-password-dialog.c:247 +-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247 ++#: ../src/libnma/nma-vpn-password-dialog.c:238 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238 + msgid "Sh_ow passwords" + msgstr "A_fficher les mots de passe" + +@@ -4239,11 +4472,11 @@ msgstr "Aucune" + msgid "Dynamic WEP (802.1x)" + msgstr "WEP dynamique (802.1X)" + +-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075 ++#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071 + msgid "C_reate" + msgstr "C_réer" + +-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161 ++#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150 + #, fuzzy, c-format + msgid "" + "Passwords or encryption keys are required to access the Wi-Fi network “%s”." +@@ -4251,35 +4484,35 @@ msgstr "" + "Des mots de passe ou des clés de chiffrement sont nécessaires pour l'accès " + "au réseau Wi-Fi « %s »." + +-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163 ++#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152 + msgid "Wi-Fi Network Authentication Required" + msgstr "Authentification nécessaire pour le réseau Wi-Fi" + +-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165 ++#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154 + msgid "Authentication required by Wi-Fi network" + msgstr "Authentification demandée par le réseau Wi-Fi" + +-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170 ++#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159 + msgid "Create New Wi-Fi Network" + msgstr "Création d'un nouveau réseau Wi-Fi" + +-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172 ++#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161 + msgid "New Wi-Fi network" + msgstr "Nouveau réseau Wi-Fi" + +-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173 ++#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162 + msgid "Enter a name for the Wi-Fi network you wish to create." + msgstr "Saisissez le nom du réseau Wi-Fi que vous voulez créer." + +-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175 ++#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164 + msgid "Connect to Hidden Wi-Fi Network" + msgstr "Connexion au réseau Wi-Fi invisible" + +-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177 ++#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166 + msgid "Hidden Wi-Fi network" + msgstr "Réseau Wi-Fi invisible" + +-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178 ++#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167 + msgid "" + "Enter the name and security details of the hidden Wi-Fi network you wish to " + "connect to." +@@ -4433,25 +4666,25 @@ msgstr "Réseau itinérant (%s)" + msgid "Roaming network" + msgstr "Réseau itinérant" + +-#: ../src/mobile-helpers.c:331 ++#: ../src/mobile-helpers.c:330 + #, fuzzy, c-format + msgid "PIN code for SIM card “%s” on “%s”" + msgstr "Code PIN pour carte SIM « %s » sur « %s »" + +-#: ../src/mobile-helpers.c:464 ++#: ../src/mobile-helpers.c:463 + msgid "PIN code required" + msgstr "Code PIN requis" + +-#: ../src/mobile-helpers.c:472 ++#: ../src/mobile-helpers.c:471 + msgid "PIN code is needed for the mobile broadband device" + msgstr "Le code PIN est nécessaire pour la connexion mobile" + +-#: ../src/mobile-helpers.c:622 ++#: ../src/mobile-helpers.c:621 + #, fuzzy, c-format + msgid "Mobile broadband connection “%s” active: (%d%%%s%s)" + msgstr "Connexion mobile « %s » active : (%d %%%s%s)" + +-#: ../src/mobile-helpers.c:625 ++#: ../src/mobile-helpers.c:624 + msgid "roaming" + msgstr "itinérance" + +@@ -4461,12 +4694,12 @@ msgstr "itinérance" + msgid "%s connection" + msgstr "Connexion à %s" + +-#: ../src/utils/utils.c:563 ++#: ../src/utils/utils.c:565 + #, fuzzy + msgid "PEM certificates (*.pem, *.crt, *.cer)" + msgstr "Certificats DER ou PEM (*.der, *.pem, *.crt, *.cer)" + +-#: ../src/utils/utils.c:575 ++#: ../src/utils/utils.c:577 + msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" + msgstr "Clés privées DER, PEM ou PKCS#12 (*.der, *.pem, *.p12, *.key)" + +@@ -4474,39 +4707,35 @@ msgstr "Clés privées DER, PEM ou PKCS#12 (*.der, *.pem, *.p12, *.key)" + msgid "undefined error in 802.1X security (wpa-eap)" + msgstr "" + +-#: ../src/wireless-security/eap-method.c:227 +-msgid "no file selected" +-msgstr "" +- +-#: ../src/wireless-security/eap-method.c:235 +-#, c-format +-msgid "file “%s” does not exist" +-msgstr "" ++#: ../src/wireless-security/eap-method.c:365 ++#, fuzzy ++msgid "no CA certificate selected" ++msgstr "Aucun certificat de CA n'est _requis" + +-#: ../src/wireless-security/eap-method.c:258 +-msgid "unspecified error validating eap-method file" ++#: ../src/wireless-security/eap-method.c:370 ++msgid "selected CA certificate file does not exist" + msgstr "" + +-#: ../src/wireless-security/eap-method-fast.c:73 ++#: ../src/wireless-security/eap-method-fast.c:71 + msgid "missing EAP-FAST PAC file" + msgstr "" + +-#: ../src/wireless-security/eap-method-fast.c:269 +-#: ../src/wireless-security/eap-method-peap.c:303 +-#: ../src/wireless-security/eap-method-ttls.c:352 ++#: ../src/wireless-security/eap-method-fast.c:267 ++#: ../src/wireless-security/eap-method-peap.c:329 ++#: ../src/wireless-security/eap-method-ttls.c:379 + msgid "GTC" + msgstr "GTC" + +-#: ../src/wireless-security/eap-method-fast.c:407 ++#: ../src/wireless-security/eap-method-fast.c:405 + #, fuzzy + msgid "Choose a PAC file" + msgstr "Choisir un fichier PAC..." + +-#: ../src/wireless-security/eap-method-fast.c:414 ++#: ../src/wireless-security/eap-method-fast.c:412 + msgid "PAC files (*.pac)" + msgstr "Fichier PAC (*.pac)" + +-#: ../src/wireless-security/eap-method-fast.c:418 ++#: ../src/wireless-security/eap-method-fast.c:416 + msgid "All files" + msgstr "Tous les fichiers" + +@@ -4524,7 +4753,7 @@ msgstr "Les deux" + + #: ../src/wireless-security/eap-method-fast.ui.h:4 + #: ../src/wireless-security/eap-method-peap.ui.h:4 +-#: ../src/wireless-security/eap-method-ttls.ui.h:1 ++#: ../src/wireless-security/eap-method-ttls.ui.h:3 + msgid "Anony_mous identity:" + msgstr "Identité anony_me :" + +@@ -4534,7 +4763,7 @@ msgstr "Fichier _PAC :" + + #: ../src/wireless-security/eap-method-fast.ui.h:6 + #: ../src/wireless-security/eap-method-peap.ui.h:7 +-#: ../src/wireless-security/eap-method-ttls.ui.h:4 ++#: ../src/wireless-security/eap-method-ttls.ui.h:1 + msgid "_Inner authentication:" + msgstr "Authentification i_nterne :" + +@@ -4550,27 +4779,12 @@ msgstr "" + msgid "missing EAP-LEAP password" + msgstr "" + +-#: ../src/wireless-security/eap-method-peap.c:64 +-#, c-format +-msgid "invalid EAP-PEAP CA certificate: %s" +-msgstr "" +- +-#: ../src/wireless-security/eap-method-peap.c:69 +-msgid "invalid EAP-PEAP CA certificate: no certificate specified" +-msgstr "" +- +-#: ../src/wireless-security/eap-method-peap.c:288 +-#: ../src/wireless-security/eap-method-ttls.c:337 ++#: ../src/wireless-security/eap-method-peap.c:314 ++#: ../src/wireless-security/eap-method-ttls.c:364 + #: ../src/wireless-security/wireless-security.c:424 + msgid "MD5" + msgstr "MD5" + +-#: ../src/wireless-security/eap-method-peap.c:382 +-#: ../src/wireless-security/eap-method-ttls.c:431 +-#, fuzzy +-msgid "Choose a Certificate Authority certificate" +-msgstr "Choisissez un certificat d'une autorité de certification..." +- + #: ../src/wireless-security/eap-method-peap.ui.h:2 + msgid "Version 0" + msgstr "Version 0" +@@ -4580,20 +4794,27 @@ msgid "Version 1" + msgstr "Version 1" + + #: ../src/wireless-security/eap-method-peap.ui.h:5 +-#: ../src/wireless-security/eap-method-ttls.ui.h:2 +-msgid "C_A certificate:" +-msgstr "Certificat du C_A :" +- +-#: ../src/wireless-security/eap-method-peap.ui.h:6 + #: ../src/wireless-security/eap-method-tls.ui.h:2 +-#: ../src/wireless-security/eap-method-ttls.ui.h:3 ++#: ../src/wireless-security/eap-method-ttls.ui.h:2 + msgid "No CA certificate is _required" + msgstr "Aucun certificat de CA n'est _requis" + +-#: ../src/wireless-security/eap-method-peap.ui.h:8 ++#: ../src/wireless-security/eap-method-peap.ui.h:6 + msgid "PEAP _version:" + msgstr "Version de _PEAP :" + ++#: ../src/wireless-security/eap-method-peap.ui.h:8 ++#: ../src/wireless-security/eap-method-tls.ui.h:3 ++#: ../src/wireless-security/eap-method-ttls.ui.h:4 ++msgid "Suffix of the server certificate name." ++msgstr "" ++ ++#: ../src/wireless-security/eap-method-peap.ui.h:9 ++#: ../src/wireless-security/eap-method-tls.ui.h:4 ++#: ../src/wireless-security/eap-method-ttls.ui.h:5 ++msgid "_Domain:" ++msgstr "" ++ + #: ../src/wireless-security/eap-method-simple.c:75 + msgid "missing EAP username" + msgstr "" +@@ -4606,46 +4827,28 @@ msgstr "" + msgid "missing EAP-TLS identity" + msgstr "" + +-#: ../src/wireless-security/eap-method-tls.c:238 ++#: ../src/wireless-security/eap-method-tls.c:256 + #, fuzzy + msgid "no user certificate selected" + msgstr "Aucun certificat de CA n'est _requis" + +-#: ../src/wireless-security/eap-method-tls.c:243 ++#: ../src/wireless-security/eap-method-tls.c:261 + msgid "selected user certificate file does not exist" + msgstr "" + +-#: ../src/wireless-security/eap-method-tls.c:263 ++#: ../src/wireless-security/eap-method-tls.c:281 + msgid "no key selected" + msgstr "" + +-#: ../src/wireless-security/eap-method-tls.c:268 ++#: ../src/wireless-security/eap-method-tls.c:286 + msgid "selected key file does not exist" + msgstr "" + +-#: ../src/wireless-security/eap-method-tls.c:314 +-#, fuzzy +-msgid "no CA certificate selected" +-msgstr "Aucun certificat de CA n'est _requis" +- +-#: ../src/wireless-security/eap-method-tls.c:319 +-msgid "selected CA certificate file does not exist" +-msgstr "" +- + #: ../src/wireless-security/eap-method-tls.ui.h:1 + msgid "I_dentity:" + msgstr "I_dentité :" + +-#: ../src/wireless-security/eap-method-ttls.c:64 +-#, c-format +-msgid "invalid EAP-TTLS CA certificate: %s" +-msgstr "" +- +-#: ../src/wireless-security/eap-method-ttls.c:69 +-msgid "invalid EAP-TTLS CA certificate: no certificate specified" +-msgstr "" +- +-#: ../src/wireless-security/eap-method-ttls.c:306 ++#: ../src/wireless-security/eap-method-ttls.c:333 + #, fuzzy + msgid "MSCHAPv2 (no EAP)" + msgstr "MSCHAPv2" +@@ -4719,17 +4922,17 @@ msgid "invalid wep-key: passphrase must be shorter than 64 characters" + msgstr "" + + #: ../src/wireless-security/ws-wep-key.ui.h:1 +-msgid "1 (Default)" +-msgstr "1 (par défaut)" +- +-#: ../src/wireless-security/ws-wep-key.ui.h:2 + msgid "Open System" + msgstr "Système ouvert" + +-#: ../src/wireless-security/ws-wep-key.ui.h:3 ++#: ../src/wireless-security/ws-wep-key.ui.h:2 + msgid "Shared Key" + msgstr "À clé partagée" + ++#: ../src/wireless-security/ws-wep-key.ui.h:3 ++msgid "1 (Default)" ++msgstr "1 (par défaut)" ++ + #: ../src/wireless-security/ws-wep-key.ui.h:4 + msgid "_Key:" + msgstr "_Clé :" +@@ -4756,383 +4959,3 @@ msgstr "" + #: ../src/wireless-security/ws-wpa-psk.ui.h:2 + msgid "_Type:" + msgstr "_Type :" +- +-#, fuzzy +-#~ msgid "NetworkManager for GNOME" +-#~ msgstr "Applet NetworkManager" +- +-#~ msgid "" +-#~ "\n" +-#~ "The VPN connection '%s' disconnected because the VPN service stopped." +-#~ msgstr "" +-#~ "\n" +-#~ "La connexion VPN « %s » a été déconnectée car le service VPN a été arrêté." +- +-#~ msgid "" +-#~ "\n" +-#~ "The VPN connection '%s' disconnected." +-#~ msgstr "" +-#~ "\n" +-#~ "La connexion VPN « %s » a été déconnectée." +- +-#~ msgid "_Disconnect VPN" +-#~ msgstr "_Déconnecter le VPN" +- +-#~ msgid "New Mobile Broadband connection..." +-#~ msgstr "Nouvelle connexion mobile..." +- +-#~ msgid "_Connect to Hidden Wi-Fi Network..." +-#~ msgstr "_Se connecter à un réseau Wi-Fi invisible..." +- +-#~ msgid "Create _New Wi-Fi Network..." +-#~ msgstr "Créer un _nouveau réseau Wi-Fi..." +- +-#~ msgid " " +-#~ msgstr " " +- +-#~ msgid "0" +-#~ msgstr "0" +- +-#~ msgid "1" +-#~ msgstr "1" +- +-#~ msgid "2" +-#~ msgstr "2" +- +-#~ msgid "3" +-#~ msgstr "3" +- +-#~ msgid "4" +-#~ msgstr "4" +- +-#~ msgid "5" +-#~ msgstr "5" +- +-#~ msgid "6" +-#~ msgstr "6" +- +-#~ msgid "7" +-#~ msgstr "7" +- +-#~ msgid "15" +-#~ msgstr "15" +- +-#~ msgid "Aut_onegotiate" +-#~ msgstr "Négociation aut_omatique" +- +-#~ msgid "FirewallD is not running." +-#~ msgstr "FirewallD n'est pas lancé." +- +-#~ msgid "New..." +-#~ msgstr "Nouveau..." +- +-#, fuzzy +-#~ msgid "invalid EAP-TLS CA certificate: %s" +-#~ msgstr "Certificat du C_A :" +- +-#~ msgid "Unencrypted private keys are insecure" +-#~ msgstr "Les clés privées non chiffrées ne sont pas sûres." +- +-#~ msgid "" +-#~ "The selected private key does not appear to be protected by a password. " +-#~ "This could allow your security credentials to be compromised. Please " +-#~ "select a password-protected private key.\n" +-#~ "\n" +-#~ "(You can password-protect your private key with openssl)" +-#~ msgstr "" +-#~ "La clé privée sélectionnée ne semble pas être protégée par un mot de " +-#~ "passe. Ceci pourrait amener à compromettre la sécurité de vos données de " +-#~ "connexion. Veuillez sélectionner une clé privée protégée par un mot de " +-#~ "passe.\n" +-#~ "\n" +-#~ "(Vous pouvez protéger votre clé privée avec un mot de passe grâce à " +-#~ "openssl)" +- +-#~ msgid "Choose your private key..." +-#~ msgstr "Choisissez votre clé privée..." +- +-#~ msgid "Enable WiMA_X Mobile Broadband" +-#~ msgstr "Activer la connexion mobile WiMA_X" +- +-#~ msgid "_Help" +-#~ msgstr "_Aide" +- +-#~ msgid "You are now connected to the bonded network." +-#~ msgstr "Vous êtes maintenant connecté au réseau lié." +- +-#~ msgid "Preparing bond connection '%s'..." +-#~ msgstr "Préparation de la connexion liée « %s »..." +- +-#~ msgid "Configuring bond connection '%s'..." +-#~ msgstr "Configuration de la connexion liée « %s »..." +- +-#~ msgid "User authentication required for bond connection '%s'..." +-#~ msgstr "Authentification nécessaire pour la connexion liée « %s »..." +- +-#~ msgid "Requesting address for '%s'..." +-#~ msgstr "Obtention d'une adresse pour « %s »..." +- +-#~ msgid "Bond connection '%s' active" +-#~ msgstr "Connexion liée « %s » active" +- +-#~ msgid "You are now connected to the bridged network." +-#~ msgstr "Vous êtes maintenant connecté au réseau pont." +- +-#~ msgid "Preparing bridge connection '%s'..." +-#~ msgstr "Préparation de la connexion pont « %s »..." +- +-#~ msgid "Configuring bridge connection '%s'..." +-#~ msgstr "Configuration de la connexion pont « %s »..." +- +-#~ msgid "User authentication required for bridge connection '%s'..." +-#~ msgstr "Authentification nécessaire pour la connexion pont « %s »..." +- +-#~ msgid "Bridge connection '%s' active" +-#~ msgstr "Connexion pont « %s » active" +- +-#~ msgid "New Mobile Broadband (CDMA) connection..." +-#~ msgstr "Nouvelle connexion mobile (CDMA)..." +- +-#~ msgid "You are now connected to the CDMA network." +-#~ msgstr "Vous êtes maintenant connecté au réseau CDMA." +- +-#~ msgid "CDMA network." +-#~ msgstr "Réseau CDMA." +- +-#~ msgid "New Mobile Broadband (GSM) connection..." +-#~ msgstr "Nouvelle connexion mobile (GSM)..." +- +-#~ msgid "You are now connected to the GSM network." +-#~ msgstr "Vous êtes maintenant connecté au réseau GSM." +- +-#~ msgid "GSM network." +-#~ msgstr "Réseau GSM." +- +-#~ msgid "Auto InfiniBand" +-#~ msgstr "InfiniBand automatique" +- +-#~ msgid "InfiniBand Networks (%s)" +-#~ msgstr "Réseaux InfiniBand (%s)" +- +-#~ msgid "InfiniBand Network (%s)" +-#~ msgstr "Réseau InfiniBand (%s)" +- +-#~ msgid "InfiniBand Networks" +-#~ msgstr "Réseaux InfiniBand" +- +-#~ msgid "InfiniBand Network" +-#~ msgstr "Réseau InfiniBand" +- +-#~ msgid "You are now connected to the InfiniBand network." +-#~ msgstr "Vous êtes maintenant connecté au réseau InfiniBand." +- +-#~ msgid "Preparing InfiniBand connection '%s'..." +-#~ msgstr "Préparation de la connexion InfiniBand « %s »..." +- +-#~ msgid "Configuring InfiniBand connection '%s'..." +-#~ msgstr "Configuration de la connexion InfiniBand « %s »..." +- +-#~ msgid "User authentication required for InfiniBand connection '%s'..." +-#~ msgstr "Authentification nécessaire pour la connexion InfiniBand « %s »..." +- +-#~ msgid "InfiniBand connection '%s' active" +-#~ msgstr "Connexion InfiniBand « %s » active" +- +-#~ msgid "You are now connected to the teamed network." +-#~ msgstr "Vous êtes maintenant connecté au réseau en équipe." +- +-#~ msgid "Preparing team connection '%s'..." +-#~ msgstr "Préparation de la connexion en équipe « %s »..." +- +-#~ msgid "Configuring team connection '%s'..." +-#~ msgstr "Configuration de la connexion en équipe « %s »..." +- +-#~ msgid "User authentication required for team connection '%s'..." +-#~ msgstr "Authentification nécessaire pour la connexion en équipe « %s »..." +- +-#~ msgid "Team connection '%s' active" +-#~ msgstr "Connexion en équipe « %s » active" +- +-#~ msgid "You are now connected to the VLAN." +-#~ msgstr "Vous êtes maintenant connecté au VLAN." +- +-#~ msgid "Preparing VLAN connection '%s'..." +-#~ msgstr "Préparation de la connexion VLAN « %s »..." +- +-#~ msgid "Configuring VLAN connection '%s'..." +-#~ msgstr "Configuration de la connexion VLAN « %s »..." +- +-#~ msgid "User authentication required for VLAN connection '%s'..." +-#~ msgstr "Authentification nécessaire pour la connexion VLAN « %s »..." +- +-#~ msgid "VLAN connection '%s' active" +-#~ msgstr "Connexion VLAN « %s » active" +- +-#~ msgid "WiMAX Mobile Broadband (%s)" +-#~ msgstr "WiMAX mobile (%s)" +- +-#~ msgid "WiMAX Mobile Broadband" +-#~ msgstr "WiMAX mobile" +- +-#~ msgid "WiMAX is disabled" +-#~ msgstr "le WiMAX est désactivé" +- +-#~ msgid "WiMAX is disabled by hardware switch" +-#~ msgstr "le WiMAX est désactivé par un commutateur matériel" +- +-#~ msgid "You are now connected to the WiMAX network." +-#~ msgstr "Vous êtes maintenant connecté au réseau WiMAX." +- +-#~ msgid "%d dB" +-#~ msgstr "%d dB" +- +-#~ msgctxt "WiMAX CINR" +-#~ msgid "unknown" +-#~ msgstr "inconnu" +- +-#~ msgctxt "WiMAX Base Station ID" +-#~ msgid "unknown" +-#~ msgstr "inconnu" +- +-#~ msgid "WiMAX (%s)" +-#~ msgstr "WiMAX (%s)" +- +-#~ msgid "CINR:" +-#~ msgstr "CINR :" +- +-#~ msgid "BSID:" +-#~ msgstr "BSID :" +- +-#~ msgid "_Device MAC address:" +-#~ msgstr "Adresse M_AC du périphérique :" +- +-#~ msgid "Any" +-#~ msgstr "N'importe lequel" +- +-#~ msgid "3G (UMTS/HSPA)" +-#~ msgstr "3G (UMTS/HSPA)" +- +-#~ msgid "2G (GPRS/EDGE)" +-#~ msgstr "2G (GPRS/EDGE)" +- +-#~ msgid "Prefer 3G (UMTS/HSPA)" +-#~ msgstr "Préférer 3G (UMTS/HSPA)" +- +-#~ msgid "Prefer 2G (GPRS/EDGE)" +-#~ msgstr "Préférer 2G (GPRS/EDGE)" +- +-#~ msgid "Prefer 4G (LTE)" +-#~ msgstr "Préférer 4G (LTE)" +- +-#~ msgid "Use only 4G (LTE)" +-#~ msgstr "N'utiliser que 4G (LTE)" +- +-#~ msgid "I_mport team configuration from a file..." +-#~ msgstr "I_mporter une configuration en équipe à partir d'un fichier..." +- +-#~ msgid "Infrastructure" +-#~ msgstr "Infrastructure" +- +-#~ msgid "WiMAX" +-#~ msgstr "WiMAX" +- +-#~ msgid "Error saving connection" +-#~ msgstr "Erreur lors de l'enregistrement de la connexion" +- +-#~ msgid "The property '%s' / '%s' is invalid: %d" +-#~ msgstr "La propriété « %s » / « %s » n'est pas valide : %d" +- +-#~ msgid "Automatic (PPP)" +-#~ msgstr "Automatique (PPP)" +- +-#~ msgid "Automatic (PPP) addresses only" +-#~ msgstr "Adresses automatiques uniquement (PPP)" +- +-#~ msgid "Could not load WiMAX user interface." +-#~ msgstr "Impossible de charger l'interface utilisateur WiMAX." +- +-#~ msgid "WiMAX connection %d" +-#~ msgstr "Connexion WiMAX %d" +- +-#~ msgid "" +-#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) " +-#~ "%s)." +-#~ msgstr "" +-#~ "Configuration Bluetooth impossible (échec de connexion D-Bus : (%s) %s)." +- +-#~ msgid "" +-#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) " +-#~ "%s)." +-#~ msgstr "" +-#~ "Configuration Bluetooth impossible (erreur de recherche de " +-#~ "NetworkManager : (%s) %s)." +- +-#~ msgid "Use your mobile phone as a network device (PAN/NAP)" +-#~ msgstr "Utiliser un téléphone portable comme périphérique réseau (PAN/NAP)" +- +-#~ msgid "Access the Internet using your mobile phone (DUN)" +-#~ msgstr "Accéder à Internet à l'aide d'un téléphone portable (DUN)" +- +-#~ msgid "Error: %s" +-#~ msgstr "Erreur : %s" +- +-#~ msgid "Failed to create DUN connection: %s" +-#~ msgstr "Échec de création de la connexion DUN : %s" +- +-#~ msgid "Your phone is now ready to use!" +-#~ msgstr "Votre téléphone est prêt pour son utilisation" +- +-#~ msgid "Mobile wizard was canceled" +-#~ msgstr "L'assistant de connexion mobile a été annulé" +- +-#~ msgid "Unknown phone device type (not GSM or CDMA)" +-#~ msgstr "Type d'équipement téléphonique inconnu (ni GSM, ni CDMA)" +- +-#~ msgid "unknown modem type." +-#~ msgstr "type de modem inconnu." +- +-#~ msgid "failed to connect to the phone." +-#~ msgstr "échec de connexion au téléphone." +- +-#~ msgid "error getting bus connection" +-#~ msgstr "erreur lors de la modification de la connexion" +- +-#~ msgid "unexpectedly disconnected from the phone." +-#~ msgstr "déconnexion intempestive du téléphone." +- +-#~ msgid "timed out detecting phone details." +-#~ msgstr "expiration de délai lors de la détection des détails du téléphone." +- +-#~ msgid "Detecting phone configuration..." +-#~ msgstr "Détection de la configuration du téléphone..." +- +-#~ msgid "" +-#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-" +-#~ "Networking connection." +-#~ msgstr "" +-#~ "L'adaptateur Bluetooth par défaut doit être activé avant de pouvoir " +-#~ "configurer une connexion d'accès distant." +- +-#~ msgid "Failed to create PAN connection: %s" +-#~ msgstr "Échec de création de la connexion PAN : %s" +- +-#~ msgid "%s Network" +-#~ msgstr "Réseau %s" +- +-#~ msgid "Primary DNS:" +-#~ msgstr "DNS primaire :" +- +-#~ msgid "Secondary DNS:" +-#~ msgstr "DNS secondaire :" +- +-#~ msgid "Ternary DNS:" +-#~ msgstr "DNS tertiaire :" +- +-#~ msgid "_Save..." +-#~ msgstr "_Enregistrer..." +- +-#~ msgid "_Edit..." +-#~ msgstr "_Modifier..." +- +-#~ msgid "_Delete..." +-#~ msgstr "_Supprimer..." +diff --git a/po/it.po b/po/it.po +index 6f2e076..e713dd1 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -11,15 +11,14 @@ + # Francesco Marletta , 2004, 2005, 2006, 2007, 2008, 2009, 2010. + # Gianvito Cavasoli , 2011. + # Milo Casagrande , 2011, 2012, 2013, 2014, 2015, 2016, 2017. +-# ++# lrintel , 2017. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: network-manager-applet\n" +-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" +-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n" +-"POT-Creation-Date: 2017-09-08 08:39+0000\n" +-"PO-Revision-Date: 2017-09-10 15:29+0200\n" +-"Last-Translator: Milo Casagrande \n" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2017-11-07 19:40+0100\n" ++"PO-Revision-Date: 2017-11-07 06:45+0000\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: Italian \n" + "Language: it\n" + "MIME-Version: 1.0\n" +@@ -27,7 +26,7 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n!=1);\n" + "X-Launchpad-Export-Date: 2012-03-09 08:20+0000\n" +-"X-Generator: Poedit 2.0.1\n" ++"X-Generator: Zanata 4.3.2\n" + + #: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191 + msgid "Network" +@@ -257,12 +256,12 @@ msgid "Failed to add/activate connection" + msgstr "Aggiunta/Attivazione della connessione non riuscita" + + #: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483 +-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410 ++#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411 + msgid "Unknown error" + msgstr "Errore sconosciuto" + + #: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539 +-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413 ++#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414 + msgid "Connection failure" + msgstr "Connessione non riuscita" + +@@ -278,7 +277,7 @@ msgstr "Disconnessione non riuscita" + msgid "Connection activation failed" + msgstr "Attivazione della connessione non riuscita" + +-#: ../src/applet.c:809 ../src/applet-device-wifi.c:1126 ++#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127 + msgid "Don’t show this message again" + msgstr "Non mostrare più questo messaggio" + +@@ -522,7 +521,6 @@ msgstr "Attualmente connessi a «%s»." + msgid "Disconnected" + msgstr "Disconnessi" + +-# + #: ../src/applet.c:2248 + msgid "The network connection has been disconnected." + msgstr "La connessione di rete è stata terminata." +@@ -589,46 +587,46 @@ msgstr "Codice PIN errato; contattare il provider." + msgid "Sending unlock code…" + msgstr "Invio codice di sblocco…" + +-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:507 ++#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507 + #, c-format + msgid "Mobile Broadband (%s)" + msgstr "Banda larga mobile (%s)" + +-#: ../src/applet-device-broadband.c:738 ++#: ../src/applet-device-broadband.c:739 + #: ../src/connection-editor/connection-helpers.c:108 + #: ../src/connection-editor/page-mobile.c:308 + #: ../src/libnm-gtk/nm-ui-utils.c:329 + msgid "Mobile Broadband" + msgstr "Banda larga mobile" + +-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75 +-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906 ++#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75 ++#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907 + msgid "Available" + msgstr "Disponibile" + + #. Default connection item +-#: ../src/applet-device-broadband.c:803 ++#: ../src/applet-device-broadband.c:805 + msgid "New Mobile Broadband connection…" + msgstr "Nuova connessione a banda larga mobile…" + +-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87 +-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308 ++#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87 ++#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309 + msgid "Connection Established" + msgstr "Connessione stabilita" + +-#: ../src/applet-device-broadband.c:818 ++#: ../src/applet-device-broadband.c:820 + msgid "You are now connected to the Mobile Broadband network." + msgstr "Attualmente connessi alla rete a banda larga mobile." + +-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964 ++#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966 + msgid "Mobile Broadband network." + msgstr "Rete a banda larga mobile." + +-#: ../src/applet-device-broadband.c:959 ++#: ../src/applet-device-broadband.c:961 + msgid "You are now registered on the home network." + msgstr "Attualmente registrati sulla rete del proprio provider." + +-#: ../src/applet-device-broadband.c:965 ++#: ../src/applet-device-broadband.c:967 + msgid "You are now registered on a roaming network." + msgstr "Attualmente registrati su una rete in roaming." + +@@ -736,7 +734,7 @@ msgstr "Crea _nuova rete Wi-Fi…" + msgid "(none)" + msgstr "(nessuna)" + +-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408 ++#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409 + msgid "Failed to add new connection" + msgstr "Aggiunta della nuova connessione non riuscita" + +@@ -744,79 +742,79 @@ msgstr "Aggiunta della nuova connessione non riuscita" + msgid "Insufficient privileges." + msgstr "Privilegi insufficienti." + +-#: ../src/applet-device-wifi.c:838 ++#: ../src/applet-device-wifi.c:839 + #, c-format + msgid "Wi-Fi Networks (%s)" + msgstr "Reti Wi-Fi (%s)" + +-#: ../src/applet-device-wifi.c:840 ++#: ../src/applet-device-wifi.c:841 + #, c-format + msgid "Wi-Fi Network (%s)" + msgstr "Rete Wi-Fi (%s)" + +-#: ../src/applet-device-wifi.c:842 ++#: ../src/applet-device-wifi.c:843 + msgid "Wi-Fi Network" + msgid_plural "Wi-Fi Networks" + msgstr[0] "Rete Wi-Fi" + msgstr[1] "Reti Wi-Fi" + +-#: ../src/applet-device-wifi.c:871 ++#: ../src/applet-device-wifi.c:872 + msgid "Wi-Fi is disabled" + msgstr "Wi-Fi disabilitata" + +-#: ../src/applet-device-wifi.c:872 ++#: ../src/applet-device-wifi.c:873 + msgid "Wi-Fi is disabled by hardware switch" + msgstr "Wi-Fi disabilitata da interruttore hardware" + +-#: ../src/applet-device-wifi.c:933 ++#: ../src/applet-device-wifi.c:934 + msgid "More networks" + msgstr "Altre reti" + +-#: ../src/applet-device-wifi.c:1122 ++#: ../src/applet-device-wifi.c:1123 + msgid "Wi-Fi Networks Available" + msgstr "Disponibili reti Wi-Fi" + +-#: ../src/applet-device-wifi.c:1123 ++#: ../src/applet-device-wifi.c:1124 + msgid "Use the network menu to connect to a Wi-Fi network" + msgstr "Usare il menù rete per connettersi a una rete Wi-Fi" + +-#: ../src/applet-device-wifi.c:1307 ++#: ../src/applet-device-wifi.c:1308 + #, c-format + msgid "You are now connected to the Wi-Fi network “%s”." + msgstr "Attualmente connessi alla rete Wi-Fi «%s»." + +-#: ../src/applet-device-wifi.c:1342 ++#: ../src/applet-device-wifi.c:1343 + #, c-format + msgid "Preparing Wi-Fi network connection “%s”…" + msgstr "Preparazione della connessione Wi-Fi «%s»…" + +-#: ../src/applet-device-wifi.c:1345 ++#: ../src/applet-device-wifi.c:1346 + #, c-format + msgid "Configuring Wi-Fi network connection “%s”…" + msgstr "Configurazione della connessione Wi-Fi «%s»…" + + # (ndt) un po' libera, ma resa simile a quella di ethernet +-#: ../src/applet-device-wifi.c:1348 ++#: ../src/applet-device-wifi.c:1349 + #, c-format + msgid "User authentication required for Wi-Fi network “%s”…" + msgstr "Richiesta autenticazione utente per la connessione Wi-Fi «%s»…" + +-#: ../src/applet-device-wifi.c:1351 ++#: ../src/applet-device-wifi.c:1352 + #, c-format + msgid "Requesting a Wi-Fi network address for “%s”…" + msgstr "Richiesta di un indirizzo Wi-Fi per «%s»…" + +-#: ../src/applet-device-wifi.c:1362 ++#: ../src/applet-device-wifi.c:1363 + #, c-format + msgid "Wi-Fi network connection “%s” active: %s (%d%%)" + msgstr "Connessione Wi-Fi «%s» attiva: %s (%d%%)" + +-#: ../src/applet-device-wifi.c:1366 ++#: ../src/applet-device-wifi.c:1367 + #, c-format + msgid "Wi-Fi network connection “%s” active" + msgstr "Connessione Wi-Fi «%s» attiva" + +-#: ../src/applet-device-wifi.c:1385 ++#: ../src/applet-device-wifi.c:1386 + msgid "Failed to activate connection" + msgstr "Attivazione della connessione non riuscita" + +@@ -1124,7 +1122,7 @@ msgstr "" + #: ../src/connection-editor/ce-page-bond.ui.h:12 + #: ../src/connection-editor/ce-page-bridge.ui.h:2 + #: ../src/connection-editor/ce-page-ip4.ui.h:7 +-#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++#: ../src/connection-editor/ce-page-ip6.ui.h:12 + #: ../src/connection-editor/ce-page-team.ui.h:13 + #: ../src/connection-editor/nm-connection-list.ui.h:3 + msgid "_Add" +@@ -1135,7 +1133,7 @@ msgstr "A_ggiungi" + #: ../src/connection-editor/ce-page-bond.ui.h:14 + #: ../src/connection-editor/ce-page-bridge.ui.h:4 + #: ../src/connection-editor/ce-page-ip4.ui.h:8 +-#: ../src/connection-editor/ce-page-ip6.ui.h:11 ++#: ../src/connection-editor/ce-page-ip6.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:15 + #: ../src/connection-editor/connection-helpers.c:772 + #: ../src/connection-editor/nm-connection-list.ui.h:4 +@@ -1730,7 +1728,7 @@ msgstr "L'interfaccia sulla quale verrà stabilita la connessione PPP." + #: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-wifi.ui.h:1 + #: ../src/connection-editor/page-ip4.c:131 +-#: ../src/connection-editor/page-ip6.c:136 ++#: ../src/connection-editor/page-ip6.c:142 + #: ../src/wireless-security/eap-method-peap.ui.h:1 + msgid "Automatic" + msgstr "Automatico" +@@ -1776,7 +1774,7 @@ msgid "Full" + msgstr "Full" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:12 +-#: ../src/connection-editor/page-ip6.c:149 ++#: ../src/connection-editor/page-ip6.c:155 + msgid "Ignore" + msgstr "Ignora" + +@@ -1784,7 +1782,7 @@ msgstr "Ignora" + #: ../src/connection-editor/ce-page-ip4.ui.h:3 + #: ../src/connection-editor/ce-page-ip6.ui.h:3 + #: ../src/connection-editor/page-ip4.c:168 +-#: ../src/connection-editor/page-ip6.c:185 ++#: ../src/connection-editor/page-ip6.c:191 + msgid "Manual" + msgstr "Manuale" + +@@ -2052,12 +2050,12 @@ msgstr "Link-Local" + #: ../src/connection-editor/ce-page-ip4.ui.h:5 + #: ../src/connection-editor/ce-page-ip6.ui.h:5 + #: ../src/connection-editor/page-ip4.c:188 +-#: ../src/connection-editor/page-ip6.c:205 ++#: ../src/connection-editor/page-ip6.c:211 + msgid "Shared to other computers" + msgstr "Condiviso con altri computer" + + #: ../src/connection-editor/ce-page-ip4.ui.h:6 +-#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++#: ../src/connection-editor/ce-page-ip6.ui.h:11 + msgid "_Method:" + msgstr "_Metodo:" + +@@ -2072,7 +2070,7 @@ msgstr "" + "identificatore del client DHCP, inserirlo qui." + + #: ../src/connection-editor/ce-page-ip4.ui.h:10 +-#: ../src/connection-editor/ce-page-ip6.ui.h:12 ++#: ../src/connection-editor/ce-page-ip6.ui.h:14 + msgid "" + "Domains used when resolving host names. Use commas to separate multiple " + "domains." +@@ -2085,16 +2083,16 @@ msgid "D_HCP client ID:" + msgstr "Id client D_HCP:" + + #: ../src/connection-editor/ce-page-ip4.ui.h:12 +-#: ../src/connection-editor/ce-page-ip6.ui.h:13 ++#: ../src/connection-editor/ce-page-ip6.ui.h:15 + #: ../src/connection-editor/page-ip4.c:372 +-#: ../src/connection-editor/page-ip6.c:335 ++#: ../src/connection-editor/page-ip6.c:346 + msgid "S_earch domains:" + msgstr "Domini di _ricerca:" + + #: ../src/connection-editor/ce-page-ip4.ui.h:13 +-#: ../src/connection-editor/ce-page-ip6.ui.h:14 ++#: ../src/connection-editor/ce-page-ip6.ui.h:16 + #: ../src/connection-editor/page-ip4.c:363 +-#: ../src/connection-editor/page-ip6.c:326 ++#: ../src/connection-editor/page-ip6.c:337 + msgid "DNS ser_vers:" + msgstr "Server _DNS:" + +@@ -2121,7 +2119,7 @@ msgstr "" + "IPv6 ha successo." + + #: ../src/connection-editor/ce-page-ip4.ui.h:17 +-#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++#: ../src/connection-editor/ce-page-ip6.ui.h:22 + msgid "_Routes…" + msgstr "_Instradamenti…" + +@@ -2139,7 +2137,15 @@ msgstr "Abilitata (preferire indirizzo pubblico)" + msgid "Enabled (prefer temporary address)" + msgstr "Abilitata (preferire indirizzo temporaneo)" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:15 ++#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++msgid "EUI64" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++msgid "Stable privacy" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:17 + msgid "" + "IP addresses of domain name servers used to resolve host names. Use commas " + "to separate multiple domain name server addresses. Link-local addresses will " +@@ -2150,15 +2156,19 @@ msgstr "" + "dominio. Gli indirizzi link-local verranno collegati all'interfaccia di " + "connessione." + +-#: ../src/connection-editor/ce-page-ip6.ui.h:16 ++#: ../src/connection-editor/ce-page-ip6.ui.h:18 + msgid "IPv6 _privacy extensions:" + msgstr "Estensioni _privacy IPv6:" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:17 ++#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++msgid "IPv6 address _generation mode:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:20 + msgid "Require IPv_6 addressing for this connection to complete" + msgstr "Richiedere indirizzo IPv_6 per completare questa connessione" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:18 ++#: ../src/connection-editor/ce-page-ip6.ui.h:21 + msgid "" + "When connecting to IPv4-capable networks, allows the connection to complete " + "if IPv6 configuration fails but IPv4 configuration succeeds." +@@ -3183,7 +3193,7 @@ msgstr "Eliminare veramente la connessione %s?" + #: ../src/connection-editor/ip4-routes-dialog.c:697 + #: ../src/connection-editor/ip6-routes-dialog.c:718 + #: ../src/connection-editor/page-ip4.c:1136 +-#: ../src/connection-editor/page-ip6.c:1095 ++#: ../src/connection-editor/page-ip6.c:1118 + msgid "Address" + msgstr "Indirizzo" + +@@ -3196,7 +3206,7 @@ msgstr "Maschera" + #: ../src/connection-editor/ip4-routes-dialog.c:735 + #: ../src/connection-editor/ip6-routes-dialog.c:756 + #: ../src/connection-editor/page-ip4.c:1174 +-#: ../src/connection-editor/page-ip6.c:1133 ++#: ../src/connection-editor/page-ip6.c:1156 + msgid "Gateway" + msgstr "Gateway" + +@@ -3206,7 +3216,7 @@ msgid "Metric" + msgstr "Metrica" + + #: ../src/connection-editor/ip6-routes-dialog.c:737 +-#: ../src/connection-editor/page-ip6.c:1114 ++#: ../src/connection-editor/page-ip6.c:1137 + msgid "Prefix" + msgstr "Prefisso" + +@@ -3638,27 +3648,27 @@ msgid "IP tunnel connection %d" + msgstr "Connessione tunnel IP %d" + + #: ../src/connection-editor/page-ip4.c:127 +-#: ../src/connection-editor/page-ip6.c:130 ++#: ../src/connection-editor/page-ip6.c:136 + msgid "Automatic (VPN)" + msgstr "Automatico (VPN)" + + #: ../src/connection-editor/page-ip4.c:128 +-#: ../src/connection-editor/page-ip6.c:131 ++#: ../src/connection-editor/page-ip6.c:137 + msgid "Automatic (VPN) addresses only" + msgstr "Automatico (VPN) solo indirizzi" + + #: ../src/connection-editor/page-ip4.c:132 +-#: ../src/connection-editor/page-ip6.c:137 ++#: ../src/connection-editor/page-ip6.c:143 + msgid "Automatic, addresses only" + msgstr "Automatico, solo indirizzi" + + #: ../src/connection-editor/page-ip4.c:134 +-#: ../src/connection-editor/page-ip6.c:133 ++#: ../src/connection-editor/page-ip6.c:139 + msgid "Automatic (PPPoE)" + msgstr "Automatico (PPPoE)" + + #: ../src/connection-editor/page-ip4.c:135 +-#: ../src/connection-editor/page-ip6.c:134 ++#: ../src/connection-editor/page-ip6.c:140 + msgid "Automatic (PPPoE) addresses only" + msgstr "Automatico (PPPoE) solo indirizzi" + +@@ -3673,17 +3683,17 @@ msgstr "Automatico (DHCP) solo indirizzi" + # [NdT] si tratta di un protocollo di risoluzione nomi locali + # http://en.wikipedia.org/wiki/Link-local_address + #: ../src/connection-editor/page-ip4.c:181 +-#: ../src/connection-editor/page-ip6.c:198 ++#: ../src/connection-editor/page-ip6.c:204 + msgid "Link-Local Only" + msgstr "Solo Link-Local" + + #: ../src/connection-editor/page-ip4.c:361 +-#: ../src/connection-editor/page-ip6.c:324 ++#: ../src/connection-editor/page-ip6.c:335 + msgid "Additional DNS ser_vers:" + msgstr "Server _DNS aggiuntivi:" + + #: ../src/connection-editor/page-ip4.c:370 +-#: ../src/connection-editor/page-ip6.c:333 ++#: ../src/connection-editor/page-ip6.c:344 + msgid "Additional s_earch domains:" + msgstr "Domini di _ricerca aggiuntivi:" + +@@ -3720,39 +3730,39 @@ msgstr "Gateway IPv4 «%s» non valido" + msgid "IPv4 DNS server “%s” invalid" + msgstr "Server DNS IPv4 «%s» non valido" + +-#: ../src/connection-editor/page-ip6.c:173 ++#: ../src/connection-editor/page-ip6.c:179 + msgid "Automatic, DHCP only" + msgstr "Automatico, solo (DHCP)" + +-#: ../src/connection-editor/page-ip6.c:993 ++#: ../src/connection-editor/page-ip6.c:1016 + #, c-format + msgid "Editing IPv6 routes for %s" + msgstr "Modifica instradamenti IPv6 per %s" + +-#: ../src/connection-editor/page-ip6.c:1184 ++#: ../src/connection-editor/page-ip6.c:1208 + msgid "IPv6 Settings" + msgstr "Impostazioni IPv6" + +-#: ../src/connection-editor/page-ip6.c:1186 ++#: ../src/connection-editor/page-ip6.c:1210 + msgid "Could not load IPv6 user interface." + msgstr "Impossibile caricare l'interfaccia utente per IPv6." + +-#: ../src/connection-editor/page-ip6.c:1277 ++#: ../src/connection-editor/page-ip6.c:1302 + #, c-format + msgid "IPv6 address “%s” invalid" + msgstr "Indirizzo IPv6 «%s» non valido" + +-#: ../src/connection-editor/page-ip6.c:1285 ++#: ../src/connection-editor/page-ip6.c:1310 + #, c-format + msgid "IPv6 prefix “%s” invalid" + msgstr "Prefisso IPv6 «%s» non valido" + +-#: ../src/connection-editor/page-ip6.c:1294 ++#: ../src/connection-editor/page-ip6.c:1319 + #, c-format + msgid "IPv6 gateway “%s” invalid" + msgstr "Gateway IPv6 «%s» non valido" + +-#: ../src/connection-editor/page-ip6.c:1336 ++#: ../src/connection-editor/page-ip6.c:1361 + #, c-format + msgid "IPv6 DNS server “%s” invalid" + msgstr "Server DNS IPv6 «%s» non valido" +@@ -4030,7 +4040,6 @@ msgstr "WEP dinamico (802.1X)" + # fornite dai prodotti. I WPA(2)-Personal utilizzeranno il metodo PSK a + # chiave condivisa mentre i WPA(2)-Enterprise utilizzeranno un server + # di autenticazione. +-# + #: ../src/connection-editor/page-wifi-security.c:407 + #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975 + msgid "WPA & WPA2 Personal" +@@ -4990,432 +4999,3 @@ msgstr "" + #: ../src/wireless-security/ws-wpa-psk.ui.h:2 + msgid "_Type:" + msgstr "_Tipo:" +- +-#~ msgid "DSL" +-#~ msgstr "DSL" +- +-#~ msgid "Mode" +-#~ msgstr "Modalità" +- +-#~ msgid "MTU" +-#~ msgstr "MTU" +- +-#~ msgid "no file selected" +-#~ msgstr "nessun file selezionato" +- +-#~ msgid "file “%s” does not exist" +-#~ msgstr "il file «%s» non esiste" +- +-#~ msgid "unspecified error validating eap-method file" +-#~ msgstr "errore non specificato nel validare il file eap-method" +- +-#~ msgid "invalid EAP-PEAP CA certificate: %s" +-#~ msgstr "certificato CA EAP-PEAP non valido: %s" +- +-#~ msgid "invalid EAP-PEAP CA certificate: no certificate specified" +-#~ msgstr "certificato CA EAP-PEAP non valido: nessun certificato specificato" +- +-# (ndt) titolo finestra +-#~ msgid "Choose a Certificate Authority certificate" +-#~ msgstr "Scelta certificato di Autorità di Certificazione" +- +-#~ msgid "C_A certificate:" +-#~ msgstr "Certificato della C_A:" +- +-#~ msgid "invalid EAP-TTLS CA certificate: %s" +-#~ msgstr "certificato CA EAP-TTLS non valido: %s" +- +-#~ msgid "invalid EAP-TTLS CA certificate: no certificate specified" +-#~ msgstr "certificato CA EAP-TTLS non valido: nessun certificato specificato" +- +-#~ msgid "" +-#~ "\n" +-#~ "The VPN connection “%s” disconnected because the VPN service stopped." +-#~ msgstr "" +-#~ "\n" +-#~ "La connessione VPN «%s» si è chiusa perché il servizio VPN è stato " +-#~ "fermato." +- +-# [NdT] certo che l'originare era proprio brutto +-#~ msgid "" +-#~ "\n" +-#~ "The VPN connection “%s” disconnected." +-#~ msgstr "" +-#~ "\n" +-#~ "La connessione VPN «%s» si è chiusa." +- +-#~ msgid "invalid EAP-TLS CA certificate: %s" +-#~ msgstr "certificato CA EAP-TLS non valido: %s" +- +-#~ msgid "invalid EAP-TLS CA certificate: no certificate specified" +-#~ msgstr "certificato CA EAP-TLS non valido: nessun certificato specificato" +- +-#~ msgid "invalid EAP-TLS password: missing" +-#~ msgstr "password EAP-TLS non valida: manca la password" +- +-#~ msgid "invalid EAP-TLS private-key: %s" +-#~ msgstr "chiave privata EAP-TLS non valida: %s" +- +-#~ msgid "invalid EAP-TLS user-certificate: %s" +-#~ msgstr "certificato utente EAP-TLS non valido: %s" +- +-#~ msgid "Unencrypted private keys are insecure" +-#~ msgstr "Le chiavi private non cifrate sono insicure" +- +-#~ msgid "" +-#~ "The selected private key does not appear to be protected by a password. " +-#~ "This could allow your security credentials to be compromised. Please " +-#~ "select a password-protected private key.\n" +-#~ "\n" +-#~ "(You can password-protect your private key with openssl)" +-#~ msgstr "" +-#~ "La chiave privata selezionata non sembra essere protetta da una password. " +-#~ "Ciò potrebbe compromettere le proprie credenziali di sicurezza. " +-#~ "Selezionare una chiave privata protetta con password.\n" +-#~ "\n" +-#~ "(È possibile proteggere con password la propria chiave privata usando " +-#~ "openssl)" +- +-# (ndt) titolo finestra +-#~ msgid "Choose your private key" +-#~ msgstr "Scelta chiave privata" +- +-#~ msgid "New Mobile Broadband connection..." +-#~ msgstr "Nuova connessione a banda larga mobile..." +- +-#~ msgid "_Connect to Hidden Wi-Fi Network..." +-#~ msgstr "_Connetti a rete Wi-Fi nascosta..." +- +-#~ msgid "Create _New Wi-Fi Network..." +-#~ msgstr "Crea _nuova rete Wi-Fi..." +- +-#~ msgid " " +-#~ msgstr " " +- +-#~ msgid "0" +-#~ msgstr "0" +- +-#~ msgid "1" +-#~ msgstr "1" +- +-#~ msgid "2" +-#~ msgstr "2" +- +-#~ msgid "3" +-#~ msgstr "3" +- +-#~ msgid "4" +-#~ msgstr "4" +- +-#~ msgid "5" +-#~ msgstr "5" +- +-#~ msgid "6" +-#~ msgstr "6" +- +-#~ msgid "7" +-#~ msgstr "7" +- +-#~ msgid "15" +-#~ msgstr "15" +- +-#~ msgid "Aut_onegotiate" +-#~ msgstr "Aut_o-negoziazione" +- +-#~ msgid "FirewallD is not running." +-#~ msgstr "FirewallD non è in esecuzione." +- +-#~ msgid "New..." +-#~ msgstr "Nuova..." +- +-#~ msgid "NetworkManager for GNOME" +-#~ msgstr "NetworkManager per GNOME" +- +-#~ msgid "_Disconnect VPN" +-#~ msgstr "_Disconnetti VPN" +- +-#~ msgid "_Help" +-#~ msgstr "A_iuto" +- +-#~ msgid "bdaddr" +-#~ msgstr "bdaddr" +- +-#~ msgid "Infrastructure" +-#~ msgstr "Infrastruttura" +- +-#~ msgid "Enable WiMA_X Mobile Broadband" +-#~ msgstr "Abilita rete a banda larga mobile WiMA_X" +- +-#~ msgid "You are now connected to the bonded network." +-#~ msgstr "Attualmente connessi alla rete aggregata." +- +-#~ msgid "Preparing bond connection '%s'..." +-#~ msgstr "Preparazione della connessione aggregata «%s»..." +- +-#~ msgid "Configuring bond connection '%s'..." +-#~ msgstr "Configurazione della connessione aggregata «%s»..." +- +-#~ msgid "User authentication required for bond connection '%s'..." +-#~ msgstr "" +-#~ "Richiesta autenticazione utente per la connessione aggregata «%s»..." +- +-#~ msgid "Requesting address for '%s'..." +-#~ msgstr "Richiesta di un indirizzo per «%s»..." +- +-#~ msgid "Bond connection '%s' active" +-#~ msgstr "Connessione aggregata «%s» attiva" +- +-#~ msgid "You are now connected to the bridged network." +-#~ msgstr "Attualmente connessi alla rete bridged." +- +-#~ msgid "Preparing bridge connection '%s'..." +-#~ msgstr "Preparazione della connessione bridge «%s»..." +- +-#~ msgid "Configuring bridge connection '%s'..." +-#~ msgstr "Configurazione della connessione bridge «%s»..." +- +-#~ msgid "User authentication required for bridge connection '%s'..." +-#~ msgstr "Richiesta autenticazione utente per la connessione bridge «%s»..." +- +-#~ msgid "Bridge connection '%s' active" +-#~ msgstr "Connessione bridge «%s» attiva" +- +-#~ msgid "New Mobile Broadband (CDMA) connection..." +-#~ msgstr "Nuova connessione a banda larga mobile (CDMA)..." +- +-#~ msgid "You are now connected to the CDMA network." +-#~ msgstr "Attualmente connessi alla rete CDMA." +- +-#~ msgid "CDMA network." +-#~ msgstr "Rete CDMA" +- +-#~ msgid "New Mobile Broadband (GSM) connection..." +-#~ msgstr "Nuova connessione a banda larga mobile (GSM)..." +- +-#~ msgid "You are now connected to the GSM network." +-#~ msgstr "Attualmente connessi alla rete GSM." +- +-#~ msgid "GSM network." +-#~ msgstr "Rete GSM" +- +-#~ msgid "Auto InfiniBand" +-#~ msgstr "InfiniBand automatica" +- +-#~ msgid "InfiniBand Networks (%s)" +-#~ msgstr "Reti InfiniBand (%s)" +- +-#~ msgid "InfiniBand Network (%s)" +-#~ msgstr "Rete InfiniBand (%s)" +- +-#~ msgid "InfiniBand Networks" +-#~ msgstr "Reti InfiniBand" +- +-#~ msgid "InfiniBand Network" +-#~ msgstr "Rete InfiniBand" +- +-#~ msgid "You are now connected to the InfiniBand network." +-#~ msgstr "Attualmente connessi alla rete InfiniBand." +- +-#~ msgid "Preparing InfiniBand connection '%s'..." +-#~ msgstr "Preparazione della connessione InfiniBand «%s»..." +- +-#~ msgid "Configuring InfiniBand connection '%s'..." +-#~ msgstr "Configurazione della connessione InfiniBand «%s»..." +- +-#~ msgid "User authentication required for InfiniBand connection '%s'..." +-#~ msgstr "" +-#~ "Richiesta autenticazione utente per la connessione InfiniBand «%s»..." +- +-#~ msgid "InfiniBand connection '%s' active" +-#~ msgstr "Connessione InfiniBand «%s» attiva" +- +-#~ msgid "You are now connected to the teamed network." +-#~ msgstr "Attualmente connessi alla rete team." +- +-#~ msgid "Preparing team connection '%s'..." +-#~ msgstr "Preparazione della connessione team «%s»..." +- +-#~ msgid "Configuring team connection '%s'..." +-#~ msgstr "Configurazione della connessione team «%s»..." +- +-#~ msgid "User authentication required for team connection '%s'..." +-#~ msgstr "Richiesta autenticazione utente per la connessione team «%s»..." +- +-#~ msgid "Team connection '%s' active" +-#~ msgstr "Connessione team «%s» attiva" +- +-#~ msgid "You are now connected to the VLAN." +-#~ msgstr "Attualmente connessi alla VLAN." +- +-#~ msgid "Preparing VLAN connection '%s'..." +-#~ msgstr "Avvio della connessione VLAN «%s»..." +- +-#~ msgid "Configuring VLAN connection '%s'..." +-#~ msgstr "Avvio della connessione VLAN «%s»..." +- +-#~ msgid "User authentication required for VLAN connection '%s'..." +-#~ msgstr "Richiesta autenticazione utente per la connessione VLAN «%s»..." +- +-#~ msgid "VLAN connection '%s' active" +-#~ msgstr "Connessione VLAN «%s» attiva" +- +-#~ msgid "WiMAX Mobile Broadband (%s)" +-#~ msgstr "Banda larga mobile WiMAX (%s)" +- +-#~ msgid "WiMAX Mobile Broadband" +-#~ msgstr "Banda larga mobile WiMAX" +- +-#~ msgid "WiMAX is disabled" +-#~ msgstr "WiMAX disabilitata" +- +-#~ msgid "WiMAX is disabled by hardware switch" +-#~ msgstr "WiMAX disabilitata da interruttore hardware" +- +-#~ msgid "You are now connected to the WiMAX network." +-#~ msgstr "Attualmente connessi alla rete WiMAX." +- +-#~ msgid "%d dB" +-#~ msgstr "%d dB" +- +-#~ msgctxt "WiMAX CINR" +-#~ msgid "unknown" +-#~ msgstr "sconosciuto" +- +-#~ msgctxt "WiMAX Base Station ID" +-#~ msgid "unknown" +-#~ msgstr "sconosciuto" +- +-#~ msgid "WiMAX (%s)" +-#~ msgstr "WiMAX (%s)" +- +-#~ msgid "CINR:" +-#~ msgstr "CINR:" +- +-#~ msgid "BSID:" +-#~ msgstr "BSID:" +- +-#~ msgid "_Device MAC address:" +-#~ msgstr "Indirizzo _MAC dispositivo:" +- +-#~ msgid "Any" +-#~ msgstr "Qualunque" +- +-#~ msgid "3G (UMTS/HSPA)" +-#~ msgstr "3G (UMTS/HSPA)" +- +-#~ msgid "2G (GPRS/EDGE)" +-#~ msgstr "2G (GPRS/EDGE)" +- +-#~ msgid "Prefer 3G (UMTS/HSPA)" +-#~ msgstr "Preferire 3G (UMTS/HSPA)" +- +-#~ msgid "Prefer 2G (GPRS/EDGE)" +-#~ msgstr "Preferire 2G (GPRS/EDGE)" +- +-#~ msgid "Prefer 4G (LTE)" +-#~ msgstr "Preferire 4G (LTE)" +- +-#~ msgid "Use only 4G (LTE)" +-#~ msgstr "Usare solo 4G (LTE)" +- +-#~ msgid "I_mport team configuration from a file..." +-#~ msgstr "I_mporta configurazione team da file..." +- +-#~ msgid "WiMAX" +-#~ msgstr "WiMAX" +- +-#~ msgid "Error saving connection" +-#~ msgstr "Errore nel salvare la connessione" +- +-#~ msgid "The property '%s' / '%s' is invalid: %d" +-#~ msgstr "La proprietà «%s» / «%s» non è valida: %d" +- +-#~ msgid "" +-#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) " +-#~ "%s)." +-#~ msgstr "" +-#~ "Impossibile eseguire la configurazione Bluetooth (connessione a D-Bus non " +-#~ "riuscita: (%s) %s)." +- +-#~ msgid "" +-#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) " +-#~ "%s)." +-#~ msgstr "" +-#~ "Impossibile eseguire la configurazione Bluetooth (errore durante la " +-#~ "ricerca di NetworkManager: (%s) %s)." +- +-#~ msgid "Use your mobile phone as a network device (PAN/NAP)" +-#~ msgstr "Usa il telefono cellulare come dispositivo di rete (PAN/NAP)" +- +-#~ msgid "Access the Internet using your mobile phone (DUN)" +-#~ msgstr "Accesso a Internet usando il telefono cellulare (DUN)" +- +-#~ msgid "Error: %s" +-#~ msgstr "Errore: %s" +- +-#~ msgid "Failed to create DUN connection: %s" +-#~ msgstr "Creazione connessione DUN non riuscita: %s" +- +-#~ msgid "Your phone is now ready to use!" +-#~ msgstr "Il telefono è pronto all'uso." +- +-#~ msgid "Mobile wizard was canceled" +-#~ msgstr "L'assistente alla connessione mobile è stato annullato" +- +-#~ msgid "Unknown phone device type (not GSM or CDMA)" +-#~ msgstr "Tipo di telefono sconosciuto (né GSM né CDMA)" +- +-#~ msgid "failed to connect to the phone." +-#~ msgstr "connessione al telefono non riuscita." +- +-#~ msgid "error getting bus connection" +-#~ msgstr "errore nel recuperare il bus della connessione" +- +-#~ msgid "unexpectedly disconnected from the phone." +-#~ msgstr "disconnessione inattesa dal telefono." +- +-#~ msgid "timed out detecting phone details." +-#~ msgstr "tempo esaurito nel rilevare i dettagli del telefono." +- +-#~ msgid "Detecting phone configuration..." +-#~ msgstr "Rilevazione configurazione telefono..." +- +-#~ msgid "" +-#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-" +-#~ "Networking connection." +-#~ msgstr "" +-#~ "L'adattatore Bluetooth predefinito deve essere abilitato prima di poter " +-#~ "impostare una connessione Dial-Up-Networking." +- +-#~ msgid "Failed to create PAN connection: %s" +-#~ msgstr "Creazione connessione PAN non riuscita: %s" +- +-#~ msgid "%s Network" +-#~ msgstr "Rete %s" +- +-#~ msgid "Primary DNS:" +-#~ msgstr "DNS primario:" +- +-#~ msgid "Secondary DNS:" +-#~ msgstr "DNS secondario:" +- +-#~ msgid "Ternary DNS:" +-#~ msgstr "DNS terziario:" +- +-#~ msgid "_Save..." +-#~ msgstr "_Salva..." +- +-#~ msgid "_Edit..." +-#~ msgstr "_Modifica..." +- +-#~ msgid "_Delete..." +-#~ msgstr "_Elimina..." +- +-#~ msgid "Automatic (PPP)" +-#~ msgstr "Automatico (PPP)" +- +-#~ msgid "Automatic (PPP) addresses only" +-#~ msgstr "Automatico (PPP) solo indirizzi" +- +-#~ msgid "unknown modem type." +-#~ msgstr "tipo di modem sconosciuto." +diff --git a/po/ja.po b/po/ja.po +index 727a69a..3e9e83f 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -11,24 +11,24 @@ + # Takayoshi OKANO , 2011. + # Jiro Matsuzawa , 2013. + # Hajime Taira , 2013. +-# kmoriguc , 2017. #zanata ++# amoewaki , 2017. #zanata + # lrintel , 2017. #zanata + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2017-05-29 19:14+0200\n" +-"PO-Revision-Date: 2017-05-19 12:37+0000\n" +-"Last-Translator: kmoriguc \n" ++"POT-Creation-Date: 2017-11-07 19:40+0100\n" ++"PO-Revision-Date: 2017-12-04 09:21+0000\n" ++"Last-Translator: amoewaki \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.1.1\n" ++"X-Generator: Zanata 4.3.2\n" + +-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175 ++#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191 + msgid "Network" + msgstr "ネットワーク" + +@@ -37,7 +37,7 @@ msgid "Manage your network connections" + msgstr "ネットワーク接続を管理" + + #: ../nm-connection-editor.desktop.in.h:1 +-#: ../src/connection-editor/nm-connection-editor.ui.h:1 ++#: ../src/connection-editor/nm-connection-list.ui.h:1 + msgid "Network Connections" + msgstr "ネットワーク接続" + +@@ -91,7 +91,7 @@ msgstr "スタンプ" + + #: ../org.gnome.nm-applet.gschema.xml.in.h:10 + msgid "Used to determine whether settings should be migrated to a new version." +-msgstr "セッティングが新規バージョンに移行すべきかどうかの判定に使用されます。" ++msgstr "設定を、新規バージョンに移行すべきかどうかの判定に使用されます。" + + #: ../org.gnome.nm-applet.gschema.xml.in.h:11 + msgid "Disable WiFi Create" +@@ -153,26 +153,26 @@ msgid "" + "The nm-connection-editor program works with NetworkManager to create and " + "edit existing connection profiles for NetworkManager." + msgstr "" +-"nm-connection-editor プログラムは NetworkManager と併用することで " +-"NetworkManager 用の接続プロファイルを作成し、また既存の接続プロファイルを編集" +-"します。" ++"nm-connection-editor プログラムは、NetworkManager と連携して NetworkManager " ++"用の接続プロファイルを作成し、また既存の接続プロファイルを編集します。" + + #: ../nm-connection-editor.appdata.xml.in.h:5 + msgid "The NetworkManager Developers" + msgstr "NetworkManager 開発者" + +-#: ../shared/nm-utils/nm-shared-utils.c:185 ++#: ../shared/nm-utils/nm-shared-utils.c:477 + #, c-format + msgid "object class '%s' has no property named '%s'" +-msgstr "オブジェクトクラス '%s' には '%s' という名前のプロパティーがありません" ++msgstr "" ++"オブジェクトクラス '%s' には、'%s' という名前のプロパティーがありません" + +-#: ../shared/nm-utils/nm-shared-utils.c:192 ++#: ../shared/nm-utils/nm-shared-utils.c:484 + #, c-format + msgid "property '%s' of object class '%s' is not writable" + msgstr "" + "オブジェクトクラス '%s' のプロパティー '%s' は、書き込み可能ではありません" + +-#: ../shared/nm-utils/nm-shared-utils.c:199 ++#: ../shared/nm-utils/nm-shared-utils.c:491 + #, c-format + msgid "" + "construct property \"%s\" for object '%s' can't be set after construction" +@@ -180,43 +180,56 @@ msgstr "" + "オブジェクト '%s' のコンストラクトプロパティー \"%s\" は構築後に設定できませ" + "ん" + +-#: ../shared/nm-utils/nm-shared-utils.c:207 ++#: ../shared/nm-utils/nm-shared-utils.c:499 + #, c-format + msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" + msgstr "" + "'%s::%s' は有効なプロパティー名ではありません。'%s' は GObject サブタイプでは" + "ありません" + +-#: ../shared/nm-utils/nm-shared-utils.c:216 ++#: ../shared/nm-utils/nm-shared-utils.c:508 + #, c-format + msgid "unable to set property '%s' of type '%s' from value of type '%s'" +-msgstr "プロパティー '%s' (タイプ '%s') をタイプ '%s' の値から設定できません" ++msgstr "プロパティー '%s' (タイプ '%s') を、タイプ '%s' の値から設定できません" + +-#: ../shared/nm-utils/nm-shared-utils.c:227 ++#: ../shared/nm-utils/nm-shared-utils.c:519 + #, c-format + msgid "" + "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " + "type '%s'" + msgstr "" +-"値 \"%s\" (タイプ '%s') がプロパティー '%s' (タイプ '%s') に対して無効または" +-"範囲外です" ++"値 \"%s\" (タイプ '%s') が、プロパティー '%s' (タイプ '%s') に対して無効また" ++"は範囲外です" + +-#. *************************************************************************** + #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99 + msgid "802.1X authentication" + msgstr "802.1X の認証" + +-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1 ++#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349 ++#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1 + #: ../src/connection-editor/ce-ip6-routes.ui.h:1 + #: ../src/connection-editor/ce-new-connection.ui.h:1 + #: ../src/connection-editor/ce-page-dcb.ui.h:17 + #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1 +-#: ../src/connection-editor/nm-connection-editor.ui.h:8 +-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1 ++#: ../src/connection-editor/connection-helpers.c:308 ++#: ../src/connection-editor/connection-helpers.c:771 ++#: ../src/connection-editor/nm-connection-editor.ui.h:5 ++#: ../src/connection-editor/page-bluetooth.c:311 ++#: ../src/connection-editor/page-mobile.c:543 ++#: ../src/connection-editor/page-proxy.c:121 ++#: ../src/connection-editor/page-team.c:344 ++#: ../src/connection-editor/page-team-port.c:206 ++#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1 ++#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1 ++#: ../src/libnma/nma-vpn-password-dialog.c:209 ++#: ../src/libnma/nma-wifi-dialog.c:1066 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209 ++#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465 + msgid "_Cancel" + msgstr "取り消し(_C)" + +-#: ../src/8021x.ui.h:3 ++#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072 ++#: ../src/libnm-gtk/nm-wifi-dialog.c:1073 + msgid "C_onnect" + msgstr "接続(_O)" + +@@ -232,37 +245,37 @@ msgstr "アドホック" + msgid "secure." + msgstr "セキュア。" + +-#: ../src/applet.c:381 ++#: ../src/applet.c:392 + msgid "Failed to add/activate connection" +-msgstr "接続の追加、あるいは有効にするのに失敗しました" ++msgstr "接続の追加、あるいは有効化に失敗しました" + +-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472 +-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410 ++#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483 ++#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411 + msgid "Unknown error" + msgstr "不明なエラー" + +-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539 +-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413 ++#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539 ++#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414 + msgid "Connection failure" + msgstr "接続に失敗" + +-#: ../src/applet.c:435 ++#: ../src/applet.c:446 + msgid "Device disconnect failed" + msgstr "デバイスの切断に失敗しました" + +-#: ../src/applet.c:440 ++#: ../src/applet.c:451 + msgid "Disconnect failure" + msgstr "切断失敗" + +-#: ../src/applet.c:470 ++#: ../src/applet.c:481 + msgid "Connection activation failed" + msgstr "接続のアクティベートに失敗しました" + +-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126 ++#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127 + msgid "Don’t show this message again" + msgstr "このメッセージを今後表示しない" + +-#: ../src/applet.c:883 ++#: ../src/applet.c:899 + #, c-format + msgid "" + "\n" +@@ -272,7 +285,7 @@ msgstr "" + "\n" + "ネットワーク接続が中断されたため、VPN 接続 '%s' は切断されました。" + +-#: ../src/applet.c:885 ++#: ../src/applet.c:901 + #, c-format + msgid "" + "\n" +@@ -282,7 +295,7 @@ msgstr "" + "\n" + "ネットワーク接続が中断されたため、VPN 接続 '%s' は失敗しました。" + +-#: ../src/applet.c:887 ++#: ../src/applet.c:903 + #, c-format + msgid "" + "\n" +@@ -291,7 +304,7 @@ msgstr "" + "\n" + "VPN サービスが予期せずに停止したため、VPN 接続 '%s' は失敗しました。" + +-#: ../src/applet.c:889 ++#: ../src/applet.c:905 + #, c-format + msgid "" + "\n" +@@ -301,7 +314,7 @@ msgstr "" + "\n" + "VPN サービスが無効な設定を返したため、VPN 接続 '%s'は失敗しました。" + +-#: ../src/applet.c:891 ++#: ../src/applet.c:907 + #, c-format + msgid "" + "\n" +@@ -310,7 +323,7 @@ msgstr "" + "\n" + "接続試行がタイムアウトしたため、VPN 接続 '%s' は失敗しました。" + +-#: ../src/applet.c:893 ++#: ../src/applet.c:909 + #, c-format + msgid "" + "\n" +@@ -319,7 +332,7 @@ msgstr "" + "\n" + "VPN サービスが時間内に開始しなかったため、VPN 接続 '%s' は失敗しました。" + +-#: ../src/applet.c:895 ++#: ../src/applet.c:911 + #, c-format + msgid "" + "\n" +@@ -328,25 +341,25 @@ msgstr "" + "\n" + "VPN サービスが開始に失敗したため、VPN 接続 '%s' は失敗しました。" + +-#: ../src/applet.c:897 ++#: ../src/applet.c:913 + #, c-format + msgid "" + "\n" + "The VPN connection “%s” failed because there were no valid VPN secrets." + msgstr "" + "\n" +-"有効な VPN secret がないため、VPN 接続 '%s' は失敗しました。" ++"有効な VPN シークレットがないため、VPN 接続 '%s' は失敗しました。" + +-#: ../src/applet.c:899 ++#: ../src/applet.c:915 + #, c-format + msgid "" + "\n" + "The VPN connection “%s” failed because of invalid VPN secrets." + msgstr "" + "\n" +-"VPN secret が無効なため、VPN 接続 '%s' は失敗しました。" ++"VPN シークレットが無効なため、VPN 接続 '%s' は失敗しました。" + +-#: ../src/applet.c:904 ++#: ../src/applet.c:920 + #, c-format + msgid "" + "\n" +@@ -355,7 +368,7 @@ msgstr "" + "\n" + "VPN 接続 '%s' は失敗しました。" + +-#: ../src/applet.c:931 ++#: ../src/applet.c:947 + #, c-format + msgid "" + "VPN connection has been successfully established.\n" +@@ -366,19 +379,19 @@ msgstr "" + "\n" + "%s\n" + +-#: ../src/applet.c:933 ++#: ../src/applet.c:949 + msgid "VPN connection has been successfully established.\n" + msgstr "VPN 接続の確立に成功しました。\n" + +-#: ../src/applet.c:935 ++#: ../src/applet.c:951 + msgid "VPN Login Message" + msgstr "VPN ログインメッセージ" + +-#: ../src/applet.c:943 ../src/applet.c:983 ++#: ../src/applet.c:959 ../src/applet.c:999 + msgid "VPN Connection Failed" + msgstr "VPN 接続は失敗しました" + +-#: ../src/applet.c:987 ++#: ../src/applet.c:1003 + #, c-format + msgid "" + "\n" +@@ -391,7 +404,7 @@ msgstr "" + "\n" + "%s" + +-#: ../src/applet.c:990 ++#: ../src/applet.c:1006 + #, c-format + msgid "" + "\n" +@@ -404,200 +417,200 @@ msgstr "" + "\n" + "%s" + +-#: ../src/applet.c:1279 ++#: ../src/applet.c:1295 + msgid "device not ready (firmware missing)" + msgstr "デバイスの準備ができていません (ファームウェア未検出)" + +-#: ../src/applet.c:1281 ++#: ../src/applet.c:1297 + msgid "device not ready" + msgstr "デバイスの準備ができていません" + + #. Notify user of unmanaged or unavailable device +-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109 ++#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109 + msgid "disconnected" + msgstr "切断されています" + +-#: ../src/applet.c:1307 ++#: ../src/applet.c:1323 + msgid "Disconnect" + msgstr "切断する" + +-#: ../src/applet.c:1321 ++#: ../src/applet.c:1337 + msgid "device not managed" + msgstr "デバイスは管理されていません" + +-#: ../src/applet.c:1394 ++#: ../src/applet.c:1410 + msgid "No network devices available" + msgstr "ネットワークデバイスがありません" + +-#: ../src/applet.c:1448 ++#: ../src/applet.c:1464 + msgid "_VPN Connections" + msgstr "VPN 接続(_V)" + +-#: ../src/applet.c:1492 ++#: ../src/applet.c:1508 + msgid "_Configure VPN…" + msgstr "VPN を設定(_C)..." + +-#: ../src/applet.c:1495 ++#: ../src/applet.c:1511 + msgid "_Add a VPN connection…" + msgstr "VPN 接続を追加(_A)" + +-#: ../src/applet.c:1601 ++#: ../src/applet.c:1617 + msgid "NetworkManager is not running…" + msgstr "NetworkManager は実行されていません..." + +-#: ../src/applet.c:1606 ../src/applet.c:2671 ++#: ../src/applet.c:1622 ../src/applet.c:2687 + msgid "Networking disabled" + msgstr "ネットワークは無効になっています" + + #. 'Enable Networking' item +-#: ../src/applet.c:1816 ++#: ../src/applet.c:1832 + msgid "Enable _Networking" + msgstr "ネットワークを有効にする(_N)" + + #. 'Enable Wi-Fi' item +-#: ../src/applet.c:1825 ++#: ../src/applet.c:1841 + msgid "Enable _Wi-Fi" + msgstr "Wi-Fi を有効にする(_W)" + + #. 'Enable Mobile Broadband' item +-#: ../src/applet.c:1834 ++#: ../src/applet.c:1850 + msgid "Enable _Mobile Broadband" + msgstr "モバイルブロードバンドを有効にする(_M)" + + #. Toggle notifications item +-#: ../src/applet.c:1846 ++#: ../src/applet.c:1862 + msgid "Enable N_otifications" + msgstr "通知を有効にする(_O)" + + #. 'Connection Information' item +-#: ../src/applet.c:1858 ++#: ../src/applet.c:1874 + msgid "Connection _Information" + msgstr "接続情報(_I)" + + #. 'Edit Connections...' item +-#: ../src/applet.c:1866 ++#: ../src/applet.c:1882 + msgid "Edit Connections…" + msgstr "接続を編集する..." + +-#: ../src/applet.c:1880 ++#: ../src/applet.c:1896 + msgid "_About" + msgstr "このアプリケーションについて(_A)" + +-#: ../src/applet.c:2191 ++#: ../src/applet.c:2207 + #, c-format + msgid "You are now connected to “%s”." + msgstr "現在'%s' に接続しています。" + +-#: ../src/applet.c:2231 ++#: ../src/applet.c:2247 + msgid "Disconnected" + msgstr "切断されました" + +-#: ../src/applet.c:2232 ++#: ../src/applet.c:2248 + msgid "The network connection has been disconnected." + msgstr "ネットワーク接続が切断されました。" + +-#: ../src/applet.c:2534 ++#: ../src/applet.c:2550 + #, c-format + msgid "Preparing network connection “%s”…" + msgstr "ネットワーク接続 '%s' を準備中..." + +-#: ../src/applet.c:2537 ++#: ../src/applet.c:2553 + #, c-format + msgid "User authentication required for network connection “%s”…" + msgstr "ネットワーク接続 '%s' にはユーザー認証が必要です..." + +-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125 +-#: ../src/mobile-helpers.c:608 ++#: ../src/applet.c:2556 ../src/applet-device-bt.c:125 ++#: ../src/mobile-helpers.c:607 + #, c-format + msgid "Requesting a network address for “%s”…" + msgstr "'%s' のネットワークアドレスを要求しています..." + +-#: ../src/applet.c:2543 ++#: ../src/applet.c:2559 + #, c-format + msgid "Network connection “%s” active" + msgstr "ネットワーク接続 '%s' はアクティブです。" + +-#: ../src/applet.c:2616 ++#: ../src/applet.c:2632 + #, c-format + msgid "Starting VPN connection “%s”…" + msgstr "VPN 接続 '%s' を開始しています..." + +-#: ../src/applet.c:2619 ++#: ../src/applet.c:2635 + #, c-format + msgid "User authentication required for VPN connection “%s”…" + msgstr "VPN 接続 '%s' にはユーザー認証が必要です..." + +-#: ../src/applet.c:2622 ++#: ../src/applet.c:2638 + #, c-format + msgid "Requesting a VPN address for “%s”…" + msgstr "'%s' の VPN アドレスを要求しています..." + +-#: ../src/applet.c:2625 ++#: ../src/applet.c:2641 + #, c-format + msgid "VPN connection active" + msgstr "VPN 接続はアクティブです" + +-#: ../src/applet.c:2675 ++#: ../src/applet.c:2691 + msgid "No network connection" + msgstr "ネットワーク接続がありません" + +-#: ../src/applet.c:3276 ++#: ../src/applet.c:3292 + msgid "NetworkManager Applet" + msgstr "NetworkManager アプレット" + + #: ../src/applet-device-broadband.c:161 + msgid "Wrong PUK code; please contact your provider." +-msgstr "PUK が違います; プロバイダーに連絡してください。" ++msgstr "PUK が違います。プロバイダーに連絡してください。" + + #: ../src/applet-device-broadband.c:203 + msgid "Wrong PIN code; please contact your provider." +-msgstr "PIN が違います; プロバイダーに連絡してください。" ++msgstr "PIN が違います。プロバイダーに連絡してください。" + + #. Start the spinner to show the progress of the unlock + #: ../src/applet-device-broadband.c:254 + msgid "Sending unlock code…" + msgstr "ロック解除コードを送信中..." + +-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506 ++#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507 + #, c-format + msgid "Mobile Broadband (%s)" + msgstr "モバイルブロードバンド (%s)" + +-#: ../src/applet-device-broadband.c:738 +-#: ../src/connection-editor/connection-helpers.c:107 ++#: ../src/applet-device-broadband.c:739 ++#: ../src/connection-editor/connection-helpers.c:108 + #: ../src/connection-editor/page-mobile.c:308 + #: ../src/libnm-gtk/nm-ui-utils.c:329 + msgid "Mobile Broadband" + msgstr "モバイルブロードバンド" + +-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75 +-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906 ++#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75 ++#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907 + msgid "Available" + msgstr "利用可能" + + #. Default connection item +-#: ../src/applet-device-broadband.c:803 ++#: ../src/applet-device-broadband.c:805 + msgid "New Mobile Broadband connection…" + msgstr "新規のモバイルブロードバンド接続…" + +-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87 +-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308 ++#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87 ++#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309 + msgid "Connection Established" + msgstr "接続を確立しました" + +-#: ../src/applet-device-broadband.c:818 ++#: ../src/applet-device-broadband.c:820 + msgid "You are now connected to the Mobile Broadband network." + msgstr "現在、モバイルブロードバンドネットワークに接続しています。" + +-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964 ++#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966 + msgid "Mobile Broadband network." + msgstr "モバイルブロードバンドネットワーク" + +-#: ../src/applet-device-broadband.c:959 ++#: ../src/applet-device-broadband.c:961 + msgid "You are now registered on the home network." + msgstr "ホームネットワークに接続しました。" + +-#: ../src/applet-device-broadband.c:965 ++#: ../src/applet-device-broadband.c:967 + msgid "You are now registered on a roaming network." + msgstr "ローミングネットワークに接続しました。" + +@@ -605,22 +618,22 @@ msgstr "ローミングネットワークに接続しました。" + msgid "You are now connected to the mobile broadband network." + msgstr "現在、モバイルブロードバンドネットワークに接続しています。" + +-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599 ++#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598 + #, c-format + msgid "Preparing mobile broadband connection “%s”…" + msgstr "モバイルブロードバンド接続 '%s' を準備中です..." + +-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602 ++#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601 + #, c-format + msgid "Configuring mobile broadband connection “%s”…" + msgstr "モバイルブロードバンド接続 '%s' を設定中です..." + +-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605 ++#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604 + #, c-format + msgid "User authentication required for mobile broadband connection “%s”…" + msgstr "モバイルブロードバンド接続 '%s' にはユーザー認証が必要です..." + +-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627 ++#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626 + #, c-format + msgid "Mobile broadband connection “%s” active" + msgstr "モバイルブロードバンド接続 '%s' はアクティブです。" +@@ -632,39 +645,39 @@ msgstr "自動 Ethernet" + #: ../src/applet-device-ethernet.c:82 + #, c-format + msgid "Ethernet Networks (%s)" +-msgstr "Ethernet ネットワーク (%s)" ++msgstr " Ethernet ネットワーク (%s)" + + #: ../src/applet-device-ethernet.c:84 + #, c-format + msgid "Ethernet Network (%s)" +-msgstr "Ethernet ネットワーク (%s)" ++msgstr " Ethernet ネットワーク (%s)" + + #: ../src/applet-device-ethernet.c:87 + msgid "Ethernet Networks" +-msgstr "Ethernet ネットワーク" ++msgstr " Ethernet ネットワーク" + + #: ../src/applet-device-ethernet.c:89 + msgid "Ethernet Network" +-msgstr "Ethernet ネットワーク" ++msgstr " Ethernet ネットワーク" + + #: ../src/applet-device-ethernet.c:133 + msgid "You are now connected to the ethernet network." +-msgstr "Ethernet ネットワークに接続しました。" ++msgstr " Ethernet ネットワークに接続しました。" + + #: ../src/applet-device-ethernet.c:161 + #, c-format + msgid "Preparing ethernet network connection “%s”…" +-msgstr "Ethernet ネットワーク接続 '%s' を準備中です..." ++msgstr " Ethernet ネットワーク接続 '%s' を準備中です..." + + #: ../src/applet-device-ethernet.c:164 + #, c-format + msgid "Configuring ethernet network connection “%s”…" +-msgstr "Ethernet ネットワーク接続 '%s' を設定中です..." ++msgstr " Ethernet ネットワーク接続 '%s' を設定中です..." + + #: ../src/applet-device-ethernet.c:167 + #, c-format + msgid "User authentication required for ethernet network connection “%s”…" +-msgstr "Ethernet ネットワーク接続 '%s'にはユーザー認証が必要です..." ++msgstr " Ethernet ネットワーク接続 '%s'にはユーザー認証が必要です..." + + #: ../src/applet-device-ethernet.c:170 + #, c-format +@@ -680,6 +693,18 @@ msgstr "Ethernet ネットワーク接続 '%s' はアクティブです" + msgid "DSL authentication" + msgstr "DSL 認証" + ++#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060 ++#: ../src/connection-editor/ce-ip4-routes.ui.h:2 ++#: ../src/connection-editor/ce-ip6-routes.ui.h:2 ++#: ../src/connection-editor/ce-page-dcb.ui.h:18 ++#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2 ++#: ../src/connection-editor/page-bluetooth.c:313 ++#: ../src/connection-editor/page-mobile.c:545 ++#: ../src/libnma/nma-vpn-password-dialog.c:210 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466 ++msgid "_OK" ++msgstr "OK(_O)" ++ + #: ../src/applet-device-wifi.c:225 + msgid "_Connect to Hidden Wi-Fi Network…" + msgstr "非表示 Wi-Fi ネットワークに接続する(_C)" +@@ -692,7 +717,7 @@ msgstr "新規 Wi-Fi ネットワークを作成(_N)" + msgid "(none)" + msgstr "(なし)" + +-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408 ++#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409 + msgid "Failed to add new connection" + msgstr "新規接続の追加に失敗しました" + +@@ -700,77 +725,77 @@ msgstr "新規接続の追加に失敗しました" + msgid "Insufficient privileges." + msgstr "権限が不足しています。" + +-#: ../src/applet-device-wifi.c:838 ++#: ../src/applet-device-wifi.c:839 + #, c-format + msgid "Wi-Fi Networks (%s)" + msgstr "Wi-Fi ネットワーク (%s)" + +-#: ../src/applet-device-wifi.c:840 ++#: ../src/applet-device-wifi.c:841 + #, c-format + msgid "Wi-Fi Network (%s)" + msgstr "Wi-Fi ネットワーク (%s)" + +-#: ../src/applet-device-wifi.c:842 ++#: ../src/applet-device-wifi.c:843 + msgid "Wi-Fi Network" + msgid_plural "Wi-Fi Networks" + msgstr[0] "Wi-Fi ネットワーク" + +-#: ../src/applet-device-wifi.c:871 ++#: ../src/applet-device-wifi.c:872 + msgid "Wi-Fi is disabled" + msgstr "Wi-Fi は無効になっています" + +-#: ../src/applet-device-wifi.c:872 ++#: ../src/applet-device-wifi.c:873 + msgid "Wi-Fi is disabled by hardware switch" + msgstr "Wi-Fi はハードウェアのスイッチで無効になっています" + +-#: ../src/applet-device-wifi.c:933 ++#: ../src/applet-device-wifi.c:934 + msgid "More networks" + msgstr "その他のネットワーク" + +-#: ../src/applet-device-wifi.c:1122 ++#: ../src/applet-device-wifi.c:1123 + msgid "Wi-Fi Networks Available" + msgstr "Wi-Fi ネットワークは利用可能です" + +-#: ../src/applet-device-wifi.c:1123 ++#: ../src/applet-device-wifi.c:1124 + msgid "Use the network menu to connect to a Wi-Fi network" + msgstr "Wi-Fi ネットワークに接続するにはネットワークメニューを使用します。" + +-#: ../src/applet-device-wifi.c:1307 ++#: ../src/applet-device-wifi.c:1308 + #, c-format + msgid "You are now connected to the Wi-Fi network “%s”." + msgstr "Wi-Fi ネットワーク '%s' に接続しました。" + +-#: ../src/applet-device-wifi.c:1342 ++#: ../src/applet-device-wifi.c:1343 + #, c-format + msgid "Preparing Wi-Fi network connection “%s”…" + msgstr "Wi-Fi ネットワーク接続 '%s' を準備中..." + +-#: ../src/applet-device-wifi.c:1345 ++#: ../src/applet-device-wifi.c:1346 + #, c-format + msgid "Configuring Wi-Fi network connection “%s”…" + msgstr "Wi-Fi ネットワーク接続 '%s' を設定中です..." + +-#: ../src/applet-device-wifi.c:1348 ++#: ../src/applet-device-wifi.c:1349 + #, c-format + msgid "User authentication required for Wi-Fi network “%s”…" + msgstr "Wi-Fi ネットワーク '%s' にはユーザー認証が必要です..." + +-#: ../src/applet-device-wifi.c:1351 ++#: ../src/applet-device-wifi.c:1352 + #, c-format + msgid "Requesting a Wi-Fi network address for “%s”…" + msgstr "'%s' の Wi-Fi ネットワークアドレスを要求しています..." + +-#: ../src/applet-device-wifi.c:1362 ++#: ../src/applet-device-wifi.c:1363 + #, c-format + msgid "Wi-Fi network connection “%s” active: %s (%d%%)" + msgstr "Wi-Fi ネットワーク接続 '%s' はアクティブです: %s (%d%%)" + +-#: ../src/applet-device-wifi.c:1366 ++#: ../src/applet-device-wifi.c:1367 + #, c-format + msgid "Wi-Fi network connection “%s” active" + msgstr " Wi-Fi ネットワーク接続 '%s' はアクティブです" + +-#: ../src/applet-device-wifi.c:1385 ++#: ../src/applet-device-wifi.c:1386 + msgid "Failed to activate connection" + msgstr "接続のアクティベートに失敗しました" + +@@ -778,227 +803,231 @@ msgstr "接続のアクティベートに失敗しました" + msgid "Error displaying connection information:" + msgstr "接続情報の表示中にエラーが起きました:" + +-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379 ++#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381 + #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948 + #: ../src/wireless-security/wireless-security.c:448 + msgid "LEAP" + msgstr "LEAP" + +-#: ../src/applet-dialogs.c:74 ++#: ../src/applet-dialogs.c:75 + msgid "Dynamic WEP" + msgstr "動的 WEP" + +-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228 +-#: ../src/applet-dialogs.c:230 ++#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229 ++#: ../src/applet-dialogs.c:231 + msgid "WPA/WPA2" + msgstr "WPA/WPA2" + + #. Create the expander +-#: ../src/applet-dialogs.c:151 ++#: ../src/applet-dialogs.c:152 + msgid "More addresses" + msgstr "その他のアドレス" + +-#: ../src/applet-dialogs.c:226 ++#: ../src/applet-dialogs.c:227 + msgid "WEP" + msgstr "WEP" + +-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243 +-#: ../src/connection-editor/page-wifi-security.c:330 ++#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244 ++#: ../src/connection-editor/page-wifi-security.c:332 + msgctxt "Wi-Fi/Ethernet security" + msgid "None" + msgstr "なし" + +-#: ../src/applet-dialogs.c:260 ++#: ../src/applet-dialogs.c:261 + #, c-format + msgid "%s (default)" + msgstr "%s (デフォルト)" + +-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580 ++#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581 + #, c-format + msgid "%u Mb/s" + msgstr "%u Mb/s" + +-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582 ++#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583 + msgctxt "Speed" + msgid "Unknown" + msgstr "不明" + + #. Address +-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368 ++#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369 + msgctxt "Address" + msgid "Unknown" + msgstr "不明" + +-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420 ++#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421 + msgid "IP Address:" + msgstr "IP アドレス:" + +-#: ../src/applet-dialogs.c:369 ++#: ../src/applet-dialogs.c:370 + msgid "Broadcast Address:" + msgstr "ブロードキャストアドレス:" + + #. Prefix +-#: ../src/applet-dialogs.c:381 ++#: ../src/applet-dialogs.c:382 + msgctxt "Subnet Mask" + msgid "Unknown" + msgstr "不明" + +-#: ../src/applet-dialogs.c:382 ++#: ../src/applet-dialogs.c:383 + msgid "Subnet Mask:" + msgstr "サブネットマスク:" + +-#: ../src/applet-dialogs.c:492 ++#: ../src/applet-dialogs.c:493 + #, c-format + msgid "Ethernet (%s)" + msgstr "Ethernet (%s)" + +-#: ../src/applet-dialogs.c:495 ++#: ../src/applet-dialogs.c:496 + #, c-format + msgid "802.11 WiFi (%s)" + msgstr "802.11 Wi-Fi (%s)" + +-#: ../src/applet-dialogs.c:502 ++#: ../src/applet-dialogs.c:503 + #, c-format + msgid "GSM (%s)" + msgstr "GSM (%s)" + +-#: ../src/applet-dialogs.c:504 ++#: ../src/applet-dialogs.c:505 + #, c-format + msgid "CDMA (%s)" + msgstr "CDMA (%s)" + + #. --- General --- +-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810 ++#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811 + #: ../src/connection-editor/ce-page-team-port.ui.h:23 + #: ../src/connection-editor/ce-page-team.ui.h:48 + #: ../src/connection-editor/page-general.c:367 + msgid "General" + msgstr "全般" + +-#: ../src/applet-dialogs.c:516 ++#: ../src/applet-dialogs.c:517 + msgid "Interface:" + msgstr "インターフェース:" + +-#: ../src/applet-dialogs.c:536 ++#: ../src/applet-dialogs.c:537 + msgid "Hardware Address:" + msgstr "ハードウェアアドレス:" + + #. Driver +-#: ../src/applet-dialogs.c:550 ++#: ../src/applet-dialogs.c:551 + msgid "Driver:" + msgstr "ドライバー:" + +-#: ../src/applet-dialogs.c:585 ++#: ../src/applet-dialogs.c:586 + msgid "Speed:" + msgstr "速度:" + +-#: ../src/applet-dialogs.c:600 ++#: ../src/applet-dialogs.c:601 + msgid "Security:" +-msgstr "セキュリティ:" ++msgstr "セキュリティー:" + + #. --- IPv4 --- +-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851 ++#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852 + #: ../src/connection-editor/ce-page-team.ui.h:29 + msgid "IPv4" + msgstr "IPv4" + +-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689 ++#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690 + msgid "Default Route:" + msgstr "デフォルトルート:" + + #. --- IPv6 --- +-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873 ++#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874 + #: ../src/connection-editor/ce-page-team.ui.h:30 + msgid "IPv6" + msgstr "IPv6" + +-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882 ++#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883 + msgid "Ignored" + msgstr "無視" + +-#: ../src/applet-dialogs.c:815 ++#: ../src/applet-dialogs.c:816 + msgid "VPN Type:" + msgstr "VPN の種類:" + +-#: ../src/applet-dialogs.c:822 ++#: ../src/applet-dialogs.c:823 + msgid "VPN Gateway:" + msgstr "VPN ゲートウェイ:" + +-#: ../src/applet-dialogs.c:828 ++#: ../src/applet-dialogs.c:829 + msgid "VPN Username:" + msgstr "VPN ユーザー名:" + +-#: ../src/applet-dialogs.c:834 ++#: ../src/applet-dialogs.c:835 + msgid "VPN Banner:" + msgstr "VPN バナー:" + +-#: ../src/applet-dialogs.c:840 ++#: ../src/applet-dialogs.c:841 + msgid "Base Connection:" + msgstr "ベース接続:" + +-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343 ++#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343 + msgid "Unknown" + msgstr "不明" + + #. Shouldn't really happen but ... +-#: ../src/applet-dialogs.c:957 ++#: ../src/applet-dialogs.c:958 + msgid "No valid active connections found!" + msgstr "有効なアクティブ接続がありません!" + +-#: ../src/applet-dialogs.c:985 ++#: ../src/applet-dialogs.c:1007 + msgid "" +-"Copyright © 2004-2014 Red Hat, Inc.\n" ++"Copyright © 2004-2017 Red Hat, Inc.\n" + "Copyright © 2005-2008 Novell, Inc.\n" + "and many other community contributors and translators" + msgstr "" +-"Copyright © 2004-2014 Red Hat, Inc.\n" ++"Copyright © 2004-2017 Red Hat, Inc.\n" + "Copyright © 2005-2008 Novell, Inc.\n" + "and many other community contributors and translators" + +-#: ../src/applet-dialogs.c:988 ++#: ../src/applet-dialogs.c:1010 + msgid "" + "Notification area applet for managing your network devices and connections." + msgstr "ネットワークデバイスと接続を管理するための通知領域アプレット。" + +-#: ../src/applet-dialogs.c:990 ++#: ../src/applet-dialogs.c:1012 + msgid "NetworkManager Website" + msgstr "NetworkManager ウェブサイト" + +-#: ../src/applet-dialogs.c:1001 ++#: ../src/applet-dialogs.c:1016 ++msgid "translator-credits" ++msgstr "翻訳者クレジット" ++ ++#: ../src/applet-dialogs.c:1026 + msgid "" + "The NetworkManager Applet could not find some required resources (the .ui " + "file was not found)." + msgstr "" +-"NetworkManager アプレットは必要ないくつかのリソースをみつけられませんでした " +-"(.ui ファイルがみつかりません)。" ++"NetworkManager アプレットは、必要なリソースをいくつか見つけられませんでした " ++"(.ui ファイルが見つかりません)。" + +-#: ../src/applet-dialogs.c:1006 ++#: ../src/applet-dialogs.c:1031 + msgid "Missing resources" + msgstr "不足しているリソース" + +-#: ../src/applet-dialogs.c:1031 ++#: ../src/applet-dialogs.c:1057 + msgid "Mobile broadband network password" + msgstr "モバイルブロードバンドネットワークのパスワード" + +-#: ../src/applet-dialogs.c:1040 ++#: ../src/applet-dialogs.c:1066 + #, c-format + msgid "A password is required to connect to “%s”." + msgstr "'%s' への接続にはパスワードが必要です。" + +-#: ../src/applet-dialogs.c:1055 ++#: ../src/applet-dialogs.c:1081 + msgid "Password:" + msgstr "パスワード:" + +-#: ../src/applet-dialogs.c:1337 ++#: ../src/applet-dialogs.c:1363 + msgid "SIM PIN unlock required" + msgstr "SIM PIN のアンロックが必要です" + +-#: ../src/applet-dialogs.c:1338 ++#: ../src/applet-dialogs.c:1364 + msgid "SIM PIN Unlock Required" + msgstr "SIM PIN の開錠が必要です" + + #. FIXME: some warning about # of times you can enter incorrect PIN +-#: ../src/applet-dialogs.c:1340 ++#: ../src/applet-dialogs.c:1366 + #, c-format + msgid "" + "The mobile broadband device “%s” requires a SIM PIN code before it can be " +@@ -1007,25 +1036,25 @@ msgstr "" + "モバイルブロードバンドデバイス %s' を使用するには SIM PIN コードが必要です。" + + #. Translators: PIN code entry label +-#: ../src/applet-dialogs.c:1342 ++#: ../src/applet-dialogs.c:1368 + msgid "PIN code:" + msgstr "PIN コード:" + + #. Translators: Show/obscure PIN checkbox label +-#: ../src/applet-dialogs.c:1346 ++#: ../src/applet-dialogs.c:1372 + msgid "Show PIN code" + msgstr "PIN コードを表示" + +-#: ../src/applet-dialogs.c:1348 ++#: ../src/applet-dialogs.c:1374 + msgid "SIM PUK unlock required" + msgstr "SIM PUK のアンロックが必要です" + +-#: ../src/applet-dialogs.c:1349 ++#: ../src/applet-dialogs.c:1375 + msgid "SIM PUK Unlock Required" + msgstr "SIM PUK のアンロックが必要です" + + #. FIXME: some warning about # of times you can enter incorrect PUK +-#: ../src/applet-dialogs.c:1351 ++#: ../src/applet-dialogs.c:1377 + #, c-format + msgid "" + "The mobile broadband device “%s” requires a SIM PUK code before it can be " +@@ -1034,32 +1063,25 @@ msgstr "" + "モバイルブロードバンドデバイス '%s' を使用するには SIM PUK コードが必要です。" + + #. Translators: PUK code entry label +-#: ../src/applet-dialogs.c:1353 ++#: ../src/applet-dialogs.c:1379 + msgid "PUK code:" + msgstr "PUK コード:" + + #. Translators: New PIN entry label +-#: ../src/applet-dialogs.c:1356 ++#: ../src/applet-dialogs.c:1382 + msgid "New PIN code:" + msgstr "新規の PIN コード:" + + #. Translators: New PIN verification entry label +-#: ../src/applet-dialogs.c:1358 ++#: ../src/applet-dialogs.c:1384 + msgid "Re-enter new PIN code:" + msgstr "新規の PIN コードを再入力:" + + #. Translators: Show/obscure PIN/PUK checkbox label +-#: ../src/applet-dialogs.c:1363 ++#: ../src/applet-dialogs.c:1389 + msgid "Show PIN/PUK codes" + msgstr "PIN/PUK コードを表示" + +-#: ../src/connection-editor/ce-ip4-routes.ui.h:2 +-#: ../src/connection-editor/ce-ip6-routes.ui.h:2 +-#: ../src/connection-editor/ce-page-dcb.ui.h:18 +-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2 +-msgid "_OK" +-msgstr "OK(_O)" +- + #: ../src/connection-editor/ce-ip4-routes.ui.h:3 + #: ../src/connection-editor/ce-ip6-routes.ui.h:3 + #: ../src/connection-editor/ce-page.h:114 +@@ -1075,21 +1097,21 @@ msgstr "" + #: ../src/connection-editor/ce-page-bond.ui.h:12 + #: ../src/connection-editor/ce-page-bridge.ui.h:2 + #: ../src/connection-editor/ce-page-ip4.ui.h:7 +-#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++#: ../src/connection-editor/ce-page-ip6.ui.h:12 + #: ../src/connection-editor/ce-page-team.ui.h:13 +-#: ../src/connection-editor/nm-connection-editor.ui.h:3 ++#: ../src/connection-editor/nm-connection-list.ui.h:3 + msgid "_Add" + msgstr "追加(_A)" + +-#. Delete + #: ../src/connection-editor/ce-ip4-routes.ui.h:5 + #: ../src/connection-editor/ce-ip6-routes.ui.h:5 + #: ../src/connection-editor/ce-page-bond.ui.h:14 + #: ../src/connection-editor/ce-page-bridge.ui.h:4 + #: ../src/connection-editor/ce-page-ip4.ui.h:8 +-#: ../src/connection-editor/ce-page-ip6.ui.h:11 ++#: ../src/connection-editor/ce-page-ip6.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:15 +-#: ../src/connection-editor/nm-connection-list.c:711 ++#: ../src/connection-editor/connection-helpers.c:772 ++#: ../src/connection-editor/nm-connection-list.ui.h:4 + msgid "_Delete" + msgstr "削除(_D)" + +@@ -1101,7 +1123,7 @@ msgstr "自動取得したルートを無視する(_N)" + #: ../src/connection-editor/ce-ip4-routes.ui.h:7 + #: ../src/connection-editor/ce-ip6-routes.ui.h:7 + msgid "_Use this connection only for resources on its network" +-msgstr "そのネットワーク上のリソースのためにのみこの接続を使用(_U)" ++msgstr "この接続を、そのネットワーク上のリソースにのみ使用(_U)" + + #: ../src/connection-editor/ce-ip4-routes.ui.h:8 + #: ../src/connection-editor/ce-ip6-routes.ui.h:8 +@@ -1109,8 +1131,7 @@ msgid "" + "If enabled, this connection will never be used as the default network " + "connection." + msgstr "" +-"有効になっている場合、この接続は決してデフォルトのネットワーク接続として 使用" +-"されません。" ++"有効にすると、この接続はデフォルトのネットワーク接続として 使用されません。" + + #: ../src/connection-editor/ce-new-connection.ui.h:2 + msgid "C_reate…" +@@ -1127,10 +1148,10 @@ msgid "" + "If you are creating a VPN, and the VPN connection you wish to create does " + "not appear in the list, you may not have the correct VPN plugin installed." + msgstr "" +-"新規接続で使用したい接続の種類を選択してください。\n" ++"新規接続で使用する接続の種類を選択してください。\n" + "\n" + "VPN 接続を作成しようとしていて、作成したい VPN 接続の種類が一覧に無い場合は、" +-"正しい VPN プラグインをインストールしていないかもしれません。" ++"正しい VPN プラグインがインストールされていない可能性があります。" + + #: ../src/connection-editor/ce-page-bond.ui.h:1 + #: ../src/connection-editor/ce-page-team.ui.h:21 +@@ -1180,11 +1201,10 @@ msgstr "Bond 接続(_C):" + msgid "M_ode:" + msgstr "モード(_O):" + +-#. Edit + #: ../src/connection-editor/ce-page-bond.ui.h:13 + #: ../src/connection-editor/ce-page-bridge.ui.h:3 + #: ../src/connection-editor/ce-page-team.ui.h:14 +-#: ../src/connection-editor/nm-connection-list.c:695 ++#: ../src/connection-editor/nm-connection-list.ui.h:5 + msgid "_Edit" + msgstr "編集(_E)" + +@@ -1228,19 +1248,19 @@ msgstr "接断遅延(_D):" + + #: ../src/connection-editor/ce-page-bond.ui.h:23 + msgid "_Primary:" +-msgstr "プライマリ(_P):" ++msgstr "プライマリー(_P):" + + #: ../src/connection-editor/ce-page-bond.ui.h:24 + msgid "" + "The interface name of the primary device. If set, this device will always be " + "the active slave when it is available." + msgstr "" +-"もし、プライマリデバイスのインターフェース名を指定した場合、それが利用可能で" +-"ある時、このデバイスは常にアクティブなスレーブになります。" ++"プライマリーデバイスのインターフェース名を指定した場合、そのデバイスが利用可" ++"能である時、常にアクティブなスレーブになります。" + + #: ../src/connection-editor/ce-page-bond.ui.h:25 + #: ../src/connection-editor/ce-page-ethernet.ui.h:17 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:4 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:8 + #: ../src/connection-editor/ce-page-team.ui.h:17 + #: ../src/connection-editor/ce-page-vlan.ui.h:4 + #: ../src/connection-editor/ce-page-wifi.ui.h:8 +@@ -1249,7 +1269,7 @@ msgstr "MTU(_M):" + + #: ../src/connection-editor/ce-page-bond.ui.h:26 + #: ../src/connection-editor/ce-page-ethernet.ui.h:18 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:3 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:7 + #: ../src/connection-editor/ce-page-team.ui.h:18 + #: ../src/connection-editor/ce-page-vlan.ui.h:5 + #: ../src/connection-editor/ce-page-wifi.ui.h:7 +@@ -1282,25 +1302,82 @@ msgid "_Hello time:" + msgstr "Hello タイム(_H):" + + #: ../src/connection-editor/ce-page-bridge.ui.h:9 ++msgid "STP forwarding delay, in seconds" ++msgstr "STP フォワード遅延 (秒単位)" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:10 + msgid "s" + msgstr "s" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:10 ++#: ../src/connection-editor/ce-page-bridge.ui.h:11 ++msgid "STP hello time, in seconds" ++msgstr "STP Hello タイム (秒単位)" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:12 + msgid "Enable I_GMP snooping" + msgstr "IGMP スヌーピングを有効にする(_G)" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:11 ++#: ../src/connection-editor/ce-page-bridge.ui.h:13 ++msgid "" ++"Controls whether IGMP snooping is enabled for this bridge. Note that if " ++"snooping was automatically disabled due to hash collisions, the system may " ++"refuse to enable the feature until the collisions are resolved." ++msgstr "" ++"このブリッジにおいて、IGMP スヌーピングが有効かどうかを制御します。ハッシュの" ++"不一致が原因でスヌーピングが自動的に無効になっている場合は、その矛盾が解決す" ++"るまでこの機能が有効にならないことがあります。" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:14 + msgid "Enable _STP (Spanning Tree Protocol)" + msgstr "STP (スパニングツリープロトコル) を有効化(_S)" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:12 ++#: ../src/connection-editor/ce-page-bridge.ui.h:15 ++msgid "" ++"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge" ++msgstr "" ++"このブリッジにおいて、スパニングツリープロトコル (STP) が有効かどうかを制御し" ++"ます。" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:16 ++msgid "" ++"STP priority for this bridge. Lower values are “better”; the lowest priority " ++"bridge will be elected the root bridge." ++msgstr "" ++"このブリッジにおける STP の優先度。値が小さい方が優先度が高くなります。優先度" ++"が一番低いブリッジが root ブリッジに選択されます。" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:17 + msgid "_Max age:" +-msgstr "最大エージ(_M):" ++msgstr "最大エイジ(_M):" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:13 ++#: ../src/connection-editor/ce-page-bridge.ui.h:18 ++msgid "STP maximum message age, in seconds" ++msgstr "STP メッセージの最大エイジ (秒単位)" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:19 + msgid "_Aging time:" + msgstr "エージング時間(_A):" + ++#: ../src/connection-editor/ce-page-bridge.ui.h:20 ++msgid "The Ethernet MAC address aging time, in seconds" ++msgstr "イーサネット MAC アドレスのエージングタイム (秒単位)" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:21 ++msgid "Group _forward mask:" ++msgstr "グループの転送マスク(_F):" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:22 ++msgid "" ++"A mask of 16 bits, each corresponding to a group address in the range from " ++"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask " ++"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause " ++"frames and LACP." ++msgstr "" ++"16 ビットのマスク。それぞれのマスクが、転送される必要がある範囲 01:80:" ++"C2:00:00:00 から 01:80:C2:00:00:0F のグループアドレスに対応しています。このマ" ++"スクには、ビット 0、1、または 2 を設定することができません。STP で使用する" ++"と、MAC がフレームと LACP を停止するためです。" ++ + #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112 + msgid "automatic" + msgstr "自動" +@@ -1365,12 +1442,12 @@ msgstr "無効な %s (%s)" + #: ../src/connection-editor/ce-page.c:388 + #, c-format + msgid "invalid interface-name for %s (%s): " +-msgstr "%s の無効な interface-name (%s): " ++msgstr "%s の無効なインターフェース名 (%s): " + + #: ../src/connection-editor/ce-page.c:392 + #, c-format + msgid "invalid interface-name (%s): " +-msgstr "無効な interface-name (%s): " ++msgstr "無効なインターフェース名 (%s): " + + #: ../src/connection-editor/ce-page.c:571 + msgid "can’t parse device name" +@@ -1397,7 +1474,7 @@ msgstr "無効な %s (%s) " + + #: ../src/connection-editor/ce-page.c:725 + msgid "Failed to update connection secrets due to an unknown error." +-msgstr "不明なエラーのため接続 secret を更新できませんでした。" ++msgstr "不明なエラーのため、接続シークレットを更新できませんでした。" + + #: ../src/connection-editor/ce-page-dcb.ui.h:1 + msgid "_Use Data Center Bridging (DCB) for this connection" +@@ -1461,7 +1538,7 @@ msgstr "優先フロー制御" + + #: ../src/connection-editor/ce-page-dcb.ui.h:19 + msgid "Enable or disable priority pause transmission for each User Priority." +-msgstr "ユーザー優先度ごとの優先ポーズ転送を有効もしくは無効にします。" ++msgstr "各ユーザー優先度の優先ポーズ転送を、有効もしくは無効にします。" + + #: ../src/connection-editor/ce-page-dcb.ui.h:20 + msgid "Priority:" +@@ -1521,7 +1598,7 @@ msgstr "グループ ID:" + + #: ../src/connection-editor/ce-page-dcb.ui.h:34 + msgid "Enter the priority group ID for each User Priority." +-msgstr "ユーザーの優先度ごとの優先グループ ID を入力してください。" ++msgstr "各ユーザー優先度に優先グループ ID を入力してください。" + + #: ../src/connection-editor/ce-page-dcb.ui.h:36 + #, no-c-format +@@ -1536,8 +1613,8 @@ msgstr "" + msgid "" + "Enter the percentage of priority group bandwidth each user priority may use." + msgstr "" +-"ユーザー優先度が使用可能な優先グループ 帯域幅のパーセンテージを入力してくださ" +-"い。" ++"ユーザー優先度が使用可能な、優先グループ 帯域幅のパーセンテージを入力してくだ" ++"さい。" + + #: ../src/connection-editor/ce-page-dcb.ui.h:38 + msgid "Enable or disable strict bandwidth for each user priority." +@@ -1545,7 +1622,7 @@ msgstr "ユーザー優先度の正確な帯域幅を有効または無効にし + + #: ../src/connection-editor/ce-page-dcb.ui.h:39 + msgid "Enter the traffic class for each user priority." +-msgstr "各ユーザー優先度ののトラフィッククラスを入力してください。" ++msgstr "各ユーザー優先度にトラフィッククラスを入力してください。" + + #: ../src/connection-editor/ce-page-dsl.ui.h:1 + #: ../src/connection-editor/ce-page-mobile.ui.h:3 +@@ -1556,10 +1633,22 @@ msgid "_Username:" + msgstr "ユーザー名(_U):" + + #: ../src/connection-editor/ce-page-dsl.ui.h:2 ++msgid "Username used to authenticate with the PPPoE service." ++msgstr "ユーザー名は、PPPoE サービスでの認証に使用されました。" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:3 ++msgid "" ++"Only initiate sessions with access concentrators that provide the specified " ++"service. For most providers this should be left blank." ++msgstr "" ++"指定したサービスを提供するアクセス集線装置だけを使用してセッションを開始しま" ++"す。多くのプロバイダーでは、これを空白にする必要があります。" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:4 + msgid "_Service:" + msgstr "サービス(_S):" + +-#: ../src/connection-editor/ce-page-dsl.ui.h:3 ++#: ../src/connection-editor/ce-page-dsl.ui.h:5 + #: ../src/wireless-security/eap-method-leap.ui.h:3 + #: ../src/wireless-security/eap-method-simple.ui.h:3 + #: ../src/wireless-security/ws-leap.ui.h:3 +@@ -1567,7 +1656,11 @@ msgstr "サービス(_S):" + msgid "Sho_w password" + msgstr "パスワードを表示(_W)" + +-#: ../src/connection-editor/ce-page-dsl.ui.h:4 ++#: ../src/connection-editor/ce-page-dsl.ui.h:6 ++msgid "Password used to authenticate with the PPPoE service." ++msgstr "PPPoE サービスでの認証に使用されるパスワード。" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:7 + #: ../src/connection-editor/ce-page-mobile.ui.h:4 + #: ../src/libnma/nma-vpn-password-dialog.c:97 + #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97 +@@ -1578,13 +1671,29 @@ msgstr "パスワードを表示(_W)" + msgid "_Password:" + msgstr "パスワード(_P):" + ++#: ../src/connection-editor/ce-page-dsl.ui.h:8 ++msgid "PPP _interface:" ++msgstr "PPP インスタンス(_I):" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:9 ++msgid "P_arent interface:" ++msgstr "親インスタンス(_A):" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:10 ++msgid "An arbitrary name to assign to the newly created PPP interface." ++msgstr "新規作成された PPP インターフェースに割り当てる任意の名前。" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:11 ++msgid "The interface on which the PPP connection will be established." ++msgstr "PPP 接続が確立されるインターフェース。" ++ + #: ../src/connection-editor/ce-page-ethernet.ui.h:1 + #: ../src/connection-editor/ce-page-ip4.ui.h:1 + #: ../src/connection-editor/ce-page-ip6.ui.h:1 +-#: ../src/connection-editor/ce-page-proxy.ui.h:3 ++#: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-wifi.ui.h:1 + #: ../src/connection-editor/page-ip4.c:131 +-#: ../src/connection-editor/page-ip6.c:136 ++#: ../src/connection-editor/page-ip6.c:142 + #: ../src/wireless-security/eap-method-peap.ui.h:1 + msgid "Automatic" + msgstr "自動" +@@ -1630,7 +1739,7 @@ msgid "Full" + msgstr "すべて" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:12 +-#: ../src/connection-editor/page-ip6.c:149 ++#: ../src/connection-editor/page-ip6.c:155 + msgid "Ignore" + msgstr "無視する" + +@@ -1638,7 +1747,7 @@ msgstr "無視する" + #: ../src/connection-editor/ce-page-ip4.ui.h:3 + #: ../src/connection-editor/ce-page-ip6.ui.h:3 + #: ../src/connection-editor/page-ip4.c:168 +-#: ../src/connection-editor/page-ip6.c:185 ++#: ../src/connection-editor/page-ip6.c:191 + msgid "Manual" + msgstr "手動" + +@@ -1647,7 +1756,7 @@ msgid "_Port:" + msgstr "ポート(_P):" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:15 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:2 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:6 + #: ../src/connection-editor/ce-page-wifi.ui.h:9 + msgid "_Device:" + msgstr "デバイス(_D):" +@@ -1695,13 +1804,12 @@ msgstr "Magic(_G)" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:28 + msgid "_Wake on LAN password:" +-msgstr "_Wake on LAN パスワード(_W):" ++msgstr "Wake on LAN パスワード(_W):" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:29 + msgid "" + "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets." +-msgstr "" +-"Wake-on-LAN パスワード (イーサネット MAC)。magic packet にのみ有効です。" ++msgstr "Wake-on-LAN パスワード (Ethernet MAC)。magic packet にのみ有効です。" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:30 + msgid "Lin_k negotiation:" +@@ -1727,13 +1835,13 @@ msgid "" + "“Automatic” options are not selected. Before specifying a speed value be " + "sure your device supports it." + msgstr "" +-"静的リンクネゴシエーションの速度の値で、「無視」または「自動」のオプションが" +-"選択されていない場合にのみ必要になります。速度の値を指定する前に、デバイスが" +-"サポートしていることを確認してください。" ++"静的リンクネゴシエーションの速度の値。「無視」または「自動」のオプションを選" ++"択していない場合にのみ必要になります。速度の値を指定する前に、デバイスがサ" ++"ポートしていることを確認してください。" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:34 + msgid "Duple_x:" +-msgstr "二重(_X)" ++msgstr "二重(_X):" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:35 + msgid "" +@@ -1741,9 +1849,9 @@ msgid "" + "“Automatic” options are not selected. Before specifying a duplex mode be " + "sure your device supports it." + msgstr "" +-"静的リンクネゴシエーションの二重の値で、「無視」または「自動」のオプションが" +-"選択されていない場合にのみ必要になります。二重モードを指定する前に、デバイス" +-"がサポートしていることを確認してください。" ++"静的リンクネゴシエーションの二重値。「無視」または「自動」のオプションを選択" ++"していない場合にのみ必要になります。二重モードを指定する前に、デバイスがサ" ++"ポートしていることを確認してください。" + + #: ../src/connection-editor/ce-page-general.ui.h:1 + msgid "Automatically connect to _VPN when using this connection" +@@ -1768,7 +1876,7 @@ msgid "" + "Default value is 0." + msgstr "" + "自動アクティベーションの接続優先度。自動アクティベーションのプロファイル選択" +-"時により大きい数字の接続が優先されます。デフォルト値は 0 です。" ++"時に、より大きい数字の接続が優先されます。デフォルト値は 0 です。" + + #: ../src/connection-editor/ce-page-general.ui.h:6 + msgid "Firewall _zone:" +@@ -1791,7 +1899,7 @@ msgid "" + msgstr "" + "IP アドレスはネットワーク上のコンピューターを指定し、他のコンピューターに配布" + "するアドレス範囲を決定します。「追加」ボタンを押して IP アドレスを追加しま" +-"す。アドレスが提供されない場合は、範囲は自動で決定されます。" ++"す。アドレスが提供されないと、範囲は自動的に決定します。" + + #: ../src/connection-editor/ce-page.h:121 + msgid "Additional static addresses" +@@ -1805,20 +1913,20 @@ msgstr "アドレス" + msgid "Address (optional)" + msgstr "アドレス (オプション)" + +-#: ../src/connection-editor/ce-page-infiniband.ui.h:1 +-msgid "_Transport mode:" +-msgstr "転送モード(_T):" +- + #. IP-over-InfiniBand "datagram mode" +-#: ../src/connection-editor/ce-page-infiniband.ui.h:6 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:2 + msgid "Datagram" + msgstr "データグラム型" + + #. IP-over-InfiniBand "connected mode" +-#: ../src/connection-editor/ce-page-infiniband.ui.h:8 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:4 + msgid "Connected" + msgstr "コネクション型" + ++#: ../src/connection-editor/ce-page-infiniband.ui.h:5 ++msgid "_Transport mode:" ++msgstr "転送モード(_T):" ++ + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1 + msgid "IPIP" + msgstr "IPIP" +@@ -1856,36 +1964,39 @@ msgid "VTI6" + msgstr "VTI6" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10 +-msgid "Device name" +-msgstr "デバイス名" ++#: ../src/connection-editor/ce-page-macsec.ui.h:6 ++msgid "Device name:" ++msgstr "デバイス名:" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11 +-msgid "Parent device" +-msgstr "親デバイス" ++#: ../src/connection-editor/ce-page-macsec.ui.h:8 ++msgid "Parent device:" ++msgstr "親デバイス:" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12 +-msgid "Mode" +-msgstr "モード" ++#: ../src/connection-editor/ce-page-macsec.ui.h:16 ++msgid "Mode:" ++msgstr "モード:" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13 +-msgid "Local IP" +-msgstr "ローカル IP" ++msgid "Local IP:" ++msgstr "ローカル IP:" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14 +-msgid "Remote IP" +-msgstr "リモート IP" ++msgid "Remote IP:" ++msgstr "リモート IP:" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15 +-msgid "Input key" +-msgstr "入力キー" ++msgid "Input key:" ++msgstr "入力キー:" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16 +-msgid "Output key" +-msgstr "出力キー" ++msgid "Output key:" ++msgstr "出力キー:" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17 +-msgid "MTU" +-msgstr "MTU" ++msgid "MTU:" ++msgstr "MTU:" + + #: ../src/connection-editor/ce-page-ip4.ui.h:2 + #: ../src/connection-editor/ce-page-ip6.ui.h:2 +@@ -1900,12 +2011,12 @@ msgstr "リンクローカル" + #: ../src/connection-editor/ce-page-ip4.ui.h:5 + #: ../src/connection-editor/ce-page-ip6.ui.h:5 + #: ../src/connection-editor/page-ip4.c:188 +-#: ../src/connection-editor/page-ip6.c:205 ++#: ../src/connection-editor/page-ip6.c:211 + msgid "Shared to other computers" + msgstr "他のコンピューターへ共有" + + #: ../src/connection-editor/ce-page-ip4.ui.h:6 +-#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++#: ../src/connection-editor/ce-page-ip6.ui.h:11 + msgid "_Method:" + msgstr "方式(_M):" + +@@ -1915,12 +2026,12 @@ msgid "" + "your computer’s configuration. If you wish to use a DHCP client identifier, " + "enter it here." + msgstr "" +-"DHCP クライアント識別子を使用すると、ネットワーク管理者はコンピューター設定を" +-"カスタマイズできます。DHCP クライアント識別子を使用する場合は、ここに入力しま" ++"ネットワーク管理者は、DHCP クライアント識別子を使用してコンピューター設定をカ" ++"スタマイズできます。DHCP クライアント識別子を使用する場合は、ここに入力しま" + "す。" + + #: ../src/connection-editor/ce-page-ip4.ui.h:10 +-#: ../src/connection-editor/ce-page-ip6.ui.h:12 ++#: ../src/connection-editor/ce-page-ip6.ui.h:14 + msgid "" + "Domains used when resolving host names. Use commas to separate multiple " + "domains." +@@ -1933,16 +2044,16 @@ msgid "D_HCP client ID:" + msgstr "DHCP クライアント ID(_H):" + + #: ../src/connection-editor/ce-page-ip4.ui.h:12 +-#: ../src/connection-editor/ce-page-ip6.ui.h:13 ++#: ../src/connection-editor/ce-page-ip6.ui.h:15 + #: ../src/connection-editor/page-ip4.c:372 +-#: ../src/connection-editor/page-ip6.c:335 ++#: ../src/connection-editor/page-ip6.c:346 + msgid "S_earch domains:" + msgstr "ドメインを検索(_E):" + + #: ../src/connection-editor/ce-page-ip4.ui.h:13 +-#: ../src/connection-editor/ce-page-ip6.ui.h:14 ++#: ../src/connection-editor/ce-page-ip6.ui.h:16 + #: ../src/connection-editor/page-ip4.c:363 +-#: ../src/connection-editor/page-ip6.c:326 ++#: ../src/connection-editor/page-ip6.c:337 + msgid "DNS ser_vers:" + msgstr "DNS サーバー(_V):" + +@@ -1951,27 +2062,28 @@ msgid "" + "IP addresses of domain name servers used to resolve host names. Use commas " + "to separate multiple domain name server addresses." + msgstr "" +-"ドメインネームサーバーの IP アドレスはホスト名を解決するために使用されます。 " +-"コンマを使用して複数のドメインネームサーバーアドレスを分離します。" ++"ドメインネームサーバーの IP アドレスは、ホスト名を解決するために使用されま" ++"す。ドメインネームサーバーアドレスが複数になる場合は、コンマで区切ります。" + + #: ../src/connection-editor/ce-page-ip4.ui.h:15 + msgid "Require IPv_4 addressing for this connection to complete" +-msgstr "この接続を完了するには IPv4 アドレス化が必要になります(_4)" ++msgstr "この接続を完了するには、IPv4 アドレスが必要になります(_4)" + + #: ../src/connection-editor/ce-page-ip4.ui.h:16 + msgid "" + "When connecting to IPv6-capable networks, allows the connection to complete " + "if IPv4 configuration fails but IPv6 configuration succeeds." + msgstr "" +-"IPv4 設定が失敗して、IPv6 設定が成功する場合、IPv6 対応のネットワークに接続す" +-"る時に接続が完了するまで待ちます。" ++"IPv4 設定が失敗して、IPv6 設定が成功する場合は、IPv6 対応のネットワークに接続" ++"する時に接続が完了するまで待ちます。" + + #: ../src/connection-editor/ce-page-ip4.ui.h:17 +-#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++#: ../src/connection-editor/ce-page-ip6.ui.h:22 + msgid "_Routes…" + msgstr "ルート(_R)…" + + #: ../src/connection-editor/ce-page-ip6.ui.h:6 ++#: ../src/connection-editor/ce-page-macsec.ui.h:3 + #: ../src/connection-editor/page-ip4.c:198 + msgid "Disabled" + msgstr "無効になっています" +@@ -1984,32 +2096,137 @@ msgstr "有効 (公開アドレスを優先)" + msgid "Enabled (prefer temporary address)" + msgstr "有効 (一時アドレスを優先)" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:15 ++#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++msgid "EUI64" ++msgstr "EUI64" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++msgid "Stable privacy" ++msgstr "安定したプライバシー" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:17 + msgid "" + "IP addresses of domain name servers used to resolve host names. Use commas " + "to separate multiple domain name server addresses. Link-local addresses will " + "be automatically scoped to the connecting interface." + msgstr "" +-"ドメインネームサーバーの IP アドレスはホスト名を解決するために使用されます。 " +-"コンマを使用して複数のドメインネームサーバーアドレスを分離します。リンクロー" +-"カルアドレスは自動的に接続中のインターフェースにスコープされます。" ++"ドメインネームサーバーの IP アドレスは、ホスト名を解決するために使用されま" ++"す。ドメインネームサーバーアドレスが複数になる場合は、コンマで区切ります。リ" ++"ンクローカルアドレスは、接続中のインターフェースに自動的にスコープされます。" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:16 ++#: ../src/connection-editor/ce-page-ip6.ui.h:18 + msgid "IPv6 _privacy extensions:" + msgstr "IPv6 のプライバシー拡張(_P):" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:17 ++#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++msgid "IPv6 address _generation mode:" ++msgstr "IPv6 アドレス生成モード(_G):" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:20 + msgid "Require IPv_6 addressing for this connection to complete" +-msgstr "この接続が完了するには IPv6 アドレス化が必要になります(_6)" ++msgstr "この接続が完了するには、IPv6 アドレスが必要になります(_6)" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:18 ++#: ../src/connection-editor/ce-page-ip6.ui.h:21 + msgid "" + "When connecting to IPv4-capable networks, allows the connection to complete " + "if IPv6 configuration fails but IPv4 configuration succeeds." + msgstr "" +-"IPv6 設定が失敗して、IPv4 設定が成功する場合、IPv4 対応のネットワークに接続す" ++"IPv6 設定が失敗し、IPv4 設定が成功する場合は、IPv4 対応のネットワークに接続す" + "る時に接続が完了するまで待ちます。" + ++#: ../src/connection-editor/ce-page-macsec.ui.h:1 ++msgid "PSK" ++msgstr "PSK" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:2 ++#: ../src/connection-editor/page-ppp.c:129 ++msgid "EAP" ++msgstr "EAP" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:4 ++msgid "Check" ++msgstr "チェック" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:5 ++msgid "Strict" ++msgstr "厳密" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:7 ++msgid "The name of the MACsec device." ++msgstr "MACsec デバイスの名前。" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:9 ++msgid "" ++"The parent interface name or parent connection UUID from which this MACSEC " ++"interface should be created." ++msgstr "" ++"この MACSEC インターフェースが作成される親インターフェースの名前、または親接" ++"続の UUID。" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:10 ++msgid "" ++"The parent interface name or parent connection UUID from which this MACsec " ++"interface should be created" ++msgstr "" ++"この MACsec インターフェースが作成される親インターフェースまたは親接続の UUID" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:11 ++msgid " The pre-shared Connectivity-association Key Name" ++msgstr "共有前の接続に関連するキー名" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:12 ++msgid "The pre-shared Connectivity Association Key" ++msgstr "共有前の接続に関連するキー" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:13 ++msgid "" ++"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key " ++"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X " ++"security page" ++msgstr "" ++"MKA (MACsec キー一致) の CAK (接続関連キー) を取得する方法を指定します。EAP " ++"モードでは、802.1X セキュリティーページにパラメーターを追加します。" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:14 ++msgid "CKN:" ++msgstr "CKN:" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:15 ++msgid "CAK:" ++msgstr "CAK:" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:17 ++msgid "Keys:" ++msgstr "キー:" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:18 ++msgid "Parameters:" ++msgstr "パラメーター:" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:19 ++msgid "Validation:" ++msgstr "検証:" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:20 ++msgid "SCI port:" ++msgstr "SCI ポート:" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:21 ++msgid "Specifies the validation mode for incoming frames" ++msgstr "入力フレームの検証モードを指定します" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:22 ++msgid "Encrypt" ++msgstr "暗号化" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:23 ++msgid "Whether the transmitted traffic must be encrypted" ++msgstr "転送トラフィックの暗号化が必要かどうか" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:24 ++msgid "The port component of the SCI (Secure Channel Identifier)" ++msgstr "SCI (セキュアチャネル識別子) のポートコンポーネント" ++ + #: ../src/connection-editor/ce-page-mobile.ui.h:1 + #: ../src/connection-editor/ce-page-team.ui.h:26 + msgid "Basic" +@@ -2066,15 +2283,15 @@ msgstr "圧縮" + + #: ../src/connection-editor/ce-page-ppp.ui.h:5 + msgid "_Use point-to-point encryption (MPPE)" +-msgstr "MPPE (ポイントツーポイント暗号化) を使用(_U)" ++msgstr "MPPE (ポイントツーポイント暗号化) を使用する(_U)" + + #: ../src/connection-editor/ce-page-ppp.ui.h:6 + msgid "_Require 128-bit encryption" +-msgstr "128-bit の暗号化を要求(_R)" ++msgstr "128 ビットの暗号化を要求する(_R)" + + #: ../src/connection-editor/ce-page-ppp.ui.h:7 + msgid "Use _stateful MPPE" +-msgstr "ステートフル MPPE を使用(_S)" ++msgstr "ステートフル MPPE を使用する(_S)" + + #: ../src/connection-editor/ce-page-ppp.ui.h:8 + msgid "Allow _BSD data compression" +@@ -2086,7 +2303,7 @@ msgstr "Deflate データ圧縮を許可する(_D)" + + #: ../src/connection-editor/ce-page-ppp.ui.h:10 + msgid "Use TCP _header compression" +-msgstr "TCP ヘッダー圧縮を使用(_H)" ++msgstr "TCP ヘッダー圧縮を使用する(_H)" + + #: ../src/connection-editor/ce-page-ppp.ui.h:11 + msgid "Echo" +@@ -2097,38 +2314,39 @@ msgid "Send PPP _echo packets" + msgstr "PPP Echo のパケットを送信(_E)" + + #: ../src/connection-editor/ce-page-proxy.ui.h:1 +-msgid "Method:" +-msgstr "方式:" +- +-#: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-team.ui.h:25 + msgid "None" + msgstr "なし" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:4 ++#: ../src/connection-editor/ce-page-proxy.ui.h:3 + msgid "For browser only" + msgstr "ブラウザー専用" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:5 ++#: ../src/connection-editor/ce-page-proxy.ui.h:4 + msgid "Use this proxy configuration for only browser clients/schemes." +-msgstr "ブラウザーのクライアント/スキームにのみこのプロキシ設定を使用します。" ++msgstr "" ++"このプロキシ設定を、ブラウザーのクライアント/スキームにのみ使用します。" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:6 ++#: ../src/connection-editor/ce-page-proxy.ui.h:5 + msgid "PAC URL:" + msgstr "PAC URL:" + ++#: ../src/connection-editor/ce-page-proxy.ui.h:6 ++msgid "PAC script:" ++msgstr "PAC スクリプト:" ++ + #: ../src/connection-editor/ce-page-proxy.ui.h:7 + msgid "URL from where the PAC script is to be obtained." + msgstr "PAC スクリプトの取得先となる URL。" + + #: ../src/connection-editor/ce-page-proxy.ui.h:8 +-msgid "PAC script:" +-msgstr "PAC スクリプト:" +- +-#: ../src/connection-editor/ce-page-proxy.ui.h:9 + msgid "Import script from a file…" + msgstr "ファイルからスクリプトをインポート..." + ++#: ../src/connection-editor/ce-page-proxy.ui.h:9 ++msgid "Method:" ++msgstr "方式:" ++ + #: ../src/connection-editor/ce-page-team-port.ui.h:1 + #: ../src/connection-editor/ce-page-team.ui.h:19 + msgid "Ad_vanced…" +@@ -2176,23 +2394,14 @@ msgid "ID of queue which this port should be mapped to." + msgstr "このポートのマッピング先となるキューの ID。" + + #: ../src/connection-editor/ce-page-team-port.ui.h:10 +-msgid "_Port priority:" +-msgstr "ポート優先度(_P):" ++msgid "Active-Backup runner options" ++msgstr "Active-Backup ランナーオプション" + + #: ../src/connection-editor/ce-page-team-port.ui.h:11 +-msgid "Port _sticky" +-msgstr "ポート付箋(_S)" ++msgid "_Port priority:" ++msgstr "ポート優先度(_P):" + + #: ../src/connection-editor/ce-page-team-port.ui.h:12 +-#: ../src/connection-editor/ce-page-team.ui.h:82 +-msgid "" +-"Validate received ARP packets on active ports. If this is not checked, all " +-"incoming ARP packets will be considered as a good reply." +-msgstr "" +-"アクティブなポートで受信した ARP パケットを検証します。これを確認しない場合" +-"は、すべての着信 ARP パケットは正常な返信とみなされます。" +- +-#: ../src/connection-editor/ce-page-team-port.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:44 + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " +@@ -2200,23 +2409,36 @@ msgid "" + msgstr "" + "値は正の数(ミリ秒単位)。notify-peer パケットのバーストの間隔を指定します。" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:14 ++#: ../src/connection-editor/ce-page-team-port.ui.h:13 + msgid "Port priority. The higher number means higher priority." +-msgstr "ポート優先度。より数字が大きいものの優先度が高くなります。" ++msgstr "ポート優先度。数字が大きい方が優先度が高くなります。" ++ ++#: ../src/connection-editor/ce-page-team-port.ui.h:14 ++msgid "Port _sticky" ++msgstr "ポート付箋(_S)" + + #: ../src/connection-editor/ce-page-team-port.ui.h:15 +-msgid "Active-Backup runner options" +-msgstr "Active-Backup ランナーオプション" ++#: ../src/connection-editor/ce-page-team.ui.h:82 ++msgid "" ++"Validate received ARP packets on active ports. If this is not checked, all " ++"incoming ARP packets will be considered as a good reply." ++msgstr "" ++"アクティブなポートで受信した ARP パケットを検証します。これを確認しないと、着" ++"信 ARP パケットがすべて正常な返信とみなされます。" + + #: ../src/connection-editor/ce-page-team-port.ui.h:16 ++msgid "LACP runner options" ++msgstr "LACP ランナーオプション" ++ ++#: ../src/connection-editor/ce-page-team-port.ui.h:17 + msgid "_LACP port priority:" + msgstr "LACP ポート優先度(_L):" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:17 ++#: ../src/connection-editor/ce-page-team-port.ui.h:18 + msgid "LACP port _key:" + msgstr "LACP ポートキー(_K):" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:18 ++#: ../src/connection-editor/ce-page-team-port.ui.h:19 + #: ../src/connection-editor/ce-page-team.ui.h:43 + msgid "" + "Number of bursts of multicast group rejoin requests sent after port is " +@@ -2225,31 +2447,27 @@ msgstr "" + "ポートの有効化または無効化後に送信された、マルチキャストグループ再参加リクエ" + "ストのバースト数。" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:19 ++#: ../src/connection-editor/ce-page-team-port.ui.h:20 + msgid "" + "Port priority according to LACP standard. The lower number means higher " + "priority." + msgstr "" +-"LACP 標準に準拠したポート優先度。より数字が小さいものの優先度が高くなります。" ++"LACP 標準に準拠したポート優先度。数字が小さい方が優先度が高くなります。" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:20 ++#: ../src/connection-editor/ce-page-team-port.ui.h:21 + #: ../src/connection-editor/ce-page-team.ui.h:45 + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " + "bursts of multicast group rejoin requests." + msgstr "" +-"値は正の数(ミリ秒単位)。マルチキャストグループ再参加リクエストのバーストの間" +-"隔を指定します。" ++"値は正の数 (ミリ秒単位) です。マルチキャストグループ再参加リクエストのバース" ++"トの間隔を指定します。" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:21 ++#: ../src/connection-editor/ce-page-team-port.ui.h:22 + msgid "" + "Port key according to LACP standard. It is only possible to aggregate ports " + "with the same key." +-msgstr "LACP 標準に準拠したポートキー。同じキーのポートの統合のみが可能です。" +- +-#: ../src/connection-editor/ce-page-team-port.ui.h:22 +-msgid "LACP runner options" +-msgstr "LACP ランナーオプション" ++msgstr "LACP 標準に準拠したポートキー。同じキーのポートだけが統合できます。" + + #: ../src/connection-editor/ce-page-team-port.ui.h:24 + #: ../src/connection-editor/ce-page-team.ui.h:70 +@@ -2297,8 +2515,8 @@ msgid "" + "Maximum number of missed replies. If this number is exceeded, link is " + "reported as down." + msgstr "" +-"不在着信となった返信の最大数。この数値を超えるとリンクがダウンとして報告され" +-"ます。" ++"不在着信となった返信の最大数。この数値を超えるとリンクがダウンしていると報告" ++"されます。" + + #: ../src/connection-editor/ce-page-team-port.ui.h:33 + #: ../src/connection-editor/ce-page-team.ui.h:79 +@@ -2306,8 +2524,8 @@ msgid "" + "Hostname to be converted to IP address which will be filled into ARP request " + "as source address." + msgstr "" +-"IP アドレスに変換されるホスト名。これは ARP リクエストでソースアドレスとして" +-"記入されます。" ++"IP アドレスに変換されるホスト名。この名前は、ソースアドレスとして ARP リクエ" ++"ストに記入されます。" + + #: ../src/connection-editor/ce-page-team-port.ui.h:34 + #: ../src/connection-editor/ce-page-team.ui.h:80 +@@ -2315,18 +2533,18 @@ msgid "" + "Hostname to be converted to IP address which will be filled into request as " + "destination address." + msgstr "" +-"IP アドレスに変換されるホスト名で、リクエストに宛先アドレスとして記入されま" ++"IP アドレスに変換されるホスト名で、宛先アドレスとしてリクエストに記入されま" + "す。" + + #: ../src/connection-editor/ce-page-team-port.ui.h:35 + #: ../src/connection-editor/ce-page-team.ui.h:81 + msgid "Ignore invalid packets from _active ports" +-msgstr "_active ポートからの無効なパケットを無視" ++msgstr "アクティブなポートからの無効なパケットを無視(_A)" + + #: ../src/connection-editor/ce-page-team-port.ui.h:36 + #: ../src/connection-editor/ce-page-team.ui.h:83 + msgid "Ignore invalid packets from i_nactive ports" +-msgstr "i_nactive ポートからの無効なパケットを無視" ++msgstr "アクティブでないポートからの無効なパケットを無視(_N)" + + #: ../src/connection-editor/ce-page-team-port.ui.h:37 + #: ../src/connection-editor/ce-page-team.ui.h:84 +@@ -2334,8 +2552,8 @@ msgid "" + "Validate received ARP packets on inactive ports. If this is not checked, all " + "incoming ARP packets will be considered as a good reply." + msgstr "" +-"アクティブでないポートで受信した ARP パケットを検証します。これを確認しない場" +-"合は、すべての着信 ARP パケットは正常な返信とみなされます。" ++"アクティブでないポートで受信した ARP パケットを検証します。これを確認しない" ++"と、着信 ARP パケットはすべて正常な返信とみなされます。" + + #: ../src/connection-editor/ce-page-team-port.ui.h:38 + #: ../src/connection-editor/ce-page-team.ui.h:85 +@@ -2387,7 +2605,7 @@ msgstr "リンクウォッチャー" + #: ../src/connection-editor/ce-page-team-port.ui.h:46 + #: ../src/connection-editor/ce-page-team.ui.h:93 + msgid "Im_port team configuration from a file…" +-msgstr "ファイルから Team 設定をインポートする(_P)..." ++msgstr "ファイルからチーム設定をインポートする(_P)..." + + #: ../src/connection-editor/ce-page-team-port.ui.h:47 + #: ../src/connection-editor/ce-page-team.ui.h:94 +@@ -2421,7 +2639,7 @@ msgstr "ポートの優先度" + + #: ../src/connection-editor/ce-page-team.ui.h:6 + msgid "From the team device" +-msgstr "team デバイスから" ++msgstr "チームデバイスから" + + #: ../src/connection-editor/ce-page-team.ui.h:7 + msgid "From the active port" +@@ -2429,11 +2647,11 @@ msgstr "アクティブなポートから" + + #: ../src/connection-editor/ce-page-team.ui.h:8 + msgid "From active to team device" +-msgstr "アクティブから team デバイスへ" ++msgstr "アクティブからチームデバイスへ" + + #: ../src/connection-editor/ce-page-team.ui.h:12 + msgid "_Teamed connections:" +-msgstr "Team 接続(_T):" ++msgstr "チーム接続(_T):" + + #: ../src/connection-editor/ce-page-team.ui.h:23 + msgid "Load balance" +@@ -2444,14 +2662,14 @@ msgid "LACP" + msgstr "LACP" + + #: ../src/connection-editor/ce-page-team.ui.h:27 +-#: ../src/connection-editor/connection-helpers.c:104 ++#: ../src/connection-editor/connection-helpers.c:105 + #: ../src/connection-editor/page-ethernet.c:351 + #: ../src/libnm-gtk/nm-ui-utils.c:321 + msgid "Ethernet" + msgstr "Ethernet" + + #: ../src/connection-editor/ce-page-team.ui.h:28 +-#: ../src/connection-editor/connection-helpers.c:119 ++#: ../src/connection-editor/connection-helpers.c:120 + #: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339 + #: ../src/libnm-gtk/nm-ui-utils.c:583 + msgid "VLAN" +@@ -2506,7 +2724,7 @@ msgid "" + "Desired hardware address of new team device. Usual MAC address format is " + "accepted." + msgstr "" +-"新規 team デバイスのハードウェアアドレス。通常の MAC アドレス形式が使用できま" ++"新規チームデバイスのハードウェアアドレス。通常の MAC アドレス形式が使用できま" + "す。" + + #: ../src/connection-editor/ce-page-team.ui.h:49 +@@ -2526,8 +2744,8 @@ msgid "" + "This defines the policy of how hardware addresses of team device and port " + "devices should be set during the team lifetime." + msgstr "" +-"team のライフタイム中に team デバイスおよびポートデバイスのハードウェアアドレ" +-"スを設定する方法についてのポリシーを定義します。" ++"チームのライフタイム中に、チームデバイスおよびポートデバイスのハードウェアア" ++"ドレスを設定する方法に関するポリシーを定義します。" + + #: ../src/connection-editor/ce-page-team.ui.h:53 + msgid "Send LACPDU frames _periodically" +@@ -2539,8 +2757,7 @@ msgid "" + "If not, it acts as “speak when spoken to”." + msgstr "" + "これにチェックを入れると、設定済みリンクとともに LACPDU フレームが定期的に送" +-"信されます。チェックを入れない場合は、「通信があった場合に応答」の動作になり" +-"ます。" ++"信されます。チェックを入れない場合は、「通信があった場合に応答」します。" + + #: ../src/connection-editor/ce-page-team.ui.h:55 + msgid "Send a LACPDU frame _every second" +@@ -2554,7 +2771,7 @@ msgid "" + msgstr "" + "このオプションは、リンクパートナーに LACPDU パケットを転送を依頼するレートを" + "指定します。これにチェックを入れると、パケットは毎秒送信されます。チェックを" +-"入れない場合は、30秒ごとに送信されます。" ++"入れない場合は、30 秒ごとに送信されます。" + + #: ../src/connection-editor/ce-page-team.ui.h:57 + msgid "_System priority:" +@@ -2582,7 +2799,7 @@ msgstr "" + + #: ../src/connection-editor/ce-page-team.ui.h:62 + msgid "This selects the policy of how the aggregators will be selected." +-msgstr "アグリゲーターを選択する方法についてのポリシーを指定します。" ++msgstr "アグリゲーターを選択する方法に関するポリシーを指定します。" + + #: ../src/connection-editor/ce-page-team.ui.h:63 + msgid "" +@@ -2627,7 +2844,7 @@ msgstr "VLAN インターフェース名(_F):" + + #: ../src/connection-editor/ce-page-vlan.ui.h:3 + msgid "Cloned MAC _address:" +-msgstr "クローンした MAC アドレス(_A):" ++msgstr "クローンの MAC アドレス(_A):" + + #: ../src/connection-editor/ce-page-vlan.ui.h:6 + msgid "VLAN _id:" +@@ -2665,7 +2882,7 @@ msgstr "\"vlan\" + 番号" + + #: ../src/connection-editor/ce-page-wifi-security.ui.h:1 + msgid "S_ecurity:" +-msgstr "セキュリティ(_E):" ++msgstr "セキュリティー(_E):" + + #: ../src/connection-editor/ce-page-wifi.ui.h:2 + msgid "A (5 GHz)" +@@ -2719,6 +2936,7 @@ msgstr "バンド(_D):" + msgid "SS_ID:" + msgstr "SSID(_I):" + ++#: ../src/connection-editor/ce-polkit.c:63 + #: ../src/connection-editor/ce-polkit-button.c:74 + msgid "No polkit authorization to perform the action" + msgstr "アクションを実行する polkit 権限がありません" +@@ -2776,75 +2994,80 @@ msgid "" + "In most cases, the provider’s PPP servers will support all authentication " + "methods. If connections fail, try disabling support for some methods." + msgstr "" +-"ほとんどの場合、プロバイダーの PPP サーバーはすべての認証方法をサポートしてい" +-"ます。接続が失敗する場合は、一部の認証方法を無効にしてみてください。" ++"通常、プロバイダーの PPP サーバーはすべての認証方法をサポートしています。接続" ++"が失敗する場合は、認証方法を一部無効にしてみてください。" + +-#: ../src/connection-editor/connection-helpers.c:105 ++#: ../src/connection-editor/connection-helpers.c:106 + #: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323 + msgid "Wi-Fi" + msgstr "Wi-Fi" + +-#: ../src/connection-editor/connection-helpers.c:113 ++#: ../src/connection-editor/connection-helpers.c:114 + #: ../src/connection-editor/page-bluetooth.c:123 + #: ../src/libnm-gtk/nm-ui-utils.c:325 + msgid "Bluetooth" + msgstr "Bluetooth" + +-#: ../src/connection-editor/connection-helpers.c:114 +-#: ../src/connection-editor/page-dsl.c:127 +-msgid "DSL" +-msgstr "DSL" +- + #: ../src/connection-editor/connection-helpers.c:115 ++#: ../src/connection-editor/page-dsl.c:201 ++msgid "DSL/PPPoE" ++msgstr "DSL/PPPoE" ++ ++#: ../src/connection-editor/connection-helpers.c:116 + #: ../src/connection-editor/page-infiniband.c:148 + #: ../src/libnm-gtk/nm-ui-utils.c:331 + msgid "InfiniBand" + msgstr "InfiniBand" + +-#: ../src/connection-editor/connection-helpers.c:116 ++#: ../src/connection-editor/connection-helpers.c:117 + #: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333 + #: ../src/libnm-gtk/nm-ui-utils.c:577 + msgid "Bond" + msgstr "Bond" + +-#: ../src/connection-editor/connection-helpers.c:117 +-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335 ++#: ../src/connection-editor/connection-helpers.c:118 ++#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335 + #: ../src/libnm-gtk/nm-ui-utils.c:579 + msgid "Team" + msgstr "Team" + +-#: ../src/connection-editor/connection-helpers.c:118 +-#: ../src/connection-editor/page-bridge.c:212 ++#: ../src/connection-editor/connection-helpers.c:119 ++#: ../src/connection-editor/page-bridge.c:233 + #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581 + msgid "Bridge" + msgstr "ブリッジ" + +-#: ../src/connection-editor/connection-helpers.c:120 ++#: ../src/connection-editor/connection-helpers.c:121 + #: ../src/connection-editor/page-ip-tunnel.c:176 + msgid "IP tunnel" + msgstr "IP トンネル" + + #: ../src/connection-editor/connection-helpers.c:122 +-#: ../src/connection-editor/connection-helpers.c:396 ++#: ../src/connection-editor/page-macsec.c:190 ++msgid "MACsec" ++msgstr "MACsec" ++ ++#: ../src/connection-editor/connection-helpers.c:124 ++#: ../src/connection-editor/connection-helpers.c:398 + #: ../src/connection-editor/page-vpn.c:96 + msgid "VPN" + msgstr "VPN" + +-#: ../src/connection-editor/connection-helpers.c:205 ++#: ../src/connection-editor/connection-helpers.c:207 + msgid "" + "The VPN plugin failed to import the VPN connection correctly\n" + "\n" + "Error: no VPN service type." + msgstr "" +-"VPN プラグインは VPN 接続の正常なインポートに失敗しました\n" ++"VPN プラグインは、VPN 接続の正常なインポートに失敗しました\n" + "\n" + "エラー: VPN サービスタイプがありません。" + +-#: ../src/connection-editor/connection-helpers.c:217 ++#: ../src/connection-editor/connection-helpers.c:219 + msgid "Cannot import VPN connection" + msgstr "VPN 接続をインポートできません" + +-#: ../src/connection-editor/connection-helpers.c:219 ++#: ../src/connection-editor/connection-helpers.c:221 + #, c-format + msgid "" + "The file “%s” could not be read or does not contain recognized VPN " +@@ -2852,59 +3075,65 @@ msgid "" + "\n" + "Error: %s." + msgstr "" +-"ファイル '%s' は読み込めなかったか、または認識される VPN 接続情報がありませ" +-"ん\n" ++"ファイル '%s' が読み込めなかったか、認識される VPN 接続情報がありません\n" + "\n" + "エラー: %s" + +-#: ../src/connection-editor/connection-helpers.c:220 ++#: ../src/connection-editor/connection-helpers.c:222 + msgid "unknown error" + msgstr "不明なエラー" + +-#: ../src/connection-editor/connection-helpers.c:303 ++#: ../src/connection-editor/connection-helpers.c:305 + #: ../src/connection-editor/page-proxy.c:118 + #: ../src/connection-editor/page-team.c:341 + #: ../src/connection-editor/page-team-port.c:203 + msgid "Select file to import" + msgstr "インポートするファイルを選択する" + +-#: ../src/connection-editor/connection-helpers.c:338 ++#: ../src/connection-editor/connection-helpers.c:309 ++#: ../src/connection-editor/page-proxy.c:122 ++#: ../src/connection-editor/page-team.c:345 ++#: ../src/connection-editor/page-team-port.c:207 ++msgid "_Open" ++msgstr "開く(_O)" ++ ++#: ../src/connection-editor/connection-helpers.c:340 + msgid "Hardware" + msgstr "ハードウェア" + +-#: ../src/connection-editor/connection-helpers.c:365 ++#: ../src/connection-editor/connection-helpers.c:367 + msgid "Virtual" + msgstr "仮想" + +-#: ../src/connection-editor/connection-helpers.c:514 + #: ../src/connection-editor/connection-helpers.c:516 ++#: ../src/connection-editor/connection-helpers.c:518 + msgid "Import a saved VPN configuration…" + msgstr "保存した VPN 設定をインポートする..." + +-#: ../src/connection-editor/connection-helpers.c:546 ++#: ../src/connection-editor/connection-helpers.c:548 + msgid "" + "The connection editor dialog could not be initialized due to an unknown " + "error." + msgstr "" +-"接続エディターのダイアログは不明なエラーのために初期化できませんでした。" ++"接続エディターのダイアログは、不明なエラーのため初期化できませんでした。" + +-#: ../src/connection-editor/connection-helpers.c:555 ++#: ../src/connection-editor/connection-helpers.c:557 + msgid "Could not create new connection" + msgstr "新しい接続を作成できませんでした" + +-#: ../src/connection-editor/connection-helpers.c:718 ++#: ../src/connection-editor/connection-helpers.c:720 + msgid "Connection delete failed" + msgstr "接続の削除に失敗しました" + +-#: ../src/connection-editor/connection-helpers.c:766 ++#: ../src/connection-editor/connection-helpers.c:768 + #, c-format + msgid "Are you sure you wish to delete the connection %s?" +-msgstr "本当に 接続 %s を削除したいのですか ?" ++msgstr "接続 %s を削除してもよろしいですか?" + + #: ../src/connection-editor/ip4-routes-dialog.c:697 + #: ../src/connection-editor/ip6-routes-dialog.c:718 + #: ../src/connection-editor/page-ip4.c:1136 +-#: ../src/connection-editor/page-ip6.c:1095 ++#: ../src/connection-editor/page-ip6.c:1118 + msgid "Address" + msgstr "アドレス" + +@@ -2916,7 +3145,7 @@ msgstr "ネットマスク" + #: ../src/connection-editor/ip4-routes-dialog.c:735 + #: ../src/connection-editor/ip6-routes-dialog.c:756 + #: ../src/connection-editor/page-ip4.c:1174 +-#: ../src/connection-editor/page-ip6.c:1133 ++#: ../src/connection-editor/page-ip6.c:1156 + msgid "Gateway" + msgstr "ゲートウェイ" + +@@ -2926,70 +3155,72 @@ msgid "Metric" + msgstr "メトリック" + + #: ../src/connection-editor/ip6-routes-dialog.c:737 +-#: ../src/connection-editor/page-ip6.c:1114 ++#: ../src/connection-editor/page-ip6.c:1137 + msgid "Prefix" + msgstr "プレフィックス" + +-#: ../src/connection-editor/nm-connection-editor.c:108 ++#: ../src/connection-editor/nm-connection-editor.c:109 + #, c-format + msgid "Editing %s" + msgstr "%s の編集" + +-#: ../src/connection-editor/nm-connection-editor.c:112 ++#: ../src/connection-editor/nm-connection-editor.c:113 + msgid "Editing un-named connection" + msgstr "無名の接続を編集" + +-#: ../src/connection-editor/nm-connection-editor.c:132 ++#: ../src/connection-editor/nm-connection-editor.c:133 + msgid "Missing connection name" + msgstr "接続名がみつかりません" + +-#: ../src/connection-editor/nm-connection-editor.c:352 ++#: ../src/connection-editor/nm-connection-editor.c:353 + msgid "Editor initializing…" + msgstr "エディターの初期化中..." + +-#: ../src/connection-editor/nm-connection-editor.c:359 +-#: ../src/connection-editor/nm-connection-list.c:408 ++#: ../src/connection-editor/nm-connection-editor.c:360 ++#: ../src/connection-editor/nm-connection-list.c:443 + msgid "Connection cannot be modified" + msgstr "接続を変更できません" + +-#: ../src/connection-editor/nm-connection-editor.c:374 ++#: ../src/connection-editor/nm-connection-editor.c:375 + #, c-format + msgid "Invalid setting %s: %s" + msgstr "無効な設定 %s: %s" + +-#: ../src/connection-editor/nm-connection-editor.c:450 ++#: ../src/connection-editor/nm-connection-editor.c:451 + msgid "" + "The connection editor could not find some required resources (the .ui file " + "was not found)." + msgstr "" +-"接続エディターは必要ないくつかのリソースをみつけられませんでした (.ui ファイ" +-"ルがみつかりませんでした)。" ++"接続エディターは、必要なリソースをいくつか見つけられませんでした (.ui ファイ" ++"ルが見つかりませんでした)。" + +-#: ../src/connection-editor/nm-connection-editor.c:577 ++#: ../src/connection-editor/nm-connection-editor.c:578 ++#: ../src/connection-editor/vpn-helpers.c:213 + msgid "_Save" + msgstr "保存(_S)" + +-#: ../src/connection-editor/nm-connection-editor.c:578 ++#: ../src/connection-editor/nm-connection-editor.c:579 + msgid "Save any changes made to this connection." +-msgstr "この接続に対しての変更をすべて保存します。" ++msgstr "この接続に対する変更をすべて保存します。" + +-#: ../src/connection-editor/nm-connection-editor.c:579 ++#: ../src/connection-editor/nm-connection-editor.c:580 + msgid "Authenticate to save this connection for all users of this machine." +-msgstr "このマシンのすべてのユーザー用接続の保存を認証する。" ++msgstr "" ++"このマシンのすべてのユーザーに対して、この接続を保存するために認証する。" + +-#: ../src/connection-editor/nm-connection-editor.c:595 ++#: ../src/connection-editor/nm-connection-editor.c:596 + msgid "Could not create connection" + msgstr "新しい接続を作成できませんでした" + +-#: ../src/connection-editor/nm-connection-editor.c:595 ++#: ../src/connection-editor/nm-connection-editor.c:596 + msgid "Could not edit connection" + msgstr "接続を編集できませんでした" + +-#: ../src/connection-editor/nm-connection-editor.c:597 ++#: ../src/connection-editor/nm-connection-editor.c:598 + msgid "Unknown error creating connection editor dialog." + msgstr "接続エディターダイアログの作成中に不明なエラーです。" + +-#: ../src/connection-editor/nm-connection-editor.c:738 ++#: ../src/connection-editor/nm-connection-editor.c:739 + msgid "" + "Warning: the connection contains some properties not supported by the " + "editor. They will be cleared upon save." +@@ -2997,23 +3228,19 @@ msgstr "" + "警告: この接続には、エディターがサポートしていないプロパティーが含まれていま" + "す。保存後するとこれらは消去されます。" + +-#: ../src/connection-editor/nm-connection-editor.c:758 ++#: ../src/connection-editor/nm-connection-editor.c:759 + msgid "Error initializing editor" + msgstr "エディターの初期化中にエラーです" + +-#: ../src/connection-editor/nm-connection-editor.c:1142 ++#: ../src/connection-editor/nm-connection-editor.c:1157 + msgid "Connection add failed" + msgstr "接続の追加に失敗しました" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2 +-msgid "_Close" +-msgstr "閉じる(_C)" +- +-#: ../src/connection-editor/nm-connection-editor.ui.h:4 ++#: ../src/connection-editor/nm-connection-editor.ui.h:1 + msgid "Fix" + msgstr "修正" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:5 ++#: ../src/connection-editor/nm-connection-editor.ui.h:2 + msgid "" + "Security labels may prevent some files from being used with certificate " + "authentication." +@@ -3021,137 +3248,153 @@ msgstr "" + "セキュリティーラベルにより、ファイルを証明書の認証に使用できない場合がありま" + "す。" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:6 ++#: ../src/connection-editor/nm-connection-editor.ui.h:3 + msgid "Connection _name:" + msgstr "接続名(_N):" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:7 ++#: ../src/connection-editor/nm-connection-editor.ui.h:4 + msgid "_Export…" + msgstr "エクスポート(_E)..." + +-#: ../src/connection-editor/nm-connection-editor.ui.h:9 ++#: ../src/connection-editor/nm-connection-editor.ui.h:6 + msgid "File Relabel" + msgstr "ファイルの再ラベル付け" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:10 ++#: ../src/connection-editor/nm-connection-editor.ui.h:7 + msgid "_Relabel" + msgstr "再ラベル付け(_R)" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:11 ++#: ../src/connection-editor/nm-connection-editor.ui.h:8 + msgid "" + "The following files are not labelled for use with certificate " + "authentication. Do you wish to adjust the labels?" + msgstr "" +-"以下のファイルは証明書の認証向けにラベル付けされていません。ラベルを修正しま" +-"すか?" ++"以下のファイルは、証明書の認証向けにラベル付けされていません。ラベルを修正し" ++"ますか?" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:12 ++#: ../src/connection-editor/nm-connection-editor.ui.h:9 + msgid "Relabel" + msgstr "再ラベル付け" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:13 ++#: ../src/connection-editor/nm-connection-editor.ui.h:10 + msgid "Filename" + msgstr "ファイル名" + +-#: ../src/connection-editor/nm-connection-list.c:127 ++#: ../src/connection-editor/nm-connection-list.c:151 + msgid "never" + msgstr "未接続" + +-#: ../src/connection-editor/nm-connection-list.c:138 +-#: ../src/connection-editor/nm-connection-list.c:149 ++#: ../src/connection-editor/nm-connection-list.c:162 ++#: ../src/connection-editor/nm-connection-list.c:173 + msgid "now" + msgstr "接続中" + + #. less than an hour ago +-#: ../src/connection-editor/nm-connection-list.c:156 ++#: ../src/connection-editor/nm-connection-list.c:180 + #, c-format + msgid "%d minute ago" + msgid_plural "%d minutes ago" + msgstr[0] "%d 分前" + +-#: ../src/connection-editor/nm-connection-list.c:160 ++#: ../src/connection-editor/nm-connection-list.c:184 + #, c-format + msgid "%d hour ago" + msgid_plural "%d hours ago" + msgstr[0] "%d 時間前" + +-#: ../src/connection-editor/nm-connection-list.c:172 ++#: ../src/connection-editor/nm-connection-list.c:196 + #, c-format + msgid "%d day ago" + msgid_plural "%d days ago" + msgstr[0] "%d 日前" + +-#: ../src/connection-editor/nm-connection-list.c:178 ++#: ../src/connection-editor/nm-connection-list.c:202 + #, c-format + msgid "%d month ago" + msgid_plural "%d months ago" + msgstr[0] "%d ヶ月前" + +-#: ../src/connection-editor/nm-connection-list.c:182 ++#: ../src/connection-editor/nm-connection-list.c:206 + #, c-format + msgid "%d year ago" + msgid_plural "%d years ago" + msgstr[0] "%d 年前" + +-#: ../src/connection-editor/nm-connection-list.c:635 ++#: ../src/connection-editor/nm-connection-list.c:445 ++msgid "Connection cannot be deleted" ++msgstr "接続を削除できません" ++ ++#: ../src/connection-editor/nm-connection-list.c:448 ++msgid "Select a connection to edit" ++msgstr "編集する接続を選択" ++ ++#: ../src/connection-editor/nm-connection-list.c:450 ++msgid "Select a connection to delete" ++msgstr "削除する接続を選択" ++ ++#: ../src/connection-editor/nm-connection-list.c:785 + #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2 + msgid "Name" + msgstr "名前" + +-#: ../src/connection-editor/nm-connection-list.c:648 ++#: ../src/connection-editor/nm-connection-list.c:798 + msgid "Last Used" + msgstr "前回の使用" + +-#: ../src/connection-editor/nm-connection-list.c:696 ++#: ../src/connection-editor/nm-connection-list.c:836 + msgid "Edit the selected connection" + msgstr "選択した接続を編集する" + +-#: ../src/connection-editor/nm-connection-list.c:697 ++#: ../src/connection-editor/nm-connection-list.c:837 + msgid "Authenticate to edit the selected connection" + msgstr "選択した接続の編集を認証する" + +-#: ../src/connection-editor/nm-connection-list.c:712 ++#: ../src/connection-editor/nm-connection-list.c:842 + msgid "Delete the selected connection" + msgstr "選択した接続を削除する" + +-#: ../src/connection-editor/nm-connection-list.c:713 ++#: ../src/connection-editor/nm-connection-list.c:843 + msgid "Authenticate to delete the selected connection" + msgstr "選択した接続の削除を認証する" + +-#: ../src/connection-editor/nm-connection-list.c:935 +-#: ../src/connection-editor/nm-connection-list.c:938 ++#: ../src/connection-editor/nm-connection-list.c:1048 ++#: ../src/connection-editor/nm-connection-list.c:1051 + msgid "Error creating connection" + msgstr "接続の作成中にエラー" + +-#: ../src/connection-editor/nm-connection-list.c:936 ++#: ../src/connection-editor/nm-connection-list.c:1049 + msgid "No VPN plugins are installed." + msgstr "VPN プラグインがインストールされていません" + +-#: ../src/connection-editor/nm-connection-list.c:939 ++#: ../src/connection-editor/nm-connection-list.c:1052 + #, c-format + msgid "Don’t know how to create “%s” connections" + msgstr "接続 '%s' の作成方法がわかりません" + +-#: ../src/connection-editor/nm-connection-list.c:970 ++#: ../src/connection-editor/nm-connection-list.c:1085 + msgid "Error editing connection" +-msgstr "接続を編集しようとしてエラー" ++msgstr "接続の編集エラー" + +-#: ../src/connection-editor/nm-connection-list.c:971 ++#: ../src/connection-editor/nm-connection-list.c:1086 + #, c-format + msgid "Did not find a connection with UUID “%s”" +-msgstr "UUID '%s' の接続がみつかりませんでした" ++msgstr "UUID '%s' の接続が見つかりませんでした" ++ ++#: ../src/connection-editor/nm-connection-list.ui.h:2 ++msgid "Add a new connection" ++msgstr "新規接続を追加" + +-#: ../src/connection-editor/page-8021x-security.c:109 ++#: ../src/connection-editor/page-8021x-security.c:116 + msgid "802.1X Security" +-msgstr "802.1X セキュリティ" ++msgstr "802.1X セキュリティー" + +-#: ../src/connection-editor/page-8021x-security.c:111 ++#: ../src/connection-editor/page-8021x-security.c:118 + msgid "Could not load 802.1X Security user interface." +-msgstr "802.1X セキュリティユーザーインターフェースを読み込めません。" ++msgstr "802.1X セキュリティーユーザーインターフェースを読み込めません。" + +-#: ../src/connection-editor/page-8021x-security.c:125 ++#: ../src/connection-editor/page-8021x-security.c:132 + msgid "Use 802.1_X security for this connection" +-msgstr "この接続に 802.1X セキュリティを使用する(_X)" ++msgstr "この接続に 802.1X セキュリティーを使用する(_X)" + + #: ../src/connection-editor/page-bluetooth.c:58 + msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55" +@@ -3193,18 +3436,18 @@ msgstr "bond ユーザーインターフェースを読み込めません。" + + #: ../src/connection-editor/page-bond.c:568 + msgid "primary" +-msgstr "プライマリ" ++msgstr "プライマリー" + + #: ../src/connection-editor/page-bond.c:623 + #, c-format + msgid "Bond connection %d" +-msgstr "bond 接続 %d" ++msgstr "ボンド接続 %d" + +-#: ../src/connection-editor/page-bridge.c:215 ++#: ../src/connection-editor/page-bridge.c:236 + msgid "Could not load bridge user interface." + msgstr "ブリッジユーザーインターフェースを読み込めません。" + +-#: ../src/connection-editor/page-bridge.c:317 ++#: ../src/connection-editor/page-bridge.c:352 + #, c-format + msgid "Bridge connection %d" + msgstr "ブリッジ接続 %d" +@@ -3228,11 +3471,15 @@ msgstr "DCB" + msgid "Could not load DCB user interface." + msgstr "DCB ユーザーインターフェースをロードできませんでした。" + +-#: ../src/connection-editor/page-dsl.c:129 ++#: ../src/connection-editor/page-dsl.c:203 + msgid "Could not load DSL user interface." + msgstr "DSL ユーザーインターフェースをロードできませんでした。" + +-#: ../src/connection-editor/page-dsl.c:219 ++#: ../src/connection-editor/page-dsl.c:298 ++msgid "missing parent interface" ++msgstr "不明の親インターフェース" ++ ++#: ../src/connection-editor/page-dsl.c:343 + #, c-format + msgid "DSL connection %d" + msgstr "DSL 接続 %d" +@@ -3257,13 +3504,13 @@ msgstr "Ethernet のユーザーインターフェースを読み込めません + + #: ../src/connection-editor/page-ethernet.c:515 + msgid "Ethernet device" +-msgstr "イーサネットデバイス" ++msgstr "Ethernet デバイス" + + #: ../src/connection-editor/page-ethernet.c:519 + #: ../src/connection-editor/page-vlan.c:742 + #: ../src/connection-editor/page-wifi.c:574 + msgid "cloned MAC" +-msgstr "クローンした MAC" ++msgstr "クローン MAC" + + #: ../src/connection-editor/page-ethernet.c:523 + msgid "Wake-on-LAN password" +@@ -3272,7 +3519,7 @@ msgstr "Wake-on-LAN パスワード" + #: ../src/connection-editor/page-ethernet.c:563 + #, c-format + msgid "Ethernet connection %d" +-msgstr "イーサネット接続 %d" ++msgstr "Ethernet 接続 %d" + + #. TRANSLATORS: Default zone set for firewall, when no zone is selected + #: ../src/connection-editor/page-general.c:54 +@@ -3287,10 +3534,9 @@ msgid "" + "zone, selecting it results in the use of the default zone set in the " + "firewall. Only usable if firewalld is active." + msgstr "" +-"このゾーンは接続の信頼レベルを定義します。デフォルトは通常のゾーンではなく、" +-"デフォルトを選択した場合はファイアウォールでセットされているデフォルトのゾー" +-"ンを利用することになります。これは firewalld がアクティブの場合にのみ有意で" +-"す。" ++"このゾーンは接続の信頼レベルを定義します。デフォルトを選択した場合は、通常の" ++"ゾーンではなく、ファイアウォールでセットされているデフォルトのゾーンを利用す" ++"ることになります。これは firewalld がアクティブの場合にのみ有意です。" + + #: ../src/connection-editor/page-general.c:370 + msgid "Could not load General user interface." +@@ -3331,27 +3577,27 @@ msgid "IP tunnel connection %d" + msgstr "IP トンネル接続 %d" + + #: ../src/connection-editor/page-ip4.c:127 +-#: ../src/connection-editor/page-ip6.c:130 ++#: ../src/connection-editor/page-ip6.c:136 + msgid "Automatic (VPN)" + msgstr "自動 (VPN)" + + #: ../src/connection-editor/page-ip4.c:128 +-#: ../src/connection-editor/page-ip6.c:131 ++#: ../src/connection-editor/page-ip6.c:137 + msgid "Automatic (VPN) addresses only" + msgstr "自動 (VPN) アドレス専用" + + #: ../src/connection-editor/page-ip4.c:132 +-#: ../src/connection-editor/page-ip6.c:137 ++#: ../src/connection-editor/page-ip6.c:143 + msgid "Automatic, addresses only" + msgstr "自動、アドレスのみ" + + #: ../src/connection-editor/page-ip4.c:134 +-#: ../src/connection-editor/page-ip6.c:133 ++#: ../src/connection-editor/page-ip6.c:139 + msgid "Automatic (PPPoE)" + msgstr "自動 (PPPoE)" + + #: ../src/connection-editor/page-ip4.c:135 +-#: ../src/connection-editor/page-ip6.c:134 ++#: ../src/connection-editor/page-ip6.c:140 + msgid "Automatic (PPPoE) addresses only" + msgstr "自動 (PPPoE) アドレス専用" + +@@ -3364,17 +3610,17 @@ msgid "Automatic (DHCP) addresses only" + msgstr "自動 (DHCP) アドレス専用" + + #: ../src/connection-editor/page-ip4.c:181 +-#: ../src/connection-editor/page-ip6.c:198 ++#: ../src/connection-editor/page-ip6.c:204 + msgid "Link-Local Only" + msgstr "ローカルへのリンク専用" + + #: ../src/connection-editor/page-ip4.c:361 +-#: ../src/connection-editor/page-ip6.c:324 ++#: ../src/connection-editor/page-ip6.c:335 + msgid "Additional DNS ser_vers:" + msgstr "追加の DNS サーバー(_V):" + + #: ../src/connection-editor/page-ip4.c:370 +-#: ../src/connection-editor/page-ip6.c:333 ++#: ../src/connection-editor/page-ip6.c:344 + msgid "Additional s_earch domains:" + msgstr "追加の検索ドメイン(_E):" + +@@ -3411,43 +3657,52 @@ msgstr "IPv4 ゲートウェイ '%s' が無効" + msgid "IPv4 DNS server “%s” invalid" + msgstr "IPv4 DNS サーバー '%s' が無効" + +-#: ../src/connection-editor/page-ip6.c:173 ++#: ../src/connection-editor/page-ip6.c:179 + msgid "Automatic, DHCP only" + msgstr "自動、DHCP のみ" + +-#: ../src/connection-editor/page-ip6.c:993 ++#: ../src/connection-editor/page-ip6.c:1016 + #, c-format + msgid "Editing IPv6 routes for %s" + msgstr "%s 用の IPv6 ルートを編集" + +-#: ../src/connection-editor/page-ip6.c:1184 ++#: ../src/connection-editor/page-ip6.c:1208 + msgid "IPv6 Settings" + msgstr "IPv6 のセッティング" + +-#: ../src/connection-editor/page-ip6.c:1186 ++#: ../src/connection-editor/page-ip6.c:1210 + msgid "Could not load IPv6 user interface." + msgstr "IPv6 ユーザーインターフェースを読み込めません。" + +-#: ../src/connection-editor/page-ip6.c:1277 ++#: ../src/connection-editor/page-ip6.c:1302 + #, c-format + msgid "IPv6 address “%s” invalid" + msgstr "IPv6 アドレス '%s' が無効" + +-#: ../src/connection-editor/page-ip6.c:1285 ++#: ../src/connection-editor/page-ip6.c:1310 + #, c-format + msgid "IPv6 prefix “%s” invalid" + msgstr "IPv6 プレフィックス “%s” が無効" + +-#: ../src/connection-editor/page-ip6.c:1294 ++#: ../src/connection-editor/page-ip6.c:1319 + #, c-format + msgid "IPv6 gateway “%s” invalid" + msgstr "IPv6 ゲートウェイ '%s' が無効" + +-#: ../src/connection-editor/page-ip6.c:1336 ++#: ../src/connection-editor/page-ip6.c:1361 + #, c-format + msgid "IPv6 DNS server “%s” invalid" + msgstr "IPv6 DNS サーバー '%s' が無効" + ++#: ../src/connection-editor/page-macsec.c:192 ++msgid "Could not load MACsec user interface." ++msgstr "MACsec ユーザーインターフェースを読み込めませんでした。" ++ ++#: ../src/connection-editor/page-macsec.c:331 ++#, c-format ++msgid "MACSEC connection %d" ++msgstr "MACSEC 接続 %d" ++ + #: ../src/connection-editor/page-master.c:247 + #: ../src/connection-editor/page-master.c:258 + msgid "Duplicate slaves" +@@ -3456,7 +3711,7 @@ msgstr "重複するスレーブ" + #: ../src/connection-editor/page-master.c:248 + #, c-format + msgid "Slaves “%s” and “%s” both apply to device “%s”" +-msgstr "スレーブ '%s' と '%s' は両方ともデバイス '%s' へ適用されます。" ++msgstr "スレーブ '%s' と '%s' は、両方ともデバイス '%s' へ適用されます。" + + #: ../src/connection-editor/page-master.c:259 + #, c-format +@@ -3507,38 +3762,34 @@ msgstr "" + "私のプロバイダーは CDMA ベースの技術 (例えば、1xRTT, EVDO)を使用します(_D)" + + #: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50 +-#: ../src/mobile-helpers.c:283 ++#: ../src/mobile-helpers.c:282 + msgid "CDMA" + msgstr "CDMA" + + #: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54 +-#: ../src/mobile-helpers.c:281 ++#: ../src/mobile-helpers.c:280 + msgid "GSM" + msgstr "GSM" + +-#: ../src/connection-editor/page-ppp.c:129 +-msgid "EAP" +-msgstr "EAP" +- + #: ../src/connection-editor/page-ppp.c:130 +-#: ../src/wireless-security/eap-method-ttls.c:260 ++#: ../src/wireless-security/eap-method-ttls.c:287 + msgid "PAP" + msgstr "PAP" + + #: ../src/connection-editor/page-ppp.c:131 +-#: ../src/wireless-security/eap-method-ttls.c:322 ++#: ../src/wireless-security/eap-method-ttls.c:349 + msgid "CHAP" + msgstr "CHAP" + + #: ../src/connection-editor/page-ppp.c:132 +-#: ../src/wireless-security/eap-method-fast.c:284 +-#: ../src/wireless-security/eap-method-peap.c:273 +-#: ../src/wireless-security/eap-method-ttls.c:290 ++#: ../src/wireless-security/eap-method-fast.c:282 ++#: ../src/wireless-security/eap-method-peap.c:299 ++#: ../src/wireless-security/eap-method-ttls.c:317 + msgid "MSCHAPv2" + msgstr "MSCHAPv2" + + #: ../src/connection-editor/page-ppp.c:133 +-#: ../src/wireless-security/eap-method-ttls.c:275 ++#: ../src/wireless-security/eap-method-ttls.c:302 + msgid "MSCHAP" + msgstr "MSCHAP" + +@@ -3562,36 +3813,36 @@ msgstr "PPP ユーザーインターフェースを読み込めません。" + + #: ../src/connection-editor/page-proxy.c:215 + msgid "Proxy" +-msgstr "プロキシ" ++msgstr "プロキシー" + + #: ../src/connection-editor/page-proxy.c:217 + msgid "Could not load proxy user interface." +-msgstr "プロキシユーザーインターフェースを読み込めません。" ++msgstr "プロキシーユーザーインターフェースを読み込めません。" + + #: ../src/connection-editor/page-team.c:361 + #: ../src/connection-editor/page-team-port.c:223 + msgid "Error: file doesn’t contain a valid JSON configuration" + msgstr "エラー: ファイルに有効な JSON 設定がありません。" + +-#: ../src/connection-editor/page-team.c:1156 ++#: ../src/connection-editor/page-team.c:1034 + msgid "Could not load team user interface." +-msgstr "Team ユーザーインターフェースを読み込めません。" ++msgstr "チームユーザーインターフェースを読み込めません。" + +-#: ../src/connection-editor/page-team.c:1253 ++#: ../src/connection-editor/page-team.c:1131 + #, c-format + msgid "Team connection %d" +-msgstr "Team 接続 %d" ++msgstr "チーム接続 %d" + + #. Translators: a "Team Port" is a network + #. * device that is part of a team. + #. +-#: ../src/connection-editor/page-team-port.c:732 ++#: ../src/connection-editor/page-team-port.c:655 + msgid "Team Port" +-msgstr "Team ポート" ++msgstr "チームポート" + +-#: ../src/connection-editor/page-team-port.c:734 ++#: ../src/connection-editor/page-team-port.c:657 + msgid "Could not load team port user interface." +-msgstr "Team ポートのユーザーインターフェースを読み込めません。" ++msgstr "チームポートのユーザーインターフェースを読み込めません。" + + #. Translators: the first %s is a device name (eg, "em1"), the + #. * second is a connection name (eg, "Auto Ethernet"). +@@ -3696,51 +3947,51 @@ msgstr "Wi-Fi デバイス" + msgid "Wi-Fi connection %d" + msgstr "Wi-Fi 接続 %d" + +-#: ../src/connection-editor/page-wifi-security.c:356 ++#: ../src/connection-editor/page-wifi-security.c:358 + #: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922 + msgid "WEP 40/128-bit Key (Hex or ASCII)" + msgstr "WEP 40/128-bit キー (HEX または ASCII)" + +-#: ../src/connection-editor/page-wifi-security.c:366 ++#: ../src/connection-editor/page-wifi-security.c:368 + #: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931 + msgid "WEP 128-bit Passphrase" + msgstr "WEP 128-bit パスフレーズ" + +-#: ../src/connection-editor/page-wifi-security.c:392 ++#: ../src/connection-editor/page-wifi-security.c:394 + msgid "Dynamic WEP (802.1X)" + msgstr "動的 WEP (802.1X)" + +-#: ../src/connection-editor/page-wifi-security.c:405 ++#: ../src/connection-editor/page-wifi-security.c:407 + #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975 + msgid "WPA & WPA2 Personal" + msgstr "WPA & WPA2 Personal" + + # そういう仕様の名前なので訳すべきでない。 +-#: ../src/connection-editor/page-wifi-security.c:418 ++#: ../src/connection-editor/page-wifi-security.c:420 + #: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989 + msgid "WPA & WPA2 Enterprise" + msgstr "WPA & WPA2 Enterprise" + +-#: ../src/connection-editor/page-wifi-security.c:461 ++#: ../src/connection-editor/page-wifi-security.c:463 + msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting." + msgstr "" +-"Wi-Fi セキュリティユーザーインターフェースを読み込めません。Wi-Fi 設定があり" +-"ません。" ++"Wi-Fi セキュリティーユーザーインターフェースを読み込めません。Wi-Fi 設定があ" ++"りません。" + +-#: ../src/connection-editor/page-wifi-security.c:472 ++#: ../src/connection-editor/page-wifi-security.c:474 + msgid "Wi-Fi Security" +-msgstr "Wi-Fi セキュリティ" ++msgstr "Wi-Fi セキュリティー" + +-#: ../src/connection-editor/page-wifi-security.c:474 ++#: ../src/connection-editor/page-wifi-security.c:476 + msgid "Could not load Wi-Fi security user interface." +-msgstr "Wi-Fi セキュリティユーザーインターフェースを読み込めません。" ++msgstr "Wi-Fi セキュリティーユーザーインターフェースを読み込めません。" + +-#: ../src/connection-editor/page-wifi-security.c:558 ++#: ../src/connection-editor/page-wifi-security.c:560 + #, c-format + msgid "missing SSID" +-msgstr "見つからない SSID" ++msgstr "不明な SSID" + +-#: ../src/connection-editor/page-wifi-security.c:564 ++#: ../src/connection-editor/page-wifi-security.c:566 + #, c-format + msgid "Security not compatible with Ad-Hoc mode" + msgstr "Ad-Hoc モードとのセキュリティーの互換性がありません" +@@ -3770,7 +4021,7 @@ msgid "" + "\n" + "Error: %s." + msgstr "" +-"VPN 接続 '%s' は %s にエクスポートできませんでした。\n" ++"VPN 接続 '%s' は、%s にエクスポートできませんでした。\n" + "\n" + "エラー: %s" + +@@ -3790,34 +4041,38 @@ msgstr "自動的にこのデバイスをアンロックする" + msgid "Connection Information" + msgstr "接続情報" + ++#: ../src/info.ui.h:2 ++msgid "_Close" ++msgstr "閉じる(_C)" ++ + #: ../src/info.ui.h:3 + msgid "Active Network Connections" + msgstr "有効なネットワーク接続" + + #: ../src/libnma/nma-file-cert-chooser.c:108 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:146 + msgid "No certificate set" + msgstr "証明書セットがありません" + + #: ../src/libnma/nma-file-cert-chooser.c:126 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:170 + msgid "No key set" + msgstr "キーセットがありません" + + #: ../src/libnma/nma-file-cert-chooser.c:246 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:370 + #, c-format + msgid "Choose a key for %s Certificate" + msgstr "%s 証明書のキーを選択する" + + #: ../src/libnma/nma-file-cert-chooser.c:250 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:374 + #, c-format + msgid "%s private _key:" + msgstr "%s プライベートキー(_K):" + + #: ../src/libnma/nma-file-cert-chooser.c:254 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:378 + #, c-format + msgid "%s key _password:" + msgstr "%s キーパスワード(_P):" +@@ -3828,7 +4083,7 @@ msgid "Choose %s Certificate" + msgstr "%s 証明書を選択する" + + #: ../src/libnma/nma-file-cert-chooser.c:262 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:386 + #, c-format + msgid "%s _certificate:" + msgstr "%s 証明書(_C):" +@@ -3837,8 +4092,7 @@ msgstr "%s 証明書(_C):" + #: ../src/libnm-gtk/nm-mobile-wizard.c:199 + msgid "" + "Your mobile broadband connection is configured with the following settings:" +-msgstr "" +-"ご使用のモバイルブロードバンド接続は以下のセッティングで設定されています:" ++msgstr "ご使用のモバイルブロードバンド接続は、以下のように設定されています。" + + #. Device + #: ../src/libnma/nma-mobile-wizard.c:205 +@@ -3987,8 +4241,8 @@ msgid "" + "This assistant helps you easily set up a mobile broadband connection to a " + "cellular (3G) network." + msgstr "" +-"このアシスタントはユーザーが簡単に携帯 (3G) ネットワークへのモバイルブロード" +-"バンド接続ができるように手伝います。" ++"このアシスタントを使用すると、携帯 (3G) ネットワークへのモバイルブロードバン" ++"ド接続が簡単にできます。" + + #: ../src/libnma/nma-mobile-wizard.c:1360 + #: ../src/libnm-gtk/nm-mobile-wizard.c:1361 +@@ -4030,45 +4284,45 @@ msgstr "モバイルブロードバンド接続のセットアップ" + msgid "New Mobile Broadband Connection" + msgstr "新規のモバイルブロードバンド接続" + +-#: ../src/libnma/nma-cert-chooser-button.c:162 ++#: ../src/libnma/nma-cert-chooser-button.c:165 + msgid "(None)" + msgstr "(なし)" + +-#: ../src/libnma/nma-cert-chooser-button.c:170 ++#: ../src/libnma/nma-cert-chooser-button.c:173 + #, c-format + msgid "Key in %s" + msgstr "%s 内のキー" + +-#: ../src/libnma/nma-cert-chooser-button.c:171 ++#: ../src/libnma/nma-cert-chooser-button.c:174 + #, c-format + msgid "Certificate in %s" + msgstr "%s 内の 証明書" + +-#: ../src/libnma/nma-cert-chooser-button.c:190 ++#: ../src/libnma/nma-cert-chooser-button.c:193 + #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183 + msgid "(Unknown)" + msgstr "(不明)" + +-#: ../src/libnma/nma-cert-chooser-button.c:212 +-#: ../src/libnma/nma-cert-chooser-button.c:242 ++#: ../src/libnma/nma-cert-chooser-button.c:215 ++#: ../src/libnma/nma-cert-chooser-button.c:245 + msgid "Select" + msgstr "選択" + +-#: ../src/libnma/nma-cert-chooser-button.c:213 +-#: ../src/libnma/nma-cert-chooser-button.c:243 ++#: ../src/libnma/nma-cert-chooser-button.c:216 ++#: ../src/libnma/nma-cert-chooser-button.c:246 + msgid "Cancel" + msgstr "キャンセル" + +-#: ../src/libnma/nma-cert-chooser-button.c:469 ++#: ../src/libnma/nma-cert-chooser-button.c:472 + msgid "Select from file…" + msgstr "ファイルから選択…" + +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:382 + #, c-format + msgid "Choose a %s Certificate" + msgstr "%s 証明書を選択する" + +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:390 + #, c-format + msgid "%s certificate _password:" + msgstr "%s 証明書のパスワード(_P):" +@@ -4121,15 +4375,15 @@ msgstr "パスワードは不要です" + #: ../src/libnma/nma-vpn-password-dialog.c:99 + #: ../src/libnm-gtk/nm-vpn-password-dialog.c:99 + msgid "_Secondary Password:" +-msgstr "セカンダリパスワード(_S):" ++msgstr "セカンダリーパスワード(_S):" + + #: ../src/libnma/nma-vpn-password-dialog.c:102 + #: ../src/libnm-gtk/nm-vpn-password-dialog.c:102 + msgid "_Tertiary Password:" + msgstr "第 3 のパスワード(_T):" + +-#: ../src/libnma/nma-vpn-password-dialog.c:247 +-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247 ++#: ../src/libnma/nma-vpn-password-dialog.c:238 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238 + msgid "Sh_ow passwords" + msgstr "パスワードを表示(_O)" + +@@ -4142,7 +4396,7 @@ msgid "" + "Either a password is missing or the connection is invalid. In the latter " + "case, you have to edit the connection with nm-connection-editor first" + msgstr "" +-"パスワードが見つからない、もしくは接続が無効です。後者の場合は、まず nm-" ++"パスワードが見つからない、もしくは接続が無効です。無効の場合は、まず nm-" + "connection-editor で接続を編集する必要があります。" + + #: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465 +@@ -4158,55 +4412,56 @@ msgstr "なし" + msgid "Dynamic WEP (802.1x)" + msgstr "動的 WEP (802.1X)" + +-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075 ++#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071 + msgid "C_reate" + msgstr "作成(_R)" + +-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161 ++#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150 + #, c-format + msgid "" + "Passwords or encryption keys are required to access the Wi-Fi network “%s”." + msgstr "" +-"Wi-Fi ネットワーク '%s' にアクセスするにはパスワードか暗号化キーが必要です。" ++"Wi-Fi ネットワーク '%s' にアクセスするには、パスワードか暗号化キーが必要で" ++"す。" + +-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163 ++#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152 + msgid "Wi-Fi Network Authentication Required" + msgstr "Wi-Fi ネットワークの認証が必要です" + +-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165 ++#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154 + msgid "Authentication required by Wi-Fi network" + msgstr "Wi-Fi ネットワークでは認証が要求されます" + +-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170 ++#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159 + msgid "Create New Wi-Fi Network" + msgstr "新しい Wi-Fi ネットワークを作成" + +-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172 ++#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161 + msgid "New Wi-Fi network" + msgstr "新規 Wi-Fi ネットワーク" + +-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173 ++#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162 + msgid "Enter a name for the Wi-Fi network you wish to create." +-msgstr "作成したい Wi-Fi ネットワークの名前を入力してください。" ++msgstr "作成する Wi-Fi ネットワークの名前を入力してください。" + +-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175 ++#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164 + msgid "Connect to Hidden Wi-Fi Network" + msgstr "非表示 Wi-Fi ネットワークに接続する" + +-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177 ++#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166 + msgid "Hidden Wi-Fi network" + msgstr "非表示 Wi-Fi ネットワーク" + +-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178 ++#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167 + msgid "" + "Enter the name and security details of the hidden Wi-Fi network you wish to " + "connect to." + msgstr "" +-"接続したい Wi-Fi ネットワークの名前とセキュリティ詳細を入力してください。" ++"接続する Wi-Fi ネットワークの名前とセキュリティー詳細を入力してください。" + + #: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1 + msgid "Wi-Fi _security:" +-msgstr "Wi-Fi セキュリティ(_S):" ++msgstr "Wi-Fi セキュリティー(_S):" + + #: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3 + msgid "C_onnection:" +@@ -4257,7 +4512,7 @@ msgid "" + "This program is a component of NetworkManager (https://wiki.gnome.org/" + "Projects/NetworkManager/)." + msgstr "" +-"このプログラムは NetworkManager (https://wiki.gnome.org/Projects/" ++"このプログラムは、NetworkManager (https://wiki.gnome.org/Projects/" + "NetworkManager/) のコンポーネントです。" + + #: ../src/main.c:45 +@@ -4265,8 +4520,8 @@ msgid "" + "It is not intended for command-line interaction but instead runs in the " + "GNOME desktop environment." + msgstr "" +-"コマンドラインでの利用は意図されていませんが、その代わりに GNOME デスクトップ" +-"環境で実行します。" ++"コマンドラインでの利用は意図されていません。代わりに GNOME デスクトップ環境で" ++"実行します。" + + #: ../src/mb-menu-item.c:52 + msgid "EVDO" +@@ -4350,25 +4605,25 @@ msgstr "ローミングネットワーク (%s)" + msgid "Roaming network" + msgstr "ローミングネットワーク" + +-#: ../src/mobile-helpers.c:331 ++#: ../src/mobile-helpers.c:330 + #, c-format + msgid "PIN code for SIM card “%s” on “%s”" +-msgstr "'%s' 上の SIM カード '%s' の PIN コード" ++msgstr "SIM カード '%s' の PIN コード ('%s' に搭載)" + +-#: ../src/mobile-helpers.c:464 ++#: ../src/mobile-helpers.c:463 + msgid "PIN code required" + msgstr "PIN コードが必要です" + +-#: ../src/mobile-helpers.c:472 ++#: ../src/mobile-helpers.c:471 + msgid "PIN code is needed for the mobile broadband device" + msgstr "モバイルブロードバンドデバイスには PIN コードが必要です" + +-#: ../src/mobile-helpers.c:622 ++#: ../src/mobile-helpers.c:621 + #, c-format + msgid "Mobile broadband connection “%s” active: (%d%%%s%s)" + msgstr "モバイルブロードバンド接続 '%s' はアクティブです: (%d%%%s%s)" + +-#: ../src/mobile-helpers.c:625 ++#: ../src/mobile-helpers.c:624 + msgid "roaming" + msgstr "ローミング" + +@@ -4378,11 +4633,11 @@ msgstr "ローミング" + msgid "%s connection" + msgstr "%s 接続" + +-#: ../src/utils/utils.c:563 ++#: ../src/utils/utils.c:565 + msgid "PEM certificates (*.pem, *.crt, *.cer)" + msgstr "PEM 証明書 (*.pem、*.crt、*.cer)" + +-#: ../src/utils/utils.c:575 ++#: ../src/utils/utils.c:577 + msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" + msgstr "DER か、PEM、 PKCS#12 のプライベートキー (*.der, *.pem, *.p12, *.key)" + +@@ -4390,38 +4645,33 @@ msgstr "DER か、PEM、 PKCS#12 のプライベートキー (*.der, *.pem, *.p1 + msgid "undefined error in 802.1X security (wpa-eap)" + msgstr "802.1X セキュリティーで未定義のエラー (wpa-eap)" + +-#: ../src/wireless-security/eap-method.c:227 +-msgid "no file selected" +-msgstr "ファイルが選択されていません" +- +-#: ../src/wireless-security/eap-method.c:235 +-#, c-format +-msgid "file “%s” does not exist" +-msgstr "ファイル '%s' は存在しません" ++#: ../src/wireless-security/eap-method.c:365 ++msgid "no CA certificate selected" ++msgstr "CA 証明書が選択されていません" + +-#: ../src/wireless-security/eap-method.c:258 +-msgid "unspecified error validating eap-method file" +-msgstr "eap-method ファイルの検証中に原因不明のエラー" ++#: ../src/wireless-security/eap-method.c:370 ++msgid "selected CA certificate file does not exist" ++msgstr "選択された CA 証明書ファイルは存在しません" + +-#: ../src/wireless-security/eap-method-fast.c:73 ++#: ../src/wireless-security/eap-method-fast.c:71 + msgid "missing EAP-FAST PAC file" + msgstr "EAP-FAST PAC ファイルがありません" + +-#: ../src/wireless-security/eap-method-fast.c:269 +-#: ../src/wireless-security/eap-method-peap.c:303 +-#: ../src/wireless-security/eap-method-ttls.c:352 ++#: ../src/wireless-security/eap-method-fast.c:267 ++#: ../src/wireless-security/eap-method-peap.c:329 ++#: ../src/wireless-security/eap-method-ttls.c:379 + msgid "GTC" + msgstr "GTC" + +-#: ../src/wireless-security/eap-method-fast.c:407 ++#: ../src/wireless-security/eap-method-fast.c:405 + msgid "Choose a PAC file" + msgstr "PAC ファイルを選択" + +-#: ../src/wireless-security/eap-method-fast.c:414 ++#: ../src/wireless-security/eap-method-fast.c:412 + msgid "PAC files (*.pac)" + msgstr "PAC ファイル (*.pac)" + +-#: ../src/wireless-security/eap-method-fast.c:418 ++#: ../src/wireless-security/eap-method-fast.c:416 + msgid "All files" + msgstr "すべてのファイル" + +@@ -4439,7 +4689,7 @@ msgstr "両方" + + #: ../src/wireless-security/eap-method-fast.ui.h:4 + #: ../src/wireless-security/eap-method-peap.ui.h:4 +-#: ../src/wireless-security/eap-method-ttls.ui.h:1 ++#: ../src/wireless-security/eap-method-ttls.ui.h:3 + msgid "Anony_mous identity:" + msgstr "匿名の識別子(_M):" + +@@ -4449,7 +4699,7 @@ msgstr "PAC ファイル(_F):" + + #: ../src/wireless-security/eap-method-fast.ui.h:6 + #: ../src/wireless-security/eap-method-peap.ui.h:7 +-#: ../src/wireless-security/eap-method-ttls.ui.h:4 ++#: ../src/wireless-security/eap-method-ttls.ui.h:1 + msgid "_Inner authentication:" + msgstr "内部認証(_I):" + +@@ -4466,26 +4716,12 @@ msgstr "EAP-LEAP ユーザー名がありません" + msgid "missing EAP-LEAP password" + msgstr "EAP-LEAP パスワードがありません" + +-#: ../src/wireless-security/eap-method-peap.c:64 +-#, c-format +-msgid "invalid EAP-PEAP CA certificate: %s" +-msgstr "EAP-PEAP CA 証明書が無効です: %s" +- +-#: ../src/wireless-security/eap-method-peap.c:69 +-msgid "invalid EAP-PEAP CA certificate: no certificate specified" +-msgstr "EAP-PEAP CA 証明書が無効です: 証明書が指定されていません" +- +-#: ../src/wireless-security/eap-method-peap.c:288 +-#: ../src/wireless-security/eap-method-ttls.c:337 ++#: ../src/wireless-security/eap-method-peap.c:314 ++#: ../src/wireless-security/eap-method-ttls.c:364 + #: ../src/wireless-security/wireless-security.c:424 + msgid "MD5" + msgstr "MD5" + +-#: ../src/wireless-security/eap-method-peap.c:382 +-#: ../src/wireless-security/eap-method-ttls.c:431 +-msgid "Choose a Certificate Authority certificate" +-msgstr "証明機関 (CA) 証明書を選択" +- + #: ../src/wireless-security/eap-method-peap.ui.h:2 + msgid "Version 0" + msgstr "バージョン 0" +@@ -4495,20 +4731,27 @@ msgid "Version 1" + msgstr "バージョン 1" + + #: ../src/wireless-security/eap-method-peap.ui.h:5 +-#: ../src/wireless-security/eap-method-ttls.ui.h:2 +-msgid "C_A certificate:" +-msgstr "CA 証明書(_A):" +- +-#: ../src/wireless-security/eap-method-peap.ui.h:6 + #: ../src/wireless-security/eap-method-tls.ui.h:2 +-#: ../src/wireless-security/eap-method-ttls.ui.h:3 ++#: ../src/wireless-security/eap-method-ttls.ui.h:2 + msgid "No CA certificate is _required" + msgstr "CA 証明書は必要ありません(_R)" + +-#: ../src/wireless-security/eap-method-peap.ui.h:8 ++#: ../src/wireless-security/eap-method-peap.ui.h:6 + msgid "PEAP _version:" + msgstr "PEAP バージョン(_V):" + ++#: ../src/wireless-security/eap-method-peap.ui.h:8 ++#: ../src/wireless-security/eap-method-tls.ui.h:3 ++#: ../src/wireless-security/eap-method-ttls.ui.h:4 ++msgid "Suffix of the server certificate name." ++msgstr "サーバー証明書名のサフィックス" ++ ++#: ../src/wireless-security/eap-method-peap.ui.h:9 ++#: ../src/wireless-security/eap-method-tls.ui.h:4 ++#: ../src/wireless-security/eap-method-ttls.ui.h:5 ++msgid "_Domain:" ++msgstr "ドメイン(_D):" ++ + #: ../src/wireless-security/eap-method-simple.c:75 + msgid "missing EAP username" + msgstr "EAP ユーザー名がありません" +@@ -4521,48 +4764,31 @@ msgstr "EAP パスワードがありません" + msgid "missing EAP-TLS identity" + msgstr "EAP-TLS アイデンティティーがありません" + +-#: ../src/wireless-security/eap-method-tls.c:238 ++#: ../src/wireless-security/eap-method-tls.c:256 + msgid "no user certificate selected" + msgstr "ユーザー証明書が選択されていません" + +-#: ../src/wireless-security/eap-method-tls.c:243 ++#: ../src/wireless-security/eap-method-tls.c:261 + msgid "selected user certificate file does not exist" + msgstr "選択されたユーザー証明書ファイルは存在しません" + +-#: ../src/wireless-security/eap-method-tls.c:263 ++#: ../src/wireless-security/eap-method-tls.c:281 + msgid "no key selected" + msgstr "キーが選択されていません" + +-#: ../src/wireless-security/eap-method-tls.c:268 ++#: ../src/wireless-security/eap-method-tls.c:286 + msgid "selected key file does not exist" + msgstr "選択されたキーファイルは存在しません" + +-#: ../src/wireless-security/eap-method-tls.c:314 +-msgid "no CA certificate selected" +-msgstr "CA 証明書が選択されていません" +- +-#: ../src/wireless-security/eap-method-tls.c:319 +-msgid "selected CA certificate file does not exist" +-msgstr "選択された CA 証明書ファイルは存在しません" +- + # とりあえずこのように訳しておくが "Identity" のままの方が適切かもしれない。 + # (WPA-EAP Identity 認証方式: ユーザ ID とパスワードの組で認証) + #: ../src/wireless-security/eap-method-tls.ui.h:1 + msgid "I_dentity:" + msgstr "アイデンティティー(_D):" + +-#: ../src/wireless-security/eap-method-ttls.c:64 +-#, c-format +-msgid "invalid EAP-TTLS CA certificate: %s" +-msgstr "EAP-TTLS CA 証明書が無効です: %s" +- +-#: ../src/wireless-security/eap-method-ttls.c:69 +-msgid "invalid EAP-TTLS CA certificate: no certificate specified" +-msgstr "EAP-TTLS CA 証明書が無効です: 証明書がしてされていません" +- +-#: ../src/wireless-security/eap-method-ttls.c:306 ++#: ../src/wireless-security/eap-method-ttls.c:333 + msgid "MSCHAPv2 (no EAP)" +-msgstr "MSCHAPv2 (no EAP)" ++msgstr "MSCHAPv2 (非 EAP)" + + #: ../src/wireless-security/wireless-security.c:72 + msgid "Unknown error validating 802.1X security" +@@ -4596,26 +4822,26 @@ msgstr "認証(_T):" + + #: ../src/wireless-security/ws-leap.c:63 + msgid "missing leap-username" +-msgstr "leap-username がみつかりません" ++msgstr "leap-username が見つかりません" + + #: ../src/wireless-security/ws-leap.c:74 + msgid "missing leap-password" +-msgstr "leap-password がみつかりません" ++msgstr "leap-password が見つかりません" + + #: ../src/wireless-security/ws-wep-key.c:107 + msgid "missing wep-key" +-msgstr "wep-key がみつかりません" ++msgstr "wep-key が見つかりません" + + #: ../src/wireless-security/ws-wep-key.c:116 + #, c-format + msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +-msgstr "無効な wep-key: %zu の長さのキーには 16 進数しか使用できません" ++msgstr "無効な wep-key: %zu の長さのキーには、16 進数しか使用できません" + + #: ../src/wireless-security/ws-wep-key.c:124 + #, c-format + msgid "" + "invalid wep-key: key with a length of %zu must contain only ascii characters" +-msgstr "無効な wep-key: %zu の長さのキーには ascii 文字しか使用できません" ++msgstr "無効な wep-key: %zu の長さのキーには、ascii 文字しか使用できません" + + #: ../src/wireless-security/ws-wep-key.c:130 + #, c-format +@@ -4635,17 +4861,17 @@ msgid "invalid wep-key: passphrase must be shorter than 64 characters" + msgstr "無効な wep-key: パスフレーズは 64 文字未満にする必要があります。" + + #: ../src/wireless-security/ws-wep-key.ui.h:1 +-msgid "1 (Default)" +-msgstr "1 (デフォルト)" +- +-#: ../src/wireless-security/ws-wep-key.ui.h:2 + msgid "Open System" + msgstr "オープンシステム" + +-#: ../src/wireless-security/ws-wep-key.ui.h:3 ++#: ../src/wireless-security/ws-wep-key.ui.h:2 + msgid "Shared Key" + msgstr "共有鍵" + ++#: ../src/wireless-security/ws-wep-key.ui.h:3 ++msgid "1 (Default)" ++msgstr "1 (デフォルト)" ++ + #: ../src/wireless-security/ws-wep-key.ui.h:4 + msgid "_Key:" + msgstr "キー(_K):" +diff --git a/po/ko.po b/po/ko.po +index 02aba05..cd8b082 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -17,22 +17,23 @@ + # - VPN은 "가상 사설망"으로 풀어서 번역 + # - bond는 "본딩"으로 번역 (여러 네트워크를 묶어서 사용) + # - bridged network는 "브릿지 네트워크"로 번역 +-# ++# lrintel , 2017. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: network-manager-applet\n" ++"Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2017-05-10 12:44+0200\n" +-"PO-Revision-Date: 2014-09-06 18:12+0900\n" +-"Last-Translator: Changwoo Ryu \n" ++"POT-Creation-Date: 2017-11-07 19:40+0100\n" ++"PO-Revision-Date: 2017-11-07 06:44+0000\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: GNOME Korea \n" + "Language: ko\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" + +-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175 ++#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191 + msgid "Network" + msgstr "네트워크" + +@@ -41,7 +42,7 @@ msgid "Manage your network connections" + msgstr "네트워크 연결을 관리합니다" + + #: ../nm-connection-editor.desktop.in.h:1 +-#: ../src/connection-editor/nm-connection-editor.ui.h:1 ++#: ../src/connection-editor/nm-connection-list.ui.h:1 + msgid "Network Connections" + msgstr "네트워크 연결" + +@@ -153,55 +154,68 @@ msgstr "" + msgid "The NetworkManager Developers" + msgstr "네트워크 관리 애플릿" + +-#: ../shared/nm-utils/nm-shared-utils.c:185 ++#: ../shared/nm-utils/nm-shared-utils.c:477 + #, c-format + msgid "object class '%s' has no property named '%s'" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:192 ++#: ../shared/nm-utils/nm-shared-utils.c:484 + #, c-format + msgid "property '%s' of object class '%s' is not writable" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:199 ++#: ../shared/nm-utils/nm-shared-utils.c:491 + #, c-format + msgid "" + "construct property \"%s\" for object '%s' can't be set after construction" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:207 ++#: ../shared/nm-utils/nm-shared-utils.c:499 + #, c-format + msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:216 ++#: ../shared/nm-utils/nm-shared-utils.c:508 + #, c-format + msgid "unable to set property '%s' of type '%s' from value of type '%s'" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:227 ++#: ../shared/nm-utils/nm-shared-utils.c:519 + #, c-format + msgid "" + "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " + "type '%s'" + msgstr "" + +-#. *************************************************************************** + #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99 + msgid "802.1X authentication" + msgstr "802.1X 인증" + +-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1 ++#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349 ++#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1 + #: ../src/connection-editor/ce-ip6-routes.ui.h:1 + #: ../src/connection-editor/ce-new-connection.ui.h:1 + #: ../src/connection-editor/ce-page-dcb.ui.h:17 + #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1 +-#: ../src/connection-editor/nm-connection-editor.ui.h:8 +-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1 ++#: ../src/connection-editor/connection-helpers.c:308 ++#: ../src/connection-editor/connection-helpers.c:771 ++#: ../src/connection-editor/nm-connection-editor.ui.h:5 ++#: ../src/connection-editor/page-bluetooth.c:311 ++#: ../src/connection-editor/page-mobile.c:543 ++#: ../src/connection-editor/page-proxy.c:121 ++#: ../src/connection-editor/page-team.c:344 ++#: ../src/connection-editor/page-team-port.c:206 ++#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1 ++#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1 ++#: ../src/libnma/nma-vpn-password-dialog.c:209 ++#: ../src/libnma/nma-wifi-dialog.c:1066 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209 ++#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465 + msgid "_Cancel" + msgstr "" + +-#: ../src/8021x.ui.h:3 ++#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072 ++#: ../src/libnm-gtk/nm-wifi-dialog.c:1073 + msgid "C_onnect" + msgstr "연결(_O)" + +@@ -218,38 +232,38 @@ msgstr "애드혹" + msgid "secure." + msgstr "" + +-#: ../src/applet.c:381 ++#: ../src/applet.c:392 + msgid "Failed to add/activate connection" + msgstr "연결 추가/활성화하는 데 실패" + +-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472 +-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410 ++#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483 ++#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411 + msgid "Unknown error" + msgstr "알 수 없는 오류" + +-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539 +-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413 ++#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539 ++#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414 + msgid "Connection failure" + msgstr "연결에 실패" + +-#: ../src/applet.c:435 ++#: ../src/applet.c:446 + msgid "Device disconnect failed" + msgstr "장치 연결 끊는 데 실패" + +-#: ../src/applet.c:440 ++#: ../src/applet.c:451 + msgid "Disconnect failure" + msgstr "연결 끊는 데 실패" + +-#: ../src/applet.c:470 ++#: ../src/applet.c:481 + msgid "Connection activation failed" + msgstr "연결 활성화 실패" + +-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126 ++#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127 + #, fuzzy + msgid "Don’t show this message again" + msgstr "다시 보지 않기" + +-#: ../src/applet.c:883 ++#: ../src/applet.c:899 + #, fuzzy, c-format + msgid "" + "\n" +@@ -259,7 +273,7 @@ msgstr "" + "\n" + "'%s' 가상 사설망 연결이 실패했습니다. 네트워크 연결이 중단되었습니다." + +-#: ../src/applet.c:885 ++#: ../src/applet.c:901 + #, fuzzy, c-format + msgid "" + "\n" +@@ -269,7 +283,7 @@ msgstr "" + "\n" + "'%s' 가상 사설망 연결이 실패했습니다. 네트워크 연결이 중단되었습니다." + +-#: ../src/applet.c:887 ++#: ../src/applet.c:903 + #, fuzzy, c-format + msgid "" + "\n" +@@ -279,7 +293,7 @@ msgstr "" + "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 예기치 못하게 중단" + "되었습니다." + +-#: ../src/applet.c:889 ++#: ../src/applet.c:905 + #, fuzzy, c-format + msgid "" + "\n" +@@ -290,7 +304,7 @@ msgstr "" + "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 잘못된 설정을 반환" + "했습니다." + +-#: ../src/applet.c:891 ++#: ../src/applet.c:907 + #, fuzzy, c-format + msgid "" + "\n" +@@ -299,7 +313,7 @@ msgstr "" + "\n" + "'%s' 가상 사설망 연결이 실패했습니다. 연결 시도가 제한 시간을 초과했습니다." + +-#: ../src/applet.c:893 ++#: ../src/applet.c:909 + #, fuzzy, c-format + msgid "" + "\n" +@@ -309,7 +323,7 @@ msgstr "" + "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 제 시간에 시작하" + "지 못했습니다." + +-#: ../src/applet.c:895 ++#: ../src/applet.c:911 + #, fuzzy, c-format + msgid "" + "\n" +@@ -319,7 +333,7 @@ msgstr "" + "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스를 시작하는데 실패했" + "습니다." + +-#: ../src/applet.c:897 ++#: ../src/applet.c:913 + #, fuzzy, c-format + msgid "" + "\n" +@@ -328,7 +342,7 @@ msgstr "" + "\n" + "'%s' 가상 사설망 연결이 실패했습니다. 올바른 가상 사설망 비밀정보가 없습니다." + +-#: ../src/applet.c:899 ++#: ../src/applet.c:915 + #, fuzzy, c-format + msgid "" + "\n" +@@ -337,7 +351,7 @@ msgstr "" + "\n" + "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 비밀 정보가 잘못되었습니다." + +-#: ../src/applet.c:904 ++#: ../src/applet.c:920 + #, fuzzy, c-format + msgid "" + "\n" +@@ -346,7 +360,7 @@ msgstr "" + "\n" + "'%s' 가상 사설망 연결이 실패했습니다." + +-#: ../src/applet.c:931 ++#: ../src/applet.c:947 + #, c-format + msgid "" + "VPN connection has been successfully established.\n" +@@ -357,19 +371,19 @@ msgstr "" + "\n" + "%s\n" + +-#: ../src/applet.c:933 ++#: ../src/applet.c:949 + msgid "VPN connection has been successfully established.\n" + msgstr "가상 사설망에 성공적으로 연결했습니다.\n" + +-#: ../src/applet.c:935 ++#: ../src/applet.c:951 + msgid "VPN Login Message" + msgstr "가상 사설망 로그인 메시지" + +-#: ../src/applet.c:943 ../src/applet.c:983 ++#: ../src/applet.c:959 ../src/applet.c:999 + msgid "VPN Connection Failed" + msgstr "가상 사설망 연결 실패" + +-#: ../src/applet.c:987 ++#: ../src/applet.c:1003 + #, fuzzy, c-format + msgid "" + "\n" +@@ -383,7 +397,7 @@ msgstr "" + "\n" + "%s" + +-#: ../src/applet.c:990 ++#: ../src/applet.c:1006 + #, fuzzy, c-format + msgid "" + "\n" +@@ -396,148 +410,148 @@ msgstr "" + "\n" + "%s" + +-#: ../src/applet.c:1279 ++#: ../src/applet.c:1295 + msgid "device not ready (firmware missing)" + msgstr "장치가 준비되지 않음(펌웨어 없음)" + +-#: ../src/applet.c:1281 ++#: ../src/applet.c:1297 + msgid "device not ready" + msgstr "장치가 준비되지 않음" + + #. Notify user of unmanaged or unavailable device +-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109 ++#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109 + msgid "disconnected" + msgstr "연결 끊김" + +-#: ../src/applet.c:1307 ++#: ../src/applet.c:1323 + msgid "Disconnect" + msgstr "연결 끊김" + +-#: ../src/applet.c:1321 ++#: ../src/applet.c:1337 + msgid "device not managed" + msgstr "장치가 관리되지 않음" + +-#: ../src/applet.c:1394 ++#: ../src/applet.c:1410 + msgid "No network devices available" + msgstr "네트워크 장치를 찾을 수 없습니다" + +-#: ../src/applet.c:1448 ++#: ../src/applet.c:1464 + msgid "_VPN Connections" + msgstr "가상 사설망 연결(_V)" + +-#: ../src/applet.c:1492 ++#: ../src/applet.c:1508 + #, fuzzy + msgid "_Configure VPN…" + msgstr "가상 사설망 설정(_C)..." + +-#: ../src/applet.c:1495 ++#: ../src/applet.c:1511 + #, fuzzy + msgid "_Add a VPN connection…" + msgstr "가상 사설망 연결(_V)" + +-#: ../src/applet.c:1601 ++#: ../src/applet.c:1617 + #, fuzzy + msgid "NetworkManager is not running…" + msgstr "네트워크 관리가 실행 중이 아닙니다..." + +-#: ../src/applet.c:1606 ../src/applet.c:2671 ++#: ../src/applet.c:1622 ../src/applet.c:2687 + msgid "Networking disabled" + msgstr "네트워크를 사용할 수 없습니다" + + #. 'Enable Networking' item +-#: ../src/applet.c:1816 ++#: ../src/applet.c:1832 + msgid "Enable _Networking" + msgstr "네트워크 사용(_N)" + + #. 'Enable Wi-Fi' item +-#: ../src/applet.c:1825 ++#: ../src/applet.c:1841 + msgid "Enable _Wi-Fi" + msgstr "와이파이 사용(_W)" + + #. 'Enable Mobile Broadband' item +-#: ../src/applet.c:1834 ++#: ../src/applet.c:1850 + msgid "Enable _Mobile Broadband" + msgstr "모바일 광대역 사용(_M)" + + #. Toggle notifications item +-#: ../src/applet.c:1846 ++#: ../src/applet.c:1862 + msgid "Enable N_otifications" + msgstr "통지기능 사용(_O)" + + #. 'Connection Information' item +-#: ../src/applet.c:1858 ++#: ../src/applet.c:1874 + msgid "Connection _Information" + msgstr "연결 정보(_I)" + + #. 'Edit Connections...' item +-#: ../src/applet.c:1866 ++#: ../src/applet.c:1882 + #, fuzzy + msgid "Edit Connections…" + msgstr "연결 편집..." + +-#: ../src/applet.c:1880 ++#: ../src/applet.c:1896 + msgid "_About" + msgstr "정보(_A)" + +-#: ../src/applet.c:2191 ++#: ../src/applet.c:2207 + #, fuzzy, c-format + msgid "You are now connected to “%s”." + msgstr "'%s'에 연결되었습니다." + +-#: ../src/applet.c:2231 ++#: ../src/applet.c:2247 + msgid "Disconnected" + msgstr "연결 끊김" + +-#: ../src/applet.c:2232 ++#: ../src/applet.c:2248 + msgid "The network connection has been disconnected." + msgstr "네트워크 연결이 끊겼습니다." + +-#: ../src/applet.c:2534 ++#: ../src/applet.c:2550 + #, fuzzy, c-format + msgid "Preparing network connection “%s”…" + msgstr "네트워크 연결 '%s' 준비 중..." + +-#: ../src/applet.c:2537 ++#: ../src/applet.c:2553 + #, fuzzy, c-format + msgid "User authentication required for network connection “%s”…" + msgstr "네트워크 연결 '%s'에는 사용자 인증이 필요합니다..." + +-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125 +-#: ../src/mobile-helpers.c:608 ++#: ../src/applet.c:2556 ../src/applet-device-bt.c:125 ++#: ../src/mobile-helpers.c:607 + #, fuzzy, c-format + msgid "Requesting a network address for “%s”…" + msgstr "'%s'에 네트워크 주소 요청중..." + +-#: ../src/applet.c:2543 ++#: ../src/applet.c:2559 + #, fuzzy, c-format + msgid "Network connection “%s” active" + msgstr "'%s' 네트워크 연결 사용 중" + +-#: ../src/applet.c:2616 ++#: ../src/applet.c:2632 + #, fuzzy, c-format + msgid "Starting VPN connection “%s”…" + msgstr "가상 사설망 연결 '%s' 시작 중..." + +-#: ../src/applet.c:2619 ++#: ../src/applet.c:2635 + #, fuzzy, c-format + msgid "User authentication required for VPN connection “%s”…" + msgstr "가상 사설망 연결 '%s'에는 사용자 인증이 필요합니다..." + +-#: ../src/applet.c:2622 ++#: ../src/applet.c:2638 + #, fuzzy, c-format + msgid "Requesting a VPN address for “%s”…" + msgstr "'%s'에 가상 사설망 주소 요청 중..." + +-#: ../src/applet.c:2625 ++#: ../src/applet.c:2641 + #, fuzzy, c-format + msgid "VPN connection active" + msgstr "가상 사설망 연결 '%s' 사용 중" + +-#: ../src/applet.c:2675 ++#: ../src/applet.c:2691 + msgid "No network connection" + msgstr "네트워크 연결 없음" + +-#: ../src/applet.c:3276 ++#: ../src/applet.c:3292 + msgid "NetworkManager Applet" + msgstr "네트워크 관리 애플릿" + +@@ -555,47 +569,47 @@ msgstr "잘못된 PIN 코드. 서비스 업체에 문의하십시오." + msgid "Sending unlock code…" + msgstr "언락 코드를 보내는 중..." + +-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506 ++#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507 + #, c-format + msgid "Mobile Broadband (%s)" + msgstr "모바일 광대역(%s)" + +-#: ../src/applet-device-broadband.c:738 +-#: ../src/connection-editor/connection-helpers.c:107 ++#: ../src/applet-device-broadband.c:739 ++#: ../src/connection-editor/connection-helpers.c:108 + #: ../src/connection-editor/page-mobile.c:308 + #: ../src/libnm-gtk/nm-ui-utils.c:329 + msgid "Mobile Broadband" + msgstr "모바일 광대역" + +-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75 +-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906 ++#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75 ++#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907 + msgid "Available" + msgstr "사용 가능" + + #. Default connection item +-#: ../src/applet-device-broadband.c:803 ++#: ../src/applet-device-broadband.c:805 + #, fuzzy + msgid "New Mobile Broadband connection…" + msgstr "새 모바일 광대역 연결" + +-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87 +-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308 ++#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87 ++#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309 + msgid "Connection Established" + msgstr "연결됨" + +-#: ../src/applet-device-broadband.c:818 ++#: ../src/applet-device-broadband.c:820 + msgid "You are now connected to the Mobile Broadband network." + msgstr "모바일 광대역 네트워크에 연결되었습니다." + +-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964 ++#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966 + msgid "Mobile Broadband network." + msgstr "모바일 광대역 네트워크." + +-#: ../src/applet-device-broadband.c:959 ++#: ../src/applet-device-broadband.c:961 + msgid "You are now registered on the home network." + msgstr "홈 네트워크에 등록되었습니다." + +-#: ../src/applet-device-broadband.c:965 ++#: ../src/applet-device-broadband.c:967 + msgid "You are now registered on a roaming network." + msgstr "로밍 네트워크에 등록되었습니다." + +@@ -603,22 +617,22 @@ msgstr "로밍 네트워크에 등록되었습니다." + msgid "You are now connected to the mobile broadband network." + msgstr "모바일 광대역 네트워크에 연결되었습니다." + +-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599 ++#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598 + #, fuzzy, c-format + msgid "Preparing mobile broadband connection “%s”…" + msgstr "모바일 광대역 연결 '%s' 준비 중..." + +-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602 ++#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601 + #, fuzzy, c-format + msgid "Configuring mobile broadband connection “%s”…" + msgstr "모바일 광대역 연결 '%s' 설정 중..." + +-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605 ++#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604 + #, fuzzy, c-format + msgid "User authentication required for mobile broadband connection “%s”…" + msgstr "모바일 광대역 연결 '%s'에는 사용자 인증이 필요합니다..." + +-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627 ++#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626 + #, fuzzy, c-format + msgid "Mobile broadband connection “%s” active" + msgstr "모바일 광대역 연결 '%s' 사용 중" +@@ -678,6 +692,18 @@ msgstr "이더넷 네트워크 연결 '%s' 사용 중" + msgid "DSL authentication" + msgstr "DSL 인증" + ++#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060 ++#: ../src/connection-editor/ce-ip4-routes.ui.h:2 ++#: ../src/connection-editor/ce-ip6-routes.ui.h:2 ++#: ../src/connection-editor/ce-page-dcb.ui.h:18 ++#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2 ++#: ../src/connection-editor/page-bluetooth.c:313 ++#: ../src/connection-editor/page-mobile.c:545 ++#: ../src/libnma/nma-vpn-password-dialog.c:210 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466 ++msgid "_OK" ++msgstr "" ++ + #: ../src/applet-device-wifi.c:225 + #, fuzzy + msgid "_Connect to Hidden Wi-Fi Network…" +@@ -692,7 +718,7 @@ msgstr "새 와이파이 네트워크 만들기" + msgid "(none)" + msgstr "(없음)" + +-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408 ++#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409 + msgid "Failed to add new connection" + msgstr "새로운 연결을 추가하는데 실패" + +@@ -700,77 +726,77 @@ msgstr "새로운 연결을 추가하는데 실패" + msgid "Insufficient privileges." + msgstr "" + +-#: ../src/applet-device-wifi.c:838 ++#: ../src/applet-device-wifi.c:839 + #, c-format + msgid "Wi-Fi Networks (%s)" + msgstr "와이파이 네트워크(%s)" + +-#: ../src/applet-device-wifi.c:840 ++#: ../src/applet-device-wifi.c:841 + #, c-format + msgid "Wi-Fi Network (%s)" + msgstr "와이파이 네트워크(%s)" + +-#: ../src/applet-device-wifi.c:842 ++#: ../src/applet-device-wifi.c:843 + msgid "Wi-Fi Network" + msgid_plural "Wi-Fi Networks" + msgstr[0] "와이파이 네트워크" + +-#: ../src/applet-device-wifi.c:871 ++#: ../src/applet-device-wifi.c:872 + msgid "Wi-Fi is disabled" + msgstr "와이파이를 사용하지 않습니다" + +-#: ../src/applet-device-wifi.c:872 ++#: ../src/applet-device-wifi.c:873 + msgid "Wi-Fi is disabled by hardware switch" + msgstr "와이파이가 하드웨어 스위치를 통해 사용하지 않습니다" + +-#: ../src/applet-device-wifi.c:933 ++#: ../src/applet-device-wifi.c:934 + msgid "More networks" + msgstr "다른 네트워크" + +-#: ../src/applet-device-wifi.c:1122 ++#: ../src/applet-device-wifi.c:1123 + msgid "Wi-Fi Networks Available" + msgstr "와이파이 네트워크가 사용 가능합니다" + +-#: ../src/applet-device-wifi.c:1123 ++#: ../src/applet-device-wifi.c:1124 + msgid "Use the network menu to connect to a Wi-Fi network" + msgstr "네트워크 메뉴에서 와이파이 네트워크에 연결할 수 있습니다" + +-#: ../src/applet-device-wifi.c:1307 ++#: ../src/applet-device-wifi.c:1308 + #, fuzzy, c-format + msgid "You are now connected to the Wi-Fi network “%s”." + msgstr "와이파이 네트워크 '%s'에 연결되었습니다." + +-#: ../src/applet-device-wifi.c:1342 ++#: ../src/applet-device-wifi.c:1343 + #, fuzzy, c-format + msgid "Preparing Wi-Fi network connection “%s”…" + msgstr "와이파이 네트워크 '%s' 연결 준비 중..." + +-#: ../src/applet-device-wifi.c:1345 ++#: ../src/applet-device-wifi.c:1346 + #, fuzzy, c-format + msgid "Configuring Wi-Fi network connection “%s”…" + msgstr "와이파이 네트워크 '%s' 연결 설정 중..." + +-#: ../src/applet-device-wifi.c:1348 ++#: ../src/applet-device-wifi.c:1349 + #, fuzzy, c-format + msgid "User authentication required for Wi-Fi network “%s”…" + msgstr "와이파이 네트워크 연결 '%s'에 사용자 인증이 필요합니다..." + +-#: ../src/applet-device-wifi.c:1351 ++#: ../src/applet-device-wifi.c:1352 + #, fuzzy, c-format + msgid "Requesting a Wi-Fi network address for “%s”…" + msgstr "'%s'에 대한 와이파이 네트워크 주소 요청 중..." + +-#: ../src/applet-device-wifi.c:1362 ++#: ../src/applet-device-wifi.c:1363 + #, fuzzy, c-format + msgid "Wi-Fi network connection “%s” active: %s (%d%%)" + msgstr "와이파이 네트워크 연결 '%s' 사용 중: %s (%d%%)" + +-#: ../src/applet-device-wifi.c:1366 ++#: ../src/applet-device-wifi.c:1367 + #, fuzzy, c-format + msgid "Wi-Fi network connection “%s” active" + msgstr "와이파이 네트워크 연결 '%s' 사용 중" + +-#: ../src/applet-device-wifi.c:1385 ++#: ../src/applet-device-wifi.c:1386 + msgid "Failed to activate connection" + msgstr "연결 활성화하는 데 실패" + +@@ -778,195 +804,195 @@ msgstr "연결 활성화하는 데 실패" + msgid "Error displaying connection information:" + msgstr "연결 정보 보이기 오류:" + +-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379 ++#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381 + #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948 + #: ../src/wireless-security/wireless-security.c:448 + msgid "LEAP" + msgstr "LEAP" + +-#: ../src/applet-dialogs.c:74 ++#: ../src/applet-dialogs.c:75 + msgid "Dynamic WEP" + msgstr "동적 WEP" + +-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228 +-#: ../src/applet-dialogs.c:230 ++#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229 ++#: ../src/applet-dialogs.c:231 + msgid "WPA/WPA2" + msgstr "WPA/WPA2" + + #. Create the expander +-#: ../src/applet-dialogs.c:151 ++#: ../src/applet-dialogs.c:152 + #, fuzzy + msgid "More addresses" + msgstr "주소" + +-#: ../src/applet-dialogs.c:226 ++#: ../src/applet-dialogs.c:227 + msgid "WEP" + msgstr "WEP" + +-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243 +-#: ../src/connection-editor/page-wifi-security.c:330 ++#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244 ++#: ../src/connection-editor/page-wifi-security.c:332 + msgctxt "Wi-Fi/Ethernet security" + msgid "None" + msgstr "없음" + +-#: ../src/applet-dialogs.c:260 ++#: ../src/applet-dialogs.c:261 + #, c-format + msgid "%s (default)" + msgstr "%s (기본값)" + +-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580 ++#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581 + #, c-format + msgid "%u Mb/s" + msgstr "%u Mb/s" + +-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582 ++#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583 + msgctxt "Speed" + msgid "Unknown" + msgstr "알 수 없음" + + #. Address +-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368 ++#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369 + msgctxt "Address" + msgid "Unknown" + msgstr "알 수 없음" + +-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420 ++#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421 + msgid "IP Address:" + msgstr "IP 주소:" + +-#: ../src/applet-dialogs.c:369 ++#: ../src/applet-dialogs.c:370 + msgid "Broadcast Address:" + msgstr "브로드캐스트 주소:" + + #. Prefix +-#: ../src/applet-dialogs.c:381 ++#: ../src/applet-dialogs.c:382 + msgctxt "Subnet Mask" + msgid "Unknown" + msgstr "알 수 없음" + +-#: ../src/applet-dialogs.c:382 ++#: ../src/applet-dialogs.c:383 + msgid "Subnet Mask:" + msgstr "서브넷 마스크:" + +-#: ../src/applet-dialogs.c:492 ++#: ../src/applet-dialogs.c:493 + #, c-format + msgid "Ethernet (%s)" + msgstr "이더넷(%s)" + +-#: ../src/applet-dialogs.c:495 ++#: ../src/applet-dialogs.c:496 + #, c-format + msgid "802.11 WiFi (%s)" + msgstr "802.11 와이파이(%s)" + +-#: ../src/applet-dialogs.c:502 ++#: ../src/applet-dialogs.c:503 + #, c-format + msgid "GSM (%s)" + msgstr "GSM (%s)" + +-#: ../src/applet-dialogs.c:504 ++#: ../src/applet-dialogs.c:505 + #, c-format + msgid "CDMA (%s)" + msgstr "CDMA (%s)" + + #. --- General --- +-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810 ++#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811 + #: ../src/connection-editor/ce-page-team-port.ui.h:23 + #: ../src/connection-editor/ce-page-team.ui.h:48 + #: ../src/connection-editor/page-general.c:367 + msgid "General" + msgstr "일반" + +-#: ../src/applet-dialogs.c:516 ++#: ../src/applet-dialogs.c:517 + msgid "Interface:" + msgstr "인터페이스:" + +-#: ../src/applet-dialogs.c:536 ++#: ../src/applet-dialogs.c:537 + msgid "Hardware Address:" + msgstr "하드웨어 주소:" + + #. Driver +-#: ../src/applet-dialogs.c:550 ++#: ../src/applet-dialogs.c:551 + msgid "Driver:" + msgstr "드라이버:" + +-#: ../src/applet-dialogs.c:585 ++#: ../src/applet-dialogs.c:586 + msgid "Speed:" + msgstr "속도:" + +-#: ../src/applet-dialogs.c:600 ++#: ../src/applet-dialogs.c:601 + msgid "Security:" + msgstr "보안:" + + #. --- IPv4 --- +-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851 ++#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852 + #: ../src/connection-editor/ce-page-team.ui.h:29 + msgid "IPv4" + msgstr "IPv4" + +-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689 ++#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690 + msgid "Default Route:" + msgstr "기본 경로:" + + #. --- IPv6 --- +-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873 ++#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874 + #: ../src/connection-editor/ce-page-team.ui.h:30 + msgid "IPv6" + msgstr "IPv6" + +-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882 ++#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883 + msgid "Ignored" + msgstr "무시함" + +-#: ../src/applet-dialogs.c:815 ++#: ../src/applet-dialogs.c:816 + msgid "VPN Type:" + msgstr "가상 사설망 형식:" + +-#: ../src/applet-dialogs.c:822 ++#: ../src/applet-dialogs.c:823 + msgid "VPN Gateway:" + msgstr "가상 사설망 게이트웨이:" + +-#: ../src/applet-dialogs.c:828 ++#: ../src/applet-dialogs.c:829 + msgid "VPN Username:" + msgstr "가상 사설망 사용자 이름:" + +-#: ../src/applet-dialogs.c:834 ++#: ../src/applet-dialogs.c:835 + msgid "VPN Banner:" + msgstr "가상 사설망 추방자:" + +-#: ../src/applet-dialogs.c:840 ++#: ../src/applet-dialogs.c:841 + msgid "Base Connection:" + msgstr "기반 연결:" + +-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343 ++#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343 + msgid "Unknown" + msgstr "알 수 없음" + + #. Shouldn't really happen but ... +-#: ../src/applet-dialogs.c:957 ++#: ../src/applet-dialogs.c:958 + msgid "No valid active connections found!" + msgstr "활성된 연결을 찾을 수 없습니다!" + +-#: ../src/applet-dialogs.c:985 +-#, fuzzy ++#: ../src/applet-dialogs.c:1007 + msgid "" +-"Copyright © 2004-2014 Red Hat, Inc.\n" ++"Copyright © 2004-2017 Red Hat, Inc.\n" + "Copyright © 2005-2008 Novell, Inc.\n" + "and many other community contributors and translators" + msgstr "" +-"Copyright © 2004-2011 Red Hat, Inc.\n" +-"Copyright © 2005-2008 Novell, Inc.\n" +-"and many other community contributors and translators" + +-#: ../src/applet-dialogs.c:988 ++#: ../src/applet-dialogs.c:1010 + msgid "" + "Notification area applet for managing your network devices and connections." + msgstr "네트워크 장치와 연결을 관리하는 알림 영역 애플릿." + +-#: ../src/applet-dialogs.c:990 ++#: ../src/applet-dialogs.c:1012 + msgid "NetworkManager Website" + msgstr "네트워크 관리 웹사이트" + +-#: ../src/applet-dialogs.c:1001 ++#: ../src/applet-dialogs.c:1016 ++msgid "translator-credits" ++msgstr "" ++ ++#: ../src/applet-dialogs.c:1026 + msgid "" + "The NetworkManager Applet could not find some required resources (the .ui " + "file was not found)." +@@ -974,33 +1000,33 @@ msgstr "" + "네트워크 관리 애플릿이 필요한 리소스를 찾을 수 없습니다. (.ui 파일이 없습니" + "다.)" + +-#: ../src/applet-dialogs.c:1006 ++#: ../src/applet-dialogs.c:1031 + msgid "Missing resources" + msgstr "빠진 자료" + +-#: ../src/applet-dialogs.c:1031 ++#: ../src/applet-dialogs.c:1057 + msgid "Mobile broadband network password" + msgstr "모바일 광대역 네트워크 암호" + +-#: ../src/applet-dialogs.c:1040 ++#: ../src/applet-dialogs.c:1066 + #, fuzzy, c-format + msgid "A password is required to connect to “%s”." + msgstr "'%s'에 연결하려면 암호가 필요합니다." + +-#: ../src/applet-dialogs.c:1055 ++#: ../src/applet-dialogs.c:1081 + msgid "Password:" + msgstr "암호:" + +-#: ../src/applet-dialogs.c:1337 ++#: ../src/applet-dialogs.c:1363 + msgid "SIM PIN unlock required" + msgstr "SIM PIN 잠금해제가 필요합니다" + +-#: ../src/applet-dialogs.c:1338 ++#: ../src/applet-dialogs.c:1364 + msgid "SIM PIN Unlock Required" + msgstr "SIM PIN 잠금해제가 필요합니다" + + #. FIXME: some warning about # of times you can enter incorrect PIN +-#: ../src/applet-dialogs.c:1340 ++#: ../src/applet-dialogs.c:1366 + #, fuzzy, c-format + msgid "" + "The mobile broadband device “%s” requires a SIM PIN code before it can be " +@@ -1008,25 +1034,25 @@ msgid "" + msgstr "'%s' 모바일 광대역 장치를 사용하려면 SIM PIN 코드가 필요합니다." + + #. Translators: PIN code entry label +-#: ../src/applet-dialogs.c:1342 ++#: ../src/applet-dialogs.c:1368 + msgid "PIN code:" + msgstr "PIN 코드:" + + #. Translators: Show/obscure PIN checkbox label +-#: ../src/applet-dialogs.c:1346 ++#: ../src/applet-dialogs.c:1372 + msgid "Show PIN code" + msgstr "PIN 코드 표시" + +-#: ../src/applet-dialogs.c:1348 ++#: ../src/applet-dialogs.c:1374 + msgid "SIM PUK unlock required" + msgstr "SIM PUK 잠금 해제가 필요합니다" + +-#: ../src/applet-dialogs.c:1349 ++#: ../src/applet-dialogs.c:1375 + msgid "SIM PUK Unlock Required" + msgstr "SIM PUK 잠금 해제가 필요합니다" + + #. FIXME: some warning about # of times you can enter incorrect PUK +-#: ../src/applet-dialogs.c:1351 ++#: ../src/applet-dialogs.c:1377 + #, fuzzy, c-format + msgid "" + "The mobile broadband device “%s” requires a SIM PUK code before it can be " +@@ -1034,32 +1060,25 @@ msgid "" + msgstr "'%s' 모바일 광대역 장치를 사용하려면 SIM PUK 코드가 필요합니다." + + #. Translators: PUK code entry label +-#: ../src/applet-dialogs.c:1353 ++#: ../src/applet-dialogs.c:1379 + msgid "PUK code:" + msgstr "PUK 코드:" + + #. Translators: New PIN entry label +-#: ../src/applet-dialogs.c:1356 ++#: ../src/applet-dialogs.c:1382 + msgid "New PIN code:" + msgstr "새 PIN 코드:" + + #. Translators: New PIN verification entry label +-#: ../src/applet-dialogs.c:1358 ++#: ../src/applet-dialogs.c:1384 + msgid "Re-enter new PIN code:" + msgstr "새 PIN 코드 다시 입력:" + + #. Translators: Show/obscure PIN/PUK checkbox label +-#: ../src/applet-dialogs.c:1363 ++#: ../src/applet-dialogs.c:1389 + msgid "Show PIN/PUK codes" + msgstr "PIN/PUK 코드 표시" + +-#: ../src/connection-editor/ce-ip4-routes.ui.h:2 +-#: ../src/connection-editor/ce-ip6-routes.ui.h:2 +-#: ../src/connection-editor/ce-page-dcb.ui.h:18 +-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2 +-msgid "_OK" +-msgstr "" +- + #: ../src/connection-editor/ce-ip4-routes.ui.h:3 + #: ../src/connection-editor/ce-ip6-routes.ui.h:3 + #: ../src/connection-editor/ce-page.h:114 +@@ -1076,21 +1095,21 @@ msgstr "" + #: ../src/connection-editor/ce-page-bond.ui.h:12 + #: ../src/connection-editor/ce-page-bridge.ui.h:2 + #: ../src/connection-editor/ce-page-ip4.ui.h:7 +-#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++#: ../src/connection-editor/ce-page-ip6.ui.h:12 + #: ../src/connection-editor/ce-page-team.ui.h:13 +-#: ../src/connection-editor/nm-connection-editor.ui.h:3 ++#: ../src/connection-editor/nm-connection-list.ui.h:3 + msgid "_Add" + msgstr "" + +-#. Delete + #: ../src/connection-editor/ce-ip4-routes.ui.h:5 + #: ../src/connection-editor/ce-ip6-routes.ui.h:5 + #: ../src/connection-editor/ce-page-bond.ui.h:14 + #: ../src/connection-editor/ce-page-bridge.ui.h:4 + #: ../src/connection-editor/ce-page-ip4.ui.h:8 +-#: ../src/connection-editor/ce-page-ip6.ui.h:11 ++#: ../src/connection-editor/ce-page-ip6.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:15 +-#: ../src/connection-editor/nm-connection-list.c:711 ++#: ../src/connection-editor/connection-helpers.c:772 ++#: ../src/connection-editor/nm-connection-list.ui.h:4 + msgid "_Delete" + msgstr "삭제(_D)" + +@@ -1179,11 +1198,10 @@ msgstr "본딩 연결(_C):" + msgid "M_ode:" + msgstr "모드(_O):" + +-#. Edit + #: ../src/connection-editor/ce-page-bond.ui.h:13 + #: ../src/connection-editor/ce-page-bridge.ui.h:3 + #: ../src/connection-editor/ce-page-team.ui.h:14 +-#: ../src/connection-editor/nm-connection-list.c:695 ++#: ../src/connection-editor/nm-connection-list.ui.h:5 + msgid "_Edit" + msgstr "편집(_E)" + +@@ -1238,7 +1256,7 @@ msgstr "" + + #: ../src/connection-editor/ce-page-bond.ui.h:25 + #: ../src/connection-editor/ce-page-ethernet.ui.h:17 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:4 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:8 + #: ../src/connection-editor/ce-page-team.ui.h:17 + #: ../src/connection-editor/ce-page-vlan.ui.h:4 + #: ../src/connection-editor/ce-page-wifi.ui.h:8 +@@ -1247,7 +1265,7 @@ msgstr "MTU(_M):" + + #: ../src/connection-editor/ce-page-bond.ui.h:26 + #: ../src/connection-editor/ce-page-ethernet.ui.h:18 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:3 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:7 + #: ../src/connection-editor/ce-page-team.ui.h:18 + #: ../src/connection-editor/ce-page-vlan.ui.h:5 + #: ../src/connection-editor/ce-page-wifi.ui.h:7 +@@ -1280,26 +1298,72 @@ msgid "_Hello time:" + msgstr "최초 통신 시간(_H):" + + #: ../src/connection-editor/ce-page-bridge.ui.h:9 ++msgid "STP forwarding delay, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:10 + msgid "s" + msgstr "초" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:10 ++#: ../src/connection-editor/ce-page-bridge.ui.h:11 ++msgid "STP hello time, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:12 + #, fuzzy + msgid "Enable I_GMP snooping" + msgstr "네트워크 사용(_N)" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:11 ++#: ../src/connection-editor/ce-page-bridge.ui.h:13 ++msgid "" ++"Controls whether IGMP snooping is enabled for this bridge. Note that if " ++"snooping was automatically disabled due to hash collisions, the system may " ++"refuse to enable the feature until the collisions are resolved." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:14 + msgid "Enable _STP (Spanning Tree Protocol)" + msgstr "STP(Spanning Tree Protocol) 사용(_S)" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:12 ++#: ../src/connection-editor/ce-page-bridge.ui.h:15 ++msgid "" ++"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:16 ++msgid "" ++"STP priority for this bridge. Lower values are “better”; the lowest priority " ++"bridge will be elected the root bridge." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:17 + msgid "_Max age:" + msgstr "최대 기간(_M):" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:13 ++#: ../src/connection-editor/ce-page-bridge.ui.h:18 ++msgid "STP maximum message age, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:19 + msgid "_Aging time:" + msgstr "유지 시간(_A):" + ++#: ../src/connection-editor/ce-page-bridge.ui.h:20 ++msgid "The Ethernet MAC address aging time, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:21 ++msgid "Group _forward mask:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:22 ++msgid "" ++"A mask of 16 bits, each corresponding to a group address in the range from " ++"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask " ++"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause " ++"frames and LACP." ++msgstr "" ++ + #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112 + msgid "automatic" + msgstr "자동" +@@ -1561,10 +1625,20 @@ msgid "_Username:" + msgstr "사용자 이름(_U):" + + #: ../src/connection-editor/ce-page-dsl.ui.h:2 ++msgid "Username used to authenticate with the PPPoE service." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:3 ++msgid "" ++"Only initiate sessions with access concentrators that provide the specified " ++"service. For most providers this should be left blank." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:4 + msgid "_Service:" + msgstr "서비스(_S):" + +-#: ../src/connection-editor/ce-page-dsl.ui.h:3 ++#: ../src/connection-editor/ce-page-dsl.ui.h:5 + #: ../src/wireless-security/eap-method-leap.ui.h:3 + #: ../src/wireless-security/eap-method-simple.ui.h:3 + #: ../src/wireless-security/ws-leap.ui.h:3 +@@ -1572,7 +1646,11 @@ msgstr "서비스(_S):" + msgid "Sho_w password" + msgstr "암호 표시(_W)" + +-#: ../src/connection-editor/ce-page-dsl.ui.h:4 ++#: ../src/connection-editor/ce-page-dsl.ui.h:6 ++msgid "Password used to authenticate with the PPPoE service." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:7 + #: ../src/connection-editor/ce-page-mobile.ui.h:4 + #: ../src/libnma/nma-vpn-password-dialog.c:97 + #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97 +@@ -1583,13 +1661,29 @@ msgstr "암호 표시(_W)" + msgid "_Password:" + msgstr "암호(_P):" + ++#: ../src/connection-editor/ce-page-dsl.ui.h:8 ++msgid "PPP _interface:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:9 ++msgid "P_arent interface:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:10 ++msgid "An arbitrary name to assign to the newly created PPP interface." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:11 ++msgid "The interface on which the PPP connection will be established." ++msgstr "" ++ + #: ../src/connection-editor/ce-page-ethernet.ui.h:1 + #: ../src/connection-editor/ce-page-ip4.ui.h:1 + #: ../src/connection-editor/ce-page-ip6.ui.h:1 +-#: ../src/connection-editor/ce-page-proxy.ui.h:3 ++#: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-wifi.ui.h:1 + #: ../src/connection-editor/page-ip4.c:131 +-#: ../src/connection-editor/page-ip6.c:136 ++#: ../src/connection-editor/page-ip6.c:142 + #: ../src/wireless-security/eap-method-peap.ui.h:1 + msgid "Automatic" + msgstr "자동" +@@ -1635,7 +1729,7 @@ msgid "Full" + msgstr "" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:12 +-#: ../src/connection-editor/page-ip6.c:149 ++#: ../src/connection-editor/page-ip6.c:155 + msgid "Ignore" + msgstr "무시" + +@@ -1643,7 +1737,7 @@ msgstr "무시" + #: ../src/connection-editor/ce-page-ip4.ui.h:3 + #: ../src/connection-editor/ce-page-ip6.ui.h:3 + #: ../src/connection-editor/page-ip4.c:168 +-#: ../src/connection-editor/page-ip6.c:185 ++#: ../src/connection-editor/page-ip6.c:191 + msgid "Manual" + msgstr "수동" + +@@ -1652,7 +1746,7 @@ msgid "_Port:" + msgstr "포트(_P):" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:15 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:2 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:6 + #: ../src/connection-editor/ce-page-wifi.ui.h:9 + #, fuzzy + msgid "_Device:" +@@ -1804,20 +1898,20 @@ msgstr "주소" + msgid "Address (optional)" + msgstr "" + +-#: ../src/connection-editor/ce-page-infiniband.ui.h:1 +-msgid "_Transport mode:" +-msgstr "전송 모드(_T):" +- + #. IP-over-InfiniBand "datagram mode" +-#: ../src/connection-editor/ce-page-infiniband.ui.h:6 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:2 + msgid "Datagram" + msgstr "데이터그램" + + #. IP-over-InfiniBand "connected mode" +-#: ../src/connection-editor/ce-page-infiniband.ui.h:8 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:4 + msgid "Connected" + msgstr "연결" + ++#: ../src/connection-editor/ce-page-infiniband.ui.h:5 ++msgid "_Transport mode:" ++msgstr "전송 모드(_T):" ++ + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1 + msgid "IPIP" + msgstr "" +@@ -1855,40 +1949,39 @@ msgid "VTI6" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10 +-#, fuzzy +-msgid "Device name" +-msgstr "장치 이름 + 번호" ++#: ../src/connection-editor/ce-page-macsec.ui.h:6 ++msgid "Device name:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11 +-#, fuzzy +-msgid "Parent device" +-msgstr "이더넷" ++#: ../src/connection-editor/ce-page-macsec.ui.h:8 ++msgid "Parent device:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12 +-#, fuzzy +-msgid "Mode" +-msgstr "모드(_M):" ++#: ../src/connection-editor/ce-page-macsec.ui.h:16 ++msgid "Mode:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13 +-msgid "Local IP" ++msgid "Local IP:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14 +-msgid "Remote IP" ++msgid "Remote IP:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15 +-msgid "Input key" ++msgid "Input key:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16 +-msgid "Output key" ++msgid "Output key:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17 +-#, fuzzy +-msgid "MTU" +-msgstr "MTU(_M):" ++msgid "MTU:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip4.ui.h:2 + #: ../src/connection-editor/ce-page-ip6.ui.h:2 +@@ -1903,12 +1996,12 @@ msgstr "로컬 연결" + #: ../src/connection-editor/ce-page-ip4.ui.h:5 + #: ../src/connection-editor/ce-page-ip6.ui.h:5 + #: ../src/connection-editor/page-ip4.c:188 +-#: ../src/connection-editor/page-ip6.c:205 ++#: ../src/connection-editor/page-ip6.c:211 + msgid "Shared to other computers" + msgstr "다른 컴퓨터와 공유" + + #: ../src/connection-editor/ce-page-ip4.ui.h:6 +-#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++#: ../src/connection-editor/ce-page-ip6.ui.h:11 + msgid "_Method:" + msgstr "방식(_M):" + +@@ -1923,7 +2016,7 @@ msgstr "" + "할 수 있습니다. DHCP 클라이언트 ID를 사용하고 싶다면, 여기 입력하십시오." + + #: ../src/connection-editor/ce-page-ip4.ui.h:10 +-#: ../src/connection-editor/ce-page-ip6.ui.h:12 ++#: ../src/connection-editor/ce-page-ip6.ui.h:14 + msgid "" + "Domains used when resolving host names. Use commas to separate multiple " + "domains." +@@ -1936,16 +2029,16 @@ msgid "D_HCP client ID:" + msgstr "D_HCP 클라이언트 ID:" + + #: ../src/connection-editor/ce-page-ip4.ui.h:12 +-#: ../src/connection-editor/ce-page-ip6.ui.h:13 ++#: ../src/connection-editor/ce-page-ip6.ui.h:15 + #: ../src/connection-editor/page-ip4.c:372 +-#: ../src/connection-editor/page-ip6.c:335 ++#: ../src/connection-editor/page-ip6.c:346 + msgid "S_earch domains:" + msgstr "검색 도메인(_E):" + + #: ../src/connection-editor/ce-page-ip4.ui.h:13 +-#: ../src/connection-editor/ce-page-ip6.ui.h:14 ++#: ../src/connection-editor/ce-page-ip6.ui.h:16 + #: ../src/connection-editor/page-ip4.c:363 +-#: ../src/connection-editor/page-ip6.c:326 ++#: ../src/connection-editor/page-ip6.c:337 + msgid "DNS ser_vers:" + msgstr "DNS 서버(_V):" + +@@ -1970,11 +2063,12 @@ msgstr "" + "설정에 성공시 연결을 마무리합니다." + + #: ../src/connection-editor/ce-page-ip4.ui.h:17 +-#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++#: ../src/connection-editor/ce-page-ip6.ui.h:22 + msgid "_Routes…" + msgstr "라우팅(_R)…" + + #: ../src/connection-editor/ce-page-ip6.ui.h:6 ++#: ../src/connection-editor/ce-page-macsec.ui.h:3 + #: ../src/connection-editor/page-ip4.c:198 + msgid "Disabled" + msgstr "사용안함" +@@ -1987,7 +2081,15 @@ msgstr "사용(공용 주소 선호)" + msgid "Enabled (prefer temporary address)" + msgstr "사용(임시 주소 선호)" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:15 ++#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++msgid "EUI64" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++msgid "Stable privacy" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:17 + msgid "" + "IP addresses of domain name servers used to resolve host names. Use commas " + "to separate multiple domain name server addresses. Link-local addresses will " +@@ -1997,15 +2099,19 @@ msgstr "" + "메인 서버를 사용하려면 쉼표로 구분하십시오. 링크 로컬 주소는 자동으로 연결된 " + "인터페이스로 취급합니다." + +-#: ../src/connection-editor/ce-page-ip6.ui.h:16 ++#: ../src/connection-editor/ce-page-ip6.ui.h:18 + msgid "IPv6 _privacy extensions:" + msgstr "IPv6 개인 보안 확장(_P):" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:17 ++#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++msgid "IPv6 address _generation mode:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:20 + msgid "Require IPv_6 addressing for this connection to complete" + msgstr "이 연결이 되려면 IPv6 주소 부여 필요(_6)" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:18 ++#: ../src/connection-editor/ce-page-ip6.ui.h:21 + msgid "" + "When connecting to IPv4-capable networks, allows the connection to complete " + "if IPv6 configuration fails but IPv4 configuration succeeds." +@@ -2013,6 +2119,94 @@ msgstr "" + "IPv4 가능한 네트워크에 연결할 때, 이 연결이 IPv6 설정은 실패하고, IPv4 설정" + "은 성공한 경우라도 연결을 마무리합니다." + ++#: ../src/connection-editor/ce-page-macsec.ui.h:1 ++msgid "PSK" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:2 ++#: ../src/connection-editor/page-ppp.c:129 ++msgid "EAP" ++msgstr "EAP" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:4 ++msgid "Check" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:5 ++msgid "Strict" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:7 ++msgid "The name of the MACsec device." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:9 ++msgid "" ++"The parent interface name or parent connection UUID from which this MACSEC " ++"interface should be created." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:10 ++msgid "" ++"The parent interface name or parent connection UUID from which this MACsec " ++"interface should be created" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:11 ++msgid " The pre-shared Connectivity-association Key Name" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:12 ++msgid "The pre-shared Connectivity Association Key" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:13 ++msgid "" ++"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key " ++"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X " ++"security page" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:14 ++msgid "CKN:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:15 ++msgid "CAK:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:17 ++msgid "Keys:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:18 ++msgid "Parameters:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:19 ++msgid "Validation:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:20 ++msgid "SCI port:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:21 ++msgid "Specifies the validation mode for incoming frames" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:22 ++msgid "Encrypt" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:23 ++msgid "Whether the transmitted traffic must be encrypted" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:24 ++msgid "The port component of the SCI (Secure Channel Identifier)" ++msgstr "" ++ + #: ../src/connection-editor/ce-page-mobile.ui.h:1 + #: ../src/connection-editor/ce-page-team.ui.h:26 + msgid "Basic" +@@ -2100,41 +2294,41 @@ msgid "Send PPP _echo packets" + msgstr "PPP 에코 패킷 보내기(_E)" + + #: ../src/connection-editor/ce-page-proxy.ui.h:1 +-#, fuzzy +-msgid "Method:" +-msgstr "방식(_M):" +- +-#: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-team.ui.h:25 + #, fuzzy + msgid "None" + msgstr "없음" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:4 ++#: ../src/connection-editor/ce-page-proxy.ui.h:3 + msgid "For browser only" + msgstr "" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:5 ++#: ../src/connection-editor/ce-page-proxy.ui.h:4 + msgid "Use this proxy configuration for only browser clients/schemes." + msgstr "" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:6 ++#: ../src/connection-editor/ce-page-proxy.ui.h:5 + msgid "PAC URL:" + msgstr "" + ++#: ../src/connection-editor/ce-page-proxy.ui.h:6 ++msgid "PAC script:" ++msgstr "" ++ + #: ../src/connection-editor/ce-page-proxy.ui.h:7 + msgid "URL from where the PAC script is to be obtained." + msgstr "" + + #: ../src/connection-editor/ce-page-proxy.ui.h:8 +-msgid "PAC script:" +-msgstr "" +- +-#: ../src/connection-editor/ce-page-proxy.ui.h:9 + #, fuzzy + msgid "Import script from a file…" + msgstr "파일에서 팀 설정 가져오기(_I)..." + ++#: ../src/connection-editor/ce-page-proxy.ui.h:9 ++#, fuzzy ++msgid "Method:" ++msgstr "방식(_M):" ++ + #: ../src/connection-editor/ce-page-team-port.ui.h:1 + #: ../src/connection-editor/ce-page-team.ui.h:19 + #, fuzzy +@@ -2182,76 +2376,76 @@ msgid "ID of queue which this port should be mapped to." + msgstr "" + + #: ../src/connection-editor/ce-page-team-port.ui.h:10 ++msgid "Active-Backup runner options" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-team-port.ui.h:11 + #, fuzzy + msgid "_Port priority:" + msgstr "우선 순위(_P):" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:11 +-msgid "Port _sticky" +-msgstr "" +- + #: ../src/connection-editor/ce-page-team-port.ui.h:12 +-#: ../src/connection-editor/ce-page-team.ui.h:82 +-msgid "" +-"Validate received ARP packets on active ports. If this is not checked, all " +-"incoming ARP packets will be considered as a good reply." +-msgstr "" +- +-#: ../src/connection-editor/ce-page-team-port.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:44 + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " + "bursts of notify-peer packets." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:14 ++#: ../src/connection-editor/ce-page-team-port.ui.h:13 + msgid "Port priority. The higher number means higher priority." + msgstr "" + ++#: ../src/connection-editor/ce-page-team-port.ui.h:14 ++msgid "Port _sticky" ++msgstr "" ++ + #: ../src/connection-editor/ce-page-team-port.ui.h:15 +-msgid "Active-Backup runner options" ++#: ../src/connection-editor/ce-page-team.ui.h:82 ++msgid "" ++"Validate received ARP packets on active ports. If this is not checked, all " ++"incoming ARP packets will be considered as a good reply." + msgstr "" + + #: ../src/connection-editor/ce-page-team-port.ui.h:16 ++msgid "LACP runner options" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-team-port.ui.h:17 + #, fuzzy + msgid "_LACP port priority:" + msgstr "우선 순위(_P):" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:17 ++#: ../src/connection-editor/ce-page-team-port.ui.h:18 + #, fuzzy + msgid "LACP port _key:" + msgstr "비밀키(_K):" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:18 ++#: ../src/connection-editor/ce-page-team-port.ui.h:19 + #: ../src/connection-editor/ce-page-team.ui.h:43 + msgid "" + "Number of bursts of multicast group rejoin requests sent after port is " + "enabled or disabled." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:19 ++#: ../src/connection-editor/ce-page-team-port.ui.h:20 + msgid "" + "Port priority according to LACP standard. The lower number means higher " + "priority." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:20 ++#: ../src/connection-editor/ce-page-team-port.ui.h:21 + #: ../src/connection-editor/ce-page-team.ui.h:45 + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " + "bursts of multicast group rejoin requests." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:21 ++#: ../src/connection-editor/ce-page-team-port.ui.h:22 + msgid "" + "Port key according to LACP standard. It is only possible to aggregate ports " + "with the same key." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:22 +-msgid "LACP runner options" +-msgstr "" +- + #: ../src/connection-editor/ce-page-team-port.ui.h:24 + #: ../src/connection-editor/ce-page-team.ui.h:70 + msgid "_Link watcher:" +@@ -2444,14 +2638,14 @@ msgid "LACP" + msgstr "" + + #: ../src/connection-editor/ce-page-team.ui.h:27 +-#: ../src/connection-editor/connection-helpers.c:104 ++#: ../src/connection-editor/connection-helpers.c:105 + #: ../src/connection-editor/page-ethernet.c:351 + #: ../src/libnm-gtk/nm-ui-utils.c:321 + msgid "Ethernet" + msgstr "이더넷" + + #: ../src/connection-editor/ce-page-team.ui.h:28 +-#: ../src/connection-editor/connection-helpers.c:119 ++#: ../src/connection-editor/connection-helpers.c:120 + #: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339 + #: ../src/libnm-gtk/nm-ui-utils.c:583 + msgid "VLAN" +@@ -2713,6 +2907,7 @@ msgstr "밴드(_D):" + msgid "SS_ID:" + msgstr "SSID(_I):" + ++#: ../src/connection-editor/ce-polkit.c:63 + #: ../src/connection-editor/ce-polkit-button.c:74 + msgid "No polkit authorization to perform the action" + msgstr "" +@@ -2770,58 +2965,63 @@ msgstr "" + "대부분의 경우 서비스 업체의 PPP 서버는 모든 인증 방법을 지원합니다. 만약 연결" + "이 실패하면, 몇몇 방법을 사용하지 않아 보십시오." + +-#: ../src/connection-editor/connection-helpers.c:105 ++#: ../src/connection-editor/connection-helpers.c:106 + #: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323 + msgid "Wi-Fi" + msgstr "와이파이" + +-#: ../src/connection-editor/connection-helpers.c:113 ++#: ../src/connection-editor/connection-helpers.c:114 + #: ../src/connection-editor/page-bluetooth.c:123 + #: ../src/libnm-gtk/nm-ui-utils.c:325 + msgid "Bluetooth" + msgstr "블루투스" + +-#: ../src/connection-editor/connection-helpers.c:114 +-#: ../src/connection-editor/page-dsl.c:127 +-msgid "DSL" +-msgstr "DSL" +- + #: ../src/connection-editor/connection-helpers.c:115 ++#: ../src/connection-editor/page-dsl.c:201 ++msgid "DSL/PPPoE" ++msgstr "" ++ ++#: ../src/connection-editor/connection-helpers.c:116 + #: ../src/connection-editor/page-infiniband.c:148 + #: ../src/libnm-gtk/nm-ui-utils.c:331 + msgid "InfiniBand" + msgstr "인피니밴드" + +-#: ../src/connection-editor/connection-helpers.c:116 ++#: ../src/connection-editor/connection-helpers.c:117 + #: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333 + #: ../src/libnm-gtk/nm-ui-utils.c:577 + msgid "Bond" + msgstr "본딩" + +-#: ../src/connection-editor/connection-helpers.c:117 +-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335 ++#: ../src/connection-editor/connection-helpers.c:118 ++#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335 + #: ../src/libnm-gtk/nm-ui-utils.c:579 + msgid "Team" + msgstr "팀" + +-#: ../src/connection-editor/connection-helpers.c:118 +-#: ../src/connection-editor/page-bridge.c:212 ++#: ../src/connection-editor/connection-helpers.c:119 ++#: ../src/connection-editor/page-bridge.c:233 + #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581 + msgid "Bridge" + msgstr "브릿지" + +-#: ../src/connection-editor/connection-helpers.c:120 ++#: ../src/connection-editor/connection-helpers.c:121 + #: ../src/connection-editor/page-ip-tunnel.c:176 + msgid "IP tunnel" + msgstr "" + + #: ../src/connection-editor/connection-helpers.c:122 +-#: ../src/connection-editor/connection-helpers.c:396 ++#: ../src/connection-editor/page-macsec.c:190 ++msgid "MACsec" ++msgstr "" ++ ++#: ../src/connection-editor/connection-helpers.c:124 ++#: ../src/connection-editor/connection-helpers.c:398 + #: ../src/connection-editor/page-vpn.c:96 + msgid "VPN" + msgstr "가상 사설망" + +-#: ../src/connection-editor/connection-helpers.c:205 ++#: ../src/connection-editor/connection-helpers.c:207 + msgid "" + "The VPN plugin failed to import the VPN connection correctly\n" + "\n" +@@ -2832,11 +3032,11 @@ msgstr "" + "\n" + "오류: 가상 사설망 서비스 유형이 없음" + +-#: ../src/connection-editor/connection-helpers.c:217 ++#: ../src/connection-editor/connection-helpers.c:219 + msgid "Cannot import VPN connection" + msgstr "가상 사설망 연결을 가져올 수 없음" + +-#: ../src/connection-editor/connection-helpers.c:219 ++#: ../src/connection-editor/connection-helpers.c:221 + #, fuzzy, c-format + msgid "" + "The file “%s” could not be read or does not contain recognized VPN " +@@ -2849,47 +3049,54 @@ msgstr "" + "\n" + "오류: %s." + +-#: ../src/connection-editor/connection-helpers.c:220 ++#: ../src/connection-editor/connection-helpers.c:222 + #, fuzzy + msgid "unknown error" + msgstr "알 수 없는 오류" + +-#: ../src/connection-editor/connection-helpers.c:303 ++#: ../src/connection-editor/connection-helpers.c:305 + #: ../src/connection-editor/page-proxy.c:118 + #: ../src/connection-editor/page-team.c:341 + #: ../src/connection-editor/page-team-port.c:203 + msgid "Select file to import" + msgstr "가져올 파일" + +-#: ../src/connection-editor/connection-helpers.c:338 ++#: ../src/connection-editor/connection-helpers.c:309 ++#: ../src/connection-editor/page-proxy.c:122 ++#: ../src/connection-editor/page-team.c:345 ++#: ../src/connection-editor/page-team-port.c:207 ++msgid "_Open" ++msgstr "" ++ ++#: ../src/connection-editor/connection-helpers.c:340 + msgid "Hardware" + msgstr "하드웨어" + +-#: ../src/connection-editor/connection-helpers.c:365 ++#: ../src/connection-editor/connection-helpers.c:367 + msgid "Virtual" + msgstr "가상" + +-#: ../src/connection-editor/connection-helpers.c:514 + #: ../src/connection-editor/connection-helpers.c:516 ++#: ../src/connection-editor/connection-helpers.c:518 + #, fuzzy + msgid "Import a saved VPN configuration…" + msgstr "저장한 가상 사설망 설정 가져오기..." + +-#: ../src/connection-editor/connection-helpers.c:546 ++#: ../src/connection-editor/connection-helpers.c:548 + msgid "" + "The connection editor dialog could not be initialized due to an unknown " + "error." + msgstr "연결 에디터 창을 알려지지 않은 오류 때문에 열 수 없습니다." + +-#: ../src/connection-editor/connection-helpers.c:555 ++#: ../src/connection-editor/connection-helpers.c:557 + msgid "Could not create new connection" + msgstr "새로운 연결을 만들 수 없음" + +-#: ../src/connection-editor/connection-helpers.c:718 ++#: ../src/connection-editor/connection-helpers.c:720 + msgid "Connection delete failed" + msgstr "연결 제거가 실패했습니다" + +-#: ../src/connection-editor/connection-helpers.c:766 ++#: ../src/connection-editor/connection-helpers.c:768 + #, c-format + msgid "Are you sure you wish to delete the connection %s?" + msgstr "%s 연결을 정말로 제거하시겠습니까?" +@@ -2897,7 +3104,7 @@ msgstr "%s 연결을 정말로 제거하시겠습니까?" + #: ../src/connection-editor/ip4-routes-dialog.c:697 + #: ../src/connection-editor/ip6-routes-dialog.c:718 + #: ../src/connection-editor/page-ip4.c:1136 +-#: ../src/connection-editor/page-ip6.c:1095 ++#: ../src/connection-editor/page-ip6.c:1118 + msgid "Address" + msgstr "주소" + +@@ -2909,7 +3116,7 @@ msgstr "넷마스크" + #: ../src/connection-editor/ip4-routes-dialog.c:735 + #: ../src/connection-editor/ip6-routes-dialog.c:756 + #: ../src/connection-editor/page-ip4.c:1174 +-#: ../src/connection-editor/page-ip6.c:1133 ++#: ../src/connection-editor/page-ip6.c:1156 + msgid "Gateway" + msgstr "게이트웨이" + +@@ -2919,228 +3126,241 @@ msgid "Metric" + msgstr "매트릭" + + #: ../src/connection-editor/ip6-routes-dialog.c:737 +-#: ../src/connection-editor/page-ip6.c:1114 ++#: ../src/connection-editor/page-ip6.c:1137 + msgid "Prefix" + msgstr "접두어" + +-#: ../src/connection-editor/nm-connection-editor.c:108 ++#: ../src/connection-editor/nm-connection-editor.c:109 + #, c-format + msgid "Editing %s" + msgstr "%s 편집" + +-#: ../src/connection-editor/nm-connection-editor.c:112 ++#: ../src/connection-editor/nm-connection-editor.c:113 + msgid "Editing un-named connection" + msgstr "이름 없는 연결을 편집" + +-#: ../src/connection-editor/nm-connection-editor.c:132 ++#: ../src/connection-editor/nm-connection-editor.c:133 + #, fuzzy + msgid "Missing connection name" + msgstr "연결 이름(_N):" + +-#: ../src/connection-editor/nm-connection-editor.c:352 ++#: ../src/connection-editor/nm-connection-editor.c:353 + #, fuzzy + msgid "Editor initializing…" + msgstr "에디터 초기화 중 오류" + +-#: ../src/connection-editor/nm-connection-editor.c:359 +-#: ../src/connection-editor/nm-connection-list.c:408 ++#: ../src/connection-editor/nm-connection-editor.c:360 ++#: ../src/connection-editor/nm-connection-list.c:443 + #, fuzzy + msgid "Connection cannot be modified" + msgstr "연결을 추가하는 데 실패했습니다" + +-#: ../src/connection-editor/nm-connection-editor.c:374 ++#: ../src/connection-editor/nm-connection-editor.c:375 + #, c-format + msgid "Invalid setting %s: %s" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.c:450 ++#: ../src/connection-editor/nm-connection-editor.c:451 + msgid "" + "The connection editor could not find some required resources (the .ui file " + "was not found)." + msgstr "" + "연결 편집 창에서 필요한 리소스를 찾을 수 없습니다. (.ui 파일이 없습니다.)" + +-#: ../src/connection-editor/nm-connection-editor.c:577 ++#: ../src/connection-editor/nm-connection-editor.c:578 ++#: ../src/connection-editor/vpn-helpers.c:213 + msgid "_Save" + msgstr "저장(_S)" + +-#: ../src/connection-editor/nm-connection-editor.c:578 ++#: ../src/connection-editor/nm-connection-editor.c:579 + msgid "Save any changes made to this connection." + msgstr "이 연결에 대해 바뀐 사항을 저장합니다." + +-#: ../src/connection-editor/nm-connection-editor.c:579 ++#: ../src/connection-editor/nm-connection-editor.c:580 + msgid "Authenticate to save this connection for all users of this machine." + msgstr "이 컴퓨터의 모든 사용자에게 이 연결을 적용하도록 인증합니다." + +-#: ../src/connection-editor/nm-connection-editor.c:595 ++#: ../src/connection-editor/nm-connection-editor.c:596 + msgid "Could not create connection" + msgstr "연결을 만들 수 없음" + +-#: ../src/connection-editor/nm-connection-editor.c:595 ++#: ../src/connection-editor/nm-connection-editor.c:596 + msgid "Could not edit connection" + msgstr "연결을 변경할 수 없음" + +-#: ../src/connection-editor/nm-connection-editor.c:597 ++#: ../src/connection-editor/nm-connection-editor.c:598 + msgid "Unknown error creating connection editor dialog." + msgstr "연결 편집 대화 창 만들기에 알 수 없는 오류." + +-#: ../src/connection-editor/nm-connection-editor.c:738 ++#: ../src/connection-editor/nm-connection-editor.c:739 + msgid "" + "Warning: the connection contains some properties not supported by the " + "editor. They will be cleared upon save." + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.c:758 ++#: ../src/connection-editor/nm-connection-editor.c:759 + msgid "Error initializing editor" + msgstr "에디터 초기화 중 오류" + +-#: ../src/connection-editor/nm-connection-editor.c:1142 ++#: ../src/connection-editor/nm-connection-editor.c:1157 + msgid "Connection add failed" + msgstr "연결을 추가하는 데 실패했습니다" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2 +-msgid "_Close" +-msgstr "" +- +-#: ../src/connection-editor/nm-connection-editor.ui.h:4 ++#: ../src/connection-editor/nm-connection-editor.ui.h:1 + msgid "Fix" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:5 ++#: ../src/connection-editor/nm-connection-editor.ui.h:2 + #, fuzzy + msgid "" + "Security labels may prevent some files from being used with certificate " + "authentication." + msgstr "참이면 CA 인증서가 EAP 인증이 되었는지 경고를 하지 않습니다." + +-#: ../src/connection-editor/nm-connection-editor.ui.h:6 ++#: ../src/connection-editor/nm-connection-editor.ui.h:3 + msgid "Connection _name:" + msgstr "연결 이름(_N):" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:7 ++#: ../src/connection-editor/nm-connection-editor.ui.h:4 + #, fuzzy + msgid "_Export…" + msgstr "내보내기(_E)..." + +-#: ../src/connection-editor/nm-connection-editor.ui.h:9 ++#: ../src/connection-editor/nm-connection-editor.ui.h:6 + msgid "File Relabel" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:10 ++#: ../src/connection-editor/nm-connection-editor.ui.h:7 + msgid "_Relabel" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:11 ++#: ../src/connection-editor/nm-connection-editor.ui.h:8 + msgid "" + "The following files are not labelled for use with certificate " + "authentication. Do you wish to adjust the labels?" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:12 ++#: ../src/connection-editor/nm-connection-editor.ui.h:9 + msgid "Relabel" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:13 ++#: ../src/connection-editor/nm-connection-editor.ui.h:10 + msgid "Filename" + msgstr "" + +-#: ../src/connection-editor/nm-connection-list.c:127 ++#: ../src/connection-editor/nm-connection-list.c:151 + msgid "never" + msgstr "하지 않음" + +-#: ../src/connection-editor/nm-connection-list.c:138 +-#: ../src/connection-editor/nm-connection-list.c:149 ++#: ../src/connection-editor/nm-connection-list.c:162 ++#: ../src/connection-editor/nm-connection-list.c:173 + msgid "now" + msgstr "지금" + + #. less than an hour ago +-#: ../src/connection-editor/nm-connection-list.c:156 ++#: ../src/connection-editor/nm-connection-list.c:180 + #, c-format + msgid "%d minute ago" + msgid_plural "%d minutes ago" + msgstr[0] "%d분 전" + +-#: ../src/connection-editor/nm-connection-list.c:160 ++#: ../src/connection-editor/nm-connection-list.c:184 + #, c-format + msgid "%d hour ago" + msgid_plural "%d hours ago" + msgstr[0] "%d시간 전" + +-#: ../src/connection-editor/nm-connection-list.c:172 ++#: ../src/connection-editor/nm-connection-list.c:196 + #, c-format + msgid "%d day ago" + msgid_plural "%d days ago" + msgstr[0] "%d일 전" + +-#: ../src/connection-editor/nm-connection-list.c:178 ++#: ../src/connection-editor/nm-connection-list.c:202 + #, c-format + msgid "%d month ago" + msgid_plural "%d months ago" + msgstr[0] "%d달 전" + +-#: ../src/connection-editor/nm-connection-list.c:182 ++#: ../src/connection-editor/nm-connection-list.c:206 + #, c-format + msgid "%d year ago" + msgid_plural "%d years ago" + msgstr[0] "%d년 전" + +-#: ../src/connection-editor/nm-connection-list.c:635 ++#: ../src/connection-editor/nm-connection-list.c:445 ++msgid "Connection cannot be deleted" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:448 ++msgid "Select a connection to edit" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:450 ++msgid "Select a connection to delete" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:785 + #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2 + msgid "Name" + msgstr "이름" + +-#: ../src/connection-editor/nm-connection-list.c:648 ++#: ../src/connection-editor/nm-connection-list.c:798 + msgid "Last Used" + msgstr "마지막 사용" + +-#: ../src/connection-editor/nm-connection-list.c:696 ++#: ../src/connection-editor/nm-connection-list.c:836 + msgid "Edit the selected connection" + msgstr "선택한 연결을 고칩니다" + +-#: ../src/connection-editor/nm-connection-list.c:697 ++#: ../src/connection-editor/nm-connection-list.c:837 + msgid "Authenticate to edit the selected connection" + msgstr "선택된 연결을 변경하도록 인증합니다" + +-#: ../src/connection-editor/nm-connection-list.c:712 ++#: ../src/connection-editor/nm-connection-list.c:842 + msgid "Delete the selected connection" + msgstr "선택한 연결 삭제" + +-#: ../src/connection-editor/nm-connection-list.c:713 ++#: ../src/connection-editor/nm-connection-list.c:843 + msgid "Authenticate to delete the selected connection" + msgstr "선택한 연결을 삭제하도록 인증" + +-#: ../src/connection-editor/nm-connection-list.c:935 +-#: ../src/connection-editor/nm-connection-list.c:938 ++#: ../src/connection-editor/nm-connection-list.c:1048 ++#: ../src/connection-editor/nm-connection-list.c:1051 + msgid "Error creating connection" + msgstr "연결을 만드는데 오류" + +-#: ../src/connection-editor/nm-connection-list.c:936 ++#: ../src/connection-editor/nm-connection-list.c:1049 + msgid "No VPN plugins are installed." + msgstr "VPN 플러그인을 하나도 설치하지 않았습니다." + +-#: ../src/connection-editor/nm-connection-list.c:939 ++#: ../src/connection-editor/nm-connection-list.c:1052 + #, fuzzy, c-format + msgid "Don’t know how to create “%s” connections" + msgstr "'%s' 연결을 만드는 방법을 알지 못합니다" + +-#: ../src/connection-editor/nm-connection-list.c:970 ++#: ../src/connection-editor/nm-connection-list.c:1085 + msgid "Error editing connection" + msgstr "연결을 편집하는데 오류" + +-#: ../src/connection-editor/nm-connection-list.c:971 ++#: ../src/connection-editor/nm-connection-list.c:1086 + #, fuzzy, c-format + msgid "Did not find a connection with UUID “%s”" + msgstr "UUID가 '%s'인 연결을 찾을 수 없습니다" + +-#: ../src/connection-editor/page-8021x-security.c:109 ++#: ../src/connection-editor/nm-connection-list.ui.h:2 ++msgid "Add a new connection" ++msgstr "" ++ ++#: ../src/connection-editor/page-8021x-security.c:116 + msgid "802.1X Security" + msgstr "802.1X 보안" + +-#: ../src/connection-editor/page-8021x-security.c:111 ++#: ../src/connection-editor/page-8021x-security.c:118 + msgid "Could not load 802.1X Security user interface." + msgstr "802.1X 보안 사용자 인터페이스를 읽어들일 수 없습니다." + +-#: ../src/connection-editor/page-8021x-security.c:125 ++#: ../src/connection-editor/page-8021x-security.c:132 + msgid "Use 802.1_X security for this connection" + msgstr "이 연결에 802.1X 보안을 사용(_X)" + +@@ -3196,11 +3416,11 @@ msgstr "기본(_P):" + msgid "Bond connection %d" + msgstr "본딩 네트워크 연결 %d" + +-#: ../src/connection-editor/page-bridge.c:215 ++#: ../src/connection-editor/page-bridge.c:236 + msgid "Could not load bridge user interface." + msgstr "브릿지 사용자 인터페이스를 읽어들일 수 없습니다." + +-#: ../src/connection-editor/page-bridge.c:317 ++#: ../src/connection-editor/page-bridge.c:352 + #, c-format + msgid "Bridge connection %d" + msgstr "브릿지 네트워크 연결 %d" +@@ -3224,11 +3444,15 @@ msgstr "DCB" + msgid "Could not load DCB user interface." + msgstr "DCB 사용자 인터페이스를 읽어들일 수 없습니다." + +-#: ../src/connection-editor/page-dsl.c:129 ++#: ../src/connection-editor/page-dsl.c:203 + msgid "Could not load DSL user interface." + msgstr "DSL 사용자 인터페이스를 읽어들일 수 없습니다." + +-#: ../src/connection-editor/page-dsl.c:219 ++#: ../src/connection-editor/page-dsl.c:298 ++msgid "missing parent interface" ++msgstr "" ++ ++#: ../src/connection-editor/page-dsl.c:343 + #, c-format + msgid "DSL connection %d" + msgstr "DSL 연결 %d" +@@ -3329,27 +3553,27 @@ msgid "IP tunnel connection %d" + msgstr "이더넷 연결 %d" + + #: ../src/connection-editor/page-ip4.c:127 +-#: ../src/connection-editor/page-ip6.c:130 ++#: ../src/connection-editor/page-ip6.c:136 + msgid "Automatic (VPN)" + msgstr "자동(가상 사설망)" + + #: ../src/connection-editor/page-ip4.c:128 +-#: ../src/connection-editor/page-ip6.c:131 ++#: ../src/connection-editor/page-ip6.c:137 + msgid "Automatic (VPN) addresses only" + msgstr "자동(가상 사설망), 주소만" + + #: ../src/connection-editor/page-ip4.c:132 +-#: ../src/connection-editor/page-ip6.c:137 ++#: ../src/connection-editor/page-ip6.c:143 + msgid "Automatic, addresses only" + msgstr "주소만 자동" + + #: ../src/connection-editor/page-ip4.c:134 +-#: ../src/connection-editor/page-ip6.c:133 ++#: ../src/connection-editor/page-ip6.c:139 + msgid "Automatic (PPPoE)" + msgstr "자동(PPPoE)" + + #: ../src/connection-editor/page-ip4.c:135 +-#: ../src/connection-editor/page-ip6.c:134 ++#: ../src/connection-editor/page-ip6.c:140 + msgid "Automatic (PPPoE) addresses only" + msgstr "주소만 자동(PPPoE)" + +@@ -3362,17 +3586,17 @@ msgid "Automatic (DHCP) addresses only" + msgstr "주소만 자동(DHCP)" + + #: ../src/connection-editor/page-ip4.c:181 +-#: ../src/connection-editor/page-ip6.c:198 ++#: ../src/connection-editor/page-ip6.c:204 + msgid "Link-Local Only" + msgstr "연결-로컬 연결만" + + #: ../src/connection-editor/page-ip4.c:361 +-#: ../src/connection-editor/page-ip6.c:324 ++#: ../src/connection-editor/page-ip6.c:335 + msgid "Additional DNS ser_vers:" + msgstr "추가 DNS 서버(_V):" + + #: ../src/connection-editor/page-ip4.c:370 +-#: ../src/connection-editor/page-ip6.c:333 ++#: ../src/connection-editor/page-ip6.c:344 + msgid "Additional s_earch domains:" + msgstr "추가 검색 도메인(_E):" + +@@ -3409,43 +3633,52 @@ msgstr "" + msgid "IPv4 DNS server “%s” invalid" + msgstr "" + +-#: ../src/connection-editor/page-ip6.c:173 ++#: ../src/connection-editor/page-ip6.c:179 + msgid "Automatic, DHCP only" + msgstr "자동, DHCP만 사용" + +-#: ../src/connection-editor/page-ip6.c:993 ++#: ../src/connection-editor/page-ip6.c:1016 + #, c-format + msgid "Editing IPv6 routes for %s" + msgstr "%s의 IPv6 경로 편집" + +-#: ../src/connection-editor/page-ip6.c:1184 ++#: ../src/connection-editor/page-ip6.c:1208 + msgid "IPv6 Settings" + msgstr "IPv6 설정" + +-#: ../src/connection-editor/page-ip6.c:1186 ++#: ../src/connection-editor/page-ip6.c:1210 + msgid "Could not load IPv6 user interface." + msgstr "IPv6 사용자 인터페이스를 읽어들일 수 없습니다." + +-#: ../src/connection-editor/page-ip6.c:1277 ++#: ../src/connection-editor/page-ip6.c:1302 + #, c-format + msgid "IPv6 address “%s” invalid" + msgstr "" + +-#: ../src/connection-editor/page-ip6.c:1285 ++#: ../src/connection-editor/page-ip6.c:1310 + #, c-format + msgid "IPv6 prefix “%s” invalid" + msgstr "" + +-#: ../src/connection-editor/page-ip6.c:1294 ++#: ../src/connection-editor/page-ip6.c:1319 + #, c-format + msgid "IPv6 gateway “%s” invalid" + msgstr "" + +-#: ../src/connection-editor/page-ip6.c:1336 ++#: ../src/connection-editor/page-ip6.c:1361 + #, c-format + msgid "IPv6 DNS server “%s” invalid" + msgstr "" + ++#: ../src/connection-editor/page-macsec.c:192 ++msgid "Could not load MACsec user interface." ++msgstr "" ++ ++#: ../src/connection-editor/page-macsec.c:331 ++#, c-format ++msgid "MACSEC connection %d" ++msgstr "" ++ + #: ../src/connection-editor/page-master.c:247 + #: ../src/connection-editor/page-master.c:258 + msgid "Duplicate slaves" +@@ -3503,38 +3736,34 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)" + msgstr "통신사가 C_DMA 기반의 기술을 사용합니다(예: 1xRTT, EVDO)" + + #: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50 +-#: ../src/mobile-helpers.c:283 ++#: ../src/mobile-helpers.c:282 + msgid "CDMA" + msgstr "CDMA" + + #: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54 +-#: ../src/mobile-helpers.c:281 ++#: ../src/mobile-helpers.c:280 + msgid "GSM" + msgstr "GSM" + +-#: ../src/connection-editor/page-ppp.c:129 +-msgid "EAP" +-msgstr "EAP" +- + #: ../src/connection-editor/page-ppp.c:130 +-#: ../src/wireless-security/eap-method-ttls.c:260 ++#: ../src/wireless-security/eap-method-ttls.c:287 + msgid "PAP" + msgstr "PAP" + + #: ../src/connection-editor/page-ppp.c:131 +-#: ../src/wireless-security/eap-method-ttls.c:322 ++#: ../src/wireless-security/eap-method-ttls.c:349 + msgid "CHAP" + msgstr "CHAP" + + #: ../src/connection-editor/page-ppp.c:132 +-#: ../src/wireless-security/eap-method-fast.c:284 +-#: ../src/wireless-security/eap-method-peap.c:273 +-#: ../src/wireless-security/eap-method-ttls.c:290 ++#: ../src/wireless-security/eap-method-fast.c:282 ++#: ../src/wireless-security/eap-method-peap.c:299 ++#: ../src/wireless-security/eap-method-ttls.c:317 + msgid "MSCHAPv2" + msgstr "MSCHAPv2" + + #: ../src/connection-editor/page-ppp.c:133 +-#: ../src/wireless-security/eap-method-ttls.c:275 ++#: ../src/wireless-security/eap-method-ttls.c:302 + msgid "MSCHAP" + msgstr "MSCHAP" + +@@ -3571,11 +3800,11 @@ msgstr "본딩 사용자 인터페이스를 읽어들일 수 없습니다." + msgid "Error: file doesn’t contain a valid JSON configuration" + msgstr "오류: 파일에 올바른 JSON 설정이 들어 있지 않습니다" + +-#: ../src/connection-editor/page-team.c:1156 ++#: ../src/connection-editor/page-team.c:1034 + msgid "Could not load team user interface." + msgstr "팀 사용자 인터페이스를 읽어들일 수 없습니다." + +-#: ../src/connection-editor/page-team.c:1253 ++#: ../src/connection-editor/page-team.c:1131 + #, c-format + msgid "Team connection %d" + msgstr "팀 연결 %d" +@@ -3583,11 +3812,11 @@ msgstr "팀 연결 %d" + #. Translators: a "Team Port" is a network + #. * device that is part of a team. + #. +-#: ../src/connection-editor/page-team-port.c:732 ++#: ../src/connection-editor/page-team-port.c:655 + msgid "Team Port" + msgstr "팀 포트" + +-#: ../src/connection-editor/page-team-port.c:734 ++#: ../src/connection-editor/page-team-port.c:657 + msgid "Could not load team port user interface." + msgstr "팀 포트 사용자 인터페이스를 읽어들일 수 없습니다." + +@@ -3698,50 +3927,50 @@ msgstr "모든 장치" + msgid "Wi-Fi connection %d" + msgstr "와이파이 연결 %d" + +-#: ../src/connection-editor/page-wifi-security.c:356 ++#: ../src/connection-editor/page-wifi-security.c:358 + #: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922 + msgid "WEP 40/128-bit Key (Hex or ASCII)" + msgstr "WEP 40/128비트 키(Hex 또는 ASCII)" + +-#: ../src/connection-editor/page-wifi-security.c:366 ++#: ../src/connection-editor/page-wifi-security.c:368 + #: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931 + msgid "WEP 128-bit Passphrase" + msgstr "WEP 128비트 열쇠글" + +-#: ../src/connection-editor/page-wifi-security.c:392 ++#: ../src/connection-editor/page-wifi-security.c:394 + msgid "Dynamic WEP (802.1X)" + msgstr "동적 WEP (802.1X)" + +-#: ../src/connection-editor/page-wifi-security.c:405 ++#: ../src/connection-editor/page-wifi-security.c:407 + #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975 + msgid "WPA & WPA2 Personal" + msgstr "개인용 WPA 또는 WPA2" + +-#: ../src/connection-editor/page-wifi-security.c:418 ++#: ../src/connection-editor/page-wifi-security.c:420 + #: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989 + msgid "WPA & WPA2 Enterprise" + msgstr "기업용 WPA 또는 WPA2" + +-#: ../src/connection-editor/page-wifi-security.c:461 ++#: ../src/connection-editor/page-wifi-security.c:463 + msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting." + msgstr "" + "와이파이 보안 사용자 인터페이스를 읽어들일 수 없습니다. 와이파이 설정이 없습" + "니다." + +-#: ../src/connection-editor/page-wifi-security.c:472 ++#: ../src/connection-editor/page-wifi-security.c:474 + msgid "Wi-Fi Security" + msgstr "와이파이 보안" + +-#: ../src/connection-editor/page-wifi-security.c:474 ++#: ../src/connection-editor/page-wifi-security.c:476 + msgid "Could not load Wi-Fi security user interface." + msgstr "와이파이 보안 사용자 인터페이스를 읽어들일 수 없습니다." + +-#: ../src/connection-editor/page-wifi-security.c:558 ++#: ../src/connection-editor/page-wifi-security.c:560 + #, c-format + msgid "missing SSID" + msgstr "" + +-#: ../src/connection-editor/page-wifi-security.c:564 ++#: ../src/connection-editor/page-wifi-security.c:566 + #, c-format + msgid "Security not compatible with Ad-Hoc mode" + msgstr "" +@@ -3792,35 +4021,39 @@ msgstr "이 장치 자동으로 잠금 해제" + msgid "Connection Information" + msgstr "연결 정보" + ++#: ../src/info.ui.h:2 ++msgid "_Close" ++msgstr "" ++ + #: ../src/info.ui.h:3 + msgid "Active Network Connections" + msgstr "사용 중인 네트워크 연결" + + #: ../src/libnma/nma-file-cert-chooser.c:108 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:146 + #, fuzzy + msgid "No certificate set" + msgstr "CA 인증서 불필요(_R)" + + #: ../src/libnma/nma-file-cert-chooser.c:126 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:170 + msgid "No key set" + msgstr "" + + #: ../src/libnma/nma-file-cert-chooser.c:246 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:370 + #, fuzzy, c-format + msgid "Choose a key for %s Certificate" + msgstr "개인 인증서 선택..." + + #: ../src/libnma/nma-file-cert-chooser.c:250 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:374 + #, fuzzy, c-format + msgid "%s private _key:" + msgstr "비밀키(_K):" + + #: ../src/libnma/nma-file-cert-chooser.c:254 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:378 + #, fuzzy, c-format + msgid "%s key _password:" + msgstr "비밀키 암호(_P):" +@@ -3831,7 +4064,7 @@ msgid "Choose %s Certificate" + msgstr "개인 인증서 선택..." + + #: ../src/libnma/nma-file-cert-chooser.c:262 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:386 + #, fuzzy, c-format + msgid "%s _certificate:" + msgstr "사용자 인증서(_U):" +@@ -4037,47 +4270,47 @@ msgstr "모바일 광대역 연결을 설정" + msgid "New Mobile Broadband Connection" + msgstr "새 모바일 광대역 연결" + +-#: ../src/libnma/nma-cert-chooser-button.c:162 ++#: ../src/libnma/nma-cert-chooser-button.c:165 + #, fuzzy + msgid "(None)" + msgstr "(없음)" + +-#: ../src/libnma/nma-cert-chooser-button.c:170 ++#: ../src/libnma/nma-cert-chooser-button.c:173 + #, c-format + msgid "Key in %s" + msgstr "" + +-#: ../src/libnma/nma-cert-chooser-button.c:171 ++#: ../src/libnma/nma-cert-chooser-button.c:174 + #, fuzzy, c-format + msgid "Certificate in %s" + msgstr "CA 인증서(_A):" + +-#: ../src/libnma/nma-cert-chooser-button.c:190 ++#: ../src/libnma/nma-cert-chooser-button.c:193 + #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183 + #, fuzzy + msgid "(Unknown)" + msgstr "알 수 없음" + +-#: ../src/libnma/nma-cert-chooser-button.c:212 +-#: ../src/libnma/nma-cert-chooser-button.c:242 ++#: ../src/libnma/nma-cert-chooser-button.c:215 ++#: ../src/libnma/nma-cert-chooser-button.c:245 + msgid "Select" + msgstr "" + +-#: ../src/libnma/nma-cert-chooser-button.c:213 +-#: ../src/libnma/nma-cert-chooser-button.c:243 ++#: ../src/libnma/nma-cert-chooser-button.c:216 ++#: ../src/libnma/nma-cert-chooser-button.c:246 + msgid "Cancel" + msgstr "" + +-#: ../src/libnma/nma-cert-chooser-button.c:469 ++#: ../src/libnma/nma-cert-chooser-button.c:472 + msgid "Select from file…" + msgstr "" + +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:382 + #, fuzzy, c-format + msgid "Choose a %s Certificate" + msgstr "개인 인증서 선택..." + +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:390 + #, fuzzy, c-format + msgid "%s certificate _password:" + msgstr "사용자 인증서(_U):" +@@ -4144,8 +4377,8 @@ msgstr "보조 암호(_S):" + msgid "_Tertiary Password:" + msgstr "보조 암호(_S):" + +-#: ../src/libnma/nma-vpn-password-dialog.c:247 +-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247 ++#: ../src/libnma/nma-vpn-password-dialog.c:238 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238 + msgid "Sh_ow passwords" + msgstr "암호 보이기(_O)" + +@@ -4174,46 +4407,46 @@ msgstr "없음" + msgid "Dynamic WEP (802.1x)" + msgstr "동적 WEP (802.1X)" + +-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075 ++#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071 + msgid "C_reate" + msgstr "만들기(_R)" + +-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161 ++#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150 + #, fuzzy, c-format + msgid "" + "Passwords or encryption keys are required to access the Wi-Fi network “%s”." + msgstr "" + "와이파이 네트워크 '%s'에 연결하려면 암호 또는 암호화 키가 있어야 합니다." + +-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163 ++#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152 + msgid "Wi-Fi Network Authentication Required" + msgstr "와이파이 네트워크 인증이 필요합니다" + +-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165 ++#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154 + msgid "Authentication required by Wi-Fi network" + msgstr "와이파이 네트워크에 인증이 필요합니다" + +-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170 ++#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159 + msgid "Create New Wi-Fi Network" + msgstr "새 와이파이 네트워크 만들기" + +-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172 ++#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161 + msgid "New Wi-Fi network" + msgstr "새 와이파이 네트워크" + +-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173 ++#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162 + msgid "Enter a name for the Wi-Fi network you wish to create." + msgstr "연결하려는 와이파이 네트워크의 이름을 입력하십시오." + +-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175 ++#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164 + msgid "Connect to Hidden Wi-Fi Network" + msgstr "감춰진 와이파이 네트워크에 연결" + +-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177 ++#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166 + msgid "Hidden Wi-Fi network" + msgstr "숨겨진 와이파이 네트워크" + +-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178 ++#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167 + msgid "" + "Enter the name and security details of the hidden Wi-Fi network you wish to " + "connect to." +@@ -4365,25 +4598,25 @@ msgstr "로밍 네트워크(%s)" + msgid "Roaming network" + msgstr "로밍 네트워크" + +-#: ../src/mobile-helpers.c:331 ++#: ../src/mobile-helpers.c:330 + #, fuzzy, c-format + msgid "PIN code for SIM card “%s” on “%s”" + msgstr "'%2$s'의 SIM 카드 '%1$s'에 대한 PIM 코드" + +-#: ../src/mobile-helpers.c:464 ++#: ../src/mobile-helpers.c:463 + msgid "PIN code required" + msgstr "PIN 코드가 필요합니다" + +-#: ../src/mobile-helpers.c:472 ++#: ../src/mobile-helpers.c:471 + msgid "PIN code is needed for the mobile broadband device" + msgstr "PIN 코드가 모바일 광대역 장치를 위해 필요합니다" + +-#: ../src/mobile-helpers.c:622 ++#: ../src/mobile-helpers.c:621 + #, fuzzy, c-format + msgid "Mobile broadband connection “%s” active: (%d%%%s%s)" + msgstr "모바일 광대역 연결 '%s' 사용 중: (%d%%%s%s)" + +-#: ../src/mobile-helpers.c:625 ++#: ../src/mobile-helpers.c:624 + msgid "roaming" + msgstr "로밍" + +@@ -4393,12 +4626,12 @@ msgstr "로밍" + msgid "%s connection" + msgstr "%s 연결" + +-#: ../src/utils/utils.c:563 ++#: ../src/utils/utils.c:565 + #, fuzzy + msgid "PEM certificates (*.pem, *.crt, *.cer)" + msgstr "DEP 혹은 PEM 인증서(*.det, *.pem, *.crt, *.cer)" + +-#: ../src/utils/utils.c:575 ++#: ../src/utils/utils.c:577 + msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" + msgstr "DER, PEM, 또는 PKCS#12 비밀 키(*.der, *.pem, *.p12, *.key)" + +@@ -4406,39 +4639,35 @@ msgstr "DER, PEM, 또는 PKCS#12 비밀 키(*.der, *.pem, *.p12, *.key)" + msgid "undefined error in 802.1X security (wpa-eap)" + msgstr "" + +-#: ../src/wireless-security/eap-method.c:227 +-msgid "no file selected" +-msgstr "" +- +-#: ../src/wireless-security/eap-method.c:235 +-#, c-format +-msgid "file “%s” does not exist" +-msgstr "" ++#: ../src/wireless-security/eap-method.c:365 ++#, fuzzy ++msgid "no CA certificate selected" ++msgstr "CA 인증서 불필요(_R)" + +-#: ../src/wireless-security/eap-method.c:258 +-msgid "unspecified error validating eap-method file" ++#: ../src/wireless-security/eap-method.c:370 ++msgid "selected CA certificate file does not exist" + msgstr "" + +-#: ../src/wireless-security/eap-method-fast.c:73 ++#: ../src/wireless-security/eap-method-fast.c:71 + msgid "missing EAP-FAST PAC file" + msgstr "" + +-#: ../src/wireless-security/eap-method-fast.c:269 +-#: ../src/wireless-security/eap-method-peap.c:303 +-#: ../src/wireless-security/eap-method-ttls.c:352 ++#: ../src/wireless-security/eap-method-fast.c:267 ++#: ../src/wireless-security/eap-method-peap.c:329 ++#: ../src/wireless-security/eap-method-ttls.c:379 + msgid "GTC" + msgstr "GTC" + +-#: ../src/wireless-security/eap-method-fast.c:407 ++#: ../src/wireless-security/eap-method-fast.c:405 + #, fuzzy + msgid "Choose a PAC file" + msgstr "PAC 파일 선택..." + +-#: ../src/wireless-security/eap-method-fast.c:414 ++#: ../src/wireless-security/eap-method-fast.c:412 + msgid "PAC files (*.pac)" + msgstr "PAC 파일(*.pac)" + +-#: ../src/wireless-security/eap-method-fast.c:418 ++#: ../src/wireless-security/eap-method-fast.c:416 + msgid "All files" + msgstr "모든 파일" + +@@ -4456,7 +4685,7 @@ msgstr "둘 다" + + #: ../src/wireless-security/eap-method-fast.ui.h:4 + #: ../src/wireless-security/eap-method-peap.ui.h:4 +-#: ../src/wireless-security/eap-method-ttls.ui.h:1 ++#: ../src/wireless-security/eap-method-ttls.ui.h:3 + msgid "Anony_mous identity:" + msgstr "익명 사용(_M):" + +@@ -4466,7 +4695,7 @@ msgstr "PAC 파일(_F):" + + #: ../src/wireless-security/eap-method-fast.ui.h:6 + #: ../src/wireless-security/eap-method-peap.ui.h:7 +-#: ../src/wireless-security/eap-method-ttls.ui.h:4 ++#: ../src/wireless-security/eap-method-ttls.ui.h:1 + msgid "_Inner authentication:" + msgstr "내부 인증(_I):" + +@@ -4482,27 +4711,12 @@ msgstr "" + msgid "missing EAP-LEAP password" + msgstr "" + +-#: ../src/wireless-security/eap-method-peap.c:64 +-#, c-format +-msgid "invalid EAP-PEAP CA certificate: %s" +-msgstr "" +- +-#: ../src/wireless-security/eap-method-peap.c:69 +-msgid "invalid EAP-PEAP CA certificate: no certificate specified" +-msgstr "" +- +-#: ../src/wireless-security/eap-method-peap.c:288 +-#: ../src/wireless-security/eap-method-ttls.c:337 ++#: ../src/wireless-security/eap-method-peap.c:314 ++#: ../src/wireless-security/eap-method-ttls.c:364 + #: ../src/wireless-security/wireless-security.c:424 + msgid "MD5" + msgstr "MD5" + +-#: ../src/wireless-security/eap-method-peap.c:382 +-#: ../src/wireless-security/eap-method-ttls.c:431 +-#, fuzzy +-msgid "Choose a Certificate Authority certificate" +-msgstr "인증 기관 인증서 선택..." +- + #: ../src/wireless-security/eap-method-peap.ui.h:2 + msgid "Version 0" + msgstr "버전 0" +@@ -4512,20 +4726,27 @@ msgid "Version 1" + msgstr "버전 1" + + #: ../src/wireless-security/eap-method-peap.ui.h:5 +-#: ../src/wireless-security/eap-method-ttls.ui.h:2 +-msgid "C_A certificate:" +-msgstr "CA 인증서(_A):" +- +-#: ../src/wireless-security/eap-method-peap.ui.h:6 + #: ../src/wireless-security/eap-method-tls.ui.h:2 +-#: ../src/wireless-security/eap-method-ttls.ui.h:3 ++#: ../src/wireless-security/eap-method-ttls.ui.h:2 + msgid "No CA certificate is _required" + msgstr "CA 인증서 불필요(_R)" + +-#: ../src/wireless-security/eap-method-peap.ui.h:8 ++#: ../src/wireless-security/eap-method-peap.ui.h:6 + msgid "PEAP _version:" + msgstr "PEAP 버전(_V):" + ++#: ../src/wireless-security/eap-method-peap.ui.h:8 ++#: ../src/wireless-security/eap-method-tls.ui.h:3 ++#: ../src/wireless-security/eap-method-ttls.ui.h:4 ++msgid "Suffix of the server certificate name." ++msgstr "" ++ ++#: ../src/wireless-security/eap-method-peap.ui.h:9 ++#: ../src/wireless-security/eap-method-tls.ui.h:4 ++#: ../src/wireless-security/eap-method-ttls.ui.h:5 ++msgid "_Domain:" ++msgstr "" ++ + #: ../src/wireless-security/eap-method-simple.c:75 + msgid "missing EAP username" + msgstr "" +@@ -4538,46 +4759,28 @@ msgstr "" + msgid "missing EAP-TLS identity" + msgstr "" + +-#: ../src/wireless-security/eap-method-tls.c:238 ++#: ../src/wireless-security/eap-method-tls.c:256 + #, fuzzy + msgid "no user certificate selected" + msgstr "CA 인증서 불필요(_R)" + +-#: ../src/wireless-security/eap-method-tls.c:243 ++#: ../src/wireless-security/eap-method-tls.c:261 + msgid "selected user certificate file does not exist" + msgstr "" + +-#: ../src/wireless-security/eap-method-tls.c:263 ++#: ../src/wireless-security/eap-method-tls.c:281 + msgid "no key selected" + msgstr "" + +-#: ../src/wireless-security/eap-method-tls.c:268 ++#: ../src/wireless-security/eap-method-tls.c:286 + msgid "selected key file does not exist" + msgstr "" + +-#: ../src/wireless-security/eap-method-tls.c:314 +-#, fuzzy +-msgid "no CA certificate selected" +-msgstr "CA 인증서 불필요(_R)" +- +-#: ../src/wireless-security/eap-method-tls.c:319 +-msgid "selected CA certificate file does not exist" +-msgstr "" +- + #: ../src/wireless-security/eap-method-tls.ui.h:1 + msgid "I_dentity:" + msgstr "인증 정보(_D):" + +-#: ../src/wireless-security/eap-method-ttls.c:64 +-#, c-format +-msgid "invalid EAP-TTLS CA certificate: %s" +-msgstr "" +- +-#: ../src/wireless-security/eap-method-ttls.c:69 +-msgid "invalid EAP-TTLS CA certificate: no certificate specified" +-msgstr "" +- +-#: ../src/wireless-security/eap-method-ttls.c:306 ++#: ../src/wireless-security/eap-method-ttls.c:333 + #, fuzzy + msgid "MSCHAPv2 (no EAP)" + msgstr "MSCHAPv2" +@@ -4652,17 +4855,17 @@ msgid "invalid wep-key: passphrase must be shorter than 64 characters" + msgstr "" + + #: ../src/wireless-security/ws-wep-key.ui.h:1 +-msgid "1 (Default)" +-msgstr "1 (기본값)" +- +-#: ../src/wireless-security/ws-wep-key.ui.h:2 + msgid "Open System" + msgstr "열린 시스템" + +-#: ../src/wireless-security/ws-wep-key.ui.h:3 ++#: ../src/wireless-security/ws-wep-key.ui.h:2 + msgid "Shared Key" + msgstr "공유 키" + ++#: ../src/wireless-security/ws-wep-key.ui.h:3 ++msgid "1 (Default)" ++msgstr "1 (기본값)" ++ + #: ../src/wireless-security/ws-wep-key.ui.h:4 + msgid "_Key:" + msgstr "키(_K):" +@@ -4689,378 +4892,3 @@ msgstr "" + #: ../src/wireless-security/ws-wpa-psk.ui.h:2 + msgid "_Type:" + msgstr "형식(_T):" +- +-#, fuzzy +-#~ msgid "NetworkManager for GNOME" +-#~ msgstr "네트워크 관리 애플릿" +- +-#~ msgid "" +-#~ "\n" +-#~ "The VPN connection '%s' disconnected because the VPN service stopped." +-#~ msgstr "" +-#~ "\n" +-#~ "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 중단되었습니다." +- +-#~ msgid "" +-#~ "\n" +-#~ "The VPN connection '%s' disconnected." +-#~ msgstr "" +-#~ "\n" +-#~ "'%s' 가상 사설망 연결이 끊어졌습니다." +- +-#~ msgid "_Disconnect VPN" +-#~ msgstr "가상 사설망 연결 끊기(_D)..." +- +-#~ msgid "New Mobile Broadband connection..." +-#~ msgstr "새 모바일 광대역 연결..." +- +-#~ msgid "_Connect to Hidden Wi-Fi Network..." +-#~ msgstr "숨겨진 와이파이 네트워크에 연결(_C)..." +- +-#~ msgid "Create _New Wi-Fi Network..." +-#~ msgstr "새 와이파이 네트워크 만들기(_N)..." +- +-#~ msgid " " +-#~ msgstr " " +- +-#~ msgid "0" +-#~ msgstr "0" +- +-#~ msgid "1" +-#~ msgstr "1" +- +-#~ msgid "2" +-#~ msgstr "2" +- +-#~ msgid "3" +-#~ msgstr "3" +- +-#~ msgid "4" +-#~ msgstr "4" +- +-#~ msgid "5" +-#~ msgstr "5" +- +-#~ msgid "6" +-#~ msgstr "6" +- +-#~ msgid "7" +-#~ msgstr "7" +- +-#~ msgid "15" +-#~ msgstr "15" +- +-#~ msgid "Aut_onegotiate" +-#~ msgstr "자동 협상(_O)" +- +-#~ msgid "FirewallD is not running." +-#~ msgstr "FirewallD가 실행 중이 아닙니다." +- +-#~ msgid "New..." +-#~ msgstr "새로 만들기..." +- +-#, fuzzy +-#~ msgid "invalid EAP-TLS CA certificate: %s" +-#~ msgstr "CA 인증서(_A):" +- +-#~ msgid "Unencrypted private keys are insecure" +-#~ msgstr "암호화되지 않은 비밀 키는 안전하지 않습니다" +- +-#~ msgid "" +-#~ "The selected private key does not appear to be protected by a password. " +-#~ "This could allow your security credentials to be compromised. Please " +-#~ "select a password-protected private key.\n" +-#~ "\n" +-#~ "(You can password-protect your private key with openssl)" +-#~ msgstr "" +-#~ "선택한 비밀 키는 암호로 보호하지 않는 것으로 보입니다. 보안 정보가 침해당" +-#~ "할 수 있습니다. 암호로 보호하는 비밀 키를 선택하십시오.\n" +-#~ "\n" +-#~ "(openssl로 비밀 키를 보호할 수 있습니다)" +- +-#~ msgid "Choose your private key..." +-#~ msgstr "비밀키 선택..." +- +-#~ msgid "Enable WiMA_X Mobile Broadband" +-#~ msgstr "와이맥스 모바일 광대역 사용(_X)" +- +-#~ msgid "_Help" +-#~ msgstr "도움말(_H)" +- +-#~ msgid "You are now connected to the bonded network." +-#~ msgstr "본딩 네트워크에 연결되었습니다." +- +-#~ msgid "Preparing bond connection '%s'..." +-#~ msgstr "본딩 네트워크 연결 '%s' 준비 중..." +- +-#~ msgid "Configuring bond connection '%s'..." +-#~ msgstr "본딩 연결 '%s' 설정 중..." +- +-#~ msgid "User authentication required for bond connection '%s'..." +-#~ msgstr "본딩 연결 '%s'에는 사용자 인증이 필요합니다..." +- +-#~ msgid "Requesting address for '%s'..." +-#~ msgstr "'%s'에 주소 요청 중..." +- +-#~ msgid "Bond connection '%s' active" +-#~ msgstr "본딩 연결 '%s' 사용 중" +- +-#~ msgid "You are now connected to the bridged network." +-#~ msgstr "브릿지 네트워크에 연결되었습니다." +- +-#~ msgid "Preparing bridge connection '%s'..." +-#~ msgstr "브릿지 연결 '%s' 준비 중..." +- +-#~ msgid "Configuring bridge connection '%s'..." +-#~ msgstr "브릿지 연결 '%s' 설정 중..." +- +-#~ msgid "User authentication required for bridge connection '%s'..." +-#~ msgstr "브릿지 연결 '%s'에는 사용자 인증이 필요합니다..." +- +-#~ msgid "Bridge connection '%s' active" +-#~ msgstr "브릿지 연결 '%s' 사용 중" +- +-#~ msgid "New Mobile Broadband (CDMA) connection..." +-#~ msgstr "새 모바일 광대역(CDMA) 연결..." +- +-#~ msgid "You are now connected to the CDMA network." +-#~ msgstr "CDMA 네트워크에 연결되었습니다." +- +-#~ msgid "CDMA network." +-#~ msgstr "CDMA 네트워크." +- +-#~ msgid "New Mobile Broadband (GSM) connection..." +-#~ msgstr "새 모바일 광대역(GSM) 연결..." +- +-#~ msgid "You are now connected to the GSM network." +-#~ msgstr "GSM 네트워크에 연결되었습니다." +- +-#~ msgid "GSM network." +-#~ msgstr "GSM 네트워크." +- +-#~ msgid "Auto InfiniBand" +-#~ msgstr "자동 인피니밴드" +- +-#~ msgid "InfiniBand Networks (%s)" +-#~ msgstr "인피니밴드 네트워크(%s)" +- +-#~ msgid "InfiniBand Network (%s)" +-#~ msgstr "인피니밴드 네트워크(%s)" +- +-#~ msgid "InfiniBand Networks" +-#~ msgstr "인피니밴드 네트워크" +- +-#~ msgid "InfiniBand Network" +-#~ msgstr "인피니밴드 네트워크" +- +-#~ msgid "You are now connected to the InfiniBand network." +-#~ msgstr "인피니밴드 네트워크에 연결되었습니다." +- +-#~ msgid "Preparing InfiniBand connection '%s'..." +-#~ msgstr "인피니밴드 연결 '%s' 준비 중..." +- +-#~ msgid "Configuring InfiniBand connection '%s'..." +-#~ msgstr "인피니밴드 연결 '%s' 설정 중..." +- +-#~ msgid "User authentication required for InfiniBand connection '%s'..." +-#~ msgstr "인피니밴드 연결 '%s'에는 사용자 인증이 필요합니다..." +- +-#~ msgid "InfiniBand connection '%s' active" +-#~ msgstr "인피니밴드 연결 '%s' 사용 중" +- +-#~ msgid "You are now connected to the teamed network." +-#~ msgstr "팀 네트워크에 연결되었습니다." +- +-#~ msgid "Preparing team connection '%s'..." +-#~ msgstr "팀 연결 '%s' 준비 중..." +- +-#~ msgid "Configuring team connection '%s'..." +-#~ msgstr "팀 연결 '%s' 설정 중..." +- +-#~ msgid "User authentication required for team connection '%s'..." +-#~ msgstr "팀 연결 '%s'에는 사용자 인증이 필요합니다..." +- +-#~ msgid "Team connection '%s' active" +-#~ msgstr "팀 연결 '%s' 사용 중" +- +-#~ msgid "You are now connected to the VLAN." +-#~ msgstr "VLAN에 연결되었습니다." +- +-#~ msgid "Preparing VLAN connection '%s'..." +-#~ msgstr "VLAN 연결 '%s' 준비 중..." +- +-#~ msgid "Configuring VLAN connection '%s'..." +-#~ msgstr "VLAN '%s' 설정 중..." +- +-#~ msgid "User authentication required for VLAN connection '%s'..." +-#~ msgstr "VLAN 연결 '%s'에는 사용자 인증이 필요합니다..." +- +-#~ msgid "VLAN connection '%s' active" +-#~ msgstr "VLAN 연결 '%s' 사용 중" +- +-#~ msgid "WiMAX Mobile Broadband (%s)" +-#~ msgstr "와이맥스 모바일 광대역(%s)" +- +-#~ msgid "WiMAX Mobile Broadband" +-#~ msgstr "와이맥스 모바일 광대역" +- +-#~ msgid "WiMAX is disabled" +-#~ msgstr "와이맥스를 사용하지 않습니다" +- +-#~ msgid "WiMAX is disabled by hardware switch" +-#~ msgstr "와이맥스가 하드웨어 스위치를 통해 사용하지 않습니다" +- +-#~ msgid "You are now connected to the WiMAX network." +-#~ msgstr "와이맥스 네트워크에 연결되었습니다." +- +-#~ msgid "%d dB" +-#~ msgstr "%d dB" +- +-#~ msgctxt "WiMAX CINR" +-#~ msgid "unknown" +-#~ msgstr "알 수 없음" +- +-#~ msgctxt "WiMAX Base Station ID" +-#~ msgid "unknown" +-#~ msgstr "알 수 없음" +- +-#~ msgid "WiMAX (%s)" +-#~ msgstr "WiMAX (%s)" +- +-#~ msgid "CINR:" +-#~ msgstr "CINR:" +- +-#~ msgid "BSID:" +-#~ msgstr "BSID:" +- +-#~ msgid "_Device MAC address:" +-#~ msgstr "장치 MAC 주소(_D):" +- +-#~ msgid "Any" +-#~ msgstr "모두" +- +-#~ msgid "3G (UMTS/HSPA)" +-#~ msgstr "3G(UMTS/HSPA)" +- +-#~ msgid "2G (GPRS/EDGE)" +-#~ msgstr "2G(GPRS/EDGE)" +- +-#~ msgid "Prefer 3G (UMTS/HSPA)" +-#~ msgstr "3G 선호(UMTS/HSPA)" +- +-#~ msgid "Prefer 2G (GPRS/EDGE)" +-#~ msgstr "2G 선호(GPRS/EDGE)" +- +-#~ msgid "Prefer 4G (LTE)" +-#~ msgstr "4G 선호(LTE)" +- +-#~ msgid "Use only 4G (LTE)" +-#~ msgstr "4G만 사용(LTE)" +- +-#~ msgid "I_mport team configuration from a file..." +-#~ msgstr "파일에서 팀 설정 가져오기(_M)..." +- +-#~ msgid "Infrastructure" +-#~ msgstr "인프라스트럭처" +- +-#~ msgid "WiMAX" +-#~ msgstr "와이맥스" +- +-#~ msgid "Error saving connection" +-#~ msgstr "연결을 저장하는데 오류" +- +-#~ msgid "The property '%s' / '%s' is invalid: %d" +-#~ msgstr "속성 '%s' / '%s' 잘못됨: %d" +- +-#~ msgid "Automatic (PPP)" +-#~ msgstr "자동(PPP)" +- +-#~ msgid "Automatic (PPP) addresses only" +-#~ msgstr "주소만 자동(PPP)" +- +-#~ msgid "Could not load WiMAX user interface." +-#~ msgstr "와이맥스 사용자 인터페이스를 읽어들일 수 없습니다." +- +-#~ msgid "WiMAX connection %d" +-#~ msgstr "와이맥스 연결 %d" +- +-#~ msgid "" +-#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) " +-#~ "%s)." +-#~ msgstr "블루투스 설정이 불가능합니다. (D-Bus에 연결 실패: (%s) %s)" +- +-#~ msgid "" +-#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) " +-#~ "%s)." +-#~ msgstr "" +-#~ "블루투스 설정이 불가능합니다. (네트워크 관리를 찾을 수 없습니다: (%s) %s)" +- +-#~ msgid "Use your mobile phone as a network device (PAN/NAP)" +-#~ msgstr "휴대 전화를 네트워크 장치로 사용(PAN/NAP)" +- +-#~ msgid "Access the Internet using your mobile phone (DUN)" +-#~ msgstr "휴대 전화를 사용해 인터넷에 연결(DUN)" +- +-#~ msgid "Error: %s" +-#~ msgstr "오류: %s" +- +-#~ msgid "Failed to create DUN connection: %s" +-#~ msgstr "DUN 연결을 만들 수 없습니다: %s" +- +-#~ msgid "Your phone is now ready to use!" +-#~ msgstr "휴대전화를 사용할 수 있습니다!" +- +-#~ msgid "Mobile wizard was canceled" +-#~ msgstr "모바일 마법사가 취소되었습니다" +- +-#~ msgid "Unknown phone device type (not GSM or CDMA)" +-#~ msgstr "알려지지 않은 휴대전화 유형(GSM이나 CDMA가 아님)" +- +-#~ msgid "unknown modem type." +-#~ msgstr "알 수 없는 모뎀 종류." +- +-#~ msgid "failed to connect to the phone." +-#~ msgstr "휴대전화에 연결하는 데 실패했습니다." +- +-#~ msgid "error getting bus connection" +-#~ msgstr "버스 연결을 가져오는데 오류" +- +-#~ msgid "unexpectedly disconnected from the phone." +-#~ msgstr "휴대전화 연결이 예기치 못하게 끊어졌습니다." +- +-#~ msgid "timed out detecting phone details." +-#~ msgstr "휴대전화 상세 정보를 감지하는 시간이 초과되었습니다." +- +-#~ msgid "Detecting phone configuration..." +-#~ msgstr "휴대전화 설정을 감지하는 중..." +- +-#~ msgid "" +-#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-" +-#~ "Networking connection." +-#~ msgstr "" +-#~ "기본 블루투스 어댑터에 전화접속 네트워크 연결을 설정하려면 사용 가능하도" +-#~ "록 설정해야 합니다." +- +-#~ msgid "Failed to create PAN connection: %s" +-#~ msgstr "PAN 연결을 만들 수 없습니다: %s" +- +-#~ msgid "%s Network" +-#~ msgstr "%s 네트워크" +- +-#~ msgid "Primary DNS:" +-#~ msgstr "기본 DNS:" +- +-#~ msgid "Secondary DNS:" +-#~ msgstr "보조 DNS:" +- +-#~ msgid "Ternary DNS:" +-#~ msgstr "세 번째 DNS:" +- +-#~ msgid "_Save..." +-#~ msgstr "저장(_S)..." +- +-#~ msgid "_Edit..." +-#~ msgstr "편집(_E)..." +- +-#~ msgid "_Delete..." +-#~ msgstr "삭제(_D)..." +diff --git a/po/pt_BR.po b/po/pt_BR.po +index 98771c6..0e6666d 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -17,24 +17,24 @@ + # Enrico Nicoletto , 2013, 2014. + # Felipe Braga , 2015. + # Rafael Fontenelle , 2013, 2014, 2015, 2016, 2017. ++# lrintel , 2017. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: network-nanager-applet\n" +-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=Networ" +-"kManager&keywords=I18N+L10N&component=nm-applet\n" +-"POT-Creation-Date: 2017-06-18 09:33+0000\n" +-"PO-Revision-Date: 2017-06-25 12:54-0200\n" +-"Last-Translator: Rafael Fontenelle \n" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2017-11-07 19:40+0100\n" ++"PO-Revision-Date: 2017-11-07 06:45+0000\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: Brazilian Portuguese \n" + "Language: pt_BR\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: Virtaal 1.0.0-beta1\n" ++"X-Generator: Zanata 4.3.2\n" + "X-Project-Style: gnome\n" + +-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3181 ++#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191 + msgid "Network" + msgstr "Rede" + +@@ -43,7 +43,7 @@ msgid "Manage your network connections" + msgstr "Controle suas conexões de rede" + + #: ../nm-connection-editor.desktop.in.h:1 +-#: ../src/connection-editor/nm-connection-editor.ui.h:1 ++#: ../src/connection-editor/nm-connection-list.ui.h:1 + msgid "Network Connections" + msgstr "Conexões de rede" + +@@ -174,17 +174,17 @@ msgstr "" + msgid "The NetworkManager Developers" + msgstr "Os desenvolvedores do NetworkManager" + +-#: ../shared/nm-utils/nm-shared-utils.c:185 ++#: ../shared/nm-utils/nm-shared-utils.c:477 + #, c-format + msgid "object class '%s' has no property named '%s'" + msgstr "a classe de objeto “%s” não possui uma propriedade chamada “%s”" + +-#: ../shared/nm-utils/nm-shared-utils.c:192 ++#: ../shared/nm-utils/nm-shared-utils.c:484 + #, c-format + msgid "property '%s' of object class '%s' is not writable" + msgstr "a propriedade “%s” da classe de objeto “%s” não é gravável" + +-#: ../shared/nm-utils/nm-shared-utils.c:199 ++#: ../shared/nm-utils/nm-shared-utils.c:491 + #, c-format + msgid "" + "construct property \"%s\" for object '%s' can't be set after construction" +@@ -192,20 +192,20 @@ msgstr "" + "a propriedade de construtor “%s” para objeto “%s” não pode ser definido após " + "construção" + +-#: ../shared/nm-utils/nm-shared-utils.c:207 ++#: ../shared/nm-utils/nm-shared-utils.c:499 + #, c-format + msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" + msgstr "" + "“%s:%s” não é um nome de propriedade válida; “%s” não é um subtipo de GObject" + +-#: ../shared/nm-utils/nm-shared-utils.c:216 ++#: ../shared/nm-utils/nm-shared-utils.c:508 + #, c-format + msgid "unable to set property '%s' of type '%s' from value of type '%s'" + msgstr "" + "não foi possível definir a propriedade “%s” de tipo “%s” a partir do valor " + "de tipo “%s”" + +-#: ../shared/nm-utils/nm-shared-utils.c:227 ++#: ../shared/nm-utils/nm-shared-utils.c:519 + #, c-format + msgid "" + "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " +@@ -214,22 +214,35 @@ msgstr "" + "o valor “%s” de tipo “%s” é inválido ou fora do intervalo da propriedade " + "“%s” de tipo “%s”" + +-#. *************************************************************************** + #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99 + msgid "802.1X authentication" + msgstr "Autenticação 802.1x" + +-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1 ++#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349 ++#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1 + #: ../src/connection-editor/ce-ip6-routes.ui.h:1 + #: ../src/connection-editor/ce-new-connection.ui.h:1 + #: ../src/connection-editor/ce-page-dcb.ui.h:17 + #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1 +-#: ../src/connection-editor/nm-connection-editor.ui.h:8 +-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1 ++#: ../src/connection-editor/connection-helpers.c:308 ++#: ../src/connection-editor/connection-helpers.c:771 ++#: ../src/connection-editor/nm-connection-editor.ui.h:5 ++#: ../src/connection-editor/page-bluetooth.c:311 ++#: ../src/connection-editor/page-mobile.c:543 ++#: ../src/connection-editor/page-proxy.c:121 ++#: ../src/connection-editor/page-team.c:344 ++#: ../src/connection-editor/page-team-port.c:206 ++#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1 ++#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1 ++#: ../src/libnma/nma-vpn-password-dialog.c:209 ++#: ../src/libnma/nma-wifi-dialog.c:1066 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209 ++#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465 + msgid "_Cancel" + msgstr "_Cancelar" + +-#: ../src/8021x.ui.h:3 ++#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072 ++#: ../src/libnm-gtk/nm-wifi-dialog.c:1073 + msgid "C_onnect" + msgstr "C_onectado" + +@@ -245,37 +258,37 @@ msgstr "ad-hoc" + msgid "secure." + msgstr "seguro." + +-#: ../src/applet.c:387 ++#: ../src/applet.c:392 + msgid "Failed to add/activate connection" + msgstr "Falha ao adicionar/ativar conexão" + +-#: ../src/applet.c:389 ../src/applet.c:443 ../src/applet.c:478 +-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410 ++#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483 ++#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411 + msgid "Unknown error" + msgstr "Erro desconhecido" + +-#: ../src/applet.c:392 ../src/applet.c:481 ../src/applet-device-wifi.c:539 +-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413 ++#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539 ++#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414 + msgid "Connection failure" + msgstr "Falha de conexão" + +-#: ../src/applet.c:441 ++#: ../src/applet.c:446 + msgid "Device disconnect failed" + msgstr "Desconexão de dispositivo falhou" + +-#: ../src/applet.c:446 ++#: ../src/applet.c:451 + msgid "Disconnect failure" + msgstr "Falha ao desconectar" + +-#: ../src/applet.c:476 ++#: ../src/applet.c:481 + msgid "Connection activation failed" + msgstr "Ativação da conexão falhou" + +-#: ../src/applet.c:799 ../src/applet-device-wifi.c:1126 ++#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127 + msgid "Don’t show this message again" + msgstr "Não mostrar esta mensagem novamente" + +-#: ../src/applet.c:889 ++#: ../src/applet.c:899 + #, c-format + msgid "" + "\n" +@@ -285,7 +298,7 @@ msgstr "" + "\n" + "A conexão VPN “%s” desconectou porque a conexão de rede foi interrompida." + +-#: ../src/applet.c:891 ++#: ../src/applet.c:901 + #, c-format + msgid "" + "\n" +@@ -295,7 +308,7 @@ msgstr "" + "\n" + "A conexão VPN “%s” falhou porque a conexão de rede foi interrompida." + +-#: ../src/applet.c:893 ++#: ../src/applet.c:903 + #, c-format + msgid "" + "\n" +@@ -304,7 +317,7 @@ msgstr "" + "\n" + "A conexão VPN “%s” falhou porque o serviço de VPN parou inesperadamente." + +-#: ../src/applet.c:895 ++#: ../src/applet.c:905 + #, c-format + msgid "" + "\n" +@@ -315,7 +328,7 @@ msgstr "" + "A conexão VPN “%s” falhou porque o serviço VPN retornou uma configuração " + "inválida." + +-#: ../src/applet.c:897 ++#: ../src/applet.c:907 + #, c-format + msgid "" + "\n" +@@ -324,7 +337,7 @@ msgstr "" + "\n" + "A conexão VPN “%s” falhou porque esgotou o tempo de tentativas de conexão." + +-#: ../src/applet.c:899 ++#: ../src/applet.c:909 + #, c-format + msgid "" + "\n" +@@ -333,7 +346,7 @@ msgstr "" + "\n" + "A conexão VPN “%s” falhou porque o serviço VPN não iniciou a tempo." + +-#: ../src/applet.c:901 ++#: ../src/applet.c:911 + #, c-format + msgid "" + "\n" +@@ -342,7 +355,7 @@ msgstr "" + "\n" + "A conexão VPN “%s” falhou porque o serviço VPN falhou ao iniciar." + +-#: ../src/applet.c:903 ++#: ../src/applet.c:913 + #, c-format + msgid "" + "\n" +@@ -351,7 +364,7 @@ msgstr "" + "\n" + "A conexão VPN “%s” falhou porque não haviam segredos VPN válidos." + +-#: ../src/applet.c:905 ++#: ../src/applet.c:915 + #, c-format + msgid "" + "\n" +@@ -360,7 +373,7 @@ msgstr "" + "\n" + "A conexão VPN “%s” falhou por causa de chaves VPN inválidas." + +-#: ../src/applet.c:910 ++#: ../src/applet.c:920 + #, c-format + msgid "" + "\n" +@@ -369,7 +382,7 @@ msgstr "" + "\n" + "A conexão VPN “%s” falhou." + +-#: ../src/applet.c:937 ++#: ../src/applet.c:947 + #, c-format + msgid "" + "VPN connection has been successfully established.\n" +@@ -380,19 +393,19 @@ msgstr "" + "\n" + "%s\n" + +-#: ../src/applet.c:939 ++#: ../src/applet.c:949 + msgid "VPN connection has been successfully established.\n" + msgstr "A conexão VPN foi estabelecida com sucesso.\n" + +-#: ../src/applet.c:941 ++#: ../src/applet.c:951 + msgid "VPN Login Message" + msgstr "Mensagem de login VPN" + +-#: ../src/applet.c:949 ../src/applet.c:989 ++#: ../src/applet.c:959 ../src/applet.c:999 + msgid "VPN Connection Failed" + msgstr "A conexão VPN falhou" + +-#: ../src/applet.c:993 ++#: ../src/applet.c:1003 + #, c-format + msgid "" + "\n" +@@ -405,7 +418,7 @@ msgstr "" + "\n" + "%s" + +-#: ../src/applet.c:996 ++#: ../src/applet.c:1006 + #, c-format + msgid "" + "\n" +@@ -418,144 +431,144 @@ msgstr "" + "\n" + "%s" + +-#: ../src/applet.c:1285 ++#: ../src/applet.c:1295 + msgid "device not ready (firmware missing)" + msgstr "dispositivo não está pronto (faltando firmware)" + +-#: ../src/applet.c:1287 ++#: ../src/applet.c:1297 + msgid "device not ready" + msgstr "dispositivo não está pronto" + + #. Notify user of unmanaged or unavailable device +-#: ../src/applet.c:1297 ../src/applet-device-ethernet.c:109 ++#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109 + msgid "disconnected" + msgstr "desconectado" + +-#: ../src/applet.c:1313 ++#: ../src/applet.c:1323 + msgid "Disconnect" + msgstr "Desconectar" + +-#: ../src/applet.c:1327 ++#: ../src/applet.c:1337 + msgid "device not managed" + msgstr "dispositivo não gerenciado" + +-#: ../src/applet.c:1400 ++#: ../src/applet.c:1410 + msgid "No network devices available" + msgstr "Nenhum dispositivo de rede disponível" + +-#: ../src/applet.c:1454 ++#: ../src/applet.c:1464 + msgid "_VPN Connections" + msgstr "Conexões _VPN" + +-#: ../src/applet.c:1498 ++#: ../src/applet.c:1508 + msgid "_Configure VPN…" + msgstr "_Configurar VPN…" + +-#: ../src/applet.c:1501 ++#: ../src/applet.c:1511 + msgid "_Add a VPN connection…" + msgstr "_Adicionar uma conexão VPN…" + +-#: ../src/applet.c:1607 ++#: ../src/applet.c:1617 + msgid "NetworkManager is not running…" + msgstr "O gerenciador de redes não está em execução…" + +-#: ../src/applet.c:1612 ../src/applet.c:2677 ++#: ../src/applet.c:1622 ../src/applet.c:2687 + msgid "Networking disabled" + msgstr "Rede desabilitada" + + #. 'Enable Networking' item +-#: ../src/applet.c:1822 ++#: ../src/applet.c:1832 + msgid "Enable _Networking" + msgstr "_Habilitar rede" + + #. 'Enable Wi-Fi' item +-#: ../src/applet.c:1831 ++#: ../src/applet.c:1841 + msgid "Enable _Wi-Fi" + msgstr "Habilitar _Wi-Fi" + + #. 'Enable Mobile Broadband' item +-#: ../src/applet.c:1840 ++#: ../src/applet.c:1850 + msgid "Enable _Mobile Broadband" + msgstr "Habilitar banda larga _móvel" + + #. Toggle notifications item +-#: ../src/applet.c:1852 ++#: ../src/applet.c:1862 + msgid "Enable N_otifications" + msgstr "Habilitar n_otificações" + + #. 'Connection Information' item +-#: ../src/applet.c:1864 ++#: ../src/applet.c:1874 + msgid "Connection _Information" + msgstr "_Informações da conexão" + + #. 'Edit Connections...' item +-#: ../src/applet.c:1872 ++#: ../src/applet.c:1882 + msgid "Edit Connections…" + msgstr "Editar conexões…" + +-#: ../src/applet.c:1886 ++#: ../src/applet.c:1896 + msgid "_About" + msgstr "_Sobre" + +-#: ../src/applet.c:2197 ++#: ../src/applet.c:2207 + #, c-format + msgid "You are now connected to “%s”." + msgstr "Você agora está conectado a “%s”." + +-#: ../src/applet.c:2237 ++#: ../src/applet.c:2247 + msgid "Disconnected" + msgstr "Desconectado" + +-#: ../src/applet.c:2238 ++#: ../src/applet.c:2248 + msgid "The network connection has been disconnected." + msgstr "A conexão de rede foi desconectada." + +-#: ../src/applet.c:2540 ++#: ../src/applet.c:2550 + #, c-format + msgid "Preparing network connection “%s”…" + msgstr "Preparando conexão de rede “%s”…" + +-#: ../src/applet.c:2543 ++#: ../src/applet.c:2553 + #, c-format + msgid "User authentication required for network connection “%s”…" + msgstr "Autenticação necessária pela conexão de rede “%s”…" + +-#: ../src/applet.c:2546 ../src/applet-device-bt.c:125 ++#: ../src/applet.c:2556 ../src/applet-device-bt.c:125 + #: ../src/mobile-helpers.c:607 + #, c-format + msgid "Requesting a network address for “%s”…" + msgstr "Requisitando um endereço de rede para “%s”…" + +-#: ../src/applet.c:2549 ++#: ../src/applet.c:2559 + #, c-format + msgid "Network connection “%s” active" + msgstr "Conexão de rede “%s” está ativa" + +-#: ../src/applet.c:2622 ++#: ../src/applet.c:2632 + #, c-format + msgid "Starting VPN connection “%s”…" + msgstr "Iniciando conexão VPN “%s”…" + +-#: ../src/applet.c:2625 ++#: ../src/applet.c:2635 + #, c-format + msgid "User authentication required for VPN connection “%s”…" + msgstr "Autenticação necessária pela conexão VPN “%s”…" + +-#: ../src/applet.c:2628 ++#: ../src/applet.c:2638 + #, c-format + msgid "Requesting a VPN address for “%s”…" + msgstr "Requisitando um endereço de rede VPN para “%s”…" + +-#: ../src/applet.c:2631 ++#: ../src/applet.c:2641 + #, c-format + msgid "VPN connection active" + msgstr "Conexão VPN ativa" + +-#: ../src/applet.c:2681 ++#: ../src/applet.c:2691 + msgid "No network connection" + msgstr "Nenhuma conexão de rede" + +-#: ../src/applet.c:3282 ++#: ../src/applet.c:3292 + msgid "NetworkManager Applet" + msgstr "Miniaplicativo gerenciador de redes" + +@@ -572,46 +585,46 @@ msgstr "Código PIN errado, por favor entre em contato com seu provedor." + msgid "Sending unlock code…" + msgstr "Enviando código do desbloqueio…" + +-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506 ++#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507 + #, c-format + msgid "Mobile Broadband (%s)" + msgstr "Banda larga móvel (%s)" + +-#: ../src/applet-device-broadband.c:738 ++#: ../src/applet-device-broadband.c:739 + #: ../src/connection-editor/connection-helpers.c:108 + #: ../src/connection-editor/page-mobile.c:308 + #: ../src/libnm-gtk/nm-ui-utils.c:329 + msgid "Mobile Broadband" + msgstr "Banda larga móvel" + +-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75 +-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906 ++#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75 ++#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907 + msgid "Available" + msgstr "Disponível" + + #. Default connection item +-#: ../src/applet-device-broadband.c:803 ++#: ../src/applet-device-broadband.c:805 + msgid "New Mobile Broadband connection…" + msgstr "Nova conexão de banda larga móvel…" + +-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87 +-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308 ++#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87 ++#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309 + msgid "Connection Established" + msgstr "Conexão estabelecida" + +-#: ../src/applet-device-broadband.c:818 ++#: ../src/applet-device-broadband.c:820 + msgid "You are now connected to the Mobile Broadband network." + msgstr "Você agora está conectado à rede de banda larga móvel." + +-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964 ++#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966 + msgid "Mobile Broadband network." + msgstr "Rede de banda larga móvel." + +-#: ../src/applet-device-broadband.c:959 ++#: ../src/applet-device-broadband.c:961 + msgid "You are now registered on the home network." + msgstr "Você agora está conectado à rede doméstica." + +-#: ../src/applet-device-broadband.c:965 ++#: ../src/applet-device-broadband.c:967 + msgid "You are now registered on a roaming network." + msgstr "Você agora está conectado em uma rede em roaming." + +@@ -694,6 +707,18 @@ msgstr "Conexão de rede ethernet “%s” ativa" + msgid "DSL authentication" + msgstr "Autenticação DSL" + ++#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060 ++#: ../src/connection-editor/ce-ip4-routes.ui.h:2 ++#: ../src/connection-editor/ce-ip6-routes.ui.h:2 ++#: ../src/connection-editor/ce-page-dcb.ui.h:18 ++#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2 ++#: ../src/connection-editor/page-bluetooth.c:313 ++#: ../src/connection-editor/page-mobile.c:545 ++#: ../src/libnma/nma-vpn-password-dialog.c:210 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466 ++msgid "_OK" ++msgstr "_OK" ++ + #: ../src/applet-device-wifi.c:225 + msgid "_Connect to Hidden Wi-Fi Network…" + msgstr "_Conectar a rede Wi-Fi oculta…" +@@ -706,7 +731,7 @@ msgstr "Criar _nova rede Wi-Fi…" + msgid "(none)" + msgstr "(nenhum)" + +-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408 ++#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409 + msgid "Failed to add new connection" + msgstr "Falha ao adicionar nova conexão" + +@@ -714,78 +739,78 @@ msgstr "Falha ao adicionar nova conexão" + msgid "Insufficient privileges." + msgstr "Privilégios insuficientes." + +-#: ../src/applet-device-wifi.c:838 ++#: ../src/applet-device-wifi.c:839 + #, c-format + msgid "Wi-Fi Networks (%s)" + msgstr "Redes Wi-Fi (%s)" + +-#: ../src/applet-device-wifi.c:840 ++#: ../src/applet-device-wifi.c:841 + #, c-format + msgid "Wi-Fi Network (%s)" + msgstr "Rede Wi-Fi (%s)" + +-#: ../src/applet-device-wifi.c:842 ++#: ../src/applet-device-wifi.c:843 + msgid "Wi-Fi Network" + msgid_plural "Wi-Fi Networks" + msgstr[0] "Rede Wi-Fi" + msgstr[1] "Rede Wi-Fi" + +-#: ../src/applet-device-wifi.c:871 ++#: ../src/applet-device-wifi.c:872 + msgid "Wi-Fi is disabled" + msgstr "Wi-Fi está desabilitado" + +-#: ../src/applet-device-wifi.c:872 ++#: ../src/applet-device-wifi.c:873 + msgid "Wi-Fi is disabled by hardware switch" + msgstr "Wi-Fi desabilitado por hardware" + +-#: ../src/applet-device-wifi.c:933 ++#: ../src/applet-device-wifi.c:934 + msgid "More networks" + msgstr "Mais redes" + +-#: ../src/applet-device-wifi.c:1122 ++#: ../src/applet-device-wifi.c:1123 + msgid "Wi-Fi Networks Available" + msgstr "Redes Wi-Fi disponíveis" + +-#: ../src/applet-device-wifi.c:1123 ++#: ../src/applet-device-wifi.c:1124 + msgid "Use the network menu to connect to a Wi-Fi network" + msgstr "Use o menu de rede para se conectar a uma rede Wi-Fi" + +-#: ../src/applet-device-wifi.c:1307 ++#: ../src/applet-device-wifi.c:1308 + #, c-format + msgid "You are now connected to the Wi-Fi network “%s”." + msgstr "Você agora está conectado à rede Wi-Fi “%s”." + +-#: ../src/applet-device-wifi.c:1342 ++#: ../src/applet-device-wifi.c:1343 + #, c-format + msgid "Preparing Wi-Fi network connection “%s”…" + msgstr "Preparando conexão de rede Wi-Fi “%s”…" + +-#: ../src/applet-device-wifi.c:1345 ++#: ../src/applet-device-wifi.c:1346 + #, c-format + msgid "Configuring Wi-Fi network connection “%s”…" + msgstr "Configurando conexão de rede Wi-Fi “%s”…" + +-#: ../src/applet-device-wifi.c:1348 ++#: ../src/applet-device-wifi.c:1349 + #, c-format + msgid "User authentication required for Wi-Fi network “%s”…" + msgstr "Autenticação necessária pela rede Wi-Fi “%s”…" + +-#: ../src/applet-device-wifi.c:1351 ++#: ../src/applet-device-wifi.c:1352 + #, c-format + msgid "Requesting a Wi-Fi network address for “%s”…" + msgstr "Requisitando um endereço de rede Wi-Fi para “%s”…" + +-#: ../src/applet-device-wifi.c:1362 ++#: ../src/applet-device-wifi.c:1363 + #, c-format + msgid "Wi-Fi network connection “%s” active: %s (%d%%)" + msgstr "Conexão de rede Wi-Fi “%s” ativa: %s (%d%%)" + +-#: ../src/applet-device-wifi.c:1366 ++#: ../src/applet-device-wifi.c:1367 + #, c-format + msgid "Wi-Fi network connection “%s” active" + msgstr "Conexão de rede Wi-Fi “%s” ativa" + +-#: ../src/applet-device-wifi.c:1385 ++#: ../src/applet-device-wifi.c:1386 + msgid "Failed to activate connection" + msgstr "Falha ao ativar conexão" + +@@ -793,195 +818,196 @@ msgstr "Falha ao ativar conexão" + msgid "Error displaying connection information:" + msgstr "Erro ao exibir informações de conexão:" + +-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:381 ++#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381 + #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948 + #: ../src/wireless-security/wireless-security.c:448 + msgid "LEAP" + msgstr "LEAP" + +-#: ../src/applet-dialogs.c:74 ++#: ../src/applet-dialogs.c:75 + msgid "Dynamic WEP" + msgstr "WEP Dinâmico" + +-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228 +-#: ../src/applet-dialogs.c:230 ++#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229 ++#: ../src/applet-dialogs.c:231 + msgid "WPA/WPA2" + msgstr "WPA/WPA2" + + #. Create the expander +-#: ../src/applet-dialogs.c:151 ++#: ../src/applet-dialogs.c:152 + msgid "More addresses" + msgstr "Mais endereços" + +-#: ../src/applet-dialogs.c:226 ++#: ../src/applet-dialogs.c:227 + msgid "WEP" + msgstr "WEP" + +-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243 ++#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244 + #: ../src/connection-editor/page-wifi-security.c:332 + msgctxt "Wi-Fi/Ethernet security" + msgid "None" + msgstr "Nenhuma" + +-#: ../src/applet-dialogs.c:260 ++#: ../src/applet-dialogs.c:261 + #, c-format + msgid "%s (default)" + msgstr "%s (padrão)" + +-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580 ++#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581 + #, c-format + msgid "%u Mb/s" + msgstr "%u Mb/s" + +-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582 ++#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583 + msgctxt "Speed" + msgid "Unknown" + msgstr "Desconhecido" + + #. Address +-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368 ++#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369 + msgctxt "Address" + msgid "Unknown" + msgstr "Desconhecido" + +-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420 ++#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421 + msgid "IP Address:" + msgstr "Endereço IP:" + +-#: ../src/applet-dialogs.c:369 ++#: ../src/applet-dialogs.c:370 + msgid "Broadcast Address:" + msgstr "Endereço de broadcast:" + + #. Prefix +-#: ../src/applet-dialogs.c:381 ++#: ../src/applet-dialogs.c:382 + msgctxt "Subnet Mask" + msgid "Unknown" + msgstr "Desconhecido" + +-#: ../src/applet-dialogs.c:382 ++#: ../src/applet-dialogs.c:383 + msgid "Subnet Mask:" + msgstr "Máscara de sub-rede:" + +-#: ../src/applet-dialogs.c:492 ++#: ../src/applet-dialogs.c:493 + #, c-format + msgid "Ethernet (%s)" + msgstr "Ethernet (%s)" + +-#: ../src/applet-dialogs.c:495 ++#: ../src/applet-dialogs.c:496 + #, c-format + msgid "802.11 WiFi (%s)" + msgstr "802.11 Wi-Fi (%s)" + +-#: ../src/applet-dialogs.c:502 ++#: ../src/applet-dialogs.c:503 + #, c-format + msgid "GSM (%s)" + msgstr "GSM (%s)" + +-#: ../src/applet-dialogs.c:504 ++#: ../src/applet-dialogs.c:505 + #, c-format + msgid "CDMA (%s)" + msgstr "CDMA (%s)" + + #. --- General --- +-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810 ++#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811 + #: ../src/connection-editor/ce-page-team-port.ui.h:23 + #: ../src/connection-editor/ce-page-team.ui.h:48 + #: ../src/connection-editor/page-general.c:367 + msgid "General" + msgstr "Geral" + +-#: ../src/applet-dialogs.c:516 ++#: ../src/applet-dialogs.c:517 + msgid "Interface:" + msgstr "Interface:" + +-#: ../src/applet-dialogs.c:536 ++#: ../src/applet-dialogs.c:537 + msgid "Hardware Address:" + msgstr "Endereço de hardware:" + + #. Driver +-#: ../src/applet-dialogs.c:550 ++#: ../src/applet-dialogs.c:551 + msgid "Driver:" + msgstr "Driver:" + +-#: ../src/applet-dialogs.c:585 ++#: ../src/applet-dialogs.c:586 + msgid "Speed:" + msgstr "Velocidade:" + +-#: ../src/applet-dialogs.c:600 ++#: ../src/applet-dialogs.c:601 + msgid "Security:" + msgstr "Segurança:" + + #. --- IPv4 --- +-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851 ++#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852 + #: ../src/connection-editor/ce-page-team.ui.h:29 + msgid "IPv4" + msgstr "IPv4" + +-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689 ++#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690 + msgid "Default Route:" + msgstr "Rota padrão:" + + #. --- IPv6 --- +-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873 ++#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874 + #: ../src/connection-editor/ce-page-team.ui.h:30 + msgid "IPv6" + msgstr "IPv6" + +-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882 ++#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883 + msgid "Ignored" + msgstr "Ignorado" + +-#: ../src/applet-dialogs.c:815 ++#: ../src/applet-dialogs.c:816 + msgid "VPN Type:" + msgstr "Tipo de VPN:" + +-#: ../src/applet-dialogs.c:822 ++#: ../src/applet-dialogs.c:823 + msgid "VPN Gateway:" + msgstr "Gateway de VPN:" + +-#: ../src/applet-dialogs.c:828 ++#: ../src/applet-dialogs.c:829 + msgid "VPN Username:" + msgstr "Nome de usuário de VPN:" + +-#: ../src/applet-dialogs.c:834 ++#: ../src/applet-dialogs.c:835 + msgid "VPN Banner:" + msgstr "Mensagem VPN:" + +-#: ../src/applet-dialogs.c:840 ++#: ../src/applet-dialogs.c:841 + msgid "Base Connection:" + msgstr "Conexão base:" + +-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343 ++#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343 + msgid "Unknown" + msgstr "Desconhecido" + + #. Shouldn't really happen but ... +-#: ../src/applet-dialogs.c:957 ++#: ../src/applet-dialogs.c:958 + msgid "No valid active connections found!" + msgstr "Nenhuma conexão ativa e válida localizada!" + +-#: ../src/applet-dialogs.c:985 ++#: ../src/applet-dialogs.c:1007 + msgid "" +-"Copyright © 2004-2014 Red Hat, Inc.\n" ++"Copyright © 2004-2017 Red Hat, Inc.\n" + "Copyright © 2005-2008 Novell, Inc.\n" + "and many other community contributors and translators" + msgstr "" +-"Copyright © 2004-2014 Red Hat, Inc.\n" +-"Copyright © 2005-2008 Novell, Inc.\n" +-"e muitos outros contribuidores da comunidade e tradutores" + +-#: ../src/applet-dialogs.c:988 ++#: ../src/applet-dialogs.c:1010 + msgid "" + "Notification area applet for managing your network devices and connections." + msgstr "" + "Miniaplicativo de área de notificação para gerenciamento dos seus " + "dispositivos de rede e conexões." + +-#: ../src/applet-dialogs.c:990 ++#: ../src/applet-dialogs.c:1012 + msgid "NetworkManager Website" + msgstr "Site do Gerenciador de redes" + +-#: ../src/applet-dialogs.c:1001 ++#: ../src/applet-dialogs.c:1016 ++msgid "translator-credits" ++msgstr "" ++ ++#: ../src/applet-dialogs.c:1026 + msgid "" + "The NetworkManager Applet could not find some required resources (the .ui " + "file was not found)." +@@ -989,33 +1015,33 @@ msgstr "" + "Não foi possível ao miniaplicativo Gerenciador de redes localizar alguns " + "recursos necessários (o arquivo .ui não foi encontrado)." + +-#: ../src/applet-dialogs.c:1006 ++#: ../src/applet-dialogs.c:1031 + msgid "Missing resources" + msgstr "Recursos em falta" + +-#: ../src/applet-dialogs.c:1031 ++#: ../src/applet-dialogs.c:1057 + msgid "Mobile broadband network password" + msgstr "Senha de rede de banda larga móvel" + +-#: ../src/applet-dialogs.c:1040 ++#: ../src/applet-dialogs.c:1066 + #, c-format + msgid "A password is required to connect to “%s”." + msgstr "Uma senha é necessária para conectar-se a “%s”." + +-#: ../src/applet-dialogs.c:1055 ++#: ../src/applet-dialogs.c:1081 + msgid "Password:" + msgstr "Senha:" + +-#: ../src/applet-dialogs.c:1337 ++#: ../src/applet-dialogs.c:1363 + msgid "SIM PIN unlock required" + msgstr "É necessário informar o código SIM PIN do desbloqueio" + +-#: ../src/applet-dialogs.c:1338 ++#: ../src/applet-dialogs.c:1364 + msgid "SIM PIN Unlock Required" + msgstr "É necessário informar o código SIM PIN do Desbloqueio" + + #. FIXME: some warning about # of times you can enter incorrect PIN +-#: ../src/applet-dialogs.c:1340 ++#: ../src/applet-dialogs.c:1366 + #, c-format + msgid "" + "The mobile broadband device “%s” requires a SIM PIN code before it can be " +@@ -1025,25 +1051,25 @@ msgstr "" + "ele possa ser usado." + + #. Translators: PIN code entry label +-#: ../src/applet-dialogs.c:1342 ++#: ../src/applet-dialogs.c:1368 + msgid "PIN code:" + msgstr "Código PIN:" + + #. Translators: Show/obscure PIN checkbox label +-#: ../src/applet-dialogs.c:1346 ++#: ../src/applet-dialogs.c:1372 + msgid "Show PIN code" + msgstr "Exibir código PIN" + +-#: ../src/applet-dialogs.c:1348 ++#: ../src/applet-dialogs.c:1374 + msgid "SIM PUK unlock required" + msgstr "É necessário informar o código SIM PUK de desbloqueio" + +-#: ../src/applet-dialogs.c:1349 ++#: ../src/applet-dialogs.c:1375 + msgid "SIM PUK Unlock Required" + msgstr "É necessário informar o código SIM PUK de Desbloqueio" + + #. FIXME: some warning about # of times you can enter incorrect PUK +-#: ../src/applet-dialogs.c:1351 ++#: ../src/applet-dialogs.c:1377 + #, c-format + msgid "" + "The mobile broadband device “%s” requires a SIM PUK code before it can be " +@@ -1053,32 +1079,25 @@ msgstr "" + "possa ser usado." + + #. Translators: PUK code entry label +-#: ../src/applet-dialogs.c:1353 ++#: ../src/applet-dialogs.c:1379 + msgid "PUK code:" + msgstr "Código PUK:" + + #. Translators: New PIN entry label +-#: ../src/applet-dialogs.c:1356 ++#: ../src/applet-dialogs.c:1382 + msgid "New PIN code:" + msgstr "Novo código PIN:" + + #. Translators: New PIN verification entry label +-#: ../src/applet-dialogs.c:1358 ++#: ../src/applet-dialogs.c:1384 + msgid "Re-enter new PIN code:" + msgstr "Re-inserir o novo código PIN:" + + #. Translators: Show/obscure PIN/PUK checkbox label +-#: ../src/applet-dialogs.c:1363 ++#: ../src/applet-dialogs.c:1389 + msgid "Show PIN/PUK codes" + msgstr "Mostrar códigos PIN/PUK" + +-#: ../src/connection-editor/ce-ip4-routes.ui.h:2 +-#: ../src/connection-editor/ce-ip6-routes.ui.h:2 +-#: ../src/connection-editor/ce-page-dcb.ui.h:18 +-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2 +-msgid "_OK" +-msgstr "_OK" +- + #: ../src/connection-editor/ce-ip4-routes.ui.h:3 + #: ../src/connection-editor/ce-ip6-routes.ui.h:3 + #: ../src/connection-editor/ce-page.h:114 +@@ -1094,21 +1113,21 @@ msgstr "" + #: ../src/connection-editor/ce-page-bond.ui.h:12 + #: ../src/connection-editor/ce-page-bridge.ui.h:2 + #: ../src/connection-editor/ce-page-ip4.ui.h:7 +-#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++#: ../src/connection-editor/ce-page-ip6.ui.h:12 + #: ../src/connection-editor/ce-page-team.ui.h:13 +-#: ../src/connection-editor/nm-connection-editor.ui.h:3 ++#: ../src/connection-editor/nm-connection-list.ui.h:3 + msgid "_Add" + msgstr "_Adicionar" + +-#. Delete + #: ../src/connection-editor/ce-ip4-routes.ui.h:5 + #: ../src/connection-editor/ce-ip6-routes.ui.h:5 + #: ../src/connection-editor/ce-page-bond.ui.h:14 + #: ../src/connection-editor/ce-page-bridge.ui.h:4 + #: ../src/connection-editor/ce-page-ip4.ui.h:8 +-#: ../src/connection-editor/ce-page-ip6.ui.h:11 ++#: ../src/connection-editor/ce-page-ip6.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:15 +-#: ../src/connection-editor/nm-connection-list.c:711 ++#: ../src/connection-editor/connection-helpers.c:772 ++#: ../src/connection-editor/nm-connection-list.ui.h:4 + msgid "_Delete" + msgstr "E_xcluir" + +@@ -1199,11 +1218,10 @@ msgstr "_Conexões agregadas:" + msgid "M_ode:" + msgstr "M_odo:" + +-#. Edit + #: ../src/connection-editor/ce-page-bond.ui.h:13 + #: ../src/connection-editor/ce-page-bridge.ui.h:3 + #: ../src/connection-editor/ce-page-team.ui.h:14 +-#: ../src/connection-editor/nm-connection-list.c:695 ++#: ../src/connection-editor/nm-connection-list.ui.h:5 + msgid "_Edit" + msgstr "_Editar" + +@@ -1259,7 +1277,7 @@ msgstr "" + + #: ../src/connection-editor/ce-page-bond.ui.h:25 + #: ../src/connection-editor/ce-page-ethernet.ui.h:17 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:4 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:8 + #: ../src/connection-editor/ce-page-team.ui.h:17 + #: ../src/connection-editor/ce-page-vlan.ui.h:4 + #: ../src/connection-editor/ce-page-wifi.ui.h:8 +@@ -1268,7 +1286,7 @@ msgstr "_MTU:" + + #: ../src/connection-editor/ce-page-bond.ui.h:26 + #: ../src/connection-editor/ce-page-ethernet.ui.h:18 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:3 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:7 + #: ../src/connection-editor/ce-page-team.ui.h:18 + #: ../src/connection-editor/ce-page-vlan.ui.h:5 + #: ../src/connection-editor/ce-page-wifi.ui.h:7 +@@ -1302,25 +1320,71 @@ msgid "_Hello time:" + msgstr "Tempo de saudação (_hello):" + + #: ../src/connection-editor/ce-page-bridge.ui.h:9 ++msgid "STP forwarding delay, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:10 + msgid "s" + msgstr "s" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:10 ++#: ../src/connection-editor/ce-page-bridge.ui.h:11 ++msgid "STP hello time, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:12 + msgid "Enable I_GMP snooping" + msgstr "Habilitar I_GMP snooping" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:11 ++#: ../src/connection-editor/ce-page-bridge.ui.h:13 ++msgid "" ++"Controls whether IGMP snooping is enabled for this bridge. Note that if " ++"snooping was automatically disabled due to hash collisions, the system may " ++"refuse to enable the feature until the collisions are resolved." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:14 + msgid "Enable _STP (Spanning Tree Protocol)" + msgstr "Habilitar _STP (Spanning Tree Protocol)" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:12 ++#: ../src/connection-editor/ce-page-bridge.ui.h:15 ++msgid "" ++"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:16 ++msgid "" ++"STP priority for this bridge. Lower values are “better”; the lowest priority " ++"bridge will be elected the root bridge." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:17 + msgid "_Max age:" + msgstr "Tempo _máximo de expiração:" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:13 ++#: ../src/connection-editor/ce-page-bridge.ui.h:18 ++msgid "STP maximum message age, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:19 + msgid "_Aging time:" + msgstr "Tempo de _vencimento:" + ++#: ../src/connection-editor/ce-page-bridge.ui.h:20 ++msgid "The Ethernet MAC address aging time, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:21 ++msgid "Group _forward mask:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:22 ++msgid "" ++"A mask of 16 bits, each corresponding to a group address in the range from " ++"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask " ++"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause " ++"frames and LACP." ++msgstr "" ++ + #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112 + msgid "automatic" + msgstr "automático" +@@ -1582,10 +1646,20 @@ msgid "_Username:" + msgstr "Nome de _usuário:" + + #: ../src/connection-editor/ce-page-dsl.ui.h:2 ++msgid "Username used to authenticate with the PPPoE service." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:3 ++msgid "" ++"Only initiate sessions with access concentrators that provide the specified " ++"service. For most providers this should be left blank." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:4 + msgid "_Service:" + msgstr "_Serviço:" + +-#: ../src/connection-editor/ce-page-dsl.ui.h:3 ++#: ../src/connection-editor/ce-page-dsl.ui.h:5 + #: ../src/wireless-security/eap-method-leap.ui.h:3 + #: ../src/wireless-security/eap-method-simple.ui.h:3 + #: ../src/wireless-security/ws-leap.ui.h:3 +@@ -1593,7 +1667,11 @@ msgstr "_Serviço:" + msgid "Sho_w password" + msgstr "_Mostrar senha" + +-#: ../src/connection-editor/ce-page-dsl.ui.h:4 ++#: ../src/connection-editor/ce-page-dsl.ui.h:6 ++msgid "Password used to authenticate with the PPPoE service." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:7 + #: ../src/connection-editor/ce-page-mobile.ui.h:4 + #: ../src/libnma/nma-vpn-password-dialog.c:97 + #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97 +@@ -1604,13 +1682,29 @@ msgstr "_Mostrar senha" + msgid "_Password:" + msgstr "Se_nha:" + ++#: ../src/connection-editor/ce-page-dsl.ui.h:8 ++msgid "PPP _interface:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:9 ++msgid "P_arent interface:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:10 ++msgid "An arbitrary name to assign to the newly created PPP interface." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:11 ++msgid "The interface on which the PPP connection will be established." ++msgstr "" ++ + #: ../src/connection-editor/ce-page-ethernet.ui.h:1 + #: ../src/connection-editor/ce-page-ip4.ui.h:1 + #: ../src/connection-editor/ce-page-ip6.ui.h:1 +-#: ../src/connection-editor/ce-page-proxy.ui.h:3 ++#: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-wifi.ui.h:1 + #: ../src/connection-editor/page-ip4.c:131 +-#: ../src/connection-editor/page-ip6.c:136 ++#: ../src/connection-editor/page-ip6.c:142 + #: ../src/wireless-security/eap-method-peap.ui.h:1 + msgid "Automatic" + msgstr "Automático" +@@ -1656,7 +1750,7 @@ msgid "Full" + msgstr "Full" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:12 +-#: ../src/connection-editor/page-ip6.c:149 ++#: ../src/connection-editor/page-ip6.c:155 + msgid "Ignore" + msgstr "Ignorar" + +@@ -1664,7 +1758,7 @@ msgstr "Ignorar" + #: ../src/connection-editor/ce-page-ip4.ui.h:3 + #: ../src/connection-editor/ce-page-ip6.ui.h:3 + #: ../src/connection-editor/page-ip4.c:168 +-#: ../src/connection-editor/page-ip6.c:185 ++#: ../src/connection-editor/page-ip6.c:191 + msgid "Manual" + msgstr "Manual" + +@@ -1673,7 +1767,7 @@ msgid "_Port:" + msgstr "_Porta:" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:15 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:2 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:6 + #: ../src/connection-editor/ce-page-wifi.ui.h:9 + msgid "_Device:" + msgstr "_Dispositivo:" +@@ -1841,20 +1935,20 @@ msgstr "Endereços" + msgid "Address (optional)" + msgstr "Endereço (opcional)" + +-#: ../src/connection-editor/ce-page-infiniband.ui.h:1 +-msgid "_Transport mode:" +-msgstr "Modo _transporte:" +- + #. IP-over-InfiniBand "datagram mode" +-#: ../src/connection-editor/ce-page-infiniband.ui.h:6 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:2 + msgid "Datagram" + msgstr "Datagrama" + + #. IP-over-InfiniBand "connected mode" +-#: ../src/connection-editor/ce-page-infiniband.ui.h:8 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:4 + msgid "Connected" + msgstr "Conectado" + ++#: ../src/connection-editor/ce-page-infiniband.ui.h:5 ++msgid "_Transport mode:" ++msgstr "Modo _transporte:" ++ + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1 + msgid "IPIP" + msgstr "IPIP" +@@ -1893,38 +1987,38 @@ msgstr "VTI6" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10 + #: ../src/connection-editor/ce-page-macsec.ui.h:6 +-msgid "Device name" +-msgstr "Nome do dispositivo" ++msgid "Device name:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11 + #: ../src/connection-editor/ce-page-macsec.ui.h:8 +-msgid "Parent device" +-msgstr "Dispositivo pai" ++msgid "Parent device:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12 + #: ../src/connection-editor/ce-page-macsec.ui.h:16 +-msgid "Mode" +-msgstr "Modo" ++msgid "Mode:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13 +-msgid "Local IP" +-msgstr "IP local" ++msgid "Local IP:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14 +-msgid "Remote IP" +-msgstr "IP remoto" ++msgid "Remote IP:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15 +-msgid "Input key" +-msgstr "Chave de entrada" ++msgid "Input key:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16 +-msgid "Output key" +-msgstr "Chave de saída" ++msgid "Output key:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17 +-msgid "MTU" +-msgstr "MTU" ++msgid "MTU:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip4.ui.h:2 + #: ../src/connection-editor/ce-page-ip6.ui.h:2 +@@ -1939,12 +2033,12 @@ msgstr "Conexão local" + #: ../src/connection-editor/ce-page-ip4.ui.h:5 + #: ../src/connection-editor/ce-page-ip6.ui.h:5 + #: ../src/connection-editor/page-ip4.c:188 +-#: ../src/connection-editor/page-ip6.c:205 ++#: ../src/connection-editor/page-ip6.c:211 + msgid "Shared to other computers" + msgstr "Compartilhado com outros computadores" + + #: ../src/connection-editor/ce-page-ip4.ui.h:6 +-#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++#: ../src/connection-editor/ce-page-ip6.ui.h:11 + msgid "_Method:" + msgstr "_Método:" + +@@ -1959,7 +2053,7 @@ msgstr "" + "identificador de cliente DHCP, digite aqui." + + #: ../src/connection-editor/ce-page-ip4.ui.h:10 +-#: ../src/connection-editor/ce-page-ip6.ui.h:12 ++#: ../src/connection-editor/ce-page-ip6.ui.h:14 + msgid "" + "Domains used when resolving host names. Use commas to separate multiple " + "domains." +@@ -1972,16 +2066,16 @@ msgid "D_HCP client ID:" + msgstr "ID do cliente D_HCP:" + + #: ../src/connection-editor/ce-page-ip4.ui.h:12 +-#: ../src/connection-editor/ce-page-ip6.ui.h:13 ++#: ../src/connection-editor/ce-page-ip6.ui.h:15 + #: ../src/connection-editor/page-ip4.c:372 +-#: ../src/connection-editor/page-ip6.c:335 ++#: ../src/connection-editor/page-ip6.c:346 + msgid "S_earch domains:" + msgstr "Pe_squisar domínios:" + + #: ../src/connection-editor/ce-page-ip4.ui.h:13 +-#: ../src/connection-editor/ce-page-ip6.ui.h:14 ++#: ../src/connection-editor/ce-page-ip6.ui.h:16 + #: ../src/connection-editor/page-ip4.c:363 +-#: ../src/connection-editor/page-ip6.c:326 ++#: ../src/connection-editor/page-ip6.c:337 + msgid "DNS ser_vers:" + msgstr "Servidores _DNS:" + +@@ -2007,7 +2101,7 @@ msgstr "" + "a configuração do Ipv4 falhar, mas a IPv6 for bem sucedida." + + #: ../src/connection-editor/ce-page-ip4.ui.h:17 +-#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++#: ../src/connection-editor/ce-page-ip6.ui.h:22 + msgid "_Routes…" + msgstr "_Rotas…" + +@@ -2025,7 +2119,15 @@ msgstr "Ativado (preferir endereço público)" + msgid "Enabled (prefer temporary address)" + msgstr "Ativado (preferir endereço temporário)" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:15 ++#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++msgid "EUI64" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++msgid "Stable privacy" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:17 + msgid "" + "IP addresses of domain name servers used to resolve host names. Use commas " + "to separate multiple domain name server addresses. Link-local addresses will " +@@ -2036,15 +2138,19 @@ msgstr "" + "de domínio. Endereços de conexões locais serão inseridas automaticamente no " + "escopo de interface de conectividade." + +-#: ../src/connection-editor/ce-page-ip6.ui.h:16 ++#: ../src/connection-editor/ce-page-ip6.ui.h:18 + msgid "IPv6 _privacy extensions:" + msgstr "Extensões de _privacidade IPv6:" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:17 ++#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++msgid "IPv6 address _generation mode:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:20 + msgid "Require IPv_6 addressing for this connection to complete" + msgstr "Requer endereçamento do IPv_6 para que esta conexão seja concluída" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:18 ++#: ../src/connection-editor/ce-page-ip6.ui.h:21 + msgid "" + "When connecting to IPv4-capable networks, allows the connection to complete " + "if IPv6 configuration fails but IPv4 configuration succeeds." +@@ -2066,7 +2172,6 @@ msgid "Check" + msgstr "Verificar" + + #: ../src/connection-editor/ce-page-macsec.ui.h:5 +-#| msgid "Metric" + msgid "Strict" + msgstr "Estrita" + +@@ -2109,37 +2214,37 @@ msgstr "" + "obtida. Para o modo EAP, preenche os parâmetros na página de segurança 802.1X" + + #: ../src/connection-editor/ce-page-macsec.ui.h:14 +-msgid "CKN" +-msgstr "CKN" ++msgid "CKN:" ++msgstr "" + + #: ../src/connection-editor/ce-page-macsec.ui.h:15 +-msgid "CAK" +-msgstr "CAK" ++msgid "CAK:" ++msgstr "" + + #: ../src/connection-editor/ce-page-macsec.ui.h:17 +-msgid "Keys" +-msgstr "Chaves" ++msgid "Keys:" ++msgstr "" + + #: ../src/connection-editor/ce-page-macsec.ui.h:18 +-msgid "Parameters" +-msgstr "Parâmetros" ++msgid "Parameters:" ++msgstr "" + + #: ../src/connection-editor/ce-page-macsec.ui.h:19 +-msgid "Encrypt" +-msgstr "Criptografar" ++msgid "Validation:" ++msgstr "" + + #: ../src/connection-editor/ce-page-macsec.ui.h:20 +-msgid "Validation" +-msgstr "Validação" ++msgid "SCI port:" ++msgstr "" + + #: ../src/connection-editor/ce-page-macsec.ui.h:21 +-msgid "SCI port" +-msgstr "Porta SCI" +- +-#: ../src/connection-editor/ce-page-macsec.ui.h:22 + msgid "Specifies the validation mode for incoming frames" + msgstr "Especifica o modo de validação para quadros recebidos" + ++#: ../src/connection-editor/ce-page-macsec.ui.h:22 ++msgid "Encrypt" ++msgstr "Criptografar" ++ + #: ../src/connection-editor/ce-page-macsec.ui.h:23 + msgid "Whether the transmitted traffic must be encrypted" + msgstr "Se o tráfego transmitido deve ser criptografado" +@@ -2236,39 +2341,39 @@ msgid "Send PPP _echo packets" + msgstr "Enviar pacotes de _eco PPP" + + #: ../src/connection-editor/ce-page-proxy.ui.h:1 +-msgid "Method:" +-msgstr "Método:" +- +-#: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-team.ui.h:25 + msgid "None" + msgstr "Nenhuma" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:4 ++#: ../src/connection-editor/ce-page-proxy.ui.h:3 + msgid "For browser only" + msgstr "Para navegador apenas" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:5 ++#: ../src/connection-editor/ce-page-proxy.ui.h:4 + msgid "Use this proxy configuration for only browser clients/schemes." + msgstr "" + "Use essa configuração de proxy para apenas navegadores clientes/esquemas." + +-#: ../src/connection-editor/ce-page-proxy.ui.h:6 ++#: ../src/connection-editor/ce-page-proxy.ui.h:5 + msgid "PAC URL:" + msgstr "PAC URL:" + ++#: ../src/connection-editor/ce-page-proxy.ui.h:6 ++msgid "PAC script:" ++msgstr "PAC script:" ++ + #: ../src/connection-editor/ce-page-proxy.ui.h:7 + msgid "URL from where the PAC script is to be obtained." + msgstr "URL por meio da qual o script PAC deve ser obtido." + + #: ../src/connection-editor/ce-page-proxy.ui.h:8 +-msgid "PAC script:" +-msgstr "PAC script:" +- +-#: ../src/connection-editor/ce-page-proxy.ui.h:9 + msgid "Import script from a file…" + msgstr "Importar script de um arquivo…" + ++#: ../src/connection-editor/ce-page-proxy.ui.h:9 ++msgid "Method:" ++msgstr "Método:" ++ + #: ../src/connection-editor/ce-page-team-port.ui.h:1 + #: ../src/connection-editor/ce-page-team.ui.h:19 + msgid "Ad_vanced…" +@@ -2316,23 +2421,14 @@ msgid "ID of queue which this port should be mapped to." + msgstr "ID da fila para a qual esta porta deve estar mapeada." + + #: ../src/connection-editor/ce-page-team-port.ui.h:10 +-msgid "_Port priority:" +-msgstr "Prioridade da _porta:" ++msgid "Active-Backup runner options" ++msgstr "Opções do executor backup-ativo" + + #: ../src/connection-editor/ce-page-team-port.ui.h:11 +-msgid "Port _sticky" +-msgstr "Porta afi_xada" ++msgid "_Port priority:" ++msgstr "Prioridade da _porta:" + + #: ../src/connection-editor/ce-page-team-port.ui.h:12 +-#: ../src/connection-editor/ce-page-team.ui.h:82 +-msgid "" +-"Validate received ARP packets on active ports. If this is not checked, all " +-"incoming ARP packets will be considered as a good reply." +-msgstr "" +-"Valida pacotes ARP recebidos em portas ativas. Se isso não estiver marcado, " +-"todos pacotes ARP recebidos serão considerados como reposta boa." +- +-#: ../src/connection-editor/ce-page-team-port.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:44 + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " +@@ -2341,24 +2437,37 @@ msgstr "" + "O valor é um número positivo em milissegundos. Especifica um intervalo entre " + "rajadas de pacotes de notificação da outra ponta." + +-#: ../src/connection-editor/ce-page-team-port.ui.h:14 ++#: ../src/connection-editor/ce-page-team-port.ui.h:13 + msgid "Port priority. The higher number means higher priority." + msgstr "" + "Prioridade da porta. O número mais alto significa uma prioridade mais alta." + ++#: ../src/connection-editor/ce-page-team-port.ui.h:14 ++msgid "Port _sticky" ++msgstr "Porta afi_xada" ++ + #: ../src/connection-editor/ce-page-team-port.ui.h:15 +-msgid "Active-Backup runner options" +-msgstr "Opções do executor backup-ativo" ++#: ../src/connection-editor/ce-page-team.ui.h:82 ++msgid "" ++"Validate received ARP packets on active ports. If this is not checked, all " ++"incoming ARP packets will be considered as a good reply." ++msgstr "" ++"Valida pacotes ARP recebidos em portas ativas. Se isso não estiver marcado, " ++"todos pacotes ARP recebidos serão considerados como reposta boa." + + #: ../src/connection-editor/ce-page-team-port.ui.h:16 ++msgid "LACP runner options" ++msgstr "Opções do executor LACP" ++ ++#: ../src/connection-editor/ce-page-team-port.ui.h:17 + msgid "_LACP port priority:" + msgstr "Prioridade de porta _LACP:" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:17 ++#: ../src/connection-editor/ce-page-team-port.ui.h:18 + msgid "LACP port _key:" + msgstr "C_have de porta LACP:" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:18 ++#: ../src/connection-editor/ce-page-team-port.ui.h:19 + #: ../src/connection-editor/ce-page-team.ui.h:43 + msgid "" + "Number of bursts of multicast group rejoin requests sent after port is " +@@ -2367,7 +2476,7 @@ msgstr "" + "Número de rajadas de requisições multicasts de reingresso em grupo enviadas " + "após porta ser habilitada ou desabilitada." + +-#: ../src/connection-editor/ce-page-team-port.ui.h:19 ++#: ../src/connection-editor/ce-page-team-port.ui.h:20 + msgid "" + "Port priority according to LACP standard. The lower number means higher " + "priority." +@@ -2375,7 +2484,7 @@ msgstr "" + "Prioridade da porta de acordo com o padrão do LACP. O número mais baixo " + "significa prioridade mais alta." + +-#: ../src/connection-editor/ce-page-team-port.ui.h:20 ++#: ../src/connection-editor/ce-page-team-port.ui.h:21 + #: ../src/connection-editor/ce-page-team.ui.h:45 + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " +@@ -2384,7 +2493,7 @@ msgstr "" + "O valor é um número positivo em milissegundos. Especifica um intervalo entre " + "rajadas de requisições multicasts de reingresso em grupo." + +-#: ../src/connection-editor/ce-page-team-port.ui.h:21 ++#: ../src/connection-editor/ce-page-team-port.ui.h:22 + msgid "" + "Port key according to LACP standard. It is only possible to aggregate ports " + "with the same key." +@@ -2392,10 +2501,6 @@ msgstr "" + "Chave de porta de acordo com o padrão do LACP. É possível agregar portas com " + "a mesma chave." + +-#: ../src/connection-editor/ce-page-team-port.ui.h:22 +-msgid "LACP runner options" +-msgstr "Opções do executor LACP" +- + #: ../src/connection-editor/ce-page-team-port.ui.h:24 + #: ../src/connection-editor/ce-page-team.ui.h:70 + msgid "_Link watcher:" +@@ -2869,6 +2974,7 @@ msgstr "Fai_xa:" + msgid "SS_ID:" + msgstr "SS_ID:" + ++#: ../src/connection-editor/ce-polkit.c:63 + #: ../src/connection-editor/ce-polkit-button.c:74 + msgid "No polkit authorization to perform the action" + msgstr "Nenhuma autorização polkit para realizar a ação" +@@ -2937,9 +3043,9 @@ msgid "Bluetooth" + msgstr "Bluetooth" + + #: ../src/connection-editor/connection-helpers.c:115 +-#: ../src/connection-editor/page-dsl.c:127 +-msgid "DSL" +-msgstr "DSL" ++#: ../src/connection-editor/page-dsl.c:201 ++msgid "DSL/PPPoE" ++msgstr "" + + #: ../src/connection-editor/connection-helpers.c:116 + #: ../src/connection-editor/page-infiniband.c:148 +@@ -2955,13 +3061,13 @@ msgstr "Agregação" + + # Link agreggation = Team Network + #: ../src/connection-editor/connection-helpers.c:118 +-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335 ++#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335 + #: ../src/libnm-gtk/nm-ui-utils.c:579 + msgid "Team" + msgstr "Equipe" + + #: ../src/connection-editor/connection-helpers.c:119 +-#: ../src/connection-editor/page-bridge.c:212 ++#: ../src/connection-editor/page-bridge.c:233 + #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581 + msgid "Bridge" + msgstr "Ponte" +@@ -3020,6 +3126,13 @@ msgstr "erro desconhecido" + msgid "Select file to import" + msgstr "Seleciona o arquivo a ser importado" + ++#: ../src/connection-editor/connection-helpers.c:309 ++#: ../src/connection-editor/page-proxy.c:122 ++#: ../src/connection-editor/page-team.c:345 ++#: ../src/connection-editor/page-team-port.c:207 ++msgid "_Open" ++msgstr "" ++ + #: ../src/connection-editor/connection-helpers.c:340 + msgid "Hardware" + msgstr "Hardware" +@@ -3057,7 +3170,7 @@ msgstr "Você tem certeza que deseja excluir a conexão %s?" + #: ../src/connection-editor/ip4-routes-dialog.c:697 + #: ../src/connection-editor/ip6-routes-dialog.c:718 + #: ../src/connection-editor/page-ip4.c:1136 +-#: ../src/connection-editor/page-ip6.c:1095 ++#: ../src/connection-editor/page-ip6.c:1118 + msgid "Address" + msgstr "Endereço" + +@@ -3069,7 +3182,7 @@ msgstr "Máscara de rede" + #: ../src/connection-editor/ip4-routes-dialog.c:735 + #: ../src/connection-editor/ip6-routes-dialog.c:756 + #: ../src/connection-editor/page-ip4.c:1174 +-#: ../src/connection-editor/page-ip6.c:1133 ++#: ../src/connection-editor/page-ip6.c:1156 + msgid "Gateway" + msgstr "Gateway" + +@@ -3079,7 +3192,7 @@ msgid "Metric" + msgstr "Métrica" + + #: ../src/connection-editor/ip6-routes-dialog.c:737 +-#: ../src/connection-editor/page-ip6.c:1114 ++#: ../src/connection-editor/page-ip6.c:1137 + msgid "Prefix" + msgstr "Prefixo" + +@@ -3105,7 +3218,7 @@ msgid "Editor initializing…" + msgstr "Erro de inicialização…" + + #: ../src/connection-editor/nm-connection-editor.c:360 +-#: ../src/connection-editor/nm-connection-list.c:408 ++#: ../src/connection-editor/nm-connection-list.c:443 + msgid "Connection cannot be modified" + msgstr "A conexão não pôde ser modificada" + +@@ -3123,6 +3236,7 @@ msgstr "" + "arquivo .ui não foi localizado)." + + #: ../src/connection-editor/nm-connection-editor.c:578 ++#: ../src/connection-editor/vpn-helpers.c:213 + msgid "_Save" + msgstr "_Salvar" + +@@ -3163,19 +3277,15 @@ msgstr "" + msgid "Error initializing editor" + msgstr "Erro ao iniciar o editor" + +-#: ../src/connection-editor/nm-connection-editor.c:1148 ++#: ../src/connection-editor/nm-connection-editor.c:1157 + msgid "Connection add failed" + msgstr "A criação da conexão falhou" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2 +-msgid "_Close" +-msgstr "_Fechar" +- +-#: ../src/connection-editor/nm-connection-editor.ui.h:4 ++#: ../src/connection-editor/nm-connection-editor.ui.h:1 + msgid "Fix" + msgstr "Corrigir" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:5 ++#: ../src/connection-editor/nm-connection-editor.ui.h:2 + msgid "" + "Security labels may prevent some files from being used with certificate " + "authentication." +@@ -3183,23 +3293,23 @@ msgstr "" + "Rótulos de segurança podem evitar que alguns arquivos seja usados com " + "autenticação com certificado." + +-#: ../src/connection-editor/nm-connection-editor.ui.h:6 ++#: ../src/connection-editor/nm-connection-editor.ui.h:3 + msgid "Connection _name:" + msgstr "_Nome da conexão:" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:7 ++#: ../src/connection-editor/nm-connection-editor.ui.h:4 + msgid "_Export…" + msgstr "_Exportar…" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:9 ++#: ../src/connection-editor/nm-connection-editor.ui.h:6 + msgid "File Relabel" + msgstr "Rerotulagem de arquivo" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:10 ++#: ../src/connection-editor/nm-connection-editor.ui.h:7 + msgid "_Relabel" + msgstr "_Rerotular" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:11 ++#: ../src/connection-editor/nm-connection-editor.ui.h:8 + msgid "" + "The following files are not labelled for use with certificate " + "authentication. Do you wish to adjust the labels?" +@@ -3207,116 +3317,132 @@ msgstr "" + "Os arquivos a seguir não estão rotulados para usar com autenticação de com " + "certificado. você deseja ajustar os rótulos?" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:12 ++#: ../src/connection-editor/nm-connection-editor.ui.h:9 + msgid "Relabel" + msgstr "Rerotular" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:13 ++#: ../src/connection-editor/nm-connection-editor.ui.h:10 + msgid "Filename" + msgstr "Nome do arquivo" + +-#: ../src/connection-editor/nm-connection-list.c:127 ++#: ../src/connection-editor/nm-connection-list.c:151 + msgid "never" + msgstr "nunca" + +-#: ../src/connection-editor/nm-connection-list.c:138 +-#: ../src/connection-editor/nm-connection-list.c:149 ++#: ../src/connection-editor/nm-connection-list.c:162 ++#: ../src/connection-editor/nm-connection-list.c:173 + msgid "now" + msgstr "agora" + + #. less than an hour ago +-#: ../src/connection-editor/nm-connection-list.c:156 ++#: ../src/connection-editor/nm-connection-list.c:180 + #, c-format + msgid "%d minute ago" + msgid_plural "%d minutes ago" + msgstr[0] "%d minuto atrás" + msgstr[1] "%d minutos atrás" + +-#: ../src/connection-editor/nm-connection-list.c:160 ++#: ../src/connection-editor/nm-connection-list.c:184 + #, c-format + msgid "%d hour ago" + msgid_plural "%d hours ago" + msgstr[0] "%d hora atrás" + msgstr[1] "%d horas atrás" + +-#: ../src/connection-editor/nm-connection-list.c:172 ++#: ../src/connection-editor/nm-connection-list.c:196 + #, c-format + msgid "%d day ago" + msgid_plural "%d days ago" + msgstr[0] "%d dia atrás" + msgstr[1] "%d dias atrás" + +-#: ../src/connection-editor/nm-connection-list.c:178 ++#: ../src/connection-editor/nm-connection-list.c:202 + #, c-format + msgid "%d month ago" + msgid_plural "%d months ago" + msgstr[0] "%d mês atrás" + msgstr[1] "%d meses atrás" + +-#: ../src/connection-editor/nm-connection-list.c:182 ++#: ../src/connection-editor/nm-connection-list.c:206 + #, c-format + msgid "%d year ago" + msgid_plural "%d years ago" + msgstr[0] "%d ano atrás" + msgstr[1] "%d anos atrás" + +-#: ../src/connection-editor/nm-connection-list.c:635 ++#: ../src/connection-editor/nm-connection-list.c:445 ++msgid "Connection cannot be deleted" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:448 ++msgid "Select a connection to edit" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:450 ++msgid "Select a connection to delete" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:785 + #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2 + msgid "Name" + msgstr "Nome" + +-#: ../src/connection-editor/nm-connection-list.c:648 ++#: ../src/connection-editor/nm-connection-list.c:798 + msgid "Last Used" + msgstr "Usada em" + +-#: ../src/connection-editor/nm-connection-list.c:696 ++#: ../src/connection-editor/nm-connection-list.c:836 + msgid "Edit the selected connection" + msgstr "Edita a conexão selecionada" + +-#: ../src/connection-editor/nm-connection-list.c:697 ++#: ../src/connection-editor/nm-connection-list.c:837 + msgid "Authenticate to edit the selected connection" + msgstr "Autentique-se para editar a conexão selecionada" + +-#: ../src/connection-editor/nm-connection-list.c:712 ++#: ../src/connection-editor/nm-connection-list.c:842 + msgid "Delete the selected connection" + msgstr "Excluir a conexão selecionada" + +-#: ../src/connection-editor/nm-connection-list.c:713 ++#: ../src/connection-editor/nm-connection-list.c:843 + msgid "Authenticate to delete the selected connection" + msgstr "Autentique-se para excluir a conexão selecionada" + +-#: ../src/connection-editor/nm-connection-list.c:935 +-#: ../src/connection-editor/nm-connection-list.c:938 ++#: ../src/connection-editor/nm-connection-list.c:1048 ++#: ../src/connection-editor/nm-connection-list.c:1051 + msgid "Error creating connection" + msgstr "Erro ao criar conexão" + +-#: ../src/connection-editor/nm-connection-list.c:936 ++#: ../src/connection-editor/nm-connection-list.c:1049 + msgid "No VPN plugins are installed." + msgstr "Nenhum plug-in de VPN está instalado." + +-#: ../src/connection-editor/nm-connection-list.c:939 ++#: ../src/connection-editor/nm-connection-list.c:1052 + #, c-format + msgid "Don’t know how to create “%s” connections" + msgstr "Não foi possível criar as conexões “%s”" + +-#: ../src/connection-editor/nm-connection-list.c:970 ++#: ../src/connection-editor/nm-connection-list.c:1085 + msgid "Error editing connection" + msgstr "Erro editando conexão" + +-#: ../src/connection-editor/nm-connection-list.c:971 ++#: ../src/connection-editor/nm-connection-list.c:1086 + #, c-format + msgid "Did not find a connection with UUID “%s”" + msgstr "Não é possível localizar a conexão com UUID “%s”" + +-#: ../src/connection-editor/page-8021x-security.c:113 ++#: ../src/connection-editor/nm-connection-list.ui.h:2 ++msgid "Add a new connection" ++msgstr "" ++ ++#: ../src/connection-editor/page-8021x-security.c:116 + msgid "802.1X Security" + msgstr "Segurança 802.1X" + +-#: ../src/connection-editor/page-8021x-security.c:115 ++#: ../src/connection-editor/page-8021x-security.c:118 + msgid "Could not load 802.1X Security user interface." + msgstr "Não foi possível carregar a interface gráfica de segurança 802.1X." + +-#: ../src/connection-editor/page-8021x-security.c:129 ++#: ../src/connection-editor/page-8021x-security.c:132 + msgid "Use 802.1_X security for this connection" + msgstr "Usar protocolo de segurança 802.1_X para esta conexão" + +@@ -3367,11 +3493,11 @@ msgstr "primário" + msgid "Bond connection %d" + msgstr "Conexão de agregação %d" + +-#: ../src/connection-editor/page-bridge.c:215 ++#: ../src/connection-editor/page-bridge.c:236 + msgid "Could not load bridge user interface." + msgstr "Não foi possível carregar a interface gráfica de ponte." + +-#: ../src/connection-editor/page-bridge.c:317 ++#: ../src/connection-editor/page-bridge.c:352 + #, c-format + msgid "Bridge connection %d" + msgstr "Conexão de ponte %d" +@@ -3396,11 +3522,15 @@ msgstr "DCB" + msgid "Could not load DCB user interface." + msgstr "Não foi possível carregar a interface gráfica de DCB." + +-#: ../src/connection-editor/page-dsl.c:129 ++#: ../src/connection-editor/page-dsl.c:203 + msgid "Could not load DSL user interface." + msgstr "Não foi possível carregar a interface gráfica para DSL." + +-#: ../src/connection-editor/page-dsl.c:219 ++#: ../src/connection-editor/page-dsl.c:298 ++msgid "missing parent interface" ++msgstr "" ++ ++#: ../src/connection-editor/page-dsl.c:343 + #, c-format + msgid "DSL connection %d" + msgstr "Conexão DSL %d" +@@ -3499,27 +3629,27 @@ msgid "IP tunnel connection %d" + msgstr "Conexão de encapsulamento de IP %d" + + #: ../src/connection-editor/page-ip4.c:127 +-#: ../src/connection-editor/page-ip6.c:130 ++#: ../src/connection-editor/page-ip6.c:136 + msgid "Automatic (VPN)" + msgstr "Automático (VPN)" + + #: ../src/connection-editor/page-ip4.c:128 +-#: ../src/connection-editor/page-ip6.c:131 ++#: ../src/connection-editor/page-ip6.c:137 + msgid "Automatic (VPN) addresses only" + msgstr "Somente endereços (VPN) automáticos" + + #: ../src/connection-editor/page-ip4.c:132 +-#: ../src/connection-editor/page-ip6.c:137 ++#: ../src/connection-editor/page-ip6.c:143 + msgid "Automatic, addresses only" + msgstr "Automático, somente endereços" + + #: ../src/connection-editor/page-ip4.c:134 +-#: ../src/connection-editor/page-ip6.c:133 ++#: ../src/connection-editor/page-ip6.c:139 + msgid "Automatic (PPPoE)" + msgstr "Automático (PPPoE)" + + #: ../src/connection-editor/page-ip4.c:135 +-#: ../src/connection-editor/page-ip6.c:134 ++#: ../src/connection-editor/page-ip6.c:140 + msgid "Automatic (PPPoE) addresses only" + msgstr "Somente endereços (PPPoE) automáticos" + +@@ -3532,17 +3662,17 @@ msgid "Automatic (DHCP) addresses only" + msgstr "Somente endereços (DHCP) automáticos" + + #: ../src/connection-editor/page-ip4.c:181 +-#: ../src/connection-editor/page-ip6.c:198 ++#: ../src/connection-editor/page-ip6.c:204 + msgid "Link-Local Only" + msgstr "Apenas conexão local" + + #: ../src/connection-editor/page-ip4.c:361 +-#: ../src/connection-editor/page-ip6.c:324 ++#: ../src/connection-editor/page-ip6.c:335 + msgid "Additional DNS ser_vers:" + msgstr "Servidores _DNS adicionais:" + + #: ../src/connection-editor/page-ip4.c:370 +-#: ../src/connection-editor/page-ip6.c:333 ++#: ../src/connection-editor/page-ip6.c:344 + msgid "Additional s_earch domains:" + msgstr "Pe_squisar domínios adicionais:" + +@@ -3579,51 +3709,49 @@ msgstr "Gateway IPv4 “%s” inválido" + msgid "IPv4 DNS server “%s” invalid" + msgstr "Servidor DNS IPv4 “%s” inválido" + +-#: ../src/connection-editor/page-ip6.c:173 ++#: ../src/connection-editor/page-ip6.c:179 + msgid "Automatic, DHCP only" + msgstr "Automático, somente DHCP" + +-#: ../src/connection-editor/page-ip6.c:993 ++#: ../src/connection-editor/page-ip6.c:1016 + #, c-format + msgid "Editing IPv6 routes for %s" + msgstr "Editando rotas IPv6 para %s" + +-#: ../src/connection-editor/page-ip6.c:1184 ++#: ../src/connection-editor/page-ip6.c:1208 + msgid "IPv6 Settings" + msgstr "Configurações IPv6" + +-#: ../src/connection-editor/page-ip6.c:1186 ++#: ../src/connection-editor/page-ip6.c:1210 + msgid "Could not load IPv6 user interface." + msgstr "Não foi possível carregar a interface gráfica para IPv6." + +-#: ../src/connection-editor/page-ip6.c:1277 ++#: ../src/connection-editor/page-ip6.c:1302 + #, c-format + msgid "IPv6 address “%s” invalid" + msgstr "Endereço IPv6 “%s” inválido" + +-#: ../src/connection-editor/page-ip6.c:1285 ++#: ../src/connection-editor/page-ip6.c:1310 + #, c-format + msgid "IPv6 prefix “%s” invalid" + msgstr "Prefixo IPv6 “%s” inválido" + +-#: ../src/connection-editor/page-ip6.c:1294 ++#: ../src/connection-editor/page-ip6.c:1319 + #, c-format + msgid "IPv6 gateway “%s” invalid" + msgstr "Gateway IPv6 “%s” inválido" + +-#: ../src/connection-editor/page-ip6.c:1336 ++#: ../src/connection-editor/page-ip6.c:1361 + #, c-format + msgid "IPv6 DNS server “%s” invalid" + msgstr "Servidor DNS IPv6 “%s” inválido" + + #: ../src/connection-editor/page-macsec.c:192 +-#| msgid "Could not load WiMAX user interface." + msgid "Could not load MACsec user interface." + msgstr "Não foi possível carregar a interface de usuário MACsec." + + #: ../src/connection-editor/page-macsec.c:331 + #, c-format +-#| msgid "WiMAX connection %d" + msgid "MACSEC connection %d" + msgstr "Conexão MACSEC %d" + +@@ -3693,24 +3821,24 @@ msgid "GSM" + msgstr "GSM" + + #: ../src/connection-editor/page-ppp.c:130 +-#: ../src/wireless-security/eap-method-ttls.c:288 ++#: ../src/wireless-security/eap-method-ttls.c:287 + msgid "PAP" + msgstr "PAP" + + #: ../src/connection-editor/page-ppp.c:131 +-#: ../src/wireless-security/eap-method-ttls.c:350 ++#: ../src/wireless-security/eap-method-ttls.c:349 + msgid "CHAP" + msgstr "CHAP" + + #: ../src/connection-editor/page-ppp.c:132 +-#: ../src/wireless-security/eap-method-fast.c:284 +-#: ../src/wireless-security/eap-method-peap.c:300 +-#: ../src/wireless-security/eap-method-ttls.c:318 ++#: ../src/wireless-security/eap-method-fast.c:282 ++#: ../src/wireless-security/eap-method-peap.c:299 ++#: ../src/wireless-security/eap-method-ttls.c:317 + msgid "MSCHAPv2" + msgstr "MSCHAPv2" + + #: ../src/connection-editor/page-ppp.c:133 +-#: ../src/wireless-security/eap-method-ttls.c:303 ++#: ../src/wireless-security/eap-method-ttls.c:302 + msgid "MSCHAP" + msgstr "MSCHAP" + +@@ -3745,11 +3873,11 @@ msgstr "Não foi possível carregar a interface gráfica de proxy." + msgid "Error: file doesn’t contain a valid JSON configuration" + msgstr "Erro: o arquivo não contém uma configuração válido de JSON" + +-#: ../src/connection-editor/page-team.c:1156 ++#: ../src/connection-editor/page-team.c:1034 + msgid "Could not load team user interface." + msgstr "Não foi possível carregar a interface gráfica de equipe." + +-#: ../src/connection-editor/page-team.c:1253 ++#: ../src/connection-editor/page-team.c:1131 + #, c-format + msgid "Team connection %d" + msgstr "Conexão de equipe %d" +@@ -3757,11 +3885,11 @@ msgstr "Conexão de equipe %d" + #. Translators: a "Team Port" is a network + #. * device that is part of a team. + #. +-#: ../src/connection-editor/page-team-port.c:732 ++#: ../src/connection-editor/page-team-port.c:655 + msgid "Team Port" + msgstr "Porta de equipe" + +-#: ../src/connection-editor/page-team-port.c:734 ++#: ../src/connection-editor/page-team-port.c:657 + msgid "Could not load team port user interface." + msgstr "Não foi possível carregar a interface gráfica de porta de equipe." + +@@ -3961,34 +4089,38 @@ msgstr "Desbloquear automaticamente este dispositivo" + msgid "Connection Information" + msgstr "Informações da conexão" + ++#: ../src/info.ui.h:2 ++msgid "_Close" ++msgstr "_Fechar" ++ + #: ../src/info.ui.h:3 + msgid "Active Network Connections" + msgstr "Conexões de rede ativas" + + #: ../src/libnma/nma-file-cert-chooser.c:108 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:146 + msgid "No certificate set" + msgstr "Nenhum certificado definido" + + #: ../src/libnma/nma-file-cert-chooser.c:126 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:170 + msgid "No key set" + msgstr "Nenhuma chave definida" + + #: ../src/libnma/nma-file-cert-chooser.c:246 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:370 + #, c-format + msgid "Choose a key for %s Certificate" + msgstr "Escolha uma chave para certificado de %s" + + #: ../src/libnma/nma-file-cert-chooser.c:250 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:374 + #, c-format + msgid "%s private _key:" + msgstr "chave _privada de %s:" + + #: ../src/libnma/nma-file-cert-chooser.c:254 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:378 + #, c-format + msgid "%s key _password:" + msgstr "_Senha da chave de %s:" +@@ -3999,7 +4131,7 @@ msgid "Choose %s Certificate" + msgstr "Escolha o certificado de %s" + + #: ../src/libnma/nma-file-cert-chooser.c:262 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:386 + #, c-format + msgid "%s _certificate:" + msgstr "_Certificado de %s:" +@@ -4202,45 +4334,45 @@ msgstr "Configurar uma conexão de banda larga móvel" + msgid "New Mobile Broadband Connection" + msgstr "Nova conexão de banda larga móvel" + +-#: ../src/libnma/nma-cert-chooser-button.c:162 ++#: ../src/libnma/nma-cert-chooser-button.c:165 + msgid "(None)" + msgstr "(Nenhum)" + +-#: ../src/libnma/nma-cert-chooser-button.c:170 ++#: ../src/libnma/nma-cert-chooser-button.c:173 + #, c-format + msgid "Key in %s" + msgstr "Chave em %s" + +-#: ../src/libnma/nma-cert-chooser-button.c:171 ++#: ../src/libnma/nma-cert-chooser-button.c:174 + #, c-format + msgid "Certificate in %s" + msgstr "Certificado em %s" + +-#: ../src/libnma/nma-cert-chooser-button.c:190 ++#: ../src/libnma/nma-cert-chooser-button.c:193 + #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183 + msgid "(Unknown)" + msgstr "(Desconhecido)" + +-#: ../src/libnma/nma-cert-chooser-button.c:212 +-#: ../src/libnma/nma-cert-chooser-button.c:242 ++#: ../src/libnma/nma-cert-chooser-button.c:215 ++#: ../src/libnma/nma-cert-chooser-button.c:245 + msgid "Select" + msgstr "Selecionar" + +-#: ../src/libnma/nma-cert-chooser-button.c:213 +-#: ../src/libnma/nma-cert-chooser-button.c:243 ++#: ../src/libnma/nma-cert-chooser-button.c:216 ++#: ../src/libnma/nma-cert-chooser-button.c:246 + msgid "Cancel" + msgstr "Cancelar" + +-#: ../src/libnma/nma-cert-chooser-button.c:469 ++#: ../src/libnma/nma-cert-chooser-button.c:472 + msgid "Select from file…" + msgstr "Selecionar do arquivo…" + +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:382 + #, c-format + msgid "Choose a %s Certificate" + msgstr "Escolha um certificado de %s" + +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:390 + #, c-format + msgid "%s certificate _password:" + msgstr "_Senha de certificado de %s:" +@@ -4300,8 +4432,8 @@ msgstr "_Senha secundária:" + msgid "_Tertiary Password:" + msgstr "Senha _terciária:" + +-#: ../src/libnma/nma-vpn-password-dialog.c:247 +-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247 ++#: ../src/libnma/nma-vpn-password-dialog.c:238 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238 + msgid "Sh_ow passwords" + msgstr "M_ostrar senhas" + +@@ -4330,11 +4462,11 @@ msgstr "Nenhum" + msgid "Dynamic WEP (802.1x)" + msgstr "WEP dinâmico (802.1x)" + +-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075 ++#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071 + msgid "C_reate" + msgstr "C_riar" + +-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161 ++#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150 + #, c-format + msgid "" + "Passwords or encryption keys are required to access the Wi-Fi network “%s”." +@@ -4342,35 +4474,35 @@ msgstr "" + "Senhas ou chaves de criptografia são necessárias para acessar a rede Wi-Fi " + "“%s”." + +-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163 ++#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152 + msgid "Wi-Fi Network Authentication Required" + msgstr "Autenticação necessária na rede Wi-Fi" + +-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165 ++#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154 + msgid "Authentication required by Wi-Fi network" + msgstr "Autenticação necessária na rede Wi-Fi" + +-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170 ++#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159 + msgid "Create New Wi-Fi Network" + msgstr "Criar nova rede Wi-Fi" + +-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172 ++#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161 + msgid "New Wi-Fi network" + msgstr "Nova rede Wi-Fi" + +-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173 ++#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162 + msgid "Enter a name for the Wi-Fi network you wish to create." + msgstr "Digite um nome para a rede Wi-Fi que você deseja criar." + +-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175 ++#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164 + msgid "Connect to Hidden Wi-Fi Network" + msgstr "Conectar a rede Wi-Fi oculta" + +-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177 ++#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166 + msgid "Hidden Wi-Fi network" + msgstr "Rede Wi-Fi oculta" + +-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178 ++#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167 + msgid "" + "Enter the name and security details of the hidden Wi-Fi network you wish to " + "connect to." +@@ -4553,11 +4685,11 @@ msgstr "roaming" + msgid "%s connection" + msgstr "Conexão %s" + +-#: ../src/utils/utils.c:563 ++#: ../src/utils/utils.c:565 + msgid "PEM certificates (*.pem, *.crt, *.cer)" + msgstr "Certificados PEM (*.pem, *.crt, *.cer)" + +-#: ../src/utils/utils.c:575 ++#: ../src/utils/utils.c:577 + msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" + msgstr "Chaves privadas DER, PEM ou PKCS#12 (*.der, *.pem, *.p12, *.key)" + +@@ -4573,25 +4705,25 @@ msgstr "Nenhum certificado AC selecionado" + msgid "selected CA certificate file does not exist" + msgstr "arquivo de certificado AC selecionado não existe" + +-#: ../src/wireless-security/eap-method-fast.c:73 ++#: ../src/wireless-security/eap-method-fast.c:71 + msgid "missing EAP-FAST PAC file" + msgstr "faltando arquivo PAC EAP-FAST" + +-#: ../src/wireless-security/eap-method-fast.c:269 +-#: ../src/wireless-security/eap-method-peap.c:330 +-#: ../src/wireless-security/eap-method-ttls.c:380 ++#: ../src/wireless-security/eap-method-fast.c:267 ++#: ../src/wireless-security/eap-method-peap.c:329 ++#: ../src/wireless-security/eap-method-ttls.c:379 + msgid "GTC" + msgstr "GTC" + +-#: ../src/wireless-security/eap-method-fast.c:407 ++#: ../src/wireless-security/eap-method-fast.c:405 + msgid "Choose a PAC file" + msgstr "Escolha um arquivo PAC" + +-#: ../src/wireless-security/eap-method-fast.c:414 ++#: ../src/wireless-security/eap-method-fast.c:412 + msgid "PAC files (*.pac)" + msgstr "Arquivos PAC (*.pac)" + +-#: ../src/wireless-security/eap-method-fast.c:418 ++#: ../src/wireless-security/eap-method-fast.c:416 + msgid "All files" + msgstr "Todos os arquivos" + +@@ -4635,8 +4767,8 @@ msgstr "faltando nome de usuário EAP-LEAP" + msgid "missing EAP-LEAP password" + msgstr "faltando senha EAP-LEAP" + +-#: ../src/wireless-security/eap-method-peap.c:315 +-#: ../src/wireless-security/eap-method-ttls.c:365 ++#: ../src/wireless-security/eap-method-peap.c:314 ++#: ../src/wireless-security/eap-method-ttls.c:364 + #: ../src/wireless-security/wireless-security.c:424 + msgid "MD5" + msgstr "MD5" +@@ -4683,19 +4815,19 @@ msgstr "faltando senha EAP" + msgid "missing EAP-TLS identity" + msgstr "faltando identidade EAP-TLS" + +-#: ../src/wireless-security/eap-method-tls.c:251 ++#: ../src/wireless-security/eap-method-tls.c:256 + msgid "no user certificate selected" + msgstr "nenhum certificado de usuário selecionado" + +-#: ../src/wireless-security/eap-method-tls.c:256 ++#: ../src/wireless-security/eap-method-tls.c:261 + msgid "selected user certificate file does not exist" + msgstr "arquivo de certificado de usuário selecionado não existe" + +-#: ../src/wireless-security/eap-method-tls.c:276 ++#: ../src/wireless-security/eap-method-tls.c:281 + msgid "no key selected" + msgstr "nenhuma chave selecionada" + +-#: ../src/wireless-security/eap-method-tls.c:281 ++#: ../src/wireless-security/eap-method-tls.c:286 + msgid "selected key file does not exist" + msgstr "arquivo de chave selecionado não existe" + +@@ -4703,7 +4835,7 @@ msgstr "arquivo de chave selecionado não existe" + msgid "I_dentity:" + msgstr "Id_entidade:" + +-#: ../src/wireless-security/eap-method-ttls.c:334 ++#: ../src/wireless-security/eap-method-ttls.c:333 + msgid "MSCHAPv2 (no EAP)" + msgstr "MSCHAPv2 (não EAP)" + +@@ -4782,17 +4914,17 @@ msgid "invalid wep-key: passphrase must be shorter than 64 characters" + msgstr "chave wep inválida: frase secreta deve ser menor que 64 caracteres" + + #: ../src/wireless-security/ws-wep-key.ui.h:1 +-msgid "1 (Default)" +-msgstr "1 (Padrão)" +- +-#: ../src/wireless-security/ws-wep-key.ui.h:2 + msgid "Open System" + msgstr "Sistema aberto" + +-#: ../src/wireless-security/ws-wep-key.ui.h:3 ++#: ../src/wireless-security/ws-wep-key.ui.h:2 + msgid "Shared Key" + msgstr "Chave compartilhada" + ++#: ../src/wireless-security/ws-wep-key.ui.h:3 ++msgid "1 (Default)" ++msgstr "1 (Padrão)" ++ + #: ../src/wireless-security/ws-wep-key.ui.h:4 + msgid "_Key:" + msgstr "_Chave:" +@@ -4823,457 +4955,3 @@ msgstr "" + #: ../src/wireless-security/ws-wpa-psk.ui.h:2 + msgid "_Type:" + msgstr "_Tipo:" +- +-#~ msgid "no file selected" +-#~ msgstr "nenhum arquivo selecionado" +- +-#~ msgid "file “%s” does not exist" +-#~ msgstr "o arquivo “%s” não existe" +- +-#~ msgid "unspecified error validating eap-method file" +-#~ msgstr "erro não especificado ao validar arquivo de método eap" +- +-#~ msgid "invalid EAP-PEAP CA certificate: %s" +-#~ msgstr "certificado de CA EAP-PEAP inválido: %s" +- +-#~ msgid "invalid EAP-PEAP CA certificate: no certificate specified" +-#~ msgstr "" +-#~ "certificado de CA EAP-PEAP inválido: nenhum certificado especificado" +- +-#~ msgid "Choose a Certificate Authority certificate" +-#~ msgstr "Escolha um certificado de Autoridade Certificadora" +- +-#~ msgid "C_A certificate:" +-#~ msgstr "Certificado _AC:" +- +-#~ msgid "invalid EAP-TTLS CA certificate: %s" +-#~ msgstr "certificado de CA EAP-TTLS inválido: %s" +- +-#~ msgid "invalid EAP-TTLS CA certificate: no certificate specified" +-#~ msgstr "" +-#~ "certificado de CA EAP-TTLS inválido: nenhum certificado especificado" +- +-#~ msgid "" +-#~ "\n" +-#~ "The VPN connection “%s” disconnected because the VPN service stopped." +-#~ msgstr "" +-#~ "\n" +-#~ "A conexão VPN “%s” desconectou porque o serviço VPN parou." +- +-#~ msgid "" +-#~ "\n" +-#~ "The VPN connection “%s” disconnected." +-#~ msgstr "" +-#~ "\n" +-#~ "A conexão VPN “%s” desconectou." +- +-#~ msgid "invalid EAP-TLS CA certificate: %s" +-#~ msgstr "certificado de CA EAP-TLS inválido: %s" +- +-#~ msgid "invalid EAP-TLS CA certificate: no certificate specified" +-#~ msgstr "certificado de CA EAP-TLS inválido: nenhum certificado especificado" +- +-#~ msgid "invalid EAP-TLS password: missing" +-#~ msgstr "senha EAP-TLS inválida: faltando" +- +-#~ msgid "invalid EAP-TLS private-key: %s" +-#~ msgstr "chave privada EAP-TLS inválida: %s" +- +-#~ msgid "invalid EAP-TLS user-certificate: %s" +-#~ msgstr "certificado de usuário EAP-TLS inválido: %s" +- +-#~ msgid "Unencrypted private keys are insecure" +-#~ msgstr "Chaves privadas não criptografadas são inseguras" +- +-#~| msgid "" +-#~| "The selected private key does not appear to be protected by a password. " +-#~| "This could allow your security credentials to be compromised. Please " +-#~| "select a password-protected private key.\n" +-#~| "\n" +-#~| "(You can password-protect your private key with openssl)" +-#~ msgid "" +-#~ "The selected private key does not appear to be protected by a password. " +-#~ "This could allow your security credentials to be compromised. Please " +-#~ "select a password-protected private key.\n" +-#~ "\n" +-#~ "(You can password-protect your private key with openssl)" +-#~ msgstr "" +-#~ "A chave privada selecionada não parece ser protegida por uma senha. Isso " +-#~ "pode permitir que as suas credenciais de segurança sejam comprometidas. " +-#~ "Por favor selecione uma chave privada protegida por senha.\n" +-#~ "\n" +-#~ "(Você pode proteger por senha sua chave privada com openssl)" +- +-#~ msgid "Choose your personal certificate" +-#~ msgstr "Escolha seu certificado pessoal" +- +-#~ msgid "Choose your private key" +-#~ msgstr "Escolha sua chave privada" +- +-#~ msgid "New Mobile Broadband connection..." +-#~ msgstr "Nova conexão de banda larga móvel..." +- +-#~ msgid "_Connect to Hidden Wi-Fi Network..." +-#~ msgstr "_Conectar-se a rede Wi-Fi oculta..." +- +-#~ msgid "Create _New Wi-Fi Network..." +-#~ msgstr "Criar _nova rede Wi-Fi..." +- +-#~ msgid " " +-#~ msgstr " " +- +-#~ msgid "0" +-#~ msgstr "0" +- +-#~ msgid "1" +-#~ msgstr "1" +- +-#~ msgid "2" +-#~ msgstr "2" +- +-#~ msgid "3" +-#~ msgstr "3" +- +-#~ msgid "4" +-#~ msgstr "4" +- +-#~ msgid "5" +-#~ msgstr "5" +- +-#~ msgid "6" +-#~ msgstr "6" +- +-#~ msgid "7" +-#~ msgstr "7" +- +-#~ msgid "15" +-#~ msgstr "15" +- +-#~ msgid "Full duple_x" +-#~ msgstr "Full duple_x" +- +-#~ msgid "Aut_onegotiate" +-#~ msgstr "_Negociar automaticamente" +- +-#~ msgid "_Import team configuration from a file..." +-#~ msgstr "_Importar uma configuração de equipe de um arquivo..." +- +-#~ msgid "FirewallD is not running." +-#~ msgstr "FirewallD não está em execução." +- +-#~ msgid "New..." +-#~ msgstr "Novo..." +- +-#~ msgid "_Disconnect VPN" +-#~ msgstr "_Desconectar VPN" +- +-#~ msgid "NetworkManager for GNOME" +-#~ msgstr "Gerenciador de redes para o GNOME" +- +-#~ msgid "_Help" +-#~ msgstr "Aj_uda" +- +-#~ msgid "Infrastructure" +-#~ msgstr "Infraestrutura" +- +-#~ msgid "bdaddr" +-#~ msgstr "bdaddr" +- +-#~ msgid "Enable WiMA_X Mobile Broadband" +-#~ msgstr "Habilitar banda larga móvel WiMA_X" +- +-#~ msgid "You are now connected to the bonded network." +-#~ msgstr "Você agora está conectado à rede vinculada." +- +-#~ msgid "Preparing bond connection '%s'..." +-#~ msgstr "Preparando conexão de vínculo \"%s\"..." +- +-#~ msgid "Configuring bond connection '%s'..." +-#~ msgstr "Configurando conexão de vínculo \"%s\"..." +- +-#~ msgid "User authentication required for bond connection '%s'..." +-#~ msgstr "Autenticação necessária pela conexão de vínculo \"%s\"..." +- +-#~ msgid "Requesting address for '%s'..." +-#~ msgstr "Requisitando um endereço para \"%s\"..." +- +-#~ msgid "Bond connection '%s' active" +-#~ msgstr "Conexão de vínculo \"%s\" ativa" +- +-#~ msgid "You are now connected to the bridged network." +-#~ msgstr "Você agora está conectado à rede de ponte." +- +-#~ msgid "Preparing bridge connection '%s'..." +-#~ msgstr "Preparando conexão de ponte \"%s\"..." +- +-#~ msgid "Configuring bridge connection '%s'..." +-#~ msgstr "Configurando conexão de ponte \"%s\"..." +- +-#~ msgid "User authentication required for bridge connection '%s'..." +-#~ msgstr "Autenticação necessária pela conexão de ponte \"%s\"..." +- +-#~ msgid "Bridge connection '%s' active" +-#~ msgstr "Conexão de ponte \"%s\" ativa" +- +-#~ msgid "New Mobile Broadband (CDMA) connection..." +-#~ msgstr "Nova conexão de banda larga móvel (CDMA)..." +- +-#~ msgid "You are now connected to the CDMA network." +-#~ msgstr "Você agora está conectado à rede CDMA." +- +-#~ msgid "CDMA network." +-#~ msgstr "Rede CDMA." +- +-#~ msgid "New Mobile Broadband (GSM) connection..." +-#~ msgstr "Nova conexão de banda larga móvel (GSM)..." +- +-#~ msgid "You are now connected to the GSM network." +-#~ msgstr "Você agora está conectado à rede GSM." +- +-#~ msgid "GSM network." +-#~ msgstr "Rede GSM." +- +-#~ msgid "Auto InfiniBand" +-#~ msgstr "InfiniBand automática" +- +-#~ msgid "InfiniBand Networks (%s)" +-#~ msgstr "Redes InfiniBand (%s)" +- +-#~ msgid "InfiniBand Network (%s)" +-#~ msgstr "Rede InfiniBand (%s)" +- +-#~ msgid "InfiniBand Networks" +-#~ msgstr "Redes InfiniBand" +- +-#~ msgid "InfiniBand Network" +-#~ msgstr "Rede InfiniBand" +- +-#~ msgid "You are now connected to the InfiniBand network." +-#~ msgstr "Você agora está conectado à rede InfiniBand." +- +-#~ msgid "Preparing InfiniBand connection '%s'..." +-#~ msgstr "Preparando conexão InfiniBand \"%s\"..." +- +-#~ msgid "Configuring InfiniBand connection '%s'..." +-#~ msgstr "Configurando conexão InfiniBand \"%s\"..." +- +-#~ msgid "User authentication required for InfiniBand connection '%s'..." +-#~ msgstr "Autenticação necessária pela conexão InfiniBand \"%s\"..." +- +-#~ msgid "InfiniBand connection '%s' active" +-#~ msgstr "Conexão InfiniBand \"%s\" ativa" +- +-#~ msgid "You are now connected to the teamed network." +-#~ msgstr "Você agora está conectado à rede de união." +- +-#~ msgid "Preparing team connection '%s'..." +-#~ msgstr "Preparando conexão de união \"%s\"..." +- +-#~ msgid "Configuring team connection '%s'..." +-#~ msgstr "Configurando conexão de união \"%s\"..." +- +-#~ msgid "User authentication required for team connection '%s'..." +-#~ msgstr "Autenticação necessária pela conexão de união \"%s\"..." +- +-#~ msgid "Team connection '%s' active" +-#~ msgstr "Conexão de união \"%s\" ativa" +- +-#~ msgid "You are now connected to the VLAN." +-#~ msgstr "Você agora está conectado à VLAN." +- +-#~ msgid "Preparing VLAN connection '%s'..." +-#~ msgstr "Iniciando conexão VLAN \"%s\"..." +- +-#~ msgid "Configuring VLAN connection '%s'..." +-#~ msgstr "Iniciando conexão VLAN \"%s\"..." +- +-#~ msgid "User authentication required for VLAN connection '%s'..." +-#~ msgstr "Autenticação necessária pela conexão VLAN \"%s\"..." +- +-#~ msgid "VLAN connection '%s' active" +-#~ msgstr "Conexão VLAN \"%s\" ativa" +- +-#~ msgid "WiMAX Mobile Broadband (%s)" +-#~ msgstr "Banda larga móvel WiMAX (%s)" +- +-#~ msgid "WiMAX Mobile Broadband" +-#~ msgstr "Banda larga móvel WiMAX" +- +-#~ msgid "WiMAX is disabled" +-#~ msgstr "WiMAX está desabilitada" +- +-#~ msgid "WiMAX is disabled by hardware switch" +-#~ msgstr "WiMAX desabilitada por hardware" +- +-#~ msgid "You are now connected to the WiMAX network." +-#~ msgstr "Você agora está conectado à rede WiMAX." +- +-#~ msgid "%d dB" +-#~ msgstr "%d dB" +- +-#~ msgctxt "WiMAX CINR" +-#~ msgid "unknown" +-#~ msgstr "desconhecido" +- +-#~ msgctxt "WiMAX Base Station ID" +-#~ msgid "unknown" +-#~ msgstr "desconhecido" +- +-#~ msgid "WiMAX (%s)" +-#~ msgstr "WiMAX (%s)" +- +-#~ msgid "CINR:" +-#~ msgstr "CINR:" +- +-#~ msgid "BSID:" +-#~ msgstr "BSID:" +- +-#~ msgid "WiMAX" +-#~ msgstr "WiMAX" +- +-#~ msgid "Error saving connection" +-#~ msgstr "Erro ao salvar conexão" +- +-#~ msgid "The property '%s' / '%s' is invalid: %d" +-#~ msgstr "A propriedade \"%s\" / \"%s\" inválida: %d" +- +-#~ msgid "IPv4 address netmask missing" +-#~ msgstr "Faltando máscara de rede do endereço IPv4" +- +-#~ msgid "IPv6 prefix \"%s\" missing" +-#~ msgstr "Faltando prefixo IPv6 \"%s\"" +- +-#~ msgid "WiMAX name missing" +-#~ msgstr "Faltando nome WiMAX" +- +-#~ msgid "WiMAX device" +-#~ msgstr "dispositivo WiMAX" +- +-#~ msgid "" +-#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) " +-#~ "%s)." +-#~ msgstr "" +-#~ "Não foi possível realizar configuração de Bluetooth (falha ao conectar ao " +-#~ "D-Bus: (%s) %s)." +- +-#~ msgid "" +-#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) " +-#~ "%s)." +-#~ msgstr "" +-#~ "Não foi possível realizar configuração de Bluetooth (erro ao localizar o " +-#~ "NetworkManager: (%s) %s)." +- +-#~ msgid "Use your mobile phone as a network device (PAN/NAP)" +-#~ msgstr "Use seu telefone celular como um dispositivo de rede (PAN/NAP)" +- +-#~ msgid "Access the Internet using your mobile phone (DUN)" +-#~ msgstr "Acesse a internet usando seu celular (DUN)" +- +-#~ msgid "Error: %s" +-#~ msgstr "Erro: %s" +- +-#~ msgid "Failed to create DUN connection: %s" +-#~ msgstr "Falhou ao criar a conexão DUN: %s" +- +-#~ msgid "Your phone is now ready to use!" +-#~ msgstr "Seu telefone não está pronto para uso!" +- +-#~ msgid "Mobile wizard was canceled" +-#~ msgstr "Assistente móvel foi cancelado" +- +-#~ msgid "Unknown phone device type (not GSM or CDMA)" +-#~ msgstr "Tipo de dispositivo de telefone desconhecido (não GSM ou CDMA)" +- +-#~ msgid "failed to connect to the phone." +-#~ msgstr "falha ao conectar ao telefone." +- +-#~ msgid "error getting bus connection" +-#~ msgstr "Erro ao obter conexão de barramento" +- +-#~ msgid "unexpectedly disconnected from the phone." +-#~ msgstr "Houve uma disconexão do telefone inesperada." +- +-#~ msgid "timed out detecting phone details." +-#~ msgstr "tempo expirado ao detectar detalhes do telefone." +- +-#~ msgid "Detecting phone configuration..." +-#~ msgstr "Detectando configuração de telefone..." +- +-#~ msgid "" +-#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-" +-#~ "Networking connection." +-#~ msgstr "" +-#~ "O adaptador padrão de Bluetooth deve estar ativado antes de configurar " +-#~ "uma conexão de rede com discagem direta." +- +-#~ msgid "Failed to create PAN connection: %s" +-#~ msgstr "Falhou ao criar a conexão PAN: %s" +- +-#~ msgid "%s Network" +-#~ msgstr "Rede %s" +- +-#~ msgid "_Device MAC address:" +-#~ msgstr "Endereço MAC do _dispositivo:" +- +-#~ msgid "I_mport team configuration from a file..." +-#~ msgstr "Importar uma configuração de equipe de um arquivo..." +- +-#~ msgid "Any" +-#~ msgstr "Qualquer" +- +-#~ msgid "3G (UMTS/HSPA)" +-#~ msgstr "3G (UMTS/HSPA)" +- +-#~ msgid "2G (GPRS/EDGE)" +-#~ msgstr "2G (GPRS/EDGE)" +- +-#~ msgid "Prefer 3G (UMTS/HSPA)" +-#~ msgstr "Preferir 3G (UMTS/HSPA)" +- +-#~ msgid "Prefer 2G (GPRS/EDGE)" +-#~ msgstr "Preferir 2G (GPRS/EDGE)" +- +-#~ msgid "Prefer 4G (LTE)" +-#~ msgstr "Preferir 4G (LTE)" +- +-#~ msgid "Use only 4G (LTE)" +-#~ msgstr "Usar apenas 4G (LTE)" +- +-#~ msgid "Primary DNS:" +-#~ msgstr "DNS primário:" +- +-#~ msgid "Secondary DNS:" +-#~ msgstr "DNS secundário:" +- +-#~ msgid "Ternary DNS:" +-#~ msgstr "DNS terciário:" +- +-#~ msgid "Automatic (PPP)" +-#~ msgstr "Automático (PPP)" +- +-#~ msgid "Automatic (PPP) addresses only" +-#~ msgstr "Somente endereços (PPP) automáticos" +- +-#~ msgid "unknown modem type." +-#~ msgstr "tipo de modem desconhecido." +- +-#~ msgid "_Save..." +-#~ msgstr "_Salvar..." +- +-#~ msgid "_Edit..." +-#~ msgstr "_Editar..." +- +-#~ msgid "_Delete..." +-#~ msgstr "E_xcluir..." +- +-#~ msgid "No Certificate Authority certificate chosen" +-#~ msgstr "Nenhum certificado de autoridade certificadora escolhido" +- +-#~ msgid "" +-#~ "Not using a Certificate Authority (CA) certificate can result in " +-#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +-#~ "a Certificate Authority certificate?" +-#~ msgstr "" +-#~ "Não usar um certificado de Autoridade Certificadora (CA) pode resultar em " +-#~ "conexões inseguras, redes Wi-Fi vulneráveis e não confiáveis. Você " +-#~ "gostaria de escolher um certificado de Autoridade Certificadora?" +diff --git a/po/ru.po b/po/ru.po +index 31cca46..3f59a92 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -8,14 +8,14 @@ + # Andrey Cherepanov , 2009, 2010. + # Yuri Myasoedov , 2012, 2013. + # Stas Solovey , 2011, 2014, 2017. +-# ++# lrintel , 2017. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: NetworkManager-applet\n" ++"Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2017-05-10 12:44+0200\n" +-"PO-Revision-Date: 2017-04-03 22:50+0300\n" +-"Last-Translator: Stas Solovey \n" ++"POT-Creation-Date: 2017-11-07 19:40+0100\n" ++"PO-Revision-Date: 2017-11-07 06:44+0000\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: Русский \n" + "Language: ru\n" + "MIME-Version: 1.0\n" +@@ -23,9 +23,9 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" + "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +-"X-Generator: Poedit 1.8.11\n" ++"X-Generator: Zanata 4.3.2\n" + +-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175 ++#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191 + msgid "Network" + msgstr "Сеть" + +@@ -34,7 +34,7 @@ msgid "Manage your network connections" + msgstr "Управление сетевыми соединениями" + + #: ../nm-connection-editor.desktop.in.h:1 +-#: ../src/connection-editor/nm-connection-editor.ui.h:1 ++#: ../src/connection-editor/nm-connection-list.ui.h:1 + msgid "Network Connections" + msgstr "Сетевые соединения" + +@@ -160,55 +160,68 @@ msgstr "" + msgid "The NetworkManager Developers" + msgstr "Разработчики NetworkManager" + +-#: ../shared/nm-utils/nm-shared-utils.c:185 ++#: ../shared/nm-utils/nm-shared-utils.c:477 + #, c-format + msgid "object class '%s' has no property named '%s'" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:192 ++#: ../shared/nm-utils/nm-shared-utils.c:484 + #, c-format + msgid "property '%s' of object class '%s' is not writable" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:199 ++#: ../shared/nm-utils/nm-shared-utils.c:491 + #, c-format + msgid "" + "construct property \"%s\" for object '%s' can't be set after construction" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:207 ++#: ../shared/nm-utils/nm-shared-utils.c:499 + #, c-format + msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:216 ++#: ../shared/nm-utils/nm-shared-utils.c:508 + #, c-format + msgid "unable to set property '%s' of type '%s' from value of type '%s'" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:227 ++#: ../shared/nm-utils/nm-shared-utils.c:519 + #, c-format + msgid "" + "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " + "type '%s'" + msgstr "" + +-#. *************************************************************************** + #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99 + msgid "802.1X authentication" + msgstr "Аутентификация 802.1X" + +-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1 ++#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349 ++#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1 + #: ../src/connection-editor/ce-ip6-routes.ui.h:1 + #: ../src/connection-editor/ce-new-connection.ui.h:1 + #: ../src/connection-editor/ce-page-dcb.ui.h:17 + #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1 +-#: ../src/connection-editor/nm-connection-editor.ui.h:8 +-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1 ++#: ../src/connection-editor/connection-helpers.c:308 ++#: ../src/connection-editor/connection-helpers.c:771 ++#: ../src/connection-editor/nm-connection-editor.ui.h:5 ++#: ../src/connection-editor/page-bluetooth.c:311 ++#: ../src/connection-editor/page-mobile.c:543 ++#: ../src/connection-editor/page-proxy.c:121 ++#: ../src/connection-editor/page-team.c:344 ++#: ../src/connection-editor/page-team-port.c:206 ++#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1 ++#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1 ++#: ../src/libnma/nma-vpn-password-dialog.c:209 ++#: ../src/libnma/nma-wifi-dialog.c:1066 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209 ++#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465 + msgid "_Cancel" + msgstr "_Отменить" + +-#: ../src/8021x.ui.h:3 ++#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072 ++#: ../src/libnm-gtk/nm-wifi-dialog.c:1073 + msgid "C_onnect" + msgstr "П_одключиться" + +@@ -224,37 +237,37 @@ msgstr "ad-hoc" + msgid "secure." + msgstr "безопасный." + +-#: ../src/applet.c:381 ++#: ../src/applet.c:392 + msgid "Failed to add/activate connection" + msgstr "Не удалось создать/включить соединение" + +-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472 +-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410 ++#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483 ++#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411 + msgid "Unknown error" + msgstr "Неизвестная ошибка" + +-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539 +-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413 ++#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539 ++#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414 + msgid "Connection failure" + msgstr "Сбой подключения" + +-#: ../src/applet.c:435 ++#: ../src/applet.c:446 + msgid "Device disconnect failed" + msgstr "Сбой устройства при отключении" + +-#: ../src/applet.c:440 ++#: ../src/applet.c:451 + msgid "Disconnect failure" + msgstr "Сбой при отключении" + +-#: ../src/applet.c:470 ++#: ../src/applet.c:481 + msgid "Connection activation failed" + msgstr "Сбой при включении соединения" + +-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126 ++#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127 + msgid "Don’t show this message again" + msgstr "Больше не показывать это сообщение" + +-#: ../src/applet.c:883 ++#: ../src/applet.c:899 + #, c-format + msgid "" + "\n" +@@ -264,7 +277,7 @@ msgstr "" + "\n" + "VPN-соединение «%s» разорвано, поскольку подключение к сети было прервано." + +-#: ../src/applet.c:885 ++#: ../src/applet.c:901 + #, c-format + msgid "" + "\n" +@@ -275,7 +288,7 @@ msgstr "" + "Произошёл сбой VPN-соединения «%s», поскольку подключение к сети было " + "прервано." + +-#: ../src/applet.c:887 ++#: ../src/applet.c:903 + #, c-format + msgid "" + "\n" +@@ -285,7 +298,7 @@ msgstr "" + "Произошёл сбой VPN-соединения «%s», поскольку служба VPN неожиданно " + "завершилась." + +-#: ../src/applet.c:889 ++#: ../src/applet.c:905 + #, c-format + msgid "" + "\n" +@@ -296,7 +309,7 @@ msgstr "" + "Произошёл сбой VPN-соединения «%s», поскольку служба VPN вернула неверную " + "конфигурацию." + +-#: ../src/applet.c:891 ++#: ../src/applet.c:907 + #, c-format + msgid "" + "\n" +@@ -305,7 +318,7 @@ msgstr "" + "\n" + "Произошёл сбой VPN-соединения «%s», поскольку превышено время ожидания." + +-#: ../src/applet.c:893 ++#: ../src/applet.c:909 + #, c-format + msgid "" + "\n" +@@ -315,7 +328,7 @@ msgstr "" + "Произошёл сбой VPN-соединения «%s», поскольку служба VPN не запустилась " + "вовремя." + +-#: ../src/applet.c:895 ++#: ../src/applet.c:911 + #, c-format + msgid "" + "\n" +@@ -325,7 +338,7 @@ msgstr "" + "Произошёл сбой VPN-соединения «%s», поскольку не удалось запустить службу " + "VPN." + +-#: ../src/applet.c:897 ++#: ../src/applet.c:913 + #, c-format + msgid "" + "\n" +@@ -335,7 +348,7 @@ msgstr "" + "Произошёл сбой соединения VPN «%s», поскольку не удалось найти подходящий " + "ключ VPN." + +-#: ../src/applet.c:899 ++#: ../src/applet.c:915 + #, c-format + msgid "" + "\n" +@@ -344,7 +357,7 @@ msgstr "" + "\n" + "Не удалось установить VPN-соединение «%s», неверный ключ доступа VPN." + +-#: ../src/applet.c:904 ++#: ../src/applet.c:920 + #, c-format + msgid "" + "\n" +@@ -353,7 +366,7 @@ msgstr "" + "\n" + "Сбой VPN-соединения «%s»." + +-#: ../src/applet.c:931 ++#: ../src/applet.c:947 + #, c-format + msgid "" + "VPN connection has been successfully established.\n" +@@ -364,19 +377,19 @@ msgstr "" + "\n" + "%s\n" + +-#: ../src/applet.c:933 ++#: ../src/applet.c:949 + msgid "VPN connection has been successfully established.\n" + msgstr "Соединение VPN успешно установлено.\n" + +-#: ../src/applet.c:935 ++#: ../src/applet.c:951 + msgid "VPN Login Message" + msgstr "Сообщение авторизации VPN" + +-#: ../src/applet.c:943 ../src/applet.c:983 ++#: ../src/applet.c:959 ../src/applet.c:999 + msgid "VPN Connection Failed" + msgstr "Сбой соединения VPN" + +-#: ../src/applet.c:987 ++#: ../src/applet.c:1003 + #, c-format + msgid "" + "\n" +@@ -389,7 +402,7 @@ msgstr "" + "\n" + "%s" + +-#: ../src/applet.c:990 ++#: ../src/applet.c:1006 + #, c-format + msgid "" + "\n" +@@ -402,144 +415,144 @@ msgstr "" + "\n" + "%s" + +-#: ../src/applet.c:1279 ++#: ../src/applet.c:1295 + msgid "device not ready (firmware missing)" + msgstr "устройство не готово (нет прошивки)" + +-#: ../src/applet.c:1281 ++#: ../src/applet.c:1297 + msgid "device not ready" + msgstr "устройство не готово" + + #. Notify user of unmanaged or unavailable device +-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109 ++#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109 + msgid "disconnected" + msgstr "соединение разорвано" + +-#: ../src/applet.c:1307 ++#: ../src/applet.c:1323 + msgid "Disconnect" + msgstr "Отключиться" + +-#: ../src/applet.c:1321 ++#: ../src/applet.c:1337 + msgid "device not managed" + msgstr "устройство не управляется" + +-#: ../src/applet.c:1394 ++#: ../src/applet.c:1410 + msgid "No network devices available" + msgstr "Нет доступных сетевых устройств" + +-#: ../src/applet.c:1448 ++#: ../src/applet.c:1464 + msgid "_VPN Connections" + msgstr "Соединения _VPN" + +-#: ../src/applet.c:1492 ++#: ../src/applet.c:1508 + msgid "_Configure VPN…" + msgstr "_Настроить VPN…" + +-#: ../src/applet.c:1495 ++#: ../src/applet.c:1511 + msgid "_Add a VPN connection…" + msgstr "_Добавить VPN-соединение…" + +-#: ../src/applet.c:1601 ++#: ../src/applet.c:1617 + msgid "NetworkManager is not running…" + msgstr "Служба NetworkManager не запущена…" + +-#: ../src/applet.c:1606 ../src/applet.c:2671 ++#: ../src/applet.c:1622 ../src/applet.c:2687 + msgid "Networking disabled" + msgstr "Поддержка сети отключена" + + #. 'Enable Networking' item +-#: ../src/applet.c:1816 ++#: ../src/applet.c:1832 + msgid "Enable _Networking" + msgstr "Включить поддержку сети" + + #. 'Enable Wi-Fi' item +-#: ../src/applet.c:1825 ++#: ../src/applet.c:1841 + msgid "Enable _Wi-Fi" + msgstr "Включить _Wi-Fi" + + #. 'Enable Mobile Broadband' item +-#: ../src/applet.c:1834 ++#: ../src/applet.c:1850 + msgid "Enable _Mobile Broadband" + msgstr "Включить _мобильную связь" + + #. Toggle notifications item +-#: ../src/applet.c:1846 ++#: ../src/applet.c:1862 + msgid "Enable N_otifications" + msgstr "Включить _уведомления" + + #. 'Connection Information' item +-#: ../src/applet.c:1858 ++#: ../src/applet.c:1874 + msgid "Connection _Information" + msgstr "C_ведения о соединении" + + #. 'Edit Connections...' item +-#: ../src/applet.c:1866 ++#: ../src/applet.c:1882 + msgid "Edit Connections…" + msgstr "Изменить соединения…" + +-#: ../src/applet.c:1880 ++#: ../src/applet.c:1896 + msgid "_About" + msgstr "_О программе" + +-#: ../src/applet.c:2191 ++#: ../src/applet.c:2207 + #, c-format + msgid "You are now connected to “%s”." + msgstr "Вы подключены к сети «%s»." + +-#: ../src/applet.c:2231 ++#: ../src/applet.c:2247 + msgid "Disconnected" + msgstr "Соединение разорвано" + +-#: ../src/applet.c:2232 ++#: ../src/applet.c:2248 + msgid "The network connection has been disconnected." + msgstr "Сетевое соединение было разорвано." + +-#: ../src/applet.c:2534 ++#: ../src/applet.c:2550 + #, c-format + msgid "Preparing network connection “%s”…" + msgstr "Подготовка сетевого соединения «%s»…" + +-#: ../src/applet.c:2537 ++#: ../src/applet.c:2553 + #, c-format + msgid "User authentication required for network connection “%s”…" + msgstr "Для сетевого соединения «%s» требуется аутентификация…" + +-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125 +-#: ../src/mobile-helpers.c:608 ++#: ../src/applet.c:2556 ../src/applet-device-bt.c:125 ++#: ../src/mobile-helpers.c:607 + #, c-format + msgid "Requesting a network address for “%s”…" + msgstr "Получение сетевого адреса для «%s»…" + +-#: ../src/applet.c:2543 ++#: ../src/applet.c:2559 + #, c-format + msgid "Network connection “%s” active" + msgstr "Сетевое соединение «%s» активно" + +-#: ../src/applet.c:2616 ++#: ../src/applet.c:2632 + #, c-format + msgid "Starting VPN connection “%s”…" + msgstr "Устанавливается VPN-соединение «%s»…" + +-#: ../src/applet.c:2619 ++#: ../src/applet.c:2635 + #, c-format + msgid "User authentication required for VPN connection “%s”…" + msgstr "Для VPN-соединения «%s» требуется аутентификация…" + +-#: ../src/applet.c:2622 ++#: ../src/applet.c:2638 + #, c-format + msgid "Requesting a VPN address for “%s”…" + msgstr "Запрос адреса VPN для «%s»…" + +-#: ../src/applet.c:2625 ++#: ../src/applet.c:2641 + #, c-format + msgid "VPN connection active" + msgstr "VPN-соединение активно" + +-#: ../src/applet.c:2675 ++#: ../src/applet.c:2691 + msgid "No network connection" + msgstr "Нет подключения к сети" + +-#: ../src/applet.c:3276 ++#: ../src/applet.c:3292 + msgid "NetworkManager Applet" + msgstr "Апплет NetworkManager" + +@@ -556,46 +569,46 @@ msgstr "Неправильный PIN-код, обратитесь к опера + msgid "Sending unlock code…" + msgstr "Отправка кода разблокировки…" + +-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506 ++#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507 + #, c-format + msgid "Mobile Broadband (%s)" + msgstr "Мобильная связь (%s)" + +-#: ../src/applet-device-broadband.c:738 +-#: ../src/connection-editor/connection-helpers.c:107 ++#: ../src/applet-device-broadband.c:739 ++#: ../src/connection-editor/connection-helpers.c:108 + #: ../src/connection-editor/page-mobile.c:308 + #: ../src/libnm-gtk/nm-ui-utils.c:329 + msgid "Mobile Broadband" + msgstr "Мобильная связь" + +-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75 +-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906 ++#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75 ++#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907 + msgid "Available" + msgstr "Доступно" + + #. Default connection item +-#: ../src/applet-device-broadband.c:803 ++#: ../src/applet-device-broadband.c:805 + msgid "New Mobile Broadband connection…" + msgstr "Создать подключение мобильной связи…" + +-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87 +-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308 ++#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87 ++#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309 + msgid "Connection Established" + msgstr "Соединение установлено" + +-#: ../src/applet-device-broadband.c:818 ++#: ../src/applet-device-broadband.c:820 + msgid "You are now connected to the Mobile Broadband network." + msgstr "Вы подключены к сети мобильной связи." + +-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964 ++#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966 + msgid "Mobile Broadband network." + msgstr "Сеть мобильной связи." + +-#: ../src/applet-device-broadband.c:959 ++#: ../src/applet-device-broadband.c:961 + msgid "You are now registered on the home network." + msgstr "Вы зарегистрированы в домашней сети." + +-#: ../src/applet-device-broadband.c:965 ++#: ../src/applet-device-broadband.c:967 + msgid "You are now registered on a roaming network." + msgstr "Вы зарегистрированы в роуминговой сети." + +@@ -603,22 +616,22 @@ msgstr "Вы зарегистрированы в роуминговой сети + msgid "You are now connected to the mobile broadband network." + msgstr "Вы подключены к сети мобильной связи." + +-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599 ++#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598 + #, c-format + msgid "Preparing mobile broadband connection “%s”…" + msgstr "Подготовка соединения мобильной связи «%s»…" + +-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602 ++#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601 + #, c-format + msgid "Configuring mobile broadband connection “%s”…" + msgstr "Настройка соединения мобильной связи «%s»…" + +-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605 ++#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604 + #, c-format + msgid "User authentication required for mobile broadband connection “%s”…" + msgstr "Для соединения мобильной связи «%s» требуется аутентификация…" + +-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627 ++#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626 + #, c-format + msgid "Mobile broadband connection “%s” active" + msgstr "Соединение мобильной связи «%s» активно" +@@ -678,6 +691,18 @@ msgstr "Сетевое соединение ethernet «%s» активно" + msgid "DSL authentication" + msgstr "Аутентификация DSL" + ++#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060 ++#: ../src/connection-editor/ce-ip4-routes.ui.h:2 ++#: ../src/connection-editor/ce-ip6-routes.ui.h:2 ++#: ../src/connection-editor/ce-page-dcb.ui.h:18 ++#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2 ++#: ../src/connection-editor/page-bluetooth.c:313 ++#: ../src/connection-editor/page-mobile.c:545 ++#: ../src/libnma/nma-vpn-password-dialog.c:210 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466 ++msgid "_OK" ++msgstr "_ОК" ++ + #: ../src/applet-device-wifi.c:225 + msgid "_Connect to Hidden Wi-Fi Network…" + msgstr "_Подключиться к скрытой сети Wi-Fi…" +@@ -690,7 +715,7 @@ msgstr "Создать _новую сеть Wi-Fi…" + msgid "(none)" + msgstr "(нет)" + +-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408 ++#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409 + msgid "Failed to add new connection" + msgstr "Не удалось добавить новое соединение" + +@@ -698,79 +723,79 @@ msgstr "Не удалось добавить новое соединение" + msgid "Insufficient privileges." + msgstr "Недостаточно прав." + +-#: ../src/applet-device-wifi.c:838 ++#: ../src/applet-device-wifi.c:839 + #, c-format + msgid "Wi-Fi Networks (%s)" + msgstr "Сети Wi-Fi (%s)" + +-#: ../src/applet-device-wifi.c:840 ++#: ../src/applet-device-wifi.c:841 + #, c-format + msgid "Wi-Fi Network (%s)" + msgstr "Сеть Wi-Fi (%s)" + +-#: ../src/applet-device-wifi.c:842 ++#: ../src/applet-device-wifi.c:843 + msgid "Wi-Fi Network" + msgid_plural "Wi-Fi Networks" + msgstr[0] "Сеть Wi-Fi" + msgstr[1] "Сети Wi-Fi" + msgstr[2] "Сетей Wi-Fi" + +-#: ../src/applet-device-wifi.c:871 ++#: ../src/applet-device-wifi.c:872 + msgid "Wi-Fi is disabled" + msgstr "Wi-Fi выключен" + +-#: ../src/applet-device-wifi.c:872 ++#: ../src/applet-device-wifi.c:873 + msgid "Wi-Fi is disabled by hardware switch" + msgstr "Wi-Fi выключен механическим переключателем" + +-#: ../src/applet-device-wifi.c:933 ++#: ../src/applet-device-wifi.c:934 + msgid "More networks" + msgstr "Ещё сети" + +-#: ../src/applet-device-wifi.c:1122 ++#: ../src/applet-device-wifi.c:1123 + msgid "Wi-Fi Networks Available" + msgstr "Доступны сети Wi-Fi" + +-#: ../src/applet-device-wifi.c:1123 ++#: ../src/applet-device-wifi.c:1124 + msgid "Use the network menu to connect to a Wi-Fi network" + msgstr "Используйте меню сети для подключения к сети Wi-Fi" + +-#: ../src/applet-device-wifi.c:1307 ++#: ../src/applet-device-wifi.c:1308 + #, c-format + msgid "You are now connected to the Wi-Fi network “%s”." + msgstr "Вы подключены к сети Wi-Fi «%s»." + +-#: ../src/applet-device-wifi.c:1342 ++#: ../src/applet-device-wifi.c:1343 + #, c-format + msgid "Preparing Wi-Fi network connection “%s”…" + msgstr "Подготовка сетевого соединения Wi-Fi «%s»…" + +-#: ../src/applet-device-wifi.c:1345 ++#: ../src/applet-device-wifi.c:1346 + #, c-format + msgid "Configuring Wi-Fi network connection “%s”…" + msgstr "Настройка сетевого соединения Wi-Fi «%s»…" + +-#: ../src/applet-device-wifi.c:1348 ++#: ../src/applet-device-wifi.c:1349 + #, c-format + msgid "User authentication required for Wi-Fi network “%s”…" + msgstr "Для соединения Wi-Fi «%s» требуется аутентификация…" + +-#: ../src/applet-device-wifi.c:1351 ++#: ../src/applet-device-wifi.c:1352 + #, c-format + msgid "Requesting a Wi-Fi network address for “%s”…" + msgstr "Запрос адреса сети Wi-Fi для «%s»…" + +-#: ../src/applet-device-wifi.c:1362 ++#: ../src/applet-device-wifi.c:1363 + #, c-format + msgid "Wi-Fi network connection “%s” active: %s (%d%%)" + msgstr "Сетевое соединение Wi-Fi «%s» активно: %s (%d%%)" + +-#: ../src/applet-device-wifi.c:1366 ++#: ../src/applet-device-wifi.c:1367 + #, c-format + msgid "Wi-Fi network connection “%s” active" + msgstr "Сетевое соединение Wi-Fi «%s» активно" + +-#: ../src/applet-device-wifi.c:1385 ++#: ../src/applet-device-wifi.c:1386 + msgid "Failed to activate connection" + msgstr "Не удалось включить соединение" + +@@ -778,195 +803,196 @@ msgstr "Не удалось включить соединение" + msgid "Error displaying connection information:" + msgstr "Ошибка показа сведений о соединении:" + +-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379 ++#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381 + #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948 + #: ../src/wireless-security/wireless-security.c:448 + msgid "LEAP" + msgstr "LEAP" + +-#: ../src/applet-dialogs.c:74 ++#: ../src/applet-dialogs.c:75 + msgid "Dynamic WEP" + msgstr "Динамический WEP" + +-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228 +-#: ../src/applet-dialogs.c:230 ++#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229 ++#: ../src/applet-dialogs.c:231 + msgid "WPA/WPA2" + msgstr "WPA/WPA2" + + #. Create the expander +-#: ../src/applet-dialogs.c:151 ++#: ../src/applet-dialogs.c:152 + msgid "More addresses" + msgstr "Дополнительные адреса" + +-#: ../src/applet-dialogs.c:226 ++#: ../src/applet-dialogs.c:227 + msgid "WEP" + msgstr "WEP" + +-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243 +-#: ../src/connection-editor/page-wifi-security.c:330 ++#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244 ++#: ../src/connection-editor/page-wifi-security.c:332 + msgctxt "Wi-Fi/Ethernet security" + msgid "None" + msgstr "Нет" + +-#: ../src/applet-dialogs.c:260 ++#: ../src/applet-dialogs.c:261 + #, c-format + msgid "%s (default)" + msgstr "%s (по умолчанию)" + +-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580 ++#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581 + #, c-format + msgid "%u Mb/s" + msgstr "%u Мбит/c" + +-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582 ++#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583 + msgctxt "Speed" + msgid "Unknown" + msgstr "Неизвестно" + + #. Address +-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368 ++#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369 + msgctxt "Address" + msgid "Unknown" + msgstr "Неизвестно" + +-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420 ++#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421 + msgid "IP Address:" + msgstr "IP-адрес:" + +-#: ../src/applet-dialogs.c:369 ++#: ../src/applet-dialogs.c:370 + msgid "Broadcast Address:" + msgstr "Широковещательный адрес:" + + #. Prefix +-#: ../src/applet-dialogs.c:381 ++#: ../src/applet-dialogs.c:382 + msgctxt "Subnet Mask" + msgid "Unknown" + msgstr "Неизвестно" + +-#: ../src/applet-dialogs.c:382 ++#: ../src/applet-dialogs.c:383 + msgid "Subnet Mask:" + msgstr "Маска подсети:" + +-#: ../src/applet-dialogs.c:492 ++#: ../src/applet-dialogs.c:493 + #, c-format + msgid "Ethernet (%s)" + msgstr "Ethernet (%s)" + +-#: ../src/applet-dialogs.c:495 ++#: ../src/applet-dialogs.c:496 + #, c-format + msgid "802.11 WiFi (%s)" + msgstr "802.11 WiFi (%s)" + +-#: ../src/applet-dialogs.c:502 ++#: ../src/applet-dialogs.c:503 + #, c-format + msgid "GSM (%s)" + msgstr "GSM (%s)" + +-#: ../src/applet-dialogs.c:504 ++#: ../src/applet-dialogs.c:505 + #, c-format + msgid "CDMA (%s)" + msgstr "CDMA (%s)" + + #. --- General --- +-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810 ++#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811 + #: ../src/connection-editor/ce-page-team-port.ui.h:23 + #: ../src/connection-editor/ce-page-team.ui.h:48 + #: ../src/connection-editor/page-general.c:367 + msgid "General" + msgstr "Основное" + +-#: ../src/applet-dialogs.c:516 ++#: ../src/applet-dialogs.c:517 + msgid "Interface:" + msgstr "Интерфейс:" + +-#: ../src/applet-dialogs.c:536 ++#: ../src/applet-dialogs.c:537 + msgid "Hardware Address:" + msgstr "Аппаратный адрес:" + + #. Driver +-#: ../src/applet-dialogs.c:550 ++#: ../src/applet-dialogs.c:551 + msgid "Driver:" + msgstr "Драйвер:" + +-#: ../src/applet-dialogs.c:585 ++#: ../src/applet-dialogs.c:586 + msgid "Speed:" + msgstr "Скорость:" + +-#: ../src/applet-dialogs.c:600 ++#: ../src/applet-dialogs.c:601 + msgid "Security:" + msgstr "Защита:" + + #. --- IPv4 --- +-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851 ++#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852 + #: ../src/connection-editor/ce-page-team.ui.h:29 + msgid "IPv4" + msgstr "IPv4" + +-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689 ++#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690 + msgid "Default Route:" + msgstr "Шлюз по умолчанию:" + + #. --- IPv6 --- +-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873 ++#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874 + #: ../src/connection-editor/ce-page-team.ui.h:30 + msgid "IPv6" + msgstr "IPv6" + +-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882 ++#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883 + msgid "Ignored" + msgstr "Игнорируется" + +-#: ../src/applet-dialogs.c:815 ++#: ../src/applet-dialogs.c:816 + msgid "VPN Type:" + msgstr "Тип VPN:" + +-#: ../src/applet-dialogs.c:822 ++#: ../src/applet-dialogs.c:823 + msgid "VPN Gateway:" + msgstr "Шлюз VPN:" + +-#: ../src/applet-dialogs.c:828 ++#: ../src/applet-dialogs.c:829 + msgid "VPN Username:" + msgstr "Имя пользователя VPN:" + +-#: ../src/applet-dialogs.c:834 ++#: ../src/applet-dialogs.c:835 + msgid "VPN Banner:" + msgstr "Баннер VPN:" + +-#: ../src/applet-dialogs.c:840 ++#: ../src/applet-dialogs.c:841 + msgid "Base Connection:" + msgstr "Основное соединение:" + +-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343 ++#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343 + msgid "Unknown" + msgstr "Неизвестно" + + #. Shouldn't really happen but ... +-#: ../src/applet-dialogs.c:957 ++#: ../src/applet-dialogs.c:958 + msgid "No valid active connections found!" + msgstr "Активные соединения отсутствуют!" + +-#: ../src/applet-dialogs.c:985 ++#: ../src/applet-dialogs.c:1007 + msgid "" +-"Copyright © 2004-2014 Red Hat, Inc.\n" ++"Copyright © 2004-2017 Red Hat, Inc.\n" + "Copyright © 2005-2008 Novell, Inc.\n" + "and many other community contributors and translators" + msgstr "" +-"Авторское право © 2004-2014 Red Hat, Inc.\n" +-"Авторское право © 2005-2008 Novell, Inc.\n" +-"и многие другие участники сообщества и переводчики" + +-#: ../src/applet-dialogs.c:988 ++#: ../src/applet-dialogs.c:1010 + msgid "" + "Notification area applet for managing your network devices and connections." + msgstr "" + "Апплет области уведомления для управления сетевыми устройствами и " + "соединениями." + +-#: ../src/applet-dialogs.c:990 ++#: ../src/applet-dialogs.c:1012 + msgid "NetworkManager Website" + msgstr "Веб-сайт NetworkManager" + +-#: ../src/applet-dialogs.c:1001 ++#: ../src/applet-dialogs.c:1016 ++msgid "translator-credits" ++msgstr "" ++ ++#: ../src/applet-dialogs.c:1026 + msgid "" + "The NetworkManager Applet could not find some required resources (the .ui " + "file was not found)." +@@ -974,33 +1000,33 @@ msgstr "" + "Апплет NetworkManager не смог найти некоторые необходимые ресурсы (не " + "найден .ui-файл интерфейса)." + +-#: ../src/applet-dialogs.c:1006 ++#: ../src/applet-dialogs.c:1031 + msgid "Missing resources" + msgstr "Отсутствуют ресурсы" + +-#: ../src/applet-dialogs.c:1031 ++#: ../src/applet-dialogs.c:1057 + msgid "Mobile broadband network password" + msgstr "Пароль сети мобильной связи" + +-#: ../src/applet-dialogs.c:1040 ++#: ../src/applet-dialogs.c:1066 + #, c-format + msgid "A password is required to connect to “%s”." + msgstr "Для подключения к «%s» требуется пароль." + +-#: ../src/applet-dialogs.c:1055 ++#: ../src/applet-dialogs.c:1081 + msgid "Password:" + msgstr "Пароль:" + +-#: ../src/applet-dialogs.c:1337 ++#: ../src/applet-dialogs.c:1363 + msgid "SIM PIN unlock required" + msgstr "Для разблокировки SIM требуется PIN-код" + +-#: ../src/applet-dialogs.c:1338 ++#: ../src/applet-dialogs.c:1364 + msgid "SIM PIN Unlock Required" + msgstr "Для разблокировки SIM требуется PIN-код" + + #. FIXME: some warning about # of times you can enter incorrect PIN +-#: ../src/applet-dialogs.c:1340 ++#: ../src/applet-dialogs.c:1366 + #, c-format + msgid "" + "The mobile broadband device “%s” requires a SIM PIN code before it can be " +@@ -1008,25 +1034,25 @@ msgid "" + msgstr "Для работы устройства мобильной связи «%s» требуется PIN-код SIM." + + #. Translators: PIN code entry label +-#: ../src/applet-dialogs.c:1342 ++#: ../src/applet-dialogs.c:1368 + msgid "PIN code:" + msgstr "PIN-код:" + + #. Translators: Show/obscure PIN checkbox label +-#: ../src/applet-dialogs.c:1346 ++#: ../src/applet-dialogs.c:1372 + msgid "Show PIN code" + msgstr "Показывать PIN-код" + +-#: ../src/applet-dialogs.c:1348 ++#: ../src/applet-dialogs.c:1374 + msgid "SIM PUK unlock required" + msgstr "Для разблокировки SIM требуется PUK-код" + +-#: ../src/applet-dialogs.c:1349 ++#: ../src/applet-dialogs.c:1375 + msgid "SIM PUK Unlock Required" + msgstr "Для разблокировки SIM требуется PUK-код" + + #. FIXME: some warning about # of times you can enter incorrect PUK +-#: ../src/applet-dialogs.c:1351 ++#: ../src/applet-dialogs.c:1377 + #, c-format + msgid "" + "The mobile broadband device “%s” requires a SIM PUK code before it can be " +@@ -1034,32 +1060,25 @@ msgid "" + msgstr "Для работы устройства мобильной связи «%s» требуется PUK-код SIM." + + #. Translators: PUK code entry label +-#: ../src/applet-dialogs.c:1353 ++#: ../src/applet-dialogs.c:1379 + msgid "PUK code:" + msgstr "PUK-код:" + + #. Translators: New PIN entry label +-#: ../src/applet-dialogs.c:1356 ++#: ../src/applet-dialogs.c:1382 + msgid "New PIN code:" + msgstr "Новый PIN-код:" + + #. Translators: New PIN verification entry label +-#: ../src/applet-dialogs.c:1358 ++#: ../src/applet-dialogs.c:1384 + msgid "Re-enter new PIN code:" + msgstr "Введите новый PIN-код ещё раз:" + + #. Translators: Show/obscure PIN/PUK checkbox label +-#: ../src/applet-dialogs.c:1363 ++#: ../src/applet-dialogs.c:1389 + msgid "Show PIN/PUK codes" + msgstr "Показывать PIN/PUK-коды" + +-#: ../src/connection-editor/ce-ip4-routes.ui.h:2 +-#: ../src/connection-editor/ce-ip6-routes.ui.h:2 +-#: ../src/connection-editor/ce-page-dcb.ui.h:18 +-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2 +-msgid "_OK" +-msgstr "_ОК" +- + #: ../src/connection-editor/ce-ip4-routes.ui.h:3 + #: ../src/connection-editor/ce-ip6-routes.ui.h:3 + #: ../src/connection-editor/ce-page.h:114 +@@ -1075,21 +1094,21 @@ msgstr "" + #: ../src/connection-editor/ce-page-bond.ui.h:12 + #: ../src/connection-editor/ce-page-bridge.ui.h:2 + #: ../src/connection-editor/ce-page-ip4.ui.h:7 +-#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++#: ../src/connection-editor/ce-page-ip6.ui.h:12 + #: ../src/connection-editor/ce-page-team.ui.h:13 +-#: ../src/connection-editor/nm-connection-editor.ui.h:3 ++#: ../src/connection-editor/nm-connection-list.ui.h:3 + msgid "_Add" + msgstr "_Добавить" + +-#. Delete + #: ../src/connection-editor/ce-ip4-routes.ui.h:5 + #: ../src/connection-editor/ce-ip6-routes.ui.h:5 + #: ../src/connection-editor/ce-page-bond.ui.h:14 + #: ../src/connection-editor/ce-page-bridge.ui.h:4 + #: ../src/connection-editor/ce-page-ip4.ui.h:8 +-#: ../src/connection-editor/ce-page-ip6.ui.h:11 ++#: ../src/connection-editor/ce-page-ip6.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:15 +-#: ../src/connection-editor/nm-connection-list.c:711 ++#: ../src/connection-editor/connection-helpers.c:772 ++#: ../src/connection-editor/nm-connection-list.ui.h:4 + msgid "_Delete" + msgstr "_Удалить" + +@@ -1181,11 +1200,10 @@ msgstr "Агрегированные _соединения (bond):" + msgid "M_ode:" + msgstr "_Режим:" + +-#. Edit + #: ../src/connection-editor/ce-page-bond.ui.h:13 + #: ../src/connection-editor/ce-page-bridge.ui.h:3 + #: ../src/connection-editor/ce-page-team.ui.h:14 +-#: ../src/connection-editor/nm-connection-list.c:695 ++#: ../src/connection-editor/nm-connection-list.ui.h:5 + msgid "_Edit" + msgstr "_Изменить" + +@@ -1241,7 +1259,7 @@ msgstr "" + + #: ../src/connection-editor/ce-page-bond.ui.h:25 + #: ../src/connection-editor/ce-page-ethernet.ui.h:17 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:4 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:8 + #: ../src/connection-editor/ce-page-team.ui.h:17 + #: ../src/connection-editor/ce-page-vlan.ui.h:4 + #: ../src/connection-editor/ce-page-wifi.ui.h:8 +@@ -1250,7 +1268,7 @@ msgstr "_MTU:" + + #: ../src/connection-editor/ce-page-bond.ui.h:26 + #: ../src/connection-editor/ce-page-ethernet.ui.h:18 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:3 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:7 + #: ../src/connection-editor/ce-page-team.ui.h:18 + #: ../src/connection-editor/ce-page-vlan.ui.h:5 + #: ../src/connection-editor/ce-page-wifi.ui.h:7 +@@ -1283,25 +1301,71 @@ msgid "_Hello time:" + msgstr "Интервал _hello:" + + #: ../src/connection-editor/ce-page-bridge.ui.h:9 ++msgid "STP forwarding delay, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:10 + msgid "s" + msgstr "с" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:10 ++#: ../src/connection-editor/ce-page-bridge.ui.h:11 ++msgid "STP hello time, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:12 + msgid "Enable I_GMP snooping" + msgstr "Включить I_GMP snooping" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:11 ++#: ../src/connection-editor/ce-page-bridge.ui.h:13 ++msgid "" ++"Controls whether IGMP snooping is enabled for this bridge. Note that if " ++"snooping was automatically disabled due to hash collisions, the system may " ++"refuse to enable the feature until the collisions are resolved." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:14 + msgid "Enable _STP (Spanning Tree Protocol)" + msgstr "Включить _STP (Spanning Tree Protocol)" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:12 ++#: ../src/connection-editor/ce-page-bridge.ui.h:15 ++msgid "" ++"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:16 ++msgid "" ++"STP priority for this bridge. Lower values are “better”; the lowest priority " ++"bridge will be elected the root bridge." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:17 + msgid "_Max age:" + msgstr "_Максимальное время жизни сообщения:" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:13 ++#: ../src/connection-editor/ce-page-bridge.ui.h:18 ++msgid "STP maximum message age, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:19 + msgid "_Aging time:" + msgstr "_Время жизни сообщения:" + ++#: ../src/connection-editor/ce-page-bridge.ui.h:20 ++msgid "The Ethernet MAC address aging time, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:21 ++msgid "Group _forward mask:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:22 ++msgid "" ++"A mask of 16 bits, each corresponding to a group address in the range from " ++"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask " ++"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause " ++"frames and LACP." ++msgstr "" ++ + #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112 + msgid "automatic" + msgstr "автоматический" +@@ -1555,10 +1619,20 @@ msgid "_Username:" + msgstr "_Имя пользователя:" + + #: ../src/connection-editor/ce-page-dsl.ui.h:2 ++msgid "Username used to authenticate with the PPPoE service." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:3 ++msgid "" ++"Only initiate sessions with access concentrators that provide the specified " ++"service. For most providers this should be left blank." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:4 + msgid "_Service:" + msgstr "С_лужба:" + +-#: ../src/connection-editor/ce-page-dsl.ui.h:3 ++#: ../src/connection-editor/ce-page-dsl.ui.h:5 + #: ../src/wireless-security/eap-method-leap.ui.h:3 + #: ../src/wireless-security/eap-method-simple.ui.h:3 + #: ../src/wireless-security/ws-leap.ui.h:3 +@@ -1566,7 +1640,11 @@ msgstr "С_лужба:" + msgid "Sho_w password" + msgstr "Пока_зывать пароль" + +-#: ../src/connection-editor/ce-page-dsl.ui.h:4 ++#: ../src/connection-editor/ce-page-dsl.ui.h:6 ++msgid "Password used to authenticate with the PPPoE service." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:7 + #: ../src/connection-editor/ce-page-mobile.ui.h:4 + #: ../src/libnma/nma-vpn-password-dialog.c:97 + #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97 +@@ -1577,13 +1655,29 @@ msgstr "Пока_зывать пароль" + msgid "_Password:" + msgstr "_Пароль:" + ++#: ../src/connection-editor/ce-page-dsl.ui.h:8 ++msgid "PPP _interface:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:9 ++msgid "P_arent interface:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:10 ++msgid "An arbitrary name to assign to the newly created PPP interface." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:11 ++msgid "The interface on which the PPP connection will be established." ++msgstr "" ++ + #: ../src/connection-editor/ce-page-ethernet.ui.h:1 + #: ../src/connection-editor/ce-page-ip4.ui.h:1 + #: ../src/connection-editor/ce-page-ip6.ui.h:1 +-#: ../src/connection-editor/ce-page-proxy.ui.h:3 ++#: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-wifi.ui.h:1 + #: ../src/connection-editor/page-ip4.c:131 +-#: ../src/connection-editor/page-ip6.c:136 ++#: ../src/connection-editor/page-ip6.c:142 + #: ../src/wireless-security/eap-method-peap.ui.h:1 + msgid "Automatic" + msgstr "Автоматический" +@@ -1629,7 +1723,7 @@ msgid "Full" + msgstr "Полный" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:12 +-#: ../src/connection-editor/page-ip6.c:149 ++#: ../src/connection-editor/page-ip6.c:155 + msgid "Ignore" + msgstr "Игнорировать" + +@@ -1637,7 +1731,7 @@ msgstr "Игнорировать" + #: ../src/connection-editor/ce-page-ip4.ui.h:3 + #: ../src/connection-editor/ce-page-ip6.ui.h:3 + #: ../src/connection-editor/page-ip4.c:168 +-#: ../src/connection-editor/page-ip6.c:185 ++#: ../src/connection-editor/page-ip6.c:191 + msgid "Manual" + msgstr "Вручную" + +@@ -1646,7 +1740,7 @@ msgid "_Port:" + msgstr "_Порт:" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:15 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:2 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:6 + #: ../src/connection-editor/ce-page-wifi.ui.h:9 + msgid "_Device:" + msgstr "_Устройство" +@@ -1795,20 +1889,20 @@ msgstr "Адреса" + msgid "Address (optional)" + msgstr "Адрес (опционально)" + +-#: ../src/connection-editor/ce-page-infiniband.ui.h:1 +-msgid "_Transport mode:" +-msgstr "_Транспортный режим:" +- + #. IP-over-InfiniBand "datagram mode" +-#: ../src/connection-editor/ce-page-infiniband.ui.h:6 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:2 + msgid "Datagram" + msgstr "Дейтаграмма" + + #. IP-over-InfiniBand "connected mode" +-#: ../src/connection-editor/ce-page-infiniband.ui.h:8 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:4 + msgid "Connected" + msgstr "Подключено" + ++#: ../src/connection-editor/ce-page-infiniband.ui.h:5 ++msgid "_Transport mode:" ++msgstr "_Транспортный режим:" ++ + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1 + msgid "IPIP" + msgstr "IPIP" +@@ -1846,36 +1940,39 @@ msgid "VTI6" + msgstr "VTI6" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10 +-msgid "Device name" +-msgstr "Имя устройства" ++#: ../src/connection-editor/ce-page-macsec.ui.h:6 ++msgid "Device name:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11 +-msgid "Parent device" +-msgstr "Родительское устройство" ++#: ../src/connection-editor/ce-page-macsec.ui.h:8 ++msgid "Parent device:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12 +-msgid "Mode" +-msgstr "Режим" ++#: ../src/connection-editor/ce-page-macsec.ui.h:16 ++msgid "Mode:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13 +-msgid "Local IP" +-msgstr "Локальный IP" ++msgid "Local IP:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14 +-msgid "Remote IP" +-msgstr "Удалённый IP" ++msgid "Remote IP:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15 +-msgid "Input key" +-msgstr "Ключ ввода" ++msgid "Input key:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16 +-msgid "Output key" +-msgstr "Ключ вывода" ++msgid "Output key:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17 +-msgid "MTU" +-msgstr "MTU" ++msgid "MTU:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip4.ui.h:2 + #: ../src/connection-editor/ce-page-ip6.ui.h:2 +@@ -1890,12 +1987,12 @@ msgstr "Локальная связь" + #: ../src/connection-editor/ce-page-ip4.ui.h:5 + #: ../src/connection-editor/ce-page-ip6.ui.h:5 + #: ../src/connection-editor/page-ip4.c:188 +-#: ../src/connection-editor/page-ip6.c:205 ++#: ../src/connection-editor/page-ip6.c:211 + msgid "Shared to other computers" + msgstr "Общий с другими компьютерами" + + #: ../src/connection-editor/ce-page-ip4.ui.h:6 +-#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++#: ../src/connection-editor/ce-page-ip6.ui.h:11 + msgid "_Method:" + msgstr "_Метод:" + +@@ -1910,7 +2007,7 @@ msgstr "" + "DHCP, введите его здесь." + + #: ../src/connection-editor/ce-page-ip4.ui.h:10 +-#: ../src/connection-editor/ce-page-ip6.ui.h:12 ++#: ../src/connection-editor/ce-page-ip6.ui.h:14 + msgid "" + "Domains used when resolving host names. Use commas to separate multiple " + "domains." +@@ -1923,16 +2020,16 @@ msgid "D_HCP client ID:" + msgstr "ID _клиента DHCP:" + + #: ../src/connection-editor/ce-page-ip4.ui.h:12 +-#: ../src/connection-editor/ce-page-ip6.ui.h:13 ++#: ../src/connection-editor/ce-page-ip6.ui.h:15 + #: ../src/connection-editor/page-ip4.c:372 +-#: ../src/connection-editor/page-ip6.c:335 ++#: ../src/connection-editor/page-ip6.c:346 + msgid "S_earch domains:" + msgstr "_Поисковый домен:" + + #: ../src/connection-editor/ce-page-ip4.ui.h:13 +-#: ../src/connection-editor/ce-page-ip6.ui.h:14 ++#: ../src/connection-editor/ce-page-ip6.ui.h:16 + #: ../src/connection-editor/page-ip4.c:363 +-#: ../src/connection-editor/page-ip6.c:326 ++#: ../src/connection-editor/page-ip6.c:337 + msgid "DNS ser_vers:" + msgstr "Серверы _DNS:" + +@@ -1957,11 +2054,12 @@ msgstr "" + "соединение в случае сбоя конфигурации IPv4, но успеха конфигурации IPv6." + + #: ../src/connection-editor/ce-page-ip4.ui.h:17 +-#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++#: ../src/connection-editor/ce-page-ip6.ui.h:22 + msgid "_Routes…" + msgstr "_Маршруты…" + + #: ../src/connection-editor/ce-page-ip6.ui.h:6 ++#: ../src/connection-editor/ce-page-macsec.ui.h:3 + #: ../src/connection-editor/page-ip4.c:198 + msgid "Disabled" + msgstr "Выключено" +@@ -1974,7 +2072,15 @@ msgstr "Включено (предпочитать открытый адрес)" + msgid "Enabled (prefer temporary address)" + msgstr "Включено (предпочитать временный адрес)" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:15 ++#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++msgid "EUI64" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++msgid "Stable privacy" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:17 + msgid "" + "IP addresses of domain name servers used to resolve host names. Use commas " + "to separate multiple domain name server addresses. Link-local addresses will " +@@ -1984,15 +2090,19 @@ msgstr "" + "несколько DNS-серверов через запятую. Адреса локальной связи будут " + "автоматически привязаны к интерфейсу подключения." + +-#: ../src/connection-editor/ce-page-ip6.ui.h:16 ++#: ../src/connection-editor/ce-page-ip6.ui.h:18 + msgid "IPv6 _privacy extensions:" + msgstr "Расширения _конфиденциальности IPv6:" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:17 ++#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++msgid "IPv6 address _generation mode:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:20 + msgid "Require IPv_6 addressing for this connection to complete" + msgstr "Требовать адресацию IPv_6 для этого соединения" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:18 ++#: ../src/connection-editor/ce-page-ip6.ui.h:21 + msgid "" + "When connecting to IPv4-capable networks, allows the connection to complete " + "if IPv6 configuration fails but IPv4 configuration succeeds." +@@ -2000,6 +2110,94 @@ msgstr "" + "При подключении к сетям с возможностями IPv4: разрешает установить " + "соединение в случае сбоя конфигурации IPv6, но успеха конфигурации IPv4." + ++#: ../src/connection-editor/ce-page-macsec.ui.h:1 ++msgid "PSK" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:2 ++#: ../src/connection-editor/page-ppp.c:129 ++msgid "EAP" ++msgstr "EAP" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:4 ++msgid "Check" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:5 ++msgid "Strict" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:7 ++msgid "The name of the MACsec device." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:9 ++msgid "" ++"The parent interface name or parent connection UUID from which this MACSEC " ++"interface should be created." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:10 ++msgid "" ++"The parent interface name or parent connection UUID from which this MACsec " ++"interface should be created" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:11 ++msgid " The pre-shared Connectivity-association Key Name" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:12 ++msgid "The pre-shared Connectivity Association Key" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:13 ++msgid "" ++"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key " ++"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X " ++"security page" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:14 ++msgid "CKN:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:15 ++msgid "CAK:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:17 ++msgid "Keys:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:18 ++msgid "Parameters:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:19 ++msgid "Validation:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:20 ++msgid "SCI port:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:21 ++msgid "Specifies the validation mode for incoming frames" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:22 ++msgid "Encrypt" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:23 ++msgid "Whether the transmitted traffic must be encrypted" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:24 ++msgid "The port component of the SCI (Secure Channel Identifier)" ++msgstr "" ++ + #: ../src/connection-editor/ce-page-mobile.ui.h:1 + #: ../src/connection-editor/ce-page-team.ui.h:26 + msgid "Basic" +@@ -2086,38 +2284,38 @@ msgid "Send PPP _echo packets" + msgstr "Посылать _эхо-пакеты PPP" + + #: ../src/connection-editor/ce-page-proxy.ui.h:1 +-msgid "Method:" +-msgstr "Метод:" +- +-#: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-team.ui.h:25 + msgid "None" + msgstr "Нет" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:4 ++#: ../src/connection-editor/ce-page-proxy.ui.h:3 + msgid "For browser only" + msgstr "Только для браузера" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:5 ++#: ../src/connection-editor/ce-page-proxy.ui.h:4 + msgid "Use this proxy configuration for only browser clients/schemes." + msgstr "" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:6 ++#: ../src/connection-editor/ce-page-proxy.ui.h:5 + msgid "PAC URL:" + msgstr "" + ++#: ../src/connection-editor/ce-page-proxy.ui.h:6 ++msgid "PAC script:" ++msgstr "" ++ + #: ../src/connection-editor/ce-page-proxy.ui.h:7 + msgid "URL from where the PAC script is to be obtained." + msgstr "" + + #: ../src/connection-editor/ce-page-proxy.ui.h:8 +-msgid "PAC script:" +-msgstr "" +- +-#: ../src/connection-editor/ce-page-proxy.ui.h:9 + msgid "Import script from a file…" + msgstr "Импортировать скрипт из файла…" + ++#: ../src/connection-editor/ce-page-proxy.ui.h:9 ++msgid "Method:" ++msgstr "Метод:" ++ + #: ../src/connection-editor/ce-page-team-port.ui.h:1 + #: ../src/connection-editor/ce-page-team.ui.h:19 + msgid "Ad_vanced…" +@@ -2163,75 +2361,75 @@ msgid "ID of queue which this port should be mapped to." + msgstr "" + + #: ../src/connection-editor/ce-page-team-port.ui.h:10 +-msgid "_Port priority:" +-msgstr "_Приоритет порта:" ++msgid "Active-Backup runner options" ++msgstr "" + + #: ../src/connection-editor/ce-page-team-port.ui.h:11 +-msgid "Port _sticky" +-msgstr "" ++msgid "_Port priority:" ++msgstr "_Приоритет порта:" + + #: ../src/connection-editor/ce-page-team-port.ui.h:12 +-#: ../src/connection-editor/ce-page-team.ui.h:82 +-msgid "" +-"Validate received ARP packets on active ports. If this is not checked, all " +-"incoming ARP packets will be considered as a good reply." +-msgstr "" +- +-#: ../src/connection-editor/ce-page-team-port.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:44 + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " + "bursts of notify-peer packets." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:14 ++#: ../src/connection-editor/ce-page-team-port.ui.h:13 + msgid "Port priority. The higher number means higher priority." + msgstr "" + ++#: ../src/connection-editor/ce-page-team-port.ui.h:14 ++msgid "Port _sticky" ++msgstr "" ++ + #: ../src/connection-editor/ce-page-team-port.ui.h:15 +-msgid "Active-Backup runner options" ++#: ../src/connection-editor/ce-page-team.ui.h:82 ++msgid "" ++"Validate received ARP packets on active ports. If this is not checked, all " ++"incoming ARP packets will be considered as a good reply." + msgstr "" + + #: ../src/connection-editor/ce-page-team-port.ui.h:16 ++msgid "LACP runner options" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-team-port.ui.h:17 + #, fuzzy + msgid "_LACP port priority:" + msgstr "_Приоритет:" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:17 ++#: ../src/connection-editor/ce-page-team-port.ui.h:18 + #, fuzzy + msgid "LACP port _key:" + msgstr "Секретный _ключ:" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:18 ++#: ../src/connection-editor/ce-page-team-port.ui.h:19 + #: ../src/connection-editor/ce-page-team.ui.h:43 + msgid "" + "Number of bursts of multicast group rejoin requests sent after port is " + "enabled or disabled." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:19 ++#: ../src/connection-editor/ce-page-team-port.ui.h:20 + msgid "" + "Port priority according to LACP standard. The lower number means higher " + "priority." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:20 ++#: ../src/connection-editor/ce-page-team-port.ui.h:21 + #: ../src/connection-editor/ce-page-team.ui.h:45 + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " + "bursts of multicast group rejoin requests." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:21 ++#: ../src/connection-editor/ce-page-team-port.ui.h:22 + msgid "" + "Port key according to LACP standard. It is only possible to aggregate ports " + "with the same key." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:22 +-msgid "LACP runner options" +-msgstr "" +- + #: ../src/connection-editor/ce-page-team-port.ui.h:24 + #: ../src/connection-editor/ce-page-team.ui.h:70 + msgid "_Link watcher:" +@@ -2418,14 +2616,14 @@ msgid "LACP" + msgstr "LACP" + + #: ../src/connection-editor/ce-page-team.ui.h:27 +-#: ../src/connection-editor/connection-helpers.c:104 ++#: ../src/connection-editor/connection-helpers.c:105 + #: ../src/connection-editor/page-ethernet.c:351 + #: ../src/libnm-gtk/nm-ui-utils.c:321 + msgid "Ethernet" + msgstr "Ethernet" + + #: ../src/connection-editor/ce-page-team.ui.h:28 +-#: ../src/connection-editor/connection-helpers.c:119 ++#: ../src/connection-editor/connection-helpers.c:120 + #: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339 + #: ../src/libnm-gtk/nm-ui-utils.c:583 + msgid "VLAN" +@@ -2680,6 +2878,7 @@ msgstr "_Диапазон:" + msgid "SS_ID:" + msgstr "SS_ID:" + ++#: ../src/connection-editor/ce-polkit.c:63 + #: ../src/connection-editor/ce-polkit-button.c:74 + msgid "No polkit authorization to perform the action" + msgstr "Нет разрешения polkit для выполнения действия" +@@ -2737,58 +2936,63 @@ msgstr "" + "аутентификации. Если же соединение не устанавливается, попробуйте выключить " + "поддержку некоторых методов." + +-#: ../src/connection-editor/connection-helpers.c:105 ++#: ../src/connection-editor/connection-helpers.c:106 + #: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323 + msgid "Wi-Fi" + msgstr "Wi-Fi" + +-#: ../src/connection-editor/connection-helpers.c:113 ++#: ../src/connection-editor/connection-helpers.c:114 + #: ../src/connection-editor/page-bluetooth.c:123 + #: ../src/libnm-gtk/nm-ui-utils.c:325 + msgid "Bluetooth" + msgstr "Bluetooth" + +-#: ../src/connection-editor/connection-helpers.c:114 +-#: ../src/connection-editor/page-dsl.c:127 +-msgid "DSL" +-msgstr "DSL" +- + #: ../src/connection-editor/connection-helpers.c:115 +-#: ../src/connection-editor/page-infiniband.c:148 +-#: ../src/libnm-gtk/nm-ui-utils.c:331 ++#: ../src/connection-editor/page-dsl.c:201 ++msgid "DSL/PPPoE" ++msgstr "" ++ ++#: ../src/connection-editor/connection-helpers.c:116 ++#: ../src/connection-editor/page-infiniband.c:148 ++#: ../src/libnm-gtk/nm-ui-utils.c:331 + msgid "InfiniBand" + msgstr "InfiniBand" + +-#: ../src/connection-editor/connection-helpers.c:116 ++#: ../src/connection-editor/connection-helpers.c:117 + #: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333 + #: ../src/libnm-gtk/nm-ui-utils.c:577 + msgid "Bond" + msgstr "Bond" + +-#: ../src/connection-editor/connection-helpers.c:117 +-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335 ++#: ../src/connection-editor/connection-helpers.c:118 ++#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335 + #: ../src/libnm-gtk/nm-ui-utils.c:579 + msgid "Team" + msgstr "Team" + +-#: ../src/connection-editor/connection-helpers.c:118 +-#: ../src/connection-editor/page-bridge.c:212 ++#: ../src/connection-editor/connection-helpers.c:119 ++#: ../src/connection-editor/page-bridge.c:233 + #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581 + msgid "Bridge" + msgstr "Мост" + +-#: ../src/connection-editor/connection-helpers.c:120 ++#: ../src/connection-editor/connection-helpers.c:121 + #: ../src/connection-editor/page-ip-tunnel.c:176 + msgid "IP tunnel" + msgstr "IP-туннель" + + #: ../src/connection-editor/connection-helpers.c:122 +-#: ../src/connection-editor/connection-helpers.c:396 ++#: ../src/connection-editor/page-macsec.c:190 ++msgid "MACsec" ++msgstr "" ++ ++#: ../src/connection-editor/connection-helpers.c:124 ++#: ../src/connection-editor/connection-helpers.c:398 + #: ../src/connection-editor/page-vpn.c:96 + msgid "VPN" + msgstr "VPN" + +-#: ../src/connection-editor/connection-helpers.c:205 ++#: ../src/connection-editor/connection-helpers.c:207 + msgid "" + "The VPN plugin failed to import the VPN connection correctly\n" + "\n" +@@ -2798,11 +3002,11 @@ msgstr "" + "\n" + "Ошибка: нет типа службы VPN." + +-#: ../src/connection-editor/connection-helpers.c:217 ++#: ../src/connection-editor/connection-helpers.c:219 + msgid "Cannot import VPN connection" + msgstr "Не удалось импортировать VPN-соединение" + +-#: ../src/connection-editor/connection-helpers.c:219 ++#: ../src/connection-editor/connection-helpers.c:221 + #, c-format + msgid "" + "The file “%s” could not be read or does not contain recognized VPN " +@@ -2815,46 +3019,53 @@ msgstr "" + "\n" + "Ошибка: %s." + +-#: ../src/connection-editor/connection-helpers.c:220 ++#: ../src/connection-editor/connection-helpers.c:222 + msgid "unknown error" + msgstr "неизвестная ошибка" + +-#: ../src/connection-editor/connection-helpers.c:303 ++#: ../src/connection-editor/connection-helpers.c:305 + #: ../src/connection-editor/page-proxy.c:118 + #: ../src/connection-editor/page-team.c:341 + #: ../src/connection-editor/page-team-port.c:203 + msgid "Select file to import" + msgstr "Выбор файла для импортирования" + +-#: ../src/connection-editor/connection-helpers.c:338 ++#: ../src/connection-editor/connection-helpers.c:309 ++#: ../src/connection-editor/page-proxy.c:122 ++#: ../src/connection-editor/page-team.c:345 ++#: ../src/connection-editor/page-team-port.c:207 ++msgid "_Open" ++msgstr "" ++ ++#: ../src/connection-editor/connection-helpers.c:340 + msgid "Hardware" + msgstr "Физическое" + +-#: ../src/connection-editor/connection-helpers.c:365 ++#: ../src/connection-editor/connection-helpers.c:367 + msgid "Virtual" + msgstr "Логическое" + +-#: ../src/connection-editor/connection-helpers.c:514 + #: ../src/connection-editor/connection-helpers.c:516 ++#: ../src/connection-editor/connection-helpers.c:518 + msgid "Import a saved VPN configuration…" + msgstr "Импортировать сохранённую конфигурацию VPN…" + +-#: ../src/connection-editor/connection-helpers.c:546 ++#: ../src/connection-editor/connection-helpers.c:548 + msgid "" + "The connection editor dialog could not be initialized due to an unknown " + "error." + msgstr "" + "Не удалось создать диалог редактора соединений из-за внутренней ошибки." + +-#: ../src/connection-editor/connection-helpers.c:555 ++#: ../src/connection-editor/connection-helpers.c:557 + msgid "Could not create new connection" + msgstr "Не удалось создать новое соединение" + +-#: ../src/connection-editor/connection-helpers.c:718 ++#: ../src/connection-editor/connection-helpers.c:720 + msgid "Connection delete failed" + msgstr "Не удалось удалить соединение" + +-#: ../src/connection-editor/connection-helpers.c:766 ++#: ../src/connection-editor/connection-helpers.c:768 + #, c-format + msgid "Are you sure you wish to delete the connection %s?" + msgstr "Удалить соединение «%s»?" +@@ -2862,7 +3073,7 @@ msgstr "Удалить соединение «%s»?" + #: ../src/connection-editor/ip4-routes-dialog.c:697 + #: ../src/connection-editor/ip6-routes-dialog.c:718 + #: ../src/connection-editor/page-ip4.c:1136 +-#: ../src/connection-editor/page-ip6.c:1095 ++#: ../src/connection-editor/page-ip6.c:1118 + msgid "Address" + msgstr "Адрес" + +@@ -2874,7 +3085,7 @@ msgstr "Маска сети" + #: ../src/connection-editor/ip4-routes-dialog.c:735 + #: ../src/connection-editor/ip6-routes-dialog.c:756 + #: ../src/connection-editor/page-ip4.c:1174 +-#: ../src/connection-editor/page-ip6.c:1133 ++#: ../src/connection-editor/page-ip6.c:1156 + msgid "Gateway" + msgstr "Шлюз" + +@@ -2884,38 +3095,38 @@ msgid "Metric" + msgstr "Метрика" + + #: ../src/connection-editor/ip6-routes-dialog.c:737 +-#: ../src/connection-editor/page-ip6.c:1114 ++#: ../src/connection-editor/page-ip6.c:1137 + msgid "Prefix" + msgstr "Префикс" + +-#: ../src/connection-editor/nm-connection-editor.c:108 ++#: ../src/connection-editor/nm-connection-editor.c:109 + #, c-format + msgid "Editing %s" + msgstr "Изменение %s" + +-#: ../src/connection-editor/nm-connection-editor.c:112 ++#: ../src/connection-editor/nm-connection-editor.c:113 + msgid "Editing un-named connection" + msgstr "Изменение безымянного соединения" + +-#: ../src/connection-editor/nm-connection-editor.c:132 ++#: ../src/connection-editor/nm-connection-editor.c:133 + msgid "Missing connection name" + msgstr "Отсутствует имя соединения" + +-#: ../src/connection-editor/nm-connection-editor.c:352 ++#: ../src/connection-editor/nm-connection-editor.c:353 + msgid "Editor initializing…" + msgstr "Инициализация редактора…" + +-#: ../src/connection-editor/nm-connection-editor.c:359 +-#: ../src/connection-editor/nm-connection-list.c:408 ++#: ../src/connection-editor/nm-connection-editor.c:360 ++#: ../src/connection-editor/nm-connection-list.c:443 + msgid "Connection cannot be modified" + msgstr "Невозможно изменить соединение" + +-#: ../src/connection-editor/nm-connection-editor.c:374 ++#: ../src/connection-editor/nm-connection-editor.c:375 + #, c-format + msgid "Invalid setting %s: %s" + msgstr "Недопустимая настройка %s: %s" + +-#: ../src/connection-editor/nm-connection-editor.c:450 ++#: ../src/connection-editor/nm-connection-editor.c:451 + msgid "" + "The connection editor could not find some required resources (the .ui file " + "was not found)." +@@ -2923,55 +3134,52 @@ msgstr "" + "Редактор соединений не может найти некоторые необходимые ресурсы (не найден " + "файл .ui)." + +-#: ../src/connection-editor/nm-connection-editor.c:577 ++#: ../src/connection-editor/nm-connection-editor.c:578 ++#: ../src/connection-editor/vpn-helpers.c:213 + msgid "_Save" + msgstr "_Сохранить" + +-#: ../src/connection-editor/nm-connection-editor.c:578 ++#: ../src/connection-editor/nm-connection-editor.c:579 + msgid "Save any changes made to this connection." + msgstr "Сохранить параметры соединения." + +-#: ../src/connection-editor/nm-connection-editor.c:579 ++#: ../src/connection-editor/nm-connection-editor.c:580 + msgid "Authenticate to save this connection for all users of this machine." + msgstr "" + "Введите пароль администратора для того, чтобы сделать это соединение общим " + "для всех пользователей компьютера." + +-#: ../src/connection-editor/nm-connection-editor.c:595 ++#: ../src/connection-editor/nm-connection-editor.c:596 + msgid "Could not create connection" + msgstr "Не удалось создать соединение" + +-#: ../src/connection-editor/nm-connection-editor.c:595 ++#: ../src/connection-editor/nm-connection-editor.c:596 + msgid "Could not edit connection" + msgstr "Не удалось изменить соединение" + +-#: ../src/connection-editor/nm-connection-editor.c:597 ++#: ../src/connection-editor/nm-connection-editor.c:598 + msgid "Unknown error creating connection editor dialog." + msgstr "Ошибка создания диалога для изменения соединений." + +-#: ../src/connection-editor/nm-connection-editor.c:738 ++#: ../src/connection-editor/nm-connection-editor.c:739 + msgid "" + "Warning: the connection contains some properties not supported by the " + "editor. They will be cleared upon save." + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.c:758 ++#: ../src/connection-editor/nm-connection-editor.c:759 + msgid "Error initializing editor" + msgstr "Ошибка инициализации редактора" + +-#: ../src/connection-editor/nm-connection-editor.c:1142 ++#: ../src/connection-editor/nm-connection-editor.c:1157 + msgid "Connection add failed" + msgstr "Сбой добавления соединения" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2 +-msgid "_Close" +-msgstr "_Закрыть" +- +-#: ../src/connection-editor/nm-connection-editor.ui.h:4 ++#: ../src/connection-editor/nm-connection-editor.ui.h:1 + msgid "Fix" + msgstr "Исправить" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:5 ++#: ../src/connection-editor/nm-connection-editor.ui.h:2 + #, fuzzy + msgid "" + "Security labels may prevent some files from being used with certificate " +@@ -2980,50 +3188,50 @@ msgstr "" + "Установите в TRUE, чтобы отключить предупреждения о сертификатах CA для " + "аутентификации EAP." + +-#: ../src/connection-editor/nm-connection-editor.ui.h:6 ++#: ../src/connection-editor/nm-connection-editor.ui.h:3 + msgid "Connection _name:" + msgstr "_Название соединения:" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:7 ++#: ../src/connection-editor/nm-connection-editor.ui.h:4 + msgid "_Export…" + msgstr "_Экспортировать…" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:9 ++#: ../src/connection-editor/nm-connection-editor.ui.h:6 + #, fuzzy + msgid "File Relabel" + msgstr "Имя файла" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:10 ++#: ../src/connection-editor/nm-connection-editor.ui.h:7 + #, fuzzy + msgid "_Relabel" + msgstr "Имя файла" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:11 ++#: ../src/connection-editor/nm-connection-editor.ui.h:8 + msgid "" + "The following files are not labelled for use with certificate " + "authentication. Do you wish to adjust the labels?" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:12 ++#: ../src/connection-editor/nm-connection-editor.ui.h:9 + #, fuzzy + msgid "Relabel" + msgstr "Имя файла" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:13 ++#: ../src/connection-editor/nm-connection-editor.ui.h:10 + msgid "Filename" + msgstr "Имя файла" + +-#: ../src/connection-editor/nm-connection-list.c:127 ++#: ../src/connection-editor/nm-connection-list.c:151 + msgid "never" + msgstr "никогда" + +-#: ../src/connection-editor/nm-connection-list.c:138 +-#: ../src/connection-editor/nm-connection-list.c:149 ++#: ../src/connection-editor/nm-connection-list.c:162 ++#: ../src/connection-editor/nm-connection-list.c:173 + msgid "now" + msgstr "сейчас" + + #. less than an hour ago +-#: ../src/connection-editor/nm-connection-list.c:156 ++#: ../src/connection-editor/nm-connection-list.c:180 + #, c-format + msgid "%d minute ago" + msgid_plural "%d minutes ago" +@@ -3031,7 +3239,7 @@ msgstr[0] "%d минута назад" + msgstr[1] "%d минуты назад" + msgstr[2] "%d минут назад" + +-#: ../src/connection-editor/nm-connection-list.c:160 ++#: ../src/connection-editor/nm-connection-list.c:184 + #, c-format + msgid "%d hour ago" + msgid_plural "%d hours ago" +@@ -3039,7 +3247,7 @@ msgstr[0] "%d час назад" + msgstr[1] "%d часа назад" + msgstr[2] "%d часов назад" + +-#: ../src/connection-editor/nm-connection-list.c:172 ++#: ../src/connection-editor/nm-connection-list.c:196 + #, c-format + msgid "%d day ago" + msgid_plural "%d days ago" +@@ -3047,7 +3255,7 @@ msgstr[0] "%d день назад" + msgstr[1] "%d дня назад" + msgstr[2] "%d дней назад" + +-#: ../src/connection-editor/nm-connection-list.c:178 ++#: ../src/connection-editor/nm-connection-list.c:202 + #, c-format + msgid "%d month ago" + msgid_plural "%d months ago" +@@ -3055,7 +3263,7 @@ msgstr[0] "%d месяц назад" + msgstr[1] "%d месяца назад" + msgstr[2] "%d месяцев назад" + +-#: ../src/connection-editor/nm-connection-list.c:182 ++#: ../src/connection-editor/nm-connection-list.c:206 + #, c-format + msgid "%d year ago" + msgid_plural "%d years ago" +@@ -3063,63 +3271,79 @@ msgstr[0] "%d год назад" + msgstr[1] "%d года назад" + msgstr[2] "%d лет назад" + +-#: ../src/connection-editor/nm-connection-list.c:635 ++#: ../src/connection-editor/nm-connection-list.c:445 ++msgid "Connection cannot be deleted" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:448 ++msgid "Select a connection to edit" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:450 ++msgid "Select a connection to delete" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:785 + #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2 + msgid "Name" + msgstr "Имя" + +-#: ../src/connection-editor/nm-connection-list.c:648 ++#: ../src/connection-editor/nm-connection-list.c:798 + msgid "Last Used" + msgstr "Последнее использование" + +-#: ../src/connection-editor/nm-connection-list.c:696 ++#: ../src/connection-editor/nm-connection-list.c:836 + msgid "Edit the selected connection" + msgstr "Изменить выбранное соединение" + +-#: ../src/connection-editor/nm-connection-list.c:697 ++#: ../src/connection-editor/nm-connection-list.c:837 + msgid "Authenticate to edit the selected connection" + msgstr "Для изменения выбранного соединения необходима аутентификация" + +-#: ../src/connection-editor/nm-connection-list.c:712 ++#: ../src/connection-editor/nm-connection-list.c:842 + msgid "Delete the selected connection" + msgstr "Удалить выбранное соединение" + +-#: ../src/connection-editor/nm-connection-list.c:713 ++#: ../src/connection-editor/nm-connection-list.c:843 + msgid "Authenticate to delete the selected connection" + msgstr "Для удаления выбранного соединения необходима аутентификация" + +-#: ../src/connection-editor/nm-connection-list.c:935 +-#: ../src/connection-editor/nm-connection-list.c:938 ++#: ../src/connection-editor/nm-connection-list.c:1048 ++#: ../src/connection-editor/nm-connection-list.c:1051 + msgid "Error creating connection" + msgstr "Ошибка создания соединения" + +-#: ../src/connection-editor/nm-connection-list.c:936 ++#: ../src/connection-editor/nm-connection-list.c:1049 + msgid "No VPN plugins are installed." + msgstr "Модули VPN не установлены." + +-#: ../src/connection-editor/nm-connection-list.c:939 ++#: ../src/connection-editor/nm-connection-list.c:1052 + #, c-format + msgid "Don’t know how to create “%s” connections" + msgstr "Неизвестно, как создавать соединения «%s»" + +-#: ../src/connection-editor/nm-connection-list.c:970 ++#: ../src/connection-editor/nm-connection-list.c:1085 + msgid "Error editing connection" + msgstr "Ошибка изменения соединения" + +-#: ../src/connection-editor/nm-connection-list.c:971 ++#: ../src/connection-editor/nm-connection-list.c:1086 + #, c-format + msgid "Did not find a connection with UUID “%s”" + msgstr "Соединение с UUID «%s» не найдено" + +-#: ../src/connection-editor/page-8021x-security.c:109 ++#: ../src/connection-editor/nm-connection-list.ui.h:2 ++msgid "Add a new connection" ++msgstr "" ++ ++#: ../src/connection-editor/page-8021x-security.c:116 + msgid "802.1X Security" + msgstr "Безопасность 802.1x" + +-#: ../src/connection-editor/page-8021x-security.c:111 ++#: ../src/connection-editor/page-8021x-security.c:118 + msgid "Could not load 802.1X Security user interface." + msgstr "Не удалось загрузить пользовательский интерфейс безопасности 802.1X." + +-#: ../src/connection-editor/page-8021x-security.c:125 ++#: ../src/connection-editor/page-8021x-security.c:132 + msgid "Use 802.1_X security for this connection" + msgstr "Использовать безопасность 802.1_X для этого соединения" + +@@ -3172,11 +3396,11 @@ msgstr "основной" + msgid "Bond connection %d" + msgstr "Агрегированное соединение (bond) %d" + +-#: ../src/connection-editor/page-bridge.c:215 ++#: ../src/connection-editor/page-bridge.c:236 + msgid "Could not load bridge user interface." + msgstr "Не удалось загрузить пользовательский интерфейс соединения типа мост." + +-#: ../src/connection-editor/page-bridge.c:317 ++#: ../src/connection-editor/page-bridge.c:352 + #, c-format + msgid "Bridge connection %d" + msgstr "Соединение типа мост %d" +@@ -3201,11 +3425,15 @@ msgstr "DCB" + msgid "Could not load DCB user interface." + msgstr "Не удалось загрузить пользовательский интерфейс DCB." + +-#: ../src/connection-editor/page-dsl.c:129 ++#: ../src/connection-editor/page-dsl.c:203 + msgid "Could not load DSL user interface." + msgstr "Не удалось загрузить пользовательский интерфейс DSL." + +-#: ../src/connection-editor/page-dsl.c:219 ++#: ../src/connection-editor/page-dsl.c:298 ++msgid "missing parent interface" ++msgstr "" ++ ++#: ../src/connection-editor/page-dsl.c:343 + #, c-format + msgid "DSL connection %d" + msgstr "Соединение DSL %d" +@@ -3306,27 +3534,27 @@ msgid "IP tunnel connection %d" + msgstr "Проводное соединение %d" + + #: ../src/connection-editor/page-ip4.c:127 +-#: ../src/connection-editor/page-ip6.c:130 ++#: ../src/connection-editor/page-ip6.c:136 + msgid "Automatic (VPN)" + msgstr "Автоматический (VPN)" + + #: ../src/connection-editor/page-ip4.c:128 +-#: ../src/connection-editor/page-ip6.c:131 ++#: ../src/connection-editor/page-ip6.c:137 + msgid "Automatic (VPN) addresses only" + msgstr "Автоматический (VPN, только адрес)" + + #: ../src/connection-editor/page-ip4.c:132 +-#: ../src/connection-editor/page-ip6.c:137 ++#: ../src/connection-editor/page-ip6.c:143 + msgid "Automatic, addresses only" + msgstr "Автоматический, только адреса" + + #: ../src/connection-editor/page-ip4.c:134 +-#: ../src/connection-editor/page-ip6.c:133 ++#: ../src/connection-editor/page-ip6.c:139 + msgid "Automatic (PPPoE)" + msgstr "Автоматический (PPPoE)" + + #: ../src/connection-editor/page-ip4.c:135 +-#: ../src/connection-editor/page-ip6.c:134 ++#: ../src/connection-editor/page-ip6.c:140 + msgid "Automatic (PPPoE) addresses only" + msgstr "Автоматический (PPPoE, только адрес)" + +@@ -3339,17 +3567,17 @@ msgid "Automatic (DHCP) addresses only" + msgstr "Автоматический (DHCP, только адрес)" + + #: ../src/connection-editor/page-ip4.c:181 +-#: ../src/connection-editor/page-ip6.c:198 ++#: ../src/connection-editor/page-ip6.c:204 + msgid "Link-Local Only" + msgstr "Только для локальной связи" + + #: ../src/connection-editor/page-ip4.c:361 +-#: ../src/connection-editor/page-ip6.c:324 ++#: ../src/connection-editor/page-ip6.c:335 + msgid "Additional DNS ser_vers:" + msgstr "_Дополнительные серверы DNS:" + + #: ../src/connection-editor/page-ip4.c:370 +-#: ../src/connection-editor/page-ip6.c:333 ++#: ../src/connection-editor/page-ip6.c:344 + msgid "Additional s_earch domains:" + msgstr "До_полнительные поисковые домены:" + +@@ -3386,45 +3614,54 @@ msgstr "" + msgid "IPv4 DNS server “%s” invalid" + msgstr "" + +-#: ../src/connection-editor/page-ip6.c:173 ++#: ../src/connection-editor/page-ip6.c:179 + msgid "Automatic, DHCP only" + msgstr "Автоматический, только DHCP" + +-#: ../src/connection-editor/page-ip6.c:993 ++#: ../src/connection-editor/page-ip6.c:1016 + #, c-format + msgid "Editing IPv6 routes for %s" + msgstr "Маршруты IPv4 для %s" + +-#: ../src/connection-editor/page-ip6.c:1184 ++#: ../src/connection-editor/page-ip6.c:1208 + msgid "IPv6 Settings" + msgstr "Параметры IPv6" + +-#: ../src/connection-editor/page-ip6.c:1186 ++#: ../src/connection-editor/page-ip6.c:1210 + msgid "Could not load IPv6 user interface." + msgstr "" + "Не удалось загрузить пользовательский интерфейс IPv6.пользовательский " + "интерфейс" + +-#: ../src/connection-editor/page-ip6.c:1277 ++#: ../src/connection-editor/page-ip6.c:1302 + #, c-format + msgid "IPv6 address “%s” invalid" + msgstr "" + +-#: ../src/connection-editor/page-ip6.c:1285 ++#: ../src/connection-editor/page-ip6.c:1310 + #, c-format + msgid "IPv6 prefix “%s” invalid" + msgstr "" + +-#: ../src/connection-editor/page-ip6.c:1294 ++#: ../src/connection-editor/page-ip6.c:1319 + #, c-format + msgid "IPv6 gateway “%s” invalid" + msgstr "" + +-#: ../src/connection-editor/page-ip6.c:1336 ++#: ../src/connection-editor/page-ip6.c:1361 + #, c-format + msgid "IPv6 DNS server “%s” invalid" + msgstr "" + ++#: ../src/connection-editor/page-macsec.c:192 ++msgid "Could not load MACsec user interface." ++msgstr "" ++ ++#: ../src/connection-editor/page-macsec.c:331 ++#, c-format ++msgid "MACSEC connection %d" ++msgstr "" ++ + #: ../src/connection-editor/page-master.c:247 + #: ../src/connection-editor/page-master.c:258 + msgid "Duplicate slaves" +@@ -3481,38 +3718,34 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)" + msgstr "Оператор использует технологию _CDMA (1xRTT, EVDO)" + + #: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50 +-#: ../src/mobile-helpers.c:283 ++#: ../src/mobile-helpers.c:282 + msgid "CDMA" + msgstr "CDMA" + + #: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54 +-#: ../src/mobile-helpers.c:281 ++#: ../src/mobile-helpers.c:280 + msgid "GSM" + msgstr "GSM" + +-#: ../src/connection-editor/page-ppp.c:129 +-msgid "EAP" +-msgstr "EAP" +- + #: ../src/connection-editor/page-ppp.c:130 +-#: ../src/wireless-security/eap-method-ttls.c:260 ++#: ../src/wireless-security/eap-method-ttls.c:287 + msgid "PAP" + msgstr "PAP" + + #: ../src/connection-editor/page-ppp.c:131 +-#: ../src/wireless-security/eap-method-ttls.c:322 ++#: ../src/wireless-security/eap-method-ttls.c:349 + msgid "CHAP" + msgstr "CHAP" + + #: ../src/connection-editor/page-ppp.c:132 +-#: ../src/wireless-security/eap-method-fast.c:284 +-#: ../src/wireless-security/eap-method-peap.c:273 +-#: ../src/wireless-security/eap-method-ttls.c:290 ++#: ../src/wireless-security/eap-method-fast.c:282 ++#: ../src/wireless-security/eap-method-peap.c:299 ++#: ../src/wireless-security/eap-method-ttls.c:317 + msgid "MSCHAPv2" + msgstr "MSCHAPv2" + + #: ../src/connection-editor/page-ppp.c:133 +-#: ../src/wireless-security/eap-method-ttls.c:275 ++#: ../src/wireless-security/eap-method-ttls.c:302 + msgid "MSCHAP" + msgstr "MSCHAP" + +@@ -3547,13 +3780,13 @@ msgstr "Не удалось загрузить пользовательский + msgid "Error: file doesn’t contain a valid JSON configuration" + msgstr "Ошибка: файл не содержит конфигурации JSON" + +-#: ../src/connection-editor/page-team.c:1156 ++#: ../src/connection-editor/page-team.c:1034 + msgid "Could not load team user interface." + msgstr "" + "Не удалось загрузить пользовательский интерфейс агрегированного соединения " + "(team)." + +-#: ../src/connection-editor/page-team.c:1253 ++#: ../src/connection-editor/page-team.c:1131 + #, c-format + msgid "Team connection %d" + msgstr "Агрегированное соединение (team) %d" +@@ -3561,11 +3794,11 @@ msgstr "Агрегированное соединение (team) %d" + #. Translators: a "Team Port" is a network + #. * device that is part of a team. + #. +-#: ../src/connection-editor/page-team-port.c:732 ++#: ../src/connection-editor/page-team-port.c:655 + msgid "Team Port" + msgstr "Порт агрегации (team)" + +-#: ../src/connection-editor/page-team-port.c:734 ++#: ../src/connection-editor/page-team-port.c:657 + msgid "Could not load team port user interface." + msgstr "" + "Не удалось загрузить пользовательский интерфейс порта агрегации (team)." +@@ -3673,50 +3906,50 @@ msgstr "Устройство Wi-Fi" + msgid "Wi-Fi connection %d" + msgstr "Соединение Wi-Fi %d" + +-#: ../src/connection-editor/page-wifi-security.c:356 ++#: ../src/connection-editor/page-wifi-security.c:358 + #: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922 + msgid "WEP 40/128-bit Key (Hex or ASCII)" + msgstr "WEP (40/128-битный ключ (Hex или ASCII))" + +-#: ../src/connection-editor/page-wifi-security.c:366 ++#: ../src/connection-editor/page-wifi-security.c:368 + #: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931 + msgid "WEP 128-bit Passphrase" + msgstr "WEP (128-битный ключ)" + +-#: ../src/connection-editor/page-wifi-security.c:392 ++#: ../src/connection-editor/page-wifi-security.c:394 + msgid "Dynamic WEP (802.1X)" + msgstr "Динамический WEP (802.1X)" + +-#: ../src/connection-editor/page-wifi-security.c:405 ++#: ../src/connection-editor/page-wifi-security.c:407 + #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975 + msgid "WPA & WPA2 Personal" + msgstr "WPA/WPA2 Personal" + +-#: ../src/connection-editor/page-wifi-security.c:418 ++#: ../src/connection-editor/page-wifi-security.c:420 + #: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989 + msgid "WPA & WPA2 Enterprise" + msgstr "WPA/WPA2 Enterprise" + +-#: ../src/connection-editor/page-wifi-security.c:461 ++#: ../src/connection-editor/page-wifi-security.c:463 + msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting." + msgstr "" + "Не удалось загрузить пользовательский интерфейс безопасности Wi-Fi; " + "отсутствуют параметры Wi-Fi." + +-#: ../src/connection-editor/page-wifi-security.c:472 ++#: ../src/connection-editor/page-wifi-security.c:474 + msgid "Wi-Fi Security" + msgstr "Защита Wi-Fi" + +-#: ../src/connection-editor/page-wifi-security.c:474 ++#: ../src/connection-editor/page-wifi-security.c:476 + msgid "Could not load Wi-Fi security user interface." + msgstr "Не удалось загрузить пользовательский интерфейс безопасности Wi-Fi." + +-#: ../src/connection-editor/page-wifi-security.c:558 ++#: ../src/connection-editor/page-wifi-security.c:560 + #, c-format + msgid "missing SSID" + msgstr "отсутствует SSID" + +-#: ../src/connection-editor/page-wifi-security.c:564 ++#: ../src/connection-editor/page-wifi-security.c:566 + #, c-format + msgid "Security not compatible with Ad-Hoc mode" + msgstr "Безопасность несовместима с режимом Ad-Hoc" +@@ -3766,36 +3999,40 @@ msgstr "Разблокировать это устройство автомат + msgid "Connection Information" + msgstr "Сведения о текущем соединении" + ++#: ../src/info.ui.h:2 ++msgid "_Close" ++msgstr "_Закрыть" ++ + #: ../src/info.ui.h:3 + msgid "Active Network Connections" + msgstr "Активные сетевые соединения" + + #: ../src/libnma/nma-file-cert-chooser.c:108 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:146 + #, fuzzy + msgid "No certificate set" + msgstr "Сертификат УЦ не _требуется" + + #: ../src/libnma/nma-file-cert-chooser.c:126 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:170 + #, fuzzy + msgid "No key set" + msgstr "файлы не выбраны" + + #: ../src/libnma/nma-file-cert-chooser.c:246 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:370 + #, fuzzy, c-format + msgid "Choose a key for %s Certificate" + msgstr "Выбрать сертификат УЦ" + + #: ../src/libnma/nma-file-cert-chooser.c:250 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:374 + #, fuzzy, c-format + msgid "%s private _key:" + msgstr "Приватный _ключ:" + + #: ../src/libnma/nma-file-cert-chooser.c:254 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:378 + #, fuzzy, c-format + msgid "%s key _password:" + msgstr "_Пароль приватного ключа:" +@@ -3806,7 +4043,7 @@ msgid "Choose %s Certificate" + msgstr "Выбрать сертификат УЦ" + + #: ../src/libnma/nma-file-cert-chooser.c:262 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:386 + #, fuzzy, c-format + msgid "%s _certificate:" + msgstr "Сертификат _пользователя:" +@@ -4008,45 +4245,45 @@ msgstr "Настройка соединения мобильной связи" + msgid "New Mobile Broadband Connection" + msgstr "Новое соединение мобильной связи" + +-#: ../src/libnma/nma-cert-chooser-button.c:162 ++#: ../src/libnma/nma-cert-chooser-button.c:165 + msgid "(None)" + msgstr "(Нет)" + +-#: ../src/libnma/nma-cert-chooser-button.c:170 ++#: ../src/libnma/nma-cert-chooser-button.c:173 + #, c-format + msgid "Key in %s" + msgstr "Ключ в %s" + +-#: ../src/libnma/nma-cert-chooser-button.c:171 ++#: ../src/libnma/nma-cert-chooser-button.c:174 + #, c-format + msgid "Certificate in %s" + msgstr "Сертификат в %s" + +-#: ../src/libnma/nma-cert-chooser-button.c:190 ++#: ../src/libnma/nma-cert-chooser-button.c:193 + #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183 + msgid "(Unknown)" + msgstr "(Неизвестно)" + +-#: ../src/libnma/nma-cert-chooser-button.c:212 +-#: ../src/libnma/nma-cert-chooser-button.c:242 ++#: ../src/libnma/nma-cert-chooser-button.c:215 ++#: ../src/libnma/nma-cert-chooser-button.c:245 + msgid "Select" + msgstr "Выбрать" + +-#: ../src/libnma/nma-cert-chooser-button.c:213 +-#: ../src/libnma/nma-cert-chooser-button.c:243 ++#: ../src/libnma/nma-cert-chooser-button.c:216 ++#: ../src/libnma/nma-cert-chooser-button.c:246 + msgid "Cancel" + msgstr "Отменить" + +-#: ../src/libnma/nma-cert-chooser-button.c:469 ++#: ../src/libnma/nma-cert-chooser-button.c:472 + msgid "Select from file…" + msgstr "Выбрать из файла…" + +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:382 + #, c-format + msgid "Choose a %s Certificate" + msgstr "Выбрать сертификат %s" + +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:390 + #, c-format + msgid "%s certificate _password:" + msgstr "Пароль сертификата %s:" +@@ -4109,8 +4346,8 @@ msgstr "_Второй пароль:" + msgid "_Tertiary Password:" + msgstr "_Третий пароль:" + +-#: ../src/libnma/nma-vpn-password-dialog.c:247 +-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247 ++#: ../src/libnma/nma-vpn-password-dialog.c:238 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238 + msgid "Sh_ow passwords" + msgstr "По_казывать пароли" + +@@ -4139,45 +4376,45 @@ msgstr "Нет" + msgid "Dynamic WEP (802.1x)" + msgstr "Динамический WEP (802.1x)" + +-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075 ++#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071 + msgid "C_reate" + msgstr "С_оздать" + +-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161 ++#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150 + #, c-format + msgid "" + "Passwords or encryption keys are required to access the Wi-Fi network “%s”." + msgstr "Для подключения к сети Wi-Fi «%s» требуется указать ключ или пароль." + +-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163 ++#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152 + msgid "Wi-Fi Network Authentication Required" + msgstr "Для сети Wi-Fi требуется аутентификация" + +-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165 ++#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154 + msgid "Authentication required by Wi-Fi network" + msgstr "Сеть Wi-Fi требует аутентификацию" + +-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170 ++#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159 + msgid "Create New Wi-Fi Network" + msgstr "Создать новую сеть Wi-Fi" + +-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172 ++#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161 + msgid "New Wi-Fi network" + msgstr "Новая сеть Wi-Fi" + +-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173 ++#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162 + msgid "Enter a name for the Wi-Fi network you wish to create." + msgstr "Введите имя для создаваемой сети Wi-Fi." + +-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175 ++#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164 + msgid "Connect to Hidden Wi-Fi Network" + msgstr "Подключение к скрытой сети Wi-Fi" + +-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177 ++#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166 + msgid "Hidden Wi-Fi network" + msgstr "Скрытая сеть Wi-Fi" + +-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178 ++#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167 + msgid "" + "Enter the name and security details of the hidden Wi-Fi network you wish to " + "connect to." +@@ -4331,25 +4568,25 @@ msgstr "Роуминговая сеть (%s)" + msgid "Roaming network" + msgstr "Роуминговая сеть" + +-#: ../src/mobile-helpers.c:331 ++#: ../src/mobile-helpers.c:330 + #, c-format + msgid "PIN code for SIM card “%s” on “%s”" + msgstr "PIN-код для SIM-карты «%s» на «%s»" + +-#: ../src/mobile-helpers.c:464 ++#: ../src/mobile-helpers.c:463 + msgid "PIN code required" + msgstr "Требуется PIN-код" + +-#: ../src/mobile-helpers.c:472 ++#: ../src/mobile-helpers.c:471 + msgid "PIN code is needed for the mobile broadband device" + msgstr "Для устройства мобильной связи требуется PIN-код" + +-#: ../src/mobile-helpers.c:622 ++#: ../src/mobile-helpers.c:621 + #, c-format + msgid "Mobile broadband connection “%s” active: (%d%%%s%s)" + msgstr "Соединение мобильной связи «%s» активно: (%d%%%s%s)" + +-#: ../src/mobile-helpers.c:625 ++#: ../src/mobile-helpers.c:624 + msgid "roaming" + msgstr "роуминг" + +@@ -4359,11 +4596,11 @@ msgstr "роуминг" + msgid "%s connection" + msgstr "Подключение %s" + +-#: ../src/utils/utils.c:563 ++#: ../src/utils/utils.c:565 + msgid "PEM certificates (*.pem, *.crt, *.cer)" + msgstr "Сертификаты PEM (*.pem, *.crt, *.cer)" + +-#: ../src/utils/utils.c:575 ++#: ../src/utils/utils.c:577 + msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" + msgstr "Секретные ключи DER, PEM или PKCS#12 (*.der, *.pem, *.p12)" + +@@ -4371,38 +4608,35 @@ msgstr "Секретные ключи DER, PEM или PKCS#12 (*.der, *.pem, *.p + msgid "undefined error in 802.1X security (wpa-eap)" + msgstr "неизвестная ошибка в безопасности 802.1x (wpa-eap)" + +-#: ../src/wireless-security/eap-method.c:227 +-msgid "no file selected" +-msgstr "файлы не выбраны" +- +-#: ../src/wireless-security/eap-method.c:235 +-#, c-format +-msgid "file “%s” does not exist" +-msgstr "файл «%s» не существует" ++#: ../src/wireless-security/eap-method.c:365 ++#, fuzzy ++msgid "no CA certificate selected" ++msgstr "Сертификат УЦ не _требуется" + +-#: ../src/wireless-security/eap-method.c:258 +-msgid "unspecified error validating eap-method file" +-msgstr "неизвестная ошибка проверки файла ЕАР-методом" ++#: ../src/wireless-security/eap-method.c:370 ++#, fuzzy ++msgid "selected CA certificate file does not exist" ++msgstr "Сертификат УЦ не _требуется" + +-#: ../src/wireless-security/eap-method-fast.c:73 ++#: ../src/wireless-security/eap-method-fast.c:71 + msgid "missing EAP-FAST PAC file" + msgstr "отсутствует файл EAP-FAST PAC" + +-#: ../src/wireless-security/eap-method-fast.c:269 +-#: ../src/wireless-security/eap-method-peap.c:303 +-#: ../src/wireless-security/eap-method-ttls.c:352 ++#: ../src/wireless-security/eap-method-fast.c:267 ++#: ../src/wireless-security/eap-method-peap.c:329 ++#: ../src/wireless-security/eap-method-ttls.c:379 + msgid "GTC" + msgstr "GTC" + +-#: ../src/wireless-security/eap-method-fast.c:407 ++#: ../src/wireless-security/eap-method-fast.c:405 + msgid "Choose a PAC file" + msgstr "Выбрать файл PAC" + +-#: ../src/wireless-security/eap-method-fast.c:414 ++#: ../src/wireless-security/eap-method-fast.c:412 + msgid "PAC files (*.pac)" + msgstr "Файлы PAC (*.pac)" + +-#: ../src/wireless-security/eap-method-fast.c:418 ++#: ../src/wireless-security/eap-method-fast.c:416 + msgid "All files" + msgstr "Все файлы" + +@@ -4420,7 +4654,7 @@ msgstr "Обе" + + #: ../src/wireless-security/eap-method-fast.ui.h:4 + #: ../src/wireless-security/eap-method-peap.ui.h:4 +-#: ../src/wireless-security/eap-method-ttls.ui.h:1 ++#: ../src/wireless-security/eap-method-ttls.ui.h:3 + msgid "Anony_mous identity:" + msgstr "_Анонимная идентификация:" + +@@ -4430,7 +4664,7 @@ msgstr "Файл _PAC:" + + #: ../src/wireless-security/eap-method-fast.ui.h:6 + #: ../src/wireless-security/eap-method-peap.ui.h:7 +-#: ../src/wireless-security/eap-method-ttls.ui.h:4 ++#: ../src/wireless-security/eap-method-ttls.ui.h:1 + msgid "_Inner authentication:" + msgstr "Вн_утренняя аутентификация:" + +@@ -4446,26 +4680,12 @@ msgstr "отсутствует имя пользователя EAP-LEAP" + msgid "missing EAP-LEAP password" + msgstr "отсутствует пароль EAP-LEAP" + +-#: ../src/wireless-security/eap-method-peap.c:64 +-#, c-format +-msgid "invalid EAP-PEAP CA certificate: %s" +-msgstr "недействительный сертификат EAP-PEAP CA: %s" +- +-#: ../src/wireless-security/eap-method-peap.c:69 +-msgid "invalid EAP-PEAP CA certificate: no certificate specified" +-msgstr "недействительный сертификат EAP-PEAP CA: сертификат не указан" +- +-#: ../src/wireless-security/eap-method-peap.c:288 +-#: ../src/wireless-security/eap-method-ttls.c:337 ++#: ../src/wireless-security/eap-method-peap.c:314 ++#: ../src/wireless-security/eap-method-ttls.c:364 + #: ../src/wireless-security/wireless-security.c:424 + msgid "MD5" + msgstr "MD5" + +-#: ../src/wireless-security/eap-method-peap.c:382 +-#: ../src/wireless-security/eap-method-ttls.c:431 +-msgid "Choose a Certificate Authority certificate" +-msgstr "Выбрать сертификат удостоверяющего центра" +- + #: ../src/wireless-security/eap-method-peap.ui.h:2 + msgid "Version 0" + msgstr "Версия 0" +@@ -4475,20 +4695,27 @@ msgid "Version 1" + msgstr "Версия 1" + + #: ../src/wireless-security/eap-method-peap.ui.h:5 +-#: ../src/wireless-security/eap-method-ttls.ui.h:2 +-msgid "C_A certificate:" +-msgstr "С_ертификат УЦ:" +- +-#: ../src/wireless-security/eap-method-peap.ui.h:6 + #: ../src/wireless-security/eap-method-tls.ui.h:2 +-#: ../src/wireless-security/eap-method-ttls.ui.h:3 ++#: ../src/wireless-security/eap-method-ttls.ui.h:2 + msgid "No CA certificate is _required" + msgstr "Сертификат УЦ не _требуется" + +-#: ../src/wireless-security/eap-method-peap.ui.h:8 ++#: ../src/wireless-security/eap-method-peap.ui.h:6 + msgid "PEAP _version:" + msgstr "_Версия PEAP:" + ++#: ../src/wireless-security/eap-method-peap.ui.h:8 ++#: ../src/wireless-security/eap-method-tls.ui.h:3 ++#: ../src/wireless-security/eap-method-ttls.ui.h:4 ++msgid "Suffix of the server certificate name." ++msgstr "" ++ ++#: ../src/wireless-security/eap-method-peap.ui.h:9 ++#: ../src/wireless-security/eap-method-tls.ui.h:4 ++#: ../src/wireless-security/eap-method-ttls.ui.h:5 ++msgid "_Domain:" ++msgstr "" ++ + #: ../src/wireless-security/eap-method-simple.c:75 + msgid "missing EAP username" + msgstr "отсутствует имя пользователя EAP" +@@ -4501,50 +4728,31 @@ msgstr "отсутствует пароль EAP" + msgid "missing EAP-TLS identity" + msgstr "отсутствует идентичность EAP-TLS" + +-#: ../src/wireless-security/eap-method-tls.c:238 ++#: ../src/wireless-security/eap-method-tls.c:256 + #, fuzzy + msgid "no user certificate selected" + msgstr "Сертификат УЦ не _требуется" + +-#: ../src/wireless-security/eap-method-tls.c:243 ++#: ../src/wireless-security/eap-method-tls.c:261 + #, fuzzy + msgid "selected user certificate file does not exist" + msgstr "Сертификат УЦ не _требуется" + +-#: ../src/wireless-security/eap-method-tls.c:263 ++#: ../src/wireless-security/eap-method-tls.c:281 + #, fuzzy + msgid "no key selected" + msgstr "файлы не выбраны" + +-#: ../src/wireless-security/eap-method-tls.c:268 ++#: ../src/wireless-security/eap-method-tls.c:286 + #, fuzzy + msgid "selected key file does not exist" + msgstr "файл «%s» не существует" + +-#: ../src/wireless-security/eap-method-tls.c:314 +-#, fuzzy +-msgid "no CA certificate selected" +-msgstr "Сертификат УЦ не _требуется" +- +-#: ../src/wireless-security/eap-method-tls.c:319 +-#, fuzzy +-msgid "selected CA certificate file does not exist" +-msgstr "Сертификат УЦ не _требуется" +- + #: ../src/wireless-security/eap-method-tls.ui.h:1 + msgid "I_dentity:" + msgstr "_Идентификация:" + +-#: ../src/wireless-security/eap-method-ttls.c:64 +-#, c-format +-msgid "invalid EAP-TTLS CA certificate: %s" +-msgstr "недействительный сертификат EAP-TTLS CA: %s" +- +-#: ../src/wireless-security/eap-method-ttls.c:69 +-msgid "invalid EAP-TTLS CA certificate: no certificate specified" +-msgstr "недействительный сертификат EAP-TTLS CA: сертификат не указан" +- +-#: ../src/wireless-security/eap-method-ttls.c:306 ++#: ../src/wireless-security/eap-method-ttls.c:333 + msgid "MSCHAPv2 (no EAP)" + msgstr "MSCHAPv2 (без EAP)" + +@@ -4625,17 +4833,17 @@ msgstr "" + "недействительный wep-ключ: парольная фраза должна быть короче 64 символов" + + #: ../src/wireless-security/ws-wep-key.ui.h:1 +-msgid "1 (Default)" +-msgstr "1 (по умолчанию)" +- +-#: ../src/wireless-security/ws-wep-key.ui.h:2 + msgid "Open System" + msgstr "Открытая система" + +-#: ../src/wireless-security/ws-wep-key.ui.h:3 ++#: ../src/wireless-security/ws-wep-key.ui.h:2 + msgid "Shared Key" + msgstr "Общий ключ" + ++#: ../src/wireless-security/ws-wep-key.ui.h:3 ++msgid "1 (Default)" ++msgstr "1 (по умолчанию)" ++ + #: ../src/wireless-security/ws-wep-key.ui.h:4 + msgid "_Key:" + msgstr "_Ключ:" +@@ -4666,560 +4874,3 @@ msgstr "" + #: ../src/wireless-security/ws-wpa-psk.ui.h:2 + msgid "_Type:" + msgstr "_Тип:" +- +-#~ msgid "" +-#~ "\n" +-#~ "The VPN connection “%s” disconnected because the VPN service stopped." +-#~ msgstr "" +-#~ "\n" +-#~ "VPN-соединение «%s» разорвано, поскольку служба VPN была остановлена." +- +-#~ msgid "" +-#~ "\n" +-#~ "The VPN connection “%s” disconnected." +-#~ msgstr "" +-#~ "\n" +-#~ "VPN-соединение «%s» разорвано." +- +-#, fuzzy +-#~ msgid "invalid EAP-TLS CA certificate: %s" +-#~ msgstr "С_ертификат УЦ:" +- +-#, fuzzy +-#~ msgid "invalid EAP-TLS CA certificate: no certificate specified" +-#~ msgstr "С_ертификат УЦ:" +- +-#, fuzzy +-#~ msgid "invalid EAP-TLS password: missing" +-#~ msgstr "С_ертификат УЦ:" +- +-#, fuzzy +-#~ msgid "invalid EAP-TLS private-key: %s" +-#~ msgstr "С_ертификат УЦ:" +- +-#, fuzzy +-#~ msgid "invalid EAP-TLS user-certificate: %s" +-#~ msgstr "С_ертификат УЦ:" +- +-#~ msgid "Unencrypted private keys are insecure" +-#~ msgstr "Использовать секретные ключи без шифрования небезопасно" +- +-#, fuzzy +-#~| msgid "" +-#~| "The selected private key does not appear to be protected by a password. " +-#~| "This could allow your security credentials to be compromised. Please " +-#~| "select a password-protected private key.\n" +-#~| "\n" +-#~| "(You can password-protect your private key with openssl)" +-#~ msgid "" +-#~ "The selected private key does not appear to be protected by a password. " +-#~ "This could allow your security credentials to be compromised. Please " +-#~ "select a password-protected private key.\n" +-#~ "\n" +-#~ "(You can password-protect your private key with openssl)" +-#~ msgstr "" +-#~ "Выбранный секретный ключ не защищён паролем. Это небезопасно, выберите " +-#~ "секретный ключ, защищённый паролем.\n" +-#~ "\n" +-#~ "Примечание: секретный ключ можно защитить с помощью openssl." +- +-#, fuzzy +-#~| msgid "Choose your personal certificate..." +-#~ msgid "Choose your personal certificate" +-#~ msgstr "Выбрать персональный сертификат…" +- +-#, fuzzy +-#~| msgid "Choose your private key..." +-#~ msgid "Choose your private key" +-#~ msgstr "Выбрать секретный ключ…" +- +-#~ msgid "_User certificate:" +-#~ msgstr "_Пользовательский сертификат:" +- +-#~ msgid "Preparing network connection '%s'..." +-#~ msgstr "Подготовка сетевого соединения «%s»…" +- +-#~ msgid "User authentication required for network connection '%s'..." +-#~ msgstr "Для сетевого соединения «%s» требуется аутентификация…" +- +-#~ msgid "Requesting a network address for '%s'..." +-#~ msgstr "Запрос сетевого адреса для «%s»…" +- +-#~ msgid "Starting VPN connection '%s'..." +-#~ msgstr "Запуск VPN-соединения «%s»…" +- +-#~ msgid "User authentication required for VPN connection '%s'..." +-#~ msgstr "Для VPN-соединения «%s» требуется аутентификация…" +- +-#~ msgid "Requesting a VPN address for '%s'..." +-#~ msgstr "Запрос VPN-адреса для «%s»…" +- +-#~ msgid "New Mobile Broadband connection..." +-#~ msgstr "Создать соединение мобильной связи…" +- +-#~ msgid "User authentication required for mobile broadband connection '%s'..." +-#~ msgstr "Для соединения мобильной связи «%s» требуется аутентификация…" +- +-#~ msgid "Preparing ethernet network connection '%s'..." +-#~ msgstr "Подготовка сетевого соединения ethernet «%s»…" +- +-#~ msgid "Configuring ethernet network connection '%s'..." +-#~ msgstr "Настройка сетевого соединения ethernet «%s»…" +- +-#~ msgid "User authentication required for ethernet network connection '%s'..." +-#~ msgstr "Для сетевого соединения ethernet «%s» требуется аутентификация…" +- +-#~ msgid "Requesting an ethernet network address for '%s'..." +-#~ msgstr "Запрос адреса сетевого соединения ethernet для «%s»…" +- +-#~ msgid "_Connect to Hidden Wi-Fi Network..." +-#~ msgstr "_Подключиться к скрытой сети Wi-Fi…" +- +-# перевод wifi как "беспроводная сеть" не подходит, так как bluetooth тоже беспроводная сеть +-#~ msgid "Create _New Wi-Fi Network..." +-#~ msgstr "Создать _новую сеть Wi-Fi…" +- +-#~ msgid "Preparing Wi-Fi network connection '%s'..." +-#~ msgstr "Подготовка сетевого соединения Wi-Fi «%s»…" +- +-#~ msgid "Configuring Wi-Fi network connection '%s'..." +-#~ msgstr "Настройка сетевого соединения Wi-Fi «%s»…" +- +-#~ msgid "Requesting a Wi-Fi network address for '%s'..." +-#~ msgstr "Запрос адреса сети Wi-Fi для «%s»…" +- +-#~ msgid " " +-#~ msgstr " " +- +-#~ msgid "0" +-#~ msgstr "0" +- +-#~ msgid "1" +-#~ msgstr "1" +- +-#~ msgid "2" +-#~ msgstr "2" +- +-#~ msgid "3" +-#~ msgstr "3" +- +-#~ msgid "4" +-#~ msgstr "4" +- +-#~ msgid "5" +-#~ msgstr "5" +- +-#~ msgid "6" +-#~ msgstr "6" +- +-#~ msgid "7" +-#~ msgstr "7" +- +-#~ msgid "15" +-#~ msgstr "15" +- +-#~ msgid "Aut_onegotiate" +-#~ msgstr "_Автосогласование" +- +-#~ msgid "_Import team configuration from a file..." +-#~ msgstr "" +-#~ "_Импортировать параметры агрегированного соединения (team) из файла…" +- +-#~ msgid "Im_port team configuration from a file..." +-#~ msgstr "" +-#~ "И_мпортировать параметры агрегированного соединения (team) из файла…" +- +-#~ msgid "Don't know how to create '%s' connections" +-#~ msgstr "Неизвестно, как создавать соединения «%s»" +- +-#~ msgid "FirewallD is not running." +-#~ msgstr "FirewallD не запущен." +- +-#~ msgid "New..." +-#~ msgstr "Создать…" +- +-#~ msgid "NetworkManager for GNOME" +-#~ msgstr "NetworkManager для GNOME" +- +-#~ msgid "_Disconnect VPN" +-#~ msgstr "_Отключить VPN" +- +-#~ msgid "Enable WiMA_X Mobile Broadband" +-#~ msgstr "Включить мобильную связь WiMA_X" +- +-#~ msgid "_Help" +-#~ msgstr "_Справка" +- +-#~ msgid "VPN connection '%s' active" +-#~ msgstr "VPN-соединение «%s» активно" +- +-# есть bond и есть team, принцип работы один, и то и другое переводится как "агрегированное", но нужно уточнять что имелось ввиду +-#~ msgid "You are now connected to the bonded network." +-#~ msgstr "Вы подключены к агрегированной сети (bond)." +- +-# есть bond и есть team, принцип работы один, и то и другое переводится как "агрегированное", но нужно уточнять что имелось ввиду +-#~ msgid "Preparing bond connection '%s'..." +-#~ msgstr "Подготовка агрегированного соединения (bond) «%s»…" +- +-# есть bond и есть team, принцип работы один, и то и другое переводится как "агрегированное", но нужно уточнять что имелось ввиду +-#~ msgid "Configuring bond connection '%s'..." +-#~ msgstr "Настройка агрегированного соединения (bond) «%s»…" +- +-# есть bond и есть team, принцип работы один, и то и другое переводится как "агрегированное", но нужно уточнять что имелось ввиду +-#~ msgid "User authentication required for bond connection '%s'..." +-#~ msgstr "" +-#~ "Для агрегированного соединения (bond) «%s» требуется аутентификация…" +- +-#~ msgid "Requesting address for '%s'..." +-#~ msgstr "Запрос адреса для «%s»…" +- +-#~ msgid "Bond connection '%s' active" +-#~ msgstr "Агрегированное соединение (bond) «%s» активно" +- +-#~ msgid "You are now connected to the bridged network." +-#~ msgstr "Вы подключены к сети типа мост." +- +-#~ msgid "Preparing bridge connection '%s'..." +-#~ msgstr "Подготовка соединения типа мост «%s»…" +- +-#~ msgid "Configuring bridge connection '%s'..." +-#~ msgstr "Настройка соединения типа мост «%s»…" +- +-#~ msgid "User authentication required for bridge connection '%s'..." +-#~ msgstr "Для соединения типа мост «%s» требуется аутентификация…" +- +-#~ msgid "Bridge connection '%s' active" +-#~ msgstr "Соединение типа мост «%s» активно" +- +-#~ msgid "New Mobile Broadband (CDMA) connection..." +-#~ msgstr "Новое подключение к сети мобильной связи CDMA…" +- +-#~ msgid "You are now connected to the CDMA network." +-#~ msgstr "Вы подключены к сети CDMA." +- +-#~ msgid "CDMA network." +-#~ msgstr "Сеть CDMA." +- +-#~ msgid "New Mobile Broadband (GSM) connection..." +-#~ msgstr "Новое подключение к сети мобильной связи GSM…" +- +-#~ msgid "You are now connected to the GSM network." +-#~ msgstr "Вы подключены к сети GSM." +- +-#~ msgid "GSM network." +-#~ msgstr "Сеть GSM." +- +-#~ msgid "Auto InfiniBand" +-#~ msgstr "Автоматический InfiniBand" +- +-#~ msgid "InfiniBand Networks (%s)" +-#~ msgstr "Сети InfiniBand (%s)" +- +-#~ msgid "InfiniBand Network (%s)" +-#~ msgstr "Сеть InfiniBand (%s)" +- +-#~ msgid "InfiniBand Networks" +-#~ msgstr "Сети InfiniBand" +- +-#~ msgid "InfiniBand Network" +-#~ msgstr "Сеть InfiniBand" +- +-#~ msgid "You are now connected to the InfiniBand network." +-#~ msgstr "Вы подключены к сети InfiniBand." +- +-#~ msgid "Preparing InfiniBand connection '%s'..." +-#~ msgstr "Подготовка соединения InfiniBand «%s»…" +- +-#~ msgid "Configuring InfiniBand connection '%s'..." +-#~ msgstr "Настройка соединения InfiniBand «%s»…" +- +-#~ msgid "User authentication required for InfiniBand connection '%s'..." +-#~ msgstr "Для соединения InfiniBand «%s» требуется аутентификация…" +- +-#~ msgid "InfiniBand connection '%s' active" +-#~ msgstr "Соединение InfiniBand «%s» активно" +- +-#~ msgid "You are now connected to the teamed network." +-#~ msgstr "Вы подключены к агрегированной сети (team)." +- +-#~ msgid "Preparing team connection '%s'..." +-#~ msgstr "Подготовка агрегированного соединения (team) «%s»…" +- +-#~ msgid "Configuring team connection '%s'..." +-#~ msgstr "Настройка агрегированного соединения (team) «%s»…" +- +-#~ msgid "User authentication required for team connection '%s'..." +-#~ msgstr "" +-#~ "Для агрегированного соединения (team) «%s» требуется аутентификация…" +- +-#~ msgid "Team connection '%s' active" +-#~ msgstr "Агрегированное соединение (team) «%s» активно" +- +-#~ msgid "You are now connected to the VLAN." +-#~ msgstr "Вы подключены к сети VLAN." +- +-#~ msgid "Preparing VLAN connection '%s'..." +-#~ msgstr "Подготовка соединения VLAN «%s»…" +- +-#~ msgid "Configuring VLAN connection '%s'..." +-#~ msgstr "Настройка соединения VLAN «%s»…" +- +-#~ msgid "User authentication required for VLAN connection '%s'..." +-#~ msgstr "Для соединения VLAN «%s» требуется аутентификация…" +- +-#~ msgid "VLAN connection '%s' active" +-#~ msgstr "Соединение VLAN «%s» активно" +- +-#~ msgid "WiMAX Mobile Broadband (%s)" +-#~ msgstr "Мобильная связь WiMAX (%s)" +- +-#~ msgid "WiMAX Mobile Broadband" +-#~ msgstr "Мобильная связь WiMAX" +- +-#~ msgid "WiMAX is disabled" +-#~ msgstr "WiMAX выключен" +- +-#~ msgid "WiMAX is disabled by hardware switch" +-#~ msgstr "WiMAX выключен механическим переключателем" +- +-#~ msgid "You are now connected to the WiMAX network." +-#~ msgstr "Вы подключены к сети WiMAX." +- +-#~ msgid "%d dB" +-#~ msgstr "%d дБ" +- +-#~ msgctxt "WiMAX CINR" +-#~ msgid "unknown" +-#~ msgstr "неизвестно" +- +-#~ msgctxt "WiMAX Base Station ID" +-#~ msgid "unknown" +-#~ msgstr "неизвестно" +- +-#~ msgid "WiMAX (%s)" +-#~ msgstr "WiMAX (%s)" +- +-#~ msgid "CINR:" +-#~ msgstr "CINR:" +- +-#~ msgid "BSID:" +-#~ msgstr "BSID:" +- +-#~ msgid "_Cloned MAC address:" +-#~ msgstr "_Клонированный MAC-адрес:" +- +-#~ msgid "WiMAX" +-#~ msgstr "WiMAX" +- +-#~ msgid "Error saving connection" +-#~ msgstr "Ошибка сохранения соединения" +- +-#~ msgid "The property '%s' / '%s' is invalid: %d" +-#~ msgstr "Неверное свойство «%s» / «%s»: %d" +- +-#~ msgid "Could not load WiMAX user interface." +-#~ msgstr "Не удалось загрузить пользовательский интерфейс WiMAX." +- +-#~ msgid "WiMAX name missing" +-#~ msgstr "Отсутствует имя WiMAX" +- +-#~ msgid "WiMAX device" +-#~ msgstr "Устройство WiMAX" +- +-#~ msgid "WiMAX connection %d" +-#~ msgstr "Соединение WiMAX %d" +- +-#~ msgid "" +-#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) " +-#~ "%s)." +-#~ msgstr "" +-#~ "Невозможно настроить Bluetooth (ошибка подключения к D-Bus: (%s) %s)." +- +-#~ msgid "" +-#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) " +-#~ "%s)." +-#~ msgstr "Невозможно настроить Bluetooth (не найден NetworkManager: (%s) %s)." +- +-#~ msgid "Use your mobile phone as a network device (PAN/NAP)" +-#~ msgstr "Использовать мобильный телефон как сетевое устройство (PAN/NAP)" +- +-#~ msgid "Access the Internet using your mobile phone (DUN)" +-#~ msgstr "" +-#~ "Доступ к Интернету с использованием вашего мобильного телефона (DUN)" +- +-#~ msgid "Error: %s" +-#~ msgstr "Ошибка: %s" +- +-#~ msgid "Failed to create DUN connection: %s" +-#~ msgstr "Не удалось создать DUN-соединение: %s" +- +-#~ msgid "Your phone is now ready to use!" +-#~ msgstr "Телефон готов к работе!" +- +-#~ msgid "Mobile wizard was canceled" +-#~ msgstr "Мастер настройки мобильного соединения отменён" +- +-#~ msgid "Unknown phone device type (not GSM or CDMA)" +-#~ msgstr "Неизвестный тип телефона (не GSM и не CDMA)" +- +-#~ msgid "failed to connect to the phone." +-#~ msgstr "не удалось подключиться к телефону." +- +-#~ msgid "error getting bus connection" +-#~ msgstr "ошибка получения подключения к шине" +- +-#~ msgid "unexpectedly disconnected from the phone." +-#~ msgstr "неожиданный разрыв связи с телефоном." +- +-#~ msgid "timed out detecting phone details." +-#~ msgstr "превышено время ожидания для поиска телефона." +- +-#~ msgid "Detecting phone configuration..." +-#~ msgstr "Поиск настроек телефона…" +- +-#~ msgid "" +-#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-" +-#~ "Networking connection." +-#~ msgstr "" +-#~ "Адаптер Bluetooth по умолчанию должен быть включён до настройки " +-#~ "коммутируемого соединения." +- +-#~ msgid "Failed to create PAN connection: %s" +-#~ msgstr "Не удалось создать PAN-соединение: %s" +- +-#~ msgid "%s Network" +-#~ msgstr "Сеть %s" +- +-#~ msgid "_Device MAC address:" +-#~ msgstr "MAC-адрес _устройства:" +- +-#~ msgid "Any" +-#~ msgstr "Любой" +- +-#~ msgid "3G (UMTS/HSPA)" +-#~ msgstr "3G (UMTS/HSPA)" +- +-#~ msgid "2G (GPRS/EDGE)" +-#~ msgstr "2G (GPRS/EDGE)" +- +-#~ msgid "Prefer 3G (UMTS/HSPA)" +-#~ msgstr "Предпочитать 3G (UMTS/HSPA)" +- +-#~ msgid "Prefer 2G (GPRS/EDGE)" +-#~ msgstr "Предпочитать 2G (GPRS/EDGE)" +- +-#~ msgid "Prefer 4G (LTE)" +-#~ msgstr "Предпочитать 4G (LTE)" +- +-#~ msgid "Use only 4G (LTE)" +-#~ msgstr "Только 4G (LTE)" +- +-#~ msgid "Infrastructure" +-#~ msgstr "Инфраструктура" +- +-#~ msgid "Automatic (PPP)" +-#~ msgstr "Автоматически (PPP)" +- +-#~ msgid "Automatic (PPP) addresses only" +-#~ msgstr "Автоматически (PPP, только адрес)" +- +-#~ msgid "unknown modem type." +-#~ msgstr "неизвестный тип модема." +- +-#~ msgid "Secondary DNS:" +-#~ msgstr "Вторичный DNS:" +- +-#~ msgid "Ternary DNS:" +-#~ msgstr "Третичный DNS:" +- +-#~ msgid "_Save..." +-#~ msgstr "_Сохранить…" +- +-#~ msgid "_Edit..." +-#~ msgstr "_Изменить…" +- +-#~ msgid "_Delete..." +-#~ msgstr "_Удалить…" +- +-#~ msgid "No Certificate Authority certificate chosen" +-#~ msgstr "Не выбран сертификат удостоверяющего центра" +- +-#~| msgid "" +-#~| "Not using a Certificate Authority (CA) certificate can result in " +-#~| "connections to insecure, rogue wireless networks. Would you like to " +-#~| "choose a Certificate Authority certificate?" +-#~ msgid "" +-#~ "Not using a Certificate Authority (CA) certificate can result in " +-#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +-#~ "a Certificate Authority certificate?" +-#~ msgstr "" +-#~ "Игнорирование сертификата удостоверяющего центра (УЦ) может сделать " +-#~ "подключения уязвимыми. Хотите выбрать сертификат удостоверяющего центра?" +- +-#~ msgid "Wireless Networks (%s)" +-#~ msgstr "Беспроводные сети (%s)" +- +-#~ msgid "Wireless Network (%s)" +-#~ msgstr "Беспроводная сеть (%s)" +- +-#~ msgid "Wireless Network" +-#~ msgid_plural "Wireless Networks" +-#~ msgstr[0] "Беспроводная сеть" +-#~ msgstr[1] "Беспроводные сети" +-#~ msgstr[2] "Беспроводных сетей" +- +-#~ msgid "wireless is disabled" +-#~ msgstr "поддержка беспроводных сетей отключена" +- +-#~ msgid "wireless is disabled by hardware switch" +-#~ msgstr "поддержка беспроводных сетей отключена аппаратно" +- +-#~ msgid "Wireless network connection '%s' active" +-#~ msgstr "Беспроводное сетевое соединение «%s» установлено" +- +-#~ msgid "Could not load Wired Security security user interface." +-#~ msgstr "" +-#~ "Не удалось загрузить интерфейс настройки защиты проводного соединения." +- +-#~ msgid "Wireless" +-#~ msgstr "Беспроводные" +- +-#~ msgid "Wireless connection %d" +-#~ msgstr "Беспроводное соединение %d" +- +-#~ msgid "_Import" +-#~ msgstr "_Импортировать" +- +-#~ msgid "Connect _automatically" +-#~ msgstr "Подключаться _автоматически" +- +-#~ msgid "A_vailable to all users" +-#~ msgstr "Доступно _всем пользователям" +- +-#~ msgid "An unknown error occurred." +-#~ msgstr "Произошла неизвестная ошибка." +- +-#~ msgid "Could not edit new connection" +-#~ msgstr "Не удалось изменить новое соединение" +- +-#~ msgid "Could not edit imported connection" +-#~ msgstr "Не удалось изменить импортированное соединение" +- +-#~ msgid "No VPN plugin available. Please install one to enable this button." +-#~ msgstr "" +-#~ "Модуль VPN недоступен. Установите модуль, чтобы эта кнопка стала активной." +- +-#~ msgid "No" +-#~ msgstr "Нет" +- +-#~ msgid "Yes" +-#~ msgstr "Да" +- +-#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)." +-#~ msgstr "Невозможно настроить Bluetooth (ошибка создания прокси D-Bus)." +- +-#~ msgid "_Security:" +-#~ msgstr "_Защита:" +- +-#~ msgid "Click on this icon to connect to a wireless network" +-#~ msgstr "Нажмите на этот значок для подключения к беспроводной сети" +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 4ae9991..e652c99 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -12,24 +12,24 @@ + # Edison Zhao , 2011. + # EL8LatSPQ , 2012. + # YunQiang Su , 2012. +-# ++# lrintel , 2017. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: network-manager-applet master\n" ++"Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2017-05-10 12:44+0200\n" +-"PO-Revision-Date: 2016-04-06 17:10+0800\n" +-"Last-Translator: shijing \n" ++"POT-Creation-Date: 2017-11-07 19:40+0100\n" ++"PO-Revision-Date: 2017-11-07 06:44+0000\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: Chinese (simplified) \n" +-"Language: zh_CN\n" ++"Language: zh_Hans\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-Launchpad-Export-Date: 2016-03-22 13:39+0000\n" +-"X-Generator: Poedit 1.8.7\n" ++"X-Generator: Zanata 4.3.2\n" + +-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175 ++#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191 + msgid "Network" + msgstr "网络" + +@@ -38,7 +38,7 @@ msgid "Manage your network connections" + msgstr "管理网络连接" + + #: ../nm-connection-editor.desktop.in.h:1 +-#: ../src/connection-editor/nm-connection-editor.ui.h:1 ++#: ../src/connection-editor/nm-connection-list.ui.h:1 + msgid "Network Connections" + msgstr "网络连接" + +@@ -149,55 +149,68 @@ msgstr "nm-connection-editor 程序为网络管理器创建或编辑现有的连 + msgid "The NetworkManager Developers" + msgstr "网络管理器小程序" + +-#: ../shared/nm-utils/nm-shared-utils.c:185 ++#: ../shared/nm-utils/nm-shared-utils.c:477 + #, c-format + msgid "object class '%s' has no property named '%s'" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:192 ++#: ../shared/nm-utils/nm-shared-utils.c:484 + #, c-format + msgid "property '%s' of object class '%s' is not writable" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:199 ++#: ../shared/nm-utils/nm-shared-utils.c:491 + #, c-format + msgid "" + "construct property \"%s\" for object '%s' can't be set after construction" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:207 ++#: ../shared/nm-utils/nm-shared-utils.c:499 + #, c-format + msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:216 ++#: ../shared/nm-utils/nm-shared-utils.c:508 + #, c-format + msgid "unable to set property '%s' of type '%s' from value of type '%s'" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:227 ++#: ../shared/nm-utils/nm-shared-utils.c:519 + #, c-format + msgid "" + "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " + "type '%s'" + msgstr "" + +-#. *************************************************************************** + #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99 + msgid "802.1X authentication" + msgstr "802.1X 认证" + +-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1 ++#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349 ++#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1 + #: ../src/connection-editor/ce-ip6-routes.ui.h:1 + #: ../src/connection-editor/ce-new-connection.ui.h:1 + #: ../src/connection-editor/ce-page-dcb.ui.h:17 + #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1 +-#: ../src/connection-editor/nm-connection-editor.ui.h:8 +-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1 ++#: ../src/connection-editor/connection-helpers.c:308 ++#: ../src/connection-editor/connection-helpers.c:771 ++#: ../src/connection-editor/nm-connection-editor.ui.h:5 ++#: ../src/connection-editor/page-bluetooth.c:311 ++#: ../src/connection-editor/page-mobile.c:543 ++#: ../src/connection-editor/page-proxy.c:121 ++#: ../src/connection-editor/page-team.c:344 ++#: ../src/connection-editor/page-team-port.c:206 ++#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1 ++#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1 ++#: ../src/libnma/nma-vpn-password-dialog.c:209 ++#: ../src/libnma/nma-wifi-dialog.c:1066 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209 ++#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465 + msgid "_Cancel" + msgstr "" + +-#: ../src/8021x.ui.h:3 ++#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072 ++#: ../src/libnm-gtk/nm-wifi-dialog.c:1073 + #, fuzzy + msgid "C_onnect" + msgstr "已连接" +@@ -214,38 +227,38 @@ msgstr "Ad hoc" + msgid "secure." + msgstr "安全。" + +-#: ../src/applet.c:381 ++#: ../src/applet.c:392 + msgid "Failed to add/activate connection" + msgstr "无法添加/启用连接" + +-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472 +-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410 ++#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483 ++#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411 + msgid "Unknown error" + msgstr "未知错误" + +-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539 +-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413 ++#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539 ++#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414 + msgid "Connection failure" + msgstr "连接失败" + +-#: ../src/applet.c:435 ++#: ../src/applet.c:446 + msgid "Device disconnect failed" + msgstr "设备断开失败" + +-#: ../src/applet.c:440 ++#: ../src/applet.c:451 + msgid "Disconnect failure" + msgstr "断开失败" + +-#: ../src/applet.c:470 ++#: ../src/applet.c:481 + msgid "Connection activation failed" + msgstr "连接启用失败" + +-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126 ++#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127 + #, fuzzy + msgid "Don’t show this message again" + msgstr "不再显示此信息" + +-#: ../src/applet.c:883 ++#: ../src/applet.c:899 + #, fuzzy, c-format + msgid "" + "\n" +@@ -255,7 +268,7 @@ msgstr "" + "\n" + "VPN 连接“%s”已断开。网络连接被中断。" + +-#: ../src/applet.c:885 ++#: ../src/applet.c:901 + #, fuzzy, c-format + msgid "" + "\n" +@@ -265,7 +278,7 @@ msgstr "" + "\n" + "VPN 连接“%s”失败。网络连接被中断。" + +-#: ../src/applet.c:887 ++#: ../src/applet.c:903 + #, fuzzy, c-format + msgid "" + "\n" +@@ -274,7 +287,7 @@ msgstr "" + "\n" + "VPN 连接“%s”失败。VPN 服务异常中断。" + +-#: ../src/applet.c:889 ++#: ../src/applet.c:905 + #, fuzzy, c-format + msgid "" + "\n" +@@ -284,7 +297,7 @@ msgstr "" + "\n" + "VPN 连接“%s”失败。VPN 服务返回了一个非法配置。" + +-#: ../src/applet.c:891 ++#: ../src/applet.c:907 + #, fuzzy, c-format + msgid "" + "\n" +@@ -293,7 +306,7 @@ msgstr "" + "\n" + "VPN 连接“%s”失败。连接超时。" + +-#: ../src/applet.c:893 ++#: ../src/applet.c:909 + #, fuzzy, c-format + msgid "" + "\n" +@@ -302,7 +315,7 @@ msgstr "" + "\n" + "VPN 连接“%s”失败。VPN 服务未在所需时间内启动。" + +-#: ../src/applet.c:895 ++#: ../src/applet.c:911 + #, fuzzy, c-format + msgid "" + "\n" +@@ -311,7 +324,7 @@ msgstr "" + "\n" + "VPN 连接“%s”失败。VPN 服务启动失败。" + +-#: ../src/applet.c:897 ++#: ../src/applet.c:913 + #, fuzzy, c-format + msgid "" + "\n" +@@ -320,7 +333,7 @@ msgstr "" + "\n" + "VPN 连接“%s”失败。没有合法的 VPN secret。" + +-#: ../src/applet.c:899 ++#: ../src/applet.c:915 + #, fuzzy, c-format + msgid "" + "\n" +@@ -329,7 +342,7 @@ msgstr "" + "\n" + "VPN 连接“%s”失败。VPN secret 非法。" + +-#: ../src/applet.c:904 ++#: ../src/applet.c:920 + #, fuzzy, c-format + msgid "" + "\n" +@@ -338,7 +351,7 @@ msgstr "" + "\n" + "VPN 连接“%s”失败。" + +-#: ../src/applet.c:931 ++#: ../src/applet.c:947 + #, c-format + msgid "" + "VPN connection has been successfully established.\n" +@@ -349,19 +362,19 @@ msgstr "" + "\n" + "%s\n" + +-#: ../src/applet.c:933 ++#: ../src/applet.c:949 + msgid "VPN connection has been successfully established.\n" + msgstr "已成功建立 VPN 连接。\n" + +-#: ../src/applet.c:935 ++#: ../src/applet.c:951 + msgid "VPN Login Message" + msgstr "VPN 登录消息" + +-#: ../src/applet.c:943 ../src/applet.c:983 ++#: ../src/applet.c:959 ../src/applet.c:999 + msgid "VPN Connection Failed" + msgstr "VPN 连接失败" + +-#: ../src/applet.c:987 ++#: ../src/applet.c:1003 + #, fuzzy, c-format + msgid "" + "\n" +@@ -374,7 +387,7 @@ msgstr "" + "\n" + "%s" + +-#: ../src/applet.c:990 ++#: ../src/applet.c:1006 + #, fuzzy, c-format + msgid "" + "\n" +@@ -387,151 +400,151 @@ msgstr "" + "\n" + "%s" + +-#: ../src/applet.c:1279 ++#: ../src/applet.c:1295 + msgid "device not ready (firmware missing)" + msgstr "设备未就绪(缺少固件)" + +-#: ../src/applet.c:1281 ++#: ../src/applet.c:1297 + msgid "device not ready" + msgstr "设备未就绪" + + #. Notify user of unmanaged or unavailable device +-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109 ++#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109 + msgid "disconnected" + msgstr "已断开" + +-#: ../src/applet.c:1307 ++#: ../src/applet.c:1323 + msgid "Disconnect" + msgstr "断开" + +-#: ../src/applet.c:1321 ++#: ../src/applet.c:1337 + msgid "device not managed" + msgstr "设备未托管" + +-#: ../src/applet.c:1394 ++#: ../src/applet.c:1410 + msgid "No network devices available" + msgstr "没有可用的网络设备" + +-#: ../src/applet.c:1448 ++#: ../src/applet.c:1464 + msgid "_VPN Connections" + msgstr "_VPN 连接" + +-#: ../src/applet.c:1492 ++#: ../src/applet.c:1508 + #, fuzzy + msgid "_Configure VPN…" + msgstr "配置 VPN(_C)..." + +-#: ../src/applet.c:1495 ++#: ../src/applet.c:1511 + #, fuzzy + msgid "_Add a VPN connection…" + msgstr "_VPN 连接" + +-#: ../src/applet.c:1601 ++#: ../src/applet.c:1617 + #, fuzzy + msgid "NetworkManager is not running…" + msgstr "网络管理器未运行..." + +-#: ../src/applet.c:1606 ../src/applet.c:2671 ++#: ../src/applet.c:1622 ../src/applet.c:2687 + msgid "Networking disabled" + msgstr "网络已禁用" + + #. 'Enable Networking' item +-#: ../src/applet.c:1816 ++#: ../src/applet.c:1832 + msgid "Enable _Networking" + msgstr "启用联网(_N)" + + #. 'Enable Wi-Fi' item +-#: ../src/applet.c:1825 ++#: ../src/applet.c:1841 + msgid "Enable _Wi-Fi" + msgstr "启用 _Wi-Fi" + + #. 'Enable Mobile Broadband' item +-#: ../src/applet.c:1834 ++#: ../src/applet.c:1850 + msgid "Enable _Mobile Broadband" + msgstr "启用移动宽带(_M)" + + #. Toggle notifications item +-#: ../src/applet.c:1846 ++#: ../src/applet.c:1862 + msgid "Enable N_otifications" + msgstr "启用通知(_O)" + + #. 'Connection Information' item +-#: ../src/applet.c:1858 ++#: ../src/applet.c:1874 + msgid "Connection _Information" + msgstr "连接信息(_I)" + + #. 'Edit Connections...' item +-#: ../src/applet.c:1866 ++#: ../src/applet.c:1882 + #, fuzzy + msgid "Edit Connections…" + msgstr "编辑连接..." + +-#: ../src/applet.c:1880 ++#: ../src/applet.c:1896 + msgid "_About" + msgstr "关于(_A)" + +-#: ../src/applet.c:2191 ++#: ../src/applet.c:2207 + #, fuzzy, c-format + msgid "You are now connected to “%s”." + msgstr "您现在已连接到“%s”。" + +-#: ../src/applet.c:2231 ++#: ../src/applet.c:2247 + msgid "Disconnected" + msgstr "已断开连接" + +-#: ../src/applet.c:2232 ++#: ../src/applet.c:2248 + #, fuzzy + msgid "The network connection has been disconnected." + msgstr "" + "\n" + "VPN 连接“%s”已断开。" + +-#: ../src/applet.c:2534 ++#: ../src/applet.c:2550 + #, fuzzy, c-format + msgid "Preparing network connection “%s”…" + msgstr "正在准备网络连接“%s”..." + +-#: ../src/applet.c:2537 ++#: ../src/applet.c:2553 + #, fuzzy, c-format + msgid "User authentication required for network connection “%s”…" + msgstr "网络连接“%s”需要用户认证..." + +-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125 +-#: ../src/mobile-helpers.c:608 ++#: ../src/applet.c:2556 ../src/applet-device-bt.c:125 ++#: ../src/mobile-helpers.c:607 + #, fuzzy, c-format + msgid "Requesting a network address for “%s”…" + msgstr "正在为“%s”请求一个网络地址..." + +-#: ../src/applet.c:2543 ++#: ../src/applet.c:2559 + #, fuzzy, c-format + msgid "Network connection “%s” active" + msgstr "网络连接“%s”已处于活动状态" + +-#: ../src/applet.c:2616 ++#: ../src/applet.c:2632 + #, fuzzy, c-format + msgid "Starting VPN connection “%s”…" + msgstr "正在启动 VPN 连接“%s”..." + +-#: ../src/applet.c:2619 ++#: ../src/applet.c:2635 + #, fuzzy, c-format + msgid "User authentication required for VPN connection “%s”…" + msgstr "VPN 连接“%s”需要用户认证..." + +-#: ../src/applet.c:2622 ++#: ../src/applet.c:2638 + #, fuzzy, c-format + msgid "Requesting a VPN address for “%s”…" + msgstr "正在为“%s”请求一个 VPN 地址..." + +-#: ../src/applet.c:2625 ++#: ../src/applet.c:2641 + #, fuzzy, c-format + msgid "VPN connection active" + msgstr "VPN 连接“%s”已处于活动状态" + +-#: ../src/applet.c:2675 ++#: ../src/applet.c:2691 + msgid "No network connection" + msgstr "没有网络连接" + +-#: ../src/applet.c:3276 ++#: ../src/applet.c:3292 + msgid "NetworkManager Applet" + msgstr "网络管理器小程序" + +@@ -549,48 +562,48 @@ msgstr "错误的 PIN 代码；请联络您的供应商。" + msgid "Sending unlock code…" + msgstr "正在发送解锁码..." + +-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506 ++#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507 + #, c-format + msgid "Mobile Broadband (%s)" + msgstr "移动宽带(%s)" + +-#: ../src/applet-device-broadband.c:738 +-#: ../src/connection-editor/connection-helpers.c:107 ++#: ../src/applet-device-broadband.c:739 ++#: ../src/connection-editor/connection-helpers.c:108 + #: ../src/connection-editor/page-mobile.c:308 + #: ../src/libnm-gtk/nm-ui-utils.c:329 + msgid "Mobile Broadband" + msgstr "移动宽带" + +-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75 +-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906 ++#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75 ++#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907 + msgid "Available" + msgstr "可用的" + + #. Default connection item +-#: ../src/applet-device-broadband.c:803 ++#: ../src/applet-device-broadband.c:805 + #, fuzzy + msgid "New Mobile Broadband connection…" + msgstr "新移动宽带连接" + +-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87 +-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308 ++#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87 ++#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309 + msgid "Connection Established" + msgstr "连接已建立" + +-#: ../src/applet-device-broadband.c:818 ++#: ../src/applet-device-broadband.c:820 + msgid "You are now connected to the Mobile Broadband network." + msgstr "您现在已连接到移动宽带网络。" + +-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964 ++#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966 + msgid "Mobile Broadband network." + msgstr "移动宽带网络。" + + # 这里的"home network"与下面的“漫游网络”是对比的关闭，应和下文的其他地方译法一致为“主网络”才说的通。 +-#: ../src/applet-device-broadband.c:959 ++#: ../src/applet-device-broadband.c:961 + msgid "You are now registered on the home network." + msgstr "您现在已注册到主网络。" + +-#: ../src/applet-device-broadband.c:965 ++#: ../src/applet-device-broadband.c:967 + msgid "You are now registered on a roaming network." + msgstr "您现在已注册到一个漫游网络。" + +@@ -598,22 +611,22 @@ msgstr "您现在已注册到一个漫游网络。" + msgid "You are now connected to the mobile broadband network." + msgstr "您现在已连接到移动宽带网络。" + +-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599 ++#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598 + #, fuzzy, c-format + msgid "Preparing mobile broadband connection “%s”…" + msgstr "正在准备移动宽带连接“%s”..." + +-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602 ++#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601 + #, fuzzy, c-format + msgid "Configuring mobile broadband connection “%s”…" + msgstr "正在配置移动宽带连接“%s”..." + +-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605 ++#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604 + #, fuzzy, c-format + msgid "User authentication required for mobile broadband connection “%s”…" + msgstr "移动宽带连接“%s”需要用户认证..." + +-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627 ++#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626 + #, fuzzy, c-format + msgid "Mobile broadband connection “%s” active" + msgstr "移动宽带连接“%s”已处于活动状态" +@@ -673,6 +686,18 @@ msgstr "以太网连接 %s 已处于活动状态" + msgid "DSL authentication" + msgstr "DSL 认证" + ++#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060 ++#: ../src/connection-editor/ce-ip4-routes.ui.h:2 ++#: ../src/connection-editor/ce-ip6-routes.ui.h:2 ++#: ../src/connection-editor/ce-page-dcb.ui.h:18 ++#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2 ++#: ../src/connection-editor/page-bluetooth.c:313 ++#: ../src/connection-editor/page-mobile.c:545 ++#: ../src/libnma/nma-vpn-password-dialog.c:210 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466 ++msgid "_OK" ++msgstr "" ++ + #: ../src/applet-device-wifi.c:225 + #, fuzzy + msgid "_Connect to Hidden Wi-Fi Network…" +@@ -687,7 +712,7 @@ msgstr "创建新的 Wi-Fi 网络" + msgid "(none)" + msgstr "(无)" + +-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408 ++#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409 + msgid "Failed to add new connection" + msgstr "无法添加新连接" + +@@ -695,77 +720,77 @@ msgstr "无法添加新连接" + msgid "Insufficient privileges." + msgstr "" + +-#: ../src/applet-device-wifi.c:838 ++#: ../src/applet-device-wifi.c:839 + #, c-format + msgid "Wi-Fi Networks (%s)" + msgstr "Wi-Fi 网络(%s)" + +-#: ../src/applet-device-wifi.c:840 ++#: ../src/applet-device-wifi.c:841 + #, c-format + msgid "Wi-Fi Network (%s)" + msgstr "Wi-Fi 网络(%s)" + +-#: ../src/applet-device-wifi.c:842 ++#: ../src/applet-device-wifi.c:843 + msgid "Wi-Fi Network" + msgid_plural "Wi-Fi Networks" + msgstr[0] "Wi-Fi 网络" + +-#: ../src/applet-device-wifi.c:871 ++#: ../src/applet-device-wifi.c:872 + msgid "Wi-Fi is disabled" + msgstr "Wi-Fi 已禁用" + +-#: ../src/applet-device-wifi.c:872 ++#: ../src/applet-device-wifi.c:873 + msgid "Wi-Fi is disabled by hardware switch" + msgstr "Wi-Fi 已通过硬件开关禁用" + +-#: ../src/applet-device-wifi.c:933 ++#: ../src/applet-device-wifi.c:934 + msgid "More networks" + msgstr "更多网络" + +-#: ../src/applet-device-wifi.c:1122 ++#: ../src/applet-device-wifi.c:1123 + msgid "Wi-Fi Networks Available" + msgstr "Wi-Fi 网络可用" + +-#: ../src/applet-device-wifi.c:1123 ++#: ../src/applet-device-wifi.c:1124 + msgid "Use the network menu to connect to a Wi-Fi network" + msgstr "使用网络菜单连接到 Wi-Fi 网络" + +-#: ../src/applet-device-wifi.c:1307 ++#: ../src/applet-device-wifi.c:1308 + #, fuzzy, c-format + msgid "You are now connected to the Wi-Fi network “%s”." + msgstr "您现在已连接到 Wi-Fi 网络 %s。" + +-#: ../src/applet-device-wifi.c:1342 ++#: ../src/applet-device-wifi.c:1343 + #, fuzzy, c-format + msgid "Preparing Wi-Fi network connection “%s”…" + msgstr "正在准备 Wi-Fi 网络连接 %s..." + +-#: ../src/applet-device-wifi.c:1345 ++#: ../src/applet-device-wifi.c:1346 + #, fuzzy, c-format + msgid "Configuring Wi-Fi network connection “%s”…" + msgstr "正在配置 Wi-Fi 网络连接 %s..." + +-#: ../src/applet-device-wifi.c:1348 ++#: ../src/applet-device-wifi.c:1349 + #, fuzzy, c-format + msgid "User authentication required for Wi-Fi network “%s”…" + msgstr "Wi-Fi 网络 %s 需要用户认证..." + +-#: ../src/applet-device-wifi.c:1351 ++#: ../src/applet-device-wifi.c:1352 + #, fuzzy, c-format + msgid "Requesting a Wi-Fi network address for “%s”…" + msgstr "正在为 %s 请求一个网络地址..." + +-#: ../src/applet-device-wifi.c:1362 ++#: ../src/applet-device-wifi.c:1363 + #, fuzzy, c-format + msgid "Wi-Fi network connection “%s” active: %s (%d%%)" + msgstr "Wi-Fi 网络连接 %s 处于活动状态：%s (%d%%)" + +-#: ../src/applet-device-wifi.c:1366 ++#: ../src/applet-device-wifi.c:1367 + #, fuzzy, c-format + msgid "Wi-Fi network connection “%s” active" + msgstr "Wi-Fi 网络连接 %s 已处于活动状态" + +-#: ../src/applet-device-wifi.c:1385 ++#: ../src/applet-device-wifi.c:1386 + msgid "Failed to activate connection" + msgstr "无法启用连接" + +@@ -773,227 +798,227 @@ msgstr "无法启用连接" + msgid "Error displaying connection information:" + msgstr "显示连接信息时出错：" + +-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379 ++#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381 + #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948 + #: ../src/wireless-security/wireless-security.c:448 + msgid "LEAP" + msgstr "LEAP" + +-#: ../src/applet-dialogs.c:74 ++#: ../src/applet-dialogs.c:75 + msgid "Dynamic WEP" + msgstr "动态 WEP" + +-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228 +-#: ../src/applet-dialogs.c:230 ++#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229 ++#: ../src/applet-dialogs.c:231 + msgid "WPA/WPA2" + msgstr "WPA/WPA2" + + #. Create the expander +-#: ../src/applet-dialogs.c:151 ++#: ../src/applet-dialogs.c:152 + #, fuzzy + msgid "More addresses" + msgstr "MAC 地址" + +-#: ../src/applet-dialogs.c:226 ++#: ../src/applet-dialogs.c:227 + msgid "WEP" + msgstr "WEP" + +-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243 +-#: ../src/connection-editor/page-wifi-security.c:330 ++#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244 ++#: ../src/connection-editor/page-wifi-security.c:332 + msgctxt "Wi-Fi/Ethernet security" + msgid "None" + msgstr "无" + +-#: ../src/applet-dialogs.c:260 ++#: ../src/applet-dialogs.c:261 + #, c-format + msgid "%s (default)" + msgstr "%s (默认)" + +-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580 ++#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581 + #, c-format + msgid "%u Mb/s" + msgstr "%u Mb/s" + +-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582 ++#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583 + msgctxt "Speed" + msgid "Unknown" + msgstr "未知" + + #. Address +-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368 ++#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369 + msgctxt "Address" + msgid "Unknown" + msgstr "未知" + +-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420 ++#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421 + msgid "IP Address:" + msgstr "IP 地址：" + +-#: ../src/applet-dialogs.c:369 ++#: ../src/applet-dialogs.c:370 + msgid "Broadcast Address:" + msgstr "广播地址：" + + #. Prefix +-#: ../src/applet-dialogs.c:381 ++#: ../src/applet-dialogs.c:382 + msgctxt "Subnet Mask" + msgid "Unknown" + msgstr "未知" + +-#: ../src/applet-dialogs.c:382 ++#: ../src/applet-dialogs.c:383 + msgid "Subnet Mask:" + msgstr "子网掩码：" + +-#: ../src/applet-dialogs.c:492 ++#: ../src/applet-dialogs.c:493 + #, c-format + msgid "Ethernet (%s)" + msgstr "以太网(%s)" + +-#: ../src/applet-dialogs.c:495 ++#: ../src/applet-dialogs.c:496 + #, c-format + msgid "802.11 WiFi (%s)" + msgstr "802.11 WiFi (%s)" + +-#: ../src/applet-dialogs.c:502 ++#: ../src/applet-dialogs.c:503 + #, c-format + msgid "GSM (%s)" + msgstr "GSM (%s)" + +-#: ../src/applet-dialogs.c:504 ++#: ../src/applet-dialogs.c:505 + #, c-format + msgid "CDMA (%s)" + msgstr "CDMA (%s)" + + #. --- General --- +-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810 ++#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811 + #: ../src/connection-editor/ce-page-team-port.ui.h:23 + #: ../src/connection-editor/ce-page-team.ui.h:48 + #: ../src/connection-editor/page-general.c:367 + msgid "General" + msgstr "常规" + +-#: ../src/applet-dialogs.c:516 ++#: ../src/applet-dialogs.c:517 + msgid "Interface:" + msgstr "接口：" + +-#: ../src/applet-dialogs.c:536 ++#: ../src/applet-dialogs.c:537 + msgid "Hardware Address:" + msgstr "硬件地址：" + + #. Driver +-#: ../src/applet-dialogs.c:550 ++#: ../src/applet-dialogs.c:551 + msgid "Driver:" + msgstr "驱动程序：" + +-#: ../src/applet-dialogs.c:585 ++#: ../src/applet-dialogs.c:586 + msgid "Speed:" + msgstr "速度：" + +-#: ../src/applet-dialogs.c:600 ++#: ../src/applet-dialogs.c:601 + msgid "Security:" + msgstr "安全性：" + + #. --- IPv4 --- +-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851 ++#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852 + #: ../src/connection-editor/ce-page-team.ui.h:29 + msgid "IPv4" + msgstr "IPv4" + +-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689 ++#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690 + msgid "Default Route:" + msgstr "默认路由：" + + #. --- IPv6 --- +-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873 ++#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874 + #: ../src/connection-editor/ce-page-team.ui.h:30 + msgid "IPv6" + msgstr "IPv6" + +-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882 ++#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883 + msgid "Ignored" + msgstr "已忽略" + +-#: ../src/applet-dialogs.c:815 ++#: ../src/applet-dialogs.c:816 + msgid "VPN Type:" + msgstr "VPN 类型：" + +-#: ../src/applet-dialogs.c:822 ++#: ../src/applet-dialogs.c:823 + msgid "VPN Gateway:" + msgstr "VPN 网关：" + +-#: ../src/applet-dialogs.c:828 ++#: ../src/applet-dialogs.c:829 + msgid "VPN Username:" + msgstr "VPN 用户名：" + +-#: ../src/applet-dialogs.c:834 ++#: ../src/applet-dialogs.c:835 + msgid "VPN Banner:" + msgstr "VPN Banner：" + +-#: ../src/applet-dialogs.c:840 ++#: ../src/applet-dialogs.c:841 + msgid "Base Connection:" + msgstr "基本连接：" + +-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343 ++#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343 + msgid "Unknown" + msgstr "未知" + + #. Shouldn't really happen but ... +-#: ../src/applet-dialogs.c:957 ++#: ../src/applet-dialogs.c:958 + msgid "No valid active connections found!" + msgstr "未找到合法的活动连接！" + +-#: ../src/applet-dialogs.c:985 +-#, fuzzy ++#: ../src/applet-dialogs.c:1007 + msgid "" +-"Copyright © 2004-2014 Red Hat, Inc.\n" ++"Copyright © 2004-2017 Red Hat, Inc.\n" + "Copyright © 2005-2008 Novell, Inc.\n" + "and many other community contributors and translators" + msgstr "" +-"版权所有 (C) 2004-2011 Red Hat 公司\n" +-"版权所有 (C) 2005-2008 Novell 公司\n" +-"和其他众多社区贡献者和翻译者" + +-#: ../src/applet-dialogs.c:988 ++#: ../src/applet-dialogs.c:1010 + msgid "" + "Notification area applet for managing your network devices and connections." + msgstr "管理您网络设备和连接的通知区域小程序。" + +-#: ../src/applet-dialogs.c:990 ++#: ../src/applet-dialogs.c:1012 + msgid "NetworkManager Website" + msgstr "NetworkManager 网站" + +-#: ../src/applet-dialogs.c:1001 ++#: ../src/applet-dialogs.c:1016 ++msgid "translator-credits" ++msgstr "" ++ ++#: ../src/applet-dialogs.c:1026 + msgid "" + "The NetworkManager Applet could not find some required resources (the .ui " + "file was not found)." + msgstr "网络管理器小程序找不到所需的资源(.ui 文件未找到)。" + +-#: ../src/applet-dialogs.c:1006 ++#: ../src/applet-dialogs.c:1031 + msgid "Missing resources" + msgstr "缺少资源" + +-#: ../src/applet-dialogs.c:1031 ++#: ../src/applet-dialogs.c:1057 + msgid "Mobile broadband network password" + msgstr "移动宽带网络密码" + +-#: ../src/applet-dialogs.c:1040 ++#: ../src/applet-dialogs.c:1066 + #, fuzzy, c-format + msgid "A password is required to connect to “%s”." + msgstr "连接到“%s”需要密码。" + +-#: ../src/applet-dialogs.c:1055 ++#: ../src/applet-dialogs.c:1081 + msgid "Password:" + msgstr "密码：" + +-#: ../src/applet-dialogs.c:1337 ++#: ../src/applet-dialogs.c:1363 + msgid "SIM PIN unlock required" + msgstr "需要解锁 SIM PIN" + +-#: ../src/applet-dialogs.c:1338 ++#: ../src/applet-dialogs.c:1364 + msgid "SIM PIN Unlock Required" + msgstr "需要解锁 SIM PIN" + + #. FIXME: some warning about # of times you can enter incorrect PIN +-#: ../src/applet-dialogs.c:1340 ++#: ../src/applet-dialogs.c:1366 + #, fuzzy, c-format + msgid "" + "The mobile broadband device “%s” requires a SIM PIN code before it can be " +@@ -1001,25 +1026,25 @@ msgid "" + msgstr "移动宽带设备“%s”在可以使用之前需要一个 SIM PIN 码。" + + #. Translators: PIN code entry label +-#: ../src/applet-dialogs.c:1342 ++#: ../src/applet-dialogs.c:1368 + msgid "PIN code:" + msgstr "PIN 代码：" + + #. Translators: Show/obscure PIN checkbox label +-#: ../src/applet-dialogs.c:1346 ++#: ../src/applet-dialogs.c:1372 + msgid "Show PIN code" + msgstr "显示 PIN 码" + +-#: ../src/applet-dialogs.c:1348 ++#: ../src/applet-dialogs.c:1374 + msgid "SIM PUK unlock required" + msgstr "需要解锁 SIM PUK" + +-#: ../src/applet-dialogs.c:1349 ++#: ../src/applet-dialogs.c:1375 + msgid "SIM PUK Unlock Required" + msgstr "需要解锁 SIM PUK" + + #. FIXME: some warning about # of times you can enter incorrect PUK +-#: ../src/applet-dialogs.c:1351 ++#: ../src/applet-dialogs.c:1377 + #, fuzzy, c-format + msgid "" + "The mobile broadband device “%s” requires a SIM PUK code before it can be " +@@ -1027,32 +1052,25 @@ msgid "" + msgstr "移动宽带设备“%s”在可以使用之前需要一个 SIM PUK 码。" + + #. Translators: PUK code entry label +-#: ../src/applet-dialogs.c:1353 ++#: ../src/applet-dialogs.c:1379 + msgid "PUK code:" + msgstr "PUK 码：" + + #. Translators: New PIN entry label +-#: ../src/applet-dialogs.c:1356 ++#: ../src/applet-dialogs.c:1382 + msgid "New PIN code:" + msgstr "新的 PIN 码：" + + #. Translators: New PIN verification entry label +-#: ../src/applet-dialogs.c:1358 ++#: ../src/applet-dialogs.c:1384 + msgid "Re-enter new PIN code:" + msgstr "再次输入新的 PIN 码：" + + #. Translators: Show/obscure PIN/PUK checkbox label +-#: ../src/applet-dialogs.c:1363 ++#: ../src/applet-dialogs.c:1389 + msgid "Show PIN/PUK codes" + msgstr "显示 PIN/PUK 码：" + +-#: ../src/connection-editor/ce-ip4-routes.ui.h:2 +-#: ../src/connection-editor/ce-ip6-routes.ui.h:2 +-#: ../src/connection-editor/ce-page-dcb.ui.h:18 +-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2 +-msgid "_OK" +-msgstr "" +- + #: ../src/connection-editor/ce-ip4-routes.ui.h:3 + #: ../src/connection-editor/ce-ip6-routes.ui.h:3 + #: ../src/connection-editor/ce-page.h:114 +@@ -1067,21 +1085,21 @@ msgstr "IP 地址可在网络上标识您的计算机。单击“添加”按钮 + #: ../src/connection-editor/ce-page-bond.ui.h:12 + #: ../src/connection-editor/ce-page-bridge.ui.h:2 + #: ../src/connection-editor/ce-page-ip4.ui.h:7 +-#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++#: ../src/connection-editor/ce-page-ip6.ui.h:12 + #: ../src/connection-editor/ce-page-team.ui.h:13 +-#: ../src/connection-editor/nm-connection-editor.ui.h:3 ++#: ../src/connection-editor/nm-connection-list.ui.h:3 + msgid "_Add" + msgstr "" + +-#. Delete + #: ../src/connection-editor/ce-ip4-routes.ui.h:5 + #: ../src/connection-editor/ce-ip6-routes.ui.h:5 + #: ../src/connection-editor/ce-page-bond.ui.h:14 + #: ../src/connection-editor/ce-page-bridge.ui.h:4 + #: ../src/connection-editor/ce-page-ip4.ui.h:8 +-#: ../src/connection-editor/ce-page-ip6.ui.h:11 ++#: ../src/connection-editor/ce-page-ip6.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:15 +-#: ../src/connection-editor/nm-connection-list.c:711 ++#: ../src/connection-editor/connection-helpers.c:772 ++#: ../src/connection-editor/nm-connection-list.ui.h:4 + msgid "_Delete" + msgstr "删除(_D)" + +@@ -1171,11 +1189,10 @@ msgstr "已绑定连接(_C)：" + msgid "M_ode:" + msgstr "模式(_O)：" + +-#. Edit + #: ../src/connection-editor/ce-page-bond.ui.h:13 + #: ../src/connection-editor/ce-page-bridge.ui.h:3 + #: ../src/connection-editor/ce-page-team.ui.h:14 +-#: ../src/connection-editor/nm-connection-list.c:695 ++#: ../src/connection-editor/nm-connection-list.ui.h:5 + msgid "_Edit" + msgstr "编辑(_E)" + +@@ -1227,7 +1244,7 @@ msgstr "主设备的接口名称。如果设置，在此设备可用时将一直 + + #: ../src/connection-editor/ce-page-bond.ui.h:25 + #: ../src/connection-editor/ce-page-ethernet.ui.h:17 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:4 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:8 + #: ../src/connection-editor/ce-page-team.ui.h:17 + #: ../src/connection-editor/ce-page-vlan.ui.h:4 + #: ../src/connection-editor/ce-page-wifi.ui.h:8 +@@ -1236,7 +1253,7 @@ msgstr "_MTU：" + + #: ../src/connection-editor/ce-page-bond.ui.h:26 + #: ../src/connection-editor/ce-page-ethernet.ui.h:18 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:3 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:7 + #: ../src/connection-editor/ce-page-team.ui.h:18 + #: ../src/connection-editor/ce-page-vlan.ui.h:5 + #: ../src/connection-editor/ce-page-wifi.ui.h:7 +@@ -1269,26 +1286,72 @@ msgid "_Hello time:" + msgstr "问候时间(_H)：" + + #: ../src/connection-editor/ce-page-bridge.ui.h:9 ++msgid "STP forwarding delay, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:10 + msgid "s" + msgstr "秒" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:10 ++#: ../src/connection-editor/ce-page-bridge.ui.h:11 ++msgid "STP hello time, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:12 + #, fuzzy + msgid "Enable I_GMP snooping" + msgstr "启用联网(_N)" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:11 ++#: ../src/connection-editor/ce-page-bridge.ui.h:13 ++msgid "" ++"Controls whether IGMP snooping is enabled for this bridge. Note that if " ++"snooping was automatically disabled due to hash collisions, the system may " ++"refuse to enable the feature until the collisions are resolved." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:14 + msgid "Enable _STP (Spanning Tree Protocol)" + msgstr "启用 _STP" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:12 ++#: ../src/connection-editor/ce-page-bridge.ui.h:15 ++msgid "" ++"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:16 ++msgid "" ++"STP priority for this bridge. Lower values are “better”; the lowest priority " ++"bridge will be elected the root bridge." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:17 + msgid "_Max age:" + msgstr "最大老化时间(_M)：" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:13 ++#: ../src/connection-editor/ce-page-bridge.ui.h:18 ++msgid "STP maximum message age, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:19 + msgid "_Aging time:" + msgstr "老化时间(_A)：" + ++#: ../src/connection-editor/ce-page-bridge.ui.h:20 ++msgid "The Ethernet MAC address aging time, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:21 ++msgid "Group _forward mask:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:22 ++msgid "" ++"A mask of 16 bits, each corresponding to a group address in the range from " ++"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask " ++"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause " ++"frames and LACP." ++msgstr "" ++ + #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112 + msgid "automatic" + msgstr "自动" +@@ -1545,10 +1608,20 @@ msgid "_Username:" + msgstr "用户名(_U)：" + + #: ../src/connection-editor/ce-page-dsl.ui.h:2 ++msgid "Username used to authenticate with the PPPoE service." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:3 ++msgid "" ++"Only initiate sessions with access concentrators that provide the specified " ++"service. For most providers this should be left blank." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:4 + msgid "_Service:" + msgstr "服务(_S)：" + +-#: ../src/connection-editor/ce-page-dsl.ui.h:3 ++#: ../src/connection-editor/ce-page-dsl.ui.h:5 + #: ../src/wireless-security/eap-method-leap.ui.h:3 + #: ../src/wireless-security/eap-method-simple.ui.h:3 + #: ../src/wireless-security/ws-leap.ui.h:3 +@@ -1556,7 +1629,11 @@ msgstr "服务(_S)：" + msgid "Sho_w password" + msgstr "显示密码(_W)" + +-#: ../src/connection-editor/ce-page-dsl.ui.h:4 ++#: ../src/connection-editor/ce-page-dsl.ui.h:6 ++msgid "Password used to authenticate with the PPPoE service." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:7 + #: ../src/connection-editor/ce-page-mobile.ui.h:4 + #: ../src/libnma/nma-vpn-password-dialog.c:97 + #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97 +@@ -1567,13 +1644,29 @@ msgstr "显示密码(_W)" + msgid "_Password:" + msgstr "密码(_P)：" + ++#: ../src/connection-editor/ce-page-dsl.ui.h:8 ++msgid "PPP _interface:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:9 ++msgid "P_arent interface:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:10 ++msgid "An arbitrary name to assign to the newly created PPP interface." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:11 ++msgid "The interface on which the PPP connection will be established." ++msgstr "" ++ + #: ../src/connection-editor/ce-page-ethernet.ui.h:1 + #: ../src/connection-editor/ce-page-ip4.ui.h:1 + #: ../src/connection-editor/ce-page-ip6.ui.h:1 +-#: ../src/connection-editor/ce-page-proxy.ui.h:3 ++#: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-wifi.ui.h:1 + #: ../src/connection-editor/page-ip4.c:131 +-#: ../src/connection-editor/page-ip6.c:136 ++#: ../src/connection-editor/page-ip6.c:142 + #: ../src/wireless-security/eap-method-peap.ui.h:1 + msgid "Automatic" + msgstr "自动" +@@ -1619,7 +1712,7 @@ msgid "Full" + msgstr "" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:12 +-#: ../src/connection-editor/page-ip6.c:149 ++#: ../src/connection-editor/page-ip6.c:155 + msgid "Ignore" + msgstr "忽略" + +@@ -1627,7 +1720,7 @@ msgstr "忽略" + #: ../src/connection-editor/ce-page-ip4.ui.h:3 + #: ../src/connection-editor/ce-page-ip6.ui.h:3 + #: ../src/connection-editor/page-ip4.c:168 +-#: ../src/connection-editor/page-ip6.c:185 ++#: ../src/connection-editor/page-ip6.c:191 + msgid "Manual" + msgstr "手动" + +@@ -1636,7 +1729,7 @@ msgid "_Port:" + msgstr "端口(_P)：" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:15 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:2 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:6 + #: ../src/connection-editor/ce-page-wifi.ui.h:9 + msgid "_Device:" + msgstr "设备(_D):" +@@ -1785,20 +1878,20 @@ msgstr "地址" + msgid "Address (optional)" + msgstr "" + +-#: ../src/connection-editor/ce-page-infiniband.ui.h:1 +-msgid "_Transport mode:" +-msgstr "传输模式(_T)：" +- + #. IP-over-InfiniBand "datagram mode" +-#: ../src/connection-editor/ce-page-infiniband.ui.h:6 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:2 + msgid "Datagram" + msgstr "数据报文" + + #. IP-over-InfiniBand "connected mode" +-#: ../src/connection-editor/ce-page-infiniband.ui.h:8 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:4 + msgid "Connected" + msgstr "已连接" + ++#: ../src/connection-editor/ce-page-infiniband.ui.h:5 ++msgid "_Transport mode:" ++msgstr "传输模式(_T)：" ++ + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1 + msgid "IPIP" + msgstr "" +@@ -1836,39 +1929,39 @@ msgid "VTI6" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10 +-#, fuzzy +-msgid "Device name" +-msgstr "设备名称 + 编号" ++#: ../src/connection-editor/ce-page-macsec.ui.h:6 ++msgid "Device name:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11 +-#, fuzzy +-msgid "Parent device" +-msgstr "以太网设备" ++#: ../src/connection-editor/ce-page-macsec.ui.h:8 ++msgid "Parent device:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12 +-msgid "Mode" ++#: ../src/connection-editor/ce-page-macsec.ui.h:16 ++msgid "Mode:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13 +-msgid "Local IP" ++msgid "Local IP:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14 +-msgid "Remote IP" ++msgid "Remote IP:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15 +-msgid "Input key" ++msgid "Input key:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16 +-msgid "Output key" ++msgid "Output key:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17 +-#, fuzzy +-msgid "MTU" +-msgstr "_MTU：" ++msgid "MTU:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip4.ui.h:2 + #: ../src/connection-editor/ce-page-ip6.ui.h:2 +@@ -1883,12 +1976,12 @@ msgstr "本地连接" + #: ../src/connection-editor/ce-page-ip4.ui.h:5 + #: ../src/connection-editor/ce-page-ip6.ui.h:5 + #: ../src/connection-editor/page-ip4.c:188 +-#: ../src/connection-editor/page-ip6.c:205 ++#: ../src/connection-editor/page-ip6.c:211 + msgid "Shared to other computers" + msgstr "与其它计算机共享" + + #: ../src/connection-editor/ce-page-ip4.ui.h:6 +-#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++#: ../src/connection-editor/ce-page-ip6.ui.h:11 + msgid "_Method:" + msgstr "方法(_M)：" + +@@ -1903,7 +1996,7 @@ msgstr "" + "标识符，请在此输入。" + + #: ../src/connection-editor/ce-page-ip4.ui.h:10 +-#: ../src/connection-editor/ce-page-ip6.ui.h:12 ++#: ../src/connection-editor/ce-page-ip6.ui.h:14 + msgid "" + "Domains used when resolving host names. Use commas to separate multiple " + "domains." +@@ -1914,16 +2007,16 @@ msgid "D_HCP client ID:" + msgstr "D_HCP 客户端 ID：" + + #: ../src/connection-editor/ce-page-ip4.ui.h:12 +-#: ../src/connection-editor/ce-page-ip6.ui.h:13 ++#: ../src/connection-editor/ce-page-ip6.ui.h:15 + #: ../src/connection-editor/page-ip4.c:372 +-#: ../src/connection-editor/page-ip6.c:335 ++#: ../src/connection-editor/page-ip6.c:346 + msgid "S_earch domains:" + msgstr "搜索域(_E)：" + + #: ../src/connection-editor/ce-page-ip4.ui.h:13 +-#: ../src/connection-editor/ce-page-ip6.ui.h:14 ++#: ../src/connection-editor/ce-page-ip6.ui.h:16 + #: ../src/connection-editor/page-ip4.c:363 +-#: ../src/connection-editor/page-ip6.c:326 ++#: ../src/connection-editor/page-ip6.c:337 + msgid "DNS ser_vers:" + msgstr "_DNS 服务器：" + +@@ -1946,11 +2039,12 @@ msgstr "" + "成。" + + #: ../src/connection-editor/ce-page-ip4.ui.h:17 +-#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++#: ../src/connection-editor/ce-page-ip6.ui.h:22 + msgid "_Routes…" + msgstr "路由(_R)..." + + #: ../src/connection-editor/ce-page-ip6.ui.h:6 ++#: ../src/connection-editor/ce-page-macsec.ui.h:3 + #: ../src/connection-editor/page-ip4.c:198 + msgid "Disabled" + msgstr "已禁用" +@@ -1963,7 +2057,15 @@ msgstr "已启用(公共地址优先)" + msgid "Enabled (prefer temporary address)" + msgstr "已启用(临时地址优先)" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:15 ++#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++msgid "EUI64" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++msgid "Stable privacy" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:17 + msgid "" + "IP addresses of domain name servers used to resolve host names. Use commas " + "to separate multiple domain name server addresses. Link-local addresses will " +@@ -1972,15 +2074,19 @@ msgstr "" + "用来解析主机名的域名服务器的 IP 地址。用逗号分隔多个域名服务器地址。本地连接" + "地址会自动配置到连接中的接口。" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:16 ++#: ../src/connection-editor/ce-page-ip6.ui.h:18 + msgid "IPv6 _privacy extensions:" + msgstr "IPv6 隐私扩展(_P)：" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:17 ++#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++msgid "IPv6 address _generation mode:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:20 + msgid "Require IPv_6 addressing for this connection to complete" + msgstr "需要 IPv_6 地址完成这个连接" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:18 ++#: ../src/connection-editor/ce-page-ip6.ui.h:21 + msgid "" + "When connecting to IPv4-capable networks, allows the connection to complete " + "if IPv6 configuration fails but IPv4 configuration succeeds." +@@ -1988,6 +2094,94 @@ msgstr "" + "当连接到兼容 IPv4 的网络时，如果 IPv6 配置失败而 IPv4 配置成功，则允许连接完" + "成。" + ++#: ../src/connection-editor/ce-page-macsec.ui.h:1 ++msgid "PSK" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:2 ++#: ../src/connection-editor/page-ppp.c:129 ++msgid "EAP" ++msgstr "EAP" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:4 ++msgid "Check" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:5 ++msgid "Strict" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:7 ++msgid "The name of the MACsec device." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:9 ++msgid "" ++"The parent interface name or parent connection UUID from which this MACSEC " ++"interface should be created." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:10 ++msgid "" ++"The parent interface name or parent connection UUID from which this MACsec " ++"interface should be created" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:11 ++msgid " The pre-shared Connectivity-association Key Name" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:12 ++msgid "The pre-shared Connectivity Association Key" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:13 ++msgid "" ++"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key " ++"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X " ++"security page" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:14 ++msgid "CKN:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:15 ++msgid "CAK:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:17 ++msgid "Keys:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:18 ++msgid "Parameters:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:19 ++msgid "Validation:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:20 ++msgid "SCI port:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:21 ++msgid "Specifies the validation mode for incoming frames" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:22 ++msgid "Encrypt" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:23 ++msgid "Whether the transmitted traffic must be encrypted" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:24 ++msgid "The port component of the SCI (Secure Channel Identifier)" ++msgstr "" ++ + #: ../src/connection-editor/ce-page-mobile.ui.h:1 + #: ../src/connection-editor/ce-page-team.ui.h:26 + msgid "Basic" +@@ -2075,41 +2269,41 @@ msgid "Send PPP _echo packets" + msgstr "发送 PPP 回响包(_E)" + + #: ../src/connection-editor/ce-page-proxy.ui.h:1 +-#, fuzzy +-msgid "Method:" +-msgstr "方法(_M)：" +- +-#: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-team.ui.h:25 + #, fuzzy + msgid "None" + msgstr "无" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:4 ++#: ../src/connection-editor/ce-page-proxy.ui.h:3 + msgid "For browser only" + msgstr "" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:5 ++#: ../src/connection-editor/ce-page-proxy.ui.h:4 + msgid "Use this proxy configuration for only browser clients/schemes." + msgstr "" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:6 ++#: ../src/connection-editor/ce-page-proxy.ui.h:5 + msgid "PAC URL:" + msgstr "" + ++#: ../src/connection-editor/ce-page-proxy.ui.h:6 ++msgid "PAC script:" ++msgstr "" ++ + #: ../src/connection-editor/ce-page-proxy.ui.h:7 + msgid "URL from where the PAC script is to be obtained." + msgstr "" + + #: ../src/connection-editor/ce-page-proxy.ui.h:8 +-msgid "PAC script:" +-msgstr "" +- +-#: ../src/connection-editor/ce-page-proxy.ui.h:9 + #, fuzzy + msgid "Import script from a file…" + msgstr "从文件导入组队配置(_I)..." + ++#: ../src/connection-editor/ce-page-proxy.ui.h:9 ++#, fuzzy ++msgid "Method:" ++msgstr "方法(_M)：" ++ + #: ../src/connection-editor/ce-page-team-port.ui.h:1 + #: ../src/connection-editor/ce-page-team.ui.h:19 + #, fuzzy +@@ -2157,76 +2351,76 @@ msgid "ID of queue which this port should be mapped to." + msgstr "" + + #: ../src/connection-editor/ce-page-team-port.ui.h:10 ++msgid "Active-Backup runner options" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-team-port.ui.h:11 + #, fuzzy + msgid "_Port priority:" + msgstr "优先级(_P)：" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:11 +-msgid "Port _sticky" +-msgstr "" +- + #: ../src/connection-editor/ce-page-team-port.ui.h:12 +-#: ../src/connection-editor/ce-page-team.ui.h:82 +-msgid "" +-"Validate received ARP packets on active ports. If this is not checked, all " +-"incoming ARP packets will be considered as a good reply." +-msgstr "" +- +-#: ../src/connection-editor/ce-page-team-port.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:44 + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " + "bursts of notify-peer packets." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:14 ++#: ../src/connection-editor/ce-page-team-port.ui.h:13 + msgid "Port priority. The higher number means higher priority." + msgstr "" + ++#: ../src/connection-editor/ce-page-team-port.ui.h:14 ++msgid "Port _sticky" ++msgstr "" ++ + #: ../src/connection-editor/ce-page-team-port.ui.h:15 +-msgid "Active-Backup runner options" ++#: ../src/connection-editor/ce-page-team.ui.h:82 ++msgid "" ++"Validate received ARP packets on active ports. If this is not checked, all " ++"incoming ARP packets will be considered as a good reply." + msgstr "" + + #: ../src/connection-editor/ce-page-team-port.ui.h:16 ++msgid "LACP runner options" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-team-port.ui.h:17 + #, fuzzy + msgid "_LACP port priority:" + msgstr "优先级(_P)：" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:17 ++#: ../src/connection-editor/ce-page-team-port.ui.h:18 + #, fuzzy + msgid "LACP port _key:" + msgstr "私钥(_K)：" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:18 ++#: ../src/connection-editor/ce-page-team-port.ui.h:19 + #: ../src/connection-editor/ce-page-team.ui.h:43 + msgid "" + "Number of bursts of multicast group rejoin requests sent after port is " + "enabled or disabled." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:19 ++#: ../src/connection-editor/ce-page-team-port.ui.h:20 + msgid "" + "Port priority according to LACP standard. The lower number means higher " + "priority." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:20 ++#: ../src/connection-editor/ce-page-team-port.ui.h:21 + #: ../src/connection-editor/ce-page-team.ui.h:45 + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " + "bursts of multicast group rejoin requests." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:21 ++#: ../src/connection-editor/ce-page-team-port.ui.h:22 + msgid "" + "Port key according to LACP standard. It is only possible to aggregate ports " + "with the same key." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:22 +-msgid "LACP runner options" +-msgstr "" +- + #: ../src/connection-editor/ce-page-team-port.ui.h:24 + #: ../src/connection-editor/ce-page-team.ui.h:70 + msgid "_Link watcher:" +@@ -2419,14 +2613,14 @@ msgid "LACP" + msgstr "" + + #: ../src/connection-editor/ce-page-team.ui.h:27 +-#: ../src/connection-editor/connection-helpers.c:104 ++#: ../src/connection-editor/connection-helpers.c:105 + #: ../src/connection-editor/page-ethernet.c:351 + #: ../src/libnm-gtk/nm-ui-utils.c:321 + msgid "Ethernet" + msgstr "以太网" + + #: ../src/connection-editor/ce-page-team.ui.h:28 +-#: ../src/connection-editor/connection-helpers.c:119 ++#: ../src/connection-editor/connection-helpers.c:120 + #: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339 + #: ../src/libnm-gtk/nm-ui-utils.c:583 + msgid "VLAN" +@@ -2688,6 +2882,7 @@ msgstr "波段(_D)：" + msgid "SS_ID:" + msgstr "SS_ID：" + ++#: ../src/connection-editor/ce-polkit.c:63 + #: ../src/connection-editor/ce-polkit-button.c:74 + msgid "No polkit authorization to perform the action" + msgstr "执行这个动作需要 polkit 授权" +@@ -2745,58 +2940,63 @@ msgstr "" + "大多数情况下，服务商的 PPP 服务器支持所有的认证方法。如连接失败，请尝试禁用一" + "些方法的支持。" + +-#: ../src/connection-editor/connection-helpers.c:105 ++#: ../src/connection-editor/connection-helpers.c:106 + #: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323 + msgid "Wi-Fi" + msgstr "Wi-Fi" + +-#: ../src/connection-editor/connection-helpers.c:113 ++#: ../src/connection-editor/connection-helpers.c:114 + #: ../src/connection-editor/page-bluetooth.c:123 + #: ../src/libnm-gtk/nm-ui-utils.c:325 + msgid "Bluetooth" + msgstr "蓝牙" + +-#: ../src/connection-editor/connection-helpers.c:114 +-#: ../src/connection-editor/page-dsl.c:127 +-msgid "DSL" +-msgstr "DSL" +- + #: ../src/connection-editor/connection-helpers.c:115 ++#: ../src/connection-editor/page-dsl.c:201 ++msgid "DSL/PPPoE" ++msgstr "" ++ ++#: ../src/connection-editor/connection-helpers.c:116 + #: ../src/connection-editor/page-infiniband.c:148 + #: ../src/libnm-gtk/nm-ui-utils.c:331 + msgid "InfiniBand" + msgstr "InfiniBand" + +-#: ../src/connection-editor/connection-helpers.c:116 ++#: ../src/connection-editor/connection-helpers.c:117 + #: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333 + #: ../src/libnm-gtk/nm-ui-utils.c:577 + msgid "Bond" + msgstr "绑定" + +-#: ../src/connection-editor/connection-helpers.c:117 +-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335 ++#: ../src/connection-editor/connection-helpers.c:118 ++#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335 + #: ../src/libnm-gtk/nm-ui-utils.c:579 + msgid "Team" + msgstr "组队" + +-#: ../src/connection-editor/connection-helpers.c:118 +-#: ../src/connection-editor/page-bridge.c:212 ++#: ../src/connection-editor/connection-helpers.c:119 ++#: ../src/connection-editor/page-bridge.c:233 + #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581 + msgid "Bridge" + msgstr "桥接" + +-#: ../src/connection-editor/connection-helpers.c:120 ++#: ../src/connection-editor/connection-helpers.c:121 + #: ../src/connection-editor/page-ip-tunnel.c:176 + msgid "IP tunnel" + msgstr "" + + #: ../src/connection-editor/connection-helpers.c:122 +-#: ../src/connection-editor/connection-helpers.c:396 ++#: ../src/connection-editor/page-macsec.c:190 ++msgid "MACsec" ++msgstr "" ++ ++#: ../src/connection-editor/connection-helpers.c:124 ++#: ../src/connection-editor/connection-helpers.c:398 + #: ../src/connection-editor/page-vpn.c:96 + msgid "VPN" + msgstr "VPN" + +-#: ../src/connection-editor/connection-helpers.c:205 ++#: ../src/connection-editor/connection-helpers.c:207 + msgid "" + "The VPN plugin failed to import the VPN connection correctly\n" + "\n" +@@ -2806,11 +3006,11 @@ msgstr "" + "\n" + "错误：没有 VPN 服务类型。" + +-#: ../src/connection-editor/connection-helpers.c:217 ++#: ../src/connection-editor/connection-helpers.c:219 + msgid "Cannot import VPN connection" + msgstr "无法导入 VPN 连接" + +-#: ../src/connection-editor/connection-helpers.c:219 ++#: ../src/connection-editor/connection-helpers.c:221 + #, fuzzy, c-format + msgid "" + "The file “%s” could not be read or does not contain recognized VPN " +@@ -2822,47 +3022,54 @@ msgstr "" + "\n" + "错误：%s。" + +-#: ../src/connection-editor/connection-helpers.c:220 ++#: ../src/connection-editor/connection-helpers.c:222 + #, fuzzy + msgid "unknown error" + msgstr "未知错误" + +-#: ../src/connection-editor/connection-helpers.c:303 ++#: ../src/connection-editor/connection-helpers.c:305 + #: ../src/connection-editor/page-proxy.c:118 + #: ../src/connection-editor/page-team.c:341 + #: ../src/connection-editor/page-team-port.c:203 + msgid "Select file to import" + msgstr "选择要导入的文件" + +-#: ../src/connection-editor/connection-helpers.c:338 ++#: ../src/connection-editor/connection-helpers.c:309 ++#: ../src/connection-editor/page-proxy.c:122 ++#: ../src/connection-editor/page-team.c:345 ++#: ../src/connection-editor/page-team-port.c:207 ++msgid "_Open" ++msgstr "" ++ ++#: ../src/connection-editor/connection-helpers.c:340 + msgid "Hardware" + msgstr "硬件" + +-#: ../src/connection-editor/connection-helpers.c:365 ++#: ../src/connection-editor/connection-helpers.c:367 + msgid "Virtual" + msgstr "虚拟" + +-#: ../src/connection-editor/connection-helpers.c:514 + #: ../src/connection-editor/connection-helpers.c:516 ++#: ../src/connection-editor/connection-helpers.c:518 + #, fuzzy + msgid "Import a saved VPN configuration…" + msgstr "导入 VPN 配置..." + +-#: ../src/connection-editor/connection-helpers.c:546 ++#: ../src/connection-editor/connection-helpers.c:548 + msgid "" + "The connection editor dialog could not be initialized due to an unknown " + "error." + msgstr "由于一个未知错误，连接编辑器对话框无法初始化。" + +-#: ../src/connection-editor/connection-helpers.c:555 ++#: ../src/connection-editor/connection-helpers.c:557 + msgid "Could not create new connection" + msgstr "无法建立新连接" + +-#: ../src/connection-editor/connection-helpers.c:718 ++#: ../src/connection-editor/connection-helpers.c:720 + msgid "Connection delete failed" + msgstr "删除连接失败" + +-#: ../src/connection-editor/connection-helpers.c:766 ++#: ../src/connection-editor/connection-helpers.c:768 + #, c-format + msgid "Are you sure you wish to delete the connection %s?" + msgstr "是否确认删除连接 %s？" +@@ -2870,7 +3077,7 @@ msgstr "是否确认删除连接 %s？" + #: ../src/connection-editor/ip4-routes-dialog.c:697 + #: ../src/connection-editor/ip6-routes-dialog.c:718 + #: ../src/connection-editor/page-ip4.c:1136 +-#: ../src/connection-editor/page-ip6.c:1095 ++#: ../src/connection-editor/page-ip6.c:1118 + msgid "Address" + msgstr "地址" + +@@ -2882,7 +3089,7 @@ msgstr "子网掩码" + #: ../src/connection-editor/ip4-routes-dialog.c:735 + #: ../src/connection-editor/ip6-routes-dialog.c:756 + #: ../src/connection-editor/page-ip4.c:1174 +-#: ../src/connection-editor/page-ip6.c:1133 ++#: ../src/connection-editor/page-ip6.c:1156 + msgid "Gateway" + msgstr "网关" + +@@ -2892,225 +3099,238 @@ msgid "Metric" + msgstr "度量" + + #: ../src/connection-editor/ip6-routes-dialog.c:737 +-#: ../src/connection-editor/page-ip6.c:1114 ++#: ../src/connection-editor/page-ip6.c:1137 + msgid "Prefix" + msgstr "前缀" + +-#: ../src/connection-editor/nm-connection-editor.c:108 ++#: ../src/connection-editor/nm-connection-editor.c:109 + #, c-format + msgid "Editing %s" + msgstr "正在编辑 %s" + +-#: ../src/connection-editor/nm-connection-editor.c:112 ++#: ../src/connection-editor/nm-connection-editor.c:113 + msgid "Editing un-named connection" + msgstr "编辑未命名连接" + +-#: ../src/connection-editor/nm-connection-editor.c:132 ++#: ../src/connection-editor/nm-connection-editor.c:133 + msgid "Missing connection name" + msgstr "缺少连接名" + +-#: ../src/connection-editor/nm-connection-editor.c:352 ++#: ../src/connection-editor/nm-connection-editor.c:353 + #, fuzzy + msgid "Editor initializing…" + msgstr "编辑器正在初始化…" + +-#: ../src/connection-editor/nm-connection-editor.c:359 +-#: ../src/connection-editor/nm-connection-list.c:408 ++#: ../src/connection-editor/nm-connection-editor.c:360 ++#: ../src/connection-editor/nm-connection-list.c:443 + msgid "Connection cannot be modified" + msgstr "连接不能被修改" + +-#: ../src/connection-editor/nm-connection-editor.c:374 ++#: ../src/connection-editor/nm-connection-editor.c:375 + #, c-format + msgid "Invalid setting %s: %s" + msgstr "无效设置 %s: %s" + +-#: ../src/connection-editor/nm-connection-editor.c:450 ++#: ../src/connection-editor/nm-connection-editor.c:451 + msgid "" + "The connection editor could not find some required resources (the .ui file " + "was not found)." + msgstr "连接编辑器找不到所需的一些资源(未找到 .ui 文件)。" + +-#: ../src/connection-editor/nm-connection-editor.c:577 ++#: ../src/connection-editor/nm-connection-editor.c:578 ++#: ../src/connection-editor/vpn-helpers.c:213 + msgid "_Save" + msgstr "保存(_S)" + +-#: ../src/connection-editor/nm-connection-editor.c:578 ++#: ../src/connection-editor/nm-connection-editor.c:579 + msgid "Save any changes made to this connection." + msgstr "保存对此连接的全部更改。" + +-#: ../src/connection-editor/nm-connection-editor.c:579 ++#: ../src/connection-editor/nm-connection-editor.c:580 + msgid "Authenticate to save this connection for all users of this machine." + msgstr "为本机所有用户保存此连接需要认证。" + +-#: ../src/connection-editor/nm-connection-editor.c:595 ++#: ../src/connection-editor/nm-connection-editor.c:596 + msgid "Could not create connection" + msgstr "无法创建连接" + +-#: ../src/connection-editor/nm-connection-editor.c:595 ++#: ../src/connection-editor/nm-connection-editor.c:596 + msgid "Could not edit connection" + msgstr "无法编辑连接" + +-#: ../src/connection-editor/nm-connection-editor.c:597 ++#: ../src/connection-editor/nm-connection-editor.c:598 + msgid "Unknown error creating connection editor dialog." + msgstr "创建连接编辑器对话框出现未知错误。" + +-#: ../src/connection-editor/nm-connection-editor.c:738 ++#: ../src/connection-editor/nm-connection-editor.c:739 + msgid "" + "Warning: the connection contains some properties not supported by the " + "editor. They will be cleared upon save." + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.c:758 ++#: ../src/connection-editor/nm-connection-editor.c:759 + msgid "Error initializing editor" + msgstr "初始化编辑器错误" + +-#: ../src/connection-editor/nm-connection-editor.c:1142 ++#: ../src/connection-editor/nm-connection-editor.c:1157 + msgid "Connection add failed" + msgstr "添加连接失败" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2 +-msgid "_Close" +-msgstr "" +- +-#: ../src/connection-editor/nm-connection-editor.ui.h:4 ++#: ../src/connection-editor/nm-connection-editor.ui.h:1 + msgid "Fix" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:5 ++#: ../src/connection-editor/nm-connection-editor.ui.h:2 + #, fuzzy + msgid "" + "Security labels may prevent some files from being used with certificate " + "authentication." + msgstr "将此项设为 true 以禁用在 EAP 认证中关于 CA 证书的警告。" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:6 ++#: ../src/connection-editor/nm-connection-editor.ui.h:3 + msgid "Connection _name:" + msgstr "连接名称(_N)：" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:7 ++#: ../src/connection-editor/nm-connection-editor.ui.h:4 + #, fuzzy + msgid "_Export…" + msgstr "导出(_E)..." + +-#: ../src/connection-editor/nm-connection-editor.ui.h:9 ++#: ../src/connection-editor/nm-connection-editor.ui.h:6 + msgid "File Relabel" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:10 ++#: ../src/connection-editor/nm-connection-editor.ui.h:7 + msgid "_Relabel" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:11 ++#: ../src/connection-editor/nm-connection-editor.ui.h:8 + msgid "" + "The following files are not labelled for use with certificate " + "authentication. Do you wish to adjust the labels?" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:12 ++#: ../src/connection-editor/nm-connection-editor.ui.h:9 + msgid "Relabel" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:13 ++#: ../src/connection-editor/nm-connection-editor.ui.h:10 + msgid "Filename" + msgstr "" + +-#: ../src/connection-editor/nm-connection-list.c:127 ++#: ../src/connection-editor/nm-connection-list.c:151 + msgid "never" + msgstr "从不" + +-#: ../src/connection-editor/nm-connection-list.c:138 +-#: ../src/connection-editor/nm-connection-list.c:149 ++#: ../src/connection-editor/nm-connection-list.c:162 ++#: ../src/connection-editor/nm-connection-list.c:173 + msgid "now" + msgstr "现在" + + #. less than an hour ago +-#: ../src/connection-editor/nm-connection-list.c:156 ++#: ../src/connection-editor/nm-connection-list.c:180 + #, c-format + msgid "%d minute ago" + msgid_plural "%d minutes ago" + msgstr[0] "%d 分钟以前" + +-#: ../src/connection-editor/nm-connection-list.c:160 ++#: ../src/connection-editor/nm-connection-list.c:184 + #, c-format + msgid "%d hour ago" + msgid_plural "%d hours ago" + msgstr[0] "%d 小时以前" + +-#: ../src/connection-editor/nm-connection-list.c:172 ++#: ../src/connection-editor/nm-connection-list.c:196 + #, c-format + msgid "%d day ago" + msgid_plural "%d days ago" + msgstr[0] "%d 天以前" + +-#: ../src/connection-editor/nm-connection-list.c:178 ++#: ../src/connection-editor/nm-connection-list.c:202 + #, c-format + msgid "%d month ago" + msgid_plural "%d months ago" + msgstr[0] "%d 个月以前" + +-#: ../src/connection-editor/nm-connection-list.c:182 ++#: ../src/connection-editor/nm-connection-list.c:206 + #, c-format + msgid "%d year ago" + msgid_plural "%d years ago" + msgstr[0] "%d 年以前" + +-#: ../src/connection-editor/nm-connection-list.c:635 ++#: ../src/connection-editor/nm-connection-list.c:445 ++msgid "Connection cannot be deleted" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:448 ++msgid "Select a connection to edit" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:450 ++msgid "Select a connection to delete" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:785 + #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2 + msgid "Name" + msgstr "名称" + +-#: ../src/connection-editor/nm-connection-list.c:648 ++#: ../src/connection-editor/nm-connection-list.c:798 + msgid "Last Used" + msgstr "最后使用的" + +-#: ../src/connection-editor/nm-connection-list.c:696 ++#: ../src/connection-editor/nm-connection-list.c:836 + msgid "Edit the selected connection" + msgstr "编辑选中的连接" + +-#: ../src/connection-editor/nm-connection-list.c:697 ++#: ../src/connection-editor/nm-connection-list.c:837 + msgid "Authenticate to edit the selected connection" + msgstr "进行认证以编辑选中的连接" + +-#: ../src/connection-editor/nm-connection-list.c:712 ++#: ../src/connection-editor/nm-connection-list.c:842 + msgid "Delete the selected connection" + msgstr "删除选中的连接" + +-#: ../src/connection-editor/nm-connection-list.c:713 ++#: ../src/connection-editor/nm-connection-list.c:843 + msgid "Authenticate to delete the selected connection" + msgstr "进行认证以删除选中的连接" + +-#: ../src/connection-editor/nm-connection-list.c:935 +-#: ../src/connection-editor/nm-connection-list.c:938 ++#: ../src/connection-editor/nm-connection-list.c:1048 ++#: ../src/connection-editor/nm-connection-list.c:1051 + msgid "Error creating connection" + msgstr "创建连接出错" + +-#: ../src/connection-editor/nm-connection-list.c:936 ++#: ../src/connection-editor/nm-connection-list.c:1049 + msgid "No VPN plugins are installed." + msgstr "未安装 VPN 插件。" + +-#: ../src/connection-editor/nm-connection-list.c:939 ++#: ../src/connection-editor/nm-connection-list.c:1052 + #, fuzzy, c-format + msgid "Don’t know how to create “%s” connections" + msgstr "不知道如何创建“%s”连接" + +-#: ../src/connection-editor/nm-connection-list.c:970 ++#: ../src/connection-editor/nm-connection-list.c:1085 + msgid "Error editing connection" + msgstr "编辑连接出错" + +-#: ../src/connection-editor/nm-connection-list.c:971 ++#: ../src/connection-editor/nm-connection-list.c:1086 + #, fuzzy, c-format + msgid "Did not find a connection with UUID “%s”" + msgstr "没有找到“%s”连接" + +-#: ../src/connection-editor/page-8021x-security.c:109 ++#: ../src/connection-editor/nm-connection-list.ui.h:2 ++msgid "Add a new connection" ++msgstr "" ++ ++#: ../src/connection-editor/page-8021x-security.c:116 + msgid "802.1X Security" + msgstr "802.1X 安全性" + +-#: ../src/connection-editor/page-8021x-security.c:111 ++#: ../src/connection-editor/page-8021x-security.c:118 + msgid "Could not load 802.1X Security user interface." + msgstr "无法加载 802.1X 安全配置用户界面。" + +-#: ../src/connection-editor/page-8021x-security.c:125 ++#: ../src/connection-editor/page-8021x-security.c:132 + msgid "Use 802.1_X security for this connection" + msgstr "对此连接使用 802.1_X 安全配置" + +@@ -3161,11 +3381,11 @@ msgstr "主要" + msgid "Bond connection %d" + msgstr "绑定连接 %d" + +-#: ../src/connection-editor/page-bridge.c:215 ++#: ../src/connection-editor/page-bridge.c:236 + msgid "Could not load bridge user interface." + msgstr "无法加载桥接用户界面。" + +-#: ../src/connection-editor/page-bridge.c:317 ++#: ../src/connection-editor/page-bridge.c:352 + #, c-format + msgid "Bridge connection %d" + msgstr "桥接连接 %d" +@@ -3189,11 +3409,15 @@ msgstr "DCB" + msgid "Could not load DCB user interface." + msgstr "无法加载 DSL 用户界面。" + +-#: ../src/connection-editor/page-dsl.c:129 ++#: ../src/connection-editor/page-dsl.c:203 + msgid "Could not load DSL user interface." + msgstr "无法加载 DSL 用户界面。" + +-#: ../src/connection-editor/page-dsl.c:219 ++#: ../src/connection-editor/page-dsl.c:298 ++msgid "missing parent interface" ++msgstr "" ++ ++#: ../src/connection-editor/page-dsl.c:343 + #, c-format + msgid "DSL connection %d" + msgstr "DSL 连接 %d" +@@ -3292,27 +3516,27 @@ msgid "IP tunnel connection %d" + msgstr "以太网连接 %d" + + #: ../src/connection-editor/page-ip4.c:127 +-#: ../src/connection-editor/page-ip6.c:130 ++#: ../src/connection-editor/page-ip6.c:136 + msgid "Automatic (VPN)" + msgstr "自动(VPN)" + + #: ../src/connection-editor/page-ip4.c:128 +-#: ../src/connection-editor/page-ip6.c:131 ++#: ../src/connection-editor/page-ip6.c:137 + msgid "Automatic (VPN) addresses only" + msgstr "自动(VPN)仅地址" + + #: ../src/connection-editor/page-ip4.c:132 +-#: ../src/connection-editor/page-ip6.c:137 ++#: ../src/connection-editor/page-ip6.c:143 + msgid "Automatic, addresses only" + msgstr "自动，仅地址" + + #: ../src/connection-editor/page-ip4.c:134 +-#: ../src/connection-editor/page-ip6.c:133 ++#: ../src/connection-editor/page-ip6.c:139 + msgid "Automatic (PPPoE)" + msgstr "自动(PPPoE)" + + #: ../src/connection-editor/page-ip4.c:135 +-#: ../src/connection-editor/page-ip6.c:134 ++#: ../src/connection-editor/page-ip6.c:140 + msgid "Automatic (PPPoE) addresses only" + msgstr "自动(PPPoE)仅地址" + +@@ -3325,17 +3549,17 @@ msgid "Automatic (DHCP) addresses only" + msgstr "自动(DHCP)仅地址" + + #: ../src/connection-editor/page-ip4.c:181 +-#: ../src/connection-editor/page-ip6.c:198 ++#: ../src/connection-editor/page-ip6.c:204 + msgid "Link-Local Only" + msgstr "仅本地连接" + + #: ../src/connection-editor/page-ip4.c:361 +-#: ../src/connection-editor/page-ip6.c:324 ++#: ../src/connection-editor/page-ip6.c:335 + msgid "Additional DNS ser_vers:" + msgstr "附加 _DNS 服务器：" + + #: ../src/connection-editor/page-ip4.c:370 +-#: ../src/connection-editor/page-ip6.c:333 ++#: ../src/connection-editor/page-ip6.c:344 + msgid "Additional s_earch domains:" + msgstr "附加搜索域(_E)：" + +@@ -3372,43 +3596,52 @@ msgstr "IPv4 网关 “%s” 无效" + msgid "IPv4 DNS server “%s” invalid" + msgstr "IPv4 DNS 服务器 “%s” 无效" + +-#: ../src/connection-editor/page-ip6.c:173 ++#: ../src/connection-editor/page-ip6.c:179 + msgid "Automatic, DHCP only" + msgstr "自动，仅 DHCP" + +-#: ../src/connection-editor/page-ip6.c:993 ++#: ../src/connection-editor/page-ip6.c:1016 + #, c-format + msgid "Editing IPv6 routes for %s" + msgstr "正在编辑 %s 的 IPv6 路由" + +-#: ../src/connection-editor/page-ip6.c:1184 ++#: ../src/connection-editor/page-ip6.c:1208 + msgid "IPv6 Settings" + msgstr "IPv6 设置" + +-#: ../src/connection-editor/page-ip6.c:1186 ++#: ../src/connection-editor/page-ip6.c:1210 + msgid "Could not load IPv6 user interface." + msgstr "无法加载 IPv6 用户界面。" + +-#: ../src/connection-editor/page-ip6.c:1277 ++#: ../src/connection-editor/page-ip6.c:1302 + #, fuzzy, c-format + msgid "IPv6 address “%s” invalid" + msgstr "IPv6 地址 “%s” 无效" + +-#: ../src/connection-editor/page-ip6.c:1285 ++#: ../src/connection-editor/page-ip6.c:1310 + #, fuzzy, c-format + msgid "IPv6 prefix “%s” invalid" + msgstr "IPv6 前缀 “%s” 无效" + +-#: ../src/connection-editor/page-ip6.c:1294 ++#: ../src/connection-editor/page-ip6.c:1319 + #, fuzzy, c-format + msgid "IPv6 gateway “%s” invalid" + msgstr "IPv6 网关 “%s” 无效" + +-#: ../src/connection-editor/page-ip6.c:1336 ++#: ../src/connection-editor/page-ip6.c:1361 + #, fuzzy, c-format + msgid "IPv6 DNS server “%s” invalid" + msgstr "IPv6 DNS 服务器 “%s” 无效" + ++#: ../src/connection-editor/page-macsec.c:192 ++msgid "Could not load MACsec user interface." ++msgstr "" ++ ++#: ../src/connection-editor/page-macsec.c:331 ++#, c-format ++msgid "MACSEC connection %d" ++msgstr "" ++ + #: ../src/connection-editor/page-master.c:247 + #: ../src/connection-editor/page-master.c:258 + msgid "Duplicate slaves" +@@ -3462,38 +3695,34 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)" + msgstr "我的提供商使用基于 C_DMA 的技术(如 1xRTT、EVDO)" + + #: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50 +-#: ../src/mobile-helpers.c:283 ++#: ../src/mobile-helpers.c:282 + msgid "CDMA" + msgstr "CDMA" + + #: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54 +-#: ../src/mobile-helpers.c:281 ++#: ../src/mobile-helpers.c:280 + msgid "GSM" + msgstr "GSM" + +-#: ../src/connection-editor/page-ppp.c:129 +-msgid "EAP" +-msgstr "EAP" +- + #: ../src/connection-editor/page-ppp.c:130 +-#: ../src/wireless-security/eap-method-ttls.c:260 ++#: ../src/wireless-security/eap-method-ttls.c:287 + msgid "PAP" + msgstr "PAP" + + #: ../src/connection-editor/page-ppp.c:131 +-#: ../src/wireless-security/eap-method-ttls.c:322 ++#: ../src/wireless-security/eap-method-ttls.c:349 + msgid "CHAP" + msgstr "CHAP" + + #: ../src/connection-editor/page-ppp.c:132 +-#: ../src/wireless-security/eap-method-fast.c:284 +-#: ../src/wireless-security/eap-method-peap.c:273 +-#: ../src/wireless-security/eap-method-ttls.c:290 ++#: ../src/wireless-security/eap-method-fast.c:282 ++#: ../src/wireless-security/eap-method-peap.c:299 ++#: ../src/wireless-security/eap-method-ttls.c:317 + msgid "MSCHAPv2" + msgstr "MSCHAPv2" + + #: ../src/connection-editor/page-ppp.c:133 +-#: ../src/wireless-security/eap-method-ttls.c:275 ++#: ../src/wireless-security/eap-method-ttls.c:302 + msgid "MSCHAP" + msgstr "MSCHAP" + +@@ -3530,11 +3759,11 @@ msgstr "无法加载绑定用户界面。" + msgid "Error: file doesn’t contain a valid JSON configuration" + msgstr "错误：此文件不含任何有效的 JSON 配置" + +-#: ../src/connection-editor/page-team.c:1156 ++#: ../src/connection-editor/page-team.c:1034 + msgid "Could not load team user interface." + msgstr "无法加载组队用户界面。" + +-#: ../src/connection-editor/page-team.c:1253 ++#: ../src/connection-editor/page-team.c:1131 + #, c-format + msgid "Team connection %d" + msgstr "组队连接 %d" +@@ -3542,11 +3771,11 @@ msgstr "组队连接 %d" + #. Translators: a "Team Port" is a network + #. * device that is part of a team. + #. +-#: ../src/connection-editor/page-team-port.c:732 ++#: ../src/connection-editor/page-team-port.c:655 + msgid "Team Port" + msgstr "组队端口" + +-#: ../src/connection-editor/page-team-port.c:734 ++#: ../src/connection-editor/page-team-port.c:657 + msgid "Could not load team port user interface." + msgstr "无法加载组队端口用户界面。" + +@@ -3655,48 +3884,48 @@ msgstr "Wi-Fi 设备" + msgid "Wi-Fi connection %d" + msgstr "Wi-Fi 连接 %d" + +-#: ../src/connection-editor/page-wifi-security.c:356 ++#: ../src/connection-editor/page-wifi-security.c:358 + #: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922 + msgid "WEP 40/128-bit Key (Hex or ASCII)" + msgstr "WEP 40/128 位密钥(十六进制或 ASCII)" + +-#: ../src/connection-editor/page-wifi-security.c:366 ++#: ../src/connection-editor/page-wifi-security.c:368 + #: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931 + msgid "WEP 128-bit Passphrase" + msgstr "WEP 128 位密码句" + +-#: ../src/connection-editor/page-wifi-security.c:392 ++#: ../src/connection-editor/page-wifi-security.c:394 + msgid "Dynamic WEP (802.1X)" + msgstr "动态 WEP (802.1X)" + +-#: ../src/connection-editor/page-wifi-security.c:405 ++#: ../src/connection-editor/page-wifi-security.c:407 + #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975 + msgid "WPA & WPA2 Personal" + msgstr "WPA 及 WPA2 个人" + +-#: ../src/connection-editor/page-wifi-security.c:418 ++#: ../src/connection-editor/page-wifi-security.c:420 + #: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989 + msgid "WPA & WPA2 Enterprise" + msgstr "WPA 及 WPA2 企业" + +-#: ../src/connection-editor/page-wifi-security.c:461 ++#: ../src/connection-editor/page-wifi-security.c:463 + msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting." + msgstr "无法加载 Wi-Fi 安全性用户界面，缺少 Wi-Fi 设置。" + +-#: ../src/connection-editor/page-wifi-security.c:472 ++#: ../src/connection-editor/page-wifi-security.c:474 + msgid "Wi-Fi Security" + msgstr "Wi-Fi 安全性" + +-#: ../src/connection-editor/page-wifi-security.c:474 ++#: ../src/connection-editor/page-wifi-security.c:476 + msgid "Could not load Wi-Fi security user interface." + msgstr "无法加载 Wi-Fi 安全性用户界面。" + +-#: ../src/connection-editor/page-wifi-security.c:558 ++#: ../src/connection-editor/page-wifi-security.c:560 + #, c-format + msgid "missing SSID" + msgstr "缺少 SSID" + +-#: ../src/connection-editor/page-wifi-security.c:564 ++#: ../src/connection-editor/page-wifi-security.c:566 + #, c-format + msgid "Security not compatible with Ad-Hoc mode" + msgstr "安全与 Ad-Hoc 模式不兼容" +@@ -3747,35 +3976,39 @@ msgstr "自动解锁此设备" + msgid "Connection Information" + msgstr "连接信息" + ++#: ../src/info.ui.h:2 ++msgid "_Close" ++msgstr "" ++ + #: ../src/info.ui.h:3 + msgid "Active Network Connections" + msgstr "活动的网络连接" + + #: ../src/libnma/nma-file-cert-chooser.c:108 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:146 + #, fuzzy + msgid "No certificate set" + msgstr "不需要 CA 证书(_R)" + + #: ../src/libnma/nma-file-cert-chooser.c:126 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:170 + msgid "No key set" + msgstr "" + + #: ../src/libnma/nma-file-cert-chooser.c:246 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:370 + #, fuzzy, c-format + msgid "Choose a key for %s Certificate" + msgstr "选择您的个人证书..." + + #: ../src/libnma/nma-file-cert-chooser.c:250 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:374 + #, fuzzy, c-format + msgid "%s private _key:" + msgstr "私钥(_K)：" + + #: ../src/libnma/nma-file-cert-chooser.c:254 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:378 + #, fuzzy, c-format + msgid "%s key _password:" + msgstr "私钥密码(_P)：" +@@ -3786,7 +4019,7 @@ msgid "Choose %s Certificate" + msgstr "选择您的个人证书..." + + #: ../src/libnma/nma-file-cert-chooser.c:262 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:386 + #, fuzzy, c-format + msgid "%s _certificate:" + msgstr "用户证书(_U)：" +@@ -3988,47 +4221,47 @@ msgstr "设置一个移动宽带连接" + msgid "New Mobile Broadband Connection" + msgstr "新移动宽带连接" + +-#: ../src/libnma/nma-cert-chooser-button.c:162 ++#: ../src/libnma/nma-cert-chooser-button.c:165 + #, fuzzy + msgid "(None)" + msgstr "(无)" + +-#: ../src/libnma/nma-cert-chooser-button.c:170 ++#: ../src/libnma/nma-cert-chooser-button.c:173 + #, c-format + msgid "Key in %s" + msgstr "" + +-#: ../src/libnma/nma-cert-chooser-button.c:171 ++#: ../src/libnma/nma-cert-chooser-button.c:174 + #, fuzzy, c-format + msgid "Certificate in %s" + msgstr "C_A 证书：" + +-#: ../src/libnma/nma-cert-chooser-button.c:190 ++#: ../src/libnma/nma-cert-chooser-button.c:193 + #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183 + #, fuzzy + msgid "(Unknown)" + msgstr "未知" + +-#: ../src/libnma/nma-cert-chooser-button.c:212 +-#: ../src/libnma/nma-cert-chooser-button.c:242 ++#: ../src/libnma/nma-cert-chooser-button.c:215 ++#: ../src/libnma/nma-cert-chooser-button.c:245 + msgid "Select" + msgstr "" + +-#: ../src/libnma/nma-cert-chooser-button.c:213 +-#: ../src/libnma/nma-cert-chooser-button.c:243 ++#: ../src/libnma/nma-cert-chooser-button.c:216 ++#: ../src/libnma/nma-cert-chooser-button.c:246 + msgid "Cancel" + msgstr "" + +-#: ../src/libnma/nma-cert-chooser-button.c:469 ++#: ../src/libnma/nma-cert-chooser-button.c:472 + msgid "Select from file…" + msgstr "" + +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:382 + #, fuzzy, c-format + msgid "Choose a %s Certificate" + msgstr "选择您的个人证书..." + +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:390 + #, fuzzy, c-format + msgid "%s certificate _password:" + msgstr "用户证书(_U)：" +@@ -4090,8 +4323,8 @@ msgstr "次要密码(_S)：" + msgid "_Tertiary Password:" + msgstr "三元密码(_T)：" + +-#: ../src/libnma/nma-vpn-password-dialog.c:247 +-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247 ++#: ../src/libnma/nma-vpn-password-dialog.c:238 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238 + msgid "Sh_ow passwords" + msgstr "显示密码(_O)" + +@@ -4121,45 +4354,45 @@ msgstr "无" + msgid "Dynamic WEP (802.1x)" + msgstr "动态 WEP (802.1X)" + +-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075 ++#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071 + msgid "C_reate" + msgstr "创建(_R)" + +-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161 ++#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150 + #, fuzzy, c-format + msgid "" + "Passwords or encryption keys are required to access the Wi-Fi network “%s”." + msgstr "需要密码或密钥来访问 Wi-Fi 网络 %s。" + +-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163 ++#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152 + msgid "Wi-Fi Network Authentication Required" + msgstr "需要 Wi-Fi 网络认证" + +-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165 ++#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154 + msgid "Authentication required by Wi-Fi network" + msgstr "Wi-Fi 网络要求认证" + +-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170 ++#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159 + msgid "Create New Wi-Fi Network" + msgstr "创建新的 Wi-Fi 网络" + +-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172 ++#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161 + msgid "New Wi-Fi network" + msgstr "新建 Wi-Fi 网络" + +-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173 ++#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162 + msgid "Enter a name for the Wi-Fi network you wish to create." + msgstr "输入您要创建的 Wi-Fi 网络的名称。" + +-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175 ++#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164 + msgid "Connect to Hidden Wi-Fi Network" + msgstr "连接到隐藏的 Wi-Fi 网络" + +-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177 ++#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166 + msgid "Hidden Wi-Fi network" + msgstr "隐藏的 Wi-Fi 网络" + +-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178 ++#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167 + msgid "" + "Enter the name and security details of the hidden Wi-Fi network you wish to " + "connect to." +@@ -4309,25 +4542,25 @@ msgstr "漫游网络(%s)" + msgid "Roaming network" + msgstr "漫游网络" + +-#: ../src/mobile-helpers.c:331 ++#: ../src/mobile-helpers.c:330 + #, fuzzy, c-format + msgid "PIN code for SIM card “%s” on “%s”" + msgstr "%2$s 上 SIM 卡 %1$s 的 PIN 码" + +-#: ../src/mobile-helpers.c:464 ++#: ../src/mobile-helpers.c:463 + msgid "PIN code required" + msgstr "需要 PIN 码" + +-#: ../src/mobile-helpers.c:472 ++#: ../src/mobile-helpers.c:471 + msgid "PIN code is needed for the mobile broadband device" + msgstr "移动宽带设备需要 PIN 码。" + +-#: ../src/mobile-helpers.c:622 ++#: ../src/mobile-helpers.c:621 + #, fuzzy, c-format + msgid "Mobile broadband connection “%s” active: (%d%%%s%s)" + msgstr "移动宽带连接“%s”已处于活动状态：(%d%%%s%s)" + +-#: ../src/mobile-helpers.c:625 ++#: ../src/mobile-helpers.c:624 + msgid "roaming" + msgstr "漫游中" + +@@ -4337,12 +4570,12 @@ msgstr "漫游中" + msgid "%s connection" + msgstr "%s 连接" + +-#: ../src/utils/utils.c:563 ++#: ../src/utils/utils.c:565 + #, fuzzy + msgid "PEM certificates (*.pem, *.crt, *.cer)" + msgstr "DER 或 PEM 证书(*.der, *.pem, *.crt, *.cer)" + +-#: ../src/utils/utils.c:575 ++#: ../src/utils/utils.c:577 + msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" + msgstr "DER，PEM 或 PKCS#12 私钥 (*.der, *.pem, *.p12, *.key)" + +@@ -4350,39 +4583,35 @@ msgstr "DER，PEM 或 PKCS#12 私钥 (*.der, *.pem, *.p12, *.key)" + msgid "undefined error in 802.1X security (wpa-eap)" + msgstr "在 802.1X 安全性中不确定的错误 (wpa-eap)" + +-#: ../src/wireless-security/eap-method.c:227 +-msgid "no file selected" +-msgstr "" ++#: ../src/wireless-security/eap-method.c:365 ++#, fuzzy ++msgid "no CA certificate selected" ++msgstr "不需要 CA 证书(_R)" + +-#: ../src/wireless-security/eap-method.c:235 +-#, c-format +-msgid "file “%s” does not exist" ++#: ../src/wireless-security/eap-method.c:370 ++msgid "selected CA certificate file does not exist" + msgstr "" + +-#: ../src/wireless-security/eap-method.c:258 +-msgid "unspecified error validating eap-method file" +-msgstr "验证 eap 方法的文件时未指定的错误" +- +-#: ../src/wireless-security/eap-method-fast.c:73 ++#: ../src/wireless-security/eap-method-fast.c:71 + msgid "missing EAP-FAST PAC file" + msgstr "缺少 EAP-FAST PAC 文件" + +-#: ../src/wireless-security/eap-method-fast.c:269 +-#: ../src/wireless-security/eap-method-peap.c:303 +-#: ../src/wireless-security/eap-method-ttls.c:352 ++#: ../src/wireless-security/eap-method-fast.c:267 ++#: ../src/wireless-security/eap-method-peap.c:329 ++#: ../src/wireless-security/eap-method-ttls.c:379 + msgid "GTC" + msgstr "GTC" + +-#: ../src/wireless-security/eap-method-fast.c:407 ++#: ../src/wireless-security/eap-method-fast.c:405 + #, fuzzy + msgid "Choose a PAC file" + msgstr "选择一个 PAC 文件..." + +-#: ../src/wireless-security/eap-method-fast.c:414 ++#: ../src/wireless-security/eap-method-fast.c:412 + msgid "PAC files (*.pac)" + msgstr "PAC 文件(*.pac)" + +-#: ../src/wireless-security/eap-method-fast.c:418 ++#: ../src/wireless-security/eap-method-fast.c:416 + msgid "All files" + msgstr "所有文件" + +@@ -4400,7 +4629,7 @@ msgstr "两者兼用" + + #: ../src/wireless-security/eap-method-fast.ui.h:4 + #: ../src/wireless-security/eap-method-peap.ui.h:4 +-#: ../src/wireless-security/eap-method-ttls.ui.h:1 ++#: ../src/wireless-security/eap-method-ttls.ui.h:3 + msgid "Anony_mous identity:" + msgstr "匿名身份(_M)：" + +@@ -4410,7 +4639,7 @@ msgstr "PAC 文件(_F)：" + + #: ../src/wireless-security/eap-method-fast.ui.h:6 + #: ../src/wireless-security/eap-method-peap.ui.h:7 +-#: ../src/wireless-security/eap-method-ttls.ui.h:4 ++#: ../src/wireless-security/eap-method-ttls.ui.h:1 + msgid "_Inner authentication:" + msgstr "内部认证(_I)：" + +@@ -4426,27 +4655,12 @@ msgstr "缺少 EAP-LEAP 用户名" + msgid "missing EAP-LEAP password" + msgstr "缺少 EAP-LEAP 密码" + +-#: ../src/wireless-security/eap-method-peap.c:64 +-#, c-format +-msgid "invalid EAP-PEAP CA certificate: %s" +-msgstr "无效的 EAP-PEAP CA 认证： %s" +- +-#: ../src/wireless-security/eap-method-peap.c:69 +-msgid "invalid EAP-PEAP CA certificate: no certificate specified" +-msgstr "无效的 EAP-PEAP CA 证书：没有指定的证书" +- +-#: ../src/wireless-security/eap-method-peap.c:288 +-#: ../src/wireless-security/eap-method-ttls.c:337 ++#: ../src/wireless-security/eap-method-peap.c:314 ++#: ../src/wireless-security/eap-method-ttls.c:364 + #: ../src/wireless-security/wireless-security.c:424 + msgid "MD5" + msgstr "MD5" + +-#: ../src/wireless-security/eap-method-peap.c:382 +-#: ../src/wireless-security/eap-method-ttls.c:431 +-#, fuzzy +-msgid "Choose a Certificate Authority certificate" +-msgstr "选择一个认证中心证书..." +- + #: ../src/wireless-security/eap-method-peap.ui.h:2 + msgid "Version 0" + msgstr "版本 0" +@@ -4456,20 +4670,27 @@ msgid "Version 1" + msgstr "版本 1" + + #: ../src/wireless-security/eap-method-peap.ui.h:5 +-#: ../src/wireless-security/eap-method-ttls.ui.h:2 +-msgid "C_A certificate:" +-msgstr "C_A 证书：" +- +-#: ../src/wireless-security/eap-method-peap.ui.h:6 + #: ../src/wireless-security/eap-method-tls.ui.h:2 +-#: ../src/wireless-security/eap-method-ttls.ui.h:3 ++#: ../src/wireless-security/eap-method-ttls.ui.h:2 + msgid "No CA certificate is _required" + msgstr "不需要 CA 证书(_R)" + +-#: ../src/wireless-security/eap-method-peap.ui.h:8 ++#: ../src/wireless-security/eap-method-peap.ui.h:6 + msgid "PEAP _version:" + msgstr "PEAP 版本(_V)：" + ++#: ../src/wireless-security/eap-method-peap.ui.h:8 ++#: ../src/wireless-security/eap-method-tls.ui.h:3 ++#: ../src/wireless-security/eap-method-ttls.ui.h:4 ++msgid "Suffix of the server certificate name." ++msgstr "" ++ ++#: ../src/wireless-security/eap-method-peap.ui.h:9 ++#: ../src/wireless-security/eap-method-tls.ui.h:4 ++#: ../src/wireless-security/eap-method-ttls.ui.h:5 ++msgid "_Domain:" ++msgstr "" ++ + #: ../src/wireless-security/eap-method-simple.c:75 + msgid "missing EAP username" + msgstr "缺少 EAP 用户名" +@@ -4482,46 +4703,28 @@ msgstr "缺少 EAP 密码" + msgid "missing EAP-TLS identity" + msgstr "缺少 EAP-TLS 身份" + +-#: ../src/wireless-security/eap-method-tls.c:238 ++#: ../src/wireless-security/eap-method-tls.c:256 + #, fuzzy + msgid "no user certificate selected" + msgstr "不需要 CA 证书(_R)" + +-#: ../src/wireless-security/eap-method-tls.c:243 ++#: ../src/wireless-security/eap-method-tls.c:261 + msgid "selected user certificate file does not exist" + msgstr "" + +-#: ../src/wireless-security/eap-method-tls.c:263 ++#: ../src/wireless-security/eap-method-tls.c:281 + msgid "no key selected" + msgstr "" + +-#: ../src/wireless-security/eap-method-tls.c:268 ++#: ../src/wireless-security/eap-method-tls.c:286 + msgid "selected key file does not exist" + msgstr "" + +-#: ../src/wireless-security/eap-method-tls.c:314 +-#, fuzzy +-msgid "no CA certificate selected" +-msgstr "不需要 CA 证书(_R)" +- +-#: ../src/wireless-security/eap-method-tls.c:319 +-msgid "selected CA certificate file does not exist" +-msgstr "" +- + #: ../src/wireless-security/eap-method-tls.ui.h:1 + msgid "I_dentity:" + msgstr "身份(_D)：" + +-#: ../src/wireless-security/eap-method-ttls.c:64 +-#, c-format +-msgid "invalid EAP-TTLS CA certificate: %s" +-msgstr "无效的 EAP-TTLS CA 证书：%s" +- +-#: ../src/wireless-security/eap-method-ttls.c:69 +-msgid "invalid EAP-TTLS CA certificate: no certificate specified" +-msgstr "无效的 EAP-TTLS CA 证书：没有指定的证书" +- +-#: ../src/wireless-security/eap-method-ttls.c:306 ++#: ../src/wireless-security/eap-method-ttls.c:333 + #, fuzzy + msgid "MSCHAPv2 (no EAP)" + msgstr "MSCHAPv2" +@@ -4597,17 +4800,17 @@ msgid "invalid wep-key: passphrase must be shorter than 64 characters" + msgstr "无效的 wep-key：密码必须少于64个字符" + + #: ../src/wireless-security/ws-wep-key.ui.h:1 +-msgid "1 (Default)" +-msgstr "1 (默认)" +- +-#: ../src/wireless-security/ws-wep-key.ui.h:2 + msgid "Open System" + msgstr "开放式系统" + +-#: ../src/wireless-security/ws-wep-key.ui.h:3 ++#: ../src/wireless-security/ws-wep-key.ui.h:2 + msgid "Shared Key" + msgstr "共享密钥" + ++#: ../src/wireless-security/ws-wep-key.ui.h:3 ++msgid "1 (Default)" ++msgstr "1 (默认)" ++ + #: ../src/wireless-security/ws-wep-key.ui.h:4 + msgid "_Key:" + msgstr "密钥(_K)：" +@@ -4635,345 +4838,3 @@ msgstr "无效的 wpa-psk：不能用 64 个字节作为十六进制解释密钥 + #: ../src/wireless-security/ws-wpa-psk.ui.h:2 + msgid "_Type:" + msgstr "类型(_T)：" +- +-#~ msgid "NetworkManager for GNOME" +-#~ msgstr "GNOME 网络管理器" +- +-#~ msgid "" +-#~ "\n" +-#~ "The VPN connection '%s' disconnected because the VPN service stopped." +-#~ msgstr "" +-#~ "\n" +-#~ "VPN 连接“%s”已断开。VPN 服务已停止。" +- +-#~ msgid "_Disconnect VPN" +-#~ msgstr "断开 VPN(_D)" +- +-#~ msgid "Enable WiMA_X Mobile Broadband" +-#~ msgstr "启用 WiMA_X 移动宽带" +- +-#~ msgid "_Help" +-#~ msgstr "帮助(_H)" +- +-#~ msgid "Disconnected - you are now offline" +-#~ msgstr "连接已断开 - 您现在处于离线状态" +- +-#~ msgid "Wireless network" +-#~ msgstr "无线网络" +- +-#~ msgid "Ethernet network" +-#~ msgstr "以太网" +- +-#~ msgid "Modem network" +-#~ msgstr "调制解调器网络" +- +-#~ msgid "You are now connected to the bonded network." +-#~ msgstr "您现在已连接到绑定的网络。" +- +-#~ msgid "Preparing bond connection '%s'..." +-#~ msgstr "正在准备绑定连接“%s”..." +- +-#~ msgid "Configuring bond connection '%s'..." +-#~ msgstr "正在配置绑定连接“%s”..." +- +-#~ msgid "User authentication required for bond connection '%s'..." +-#~ msgstr "绑定连接“%s”需要用户认证..." +- +-#~ msgid "Requesting address for '%s'..." +-#~ msgstr "正在为“%s”请求地址..." +- +-#~ msgid "Bond connection '%s' active" +-#~ msgstr "绑定连接“%s”已处于活动状态" +- +-#~ msgid "You are now connected to the bridged network." +-#~ msgstr "您现在已连接到桥接的网络。" +- +-#~ msgid "Preparing bridge connection '%s'..." +-#~ msgstr "正在准备桥接网络连接“%s”..." +- +-#~ msgid "Configuring bridge connection '%s'..." +-#~ msgstr "正在配置桥接网络连接 %s..." +- +-#~ msgid "User authentication required for bridge connection '%s'..." +-#~ msgstr "桥接网络“%s”需要用户认证..." +- +-#~ msgid "Bridge connection '%s' active" +-#~ msgstr "桥接网络连接“%s”已处于活动状态" +- +-#~ msgid "New Mobile Broadband connection..." +-#~ msgstr "新移动宽带连接..." +- +-#~ msgid "New Mobile Broadband (CDMA) connection..." +-#~ msgstr "新建移动宽带(CDMA)连接..." +- +-#~ msgid "You are now connected to the CDMA network." +-#~ msgstr "您现在已连接到 CDMA 网络。" +- +-#~ msgid "CDMA network." +-#~ msgstr "CDMA 网络。" +- +-#~ msgid "New Mobile Broadband (GSM) connection..." +-#~ msgstr "新建移动宽带(GSM)连接..." +- +-#~ msgid "You are now connected to the GSM network." +-#~ msgstr "您现在已连接到 GSM 网络。" +- +-#~ msgid "GSM network." +-#~ msgstr "GSM 网络。" +- +-#~ msgid "Auto InfiniBand" +-#~ msgstr "自动 InfiniBand" +- +-#~ msgid "InfiniBand Networks (%s)" +-#~ msgstr "InfiniBand 网络（%s）" +- +-#~ msgid "InfiniBand Network (%s)" +-#~ msgstr "InfiniBand 网络（%s）" +- +-#~ msgid "InfiniBand Networks" +-#~ msgstr "InfiniBand 网络" +- +-#~ msgid "InfiniBand Network" +-#~ msgstr "InfiniBand 网络" +- +-#~ msgid "You are now connected to the InfiniBand network." +-#~ msgstr "您现在已连接到 InfiniBand 网络。" +- +-#~ msgid "Preparing InfiniBand connection '%s'..." +-#~ msgstr "正在准备 InfiniBand 网络连接“%s”..." +- +-#~ msgid "Configuring InfiniBand connection '%s'..." +-#~ msgstr "正在配置 InfiniBand 网络连接 %s..." +- +-#~ msgid "User authentication required for InfiniBand connection '%s'..." +-#~ msgstr "InfiniBand 网络“%s”需要用户认证..." +- +-#~ msgid "InfiniBand connection '%s' active" +-#~ msgstr "InfiniBand 连接“%s”开启" +- +-#~ msgid "You are now connected to the teamed network." +-#~ msgstr "您现已连接到组队网络。" +- +-#~ msgid "Preparing team connection '%s'..." +-#~ msgstr "正在准备组队网络连接“%s”..." +- +-#~ msgid "Configuring team connection '%s'..." +-#~ msgstr "正在配置组队网络连接 %s..." +- +-#~ msgid "User authentication required for team connection '%s'..." +-#~ msgstr "组队连接“%s”需要用户认证..." +- +-#~ msgid "Team connection '%s' active" +-#~ msgstr "组队连接“%s”开启" +- +-#~ msgid "You are now connected to the VLAN." +-#~ msgstr "您现在已连接到 VLAN 网络。" +- +-#~ msgid "Preparing VLAN connection '%s'..." +-#~ msgstr "正在启动 VLAN 连接“%s”..." +- +-#~ msgid "Configuring VLAN connection '%s'..." +-#~ msgstr "正在启动 VLAN 连接“%s”..." +- +-#~ msgid "User authentication required for VLAN connection '%s'..." +-#~ msgstr "VLAN 连接“%s”需要用户认证..." +- +-#~ msgid "VLAN connection '%s' active" +-#~ msgstr "VLAN 连接“%s”已处于活动状态" +- +-#~ msgid "_Connect to Hidden Wi-Fi Network..." +-#~ msgstr "连接到隐藏的 Wi-Fi 网络(_C)..." +- +-#~ msgid "Create _New Wi-Fi Network..." +-#~ msgstr "创建新的 Wi-Fi 网络(_N)..." +- +-#~ msgid "WiMAX Mobile Broadband (%s)" +-#~ msgstr "WiMAX 移动宽带(%s)" +- +-#~ msgid "WiMAX Mobile Broadband" +-#~ msgstr "WiMAX 移动宽带" +- +-#~ msgid "WiMAX is disabled" +-#~ msgstr "WiMAX 已禁用" +- +-#~ msgid "WiMAX is disabled by hardware switch" +-#~ msgstr "WiMAX 已通过硬件开关禁用" +- +-#~ msgid "You are now connected to the WiMAX network." +-#~ msgstr "您现在已连接到 WiMAX 网络。" +- +-#~ msgid "%d dB" +-#~ msgstr "%d dB" +- +-#~ msgctxt "WiMAX CINR" +-#~ msgid "unknown" +-#~ msgstr "未知" +- +-#~ msgctxt "WiMAX Base Station ID" +-#~ msgid "unknown" +-#~ msgstr "未知" +- +-#~ msgid "WiMAX (%s)" +-#~ msgstr "WiMAX (%s)" +- +-#~ msgid "CINR:" +-#~ msgstr "CINR：" +- +-#~ msgid "BSID:" +-#~ msgstr "BSID：" +- +-#~ msgid " " +-#~ msgstr " " +- +-#~ msgid "0" +-#~ msgstr "0" +- +-#~ msgid "1" +-#~ msgstr "1" +- +-#~ msgid "2" +-#~ msgstr "2" +- +-#~ msgid "3" +-#~ msgstr "3" +- +-#~ msgid "4" +-#~ msgstr "4" +- +-#~ msgid "5" +-#~ msgstr "5" +- +-#~ msgid "6" +-#~ msgstr "6" +- +-#~ msgid "7" +-#~ msgstr "7" +- +-#~ msgid "15" +-#~ msgstr "15" +- +-#~ msgid "Aut_onegotiate" +-#~ msgstr "自动握手(_O)" +- +-#~ msgid "WiMAX" +-#~ msgstr "WiMAX" +- +-#~ msgid "Error saving connection" +-#~ msgstr "保存连接出错" +- +-#~ msgid "The property '%s' / '%s' is invalid: %d" +-#~ msgstr "属性“%s”/“%s”非法：%d" +- +-#~ msgid "FirewallD is not running." +-#~ msgstr "FirewallD 未运行。" +- +-#~ msgid "IPv4 address netmask missing" +-#~ msgstr "IPv4 地址掩码丢失" +- +-#~ msgid "IPv6 prefix \"%s\" missing" +-#~ msgstr "IPv6 前缀 “%s” 丢失" +- +-#~ msgid "Could not load WiMAX user interface." +-#~ msgstr "无法加载 WiMAX 用户界面。" +- +-#~ msgid "WiMAX name missing" +-#~ msgstr "WiMAX 名称缺失" +- +-#~ msgid "WiMAX device" +-#~ msgstr "WiMAX 设备" +- +-#~ msgid "WiMAX connection %d" +-#~ msgstr "WiMAX 连接 %d" +- +-#~ msgid "" +-#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) " +-#~ "%s)." +-#~ msgstr "蓝牙配置不可用(无法连接 D-Bus：(%s) %s)。" +- +-#~ msgid "" +-#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) " +-#~ "%s)." +-#~ msgstr "蓝牙配置不可用(查找 NetworkManager 出错：(%s) %s)。" +- +-#~ msgid "Use your mobile phone as a network device (PAN/NAP)" +-#~ msgstr "使用您的移动电话作为网络设备(PAN/NAP)" +- +-#~ msgid "Access the Internet using your mobile phone (DUN)" +-#~ msgstr "使用您的手机访问互联网(DUN)" +- +-#~ msgid "Error: %s" +-#~ msgstr "错误：%s" +- +-#~ msgid "Failed to create DUN connection: %s" +-#~ msgstr "无法建立 DUN 连接：%s" +- +-#~ msgid "Your phone is now ready to use!" +-#~ msgstr "您的电话已经可以使用！" +- +-#~ msgid "Mobile wizard was canceled" +-#~ msgstr "移动连接向导已被取消" +- +-#~ msgid "Unknown phone device type (not GSM or CDMA)" +-#~ msgstr "未知电话设备类型(不是 GSM 或者 CDMA)" +- +-#~ msgid "failed to connect to the phone." +-#~ msgstr "连接到电话失败。" +- +-#~ msgid "error getting bus connection" +-#~ msgstr "获取总线连接出错" +- +-#~ msgid "unexpectedly disconnected from the phone." +-#~ msgstr "意外断开与电话的连接。" +- +-#~ msgid "timed out detecting phone details." +-#~ msgstr "检测电话详细信息时超时。" +- +-#~ msgid "Detecting phone configuration..." +-#~ msgstr "正在检测电话配置..." +- +-#~ msgid "" +-#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-" +-#~ "Networking connection." +-#~ msgstr "在设置拨号网络连接前必须启用默认蓝牙适配器。" +- +-#~ msgid "Failed to create PAN connection: %s" +-#~ msgstr "无法建立 PAN 连接：%s" +- +-#~ msgid "%s Network" +-#~ msgstr "%s 网络" +- +-#~ msgid "New..." +-#~ msgstr "新建..." +- +-#~ msgid "invalid EAP-TLS CA certificate: %s" +-#~ msgstr "无效的 EAP-TLS CA 证书：%s" +- +-#~ msgid "invalid EAP-TLS CA certificate: no certificate specified" +-#~ msgstr "无效的 EAP-TLS CA 证书：没有指定的证书" +- +-#~ msgid "invalid EAP-TLS password: missing" +-#~ msgstr "无效的 EAP-TLS 密码：丢失" +- +-#~ msgid "invalid EAP-TLS private-key: %s" +-#~ msgstr "无效的 EAP-TLS 私钥：%s" +- +-#~ msgid "invalid EAP-TLS user-certificate: %s" +-#~ msgstr "无效的 EAP-TLS 用户证书：%s" +- +-#~ msgid "Unencrypted private keys are insecure" +-#~ msgstr "未加密的私钥是不安全的" +- +-#~ msgid "" +-#~ "The selected private key does not appear to be protected by a password. " +-#~ "This could allow your security credentials to be compromised. Please " +-#~ "select a password-protected private key.\n" +-#~ "\n" +-#~ "(You can password-protect your private key with openssl)" +-#~ msgstr "" +-#~ "选定的私钥似乎没有密码保护。这可能影响到您的安全证书的安全性。请选择一个有" +-#~ "密码保护的私钥。\n" +-#~ "\n" +-#~ "(您可以使用 openssl 来对私钥进行密码保护)" +- +-#~ msgid "Choose your private key..." +-#~ msgstr "选择您的私钥..." +diff --git a/po/zh_TW.po b/po/zh_TW.po +index f880735..def8c21 100644 +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -8,23 +8,23 @@ + # Wei-Lun Chao , 2010. + # Roy Chan , 2011. + # Anthony Fok , 2013. +-# ++# lrintel , 2017. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: network-manager-applet 0.9.8\n" ++"Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2017-05-10 12:44+0200\n" +-"PO-Revision-Date: 2014-08-26 06:54+0800\n" +-"Last-Translator: Chao-Hsiung Liao \n" ++"POT-Creation-Date: 2017-11-07 19:40+0100\n" ++"PO-Revision-Date: 2017-11-07 06:45+0000\n" ++"Last-Translator: Copied by Zanata \n" + "Language-Team: Traditional Chinese \n" +-"Language: zh_TW\n" ++"Language: zh_Hant\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: Poedit 1.6.5\n" ++"X-Generator: Zanata 4.3.2\n" + +-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175 ++#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191 + msgid "Network" + msgstr "網路" + +@@ -33,7 +33,7 @@ msgid "Manage your network connections" + msgstr "管理您的網路連線" + + #: ../nm-connection-editor.desktop.in.h:1 +-#: ../src/connection-editor/nm-connection-editor.ui.h:1 ++#: ../src/connection-editor/nm-connection-list.ui.h:1 + msgid "Network Connections" + msgstr "網路連線" + +@@ -145,55 +145,68 @@ msgstr "" + msgid "The NetworkManager Developers" + msgstr "NetworkManager 面板程式" + +-#: ../shared/nm-utils/nm-shared-utils.c:185 ++#: ../shared/nm-utils/nm-shared-utils.c:477 + #, c-format + msgid "object class '%s' has no property named '%s'" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:192 ++#: ../shared/nm-utils/nm-shared-utils.c:484 + #, c-format + msgid "property '%s' of object class '%s' is not writable" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:199 ++#: ../shared/nm-utils/nm-shared-utils.c:491 + #, c-format + msgid "" + "construct property \"%s\" for object '%s' can't be set after construction" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:207 ++#: ../shared/nm-utils/nm-shared-utils.c:499 + #, c-format + msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:216 ++#: ../shared/nm-utils/nm-shared-utils.c:508 + #, c-format + msgid "unable to set property '%s' of type '%s' from value of type '%s'" + msgstr "" + +-#: ../shared/nm-utils/nm-shared-utils.c:227 ++#: ../shared/nm-utils/nm-shared-utils.c:519 + #, c-format + msgid "" + "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " + "type '%s'" + msgstr "" + +-#. *************************************************************************** + #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99 + msgid "802.1X authentication" + msgstr "802.1X 驗證" + +-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1 ++#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349 ++#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1 + #: ../src/connection-editor/ce-ip6-routes.ui.h:1 + #: ../src/connection-editor/ce-new-connection.ui.h:1 + #: ../src/connection-editor/ce-page-dcb.ui.h:17 + #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1 +-#: ../src/connection-editor/nm-connection-editor.ui.h:8 +-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1 ++#: ../src/connection-editor/connection-helpers.c:308 ++#: ../src/connection-editor/connection-helpers.c:771 ++#: ../src/connection-editor/nm-connection-editor.ui.h:5 ++#: ../src/connection-editor/page-bluetooth.c:311 ++#: ../src/connection-editor/page-mobile.c:543 ++#: ../src/connection-editor/page-proxy.c:121 ++#: ../src/connection-editor/page-team.c:344 ++#: ../src/connection-editor/page-team-port.c:206 ++#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1 ++#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1 ++#: ../src/libnma/nma-vpn-password-dialog.c:209 ++#: ../src/libnma/nma-wifi-dialog.c:1066 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209 ++#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465 + msgid "_Cancel" + msgstr "" + +-#: ../src/8021x.ui.h:3 ++#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072 ++#: ../src/libnm-gtk/nm-wifi-dialog.c:1073 + msgid "C_onnect" + msgstr "連線(_O)" + +@@ -209,38 +222,38 @@ msgstr "ad-hoc" + msgid "secure." + msgstr "安全。" + +-#: ../src/applet.c:381 ++#: ../src/applet.c:392 + msgid "Failed to add/activate connection" + msgstr "無法加入/使用連線" + +-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472 +-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410 ++#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483 ++#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411 + msgid "Unknown error" + msgstr "不明的錯誤" + +-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539 +-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413 ++#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539 ++#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414 + msgid "Connection failure" + msgstr "連線失敗" + +-#: ../src/applet.c:435 ++#: ../src/applet.c:446 + msgid "Device disconnect failed" + msgstr "裝置斷線失敗" + +-#: ../src/applet.c:440 ++#: ../src/applet.c:451 + msgid "Disconnect failure" + msgstr "斷線失敗" + +-#: ../src/applet.c:470 ++#: ../src/applet.c:481 + msgid "Connection activation failed" + msgstr "連線生效失敗" + +-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126 ++#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127 + #, fuzzy + msgid "Don’t show this message again" + msgstr "不要再顯示這個訊息" + +-#: ../src/applet.c:883 ++#: ../src/applet.c:899 + #, fuzzy, c-format + msgid "" + "\n" +@@ -250,7 +263,7 @@ msgstr "" + "\n" + "VPN 連線「%s」失敗，因為網路連線中斷了。" + +-#: ../src/applet.c:885 ++#: ../src/applet.c:901 + #, fuzzy, c-format + msgid "" + "\n" +@@ -260,7 +273,7 @@ msgstr "" + "\n" + "VPN 連線「%s」失敗，因為網路連線被中斷了。" + +-#: ../src/applet.c:887 ++#: ../src/applet.c:903 + #, fuzzy, c-format + msgid "" + "\n" +@@ -269,7 +282,7 @@ msgstr "" + "\n" + "VPN 連線「%s」失敗，因為 VPN 服務意外的停止了。" + +-#: ../src/applet.c:889 ++#: ../src/applet.c:905 + #, fuzzy, c-format + msgid "" + "\n" +@@ -279,7 +292,7 @@ msgstr "" + "\n" + "VPN 連線「%s」失敗，因為 VPN 服務傳回無效的組態。" + +-#: ../src/applet.c:891 ++#: ../src/applet.c:907 + #, fuzzy, c-format + msgid "" + "\n" +@@ -288,7 +301,7 @@ msgstr "" + "\n" + "VPN 連線「%s」失敗，因為連線的嘗試已逾時。" + +-#: ../src/applet.c:893 ++#: ../src/applet.c:909 + #, fuzzy, c-format + msgid "" + "\n" +@@ -297,7 +310,7 @@ msgstr "" + "\n" + "VPN 連線「%s」失敗，因為 VPN 服務沒有及時啟動。" + +-#: ../src/applet.c:895 ++#: ../src/applet.c:911 + #, fuzzy, c-format + msgid "" + "\n" +@@ -306,7 +319,7 @@ msgstr "" + "\n" + "VPN 連線「%s」失敗，因為 VPN 服務啟動失敗。" + +-#: ../src/applet.c:897 ++#: ../src/applet.c:913 + #, fuzzy, c-format + msgid "" + "\n" +@@ -315,7 +328,7 @@ msgstr "" + "\n" + "VPN 連線「%s」失敗，因為沒有有效的 VPN 服務。" + +-#: ../src/applet.c:899 ++#: ../src/applet.c:915 + #, fuzzy, c-format + msgid "" + "\n" +@@ -324,7 +337,7 @@ msgstr "" + "\n" + "VPN 連線「%s」失敗，因為無效的 VPN 機密。" + +-#: ../src/applet.c:904 ++#: ../src/applet.c:920 + #, fuzzy, c-format + msgid "" + "\n" +@@ -333,7 +346,7 @@ msgstr "" + "\n" + "VPN 連線「%s」失敗。" + +-#: ../src/applet.c:931 ++#: ../src/applet.c:947 + #, c-format + msgid "" + "VPN connection has been successfully established.\n" +@@ -343,19 +356,19 @@ msgstr "" + "VPN 連線已成功的。\n" + "%s\n" + +-#: ../src/applet.c:933 ++#: ../src/applet.c:949 + msgid "VPN connection has been successfully established.\n" + msgstr "VPN 連線已成功的。\n" + +-#: ../src/applet.c:935 ++#: ../src/applet.c:951 + msgid "VPN Login Message" + msgstr "VPN 登錄訊息" + +-#: ../src/applet.c:943 ../src/applet.c:983 ++#: ../src/applet.c:959 ../src/applet.c:999 + msgid "VPN Connection Failed" + msgstr "VPN 連線失敗" + +-#: ../src/applet.c:987 ++#: ../src/applet.c:1003 + #, fuzzy, c-format + msgid "" + "\n" +@@ -368,7 +381,7 @@ msgstr "" + "\n" + "%s" + +-#: ../src/applet.c:990 ++#: ../src/applet.c:1006 + #, fuzzy, c-format + msgid "" + "\n" +@@ -381,148 +394,148 @@ msgstr "" + "\n" + "%s" + +-#: ../src/applet.c:1279 ++#: ../src/applet.c:1295 + msgid "device not ready (firmware missing)" + msgstr "裝置尚未就緒 (缺少韌體)" + +-#: ../src/applet.c:1281 ++#: ../src/applet.c:1297 + msgid "device not ready" + msgstr "裝置尚未就緒" + + #. Notify user of unmanaged or unavailable device +-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109 ++#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109 + msgid "disconnected" + msgstr "已斷線" + +-#: ../src/applet.c:1307 ++#: ../src/applet.c:1323 + msgid "Disconnect" + msgstr "斷線" + +-#: ../src/applet.c:1321 ++#: ../src/applet.c:1337 + msgid "device not managed" + msgstr "裝置無法管理" + +-#: ../src/applet.c:1394 ++#: ../src/applet.c:1410 + msgid "No network devices available" + msgstr "沒有可用的網路裝置" + +-#: ../src/applet.c:1448 ++#: ../src/applet.c:1464 + msgid "_VPN Connections" + msgstr "_VPN 連線" + +-#: ../src/applet.c:1492 ++#: ../src/applet.c:1508 + #, fuzzy + msgid "_Configure VPN…" + msgstr "設置 VPN(_C)…" + +-#: ../src/applet.c:1495 ++#: ../src/applet.c:1511 + #, fuzzy + msgid "_Add a VPN connection…" + msgstr "_VPN 連線" + +-#: ../src/applet.c:1601 ++#: ../src/applet.c:1617 + #, fuzzy + msgid "NetworkManager is not running…" + msgstr "NetworkManager 沒有執行…." + +-#: ../src/applet.c:1606 ../src/applet.c:2671 ++#: ../src/applet.c:1622 ../src/applet.c:2687 + msgid "Networking disabled" + msgstr "網路已停用" + + #. 'Enable Networking' item +-#: ../src/applet.c:1816 ++#: ../src/applet.c:1832 + msgid "Enable _Networking" + msgstr "啟用網路(_N)" + + #. 'Enable Wi-Fi' item +-#: ../src/applet.c:1825 ++#: ../src/applet.c:1841 + msgid "Enable _Wi-Fi" + msgstr "啟用 _Wi-Fi" + + #. 'Enable Mobile Broadband' item +-#: ../src/applet.c:1834 ++#: ../src/applet.c:1850 + msgid "Enable _Mobile Broadband" + msgstr "啟用行動寬頻(_M)" + + #. Toggle notifications item +-#: ../src/applet.c:1846 ++#: ../src/applet.c:1862 + msgid "Enable N_otifications" + msgstr "啟用通知功能(_O)" + + #. 'Connection Information' item +-#: ../src/applet.c:1858 ++#: ../src/applet.c:1874 + msgid "Connection _Information" + msgstr "連線資訊(_I)" + + #. 'Edit Connections...' item +-#: ../src/applet.c:1866 ++#: ../src/applet.c:1882 + #, fuzzy + msgid "Edit Connections…" + msgstr "編輯連線…" + +-#: ../src/applet.c:1880 ++#: ../src/applet.c:1896 + msgid "_About" + msgstr "關於(_A)" + +-#: ../src/applet.c:2191 ++#: ../src/applet.c:2207 + #, fuzzy, c-format + msgid "You are now connected to “%s”." + msgstr "您現在已連線至「%s」。" + +-#: ../src/applet.c:2231 ++#: ../src/applet.c:2247 + msgid "Disconnected" + msgstr "已斷線" + +-#: ../src/applet.c:2232 ++#: ../src/applet.c:2248 + msgid "The network connection has been disconnected." + msgstr "網路連線已中斷。" + +-#: ../src/applet.c:2534 ++#: ../src/applet.c:2550 + #, fuzzy, c-format + msgid "Preparing network connection “%s”…" + msgstr "正在準備網路連線「%s」…" + +-#: ../src/applet.c:2537 ++#: ../src/applet.c:2553 + #, fuzzy, c-format + msgid "User authentication required for network connection “%s”…" + msgstr "網路連線「%s」需要使用者驗證…" + +-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125 +-#: ../src/mobile-helpers.c:608 ++#: ../src/applet.c:2556 ../src/applet-device-bt.c:125 ++#: ../src/mobile-helpers.c:607 + #, fuzzy, c-format + msgid "Requesting a network address for “%s”…" + msgstr "正在要求提供「%s」的網路位址…" + +-#: ../src/applet.c:2543 ++#: ../src/applet.c:2559 + #, fuzzy, c-format + msgid "Network connection “%s” active" + msgstr "網路連線「%s」在使用中" + +-#: ../src/applet.c:2616 ++#: ../src/applet.c:2632 + #, fuzzy, c-format + msgid "Starting VPN connection “%s”…" + msgstr "正在啟動 VPN 連線「%s」…" + +-#: ../src/applet.c:2619 ++#: ../src/applet.c:2635 + #, fuzzy, c-format + msgid "User authentication required for VPN connection “%s”…" + msgstr "VPN 連線「%s」需要使用者驗證…" + +-#: ../src/applet.c:2622 ++#: ../src/applet.c:2638 + #, fuzzy, c-format + msgid "Requesting a VPN address for “%s”…" + msgstr "正在要求 VPN 提供「%s」的網路位址…" + +-#: ../src/applet.c:2625 ++#: ../src/applet.c:2641 + #, fuzzy, c-format + msgid "VPN connection active" + msgstr "VPN 連線「%s」在使用中" + +-#: ../src/applet.c:2675 ++#: ../src/applet.c:2691 + msgid "No network connection" + msgstr "沒有網路連接" + +-#: ../src/applet.c:3276 ++#: ../src/applet.c:3292 + msgid "NetworkManager Applet" + msgstr "NetworkManager 面板程式" + +@@ -540,47 +553,47 @@ msgstr "PIN 碼錯誤，請聯絡您的供應商。" + msgid "Sending unlock code…" + msgstr "發送解鎖用的密碼…" + +-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506 ++#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507 + #, c-format + msgid "Mobile Broadband (%s)" + msgstr "行動寬頻 (%s)" + +-#: ../src/applet-device-broadband.c:738 +-#: ../src/connection-editor/connection-helpers.c:107 ++#: ../src/applet-device-broadband.c:739 ++#: ../src/connection-editor/connection-helpers.c:108 + #: ../src/connection-editor/page-mobile.c:308 + #: ../src/libnm-gtk/nm-ui-utils.c:329 + msgid "Mobile Broadband" + msgstr "行動寬頻" + +-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75 +-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906 ++#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75 ++#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907 + msgid "Available" + msgstr "可用" + + #. Default connection item +-#: ../src/applet-device-broadband.c:803 ++#: ../src/applet-device-broadband.c:805 + #, fuzzy + msgid "New Mobile Broadband connection…" + msgstr "新的行動寬頻連線" + +-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87 +-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308 ++#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87 ++#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309 + msgid "Connection Established" + msgstr "已建立連線" + +-#: ../src/applet-device-broadband.c:818 ++#: ../src/applet-device-broadband.c:820 + msgid "You are now connected to the Mobile Broadband network." + msgstr "您現在已連線至行動寬頻網路。" + +-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964 ++#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966 + msgid "Mobile Broadband network." + msgstr "行動寬頻網路。" + +-#: ../src/applet-device-broadband.c:959 ++#: ../src/applet-device-broadband.c:961 + msgid "You are now registered on the home network." + msgstr "您現在已註冊至家用網路。" + +-#: ../src/applet-device-broadband.c:965 ++#: ../src/applet-device-broadband.c:967 + msgid "You are now registered on a roaming network." + msgstr "您現在已註冊至漫遊網路。" + +@@ -588,22 +601,22 @@ msgstr "您現在已註冊至漫遊網路。" + msgid "You are now connected to the mobile broadband network." + msgstr "您現在已連線至行動寬頻網路。" + +-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599 ++#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598 + #, fuzzy, c-format + msgid "Preparing mobile broadband connection “%s”…" + msgstr "正在準備行動寬頻連線「%s」…" + +-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602 ++#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601 + #, fuzzy, c-format + msgid "Configuring mobile broadband connection “%s”…" + msgstr "正在設定行動寬頻連線「%s」…" + +-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605 ++#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604 + #, fuzzy, c-format + msgid "User authentication required for mobile broadband connection “%s”…" + msgstr "行動寬頻連線「%s」需要使用者驗證…" + +-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627 ++#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626 + #, fuzzy, c-format + msgid "Mobile broadband connection “%s” active" + msgstr "行動寬頻連線「%s」在使用中" +@@ -663,6 +676,18 @@ msgstr "有線網路連線「%s」在使用中" + msgid "DSL authentication" + msgstr "DSL 驗證" + ++#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060 ++#: ../src/connection-editor/ce-ip4-routes.ui.h:2 ++#: ../src/connection-editor/ce-ip6-routes.ui.h:2 ++#: ../src/connection-editor/ce-page-dcb.ui.h:18 ++#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2 ++#: ../src/connection-editor/page-bluetooth.c:313 ++#: ../src/connection-editor/page-mobile.c:545 ++#: ../src/libnma/nma-vpn-password-dialog.c:210 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466 ++msgid "_OK" ++msgstr "" ++ + #: ../src/applet-device-wifi.c:225 + #, fuzzy + msgid "_Connect to Hidden Wi-Fi Network…" +@@ -677,7 +702,7 @@ msgstr "建立新的 Wi-Fi 網路" + msgid "(none)" + msgstr "(無)" + +-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408 ++#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409 + msgid "Failed to add new connection" + msgstr "無法加入新連線" + +@@ -685,77 +710,77 @@ msgstr "無法加入新連線" + msgid "Insufficient privileges." + msgstr "" + +-#: ../src/applet-device-wifi.c:838 ++#: ../src/applet-device-wifi.c:839 + #, c-format + msgid "Wi-Fi Networks (%s)" + msgstr "Wi-Fi 網路 (%s)" + +-#: ../src/applet-device-wifi.c:840 ++#: ../src/applet-device-wifi.c:841 + #, c-format + msgid "Wi-Fi Network (%s)" + msgstr "Wi-Fi 網路 (%s)" + +-#: ../src/applet-device-wifi.c:842 ++#: ../src/applet-device-wifi.c:843 + msgid "Wi-Fi Network" + msgid_plural "Wi-Fi Networks" + msgstr[0] "Wi-Fi 網路" + +-#: ../src/applet-device-wifi.c:871 ++#: ../src/applet-device-wifi.c:872 + msgid "Wi-Fi is disabled" + msgstr "Wi-Fi 已停用" + +-#: ../src/applet-device-wifi.c:872 ++#: ../src/applet-device-wifi.c:873 + msgid "Wi-Fi is disabled by hardware switch" + msgstr "Wi-Fi 已被硬體開關停用" + +-#: ../src/applet-device-wifi.c:933 ++#: ../src/applet-device-wifi.c:934 + msgid "More networks" + msgstr "更多網路" + +-#: ../src/applet-device-wifi.c:1122 ++#: ../src/applet-device-wifi.c:1123 + msgid "Wi-Fi Networks Available" + msgstr "有 Wi-Fi 網路可用" + +-#: ../src/applet-device-wifi.c:1123 ++#: ../src/applet-device-wifi.c:1124 + msgid "Use the network menu to connect to a Wi-Fi network" + msgstr "使用網路選單來連線到 Wi-Fi 網路" + +-#: ../src/applet-device-wifi.c:1307 ++#: ../src/applet-device-wifi.c:1308 + #, fuzzy, c-format + msgid "You are now connected to the Wi-Fi network “%s”." + msgstr "您現在已連線至 Wi-Fi 網路「%s」。" + +-#: ../src/applet-device-wifi.c:1342 ++#: ../src/applet-device-wifi.c:1343 + #, fuzzy, c-format + msgid "Preparing Wi-Fi network connection “%s”…" + msgstr "正在準備 Wi-Fi 網路連線「%s」…" + +-#: ../src/applet-device-wifi.c:1345 ++#: ../src/applet-device-wifi.c:1346 + #, fuzzy, c-format + msgid "Configuring Wi-Fi network connection “%s”…" + msgstr "正在設定 Wi-Fi 網路連線「%s」…" + +-#: ../src/applet-device-wifi.c:1348 ++#: ../src/applet-device-wifi.c:1349 + #, fuzzy, c-format + msgid "User authentication required for Wi-Fi network “%s”…" + msgstr "Wi-Fi 網路連線「%s」需要使用者驗證…" + +-#: ../src/applet-device-wifi.c:1351 ++#: ../src/applet-device-wifi.c:1352 + #, fuzzy, c-format + msgid "Requesting a Wi-Fi network address for “%s”…" + msgstr "正在要求提供「%s」的 Wi-Fi 網路位址…" + +-#: ../src/applet-device-wifi.c:1362 ++#: ../src/applet-device-wifi.c:1363 + #, fuzzy, c-format + msgid "Wi-Fi network connection “%s” active: %s (%d%%)" + msgstr "Wi-Fi 網路連線「%s」在使用中： %s (%d%%)" + +-#: ../src/applet-device-wifi.c:1366 ++#: ../src/applet-device-wifi.c:1367 + #, fuzzy, c-format + msgid "Wi-Fi network connection “%s” active" + msgstr "Wi-Fi 網路連線「%s」在使用中" + +-#: ../src/applet-device-wifi.c:1385 ++#: ../src/applet-device-wifi.c:1386 + msgid "Failed to activate connection" + msgstr "無法使用連線" + +@@ -763,227 +788,227 @@ msgstr "無法使用連線" + msgid "Error displaying connection information:" + msgstr "顯示連線資訊發生錯誤：" + +-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379 ++#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381 + #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948 + #: ../src/wireless-security/wireless-security.c:448 + msgid "LEAP" + msgstr "LEAP" + +-#: ../src/applet-dialogs.c:74 ++#: ../src/applet-dialogs.c:75 + msgid "Dynamic WEP" + msgstr "動態 WEP" + +-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228 +-#: ../src/applet-dialogs.c:230 ++#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229 ++#: ../src/applet-dialogs.c:231 + msgid "WPA/WPA2" + msgstr "WPA/WPA2" + + #. Create the expander +-#: ../src/applet-dialogs.c:151 ++#: ../src/applet-dialogs.c:152 + #, fuzzy + msgid "More addresses" + msgstr "地址" + +-#: ../src/applet-dialogs.c:226 ++#: ../src/applet-dialogs.c:227 + msgid "WEP" + msgstr "WEP" + +-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243 +-#: ../src/connection-editor/page-wifi-security.c:330 ++#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244 ++#: ../src/connection-editor/page-wifi-security.c:332 + msgctxt "Wi-Fi/Ethernet security" + msgid "None" + msgstr "沒有" + +-#: ../src/applet-dialogs.c:260 ++#: ../src/applet-dialogs.c:261 + #, c-format + msgid "%s (default)" + msgstr "%s (預設值)" + +-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580 ++#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581 + #, c-format + msgid "%u Mb/s" + msgstr "%u Mb/s" + +-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582 ++#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583 + msgctxt "Speed" + msgid "Unknown" + msgstr "不明" + + #. Address +-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368 ++#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369 + msgctxt "Address" + msgid "Unknown" + msgstr "不明" + +-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420 ++#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421 + msgid "IP Address:" + msgstr "IP 位址：" + +-#: ../src/applet-dialogs.c:369 ++#: ../src/applet-dialogs.c:370 + msgid "Broadcast Address:" + msgstr "廣播位址：" + + #. Prefix +-#: ../src/applet-dialogs.c:381 ++#: ../src/applet-dialogs.c:382 + msgctxt "Subnet Mask" + msgid "Unknown" + msgstr "不明" + +-#: ../src/applet-dialogs.c:382 ++#: ../src/applet-dialogs.c:383 + msgid "Subnet Mask:" + msgstr "子網路遮罩：" + +-#: ../src/applet-dialogs.c:492 ++#: ../src/applet-dialogs.c:493 + #, c-format + msgid "Ethernet (%s)" + msgstr "乙太網路 (%s)" + +-#: ../src/applet-dialogs.c:495 ++#: ../src/applet-dialogs.c:496 + #, c-format + msgid "802.11 WiFi (%s)" + msgstr "802.11 WiFi (%s)" + +-#: ../src/applet-dialogs.c:502 ++#: ../src/applet-dialogs.c:503 + #, c-format + msgid "GSM (%s)" + msgstr "GSM (%s)" + +-#: ../src/applet-dialogs.c:504 ++#: ../src/applet-dialogs.c:505 + #, c-format + msgid "CDMA (%s)" + msgstr "CDMA (%s)" + + #. --- General --- +-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810 ++#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811 + #: ../src/connection-editor/ce-page-team-port.ui.h:23 + #: ../src/connection-editor/ce-page-team.ui.h:48 + #: ../src/connection-editor/page-general.c:367 + msgid "General" + msgstr "一般" + +-#: ../src/applet-dialogs.c:516 ++#: ../src/applet-dialogs.c:517 + msgid "Interface:" + msgstr "介面：" + +-#: ../src/applet-dialogs.c:536 ++#: ../src/applet-dialogs.c:537 + msgid "Hardware Address:" + msgstr "硬體位址：" + + #. Driver +-#: ../src/applet-dialogs.c:550 ++#: ../src/applet-dialogs.c:551 + msgid "Driver:" + msgstr "驅動程式：" + +-#: ../src/applet-dialogs.c:585 ++#: ../src/applet-dialogs.c:586 + msgid "Speed:" + msgstr "速度：" + +-#: ../src/applet-dialogs.c:600 ++#: ../src/applet-dialogs.c:601 + msgid "Security:" + msgstr "安全性：" + + #. --- IPv4 --- +-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851 ++#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852 + #: ../src/connection-editor/ce-page-team.ui.h:29 + msgid "IPv4" + msgstr "IPv4" + +-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689 ++#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690 + msgid "Default Route:" + msgstr "預設路由：" + + #. --- IPv6 --- +-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873 ++#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874 + #: ../src/connection-editor/ce-page-team.ui.h:30 + msgid "IPv6" + msgstr "IPv6" + +-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882 ++#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883 + msgid "Ignored" + msgstr "已忽略" + +-#: ../src/applet-dialogs.c:815 ++#: ../src/applet-dialogs.c:816 + msgid "VPN Type:" + msgstr "VPN 類型：" + +-#: ../src/applet-dialogs.c:822 ++#: ../src/applet-dialogs.c:823 + msgid "VPN Gateway:" + msgstr "VPN 閘道器：" + +-#: ../src/applet-dialogs.c:828 ++#: ../src/applet-dialogs.c:829 + msgid "VPN Username:" + msgstr "VPN 使用者名稱：" + +-#: ../src/applet-dialogs.c:834 ++#: ../src/applet-dialogs.c:835 + msgid "VPN Banner:" + msgstr "VPN 旗幟：" + +-#: ../src/applet-dialogs.c:840 ++#: ../src/applet-dialogs.c:841 + msgid "Base Connection:" + msgstr "基礎連線：" + +-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343 ++#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343 + msgid "Unknown" + msgstr "不明" + + #. Shouldn't really happen but ... +-#: ../src/applet-dialogs.c:957 ++#: ../src/applet-dialogs.c:958 + msgid "No valid active connections found!" + msgstr "找不到有效的使用中連線！" + +-#: ../src/applet-dialogs.c:985 +-#, fuzzy ++#: ../src/applet-dialogs.c:1007 + msgid "" +-"Copyright © 2004-2014 Red Hat, Inc.\n" ++"Copyright © 2004-2017 Red Hat, Inc.\n" + "Copyright © 2005-2008 Novell, Inc.\n" + "and many other community contributors and translators" + msgstr "" +-"Copyright © 2004-2011 Red Hat, Inc.\n" +-"Copyright © 2005-2008 Novell, Inc.\n" +-"與許多其他社群貢獻者與翻譯者" + +-#: ../src/applet-dialogs.c:988 ++#: ../src/applet-dialogs.c:1010 + msgid "" + "Notification area applet for managing your network devices and connections." + msgstr "用來管理您的網路裝置與連線的通知區面板程式。" + +-#: ../src/applet-dialogs.c:990 ++#: ../src/applet-dialogs.c:1012 + msgid "NetworkManager Website" + msgstr "NetworkManager 網站" + +-#: ../src/applet-dialogs.c:1001 ++#: ../src/applet-dialogs.c:1016 ++msgid "translator-credits" ++msgstr "" ++ ++#: ../src/applet-dialogs.c:1026 + msgid "" + "The NetworkManager Applet could not find some required resources (the .ui " + "file was not found)." + msgstr "NetworkManager 面板程式無法找到一些需要的資源（找不到 .ui 檔）。" + +-#: ../src/applet-dialogs.c:1006 ++#: ../src/applet-dialogs.c:1031 + msgid "Missing resources" + msgstr "遺失資源" + +-#: ../src/applet-dialogs.c:1031 ++#: ../src/applet-dialogs.c:1057 + msgid "Mobile broadband network password" + msgstr "行動寬頻網路密碼" + +-#: ../src/applet-dialogs.c:1040 ++#: ../src/applet-dialogs.c:1066 + #, fuzzy, c-format + msgid "A password is required to connect to “%s”." + msgstr "連線至「%s」需要密碼。" + +-#: ../src/applet-dialogs.c:1055 ++#: ../src/applet-dialogs.c:1081 + msgid "Password:" + msgstr "密碼：" + +-#: ../src/applet-dialogs.c:1337 ++#: ../src/applet-dialogs.c:1363 + msgid "SIM PIN unlock required" + msgstr "需要解鎖 SIM PIN 碼" + +-#: ../src/applet-dialogs.c:1338 ++#: ../src/applet-dialogs.c:1364 + msgid "SIM PIN Unlock Required" + msgstr "需要解鎖 SIM PIN 碼" + + #. FIXME: some warning about # of times you can enter incorrect PIN +-#: ../src/applet-dialogs.c:1340 ++#: ../src/applet-dialogs.c:1366 + #, fuzzy, c-format + msgid "" + "The mobile broadband device “%s” requires a SIM PIN code before it can be " +@@ -991,25 +1016,25 @@ msgid "" + msgstr "要使用行動寬頻裝置「%s」之前，需要 SIM PIN 碼。" + + #. Translators: PIN code entry label +-#: ../src/applet-dialogs.c:1342 ++#: ../src/applet-dialogs.c:1368 + msgid "PIN code:" + msgstr "PIN 碼：" + + #. Translators: Show/obscure PIN checkbox label +-#: ../src/applet-dialogs.c:1346 ++#: ../src/applet-dialogs.c:1372 + msgid "Show PIN code" + msgstr "顯示 PIN 碼" + +-#: ../src/applet-dialogs.c:1348 ++#: ../src/applet-dialogs.c:1374 + msgid "SIM PUK unlock required" + msgstr "需要解鎖 SIM PUK 碼" + +-#: ../src/applet-dialogs.c:1349 ++#: ../src/applet-dialogs.c:1375 + msgid "SIM PUK Unlock Required" + msgstr "需要解鎖 SIM PUK 碼" + + #. FIXME: some warning about # of times you can enter incorrect PUK +-#: ../src/applet-dialogs.c:1351 ++#: ../src/applet-dialogs.c:1377 + #, fuzzy, c-format + msgid "" + "The mobile broadband device “%s” requires a SIM PUK code before it can be " +@@ -1017,32 +1042,25 @@ msgid "" + msgstr "要使用行動寬頻裝置「%s」之前，需要 SIM PUK 碼。" + + #. Translators: PUK code entry label +-#: ../src/applet-dialogs.c:1353 ++#: ../src/applet-dialogs.c:1379 + msgid "PUK code:" + msgstr "PUK 碼：" + + #. Translators: New PIN entry label +-#: ../src/applet-dialogs.c:1356 ++#: ../src/applet-dialogs.c:1382 + msgid "New PIN code:" + msgstr "新的 PIN 碼：" + + #. Translators: New PIN verification entry label +-#: ../src/applet-dialogs.c:1358 ++#: ../src/applet-dialogs.c:1384 + msgid "Re-enter new PIN code:" + msgstr "重新輸入 PIN 碼：" + + #. Translators: Show/obscure PIN/PUK checkbox label +-#: ../src/applet-dialogs.c:1363 ++#: ../src/applet-dialogs.c:1389 + msgid "Show PIN/PUK codes" + msgstr "顯示 PIN/PUK 碼" + +-#: ../src/connection-editor/ce-ip4-routes.ui.h:2 +-#: ../src/connection-editor/ce-ip6-routes.ui.h:2 +-#: ../src/connection-editor/ce-page-dcb.ui.h:18 +-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2 +-msgid "_OK" +-msgstr "" +- + #: ../src/connection-editor/ce-ip4-routes.ui.h:3 + #: ../src/connection-editor/ce-ip6-routes.ui.h:3 + #: ../src/connection-editor/ce-page.h:114 +@@ -1057,21 +1075,21 @@ msgstr "用來在網路上區別您的電腦的 IP 位址。請按下「新增 + #: ../src/connection-editor/ce-page-bond.ui.h:12 + #: ../src/connection-editor/ce-page-bridge.ui.h:2 + #: ../src/connection-editor/ce-page-ip4.ui.h:7 +-#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++#: ../src/connection-editor/ce-page-ip6.ui.h:12 + #: ../src/connection-editor/ce-page-team.ui.h:13 +-#: ../src/connection-editor/nm-connection-editor.ui.h:3 ++#: ../src/connection-editor/nm-connection-list.ui.h:3 + msgid "_Add" + msgstr "" + +-#. Delete + #: ../src/connection-editor/ce-ip4-routes.ui.h:5 + #: ../src/connection-editor/ce-ip6-routes.ui.h:5 + #: ../src/connection-editor/ce-page-bond.ui.h:14 + #: ../src/connection-editor/ce-page-bridge.ui.h:4 + #: ../src/connection-editor/ce-page-ip4.ui.h:8 +-#: ../src/connection-editor/ce-page-ip6.ui.h:11 ++#: ../src/connection-editor/ce-page-ip6.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:15 +-#: ../src/connection-editor/nm-connection-list.c:711 ++#: ../src/connection-editor/connection-helpers.c:772 ++#: ../src/connection-editor/nm-connection-list.ui.h:4 + msgid "_Delete" + msgstr "刪除(_D)" + +@@ -1161,11 +1179,10 @@ msgstr "繫結的連線(_C)：" + msgid "M_ode:" + msgstr "模式(_O)：" + +-#. Edit + #: ../src/connection-editor/ce-page-bond.ui.h:13 + #: ../src/connection-editor/ce-page-bridge.ui.h:3 + #: ../src/connection-editor/ce-page-team.ui.h:14 +-#: ../src/connection-editor/nm-connection-list.c:695 ++#: ../src/connection-editor/nm-connection-list.ui.h:5 + msgid "_Edit" + msgstr "編輯(_E)" + +@@ -1218,7 +1235,7 @@ msgstr "主要介面的介面名稱。如果設定，這個裝置在可用時會 + + #: ../src/connection-editor/ce-page-bond.ui.h:25 + #: ../src/connection-editor/ce-page-ethernet.ui.h:17 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:4 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:8 + #: ../src/connection-editor/ce-page-team.ui.h:17 + #: ../src/connection-editor/ce-page-vlan.ui.h:4 + #: ../src/connection-editor/ce-page-wifi.ui.h:8 +@@ -1227,7 +1244,7 @@ msgstr "_MTU：" + + #: ../src/connection-editor/ce-page-bond.ui.h:26 + #: ../src/connection-editor/ce-page-ethernet.ui.h:18 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:3 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:7 + #: ../src/connection-editor/ce-page-team.ui.h:18 + #: ../src/connection-editor/ce-page-vlan.ui.h:5 + #: ../src/connection-editor/ce-page-wifi.ui.h:7 +@@ -1260,26 +1277,72 @@ msgid "_Hello time:" + msgstr "_Hello 時間：" + + #: ../src/connection-editor/ce-page-bridge.ui.h:9 ++msgid "STP forwarding delay, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:10 + msgid "s" + msgstr "秒" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:10 ++#: ../src/connection-editor/ce-page-bridge.ui.h:11 ++msgid "STP hello time, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:12 + #, fuzzy + msgid "Enable I_GMP snooping" + msgstr "啟用網路(_N)" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:11 ++#: ../src/connection-editor/ce-page-bridge.ui.h:13 ++msgid "" ++"Controls whether IGMP snooping is enabled for this bridge. Note that if " ++"snooping was automatically disabled due to hash collisions, the system may " ++"refuse to enable the feature until the collisions are resolved." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:14 + msgid "Enable _STP (Spanning Tree Protocol)" + msgstr "啟用 _STP (生成樹協議)" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:12 ++#: ../src/connection-editor/ce-page-bridge.ui.h:15 ++msgid "" ++"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:16 ++msgid "" ++"STP priority for this bridge. Lower values are “better”; the lowest priority " ++"bridge will be elected the root bridge." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:17 + msgid "_Max age:" + msgstr "最大時間(_M)：" + +-#: ../src/connection-editor/ce-page-bridge.ui.h:13 ++#: ../src/connection-editor/ce-page-bridge.ui.h:18 ++msgid "STP maximum message age, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:19 + msgid "_Aging time:" + msgstr "存續時間(_A)：" + ++#: ../src/connection-editor/ce-page-bridge.ui.h:20 ++msgid "The Ethernet MAC address aging time, in seconds" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:21 ++msgid "Group _forward mask:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-bridge.ui.h:22 ++msgid "" ++"A mask of 16 bits, each corresponding to a group address in the range from " ++"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask " ++"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause " ++"frames and LACP." ++msgstr "" ++ + #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112 + msgid "automatic" + msgstr "自動" +@@ -1539,10 +1602,20 @@ msgid "_Username:" + msgstr "使用者名稱(_U)：" + + #: ../src/connection-editor/ce-page-dsl.ui.h:2 ++msgid "Username used to authenticate with the PPPoE service." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:3 ++msgid "" ++"Only initiate sessions with access concentrators that provide the specified " ++"service. For most providers this should be left blank." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:4 + msgid "_Service:" + msgstr "服務(_S)：" + +-#: ../src/connection-editor/ce-page-dsl.ui.h:3 ++#: ../src/connection-editor/ce-page-dsl.ui.h:5 + #: ../src/wireless-security/eap-method-leap.ui.h:3 + #: ../src/wireless-security/eap-method-simple.ui.h:3 + #: ../src/wireless-security/ws-leap.ui.h:3 +@@ -1550,7 +1623,11 @@ msgstr "服務(_S)：" + msgid "Sho_w password" + msgstr "顯示密碼(_W)" + +-#: ../src/connection-editor/ce-page-dsl.ui.h:4 ++#: ../src/connection-editor/ce-page-dsl.ui.h:6 ++msgid "Password used to authenticate with the PPPoE service." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:7 + #: ../src/connection-editor/ce-page-mobile.ui.h:4 + #: ../src/libnma/nma-vpn-password-dialog.c:97 + #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97 +@@ -1561,13 +1638,29 @@ msgstr "顯示密碼(_W)" + msgid "_Password:" + msgstr "密碼(_P)：" + ++#: ../src/connection-editor/ce-page-dsl.ui.h:8 ++msgid "PPP _interface:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:9 ++msgid "P_arent interface:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:10 ++msgid "An arbitrary name to assign to the newly created PPP interface." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-dsl.ui.h:11 ++msgid "The interface on which the PPP connection will be established." ++msgstr "" ++ + #: ../src/connection-editor/ce-page-ethernet.ui.h:1 + #: ../src/connection-editor/ce-page-ip4.ui.h:1 + #: ../src/connection-editor/ce-page-ip6.ui.h:1 +-#: ../src/connection-editor/ce-page-proxy.ui.h:3 ++#: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-wifi.ui.h:1 + #: ../src/connection-editor/page-ip4.c:131 +-#: ../src/connection-editor/page-ip6.c:136 ++#: ../src/connection-editor/page-ip6.c:142 + #: ../src/wireless-security/eap-method-peap.ui.h:1 + msgid "Automatic" + msgstr "自動" +@@ -1613,7 +1706,7 @@ msgid "Full" + msgstr "" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:12 +-#: ../src/connection-editor/page-ip6.c:149 ++#: ../src/connection-editor/page-ip6.c:155 + msgid "Ignore" + msgstr "忽略" + +@@ -1621,7 +1714,7 @@ msgstr "忽略" + #: ../src/connection-editor/ce-page-ip4.ui.h:3 + #: ../src/connection-editor/ce-page-ip6.ui.h:3 + #: ../src/connection-editor/page-ip4.c:168 +-#: ../src/connection-editor/page-ip6.c:185 ++#: ../src/connection-editor/page-ip6.c:191 + msgid "Manual" + msgstr "手動" + +@@ -1630,7 +1723,7 @@ msgid "_Port:" + msgstr "連接埠(_P)：" + + #: ../src/connection-editor/ce-page-ethernet.ui.h:15 +-#: ../src/connection-editor/ce-page-infiniband.ui.h:2 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:6 + #: ../src/connection-editor/ce-page-wifi.ui.h:9 + #, fuzzy + msgid "_Device:" +@@ -1780,20 +1873,20 @@ msgstr "地址" + msgid "Address (optional)" + msgstr "" + +-#: ../src/connection-editor/ce-page-infiniband.ui.h:1 +-msgid "_Transport mode:" +-msgstr "傳輸模式(_T)：" +- + #. IP-over-InfiniBand "datagram mode" +-#: ../src/connection-editor/ce-page-infiniband.ui.h:6 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:2 + msgid "Datagram" + msgstr "Datagram" + + #. IP-over-InfiniBand "connected mode" +-#: ../src/connection-editor/ce-page-infiniband.ui.h:8 ++#: ../src/connection-editor/ce-page-infiniband.ui.h:4 + msgid "Connected" + msgstr "成功連線" + ++#: ../src/connection-editor/ce-page-infiniband.ui.h:5 ++msgid "_Transport mode:" ++msgstr "傳輸模式(_T)：" ++ + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1 + msgid "IPIP" + msgstr "" +@@ -1831,40 +1924,39 @@ msgid "VTI6" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10 +-#, fuzzy +-msgid "Device name" +-msgstr "裝置名稱 + 編號" ++#: ../src/connection-editor/ce-page-macsec.ui.h:6 ++msgid "Device name:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11 +-#, fuzzy +-msgid "Parent device" +-msgstr "有線網路" ++#: ../src/connection-editor/ce-page-macsec.ui.h:8 ++msgid "Parent device:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12 +-#, fuzzy +-msgid "Mode" +-msgstr "模式(_M)：" ++#: ../src/connection-editor/ce-page-macsec.ui.h:16 ++msgid "Mode:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13 +-msgid "Local IP" ++msgid "Local IP:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14 +-msgid "Remote IP" ++msgid "Remote IP:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15 +-msgid "Input key" ++msgid "Input key:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16 +-msgid "Output key" ++msgid "Output key:" + msgstr "" + + #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17 +-#, fuzzy +-msgid "MTU" +-msgstr "_MTU：" ++msgid "MTU:" ++msgstr "" + + #: ../src/connection-editor/ce-page-ip4.ui.h:2 + #: ../src/connection-editor/ce-page-ip6.ui.h:2 +@@ -1879,12 +1971,12 @@ msgstr "本機連線" + #: ../src/connection-editor/ce-page-ip4.ui.h:5 + #: ../src/connection-editor/ce-page-ip6.ui.h:5 + #: ../src/connection-editor/page-ip4.c:188 +-#: ../src/connection-editor/page-ip6.c:205 ++#: ../src/connection-editor/page-ip6.c:211 + msgid "Shared to other computers" + msgstr "分享給其他電腦" + + #: ../src/connection-editor/ce-page-ip4.ui.h:6 +-#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++#: ../src/connection-editor/ce-page-ip6.ui.h:11 + msgid "_Method:" + msgstr "方法(_M)：" + +@@ -1899,7 +1991,7 @@ msgstr "" + "別，請在此輸入。" + + #: ../src/connection-editor/ce-page-ip4.ui.h:10 +-#: ../src/connection-editor/ce-page-ip6.ui.h:12 ++#: ../src/connection-editor/ce-page-ip6.ui.h:14 + msgid "" + "Domains used when resolving host names. Use commas to separate multiple " + "domains." +@@ -1910,16 +2002,16 @@ msgid "D_HCP client ID:" + msgstr "D_HCP 用戶端 ID：" + + #: ../src/connection-editor/ce-page-ip4.ui.h:12 +-#: ../src/connection-editor/ce-page-ip6.ui.h:13 ++#: ../src/connection-editor/ce-page-ip6.ui.h:15 + #: ../src/connection-editor/page-ip4.c:372 +-#: ../src/connection-editor/page-ip6.c:335 ++#: ../src/connection-editor/page-ip6.c:346 + msgid "S_earch domains:" + msgstr "搜尋網域(_E)：" + + #: ../src/connection-editor/ce-page-ip4.ui.h:13 +-#: ../src/connection-editor/ce-page-ip6.ui.h:14 ++#: ../src/connection-editor/ce-page-ip6.ui.h:16 + #: ../src/connection-editor/page-ip4.c:363 +-#: ../src/connection-editor/page-ip6.c:326 ++#: ../src/connection-editor/page-ip6.c:337 + msgid "DNS ser_vers:" + msgstr "_DNS 伺服器：" + +@@ -1944,11 +2036,12 @@ msgstr "" + "許連線完成。" + + #: ../src/connection-editor/ce-page-ip4.ui.h:17 +-#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++#: ../src/connection-editor/ce-page-ip6.ui.h:22 + msgid "_Routes…" + msgstr "路由(_R)…" + + #: ../src/connection-editor/ce-page-ip6.ui.h:6 ++#: ../src/connection-editor/ce-page-macsec.ui.h:3 + #: ../src/connection-editor/page-ip4.c:198 + msgid "Disabled" + msgstr "已停用" +@@ -1961,7 +2054,15 @@ msgstr "啟用 (偏好公開位址)" + msgid "Enabled (prefer temporary address)" + msgstr "啟用 (偏好暫時位址)" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:15 ++#: ../src/connection-editor/ce-page-ip6.ui.h:9 ++msgid "EUI64" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:10 ++msgid "Stable privacy" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:17 + msgid "" + "IP addresses of domain name servers used to resolve host names. Use commas " + "to separate multiple domain name server addresses. Link-local addresses will " +@@ -1970,15 +2071,19 @@ msgstr "" + "網域名稱伺服器的 IP 位址，用來解析主機名稱。請使用逗號來分開多個網域伺服器的" + "位址。Link-local 位址會自動設定到連線中的介面。" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:16 ++#: ../src/connection-editor/ce-page-ip6.ui.h:18 + msgid "IPv6 _privacy extensions:" + msgstr "I_Pv6 隱私擴充功能：" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:17 ++#: ../src/connection-editor/ce-page-ip6.ui.h:19 ++msgid "IPv6 address _generation mode:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-ip6.ui.h:20 + msgid "Require IPv_6 addressing for this connection to complete" + msgstr "需要 IPv_6 addressing 才可完成此連線" + +-#: ../src/connection-editor/ce-page-ip6.ui.h:18 ++#: ../src/connection-editor/ce-page-ip6.ui.h:21 + msgid "" + "When connecting to IPv4-capable networks, allows the connection to complete " + "if IPv6 configuration fails but IPv4 configuration succeeds." +@@ -1986,6 +2091,94 @@ msgstr "" + "當連至可使用 IPv4 的網路時，若 IPv6 配置失敗，不過 IPv4 配置卻成功的話，請允" + "許連線完成。" + ++#: ../src/connection-editor/ce-page-macsec.ui.h:1 ++msgid "PSK" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:2 ++#: ../src/connection-editor/page-ppp.c:129 ++msgid "EAP" ++msgstr "EAP" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:4 ++msgid "Check" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:5 ++msgid "Strict" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:7 ++msgid "The name of the MACsec device." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:9 ++msgid "" ++"The parent interface name or parent connection UUID from which this MACSEC " ++"interface should be created." ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:10 ++msgid "" ++"The parent interface name or parent connection UUID from which this MACsec " ++"interface should be created" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:11 ++msgid " The pre-shared Connectivity-association Key Name" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:12 ++msgid "The pre-shared Connectivity Association Key" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:13 ++msgid "" ++"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key " ++"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X " ++"security page" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:14 ++msgid "CKN:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:15 ++msgid "CAK:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:17 ++msgid "Keys:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:18 ++msgid "Parameters:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:19 ++msgid "Validation:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:20 ++msgid "SCI port:" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:21 ++msgid "Specifies the validation mode for incoming frames" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:22 ++msgid "Encrypt" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:23 ++msgid "Whether the transmitted traffic must be encrypted" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-macsec.ui.h:24 ++msgid "The port component of the SCI (Secure Channel Identifier)" ++msgstr "" ++ + #: ../src/connection-editor/ce-page-mobile.ui.h:1 + #: ../src/connection-editor/ce-page-team.ui.h:26 + msgid "Basic" +@@ -2073,41 +2266,41 @@ msgid "Send PPP _echo packets" + msgstr "傳送 PPP _echo 封包" + + #: ../src/connection-editor/ce-page-proxy.ui.h:1 +-#, fuzzy +-msgid "Method:" +-msgstr "方法(_M)：" +- +-#: ../src/connection-editor/ce-page-proxy.ui.h:2 + #: ../src/connection-editor/ce-page-team.ui.h:25 + #, fuzzy + msgid "None" + msgstr "沒有" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:4 ++#: ../src/connection-editor/ce-page-proxy.ui.h:3 + msgid "For browser only" + msgstr "" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:5 ++#: ../src/connection-editor/ce-page-proxy.ui.h:4 + msgid "Use this proxy configuration for only browser clients/schemes." + msgstr "" + +-#: ../src/connection-editor/ce-page-proxy.ui.h:6 ++#: ../src/connection-editor/ce-page-proxy.ui.h:5 + msgid "PAC URL:" + msgstr "" + ++#: ../src/connection-editor/ce-page-proxy.ui.h:6 ++msgid "PAC script:" ++msgstr "" ++ + #: ../src/connection-editor/ce-page-proxy.ui.h:7 + msgid "URL from where the PAC script is to be obtained." + msgstr "" + + #: ../src/connection-editor/ce-page-proxy.ui.h:8 +-msgid "PAC script:" +-msgstr "" +- +-#: ../src/connection-editor/ce-page-proxy.ui.h:9 + #, fuzzy + msgid "Import script from a file…" + msgstr "從檔案匯入團隊組態(_I)…" + ++#: ../src/connection-editor/ce-page-proxy.ui.h:9 ++#, fuzzy ++msgid "Method:" ++msgstr "方法(_M)：" ++ + #: ../src/connection-editor/ce-page-team-port.ui.h:1 + #: ../src/connection-editor/ce-page-team.ui.h:19 + #, fuzzy +@@ -2155,76 +2348,76 @@ msgid "ID of queue which this port should be mapped to." + msgstr "" + + #: ../src/connection-editor/ce-page-team-port.ui.h:10 ++msgid "Active-Backup runner options" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-team-port.ui.h:11 + #, fuzzy + msgid "_Port priority:" + msgstr "優先順序(_P)：" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:11 +-msgid "Port _sticky" +-msgstr "" +- + #: ../src/connection-editor/ce-page-team-port.ui.h:12 +-#: ../src/connection-editor/ce-page-team.ui.h:82 +-msgid "" +-"Validate received ARP packets on active ports. If this is not checked, all " +-"incoming ARP packets will be considered as a good reply." +-msgstr "" +- +-#: ../src/connection-editor/ce-page-team-port.ui.h:13 + #: ../src/connection-editor/ce-page-team.ui.h:44 + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " + "bursts of notify-peer packets." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:14 ++#: ../src/connection-editor/ce-page-team-port.ui.h:13 + msgid "Port priority. The higher number means higher priority." + msgstr "" + ++#: ../src/connection-editor/ce-page-team-port.ui.h:14 ++msgid "Port _sticky" ++msgstr "" ++ + #: ../src/connection-editor/ce-page-team-port.ui.h:15 +-msgid "Active-Backup runner options" ++#: ../src/connection-editor/ce-page-team.ui.h:82 ++msgid "" ++"Validate received ARP packets on active ports. If this is not checked, all " ++"incoming ARP packets will be considered as a good reply." + msgstr "" + + #: ../src/connection-editor/ce-page-team-port.ui.h:16 ++msgid "LACP runner options" ++msgstr "" ++ ++#: ../src/connection-editor/ce-page-team-port.ui.h:17 + #, fuzzy + msgid "_LACP port priority:" + msgstr "優先順序(_P)：" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:17 ++#: ../src/connection-editor/ce-page-team-port.ui.h:18 + #, fuzzy + msgid "LACP port _key:" + msgstr "私密金鑰(_K)：" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:18 ++#: ../src/connection-editor/ce-page-team-port.ui.h:19 + #: ../src/connection-editor/ce-page-team.ui.h:43 + msgid "" + "Number of bursts of multicast group rejoin requests sent after port is " + "enabled or disabled." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:19 ++#: ../src/connection-editor/ce-page-team-port.ui.h:20 + msgid "" + "Port priority according to LACP standard. The lower number means higher " + "priority." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:20 ++#: ../src/connection-editor/ce-page-team-port.ui.h:21 + #: ../src/connection-editor/ce-page-team.ui.h:45 + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " + "bursts of multicast group rejoin requests." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:21 ++#: ../src/connection-editor/ce-page-team-port.ui.h:22 + msgid "" + "Port key according to LACP standard. It is only possible to aggregate ports " + "with the same key." + msgstr "" + +-#: ../src/connection-editor/ce-page-team-port.ui.h:22 +-msgid "LACP runner options" +-msgstr "" +- + #: ../src/connection-editor/ce-page-team-port.ui.h:24 + #: ../src/connection-editor/ce-page-team.ui.h:70 + msgid "_Link watcher:" +@@ -2417,14 +2610,14 @@ msgid "LACP" + msgstr "" + + #: ../src/connection-editor/ce-page-team.ui.h:27 +-#: ../src/connection-editor/connection-helpers.c:104 ++#: ../src/connection-editor/connection-helpers.c:105 + #: ../src/connection-editor/page-ethernet.c:351 + #: ../src/libnm-gtk/nm-ui-utils.c:321 + msgid "Ethernet" + msgstr "有線網路" + + #: ../src/connection-editor/ce-page-team.ui.h:28 +-#: ../src/connection-editor/connection-helpers.c:119 ++#: ../src/connection-editor/connection-helpers.c:120 + #: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339 + #: ../src/libnm-gtk/nm-ui-utils.c:583 + msgid "VLAN" +@@ -2686,6 +2879,7 @@ msgstr "波段(_D)：" + msgid "SS_ID:" + msgstr "SS_ID：" + ++#: ../src/connection-editor/ce-polkit.c:63 + #: ../src/connection-editor/ce-polkit-button.c:74 + msgid "No polkit authorization to perform the action" + msgstr "" +@@ -2743,58 +2937,63 @@ msgstr "" + "在大多數情況下，網路供應者的 PPP 伺服器會支援所有的驗證方法。如果連線失敗，請" + "嘗試停用某些方法的支援。" + +-#: ../src/connection-editor/connection-helpers.c:105 ++#: ../src/connection-editor/connection-helpers.c:106 + #: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323 + msgid "Wi-Fi" + msgstr "Wi-Fi" + +-#: ../src/connection-editor/connection-helpers.c:113 ++#: ../src/connection-editor/connection-helpers.c:114 + #: ../src/connection-editor/page-bluetooth.c:123 + #: ../src/libnm-gtk/nm-ui-utils.c:325 + msgid "Bluetooth" + msgstr "藍牙" + +-#: ../src/connection-editor/connection-helpers.c:114 +-#: ../src/connection-editor/page-dsl.c:127 +-msgid "DSL" +-msgstr "DSL" +- + #: ../src/connection-editor/connection-helpers.c:115 ++#: ../src/connection-editor/page-dsl.c:201 ++msgid "DSL/PPPoE" ++msgstr "" ++ ++#: ../src/connection-editor/connection-helpers.c:116 + #: ../src/connection-editor/page-infiniband.c:148 + #: ../src/libnm-gtk/nm-ui-utils.c:331 + msgid "InfiniBand" + msgstr "InfiniBand" + +-#: ../src/connection-editor/connection-helpers.c:116 ++#: ../src/connection-editor/connection-helpers.c:117 + #: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333 + #: ../src/libnm-gtk/nm-ui-utils.c:577 + msgid "Bond" + msgstr "繫結" + +-#: ../src/connection-editor/connection-helpers.c:117 +-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335 ++#: ../src/connection-editor/connection-helpers.c:118 ++#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335 + #: ../src/libnm-gtk/nm-ui-utils.c:579 + msgid "Team" + msgstr "團隊" + +-#: ../src/connection-editor/connection-helpers.c:118 +-#: ../src/connection-editor/page-bridge.c:212 ++#: ../src/connection-editor/connection-helpers.c:119 ++#: ../src/connection-editor/page-bridge.c:233 + #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581 + msgid "Bridge" + msgstr "橋接" + +-#: ../src/connection-editor/connection-helpers.c:120 ++#: ../src/connection-editor/connection-helpers.c:121 + #: ../src/connection-editor/page-ip-tunnel.c:176 + msgid "IP tunnel" + msgstr "" + + #: ../src/connection-editor/connection-helpers.c:122 +-#: ../src/connection-editor/connection-helpers.c:396 ++#: ../src/connection-editor/page-macsec.c:190 ++msgid "MACsec" ++msgstr "" ++ ++#: ../src/connection-editor/connection-helpers.c:124 ++#: ../src/connection-editor/connection-helpers.c:398 + #: ../src/connection-editor/page-vpn.c:96 + msgid "VPN" + msgstr "VPN" + +-#: ../src/connection-editor/connection-helpers.c:205 ++#: ../src/connection-editor/connection-helpers.c:207 + msgid "" + "The VPN plugin failed to import the VPN connection correctly\n" + "\n" +@@ -2804,11 +3003,11 @@ msgstr "" + "\n" + "錯誤：沒有 VPN 服務類型。" + +-#: ../src/connection-editor/connection-helpers.c:217 ++#: ../src/connection-editor/connection-helpers.c:219 + msgid "Cannot import VPN connection" + msgstr "無法匯入 VPN 網路連線" + +-#: ../src/connection-editor/connection-helpers.c:219 ++#: ../src/connection-editor/connection-helpers.c:221 + #, fuzzy, c-format + msgid "" + "The file “%s” could not be read or does not contain recognized VPN " +@@ -2820,47 +3019,54 @@ msgstr "" + "\n" + "錯誤：%s。" + +-#: ../src/connection-editor/connection-helpers.c:220 ++#: ../src/connection-editor/connection-helpers.c:222 + #, fuzzy + msgid "unknown error" + msgstr "不明的錯誤" + +-#: ../src/connection-editor/connection-helpers.c:303 ++#: ../src/connection-editor/connection-helpers.c:305 + #: ../src/connection-editor/page-proxy.c:118 + #: ../src/connection-editor/page-team.c:341 + #: ../src/connection-editor/page-team-port.c:203 + msgid "Select file to import" + msgstr "選擇要匯入的檔案" + +-#: ../src/connection-editor/connection-helpers.c:338 ++#: ../src/connection-editor/connection-helpers.c:309 ++#: ../src/connection-editor/page-proxy.c:122 ++#: ../src/connection-editor/page-team.c:345 ++#: ../src/connection-editor/page-team-port.c:207 ++msgid "_Open" ++msgstr "" ++ ++#: ../src/connection-editor/connection-helpers.c:340 + msgid "Hardware" + msgstr "硬體" + +-#: ../src/connection-editor/connection-helpers.c:365 ++#: ../src/connection-editor/connection-helpers.c:367 + msgid "Virtual" + msgstr "虛擬" + +-#: ../src/connection-editor/connection-helpers.c:514 + #: ../src/connection-editor/connection-helpers.c:516 ++#: ../src/connection-editor/connection-helpers.c:518 + #, fuzzy + msgid "Import a saved VPN configuration…" + msgstr "匯入已儲存的 VPN 組態…" + +-#: ../src/connection-editor/connection-helpers.c:546 ++#: ../src/connection-editor/connection-helpers.c:548 + msgid "" + "The connection editor dialog could not be initialized due to an unknown " + "error." + msgstr "由於不明的錯誤使連線編輯器對話盒無法初始化。" + +-#: ../src/connection-editor/connection-helpers.c:555 ++#: ../src/connection-editor/connection-helpers.c:557 + msgid "Could not create new connection" + msgstr "無法建立新連線" + +-#: ../src/connection-editor/connection-helpers.c:718 ++#: ../src/connection-editor/connection-helpers.c:720 + msgid "Connection delete failed" + msgstr "刪除連線失敗" + +-#: ../src/connection-editor/connection-helpers.c:766 ++#: ../src/connection-editor/connection-helpers.c:768 + #, c-format + msgid "Are you sure you wish to delete the connection %s?" + msgstr "您確定要刪除連線 %s ？" +@@ -2868,7 +3074,7 @@ msgstr "您確定要刪除連線 %s ？" + #: ../src/connection-editor/ip4-routes-dialog.c:697 + #: ../src/connection-editor/ip6-routes-dialog.c:718 + #: ../src/connection-editor/page-ip4.c:1136 +-#: ../src/connection-editor/page-ip6.c:1095 ++#: ../src/connection-editor/page-ip6.c:1118 + msgid "Address" + msgstr "地址" + +@@ -2880,7 +3086,7 @@ msgstr "網路遮罩" + #: ../src/connection-editor/ip4-routes-dialog.c:735 + #: ../src/connection-editor/ip6-routes-dialog.c:756 + #: ../src/connection-editor/page-ip4.c:1174 +-#: ../src/connection-editor/page-ip6.c:1133 ++#: ../src/connection-editor/page-ip6.c:1156 + msgid "Gateway" + msgstr "通訊閘" + +@@ -2890,227 +3096,240 @@ msgid "Metric" + msgstr "度量 (Metric)" + + #: ../src/connection-editor/ip6-routes-dialog.c:737 +-#: ../src/connection-editor/page-ip6.c:1114 ++#: ../src/connection-editor/page-ip6.c:1137 + msgid "Prefix" + msgstr "前綴" + +-#: ../src/connection-editor/nm-connection-editor.c:108 ++#: ../src/connection-editor/nm-connection-editor.c:109 + #, c-format + msgid "Editing %s" + msgstr "編輯 %s" + +-#: ../src/connection-editor/nm-connection-editor.c:112 ++#: ../src/connection-editor/nm-connection-editor.c:113 + msgid "Editing un-named connection" + msgstr "編輯未命名的連線" + +-#: ../src/connection-editor/nm-connection-editor.c:132 ++#: ../src/connection-editor/nm-connection-editor.c:133 + #, fuzzy + msgid "Missing connection name" + msgstr "連線名稱(_N)：" + +-#: ../src/connection-editor/nm-connection-editor.c:352 ++#: ../src/connection-editor/nm-connection-editor.c:353 + #, fuzzy + msgid "Editor initializing…" + msgstr "初始化編輯器時發生錯誤" + +-#: ../src/connection-editor/nm-connection-editor.c:359 +-#: ../src/connection-editor/nm-connection-list.c:408 ++#: ../src/connection-editor/nm-connection-editor.c:360 ++#: ../src/connection-editor/nm-connection-list.c:443 + #, fuzzy + msgid "Connection cannot be modified" + msgstr "新增連線失敗" + +-#: ../src/connection-editor/nm-connection-editor.c:374 ++#: ../src/connection-editor/nm-connection-editor.c:375 + #, c-format + msgid "Invalid setting %s: %s" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.c:450 ++#: ../src/connection-editor/nm-connection-editor.c:451 + msgid "" + "The connection editor could not find some required resources (the .ui file " + "was not found)." + msgstr "連線編輯器找不到一些需要的資源（找不到 .ui 檔）。" + +-#: ../src/connection-editor/nm-connection-editor.c:577 ++#: ../src/connection-editor/nm-connection-editor.c:578 ++#: ../src/connection-editor/vpn-helpers.c:213 + msgid "_Save" + msgstr "儲存(_S)" + +-#: ../src/connection-editor/nm-connection-editor.c:578 ++#: ../src/connection-editor/nm-connection-editor.c:579 + msgid "Save any changes made to this connection." + msgstr "儲存任何對這個連線進行的變更。" + +-#: ../src/connection-editor/nm-connection-editor.c:579 ++#: ../src/connection-editor/nm-connection-editor.c:580 + msgid "Authenticate to save this connection for all users of this machine." + msgstr "驗證以儲存這個連線給此電腦上的所有使用者。" + +-#: ../src/connection-editor/nm-connection-editor.c:595 ++#: ../src/connection-editor/nm-connection-editor.c:596 + msgid "Could not create connection" + msgstr "無法建立連線" + +-#: ../src/connection-editor/nm-connection-editor.c:595 ++#: ../src/connection-editor/nm-connection-editor.c:596 + msgid "Could not edit connection" + msgstr "無法編輯連線" + +-#: ../src/connection-editor/nm-connection-editor.c:597 ++#: ../src/connection-editor/nm-connection-editor.c:598 + msgid "Unknown error creating connection editor dialog." + msgstr "建立連線編輯器對話盒時發生不明錯誤。" + +-#: ../src/connection-editor/nm-connection-editor.c:738 ++#: ../src/connection-editor/nm-connection-editor.c:739 + msgid "" + "Warning: the connection contains some properties not supported by the " + "editor. They will be cleared upon save." + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.c:758 ++#: ../src/connection-editor/nm-connection-editor.c:759 + msgid "Error initializing editor" + msgstr "初始化編輯器時發生錯誤" + +-#: ../src/connection-editor/nm-connection-editor.c:1142 ++#: ../src/connection-editor/nm-connection-editor.c:1157 + msgid "Connection add failed" + msgstr "新增連線失敗" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2 +-msgid "_Close" +-msgstr "" +- +-#: ../src/connection-editor/nm-connection-editor.ui.h:4 ++#: ../src/connection-editor/nm-connection-editor.ui.h:1 + msgid "Fix" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:5 ++#: ../src/connection-editor/nm-connection-editor.ui.h:2 + #, fuzzy + msgid "" + "Security labels may prevent some files from being used with certificate " + "authentication." + msgstr "將這設為 True，以停用在 EAP 認證中關於 CA 證書的警告。" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:6 ++#: ../src/connection-editor/nm-connection-editor.ui.h:3 + msgid "Connection _name:" + msgstr "連線名稱(_N)：" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:7 ++#: ../src/connection-editor/nm-connection-editor.ui.h:4 + #, fuzzy + msgid "_Export…" + msgstr "匯出(_X)" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:9 ++#: ../src/connection-editor/nm-connection-editor.ui.h:6 + msgid "File Relabel" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:10 ++#: ../src/connection-editor/nm-connection-editor.ui.h:7 + msgid "_Relabel" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:11 ++#: ../src/connection-editor/nm-connection-editor.ui.h:8 + msgid "" + "The following files are not labelled for use with certificate " + "authentication. Do you wish to adjust the labels?" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:12 ++#: ../src/connection-editor/nm-connection-editor.ui.h:9 + msgid "Relabel" + msgstr "" + +-#: ../src/connection-editor/nm-connection-editor.ui.h:13 ++#: ../src/connection-editor/nm-connection-editor.ui.h:10 + msgid "Filename" + msgstr "" + +-#: ../src/connection-editor/nm-connection-list.c:127 ++#: ../src/connection-editor/nm-connection-list.c:151 + msgid "never" + msgstr "永不" + +-#: ../src/connection-editor/nm-connection-list.c:138 +-#: ../src/connection-editor/nm-connection-list.c:149 ++#: ../src/connection-editor/nm-connection-list.c:162 ++#: ../src/connection-editor/nm-connection-list.c:173 + msgid "now" + msgstr "現在" + + #. less than an hour ago +-#: ../src/connection-editor/nm-connection-list.c:156 ++#: ../src/connection-editor/nm-connection-list.c:180 + #, c-format + msgid "%d minute ago" + msgid_plural "%d minutes ago" + msgstr[0] "%d 分鐘以前" + +-#: ../src/connection-editor/nm-connection-list.c:160 ++#: ../src/connection-editor/nm-connection-list.c:184 + #, c-format + msgid "%d hour ago" + msgid_plural "%d hours ago" + msgstr[0] "%d 小時以前" + +-#: ../src/connection-editor/nm-connection-list.c:172 ++#: ../src/connection-editor/nm-connection-list.c:196 + #, c-format + msgid "%d day ago" + msgid_plural "%d days ago" + msgstr[0] "%d 天以前" + +-#: ../src/connection-editor/nm-connection-list.c:178 ++#: ../src/connection-editor/nm-connection-list.c:202 + #, c-format + msgid "%d month ago" + msgid_plural "%d months ago" + msgstr[0] "%d 個月以前" + +-#: ../src/connection-editor/nm-connection-list.c:182 ++#: ../src/connection-editor/nm-connection-list.c:206 + #, c-format + msgid "%d year ago" + msgid_plural "%d years ago" + msgstr[0] "%d 年以前" + +-#: ../src/connection-editor/nm-connection-list.c:635 ++#: ../src/connection-editor/nm-connection-list.c:445 ++msgid "Connection cannot be deleted" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:448 ++msgid "Select a connection to edit" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:450 ++msgid "Select a connection to delete" ++msgstr "" ++ ++#: ../src/connection-editor/nm-connection-list.c:785 + #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2 + msgid "Name" + msgstr "名稱" + +-#: ../src/connection-editor/nm-connection-list.c:648 ++#: ../src/connection-editor/nm-connection-list.c:798 + msgid "Last Used" + msgstr "最後使用的" + +-#: ../src/connection-editor/nm-connection-list.c:696 ++#: ../src/connection-editor/nm-connection-list.c:836 + msgid "Edit the selected connection" + msgstr "編輯選取的連線" + +-#: ../src/connection-editor/nm-connection-list.c:697 ++#: ../src/connection-editor/nm-connection-list.c:837 + msgid "Authenticate to edit the selected connection" + msgstr "驗證以編輯選取的連線" + +-#: ../src/connection-editor/nm-connection-list.c:712 ++#: ../src/connection-editor/nm-connection-list.c:842 + msgid "Delete the selected connection" + msgstr "刪除選取的連線" + +-#: ../src/connection-editor/nm-connection-list.c:713 ++#: ../src/connection-editor/nm-connection-list.c:843 + msgid "Authenticate to delete the selected connection" + msgstr "驗證以刪除選取的連線" + +-#: ../src/connection-editor/nm-connection-list.c:935 +-#: ../src/connection-editor/nm-connection-list.c:938 ++#: ../src/connection-editor/nm-connection-list.c:1048 ++#: ../src/connection-editor/nm-connection-list.c:1051 + msgid "Error creating connection" + msgstr "建立連線時發生錯誤" + +-#: ../src/connection-editor/nm-connection-list.c:936 ++#: ../src/connection-editor/nm-connection-list.c:1049 + msgid "No VPN plugins are installed." + msgstr "尚未安裝任何 VPN 外掛程式。" + +-#: ../src/connection-editor/nm-connection-list.c:939 ++#: ../src/connection-editor/nm-connection-list.c:1052 + #, fuzzy, c-format + msgid "Don’t know how to create “%s” connections" + msgstr "不知道如何建立「%s」連線" + +-#: ../src/connection-editor/nm-connection-list.c:970 ++#: ../src/connection-editor/nm-connection-list.c:1085 + msgid "Error editing connection" + msgstr "編輯連線時發生錯誤" + +-#: ../src/connection-editor/nm-connection-list.c:971 ++#: ../src/connection-editor/nm-connection-list.c:1086 + #, fuzzy, c-format + msgid "Did not find a connection with UUID “%s”" + msgstr "找不到 UUID「%s」的連線" + +-#: ../src/connection-editor/page-8021x-security.c:109 ++#: ../src/connection-editor/nm-connection-list.ui.h:2 ++msgid "Add a new connection" ++msgstr "" ++ ++#: ../src/connection-editor/page-8021x-security.c:116 + msgid "802.1X Security" + msgstr "802.1X 防護" + +-#: ../src/connection-editor/page-8021x-security.c:111 ++#: ../src/connection-editor/page-8021x-security.c:118 + msgid "Could not load 802.1X Security user interface." + msgstr "無法載入 802.1X 安全性使用者介面。" + +-#: ../src/connection-editor/page-8021x-security.c:125 ++#: ../src/connection-editor/page-8021x-security.c:132 + msgid "Use 802.1_X security for this connection" + msgstr "在這個連線使用 802.1_X 防護" + +@@ -3166,11 +3385,11 @@ msgstr "主要(_P):" + msgid "Bond connection %d" + msgstr "繫結的連線 %d" + +-#: ../src/connection-editor/page-bridge.c:215 ++#: ../src/connection-editor/page-bridge.c:236 + msgid "Could not load bridge user interface." + msgstr "無法載入橋接的使用者介面。" + +-#: ../src/connection-editor/page-bridge.c:317 ++#: ../src/connection-editor/page-bridge.c:352 + #, c-format + msgid "Bridge connection %d" + msgstr "橋接的連線 %d" +@@ -3194,11 +3413,15 @@ msgstr "DCB" + msgid "Could not load DCB user interface." + msgstr "無法載入 DCB 使用者介面。" + +-#: ../src/connection-editor/page-dsl.c:129 ++#: ../src/connection-editor/page-dsl.c:203 + msgid "Could not load DSL user interface." + msgstr "無法載入 DSL 使用者介面。" + +-#: ../src/connection-editor/page-dsl.c:219 ++#: ../src/connection-editor/page-dsl.c:298 ++msgid "missing parent interface" ++msgstr "" ++ ++#: ../src/connection-editor/page-dsl.c:343 + #, c-format + msgid "DSL connection %d" + msgstr "DSL 連線 %d" +@@ -3298,27 +3521,27 @@ msgid "IP tunnel connection %d" + msgstr "線網路連線 %d" + + #: ../src/connection-editor/page-ip4.c:127 +-#: ../src/connection-editor/page-ip6.c:130 ++#: ../src/connection-editor/page-ip6.c:136 + msgid "Automatic (VPN)" + msgstr "自動 (VPN)" + + #: ../src/connection-editor/page-ip4.c:128 +-#: ../src/connection-editor/page-ip6.c:131 ++#: ../src/connection-editor/page-ip6.c:137 + msgid "Automatic (VPN) addresses only" + msgstr "只用自動 (VPN) 位址" + + #: ../src/connection-editor/page-ip4.c:132 +-#: ../src/connection-editor/page-ip6.c:137 ++#: ../src/connection-editor/page-ip6.c:143 + msgid "Automatic, addresses only" + msgstr "自動，僅限位址" + + #: ../src/connection-editor/page-ip4.c:134 +-#: ../src/connection-editor/page-ip6.c:133 ++#: ../src/connection-editor/page-ip6.c:139 + msgid "Automatic (PPPoE)" + msgstr "自動 (PPPoE)" + + #: ../src/connection-editor/page-ip4.c:135 +-#: ../src/connection-editor/page-ip6.c:134 ++#: ../src/connection-editor/page-ip6.c:140 + msgid "Automatic (PPPoE) addresses only" + msgstr "只用自動 (PPPoE) 位址" + +@@ -3331,17 +3554,17 @@ msgid "Automatic (DHCP) addresses only" + msgstr "只用自動 (DHCP) 位址" + + #: ../src/connection-editor/page-ip4.c:181 +-#: ../src/connection-editor/page-ip6.c:198 ++#: ../src/connection-editor/page-ip6.c:204 + msgid "Link-Local Only" + msgstr "只有本機連線" + + #: ../src/connection-editor/page-ip4.c:361 +-#: ../src/connection-editor/page-ip6.c:324 ++#: ../src/connection-editor/page-ip6.c:335 + msgid "Additional DNS ser_vers:" + msgstr "額外的 _DNS 伺服器：" + + #: ../src/connection-editor/page-ip4.c:370 +-#: ../src/connection-editor/page-ip6.c:333 ++#: ../src/connection-editor/page-ip6.c:344 + msgid "Additional s_earch domains:" + msgstr "額外的搜尋網域(_E)：" + +@@ -3378,43 +3601,52 @@ msgstr "" + msgid "IPv4 DNS server “%s” invalid" + msgstr "" + +-#: ../src/connection-editor/page-ip6.c:173 ++#: ../src/connection-editor/page-ip6.c:179 + msgid "Automatic, DHCP only" + msgstr "自動，僅使用 DHCP" + +-#: ../src/connection-editor/page-ip6.c:993 ++#: ../src/connection-editor/page-ip6.c:1016 + #, c-format + msgid "Editing IPv6 routes for %s" + msgstr "為 %s 編輯 IPv6 路由" + +-#: ../src/connection-editor/page-ip6.c:1184 ++#: ../src/connection-editor/page-ip6.c:1208 + msgid "IPv6 Settings" + msgstr "IPv6 設定" + +-#: ../src/connection-editor/page-ip6.c:1186 ++#: ../src/connection-editor/page-ip6.c:1210 + msgid "Could not load IPv6 user interface." + msgstr "無法載入 IPv6 使用者介面。" + +-#: ../src/connection-editor/page-ip6.c:1277 ++#: ../src/connection-editor/page-ip6.c:1302 + #, c-format + msgid "IPv6 address “%s” invalid" + msgstr "" + +-#: ../src/connection-editor/page-ip6.c:1285 ++#: ../src/connection-editor/page-ip6.c:1310 + #, c-format + msgid "IPv6 prefix “%s” invalid" + msgstr "" + +-#: ../src/connection-editor/page-ip6.c:1294 ++#: ../src/connection-editor/page-ip6.c:1319 + #, c-format + msgid "IPv6 gateway “%s” invalid" + msgstr "" + +-#: ../src/connection-editor/page-ip6.c:1336 ++#: ../src/connection-editor/page-ip6.c:1361 + #, c-format + msgid "IPv6 DNS server “%s” invalid" + msgstr "" + ++#: ../src/connection-editor/page-macsec.c:192 ++msgid "Could not load MACsec user interface." ++msgstr "" ++ ++#: ../src/connection-editor/page-macsec.c:331 ++#, c-format ++msgid "MACSEC connection %d" ++msgstr "" ++ + #: ../src/connection-editor/page-master.c:247 + #: ../src/connection-editor/page-master.c:258 + msgid "Duplicate slaves" +@@ -3468,38 +3700,34 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)" + msgstr "我的供應商使用 C_DMA 為主的技術（例如 1xRTT、EVDO）" + + #: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50 +-#: ../src/mobile-helpers.c:283 ++#: ../src/mobile-helpers.c:282 + msgid "CDMA" + msgstr "CDMA" + + #: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54 +-#: ../src/mobile-helpers.c:281 ++#: ../src/mobile-helpers.c:280 + msgid "GSM" + msgstr "GSM" + +-#: ../src/connection-editor/page-ppp.c:129 +-msgid "EAP" +-msgstr "EAP" +- + #: ../src/connection-editor/page-ppp.c:130 +-#: ../src/wireless-security/eap-method-ttls.c:260 ++#: ../src/wireless-security/eap-method-ttls.c:287 + msgid "PAP" + msgstr "PAP" + + #: ../src/connection-editor/page-ppp.c:131 +-#: ../src/wireless-security/eap-method-ttls.c:322 ++#: ../src/wireless-security/eap-method-ttls.c:349 + msgid "CHAP" + msgstr "CHAP" + + #: ../src/connection-editor/page-ppp.c:132 +-#: ../src/wireless-security/eap-method-fast.c:284 +-#: ../src/wireless-security/eap-method-peap.c:273 +-#: ../src/wireless-security/eap-method-ttls.c:290 ++#: ../src/wireless-security/eap-method-fast.c:282 ++#: ../src/wireless-security/eap-method-peap.c:299 ++#: ../src/wireless-security/eap-method-ttls.c:317 + msgid "MSCHAPv2" + msgstr "MSCHAPv2" + + #: ../src/connection-editor/page-ppp.c:133 +-#: ../src/wireless-security/eap-method-ttls.c:275 ++#: ../src/wireless-security/eap-method-ttls.c:302 + msgid "MSCHAP" + msgstr "MSCHAP" + +@@ -3536,11 +3764,11 @@ msgstr "無法載入繫結的使用者介面。" + msgid "Error: file doesn’t contain a valid JSON configuration" + msgstr "錯誤：檔案不含有效的 JSON 組態" + +-#: ../src/connection-editor/page-team.c:1156 ++#: ../src/connection-editor/page-team.c:1034 + msgid "Could not load team user interface." + msgstr "無法載入團隊使用者介面。" + +-#: ../src/connection-editor/page-team.c:1253 ++#: ../src/connection-editor/page-team.c:1131 + #, c-format + msgid "Team connection %d" + msgstr "團隊連線 %d" +@@ -3548,11 +3776,11 @@ msgstr "團隊連線 %d" + #. Translators: a "Team Port" is a network + #. * device that is part of a team. + #. +-#: ../src/connection-editor/page-team-port.c:732 ++#: ../src/connection-editor/page-team-port.c:655 + msgid "Team Port" + msgstr "團隊連接埠" + +-#: ../src/connection-editor/page-team-port.c:734 ++#: ../src/connection-editor/page-team-port.c:657 + msgid "Could not load team port user interface." + msgstr "無法載入團隊連接埠使用者介面。" + +@@ -3662,48 +3890,48 @@ msgstr "任何裝置" + msgid "Wi-Fi connection %d" + msgstr "Wi-Fi 連線 %d" + +-#: ../src/connection-editor/page-wifi-security.c:356 ++#: ../src/connection-editor/page-wifi-security.c:358 + #: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922 + msgid "WEP 40/128-bit Key (Hex or ASCII)" + msgstr "WEP 40/128-位元 金鑰 (Hex 或 ASCII)" + +-#: ../src/connection-editor/page-wifi-security.c:366 ++#: ../src/connection-editor/page-wifi-security.c:368 + #: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931 + msgid "WEP 128-bit Passphrase" + msgstr "WEP 128-位元 密語" + +-#: ../src/connection-editor/page-wifi-security.c:392 ++#: ../src/connection-editor/page-wifi-security.c:394 + msgid "Dynamic WEP (802.1X)" + msgstr "動態 WEP (802.1X)" + +-#: ../src/connection-editor/page-wifi-security.c:405 ++#: ../src/connection-editor/page-wifi-security.c:407 + #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975 + msgid "WPA & WPA2 Personal" + msgstr "WPA & WPA2 個人版" + +-#: ../src/connection-editor/page-wifi-security.c:418 ++#: ../src/connection-editor/page-wifi-security.c:420 + #: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989 + msgid "WPA & WPA2 Enterprise" + msgstr "WPA & WPA2 企業版" + +-#: ../src/connection-editor/page-wifi-security.c:461 ++#: ../src/connection-editor/page-wifi-security.c:463 + msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting." + msgstr "無法載入 Wi-Fi 安全性使用者介面；失去 Wi-Fi 設定值。" + +-#: ../src/connection-editor/page-wifi-security.c:472 ++#: ../src/connection-editor/page-wifi-security.c:474 + msgid "Wi-Fi Security" + msgstr "Wi-Fi 安全性" + +-#: ../src/connection-editor/page-wifi-security.c:474 ++#: ../src/connection-editor/page-wifi-security.c:476 + msgid "Could not load Wi-Fi security user interface." + msgstr "無法載入 Wi-Fi 安全性使用者介面。" + +-#: ../src/connection-editor/page-wifi-security.c:558 ++#: ../src/connection-editor/page-wifi-security.c:560 + #, c-format + msgid "missing SSID" + msgstr "" + +-#: ../src/connection-editor/page-wifi-security.c:564 ++#: ../src/connection-editor/page-wifi-security.c:566 + #, c-format + msgid "Security not compatible with Ad-Hoc mode" + msgstr "" +@@ -3754,35 +3982,39 @@ msgstr "自動解鎖這個裝置" + msgid "Connection Information" + msgstr "連線資訊" + ++#: ../src/info.ui.h:2 ++msgid "_Close" ++msgstr "" ++ + #: ../src/info.ui.h:3 + msgid "Active Network Connections" + msgstr "啟用網路連線" + + #: ../src/libnma/nma-file-cert-chooser.c:108 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:146 + #, fuzzy + msgid "No certificate set" + msgstr "不需要 CA 憑證(_R)" + + #: ../src/libnma/nma-file-cert-chooser.c:126 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:170 + msgid "No key set" + msgstr "" + + #: ../src/libnma/nma-file-cert-chooser.c:246 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:370 + #, fuzzy, c-format + msgid "Choose a key for %s Certificate" + msgstr "選擇 CA 憑證" + + #: ../src/libnma/nma-file-cert-chooser.c:250 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:374 + #, fuzzy, c-format + msgid "%s private _key:" + msgstr "私密金鑰(_K)：" + + #: ../src/libnma/nma-file-cert-chooser.c:254 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:378 + #, fuzzy, c-format + msgid "%s key _password:" + msgstr "私密金鑰密碼(_P)：" +@@ -3793,7 +4025,7 @@ msgid "Choose %s Certificate" + msgstr "選擇 CA 憑證" + + #: ../src/libnma/nma-file-cert-chooser.c:262 +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:386 + #, fuzzy, c-format + msgid "%s _certificate:" + msgstr "使用者憑證(_U)：" +@@ -3995,47 +4227,47 @@ msgstr "設定行動寬頻連線" + msgid "New Mobile Broadband Connection" + msgstr "新的行動寬頻連線" + +-#: ../src/libnma/nma-cert-chooser-button.c:162 ++#: ../src/libnma/nma-cert-chooser-button.c:165 + #, fuzzy + msgid "(None)" + msgstr "(無)" + +-#: ../src/libnma/nma-cert-chooser-button.c:170 ++#: ../src/libnma/nma-cert-chooser-button.c:173 + #, c-format + msgid "Key in %s" + msgstr "" + +-#: ../src/libnma/nma-cert-chooser-button.c:171 ++#: ../src/libnma/nma-cert-chooser-button.c:174 + #, fuzzy, c-format + msgid "Certificate in %s" + msgstr "C_A 憑證：" + +-#: ../src/libnma/nma-cert-chooser-button.c:190 ++#: ../src/libnma/nma-cert-chooser-button.c:193 + #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183 + #, fuzzy + msgid "(Unknown)" + msgstr "不明" + +-#: ../src/libnma/nma-cert-chooser-button.c:212 +-#: ../src/libnma/nma-cert-chooser-button.c:242 ++#: ../src/libnma/nma-cert-chooser-button.c:215 ++#: ../src/libnma/nma-cert-chooser-button.c:245 + msgid "Select" + msgstr "" + +-#: ../src/libnma/nma-cert-chooser-button.c:213 +-#: ../src/libnma/nma-cert-chooser-button.c:243 ++#: ../src/libnma/nma-cert-chooser-button.c:216 ++#: ../src/libnma/nma-cert-chooser-button.c:246 + msgid "Cancel" + msgstr "" + +-#: ../src/libnma/nma-cert-chooser-button.c:469 ++#: ../src/libnma/nma-cert-chooser-button.c:472 + msgid "Select from file…" + msgstr "" + +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:382 + #, fuzzy, c-format + msgid "Choose a %s Certificate" + msgstr "選擇 CA 憑證" + +-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384 ++#: ../src/libnma/nma-pkcs11-cert-chooser.c:390 + #, fuzzy, c-format + msgid "%s certificate _password:" + msgstr "使用者憑證(_U)：" +@@ -4102,8 +4334,8 @@ msgstr "第二密碼(_S)：" + msgid "_Tertiary Password:" + msgstr "第二密碼(_S)：" + +-#: ../src/libnma/nma-vpn-password-dialog.c:247 +-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247 ++#: ../src/libnma/nma-vpn-password-dialog.c:238 ++#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238 + msgid "Sh_ow passwords" + msgstr "顯示密碼(_O)" + +@@ -4132,45 +4364,45 @@ msgstr "沒有" + msgid "Dynamic WEP (802.1x)" + msgstr "動態 WEP (802.1X)" + +-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075 ++#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071 + msgid "C_reate" + msgstr "建立(_R)" + +-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161 ++#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150 + #, fuzzy, c-format + msgid "" + "Passwords or encryption keys are required to access the Wi-Fi network “%s”." + msgstr "需要密碼或是加密金鑰來存取 Wi-Fi 網路「%s」。" + +-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163 ++#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152 + msgid "Wi-Fi Network Authentication Required" + msgstr "Wi-Fi 網路連線需要驗證" + +-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165 ++#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154 + msgid "Authentication required by Wi-Fi network" + msgstr "Wi-Fi 網路連線需要驗證" + +-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170 ++#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159 + msgid "Create New Wi-Fi Network" + msgstr "建立新的 Wi-Fi 網路" + +-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172 ++#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161 + msgid "New Wi-Fi network" + msgstr "新的 Wi-Fi 網路" + +-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173 ++#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162 + msgid "Enter a name for the Wi-Fi network you wish to create." + msgstr "輸入您要建立的 Wi-Fi 網路的名稱。" + +-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175 ++#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164 + msgid "Connect to Hidden Wi-Fi Network" + msgstr "連接到隱藏的 Wi-Fi 網路" + +-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177 ++#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166 + msgid "Hidden Wi-Fi network" + msgstr "隱藏的 Wi-Fi 網路" + +-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178 ++#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167 + msgid "" + "Enter the name and security details of the hidden Wi-Fi network you wish to " + "connect to." +@@ -4320,25 +4552,25 @@ msgstr "漫遊網路（%s）" + msgid "Roaming network" + msgstr "漫遊網路" + +-#: ../src/mobile-helpers.c:331 ++#: ../src/mobile-helpers.c:330 + #, fuzzy, c-format + msgid "PIN code for SIM card “%s” on “%s”" + msgstr "SIM 卡「%s」在「%s」的 PIN 碼" + +-#: ../src/mobile-helpers.c:464 ++#: ../src/mobile-helpers.c:463 + msgid "PIN code required" + msgstr "需要 PIN 碼" + +-#: ../src/mobile-helpers.c:472 ++#: ../src/mobile-helpers.c:471 + msgid "PIN code is needed for the mobile broadband device" + msgstr "這個行動寬頻裝置需要 PIN 碼" + +-#: ../src/mobile-helpers.c:622 ++#: ../src/mobile-helpers.c:621 + #, fuzzy, c-format + msgid "Mobile broadband connection “%s” active: (%d%%%s%s)" + msgstr "行動寬頻連線「%s」在使用中：(%d%%%s%s)" + +-#: ../src/mobile-helpers.c:625 ++#: ../src/mobile-helpers.c:624 + msgid "roaming" + msgstr "漫遊" + +@@ -4348,12 +4580,12 @@ msgstr "漫遊" + msgid "%s connection" + msgstr "%s 連線" + +-#: ../src/utils/utils.c:563 ++#: ../src/utils/utils.c:565 + #, fuzzy + msgid "PEM certificates (*.pem, *.crt, *.cer)" + msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)" + +-#: ../src/utils/utils.c:575 ++#: ../src/utils/utils.c:577 + msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" + msgstr "DER、PEM 或是 PKCS#12 私人金鑰 (*.der, *.pem, *.p12, *.key)" + +@@ -4361,39 +4593,35 @@ msgstr "DER、PEM 或是 PKCS#12 私人金鑰 (*.der, *.pem, *.p12, *.key)" + msgid "undefined error in 802.1X security (wpa-eap)" + msgstr "" + +-#: ../src/wireless-security/eap-method.c:227 +-msgid "no file selected" +-msgstr "" +- +-#: ../src/wireless-security/eap-method.c:235 +-#, c-format +-msgid "file “%s” does not exist" +-msgstr "" ++#: ../src/wireless-security/eap-method.c:365 ++#, fuzzy ++msgid "no CA certificate selected" ++msgstr "不需要 CA 憑證(_R)" + +-#: ../src/wireless-security/eap-method.c:258 +-msgid "unspecified error validating eap-method file" ++#: ../src/wireless-security/eap-method.c:370 ++msgid "selected CA certificate file does not exist" + msgstr "" + +-#: ../src/wireless-security/eap-method-fast.c:73 ++#: ../src/wireless-security/eap-method-fast.c:71 + msgid "missing EAP-FAST PAC file" + msgstr "" + +-#: ../src/wireless-security/eap-method-fast.c:269 +-#: ../src/wireless-security/eap-method-peap.c:303 +-#: ../src/wireless-security/eap-method-ttls.c:352 ++#: ../src/wireless-security/eap-method-fast.c:267 ++#: ../src/wireless-security/eap-method-peap.c:329 ++#: ../src/wireless-security/eap-method-ttls.c:379 + msgid "GTC" + msgstr "GTC" + +-#: ../src/wireless-security/eap-method-fast.c:407 ++#: ../src/wireless-security/eap-method-fast.c:405 + #, fuzzy + msgid "Choose a PAC file" + msgstr "選擇一個 PAC 檔案…" + +-#: ../src/wireless-security/eap-method-fast.c:414 ++#: ../src/wireless-security/eap-method-fast.c:412 + msgid "PAC files (*.pac)" + msgstr "PAC 檔案 (*.pac)" + +-#: ../src/wireless-security/eap-method-fast.c:418 ++#: ../src/wireless-security/eap-method-fast.c:416 + msgid "All files" + msgstr "所有檔案" + +@@ -4411,7 +4639,7 @@ msgstr "兩者" + + #: ../src/wireless-security/eap-method-fast.ui.h:4 + #: ../src/wireless-security/eap-method-peap.ui.h:4 +-#: ../src/wireless-security/eap-method-ttls.ui.h:1 ++#: ../src/wireless-security/eap-method-ttls.ui.h:3 + msgid "Anony_mous identity:" + msgstr "匿名識別(_M)：" + +@@ -4421,7 +4649,7 @@ msgstr "PAC 檔案(_F)：" + + #: ../src/wireless-security/eap-method-fast.ui.h:6 + #: ../src/wireless-security/eap-method-peap.ui.h:7 +-#: ../src/wireless-security/eap-method-ttls.ui.h:4 ++#: ../src/wireless-security/eap-method-ttls.ui.h:1 + msgid "_Inner authentication:" + msgstr "內部驗證(_I)：" + +@@ -4437,27 +4665,12 @@ msgstr "" + msgid "missing EAP-LEAP password" + msgstr "" + +-#: ../src/wireless-security/eap-method-peap.c:64 +-#, c-format +-msgid "invalid EAP-PEAP CA certificate: %s" +-msgstr "" +- +-#: ../src/wireless-security/eap-method-peap.c:69 +-msgid "invalid EAP-PEAP CA certificate: no certificate specified" +-msgstr "" +- +-#: ../src/wireless-security/eap-method-peap.c:288 +-#: ../src/wireless-security/eap-method-ttls.c:337 ++#: ../src/wireless-security/eap-method-peap.c:314 ++#: ../src/wireless-security/eap-method-ttls.c:364 + #: ../src/wireless-security/wireless-security.c:424 + msgid "MD5" + msgstr "MD5" + +-#: ../src/wireless-security/eap-method-peap.c:382 +-#: ../src/wireless-security/eap-method-ttls.c:431 +-#, fuzzy +-msgid "Choose a Certificate Authority certificate" +-msgstr "選擇憑證授權單位 (CA) 憑證…" +- + #: ../src/wireless-security/eap-method-peap.ui.h:2 + msgid "Version 0" + msgstr "版本 0" +@@ -4467,20 +4680,27 @@ msgid "Version 1" + msgstr "版本 1" + + #: ../src/wireless-security/eap-method-peap.ui.h:5 +-#: ../src/wireless-security/eap-method-ttls.ui.h:2 +-msgid "C_A certificate:" +-msgstr "C_A 憑證：" +- +-#: ../src/wireless-security/eap-method-peap.ui.h:6 + #: ../src/wireless-security/eap-method-tls.ui.h:2 +-#: ../src/wireless-security/eap-method-ttls.ui.h:3 ++#: ../src/wireless-security/eap-method-ttls.ui.h:2 + msgid "No CA certificate is _required" + msgstr "不需要 CA 憑證(_R)" + +-#: ../src/wireless-security/eap-method-peap.ui.h:8 ++#: ../src/wireless-security/eap-method-peap.ui.h:6 + msgid "PEAP _version:" + msgstr "PEAP 版本(_V)：" + ++#: ../src/wireless-security/eap-method-peap.ui.h:8 ++#: ../src/wireless-security/eap-method-tls.ui.h:3 ++#: ../src/wireless-security/eap-method-ttls.ui.h:4 ++msgid "Suffix of the server certificate name." ++msgstr "" ++ ++#: ../src/wireless-security/eap-method-peap.ui.h:9 ++#: ../src/wireless-security/eap-method-tls.ui.h:4 ++#: ../src/wireless-security/eap-method-ttls.ui.h:5 ++msgid "_Domain:" ++msgstr "" ++ + #: ../src/wireless-security/eap-method-simple.c:75 + msgid "missing EAP username" + msgstr "" +@@ -4493,46 +4713,28 @@ msgstr "" + msgid "missing EAP-TLS identity" + msgstr "" + +-#: ../src/wireless-security/eap-method-tls.c:238 ++#: ../src/wireless-security/eap-method-tls.c:256 + #, fuzzy + msgid "no user certificate selected" + msgstr "不需要 CA 憑證(_R)" + +-#: ../src/wireless-security/eap-method-tls.c:243 ++#: ../src/wireless-security/eap-method-tls.c:261 + msgid "selected user certificate file does not exist" + msgstr "" + +-#: ../src/wireless-security/eap-method-tls.c:263 ++#: ../src/wireless-security/eap-method-tls.c:281 + msgid "no key selected" + msgstr "" + +-#: ../src/wireless-security/eap-method-tls.c:268 ++#: ../src/wireless-security/eap-method-tls.c:286 + msgid "selected key file does not exist" + msgstr "" + +-#: ../src/wireless-security/eap-method-tls.c:314 +-#, fuzzy +-msgid "no CA certificate selected" +-msgstr "不需要 CA 憑證(_R)" +- +-#: ../src/wireless-security/eap-method-tls.c:319 +-msgid "selected CA certificate file does not exist" +-msgstr "" +- + #: ../src/wireless-security/eap-method-tls.ui.h:1 + msgid "I_dentity:" + msgstr "識別(_D)：" + +-#: ../src/wireless-security/eap-method-ttls.c:64 +-#, c-format +-msgid "invalid EAP-TTLS CA certificate: %s" +-msgstr "" +- +-#: ../src/wireless-security/eap-method-ttls.c:69 +-msgid "invalid EAP-TTLS CA certificate: no certificate specified" +-msgstr "" +- +-#: ../src/wireless-security/eap-method-ttls.c:306 ++#: ../src/wireless-security/eap-method-ttls.c:333 + #, fuzzy + msgid "MSCHAPv2 (no EAP)" + msgstr "MSCHAPv2" +@@ -4606,17 +4808,17 @@ msgid "invalid wep-key: passphrase must be shorter than 64 characters" + msgstr "" + + #: ../src/wireless-security/ws-wep-key.ui.h:1 +-msgid "1 (Default)" +-msgstr "1 (預設值)" +- +-#: ../src/wireless-security/ws-wep-key.ui.h:2 + msgid "Open System" + msgstr "開放系統" + +-#: ../src/wireless-security/ws-wep-key.ui.h:3 ++#: ../src/wireless-security/ws-wep-key.ui.h:2 + msgid "Shared Key" + msgstr "共享金鑰" + ++#: ../src/wireless-security/ws-wep-key.ui.h:3 ++msgid "1 (Default)" ++msgstr "1 (預設值)" ++ + #: ../src/wireless-security/ws-wep-key.ui.h:4 + msgid "_Key:" + msgstr "金鑰(_K)：" +@@ -4643,618 +4845,3 @@ msgstr "" + #: ../src/wireless-security/ws-wpa-psk.ui.h:2 + msgid "_Type:" + msgstr "類型(_T)：" +- +-#, fuzzy +-#~ msgid "NetworkManager for GNOME" +-#~ msgstr "NetworkManager 面板程式" +- +-#~ msgid "" +-#~ "\n" +-#~ "The VPN connection '%s' disconnected because the VPN service stopped." +-#~ msgstr "" +-#~ "\n" +-#~ "VPN 連線「%s」失敗，因為 VPN 服務已停止。" +- +-#~ msgid "" +-#~ "\n" +-#~ "The VPN connection '%s' disconnected." +-#~ msgstr "" +-#~ "\n" +-#~ "VPN 連線「%s」已斷線。" +- +-#~ msgid "_Disconnect VPN" +-#~ msgstr "與 VPN 斷線(_D)" +- +-#~ msgid "New Mobile Broadband connection..." +-#~ msgstr "新的行動寬頻連線…" +- +-#~ msgid "_Connect to Hidden Wi-Fi Network..." +-#~ msgstr "連接到隱藏的 Wi-Fi 網路(_C)…" +- +-#~ msgid "Create _New Wi-Fi Network..." +-#~ msgstr "建立新的 Wi-Fi 網路(_N)…" +- +-#~ msgid " " +-#~ msgstr " " +- +-#~ msgid "0" +-#~ msgstr "0" +- +-#~ msgid "1" +-#~ msgstr "1" +- +-#~ msgid "2" +-#~ msgstr "2" +- +-#~ msgid "3" +-#~ msgstr "3" +- +-#~ msgid "4" +-#~ msgstr "4" +- +-#~ msgid "5" +-#~ msgstr "5" +- +-#~ msgid "6" +-#~ msgstr "6" +- +-#~ msgid "7" +-#~ msgstr "7" +- +-#~ msgid "15" +-#~ msgstr "15" +- +-#~ msgid "Aut_onegotiate" +-#~ msgstr "自動協議(_O)" +- +-#~ msgid "_Export..." +-#~ msgstr "匯出(_E)…" +- +-#~ msgid "FirewallD is not running." +-#~ msgstr "FirewallD 沒有執行。" +- +-#~ msgid "New..." +-#~ msgstr "新增…" +- +-#, fuzzy +-#~ msgid "invalid EAP-TLS CA certificate: %s" +-#~ msgstr "C_A 憑證：" +- +-#~ msgid "Unencrypted private keys are insecure" +-#~ msgstr "未加密的私密金鑰是不安全的" +- +-#~ msgid "" +-#~ "The selected private key does not appear to be protected by a password. " +-#~ "This could allow your security credentials to be compromised. Please " +-#~ "select a password-protected private key.\n" +-#~ "\n" +-#~ "(You can password-protect your private key with openssl)" +-#~ msgstr "" +-#~ "所選擇的私密金鑰似乎沒有密碼保護。 這可能會導致不安全的後果。請選擇用密碼" +-#~ "保護的私密金鑰。\n" +-#~ "\n" +-#~ "（您可以使用 openssl 來加密您的私密金鑰）" +- +-#~ msgid "Choose your personal certificate..." +-#~ msgstr "選擇您的個人憑證…" +- +-#~ msgid "Choose your private key..." +-#~ msgstr "選擇您的私密金鑰…" +- +-#~ msgid "Enable WiMA_X Mobile Broadband" +-#~ msgstr "啟用 WiMA_X 行動寬頻" +- +-#~ msgid "_Help" +-#~ msgstr "求助(_H)" +- +-#~ msgid "You are now connected to the bonded network." +-#~ msgstr "您現在已連線至繫結的網路。" +- +-#~ msgid "Preparing bond connection '%s'..." +-#~ msgstr "正在準備繫結的連線「%s」…" +- +-#~ msgid "Configuring bond connection '%s'..." +-#~ msgstr "正在設定繫結的連線「%s」…" +- +-#~ msgid "User authentication required for bond connection '%s'..." +-#~ msgstr "繫結的連線「%s」需要使用者驗證…" +- +-#~ msgid "Requesting address for '%s'..." +-#~ msgstr "正在要求「%s」的網路位址…" +- +-#~ msgid "Bond connection '%s' active" +-#~ msgstr "繫結的連線「%s」在使用中" +- +-#~ msgid "You are now connected to the bridged network." +-#~ msgstr "您現在已連線至橋接的網路。" +- +-#~ msgid "Preparing bridge connection '%s'..." +-#~ msgstr "正在準備橋接的網路連線「%s」…" +- +-#~ msgid "Configuring bridge connection '%s'..." +-#~ msgstr "正在設定橋接的網路連線「%s」…" +- +-#~ msgid "User authentication required for bridge connection '%s'..." +-#~ msgstr "橋接的連線「%s」需要使用者驗證…" +- +-#~ msgid "Bridge connection '%s' active" +-#~ msgstr "橋接的連線「%s」在使用中" +- +-#~ msgid "New Mobile Broadband (CDMA) connection..." +-#~ msgstr "新的行動寬頻 (CDMA) 連線…" +- +-#~ msgid "You are now connected to the CDMA network." +-#~ msgstr "您現在已連線至 CDMA 網路。" +- +-#~ msgid "CDMA network." +-#~ msgstr "CDMA 網路。" +- +-#~ msgid "New Mobile Broadband (GSM) connection..." +-#~ msgstr "新的行動寬頻 (GSM) 連線…" +- +-#~ msgid "You are now connected to the GSM network." +-#~ msgstr "您現在已連線至 GSM 網路。" +- +-#~ msgid "GSM network." +-#~ msgstr "GSM 網路。" +- +-#~ msgid "Auto InfiniBand" +-#~ msgstr "自動 InfiniBand" +- +-#~ msgid "InfiniBand Networks (%s)" +-#~ msgstr "InfiniBand 網路 (%s)" +- +-#~ msgid "InfiniBand Network (%s)" +-#~ msgstr "InfiniBand 網路 (%s)" +- +-#~ msgid "InfiniBand Networks" +-#~ msgstr "InfiniBand 網路" +- +-#~ msgid "InfiniBand Network" +-#~ msgstr "InfiniBand 網路" +- +-#~ msgid "You are now connected to the InfiniBand network." +-#~ msgstr "您現在已連線至 InfiniBand 網路。" +- +-#~ msgid "Preparing InfiniBand connection '%s'..." +-#~ msgstr "正在準備 InfiniBand 連線「%s」…" +- +-#~ msgid "Configuring InfiniBand connection '%s'..." +-#~ msgstr "正在設定 InfiniBand 連線「%s」…" +- +-#~ msgid "User authentication required for InfiniBand connection '%s'..." +-#~ msgstr "InfiniBand 連線「%s」需要使用者驗證…" +- +-#~ msgid "InfiniBand connection '%s' active" +-#~ msgstr "InfiniBand 連線「%s」在使用中" +- +-#~ msgid "You are now connected to the teamed network." +-#~ msgstr "您現在已連線至團隊網路。" +- +-#~ msgid "Preparing team connection '%s'..." +-#~ msgstr "正在準備團隊的網路連線「%s」…" +- +-#~ msgid "Configuring team connection '%s'..." +-#~ msgstr "正在設定團隊的網路連線「%s」…" +- +-#~ msgid "User authentication required for team connection '%s'..." +-#~ msgstr "團隊連線「%s」需要使用者驗證…" +- +-#~ msgid "Team connection '%s' active" +-#~ msgstr "團隊連線「%s」在使用中" +- +-#~ msgid "You are now connected to the VLAN." +-#~ msgstr "您現在已連線至 VLAN 網路。" +- +-#~ msgid "Preparing VLAN connection '%s'..." +-#~ msgstr "正在啟動 VLAN 連線「%s」…" +- +-#~ msgid "Configuring VLAN connection '%s'..." +-#~ msgstr "正在啟動 VLAN 連線「%s」…" +- +-#~ msgid "User authentication required for VLAN connection '%s'..." +-#~ msgstr "VLAN 連線「%s」需要使用者驗證…" +- +-#~ msgid "VLAN connection '%s' active" +-#~ msgstr "VLAN 連線「%s」在使用中" +- +-#~ msgid "WiMAX Mobile Broadband (%s)" +-#~ msgstr "WiMAX 行動寬頻 (%s)" +- +-#~ msgid "WiMAX Mobile Broadband" +-#~ msgstr "WiMAX 行動寬頻" +- +-#~ msgid "WiMAX is disabled" +-#~ msgstr "WiMAX 已停用" +- +-#~ msgid "WiMAX is disabled by hardware switch" +-#~ msgstr "WiMAX 已被硬體開關停用" +- +-#~ msgid "You are now connected to the WiMAX network." +-#~ msgstr "您現在已連線至 WiMAX 網路。" +- +-#~ msgid "%d dB" +-#~ msgstr "%d dB" +- +-#~ msgctxt "WiMAX CINR" +-#~ msgid "unknown" +-#~ msgstr "不明" +- +-#~ msgctxt "WiMAX Base Station ID" +-#~ msgid "unknown" +-#~ msgstr "不明" +- +-#~ msgid "WiMAX (%s)" +-#~ msgstr "WiMAX (%s)" +- +-#~ msgid "CINR:" +-#~ msgstr "CINR：" +- +-#~ msgid "BSID:" +-#~ msgstr "BSID：" +- +-#~ msgid "_Device MAC address:" +-#~ msgstr "裝置的 MAC 位址(_D)：" +- +-#~ msgid "Any" +-#~ msgstr "任何" +- +-#~ msgid "3G (UMTS/HSPA)" +-#~ msgstr "3G (UMTS/HSPA)" +- +-#~ msgid "2G (GPRS/EDGE)" +-#~ msgstr "2G (GPRS/EDGE)" +- +-#~ msgid "Prefer 3G (UMTS/HSPA)" +-#~ msgstr "偏好 3G (UMTS/HSPA)" +- +-#~ msgid "Prefer 2G (GPRS/EDGE)" +-#~ msgstr "偏好 2G (GPRS/EDGE)" +- +-#~ msgid "Prefer 4G (LTE)" +-#~ msgstr "偏好 4G (LTE)" +- +-#~ msgid "Use only 4G (LTE)" +-#~ msgstr "只使用 4G (LTE)" +- +-#~ msgid "I_mport team configuration from a file..." +-#~ msgstr "從檔案匯入團隊組態(_M)…" +- +-#~ msgid "Infrastructure" +-#~ msgstr "基礎架構" +- +-#~ msgid "WiMAX" +-#~ msgstr "WiMAX" +- +-#~ msgid "Error saving connection" +-#~ msgstr "儲存連線時錯誤" +- +-#~ msgid "The property '%s' / '%s' is invalid: %d" +-#~ msgstr "屬性「%s」/「%s」是無效的：%d" +- +-#~ msgid "Automatic (PPP)" +-#~ msgstr "自動 (PPP)" +- +-#~ msgid "Automatic (PPP) addresses only" +-#~ msgstr "只用自動 (PPP) 位址" +- +-#~ msgid "Could not load WiMAX user interface." +-#~ msgstr "無法載入 WiMAX 使用者介面。" +- +-#~ msgid "WiMAX connection %d" +-#~ msgstr "WiMAX 連線 %d" +- +-#~ msgid "" +-#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) " +-#~ "%s)." +-#~ msgstr "無法進行藍牙的配置（無法連至 D-Bus：(%s) %s）。" +- +-#~ msgid "" +-#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) " +-#~ "%s)." +-#~ msgstr "無法進行藍牙的配置（找不到 NetworkManager：(%s) %s）。" +- +-#~ msgid "Use your mobile phone as a network device (PAN/NAP)" +-#~ msgstr "使用手機作為網路裝置（PAN/NAP）" +- +-#~ msgid "Access the Internet using your mobile phone (DUN)" +-#~ msgstr "使用手機存取網際網路（DUN）" +- +-#~ msgid "Error: %s" +-#~ msgstr "錯誤：%s" +- +-#~ msgid "Failed to create DUN connection: %s" +-#~ msgstr "無法建立 DUN 連線：%s" +- +-#~ msgid "Your phone is now ready to use!" +-#~ msgstr "您的電話現在已經可以使用！" +- +-#~ msgid "Mobile wizard was canceled" +-#~ msgstr "行動精靈已經取消" +- +-#~ msgid "Unknown phone device type (not GSM or CDMA)" +-#~ msgstr "不明的電話裝置類型（非 GSM 或 CDMA）" +- +-#~ msgid "unknown modem type." +-#~ msgstr "不明的數據機類型。" +- +-#~ msgid "failed to connect to the phone." +-#~ msgstr "無法連線至電話。" +- +-#~ msgid "error getting bus connection" +-#~ msgstr "取得匯流排連線時發生錯誤" +- +-#~ msgid "unexpectedly disconnected from the phone." +-#~ msgstr "電話無預期離線。" +- +-#~ msgid "timed out detecting phone details." +-#~ msgstr "在時間內偵測不到電話的詳細資料。" +- +-#~ msgid "Detecting phone configuration..." +-#~ msgstr "偵測電話的配置…" +- +-#~ msgid "" +-#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-" +-#~ "Networking connection." +-#~ msgstr "預設的藍牙配接卡必須在設定撥接網路連線前啟用。" +- +-#~ msgid "Failed to create PAN connection: %s" +-#~ msgstr "無法建立 PAN 連線：%s" +- +-#~ msgid "%s Network" +-#~ msgstr "%s 網路" +- +-#~ msgid "Primary DNS:" +-#~ msgstr "主要 DNS：" +- +-#~ msgid "Secondary DNS:" +-#~ msgstr "次要 DNS：" +- +-#~ msgid "Ternary DNS:" +-#~ msgstr "第三 DNS：" +- +-#~ msgid "_Save..." +-#~ msgstr "儲存(_S)…" +- +-#~ msgid "_Edit..." +-#~ msgstr "編輯(_E)…" +- +-#~ msgid "_Delete..." +-#~ msgstr "刪除(_D)…" +- +-#~ msgid "No Certificate Authority certificate chosen" +-#~ msgstr "未選擇任何憑證授權單位 (CA) 憑證" +- +-#~ msgid "" +-#~ "Not using a Certificate Authority (CA) certificate can result in " +-#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +-#~ "a Certificate Authority certificate?" +-#~ msgstr "" +-#~ "不使用憑證中心 (CA) 的憑證會造成連線不安全、流氓 Wi-Fi 網路 (可能被竊取、" +-#~ "劫聽之意)。是否要選擇一個憑證中心的憑證？" +- +-#~ msgid "Yes" +-#~ msgstr "是" +- +-#~ msgid "Only on activation" +-#~ msgstr "只在生效時" +- +-#~ msgid "No" +-#~ msgstr "否" +- +-#~ msgid "ModemManager is not running" +-#~ msgstr "ModemManager 未有運行" +- +-#~ msgid "Connect _automatically" +-#~ msgstr "自動連線(_A)" +- +-#~ msgid "A_vailable to all users" +-#~ msgstr "所有使用者皆可用" +- +-#~ msgid "An unknown error occurred." +-#~ msgstr "發生不明的錯誤。" +- +-#~ msgid "Could not edit new connection" +-#~ msgstr "無法編輯新連線" +- +-#~ msgid "Wireless Networks (%s)" +-#~ msgstr "無線網路 (%s)" +- +-#~ msgid "Wireless Network (%s)" +-#~ msgstr "無線網路 (%s)" +- +-#~ msgid "Wireless Network" +-#~ msgid_plural "Wireless Networks" +-#~ msgstr[0] "無線網路" +- +-#~ msgid "wireless is disabled" +-#~ msgstr "無線網路已停用" +- +-#~ msgid "wireless is disabled by hardware switch" +-#~ msgstr "無線網路已被硬體開關停用" +- +-#~ msgid "Preparing wireless network connection '%s'..." +-#~ msgstr "正在準備無線網路連線「%s」…" +- +-#~ msgid "Configuring wireless network connection '%s'..." +-#~ msgstr "正在設定無線網路連線「%s」…" +- +-#~ msgid "Requesting a wireless network address for '%s'..." +-#~ msgstr "正在要求無線網路「%s」提供網路位址…" +- +-#~ msgid "Wireless network connection '%s' active" +-#~ msgstr "無線網路連線「%s」在使用中" +- +-#~ msgid "Could not load Wired Security security user interface." +-#~ msgstr "無法載入 Wired Security 安全使用者介面。" +- +-#~ msgid "Wireless" +-#~ msgstr "無線網路" +- +-#~ msgid "Wireless connection %d" +-#~ msgstr "無線網路連線 %d" +- +-#~ msgid "_Import" +-#~ msgstr "匯入(_I)" +- +-#~ msgid "Could not edit imported connection" +-#~ msgstr "無法編輯匯入的連線" +- +-#~ msgid "No VPN plugin available. Please install one to enable this button." +-#~ msgstr "沒有 VPN 外掛程式可用。請安裝其中一種以啟用這個按鈕。" +- +-#~ msgid "Don't know how to edit '%s' connections" +-#~ msgstr "不知道如何編輯「%s」連線" +- +-#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)." +-#~ msgstr "無法進行藍牙的配置（無法建立 D-Bus proxy）。" +- +-#~ msgid "_Security:" +-#~ msgstr "安全性(_S)：" +- +-#~ msgid "Disconnected - you are now offline" +-#~ msgstr "未連線 - 您現在是離線" +- +-#~ msgid "Wireless network" +-#~ msgstr "無線網路" +- +-#~ msgid "Ethernet network" +-#~ msgstr "乙太網路" +- +-#~ msgid "Modem network" +-#~ msgstr "數據機網路" +- +-#~ msgid "Mobile Broadband network" +-#~ msgstr "行動寬頻網路" +- +-#~ msgid "CDMA network" +-#~ msgstr "CDMA 網路" +- +-#~ msgid "Wired network" +-#~ msgstr "有線網路" +- +-#~ msgid "WiMAX network" +-#~ msgstr "WiMAX 網路" +- +-#~ msgid "Enter a name for the wireless network you wish to create." +-#~ msgstr "輸入您要建立的無線網路的名稱。" +- +-#~ msgid "New wireless network" +-#~ msgstr "新的無線網路" +- +-#~ msgid "Wired Network" +-#~ msgstr "有線網路" +- +-#~ msgid "Wired Networks" +-#~ msgstr "有線網路" +- +-#~ msgid "Enable _Wireless" +-#~ msgstr "啟用無線網路(_W)" +- +-#~ msgid "Create New Wireless Network" +-#~ msgstr "建立新的無線網路" +- +-#~ msgid "Wired network connection '%s' active" +-#~ msgstr "有線網路連線「%s」在使用中" +- +-#~ msgid "Wireless Networks Available" +-#~ msgstr "可用的無線網路" +- +-#~ msgid "Wireless network connection '%s' active: %s (%d%%)" +-#~ msgstr "無線網路連線「%s」在使用中： %s (%d%%)" +- +-#~ msgid "Could not load wired user interface." +-#~ msgstr "無法載入有線網路使用者介面。" +- +-#~ msgid "Could not load WiFi user interface." +-#~ msgstr "無法載入 WiFi 使用者介面。" +- +-#~ msgid "Could not load WiFi security user interface; missing WiFi setting." +-#~ msgstr "無法載入 WiFi 防護使用者介面；失去 WiFi 設定值。" +- +-#~ msgid "Could not load WiFi security user interface." +-#~ msgstr "無法載入 WiFi 防護使用者介面。" +- +-#~ msgid "Wireless Security" +-#~ msgstr "無線網路防護" +- +-#~ msgid "Error creating connection editor dialog." +-#~ msgstr "建立連線編輯器對話盒時發生錯誤。" +- +-#~ msgid "Wired 802.1X authentication" +-#~ msgstr "有線網路 802.1X 驗證" +- +-#~ msgid "" +-#~ "Passwords or encryption keys are required to access the wireless network " +-#~ "'%s'." +-#~ msgstr "需要密碼或是加密金鑰來存取無線網路「%s」。" +- +-#~ msgid "Wireless Network Authentication Required" +-#~ msgstr "無線網路驗證要求" +- +-#~ msgid "Authentication required by wireless network" +-#~ msgstr "無線網路所需要的驗證" +- +-#~ msgid "Connect to Hidden Wireless Network" +-#~ msgstr "連接到隱藏的無線網路" +- +-#~ msgid "Hidden wireless network" +-#~ msgstr "隱藏的無線網路" +- +-#~ msgid "" +-#~ "Enter the name and security details of the hidden wireless network you " +-#~ "wish to connect to." +-#~ msgstr "輸入您要連接的隱藏無線網路的名稱與安全性詳細資料。" +- +-#~ msgid "Wireless _adapter:" +-#~ msgstr "無線網路卡(_A)：" +- +-#~ msgid "" +-#~ "This option locks this connection to the wireless access point (AP) " +-#~ "specified by the BSSID entered here. Example: 00:11:22:33:44:55" +-#~ msgstr "" +-#~ "此選項會將此連線鎖定至在此所輸入的 BSSID 所指定的無限存取點（AP）。例如：" +-#~ "00:11:22:33:44:55" +- +-#~ msgid "_DNS servers:" +-#~ msgstr "_DNS 伺服器：" +- +-#~ msgid "Preparing wired network connection '%s'..." +-#~ msgstr "正在準備有線網路連線「%s」…" +- +-#~ msgid "User authentication required for wired network connection '%s'..." +-#~ msgstr "有線網路連線「%s」需要使用者驗證…" +- +-#~ msgid "Requesting a wired network address for '%s'..." +-#~ msgstr "正要求有線網路「%s」提供網路位址…" +- +-#~ msgid "_Connect to Hidden Wireless Network..." +-#~ msgstr "連接到隱藏的無線網路(_C)…" +- +-#~ msgid "Create _New Wireless Network..." +-#~ msgstr "建立新的無線網路(_N)…" +- +-#~ msgid "Use the network menu to connect to a wireless network" +-#~ msgstr "使用網路選單來連線到無線網路" +- +-#~ msgid "User authentication required for wireless network '%s'..." +-#~ msgstr "無線網路「%s」要求使用者驗證…" +- +-#~ msgid "" +-#~ "Not using a Certificate Authority (CA) certificate can result in " +-#~ "connections to insecure, rogue wireless networks. Would you like to " +-#~ "choose a Certificate Authority certificate?" +-#~ msgstr "" +-#~ "不使用憑證中心 (CA) 的憑證會造成連線不安全、流氓無線網路 (可能被竊取、劫聽" +-#~ "之意) 。是否要選擇一個憑證中心的憑證？" +- +-#~ msgid "" +-#~ "Set this to true to disable notifications when wireless networks are " +-#~ "available." +-#~ msgstr "將這設為 True，以停用有無線網路可用。" +- +-#~ msgid "Additional _DNS servers:" +-#~ msgstr "額外的 _DNS 伺服器：" +- +-#~ msgid "Wireless _security:" +-#~ msgstr "無線網路安全(_W)：" +-- +2.14.3 + diff --git a/SOURCES/nm-applet-no-notifications.patch b/SOURCES/nm-applet-no-notifications.patch new file mode 100644 index 0000000..be6b6bf --- /dev/null +++ b/SOURCES/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/SPECS/network-manager-applet.spec b/SPECS/network-manager-applet.spec new file mode 100644 index 0000000..8182a11 --- /dev/null +++ b/SPECS/network-manager-applet.spec @@ -0,0 +1,466 @@ +%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.6 +%global real_version 1.8.6 +%global release_version 2 + +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/1.8/%{name}-%{real_version}.tar.xz +Patch0: nm-applet-no-notifications.patch +Patch1: 0001-po-import-translations-rh1481187.patch + +Requires: NetworkManager >= %{nm_version} +Requires: NetworkManager-glib >= %{nm_version} +Requires: libnma%{?_isa} = %{version}-%{release} +Requires: libnotify >= 0.4.3 +Requires: gnome-icon-theme +Requires: nm-connection-editor = %{version}-%{release} + +BuildRequires: NetworkManager-devel >= %{nm_version} +BuildRequires: NetworkManager-glib-devel >= %{nm_version} +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: automake autoconf intltool libtool +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 + +%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 +Requires: NetworkManager-glib >= %{nm_version} +Requires: libnma%{?_isa} = %{version}-%{release} +Requires: gnome-icon-theme +Requires(post): /usr/bin/gtk-update-icon-cache + +%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-devel >= %{nm_version} +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}" +%patch0 -p1 +%patch1 -p1 + +%build +autoreconf -i -f +intltoolize --force +%configure \ + --with-gcr \ + --with-selinux \ + --disable-static \ + --enable-more-warnings=yes +make %{?_smp_mflags} + +%install +make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties + +%find_lang nm-applet +cat nm-applet.lang >> %{name}.lang + +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + +# 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 + + +%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 + +%post +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + +%post -n nm-connection-editor +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : + +%postun -n nm-connection-editor +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi +glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : + +%posttrans -n nm-connection-editor +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : + +%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 AUTHORS README 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}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml +%{_datadir}/appdata/nm-connection-editor.appdata.xml +%{_mandir}/man1/nm-connection-editor* +%dir %{_datadir}/gnome-vpn-properties + +%files -n libnm-gtk +%{_libdir}/libnm-gtk.so.* +%{_libdir}/girepository-1.0/NMGtk-1.0.typelib + +%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 + +%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 +* Tue Dec 12 2017 Lubomir Rintel - 1.8.6-2 +- po: import translations (rh #1481187) + +* Tue Nov 07 2017 Lubomir Rintel - 1.8.6-1 +- Update to 1.8.6 release (rh #1507020) + +* Tue Jun 6 2017 Beniamino Galvani - 1.8.0-3 +- editor: fix crash when destroying 802.1x page (rh #1458567) + +* Mon May 29 2017 Lubomir Rintel - 1.8.0-2 +- po: update Japanese translation (rh #1379642) + +* Wed May 10 2017 Thomas Haller - 1.8.0-1 +- Update to 1.8.0 release (rh #1441621) + +* Tue Mar 28 2017 Lubomir Rintel - 1.8.0-0.1.git20170326.f260f8a +- Update to network-manager-applet 1.8 snapshot +- c-e: add missing mnemonic characters to buttons (rh #1434317) +- c-e: fix handling of devices without permanent MAC address in devices combo box (rh #1380424) + +* Thu Sep 22 2016 Lubomir Rintel - 1.4.0-2 +- c-e: fix team page with older GTK and jansson (rh #1079465) + +* Wed Aug 24 2016 Lubomir Rintel - 1.4.0-1 +- Update to network-manager-applet 1.4.0 release +- c-e: add editor for teaming devices (rh #1079465) + +* Sat Aug 20 2016 Thomas Haller - 1.2.2-2 +- c-e: fix tab stop for Create button (rh#1339565) + +* Fri Jul 08 2016 Lubomir Rintel - 1.2.2-1 +- Update to network-manager-applet 1.2.2 release + +* Wed Apr 27 2016 Lubomir Rintel - 1.2.0-1 +- Update to network-manager-applet 1.2.0 release + +* Wed Mar 30 2016 Lubomir Rintel - 1.2.0-0.1.beta3 +- Rebase to 1.2-beta3 + +* Wed Sep 30 2015 Jiří Klimeš - 1.0.6-2 +- libnm-gtk: fix a possible crash on widgets destroy (rh #1267326) +- libnm-gtk: use symbolic icons for password store menu (rh #1267330) + +* Tue Jul 14 2015 Lubomir Rintel - 1.0.6-1 +- Align with the 1.0.6 upstream release: +- editor: add support for setting MTU on team connections (rh #1255927) +- editor: offer bond connections in vlan slave picker (rh #1255735) + +* Tue Jul 14 2015 Lubomir Rintel - 1.0.4-1 +- Align with the upstream release + +* Wed Jun 17 2015 Jiří Klimeš - 1.0.3-2.git20150617.a0b0166 +- New snapshot: +- editor: let users edit connection.interface-name property (rh #1139536) + +* Mon Jun 15 2015 Lubomir Rintel - 1.0.3-1.git20160615.28a0e28 +- New snapshot: +- applet: make new auto connections only available for current user (rh #1176042) +- editor: allow forcing always-on-top windows for installer (rh #1097883) +- editor: allow changing bond MTU (rh #1177582) +- editor: use ifname instead of UUID in slaves' master property (rh #1083186) +- editor: allow adding Bluetooth connections (rh #1229471) + +* Tue May 19 2015 Debarshi Ray - 1.0.0-3.git20150122.76569a46 +- Drop gnome-bluetooth BR because it does not work with newer versions (rh #1174547) + +* Thu Jan 22 2015 Dan Williams - 1.0.0-2.git20150122.76569a46 +- editor: fix IPoIB editing support (rh #1182560) + +* Fri Jan 9 2015 Dan Williams - 1.0.0-1 +- Update to 1.0 release + +* Tue Nov 25 2014 Dan Williams - 0.9.11.0-2.git20141125.b4973b85 +- New snapshot + +* Wed Nov 19 2014 Dan Williams - 0.9.11.0-1.git20141119.a06c7cd3 +- Update translations (rh #1081943) +- Allow creating master devices without slaves (rh #1075198) + +* Wed Mar 26 2014 Dan Winship - 0.9.9.0-15.git20140307 +- Make Bluetooth plugin work more than once (rh #1054212) + +* Thu Mar 20 2014 Dan Winship - 0.9.9.0-14.git20140307 +- Add ModemManager-glib-devel to BuildRequires to fix Bluetooth (rh #1054212) + +* Fri Mar 7 2014 Jiří Klimeš - 0.9.9.0-13.git20140307 +- Update to new git master snapshot +- connection-editor: allow VLANs/slaves of more device types (rh #1045203) +- connection-editor: add DCB configuration UI (bgo #711032) (rh #1068688) + +* Fri Jan 24 2014 Daniel Mach - 0.9.9.0-12.git20131212 +- Mass rebuild 2014-01-24 + +* Wed Jan 15 2014 Dan Winship - 0.9.9.0-11.git20131212 +- Fix keyboard activation of bridge priority field (rh #1036142) + +* Fri Dec 27 2013 Daniel Mach - 0.9.9.0-10.git20131212 +- Mass rebuild 2013-12-27 + +* Fri Dec 13 2013 Dan Williams - 0.9.9.0-9.git20131212 +- applet: fix crash if some resources were not available (rh #1034500) +- editor: default to user-saved secrets and allow changing secret storage (rh #879566) +- applet/editor: fix various Coverity-found defects (rh #1025894) + +* Fri Nov 8 2013 Dan Williams - 0.9.9.0-8.git20131108 +- editor: improve handling of NPAR/SRIOV devices in bonds (rh #804527) +- editor: allow creating bridge masters without slaves + +* Fri Oct 11 2013 Dan Williams - 0.9.9.0-7.git20131011 +- editor: add support for Team devices (rh #1003646) +- editor: don't use deprecated WEP40 and WEP104 values for pairwise (rh #1005171) +- editor: add 'primary' option for bond interfaces (rh #1013727) +- editor: dis-allow IPv6 scopes in DNS server entry (rh #962449) + +* 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 +