[network-manager-applet] po: update-po of some languages
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] po: update-po of some languages
- Date: Wed, 20 Feb 2019 17:58:54 +0000 (UTC)
commit b26924097d89154546b012653d9afdc8968b1614
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Wed Feb 20 18:32:40 2019 +0100
po: update-po of some languages
This is so that subsequent patch looks sensible.
po/de.po | 267 +++++----
po/es.po | 86 ++-
po/ja.po | 1724 ++++++++++++++++++++++++++++++++++-------------------------
po/ko.po | 1693 +++++++++++++++++++++++++++++++--------------------------
po/ru.po | 264 +++++----
po/zh_CN.po | 1691 +++++++++++++++++++++++++++++++--------------------------
po/zh_TW.po | 1685 ++++++++++++++++++++++++++++++++-------------------------
7 files changed, 4153 insertions(+), 3257 deletions(-)
---
diff --git a/po/de.po b/po/de.po
index 5f26c19a..30f7f926 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,9 +22,8 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2018-08-20 08:21+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-02-20 18:18+0100\n"
"PO-Revision-Date: 2018-08-25 23:06+0200\n"
"Last-Translator: Mario Blättermann <mario blaettermann gmail com>\n"
"Language-Team: Deutsch <gnome-de gnome org>\n"
@@ -44,9 +43,9 @@ msgid "Manage your network connections"
msgstr "Verwaltung der Netzwerkverbindungen"
#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "Netzwerkverbindungen"
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Rohkonfiguration"
#: ../nm-connection-editor.desktop.in.h:2
msgid "Manage and change your network connection settings"
@@ -236,13 +235,13 @@ msgstr "802.1X-Legitimierung"
#: ../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.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1062
+#: ../src/libnma/nma-wifi-dialog.c:1104
#: ../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 "A_bbrechen"
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1068
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1110
#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
msgid "C_onnect"
msgstr "_Verbinden"
@@ -832,8 +831,8 @@ msgid "Error displaying connection information:"
msgstr "Die Verbindungsinformationen konnten nicht angezeigt werden:"
#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
-#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:448
+#: ../src/libnma/nma-wifi-dialog.c:972 ../src/libnm-gtk/nm-wifi-dialog.c:948
+#: ../src/wireless-security/wireless-security.c:449
msgid "LEAP"
msgstr "LEAP"
@@ -1700,6 +1699,7 @@ msgid "_Service"
msgstr "_Dienst"
#: ../src/connection-editor/ce-page-dsl.ui.h:5
+#: ../src/libnma/nma-file-cert-chooser.c:347
#: ../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
@@ -2369,6 +2369,7 @@ msgid "Allow _roaming if home network is not available"
msgstr "_Roaming erlauben, falls das Heimnetzwerk nicht verfügbar ist"
#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:454
msgid "Sho_w passwords"
msgstr "Pass_wörter anzeigen"
@@ -2527,13 +2528,8 @@ msgid "Port _sticky"
msgstr "_Klebriger Port"
#: ../src/connection-editor/ce-page-team-port.ui.h:15
-#: ../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."
+msgid "Do not unselect the port if a better one becomes available."
msgstr ""
-"Auf aktiven Ports erhaltene ARP-Pakete prüfen. Falls nicht angewählt, werden "
-"alle eingehenden ARP-Pakete als valide Antwort eingestuft."
#: ../src/connection-editor/ce-page-team-port.ui.h:16
msgid "LACP runner options"
@@ -2654,11 +2650,20 @@ msgid "Ignore invalid packets from _active ports"
msgstr "Ungültige Pakete _aktiver Ports ignorieren"
#: ../src/connection-editor/ce-page-team-port.ui.h:36
+#: ../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 ""
+"Auf aktiven Ports erhaltene ARP-Pakete prüfen. Falls nicht angewählt, werden "
+"alle eingehenden ARP-Pakete als valide Antwort eingestuft."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:37
#: ../src/connection-editor/ce-page-team.ui.h:83
msgid "Ignore invalid packets from i_nactive ports"
msgstr "Ungültige Pakete i_naktiver Ports ignorieren"
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
+#: ../src/connection-editor/ce-page-team-port.ui.h:38
#: ../src/connection-editor/ce-page-team.ui.h:84
msgid ""
"Validate received ARP packets on inactive ports. If this is not checked, all "
@@ -2667,12 +2672,12 @@ msgstr ""
"Auf inaktiven Ports erhaltene ARP-Pakete prüfen. Falls nicht angewählt, "
"werden alle eingehenden ARP-Pakete als valide Antwort eingestuft."
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
+#: ../src/connection-editor/ce-page-team-port.ui.h:39
#: ../src/connection-editor/ce-page-team.ui.h:85
msgid "S_end on inactive ports"
msgstr "Auf inaktiven Ports _senden"
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
+#: ../src/connection-editor/ce-page-team-port.ui.h:40
#: ../src/connection-editor/ce-page-team.ui.h:86
msgid ""
"By default, ARP requests are sent on active ports only. This option allows "
@@ -2681,7 +2686,7 @@ msgstr ""
"Normalerweise werden ARP-Anfragen nur auf aktiven Ports gesendet. Mit dieser "
"Option werden sie auch auf inaktiven Ports gesendet."
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
+#: ../src/connection-editor/ce-page-team-port.ui.h:41
#: ../src/connection-editor/ce-page-team.ui.h:87
msgid ""
"The delay between the link coming up and the runner being notified about it."
@@ -2689,7 +2694,7 @@ msgstr ""
"Die Verzögerung zwischen der Aktivierung des Links und der Benachrichtigung "
"des Runners."
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
+#: ../src/connection-editor/ce-page-team-port.ui.h:42
#: ../src/connection-editor/ce-page-team.ui.h:88
msgid ""
"The delay between the link going down and the runner being notified about it."
@@ -2697,12 +2702,12 @@ msgstr ""
"Die Verzögerung zwischen der Deaktivierung des Links und der "
"Benachrichtigung des Runners."
-#: ../src/connection-editor/ce-page-team-port.ui.h:42
+#: ../src/connection-editor/ce-page-team-port.ui.h:43
#: ../src/connection-editor/ce-page-team.ui.h:89
msgid "The interval between requests being sent."
msgstr "Das Intervall zwischen den zu sendenden Anfragen."
-#: ../src/connection-editor/ce-page-team-port.ui.h:43
+#: ../src/connection-editor/ce-page-team-port.ui.h:44
#: ../src/connection-editor/ce-page-team.ui.h:90
msgid ""
"The delay between link watch initialization and the first request being sent."
@@ -2710,27 +2715,27 @@ msgstr ""
"Die Verzögerung zwischen der Initialisierung der Linküberwachung und der "
"ersten gesendeten Anfrage."
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
+#: ../src/connection-editor/ce-page-team-port.ui.h:45
#: ../src/connection-editor/ce-page-team.ui.h:91
msgid "The link watcher to be used."
msgstr "Die zu verwendende Verbindungsüberwachung."
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
+#: ../src/connection-editor/ce-page-team-port.ui.h:46
#: ../src/connection-editor/ce-page-team.ui.h:92
msgid "Link Watcher"
msgstr "Verbindungsüberwachung"
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
+#: ../src/connection-editor/ce-page-team-port.ui.h:47
#: ../src/connection-editor/ce-page-team.ui.h:93
msgid "Im_port team configuration from a file…"
msgstr "Team-Konfiguration aus Datei _importieren …"
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
+#: ../src/connection-editor/ce-page-team-port.ui.h:48
#: ../src/connection-editor/ce-page-team.ui.h:94
msgid "Edit _JSON configuration"
msgstr "_JSON-Konfiguration bearbeiten"
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
+#: ../src/connection-editor/ce-page-team-port.ui.h:49
#: ../src/connection-editor/ce-page-team.ui.h:95
msgid "Raw Configuration"
msgstr "Rohkonfiguration"
@@ -3518,6 +3523,10 @@ msgstr "Fehler beim Bearbeiten der Verbindung"
msgid "Did not find a connection with UUID “%s”"
msgstr "Eine Verbindung mit der UUID »%s« konnte nicht gefunden werden"
+#: ../src/connection-editor/nm-connection-list.ui.h:1
+msgid "Network Connections"
+msgstr "Netzwerkverbindungen"
+
#: ../src/connection-editor/nm-connection-list.ui.h:2
msgid "Add a new connection"
msgstr "Eine neue Verbindung hinzufügen"
@@ -3662,7 +3671,7 @@ msgstr "Ethernet-Verbindung %d"
#. TRANSLATORS: Default zone set for firewall, when no zone is selected
#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnma/nma-mobile-providers.c:802
#: ../src/libnm-gtk/nm-mobile-providers.c:801
msgid "Default"
msgstr "Vorgabe"
@@ -3903,35 +3912,37 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
msgstr ""
"Mein Dienstanbieter verwendet C_DMA-basierte Technologien (z.B. 1xRTT, EVDO)"
-#: ../src/connection-editor/page-mobile.c:586 ../src/mb-menu-item.c:50
+#: ../src/connection-editor/page-mobile.c:586
+#: ../src/libnma/nma-mobile-wizard.c:147 ../src/mb-menu-item.c:50
#: ../src/mobile-helpers.c:282
msgid "CDMA"
msgstr "CDMA"
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:589
+#: ../src/libnma/nma-mobile-wizard.c:144 ../src/mb-menu-item.c:54
#: ../src/mobile-helpers.c:280
msgid "GSM"
msgstr "GSM"
#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: ../src/wireless-security/eap-method-ttls.c:288
msgid "PAP"
msgstr "PAP"
#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: ../src/wireless-security/eap-method-ttls.c:354
msgid "CHAP"
msgstr "CHAP"
#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: ../src/wireless-security/eap-method-fast.c:284
+#: ../src/wireless-security/eap-method-peap.c:300
+#: ../src/wireless-security/eap-method-ttls.c:320
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: ../src/wireless-security/eap-method-ttls.c:304
msgid "MSCHAP"
msgstr "MSCHAP"
@@ -4095,12 +4106,12 @@ msgid "Wi-Fi connection %d"
msgstr "Funknetzwerkverbindung %d"
#: ../src/connection-editor/page-wifi-security.c:355
-#: ../src/libnma/nma-wifi-dialog.c:920 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:922
msgid "WEP 40/128-bit Key (Hex or ASCII)"
msgstr "WEP 40/128-bit-Schlüssel (Hexadezimal oder ASCII)"
#: ../src/connection-editor/page-wifi-security.c:365
-#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../src/libnma/nma-wifi-dialog.c:955 ../src/libnm-gtk/nm-wifi-dialog.c:931
msgid "WEP 128-bit Passphrase"
msgstr "WEP 128-bit-Passphrase"
@@ -4109,12 +4120,12 @@ msgid "Dynamic WEP (802.1X)"
msgstr "Dynamisches WEP (802.1X)"
#: ../src/connection-editor/page-wifi-security.c:404
-#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: ../src/libnma/nma-wifi-dialog.c:999 ../src/libnm-gtk/nm-wifi-dialog.c:975
msgid "WPA & WPA2 Personal"
msgstr "WPA & WPA2 Personal"
#: ../src/connection-editor/page-wifi-security.c:417
-#: ../src/libnma/nma-wifi-dialog.c:987 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: ../src/libnma/nma-wifi-dialog.c:1017 ../src/libnm-gtk/nm-wifi-dialog.c:989
msgid "WPA & WPA2 Enterprise"
msgstr "WPA & WPA2 Enterprise"
@@ -4198,29 +4209,29 @@ msgid "Active Network Connections"
msgstr "Aktive Netzwerkverbindungen"
#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:152
msgid "No certificate set"
msgstr "Kein Zertifikat festgelegt"
#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:176
msgid "No key set"
msgstr "Kein Schlüssel gesetzt"
#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
#, c-format
msgid "Choose a key for %s Certificate"
msgstr "Wählen Sie einen Schlüssel für das %s-Zertifikat"
#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
#, c-format
msgid "%s private _key"
msgstr "Geheimer %s-_Schlüssel"
#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
#, c-format
msgid "%s key _password"
msgstr "_Passwort des %s-Schlüssels"
@@ -4231,47 +4242,47 @@ msgid "Choose %s Certificate"
msgstr "Wählen Sie das %s-Zertifikat"
#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:398
#, c-format
msgid "%s _certificate"
msgstr "%s-_Zertifikat"
-#: ../src/libnma/nma-mobile-wizard.c:281
+#: ../src/libnma/nma-mobile-providers.c:991
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Mein Land ist nicht aufgelistet"
+
+#: ../src/libnma/nma-mobile-wizard.c:252 ../src/libnma/nma-mobile-wizard.c:284
#: ../src/libnm-gtk/nm-mobile-wizard.c:326
msgid "Unlisted"
msgstr "Nicht aufgelistet"
-#: ../src/libnma/nma-mobile-wizard.c:465
+#: ../src/libnma/nma-mobile-wizard.c:484
#: ../src/libnm-gtk/nm-mobile-wizard.c:558
msgid "My plan is not listed…"
msgstr "Mein Abrechnungsmodus ist nicht aufgelistet …"
-#: ../src/libnma/nma-mobile-wizard.c:626
+#: ../src/libnma/nma-mobile-wizard.c:644
#: ../src/libnm-gtk/nm-mobile-wizard.c:724
msgid "Provider"
msgstr "Dienstanbieter"
-#: ../src/libnma/nma-mobile-wizard.c:908
+#: ../src/libnma/nma-mobile-wizard.c:932
#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
msgid "Country or region"
msgstr "Land oder Region"
-#: ../src/libnma/nma-mobile-wizard.c:918
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Mein Land ist nicht aufgelistet"
-
-#: ../src/libnma/nma-mobile-wizard.c:999
+#: ../src/libnma/nma-mobile-wizard.c:1016
#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
msgid "Installed GSM device"
msgstr "Installiertes GSM-Gerät"
-#: ../src/libnma/nma-mobile-wizard.c:1002
+#: ../src/libnma/nma-mobile-wizard.c:1019
#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
msgid "Installed CDMA device"
msgstr "Installiertes CDMA-Gerät"
-#: ../src/libnma/nma-mobile-wizard.c:1208
+#: ../src/libnma/nma-mobile-wizard.c:1225
#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
msgid "Any device"
msgstr "Irgendein Gerät"
@@ -4337,8 +4348,8 @@ msgid "Select your provider from a _list:"
msgstr "Dienstanbieter aus einer _Liste auswählen:"
#: ../src/libnma/nma-mobile-wizard.ui.h:12
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-msgid "I can’t find my provider and I wish to enter it _manually:"
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
msgstr ""
"Ich kann meinen Dienstanbieter nicht finden und möchte ihn _manuell eingeben:"
@@ -4354,26 +4365,21 @@ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
msgstr "Mein Dienstanbieter verwendet CDMA-Technologien (1xRTT, EVDO)"
#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Dienstanbieter:"
-
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
#: ../src/libnm-gtk/nm-mobile-wizard.c:792
msgid "Choose your Provider"
msgstr "Dienstanbieter auswählen"
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
+#: ../src/libnma/nma-mobile-wizard.ui.h:16
#: ../src/libnm-gtk/nm-mobile-wizard.c:457
msgid "_Select your plan:"
msgstr "Abrechnung_smodus auswählen:"
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
+#: ../src/libnma/nma-mobile-wizard.ui.h:17
#: ../src/libnm-gtk/nm-mobile-wizard.c:481
msgid "Selected plan _APN (Access Point Name):"
msgstr "Zugangspunkt (APN) zum ausgewählten _Abrechnungsmodus:"
-#: ../src/libnma/nma-mobile-wizard.ui.h:19
+#: ../src/libnma/nma-mobile-wizard.ui.h:18
#: ../src/libnm-gtk/nm-mobile-wizard.c:501
msgid ""
"Warning: Selecting an incorrect plan may result in billing issues for your "
@@ -4388,12 +4394,12 @@ msgstr ""
"Im Zweifelsfall sollten Sie Ihren Dienstanbieter nach dem Abrechnungsmodus "
"Ihres Zugangspunktes fragen."
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
+#: ../src/libnma/nma-mobile-wizard.ui.h:21
#: ../src/libnm-gtk/nm-mobile-wizard.c:509
msgid "Choose your Billing Plan"
msgstr "Abrechnungsmodus wählen"
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
+#: ../src/libnma/nma-mobile-wizard.ui.h:22
#: ../src/libnm-gtk/nm-mobile-wizard.c:199
msgid ""
"Your mobile broadband connection is configured with the following settings:"
@@ -4402,24 +4408,24 @@ msgstr ""
"eingerichtet:"
#. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
+#: ../src/libnma/nma-mobile-wizard.ui.h:23
#: ../src/libnm-gtk/nm-mobile-wizard.c:206
msgid "Your Device:"
msgstr "Ihr Gerät:"
#. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
+#: ../src/libnma/nma-mobile-wizard.ui.h:24
#: ../src/libnm-gtk/nm-mobile-wizard.c:217
msgid "Your Provider:"
msgstr "Ihr Dienstanbieter:"
#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
+#: ../src/libnma/nma-mobile-wizard.ui.h:25
#: ../src/libnm-gtk/nm-mobile-wizard.c:228
msgid "Your Plan:"
msgstr "Ihr Abrechnungsmodus:"
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
+#: ../src/libnma/nma-mobile-wizard.ui.h:26
#: ../src/libnm-gtk/nm-mobile-wizard.c:249
msgid ""
"A connection will now be made to your mobile broadband provider using the "
@@ -4435,7 +4441,7 @@ msgstr ""
"Breitbandverbindungen zu ändern, wählen Sie »Netzwerkverbindungen« im Menü "
"System → Einstellungen."
-#: ../src/libnma/nma-mobile-wizard.ui.h:28
+#: ../src/libnma/nma-mobile-wizard.ui.h:27
#: ../src/libnm-gtk/nm-mobile-wizard.c:262
msgid "Confirm Mobile Broadband Settings"
msgstr "Mobile Breitbandeinstellungen bestätigen"
@@ -4473,12 +4479,12 @@ msgstr "Abbrechen"
msgid "Select from file…"
msgstr "Aus _Datei auswählen …"
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:394
#, c-format
msgid "Choose a %s Certificate"
msgstr "Wählen Sie ein %s-Zertifikat"
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:402
#, c-format
msgid "%s certificate _password"
msgstr "_Passwort des %s-Zertifikats"
@@ -4548,36 +4554,28 @@ msgstr "_Sekundäres Passwort:"
msgid "_Password:"
msgstr "_Passwort:"
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: ../src/libnma/nma-wifi-dialog.c:127 ../src/libnm-gtk/nm-wifi-dialog.c:141
msgid "Click to connect"
msgstr "Klicken Sie zum Verbinden"
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-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 ""
-"Entweder fehlt ein Passwort oder die Verbindung ist ungültig. In letztem "
-"Fall müssen Sie die Verbindung zuerst mit nm-connection-editor bearbeiten"
-
-#: ../src/libnma/nma-wifi-dialog.c:465 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:465
msgid "New…"
msgstr "Neu …"
-#: ../src/libnma/nma-wifi-dialog.c:903 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:905
msgctxt "Wifi/wired security"
msgid "None"
msgstr "Keine"
-#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: ../src/libnma/nma-wifi-dialog.c:985 ../src/libnm-gtk/nm-wifi-dialog.c:961
msgid "Dynamic WEP (802.1x)"
msgstr "Dynamisches WEP (802.1X)"
-#: ../src/libnma/nma-wifi-dialog.c:1066 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: ../src/libnma/nma-wifi-dialog.c:1108 ../src/libnm-gtk/nm-wifi-dialog.c:1071
msgid "C_reate"
msgstr "E_rzeugen"
-#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnma/nma-wifi-dialog.c:1186 ../src/libnm-gtk/nm-wifi-dialog.c:1150
#, c-format
msgid ""
"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4585,36 +4583,36 @@ msgstr ""
"Es werden Passwörter oder Schlüssel für die Verschlüsselung benötigt, um "
"sich mit dem Funknetzwerk »%s« zu verbinden."
-#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1152
msgid "Wi-Fi Network Authentication Required"
msgstr "Legitimierung für Funknetzwerk wird benötigt"
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1154
msgid "Authentication required by Wi-Fi network"
msgstr "Legitimierung für Funknetzwerk wird benötigt"
-#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1159
msgid "Create New Wi-Fi Network"
msgstr "Neues Funknetzwerk erstellen"
-#: ../src/libnma/nma-wifi-dialog.c:1156 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1197 ../src/libnm-gtk/nm-wifi-dialog.c:1161
msgid "New Wi-Fi network"
msgstr "Neues Funknetzwerk"
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: ../src/libnma/nma-wifi-dialog.c:1198 ../src/libnm-gtk/nm-wifi-dialog.c:1162
msgid "Enter a name for the Wi-Fi network you wish to create."
msgstr ""
"Bitte geben Sie den Namen des Funknetzwerks ein, das Sie erstellen möchten."
-#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1200 ../src/libnm-gtk/nm-wifi-dialog.c:1164
msgid "Connect to Hidden Wi-Fi Network"
msgstr "Mit einem verborgenen Funknetzwerk verbinden"
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1202 ../src/libnm-gtk/nm-wifi-dialog.c:1166
msgid "Hidden Wi-Fi network"
msgstr "Verborgenes Funknetzwerk"
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: ../src/libnma/nma-wifi-dialog.c:1203 ../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."
@@ -4634,6 +4632,15 @@ msgstr "_Verbindung"
msgid "Wi-Fi _adapter"
msgstr "WLAN-_Adapter"
+#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"Ich kann meinen Dienstanbieter nicht finden und möchte ihn _manuell eingeben:"
+
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Dienstanbieter:"
+
#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
msgid "Wired"
msgstr "Kabelgebunden"
@@ -4666,6 +4673,14 @@ msgctxt "long device name"
msgid "%s %s"
msgstr "%s-%s"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:142
+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 ""
+"Entweder fehlt ein Passwort oder die Verbindung ist ungültig. In letztem "
+"Fall müssen Sie die Verbindung zuerst mit nm-connection-editor bearbeiten"
+
#: ../src/libnm-gtk/wifi.ui.h:1
msgid "Wi-Fi _security:"
msgstr "Sicherheit des _Funknetzwerks:"
@@ -4836,21 +4851,21 @@ msgstr "Die gewählte Datei mit dem CA-Zertifikat ist nicht vorhanden"
msgid "missing EAP-FAST PAC file"
msgstr "EAP-FAST PAC-Datei fehlt"
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: ../src/wireless-security/eap-method-fast.c:268
+#: ../src/wireless-security/eap-method-peap.c:332
+#: ../src/wireless-security/eap-method-ttls.c:386
msgid "GTC"
msgstr "GTC"
-#: ../src/wireless-security/eap-method-fast.c:405
+#: ../src/wireless-security/eap-method-fast.c:407
msgid "Choose a PAC file"
msgstr "PAC-Datei wählen"
-#: ../src/wireless-security/eap-method-fast.c:412
+#: ../src/wireless-security/eap-method-fast.c:414
msgid "PAC files (*.pac)"
msgstr "PAC-Dateien (*.pac)"
-#: ../src/wireless-security/eap-method-fast.c:416
+#: ../src/wireless-security/eap-method-fast.c:418
msgid "All files"
msgstr "Alle Dateien"
@@ -4894,9 +4909,9 @@ msgstr "EAP-LEAP-Benutzername fehlt"
msgid "missing EAP-LEAP password"
msgstr "EAP-LEAP-Passwort fehlt"
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: ../src/wireless-security/eap-method-peap.c:316
+#: ../src/wireless-security/eap-method-ttls.c:370
+#: ../src/wireless-security/wireless-security.c:425
msgid "MD5"
msgstr "MD5"
@@ -4930,14 +4945,28 @@ msgstr "Suffix des Namens des Serverzertifikats."
msgid "_Domain"
msgstr "_Domäne"
-#: ../src/wireless-security/eap-method-simple.c:75
+#: ../src/wireless-security/eap-method-simple.c:90
msgid "missing EAP username"
msgstr "EAP-Benutzername fehlt"
-#: ../src/wireless-security/eap-method-simple.c:88
+#: ../src/wireless-security/eap-method-simple.c:106
msgid "missing EAP password"
msgstr "EAP-Passwort fehlt"
+#: ../src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.ui.h:4
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bit-Passphrase"
+
+#: ../src/wireless-security/eap-method-simple.ui.h:5
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Passwörter _zeigen"
+
#: ../src/wireless-security/eap-method-tls.c:64
msgid "missing EAP-TLS identity"
msgstr "EAP-TLS-Identität fehlt"
@@ -4962,7 +4991,7 @@ msgstr "Die gewählte Schlüsseldatei ist nicht vorhanden"
msgid "I_dentity"
msgstr "_Identität"
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: ../src/wireless-security/eap-method-ttls.c:337
msgid "MSCHAPv2 (no EAP)"
msgstr "MSCHAPv2 (kein EAP)"
@@ -4970,26 +4999,30 @@ msgstr "MSCHAPv2 (kein EAP)"
msgid "Unknown error validating 802.1X security"
msgstr "Unbekannter Fehler beim Überprüfen der 802.1X-Sicherheit"
-#: ../src/wireless-security/wireless-security.c:436
+#: ../src/wireless-security/wireless-security.c:437
msgid "TLS"
msgstr "TLS"
-#: ../src/wireless-security/wireless-security.c:460
+#: ../src/wireless-security/wireless-security.c:461
msgid "PWD"
msgstr "PWD"
-#: ../src/wireless-security/wireless-security.c:471
+#: ../src/wireless-security/wireless-security.c:472
msgid "FAST"
msgstr "FAST"
-#: ../src/wireless-security/wireless-security.c:482
+#: ../src/wireless-security/wireless-security.c:483
msgid "Tunneled TLS"
msgstr "Getunneltes TLS"
-#: ../src/wireless-security/wireless-security.c:493
+#: ../src/wireless-security/wireless-security.c:494
msgid "Protected EAP (PEAP)"
msgstr "Geschütztes EAP (PEAP)"
+#: ../src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
#: ../src/wireless-security/ws-wep-key.ui.h:6
#: ../src/wireless-security/ws-wpa-eap.ui.h:1
diff --git a/po/es.po b/po/es.po
index 3822bae1..0813d16d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,9 +13,8 @@
msgid ""
msgstr ""
"Project-Id-Version: networkmanager-applet.master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2018-12-06 09:38+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-02-20 18:18+0100\n"
"PO-Revision-Date: 2019-02-19 15:50+0100\n"
"Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
"Language-Team: es <gnome-es-list gnome org>\n"
@@ -35,7 +34,6 @@ msgid "Manage your network connections"
msgstr "Gestione sus conexiones de red"
#: ../nm-connection-editor.desktop.in.h:1
-#| msgid "Raw Configuration"
msgid "Advanced Network Configuration"
msgstr "Configuración de red avanzada"
@@ -226,19 +224,18 @@ msgstr "Autenticación 802.1x"
#: ../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.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1097
+#: ../src/libnma/nma-wifi-dialog.c:1104
#: ../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/libnma/nma-wifi-dialog.c:1103
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1110
#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
msgid "C_onnect"
msgstr "C_onectar"
#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
-#| msgid "_Network name:"
msgid "_Network name"
msgstr "_Nombre de red"
@@ -816,7 +813,7 @@ 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:378
-#: ../src/libnma/nma-wifi-dialog.c:968 ../src/libnm-gtk/nm-wifi-dialog.c:948
+#: ../src/libnma/nma-wifi-dialog.c:972 ../src/libnm-gtk/nm-wifi-dialog.c:948
#: ../src/wireless-security/wireless-security.c:449
msgid "LEAP"
msgstr "LEAP"
@@ -2309,7 +2306,7 @@ msgid "Allow _roaming if home network is not available"
msgstr "Permitir «_roaming» si la red doméstica no está disponible"
#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:441
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:454
msgid "Sho_w passwords"
msgstr "_Mostrar las contraseñas"
@@ -3120,10 +3117,6 @@ msgstr "No hay tipo de servicio VPN."
#: ../src/connection-editor/connection-helpers.c:209
#, fuzzy
-#| msgid ""
-#| "The VPN plugin failed to import the VPN connection correctly\n"
-#| "\n"
-#| "Error: no VPN service type."
msgid "The VPN plugin failed to import the VPN connection correctly: "
msgstr ""
"El complemento de VPN falló al importar correctamente la conexión VPN\n"
@@ -3178,7 +3171,6 @@ msgid "Are you sure you wish to delete the connection %s?"
msgstr "¿Está seguro de que quiere eliminar la conexión %s?"
#: ../src/connection-editor/gtk/menus.ui.h:1
-#| msgid "_VPN Connections"
msgid "_New Connection"
msgstr "_Nueva conexión"
@@ -3418,18 +3410,15 @@ msgstr "Autentíquese para eliminar la conexión seleccionada"
#: ../src/connection-editor/nm-connection-list.c:1059
#, c-format
-#| msgid "Unsupported mobile broadband connection type."
msgid "Unrecognized connection type"
msgstr "Tipo de conexión no identificado"
#: ../src/connection-editor/nm-connection-list.c:1064
#, c-format
-#| msgid "Don’t know how to create “%s” connections"
msgid "Don’t know how to import “%s” connections"
msgstr "Se desconoce cómo importar conexiones «%s»"
#: ../src/connection-editor/nm-connection-list.c:1068
-#| msgid "Error editing connection"
msgid "Error importing connection"
msgstr "Error al importar la conexión"
@@ -3440,7 +3429,6 @@ msgid "Error creating connection"
msgstr "Error al crear la conexión"
#: ../src/connection-editor/nm-connection-list.c:1075
-#| msgid "Connection cannot be modified"
msgid "Connection type not specified."
msgstr "Tipo de conexión no especificado."
@@ -4035,12 +4023,12 @@ msgid "Wi-Fi connection %d"
msgstr "Conexión inalámbrica %d"
#: ../src/connection-editor/page-wifi-security.c:355
-#: ../src/libnma/nma-wifi-dialog.c:942 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:922
msgid "WEP 40/128-bit Key (Hex or ASCII)"
msgstr "Clave WEP 40/128-bit (Hexadecimal o ASCII)"
#: ../src/connection-editor/page-wifi-security.c:365
-#: ../src/libnma/nma-wifi-dialog.c:951 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../src/libnma/nma-wifi-dialog.c:955 ../src/libnm-gtk/nm-wifi-dialog.c:931
msgid "WEP 128-bit Passphrase"
msgstr "Frase de paso WEP de 128 bits"
@@ -4049,12 +4037,12 @@ msgid "Dynamic WEP (802.1X)"
msgstr "WEP dinámica (802.1x)"
#: ../src/connection-editor/page-wifi-security.c:404
-#: ../src/libnma/nma-wifi-dialog.c:995 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: ../src/libnma/nma-wifi-dialog.c:999 ../src/libnm-gtk/nm-wifi-dialog.c:975
msgid "WPA & WPA2 Personal"
msgstr "WPA y WPA2 personal"
#: ../src/connection-editor/page-wifi-security.c:417
-#: ../src/libnma/nma-wifi-dialog.c:1013 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: ../src/libnma/nma-wifi-dialog.c:1017 ../src/libnm-gtk/nm-wifi-dialog.c:989
msgid "WPA & WPA2 Enterprise"
msgstr "WPA y WPA2 enterprise"
@@ -4136,32 +4124,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:146
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:152
msgid "No certificate set"
msgstr "No hay ningún certificado configurado"
#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:176
msgid "No key set"
msgstr "No hay clave establecida"
#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
#, 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:374
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
#, c-format
-#| msgid "%s private _key:"
msgid "%s private _key"
msgstr "clave privada %s"
#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
#, c-format
-#| msgid "%s key _password:"
msgid "%s key _password"
msgstr "contraseña de clave %s"
@@ -4171,9 +4157,8 @@ msgid "Choose %s Certificate"
msgstr "Elija un certificado %s:"
#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:398
#, c-format
-#| msgid "%s _certificate:"
msgid "%s _certificate"
msgstr "_certificado %s"
@@ -4278,7 +4263,6 @@ msgstr "Seleccionar su proveedor de la _lista:"
#: ../src/libnma/nma-mobile-wizard.ui.h:12
#, fuzzy
-#| msgid "I can’t find my provider and I wish to enter it _manually:"
msgid "I can’t find my provider and I wish to set up the connection _manually:"
msgstr "No puedo encontrar mi proveedor y querría introducirlo _manualmente:"
@@ -4403,14 +4387,13 @@ msgstr "Cancelar"
msgid "Select from file…"
msgstr "Seleccionar desde un archivo…"
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:394
#, c-format
msgid "Choose a %s Certificate"
msgstr "Elija un certificado %s"
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:402
#, c-format
-#| msgid "%s certificate _password:"
msgid "%s certificate _password"
msgstr "_contraseña del certificado %s"
@@ -4479,28 +4462,28 @@ msgstr "Contraseña _secundaria:"
msgid "_Password:"
msgstr "Contrase_ña:"
-#: ../src/libnma/nma-wifi-dialog.c:126 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: ../src/libnma/nma-wifi-dialog.c:127 ../src/libnm-gtk/nm-wifi-dialog.c:141
msgid "Click to connect"
msgstr "Pulse para conectar"
-#: ../src/libnma/nma-wifi-dialog.c:457 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:465
msgid "New…"
msgstr "Nueva…"
-#: ../src/libnma/nma-wifi-dialog.c:925 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:905
msgctxt "Wifi/wired security"
msgid "None"
msgstr "Ninguna"
-#: ../src/libnma/nma-wifi-dialog.c:981 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: ../src/libnma/nma-wifi-dialog.c:985 ../src/libnm-gtk/nm-wifi-dialog.c:961
msgid "Dynamic WEP (802.1x)"
msgstr "WEP dinámica (802.1x)"
-#: ../src/libnma/nma-wifi-dialog.c:1101 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: ../src/libnma/nma-wifi-dialog.c:1108 ../src/libnm-gtk/nm-wifi-dialog.c:1071
msgid "C_reate"
msgstr "C_rear"
-#: ../src/libnma/nma-wifi-dialog.c:1179 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnma/nma-wifi-dialog.c:1186 ../src/libnm-gtk/nm-wifi-dialog.c:1150
#, c-format
msgid ""
"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4508,35 +4491,35 @@ msgstr ""
"Se necesitan contraseñas o claves de cifrado para acceder a la red "
"inalámbrica «%s»."
-#: ../src/libnma/nma-wifi-dialog.c:1181 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1152
msgid "Wi-Fi Network Authentication Required"
msgstr "Se requiere autenticación para la red inalámbrica"
-#: ../src/libnma/nma-wifi-dialog.c:1183 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1154
msgid "Authentication required by Wi-Fi network"
msgstr "La red inalámbrica necesita autenticación"
-#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1159
msgid "Create New Wi-Fi Network"
msgstr "Crear una red inalámbrica"
-#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1197 ../src/libnm-gtk/nm-wifi-dialog.c:1161
msgid "New Wi-Fi network"
msgstr "Red inalámbrica nueva"
-#: ../src/libnma/nma-wifi-dialog.c:1191 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: ../src/libnma/nma-wifi-dialog.c:1198 ../src/libnm-gtk/nm-wifi-dialog.c:1162
msgid "Enter a name for the Wi-Fi network you wish to create."
msgstr "Introduzca un nombre para la red inalámbrica que quiere crear."
-#: ../src/libnma/nma-wifi-dialog.c:1193 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1200 ../src/libnm-gtk/nm-wifi-dialog.c:1164
msgid "Connect to Hidden Wi-Fi Network"
msgstr "Conectar con una red inalámbrica oculta"
-#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1202 ../src/libnm-gtk/nm-wifi-dialog.c:1166
msgid "Hidden Wi-Fi network"
msgstr "Red inalámbrica oculta"
-#: ../src/libnma/nma-wifi-dialog.c:1196 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: ../src/libnma/nma-wifi-dialog.c:1203 ../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."
@@ -4545,17 +4528,14 @@ msgstr ""
"oculta a la que quiere conectarse."
#: ../src/libnma/wifi.ui.h:1
-#| msgid "Wi-Fi _security:"
msgid "Wi-Fi _security"
msgstr "_Seguridad inalámbrica"
#: ../src/libnma/wifi.ui.h:3
-#| msgid "C_onnection:"
msgid "C_onnection"
msgstr "Co_nexión"
#: ../src/libnma/wifi.ui.h:4
-#| msgid "Wi-Fi _adapter:"
msgid "Wi-Fi _adapter"
msgstr "_Adaptador inalámbrico"
@@ -4884,12 +4864,10 @@ msgid "missing EAP client Private Key passphrase"
msgstr ""
#: ../src/wireless-security/eap-method-simple.ui.h:4
-#| msgid "WEP 128-bit Passphrase"
msgid "P_rivate Key Passphrase"
msgstr "Frase de paso de la clave p_rivada"
#: ../src/wireless-security/eap-method-simple.ui.h:5
-#| msgid "Sh_ow passwords"
msgid "Sh_ow passphrase"
msgstr "M_ostrar frase de paso"
diff --git a/po/ja.po b/po/ja.po
index 27a10704..7afadcf1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-16 16:50+0200\n"
+"POT-Creation-Date: 2019-02-20 18:18+0100\n"
"PO-Revision-Date: 2018-01-30 12:06+0000\n"
"Last-Translator: amoewaki <amoewaki redhat com>\n"
"Language-Team: Japanese <gnome-translation gnome gr jp>\n"
@@ -29,7 +29,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Zanata 4.3.2\n"
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
msgid "Network"
msgstr "ネットワーク"
@@ -38,9 +38,9 @@ msgid "Manage your network connections"
msgstr "ネットワーク接続を管理"
#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "ネットワーク接続"
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Raw 設定"
#: ../nm-connection-editor.desktop.in.h:2
msgid "Manage and change your network connection settings"
@@ -212,30 +212,31 @@ msgstr "802.1X の認証"
#: ../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/connection-helpers.c:308
-#: ../src/connection-editor/connection-helpers.c:771
+#: ../src/connection-editor/connection-helpers.c:296
+#: ../src/connection-editor/connection-helpers.c:759
#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:543
+#: ../src/connection-editor/page-bluetooth.c:307
+#: ../src/connection-editor/page-mobile.c:540
#: ../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/libnma/nma-vpn-password-dialog.ui.h:1
+#: ../src/libnma/nma-wifi-dialog.c:1104
#: ../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/libnma/nma-wifi-dialog.c:1072
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1110
#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
msgid "C_onnect"
msgstr "接続(_O)"
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#, fuzzy
+msgid "_Network name"
msgstr "ネットワーク名(_N):"
#: ../src/ap-menu-item.c:82
@@ -272,11 +273,11 @@ msgstr "切断失敗"
msgid "Connection activation failed"
msgstr "接続のアクティベートに失敗しました"
-#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
+#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
msgid "Don’t show this message again"
msgstr "このメッセージを今後表示しない"
-#: ../src/applet.c:899
+#: ../src/applet.c:898
#, c-format
msgid ""
"\n"
@@ -286,7 +287,7 @@ msgstr ""
"\n"
"ネットワーク接続が中断されたため、VPN 接続 '%s' は切断されました。"
-#: ../src/applet.c:901
+#: ../src/applet.c:900
#, c-format
msgid ""
"\n"
@@ -296,7 +297,7 @@ msgstr ""
"\n"
"ネットワーク接続が中断されたため、VPN 接続 '%s' は失敗しました。"
-#: ../src/applet.c:903
+#: ../src/applet.c:902
#, c-format
msgid ""
"\n"
@@ -305,7 +306,7 @@ msgstr ""
"\n"
"VPN サービスが予期せずに停止したため、VPN 接続 '%s' は失敗しました。"
-#: ../src/applet.c:905
+#: ../src/applet.c:904
#, c-format
msgid ""
"\n"
@@ -315,7 +316,7 @@ msgstr ""
"\n"
"VPN サービスが無効な設定を返したため、VPN 接続 '%s'は失敗しました。"
-#: ../src/applet.c:907
+#: ../src/applet.c:906
#, c-format
msgid ""
"\n"
@@ -324,7 +325,7 @@ msgstr ""
"\n"
"接続試行がタイムアウトしたため、VPN 接続 '%s' は失敗しました。"
-#: ../src/applet.c:909
+#: ../src/applet.c:908
#, c-format
msgid ""
"\n"
@@ -333,7 +334,7 @@ msgstr ""
"\n"
"VPN サービスが時間内に開始しなかったため、VPN 接続 '%s' は失敗しました。"
-#: ../src/applet.c:911
+#: ../src/applet.c:910
#, c-format
msgid ""
"\n"
@@ -342,7 +343,7 @@ msgstr ""
"\n"
"VPN サービスが開始に失敗したため、VPN 接続 '%s' は失敗しました。"
-#: ../src/applet.c:913
+#: ../src/applet.c:912
#, c-format
msgid ""
"\n"
@@ -351,7 +352,7 @@ msgstr ""
"\n"
"有効な VPN シークレットがないため、VPN 接続 '%s' は失敗しました。"
-#: ../src/applet.c:915
+#: ../src/applet.c:914
#, c-format
msgid ""
"\n"
@@ -360,7 +361,7 @@ msgstr ""
"\n"
"VPN シークレットが無効なため、VPN 接続 '%s' は失敗しました。"
-#: ../src/applet.c:920
+#: ../src/applet.c:919
#, c-format
msgid ""
"\n"
@@ -369,7 +370,7 @@ msgstr ""
"\n"
"VPN 接続 '%s' は失敗しました。"
-#: ../src/applet.c:947
+#: ../src/applet.c:946
#, c-format
msgid ""
"VPN connection has been successfully established.\n"
@@ -380,19 +381,19 @@ msgstr ""
"\n"
"%s\n"
-#: ../src/applet.c:949
+#: ../src/applet.c:948
msgid "VPN connection has been successfully established.\n"
msgstr "VPN 接続の確立に成功しました。\n"
-#: ../src/applet.c:951
+#: ../src/applet.c:950
msgid "VPN Login Message"
msgstr "VPN ログインメッセージ"
-#: ../src/applet.c:959 ../src/applet.c:999
+#: ../src/applet.c:958 ../src/applet.c:998
msgid "VPN Connection Failed"
msgstr "VPN 接続は失敗しました"
-#: ../src/applet.c:1003
+#: ../src/applet.c:1002
#, c-format
msgid ""
"\n"
@@ -405,7 +406,7 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1006
+#: ../src/applet.c:1005
#, c-format
msgid ""
"\n"
@@ -418,144 +419,144 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1295
+#: ../src/applet.c:1296
msgid "device not ready (firmware missing)"
msgstr "デバイスの準備ができていません (ファームウェア未検出)"
-#: ../src/applet.c:1297
+#: ../src/applet.c:1298
msgid "device not ready"
msgstr "デバイスの準備ができていません"
#. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
msgid "disconnected"
msgstr "切断されています"
-#: ../src/applet.c:1323
+#: ../src/applet.c:1324
msgid "Disconnect"
msgstr "切断する"
-#: ../src/applet.c:1337
+#: ../src/applet.c:1338
msgid "device not managed"
msgstr "デバイスは管理されていません"
-#: ../src/applet.c:1410
+#: ../src/applet.c:1411
msgid "No network devices available"
msgstr "ネットワークデバイスがありません"
-#: ../src/applet.c:1464
+#: ../src/applet.c:1465
msgid "_VPN Connections"
msgstr "VPN 接続(_V)"
-#: ../src/applet.c:1508
+#: ../src/applet.c:1509
msgid "_Configure VPN…"
msgstr "VPN を設定(_C)..."
-#: ../src/applet.c:1511
+#: ../src/applet.c:1512
msgid "_Add a VPN connection…"
msgstr "VPN 接続を追加(_A)"
-#: ../src/applet.c:1617
+#: ../src/applet.c:1618
msgid "NetworkManager is not running…"
msgstr "NetworkManager は実行されていません..."
-#: ../src/applet.c:1622 ../src/applet.c:2687
+#: ../src/applet.c:1623 ../src/applet.c:2688
msgid "Networking disabled"
msgstr "ネットワークは無効になっています"
#. 'Enable Networking' item
-#: ../src/applet.c:1832
+#: ../src/applet.c:1833
msgid "Enable _Networking"
msgstr "ネットワークを有効にする(_N)"
#. 'Enable Wi-Fi' item
-#: ../src/applet.c:1841
+#: ../src/applet.c:1842
msgid "Enable _Wi-Fi"
msgstr "Wi-Fi を有効にする(_W)"
#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1850
+#: ../src/applet.c:1851
msgid "Enable _Mobile Broadband"
msgstr "モバイルブロードバンドを有効にする(_M)"
#. Toggle notifications item
-#: ../src/applet.c:1862
+#: ../src/applet.c:1863
msgid "Enable N_otifications"
msgstr "通知を有効にする(_O)"
#. 'Connection Information' item
-#: ../src/applet.c:1874
+#: ../src/applet.c:1875
msgid "Connection _Information"
msgstr "接続情報(_I)"
#. 'Edit Connections...' item
-#: ../src/applet.c:1882
+#: ../src/applet.c:1883
msgid "Edit Connections…"
msgstr "接続を編集する..."
-#: ../src/applet.c:1896
+#: ../src/applet.c:1897
msgid "_About"
msgstr "このアプリケーションについて(_A)"
-#: ../src/applet.c:2207
+#: ../src/applet.c:2208
#, c-format
msgid "You are now connected to “%s”."
msgstr "現在'%s' に接続しています。"
-#: ../src/applet.c:2247
+#: ../src/applet.c:2248
msgid "Disconnected"
msgstr "切断されました"
-#: ../src/applet.c:2248
+#: ../src/applet.c:2249
msgid "The network connection has been disconnected."
msgstr "ネットワーク接続が切断されました。"
-#: ../src/applet.c:2550
+#: ../src/applet.c:2551
#, c-format
msgid "Preparing network connection “%s”…"
msgstr "ネットワーク接続 '%s' を準備中..."
-#: ../src/applet.c:2553
+#: ../src/applet.c:2554
#, c-format
msgid "User authentication required for network connection “%s”…"
msgstr "ネットワーク接続 '%s' にはユーザー認証が必要です..."
-#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2557 ../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:2559
+#: ../src/applet.c:2560
#, c-format
msgid "Network connection “%s” active"
msgstr "ネットワーク接続 '%s' はアクティブです。"
-#: ../src/applet.c:2632
+#: ../src/applet.c:2633
#, c-format
msgid "Starting VPN connection “%s”…"
msgstr "VPN 接続 '%s' を開始しています..."
-#: ../src/applet.c:2635
+#: ../src/applet.c:2636
#, c-format
msgid "User authentication required for VPN connection “%s”…"
msgstr "VPN 接続 '%s' にはユーザー認証が必要です..."
-#: ../src/applet.c:2638
+#: ../src/applet.c:2639
#, c-format
msgid "Requesting a VPN address for “%s”…"
msgstr "'%s' の VPN アドレスを要求しています..."
-#: ../src/applet.c:2641
+#: ../src/applet.c:2642
#, c-format
msgid "VPN connection active"
msgstr "VPN 接続はアクティブです"
-#: ../src/applet.c:2691
+#: ../src/applet.c:2692
msgid "No network connection"
msgstr "ネットワーク接続がありません"
-#: ../src/applet.c:3292
+#: ../src/applet.c:3299
msgid "NetworkManager Applet"
msgstr "NetworkManager アプレット"
@@ -572,46 +573,46 @@ msgstr "PIN が違います。プロバイダーに連絡してください。"
msgid "Sending unlock code…"
msgstr "ロック解除コードを送信中..."
-#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
+#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
#, c-format
msgid "Mobile Broadband (%s)"
msgstr "モバイルブロードバンド (%s)"
-#: ../src/applet-device-broadband.c:739
+#: ../src/applet-device-broadband.c:741
#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:308
+#: ../src/connection-editor/page-mobile.c:305
#: ../src/libnm-gtk/nm-ui-utils.c:329
msgid "Mobile Broadband"
msgstr "モバイルブロードバンド"
-#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-broadband.c:794 ../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:805
+#: ../src/applet-device-broadband.c:807
msgid "New Mobile Broadband connection…"
msgstr "新規のモバイルブロードバンド接続…"
-#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-broadband.c:821 ../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:820
+#: ../src/applet-device-broadband.c:822
msgid "You are now connected to the Mobile Broadband network."
msgstr "現在、モバイルブロードバンドネットワークに接続しています。"
-#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
+#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
msgid "Mobile Broadband network."
msgstr "モバイルブロードバンドネットワーク"
-#: ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:963
msgid "You are now registered on the home network."
msgstr "ホームネットワークに接続しました。"
-#: ../src/applet-device-broadband.c:967
+#: ../src/applet-device-broadband.c:969
msgid "You are now registered on a roaming network."
msgstr "ローミングネットワークに接続しました。"
@@ -699,9 +700,9 @@ msgstr "DSL 認証"
#: ../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:311
-#: ../src/connection-editor/page-mobile.c:545
-#: ../src/libnma/nma-vpn-password-dialog.c:210
+#: ../src/connection-editor/page-bluetooth.c:309
+#: ../src/connection-editor/page-mobile.c:542
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
msgid "_OK"
msgstr "OK(_O)"
@@ -804,9 +805,9 @@ msgstr "接続のアクティベートに失敗しました"
msgid "Error displaying connection information:"
msgstr "接続情報の表示中にエラーが起きました:"
-#: ../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
+#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
+#: ../src/libnma/nma-wifi-dialog.c:972 ../src/libnm-gtk/nm-wifi-dialog.c:948
+#: ../src/wireless-security/wireless-security.c:449
msgid "LEAP"
msgstr "LEAP"
@@ -829,7 +830,7 @@ msgid "WEP"
msgstr "WEP"
#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:332
+#: ../src/connection-editor/page-wifi-security.c:329
msgctxt "Wi-Fi/Ethernet security"
msgid "None"
msgstr "なし"
@@ -1099,7 +1100,7 @@ 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
+#: ../src/connection-editor/ce-page.h:112
msgid ""
"IP addresses identify your computer on the network. Click the “Add” button "
"to add an IP address."
@@ -1125,7 +1126,7 @@ msgstr "追加(_A)"
#: ../src/connection-editor/ce-page-ip4.ui.h:8
#: ../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/connection-helpers.c:760
#: ../src/connection-editor/nm-connection-list.ui.h:4
msgid "_Delete"
msgstr "削除(_D)"
@@ -1208,12 +1209,14 @@ msgid "ARP"
msgstr "ARP"
#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#, fuzzy
+msgid "Bonded _connections"
msgstr "Bond 接続(_C):"
#: ../src/connection-editor/ce-page-bond.ui.h:11
#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#, fuzzy
+msgid "M_ode"
msgstr "モード(_O):"
#: ../src/connection-editor/ce-page-bond.ui.h:13
@@ -1224,7 +1227,8 @@ msgid "_Edit"
msgstr "編集(_E)"
#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#, fuzzy
+msgid "Monitoring _frequency"
msgstr "監視周期(_F):"
#: ../src/connection-editor/ce-page-bond.ui.h:16
@@ -1234,15 +1238,18 @@ msgstr "ms"
#: ../src/connection-editor/ce-page-bond.ui.h:17
#: ../src/connection-editor/ce-page-bridge.ui.h:6
#: ../src/connection-editor/ce-page-team.ui.h:16
-msgid "_Interface name:"
+#, fuzzy
+msgid "_Interface name"
msgstr "インターフェース名(_I):"
#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#, fuzzy
+msgid "_Link Monitoring"
msgstr "リンク監視(_L)"
#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#, fuzzy
+msgid "ARP _targets"
msgstr "ARP 対象(_T):"
#: ../src/connection-editor/ce-page-bond.ui.h:20
@@ -1254,15 +1261,18 @@ msgstr ""
"のリスト。"
#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#, fuzzy
+msgid "Link _up delay"
msgstr "接続遅延(_U):"
#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#, fuzzy
+msgid "Link _down delay"
msgstr "接断遅延(_D):"
#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#, fuzzy
+msgid "_Primary"
msgstr "プライマリー(_P):"
#: ../src/connection-editor/ce-page-bond.ui.h:24
@@ -1279,7 +1289,8 @@ msgstr ""
#: ../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
-msgid "_MTU:"
+#, fuzzy
+msgid "_MTU"
msgstr "MTU(_M):"
#: ../src/connection-editor/ce-page-bond.ui.h:26
@@ -1292,28 +1303,34 @@ msgid "bytes"
msgstr "バイト"
#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#, fuzzy
+msgid "Path _cost"
msgstr "経路のコスト(_C):"
#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#, fuzzy
+msgid "_Priority"
msgstr "優先度(_P):"
#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#, fuzzy
+msgid "_Hairpin mode"
msgstr "ヘアピンモード(_H):"
#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#, fuzzy
+msgid "Bridged _connections"
msgstr "ブリッジ接続(_C):"
#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#, fuzzy
+msgid "_Forward delay"
msgstr "転送遅延(_F):"
#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#, fuzzy
+msgid "_Hello time"
msgstr "Hello タイム(_H):"
#: ../src/connection-editor/ce-page-bridge.ui.h:9
@@ -1362,7 +1379,8 @@ msgstr ""
"が一番低いブリッジが root ブリッジに選択されます。"
#: ../src/connection-editor/ce-page-bridge.ui.h:17
-msgid "_Max age:"
+#, fuzzy
+msgid "_Max age"
msgstr "最大エイジ(_M):"
#: ../src/connection-editor/ce-page-bridge.ui.h:18
@@ -1370,7 +1388,8 @@ msgid "STP maximum message age, in seconds"
msgstr "STP メッセージの最大エイジ (秒単位)"
#: ../src/connection-editor/ce-page-bridge.ui.h:19
-msgid "_Aging time:"
+#, fuzzy
+msgid "_Aging time"
msgstr "エージング時間(_A):"
#: ../src/connection-editor/ce-page-bridge.ui.h:20
@@ -1378,7 +1397,8 @@ msgid "The Ethernet MAC address aging time, in seconds"
msgstr "イーサネット MAC アドレスのエージングタイム (秒単位)"
#: ../src/connection-editor/ce-page-bridge.ui.h:21
-msgid "Group _forward mask:"
+#, fuzzy
+msgid "Group _forward mask"
msgstr "グループの転送マスク(_F):"
#: ../src/connection-editor/ce-page-bridge.ui.h:22
@@ -1487,10 +1507,6 @@ msgstr "デバイス"
msgid "invalid %s (%s) "
msgstr "無効な %s (%s) "
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "不明なエラーのため、接続シークレットを更新できませんでした。"
-
#: ../src/connection-editor/ce-page-dcb.ui.h:1
msgid "_Use Data Center Bridging (DCB) for this connection"
msgstr "この接続に Data Center Bridging (DCB) を使用する(_U)"
@@ -1556,66 +1572,75 @@ msgid "Enable or disable priority pause transmission for each User Priority."
msgstr "各ユーザー優先度の優先ポーズ転送を、有効もしくは無効にしてください。"
#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "優先度:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#, fuzzy
+msgid "0"
msgstr "0:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#, fuzzy
+msgid "1"
msgstr "1:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#, fuzzy
+msgid "2"
msgstr "2:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#, fuzzy
+msgid "3"
msgstr "3:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#, fuzzy
+msgid "4"
msgstr "4:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#, fuzzy
+msgid "5"
msgstr "5:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#, fuzzy
+msgid "6"
msgstr "6:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#, fuzzy
+msgid "7"
msgstr "7:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#, fuzzy
+msgid "Traffic Class"
msgstr "トラフィッククラス:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#, fuzzy
+msgid "Strict Bandwidth"
msgstr "厳密な帯域幅:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#, fuzzy
+msgid "Priority Bandwidth"
msgstr "優先帯域幅:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "Group Bandwidth"
msgstr "グループ帯域幅:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "Group ID"
msgstr "グループ ID:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
msgid "Enter the priority group ID for each User Priority."
msgstr "各ユーザー優先度に優先グループ ID を入力してください。"
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
#, no-c-format
msgid ""
"Enter the allowed link bandwidth percent each Priority Group may use. The "
@@ -1624,18 +1649,18 @@ msgstr ""
"優先グループが使用する利用可能なリンク帯域幅のパーセンテージを入力してくださ"
"い。各グループの合計を 100% にする必要があります。"
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
msgid ""
"Enter the percentage of priority group bandwidth each user priority may use."
msgstr ""
"ユーザー優先度が使用可能な、優先グループ 帯域幅のパーセンテージを入力してくだ"
"さい。"
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
msgid "Enable or disable strict bandwidth for each user priority."
msgstr "ユーザー優先度の正確な帯域幅を有効または無効にしてください。"
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
msgid "Enter the traffic class for each user priority."
msgstr "各ユーザー優先度にトラフィッククラスを入力してください。"
@@ -1644,7 +1669,8 @@ msgstr "各ユーザー優先度にトラフィッククラスを入力してく
#: ../src/wireless-security/eap-method-leap.ui.h:1
#: ../src/wireless-security/eap-method-simple.ui.h:1
#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#, fuzzy
+msgid "_Username"
msgstr "ユーザー名(_U):"
#: ../src/connection-editor/ce-page-dsl.ui.h:2
@@ -1660,10 +1686,12 @@ msgstr ""
"す。多くのプロバイダーでは、これを空白にする必要があります。"
#: ../src/connection-editor/ce-page-dsl.ui.h:4
-msgid "_Service:"
+#, fuzzy
+msgid "_Service"
msgstr "サービス(_S):"
#: ../src/connection-editor/ce-page-dsl.ui.h:5
+#: ../src/libnma/nma-file-cert-chooser.c:347
#: ../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
@@ -1677,21 +1705,22 @@ 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
#: ../src/wireless-security/eap-method-leap.ui.h:2
#: ../src/wireless-security/eap-method-simple.ui.h:2
#: ../src/wireless-security/ws-leap.ui.h:2
#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#, fuzzy
+msgid "_Password"
msgstr "パスワード(_P):"
#: ../src/connection-editor/ce-page-dsl.ui.h:8
-msgid "PPP _interface:"
+#, fuzzy
+msgid "PPP _interface"
msgstr "PPP インスタンス(_I):"
#: ../src/connection-editor/ce-page-dsl.ui.h:9
-msgid "P_arent interface:"
+#, fuzzy
+msgid "P_arent interface"
msgstr "親インスタンス(_A):"
#: ../src/connection-editor/ce-page-dsl.ui.h:10
@@ -1702,13 +1731,27 @@ msgstr "新規作成された PPP インターフェースに割り当てる任
msgid "The interface on which the PPP connection will be established."
msgstr "PPP 接続が確立されるインターフェース。"
+#: ../src/connection-editor/ce-page-dsl.ui.h:12
+#, fuzzy
+msgid "C_laim interface"
+msgstr "親インスタンス(_A):"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:13
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
#: ../src/connection-editor/ce-page-ethernet.ui.h:1
+#: ../src/connection-editor/ce-page-general.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:142
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:143
#: ../src/wireless-security/eap-method-peap.ui.h:1
msgid "Automatic"
msgstr "自動"
@@ -1754,35 +1797,39 @@ msgid "Full"
msgstr "すべて"
#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:155
+#: ../src/connection-editor/page-ip6.c:156
msgid "Ignore"
msgstr "無視する"
#: ../src/connection-editor/ce-page-ethernet.ui.h:13
#: ../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:191
+#: ../src/connection-editor/page-ip4.c:169
+#: ../src/connection-editor/page-ip6.c:192
msgid "Manual"
msgstr "手動"
#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#, fuzzy
+msgid "_Port"
msgstr "ポート(_P):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:15
#: ../src/connection-editor/ce-page-infiniband.ui.h:6
#: ../src/connection-editor/ce-page-wifi.ui.h:9
-msgid "_Device:"
+#, fuzzy
+msgid "_Device"
msgstr "デバイス(_D):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:16
#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+#, fuzzy
+msgid "C_loned MAC address"
msgstr "クローンした MAC アドレス(_L):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
+#, fuzzy
+msgid "Wake on LAN"
msgstr "Wake on LAN:"
#: ../src/connection-editor/ce-page-ethernet.ui.h:20
@@ -1818,7 +1865,8 @@ msgid "Ma_gic"
msgstr "Magic(_G)"
#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-msgid "_Wake on LAN password:"
+#, fuzzy
+msgid "_Wake on LAN password"
msgstr "Wake on LAN パスワード(_W):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:29
@@ -1827,7 +1875,8 @@ msgid ""
msgstr "Wake-on-LAN パスワード (Ethernet MAC)。magic packet にのみ有効です。"
#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#, fuzzy
+msgid "Lin_k negotiation"
msgstr "リンクネゴシエーション(_K):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:31
@@ -1841,7 +1890,8 @@ msgstr ""
"にしておくか「自動」を選択してください。"
#: ../src/connection-editor/ce-page-ethernet.ui.h:32
-msgid "_Speed:"
+#, fuzzy
+msgid "_Speed"
msgstr "スピード(_S):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:33
@@ -1855,7 +1905,8 @@ msgstr ""
"ポートしていることを確認してください。"
#: ../src/connection-editor/ce-page-ethernet.ui.h:34
-msgid "Duple_x:"
+#, fuzzy
+msgid "Duple_x"
msgstr "二重(_X):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:35
@@ -1868,23 +1919,48 @@ msgstr ""
"していない場合にのみ必要になります。二重モードを指定する前に、デバイスがサ"
"ポートしていることを確認してください。"
-#: ../src/connection-editor/ce-page-general.ui.h:1
-msgid "Automatically connect to _VPN when using this connection"
-msgstr "この接続を使用したときは自動的に VPN に接続する(_V)"
-
#: ../src/connection-editor/ce-page-general.ui.h:2
-msgid "All _users may connect to this network"
-msgstr "全ユーザーがこのネットワークに接続可能とする(_U)"
+msgid "Yes"
+msgstr ""
#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "この接続が利用可能になったときに自動的に接続する(_A)"
+#, fuzzy
+msgid "No"
+msgstr "なし"
#: ../src/connection-editor/ce-page-general.ui.h:4
-msgid "Connection _priority for auto-activation:"
-msgstr "自動アクティベーションの接続優先度(_P)"
+msgid "All _users may connect to this network"
+msgstr "全ユーザーがこのネットワークに接続可能とする(_U)"
#: ../src/connection-editor/ce-page-general.ui.h:5
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "この接続を使用したときは自動的に VPN に接続する(_V)"
+
+#: ../src/connection-editor/ce-page-general.ui.h:6
+#, fuzzy
+msgid "Firewall _zone"
+msgstr "ファイアウォールゾーン(_Z):"
+
+#: ../src/connection-editor/ce-page-general.ui.h:7
+#, fuzzy
+msgid "_Metered connection"
+msgstr "チーム接続(_T):"
+
+#: ../src/connection-editor/ce-page-general.ui.h:8
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:9
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "自動取得したルートを無視する(_N)"
+
+#: ../src/connection-editor/ce-page-general.ui.h:10
msgid ""
"Connection priority for automatic activation. Connections with higher "
"numbers are preferred when selecting profiles for automatic activation. "
@@ -1893,11 +1969,7 @@ msgstr ""
"自動アクティベーションの接続優先度。自動アクティベーションのプロファイル選択"
"時に、より大きい数字の接続が優先されます。デフォルト値は 0 です。"
-#: ../src/connection-editor/ce-page-general.ui.h:6
-msgid "Firewall _zone:"
-msgstr "ファイアウォールゾーン(_Z):"
-
-#: ../src/connection-editor/ce-page.h:111
+#: ../src/connection-editor/ce-page.h:109
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."
@@ -1905,7 +1977,7 @@ msgstr ""
"IP アドレスはネットワーク上のコンピューターを指定します。「追加」ボタンを押し"
"て、自動設定とは別に設定される静的 IP アドレスを追加します。"
-#: ../src/connection-editor/ce-page.h:116
+#: ../src/connection-editor/ce-page.h:114
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 "
@@ -1916,15 +1988,15 @@ msgstr ""
"するアドレス範囲を決定します。「追加」ボタンを押して IP アドレスを追加しま"
"す。アドレスが提供されないと、範囲は自動的に決定します。"
-#: ../src/connection-editor/ce-page.h:121
+#: ../src/connection-editor/ce-page.h:119
msgid "Additional static addresses"
msgstr "その他の静的アドレス"
-#: ../src/connection-editor/ce-page.h:122
+#: ../src/connection-editor/ce-page.h:120
msgid "Addresses"
msgstr "アドレス"
-#: ../src/connection-editor/ce-page.h:123
+#: ../src/connection-editor/ce-page.h:121
msgid "Address (optional)"
msgstr "アドレス (オプション)"
@@ -1939,7 +2011,8 @@ msgid "Connected"
msgstr "コネクション型"
#: ../src/connection-editor/ce-page-infiniband.ui.h:5
-msgid "_Transport mode:"
+#, fuzzy
+msgid "_Transport mode"
msgstr "転送モード(_T):"
#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
@@ -1980,37 +2053,45 @@ msgstr "VTI6"
#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
#: ../src/connection-editor/ce-page-macsec.ui.h:6
-msgid "Device name:"
+#, fuzzy
+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:"
+#, fuzzy
+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:"
+#, fuzzy
+msgid "Mode"
msgstr "モード:"
#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-msgid "Local IP:"
+#, fuzzy
+msgid "Local IP"
msgstr "ローカル IP:"
#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-msgid "Remote IP:"
+#, fuzzy
+msgid "Remote IP"
msgstr "リモート IP:"
#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-msgid "Input key:"
+#, fuzzy
+msgid "Input key"
msgstr "入力キー:"
#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-msgid "Output key:"
+#, fuzzy
+msgid "Output key"
msgstr "出力キー:"
#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
-msgid "MTU:"
+#, fuzzy
+msgid "MTU"
msgstr "MTU:"
#: ../src/connection-editor/ce-page-ip4.ui.h:2
@@ -2025,14 +2106,15 @@ 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:211
+#: ../src/connection-editor/page-ip4.c:189
+#: ../src/connection-editor/page-ip6.c:212
msgid "Shared to other computers"
msgstr "他のコンピューターへ共有"
#: ../src/connection-editor/ce-page-ip4.ui.h:6
#: ../src/connection-editor/ce-page-ip6.ui.h:11
-msgid "_Method:"
+#, fuzzy
+msgid "_Method"
msgstr "方式(_M):"
#: ../src/connection-editor/ce-page-ip4.ui.h:9
@@ -2055,21 +2137,24 @@ msgstr ""
"使います。"
#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#, fuzzy
+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:15
-#: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:346
-msgid "S_earch domains:"
+#: ../src/connection-editor/page-ip4.c:373
+#: ../src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
msgstr "ドメインを検索(_E):"
#: ../src/connection-editor/ce-page-ip4.ui.h:13
#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:337
-msgid "DNS ser_vers:"
+#: ../src/connection-editor/page-ip4.c:364
+#: ../src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
msgstr "DNS サーバー(_V):"
#: ../src/connection-editor/ce-page-ip4.ui.h:14
@@ -2099,7 +2184,7 @@ 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
+#: ../src/connection-editor/page-ip4.c:199
msgid "Disabled"
msgstr "無効"
@@ -2130,11 +2215,13 @@ msgstr ""
"ンクローカルアドレスは、接続中のインターフェースに自動的にスコープされます。"
#: ../src/connection-editor/ce-page-ip6.ui.h:18
-msgid "IPv6 _privacy extensions:"
+#, fuzzy
+msgid "IPv6 _privacy extensions"
msgstr "IPv6 のプライバシー拡張(_P):"
#: ../src/connection-editor/ce-page-ip6.ui.h:19
-msgid "IPv6 address _generation mode:"
+#, fuzzy
+msgid "IPv6 address _generation mode"
msgstr "IPv6 アドレス生成モード(_G):"
#: ../src/connection-editor/ce-page-ip6.ui.h:20
@@ -2203,27 +2290,33 @@ msgstr ""
"モードでは、802.1X セキュリティーページにパラメーターを追加します。"
#: ../src/connection-editor/ce-page-macsec.ui.h:14
-msgid "CKN:"
+#, fuzzy
+msgid "CKN"
msgstr "CKN:"
#: ../src/connection-editor/ce-page-macsec.ui.h:15
-msgid "CAK:"
+#, fuzzy
+msgid "CAK"
msgstr "CAK:"
#: ../src/connection-editor/ce-page-macsec.ui.h:17
-msgid "Keys:"
+#, fuzzy
+msgid "Keys"
msgstr "キー:"
#: ../src/connection-editor/ce-page-macsec.ui.h:18
-msgid "Parameters:"
+#, fuzzy
+msgid "Parameters"
msgstr "パラメーター:"
#: ../src/connection-editor/ce-page-macsec.ui.h:19
-msgid "Validation:"
+#, fuzzy
+msgid "Validation"
msgstr "検証:"
#: ../src/connection-editor/ce-page-macsec.ui.h:20
-msgid "SCI port:"
+#, fuzzy
+msgid "SCI port"
msgstr "SCI ポート:"
#: ../src/connection-editor/ce-page-macsec.ui.h:21
@@ -2248,7 +2341,8 @@ msgid "Basic"
msgstr "基本"
#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#, fuzzy
+msgid "Nu_mber"
msgstr "番号(_M):"
#: ../src/connection-editor/ce-page-mobile.ui.h:5
@@ -2256,11 +2350,13 @@ msgid "Advanced"
msgstr "高度"
#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#, fuzzy
+msgid "_APN"
msgstr "APN(_A):"
#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#, fuzzy
+msgid "N_etwork ID"
msgstr "ネットワーク ID(_E):"
#: ../src/connection-editor/ce-page-mobile.ui.h:8
@@ -2268,7 +2364,8 @@ msgid "Change…"
msgstr "変更..."
#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#, fuzzy
+msgid "P_IN"
msgstr "PIN 番号(_I):"
#: ../src/connection-editor/ce-page-mobile.ui.h:10
@@ -2276,6 +2373,7 @@ msgid "Allow _roaming if home network is not available"
msgstr "ホームネットワークが利用できない場合にローミングを許可(_R)"
#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:454
msgid "Sho_w passwords"
msgstr "パスワードを表示(_W)"
@@ -2284,7 +2382,8 @@ msgid "Authentication"
msgstr "認証"
#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#, fuzzy
+msgid "Allowed methods"
msgstr "利用可能な認証方法:"
# "auth_methods_button"ボタンのラベル
@@ -2343,11 +2442,13 @@ msgstr ""
"このプロキシ設定を、ブラウザーのクライアント/スキームにのみ使用します。"
#: ../src/connection-editor/ce-page-proxy.ui.h:5
-msgid "PAC URL:"
+#, fuzzy
+msgid "PAC URL"
msgstr "PAC URL:"
#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC script:"
+#, fuzzy
+msgid "PAC script"
msgstr "PAC スクリプト:"
#: ../src/connection-editor/ce-page-proxy.ui.h:7
@@ -2359,7 +2460,8 @@ msgid "Import script from a file…"
msgstr "ファイルからスクリプトをインポート..."
#: ../src/connection-editor/ce-page-proxy.ui.h:9
-msgid "Method:"
+#, fuzzy
+msgid "Method"
msgstr "方式:"
#: ../src/connection-editor/ce-page-team-port.ui.h:1
@@ -2392,7 +2494,8 @@ msgid "Team Advanced Options"
msgstr "チームの高度なオプション"
#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#, fuzzy
+msgid "_Queue ID"
msgstr "キュー ID(_ID):"
#: ../src/connection-editor/ce-page-team-port.ui.h:8
@@ -2413,7 +2516,8 @@ msgid "Active-Backup runner options"
msgstr "Active-Backup ランナーオプション"
#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "_Port priority:"
+#, fuzzy
+msgid "_Port priority"
msgstr "ポート優先度(_P):"
#: ../src/connection-editor/ce-page-team-port.ui.h:12
@@ -2433,24 +2537,21 @@ msgid "Port _sticky"
msgstr "ポート付箋(_S)"
#: ../src/connection-editor/ce-page-team-port.ui.h:15
-#: ../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."
+msgid "Do not unselect the port if a better one becomes available."
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:"
+#, fuzzy
+msgid "_LACP port priority"
msgstr "LACP ポート優先度(_L):"
#: ../src/connection-editor/ce-page-team-port.ui.h:18
-msgid "LACP port _key:"
+#, fuzzy
+msgid "LACP port _key"
msgstr "LACP ポートキー(_K):"
#: ../src/connection-editor/ce-page-team-port.ui.h:19
@@ -2486,42 +2587,50 @@ msgstr "LACP 標準に準拠したポートキー。同じキーのポートだ
#: ../src/connection-editor/ce-page-team-port.ui.h:24
#: ../src/connection-editor/ce-page-team.ui.h:70
-msgid "_Link watcher:"
+#, fuzzy
+msgid "_Link watcher"
msgstr "リンクウォッチャー(_L):"
#: ../src/connection-editor/ce-page-team-port.ui.h:25
#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#, fuzzy
+msgid "_Up delay"
msgstr "アップ遅延(_U):"
#: ../src/connection-editor/ce-page-team-port.ui.h:26
#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#, fuzzy
+msgid "_Down delay"
msgstr "ダウン遅延(_D):"
#: ../src/connection-editor/ce-page-team-port.ui.h:27
#: ../src/connection-editor/ce-page-team.ui.h:73
-msgid "Send _interval:"
+#, fuzzy
+msgid "Send _interval"
msgstr "送信間隔(_I):"
#: ../src/connection-editor/ce-page-team-port.ui.h:28
#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#, fuzzy
+msgid "Delay _before first send"
msgstr "初回送信までの遅延(_B):"
#: ../src/connection-editor/ce-page-team-port.ui.h:29
#: ../src/connection-editor/ce-page-team.ui.h:75
-msgid "_Maximum missed replies:"
+#, fuzzy
+msgid "_Maximum missed replies"
msgstr "不在着信となった返信の最大数(_M):"
#: ../src/connection-editor/ce-page-team-port.ui.h:30
#: ../src/connection-editor/ce-page-team.ui.h:76
-msgid "_Source host:"
+#, fuzzy
+msgid "_Source host"
msgstr "ソースホスト(_S):"
#: ../src/connection-editor/ce-page-team-port.ui.h:31
#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#, fuzzy
+msgid "_Target host"
msgstr "ターゲットホスト(_T):"
#: ../src/connection-editor/ce-page-team-port.ui.h:32
@@ -2557,11 +2666,20 @@ msgid "Ignore invalid packets from _active ports"
msgstr "アクティブなポートからの無効なパケットを無視(_A)"
#: ../src/connection-editor/ce-page-team-port.ui.h:36
+#: ../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:37
#: ../src/connection-editor/ce-page-team.ui.h:83
msgid "Ignore invalid packets from i_nactive ports"
msgstr "アクティブでないポートからの無効なパケットを無視(_N)"
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
+#: ../src/connection-editor/ce-page-team-port.ui.h:38
#: ../src/connection-editor/ce-page-team.ui.h:84
msgid ""
"Validate received ARP packets on inactive ports. If this is not checked, all "
@@ -2570,12 +2688,12 @@ msgstr ""
"アクティブでないポートで受信した ARP パケットを検証します。これを確認しない"
"と、着信 ARP パケットはすべて正常な返信とみなされます。"
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
+#: ../src/connection-editor/ce-page-team-port.ui.h:39
#: ../src/connection-editor/ce-page-team.ui.h:85
msgid "S_end on inactive ports"
msgstr "アクティブでないポートで送信(_E)"
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
+#: ../src/connection-editor/ce-page-team-port.ui.h:40
#: ../src/connection-editor/ce-page-team.ui.h:86
msgid ""
"By default, ARP requests are sent on active ports only. This option allows "
@@ -2584,50 +2702,51 @@ msgstr ""
"デフォルトでは、ARP リクエストはアクティブなポートでのみ送信されます。このオ"
"プションを使用すると、アクティブでないポートでも送信されるようになります。"
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
+#: ../src/connection-editor/ce-page-team-port.ui.h:41
#: ../src/connection-editor/ce-page-team.ui.h:87
msgid ""
"The delay between the link coming up and the runner being notified about it."
msgstr "リンクがアップになってからランナーが通知されるまでの遅延。"
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
+#: ../src/connection-editor/ce-page-team-port.ui.h:42
#: ../src/connection-editor/ce-page-team.ui.h:88
msgid ""
"The delay between the link going down and the runner being notified about it."
msgstr "リンクがダウンになってからランナーが通知されるまでの遅延。"
-#: ../src/connection-editor/ce-page-team-port.ui.h:42
+#: ../src/connection-editor/ce-page-team-port.ui.h:43
#: ../src/connection-editor/ce-page-team.ui.h:89
msgid "The interval between requests being sent."
msgstr "リクエストの送信間隔。"
-#: ../src/connection-editor/ce-page-team-port.ui.h:43
+#: ../src/connection-editor/ce-page-team-port.ui.h:44
#: ../src/connection-editor/ce-page-team.ui.h:90
msgid ""
"The delay between link watch initialization and the first request being sent."
msgstr "リンクウォッチの初期化から初回リクエスト送信までの遅延。"
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
+#: ../src/connection-editor/ce-page-team-port.ui.h:45
#: ../src/connection-editor/ce-page-team.ui.h:91
msgid "The link watcher to be used."
msgstr "使用するリンクウォッチャー。"
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
+#: ../src/connection-editor/ce-page-team-port.ui.h:46
#: ../src/connection-editor/ce-page-team.ui.h:92
msgid "Link Watcher"
msgstr "リンクウォッチャー"
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
+#: ../src/connection-editor/ce-page-team-port.ui.h:47
#: ../src/connection-editor/ce-page-team.ui.h:93
msgid "Im_port team configuration from a file…"
msgstr "ファイルからチーム設定をインポートする(_P)..."
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
+#: ../src/connection-editor/ce-page-team-port.ui.h:48
#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#, fuzzy
+msgid "Edit _JSON configuration"
msgstr "JSON 設定の編集(_J):"
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
+#: ../src/connection-editor/ce-page-team-port.ui.h:49
#: ../src/connection-editor/ce-page-team.ui.h:95
msgid "Raw Configuration"
msgstr "Raw 設定"
@@ -2665,7 +2784,8 @@ msgid "From active to team device"
msgstr "アクティブからチームデバイスへ"
#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#, fuzzy
+msgid "_Teamed connections"
msgstr "チーム接続(_T):"
#: ../src/connection-editor/ce-page-team.ui.h:23
@@ -2678,14 +2798,14 @@ msgstr "LACP"
#: ../src/connection-editor/ce-page-team.ui.h:27
#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:351
+#: ../src/connection-editor/page-ethernet.c:348
#: ../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:120
-#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
#: ../src/libnm-gtk/nm-ui-utils.c:583
msgid "VLAN"
msgstr "VLAN"
@@ -2715,23 +2835,28 @@ msgid "Any L4 protocol"
msgstr "すべての L4 プロトコル"
#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#, fuzzy
+msgid "_Peer notification count"
msgstr "ピア通知数(_P):"
#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#, fuzzy
+msgid "Peer _notification interval"
msgstr "ピア通知間隔(_N):"
#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#, fuzzy
+msgid "_Multicast rejoin count"
msgstr "マルチキャスト再参加数(_M):"
#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#, fuzzy
+msgid "Multicast _rejoin interval"
msgstr "マルチキャスト再参加間隔(_R):"
#: ../src/connection-editor/ce-page-team.ui.h:46
-msgid "_Hardware Address:"
+#, fuzzy
+msgid "_Hardware Address"
msgstr "ハードウェアアドレス(_H):"
#: ../src/connection-editor/ce-page-team.ui.h:47
@@ -2743,11 +2868,13 @@ msgstr ""
"す。"
#: ../src/connection-editor/ce-page-team.ui.h:49
-msgid "_Runner:"
+#, fuzzy
+msgid "_Runner"
msgstr "ランナー(_R):"
#: ../src/connection-editor/ce-page-team.ui.h:50
-msgid "_Hardware address policy:"
+#, fuzzy
+msgid "_Hardware address policy"
msgstr "ハードウェアアドレスポリシー(_H):"
#: ../src/connection-editor/ce-page-team.ui.h:51
@@ -2789,15 +2916,18 @@ msgstr ""
"入れない場合は、30 秒ごとに送信されます。"
#: ../src/connection-editor/ce-page-team.ui.h:57
-msgid "_System priority:"
+#, fuzzy
+msgid "_System priority"
msgstr "システム優先度(_S):"
#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#, fuzzy
+msgid "_Minimum ports"
msgstr "最小ポート数(_M):"
#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#, fuzzy
+msgid "_Aggregator selection policy"
msgstr "アグリゲーター選択ポリシー(_A):"
#: ../src/connection-editor/ce-page-team.ui.h:60
@@ -2838,11 +2968,13 @@ msgstr ""
"効になっています。"
#: ../src/connection-editor/ce-page-team.ui.h:67
-msgid "Transmission _balancing interval:"
+#, fuzzy
+msgid "Transmission _balancing interval"
msgstr "転送バランシングの間隔(_B):"
#: ../src/connection-editor/ce-page-team.ui.h:68
-msgid "_Transmission balancer:"
+#, fuzzy
+msgid "_Transmission balancer"
msgstr "転送バランサー(_T):"
#: ../src/connection-editor/ce-page-team.ui.h:69
@@ -2850,23 +2982,28 @@ msgid "Runner"
msgstr "ランナー"
#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#, fuzzy
+msgid "_Parent interface"
msgstr "親インターフェース(_P):"
#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
+#, fuzzy
+msgid "VLAN inter_face name"
msgstr "VLAN インターフェース名(_F):"
#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
+#, fuzzy
+msgid "Cloned MAC _address"
msgstr "クローンの MAC アドレス(_A):"
#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#, fuzzy
+msgid "VLAN _id"
msgstr "VLAN ID(_I):"
#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#, fuzzy
+msgid "Flags"
msgstr "フラグ"
#: ../src/connection-editor/ce-page-vlan.ui.h:8
@@ -2896,7 +3033,8 @@ msgid "\"vlan\" + number"
msgstr "\"vlan\" + 番号"
#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#, fuzzy
+msgid "S_ecurity"
msgstr "セキュリティー(_E):"
#: ../src/connection-editor/ce-page-wifi.ui.h:2
@@ -2924,7 +3062,8 @@ msgid "mW"
msgstr "mW"
#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#, fuzzy
+msgid "Transmission po_wer"
msgstr "送信パワー(_W):"
#: ../src/connection-editor/ce-page-wifi.ui.h:13
@@ -2932,23 +3071,28 @@ msgid "Mb/s"
msgstr "Mb/s"
#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#, fuzzy
+msgid "_Rate"
msgstr "レート(_R):"
#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#, fuzzy
+msgid "_BSSID"
msgstr "BSSID(_B):"
#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#, fuzzy
+msgid "C_hannel"
msgstr "チャンネル(_H):"
#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#, fuzzy
+msgid "Ban_d"
msgstr "バンド(_D):"
#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#, fuzzy
+msgid "SS_ID"
msgstr "SSID(_I):"
#: ../src/connection-editor/ce-polkit.c:63
@@ -3013,154 +3157,145 @@ msgstr ""
"が失敗する場合は、認証方法を一部無効にしてみてください。"
#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
msgid "Wi-Fi"
msgstr "Wi-Fi"
#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/connection-editor/page-bluetooth.c:120
#: ../src/libnm-gtk/nm-ui-utils.c:325
msgid "Bluetooth"
msgstr "Bluetooth"
#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:201
+#: ../src/connection-editor/page-dsl.c:217
msgid "DSL/PPPoE"
msgstr "DSL/PPPoE"
#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:148
+#: ../src/connection-editor/page-infiniband.c:145
#: ../src/libnm-gtk/nm-ui-utils.c:331
msgid "InfiniBand"
msgstr "InfiniBand"
#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../src/connection-editor/page-bond.c:443 ../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:118
-#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/page-team.c:1028 ../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:119
-#: ../src/connection-editor/page-bridge.c:233
+#: ../src/connection-editor/page-bridge.c:230
#: ../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:121
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: ../src/connection-editor/page-ip-tunnel.c:173
msgid "IP tunnel"
msgstr "IP トンネル"
#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:190
+#: ../src/connection-editor/page-macsec.c:187
msgid "MACsec"
msgstr "MACsec"
#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:398
-#: ../src/connection-editor/page-vpn.c:103
+#: ../src/connection-editor/connection-helpers.c:386
+#: ../src/connection-editor/page-vpn.c:100
msgid "VPN"
msgstr "VPN"
-#: ../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."
+#: ../src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
msgstr ""
"VPN プラグインは、VPN 接続の正常なインポートに失敗しました\n"
"\n"
"エラー: VPN サービスタイプがありません。"
-#: ../src/connection-editor/connection-helpers.c:219
-msgid "Cannot import VPN connection"
-msgstr "VPN 接続をインポートできません"
+#: ../src/connection-editor/connection-helpers.c:293
+#: ../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:221
-#, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
-msgstr ""
-"ファイル '%s' が読み込めなかったか、認識される VPN 接続情報がありません\n"
-"\n"
-"エラー: %s"
-
-#: ../src/connection-editor/connection-helpers.c:222
-msgid "unknown error"
-msgstr "不明なエラー"
-
-#: ../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:309
+#: ../src/connection-editor/connection-helpers.c:297
#: ../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
+#: ../src/connection-editor/connection-helpers.c:328
msgid "Hardware"
msgstr "ハードウェア"
-#: ../src/connection-editor/connection-helpers.c:367
+#: ../src/connection-editor/connection-helpers.c:355
msgid "Virtual"
msgstr "仮想"
-#: ../src/connection-editor/connection-helpers.c:516
-#: ../src/connection-editor/connection-helpers.c:518
+#: ../src/connection-editor/connection-helpers.c:504
+#: ../src/connection-editor/connection-helpers.c:506
msgid "Import a saved VPN configuration…"
msgstr "保存した VPN 設定をインポートする..."
-#: ../src/connection-editor/connection-helpers.c:548
+#: ../src/connection-editor/connection-helpers.c:536
msgid ""
"The connection editor dialog could not be initialized due to an unknown "
"error."
msgstr ""
"接続エディターのダイアログは、不明なエラーのため初期化できませんでした。"
-#: ../src/connection-editor/connection-helpers.c:557
+#: ../src/connection-editor/connection-helpers.c:545
msgid "Could not create new connection"
msgstr "新しい接続を作成できませんでした"
-#: ../src/connection-editor/connection-helpers.c:720
+#: ../src/connection-editor/connection-helpers.c:708
msgid "Connection delete failed"
msgstr "接続の削除に失敗しました"
-#: ../src/connection-editor/connection-helpers.c:768
+#: ../src/connection-editor/connection-helpers.c:756
#, c-format
msgid "Are you sure you wish to delete the connection %s?"
msgstr "接続 %s を削除してもよろしいですか?"
+#: ../src/connection-editor/gtk/menus.ui.h:1
+#, fuzzy
+msgid "_New Connection"
+msgstr "VPN 接続(_V)"
+
+#: ../src/connection-editor/gtk/menus.ui.h:2
+msgid "_Quit"
+msgstr ""
+
#: ../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:1118
+#: ../src/connection-editor/page-ip4.c:1133
+#: ../src/connection-editor/page-ip6.c:1115
msgid "Address"
msgstr "アドレス"
#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: ../src/connection-editor/page-ip4.c:1152
msgid "Netmask"
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:1156
+#: ../src/connection-editor/page-ip4.c:1171
+#: ../src/connection-editor/page-ip6.c:1153
msgid "Gateway"
msgstr "ゲートウェイ"
@@ -3170,38 +3305,38 @@ msgid "Metric"
msgstr "メトリック"
#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1137
+#: ../src/connection-editor/page-ip6.c:1134
msgid "Prefix"
msgstr "プレフィックス"
-#: ../src/connection-editor/nm-connection-editor.c:109
+#: ../src/connection-editor/nm-connection-editor.c:110
#, c-format
msgid "Editing %s"
msgstr "%s の編集"
-#: ../src/connection-editor/nm-connection-editor.c:113
+#: ../src/connection-editor/nm-connection-editor.c:114
msgid "Editing un-named connection"
msgstr "無名の接続を編集"
-#: ../src/connection-editor/nm-connection-editor.c:133
+#: ../src/connection-editor/nm-connection-editor.c:134
msgid "Missing connection name"
msgstr "接続名がみつかりません"
-#: ../src/connection-editor/nm-connection-editor.c:349
+#: ../src/connection-editor/nm-connection-editor.c:350
msgid "Editor initializing…"
msgstr "エディターの初期化中..."
-#: ../src/connection-editor/nm-connection-editor.c:356
-#: ../src/connection-editor/nm-connection-list.c:443
+#: ../src/connection-editor/nm-connection-editor.c:357
+#: ../src/connection-editor/nm-connection-list.c:471
msgid "Connection cannot be modified"
msgstr "接続を変更できません"
-#: ../src/connection-editor/nm-connection-editor.c:371
+#: ../src/connection-editor/nm-connection-editor.c:372
#, c-format
msgid "Invalid setting %s: %s"
msgstr "無効な設定 %s: %s"
-#: ../src/connection-editor/nm-connection-editor.c:447
+#: ../src/connection-editor/nm-connection-editor.c:448
msgid ""
"The connection editor could not find some required resources (the .ui file "
"was not found)."
@@ -3209,33 +3344,33 @@ msgstr ""
"接続エディターは、必要なリソースをいくつか見つけられませんでした (.ui ファイ"
"ルが見つかりませんでした)。"
-#: ../src/connection-editor/nm-connection-editor.c:574
+#: ../src/connection-editor/nm-connection-editor.c:581
#: ../src/connection-editor/vpn-helpers.c:213
msgid "_Save"
msgstr "保存(_S)"
-#: ../src/connection-editor/nm-connection-editor.c:575
+#: ../src/connection-editor/nm-connection-editor.c:582
msgid "Save any changes made to this connection."
msgstr "この接続に対する変更をすべて保存します。"
-#: ../src/connection-editor/nm-connection-editor.c:576
+#: ../src/connection-editor/nm-connection-editor.c:583
msgid "Authenticate to save this connection for all users of this machine."
msgstr ""
"このマシンのすべてのユーザーに対して、この接続を保存するために認証する。"
-#: ../src/connection-editor/nm-connection-editor.c:592
+#: ../src/connection-editor/nm-connection-editor.c:599
msgid "Could not create connection"
msgstr "新しい接続を作成できませんでした"
-#: ../src/connection-editor/nm-connection-editor.c:592
+#: ../src/connection-editor/nm-connection-editor.c:599
msgid "Could not edit connection"
msgstr "接続を編集できませんでした"
-#: ../src/connection-editor/nm-connection-editor.c:594
+#: ../src/connection-editor/nm-connection-editor.c:601
msgid "Unknown error creating connection editor dialog."
msgstr "接続エディターダイアログの作成中に不明なエラーです。"
-#: ../src/connection-editor/nm-connection-editor.c:735
+#: ../src/connection-editor/nm-connection-editor.c:742
msgid ""
"Warning: the connection contains some properties not supported by the "
"editor. They will be cleared upon save."
@@ -3243,11 +3378,11 @@ msgstr ""
"警告: この接続には、エディターがサポートしていないプロパティーが含まれていま"
"す。保存後するとこれらは消去されます。"
-#: ../src/connection-editor/nm-connection-editor.c:755
+#: ../src/connection-editor/nm-connection-editor.c:762
msgid "Error initializing editor"
msgstr "エディターの初期化中にエラーです"
-#: ../src/connection-editor/nm-connection-editor.c:1153
+#: ../src/connection-editor/nm-connection-editor.c:1169
msgid "Connection add failed"
msgstr "接続の追加に失敗しました"
@@ -3264,7 +3399,8 @@ msgstr ""
"す。"
#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
+#, fuzzy
+msgid "Connection _name"
msgstr "接続名(_N):"
#: ../src/connection-editor/nm-connection-editor.ui.h:4
@@ -3295,119 +3431,144 @@ msgstr "再ラベル付け"
msgid "Filename"
msgstr "ファイル名"
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:148
msgid "never"
msgstr "未接続"
-#: ../src/connection-editor/nm-connection-list.c:162
-#: ../src/connection-editor/nm-connection-list.c:173
+#: ../src/connection-editor/nm-connection-list.c:159
+#: ../src/connection-editor/nm-connection-list.c:170
msgid "now"
msgstr "接続中"
#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:180
+#: ../src/connection-editor/nm-connection-list.c:177
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%d 分前"
-#: ../src/connection-editor/nm-connection-list.c:184
+#: ../src/connection-editor/nm-connection-list.c:181
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%d 時間前"
-#: ../src/connection-editor/nm-connection-list.c:196
+#: ../src/connection-editor/nm-connection-list.c:193
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "%d 日前"
-#: ../src/connection-editor/nm-connection-list.c:202
+#: ../src/connection-editor/nm-connection-list.c:199
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
msgstr[0] "%d ヶ月前"
-#: ../src/connection-editor/nm-connection-list.c:206
+#: ../src/connection-editor/nm-connection-list.c:203
#, c-format
msgid "%d year ago"
msgid_plural "%d years ago"
msgstr[0] "%d 年前"
-#: ../src/connection-editor/nm-connection-list.c:445
+#: ../src/connection-editor/nm-connection-list.c:473
msgid "Connection cannot be deleted"
msgstr "接続を削除できません"
-#: ../src/connection-editor/nm-connection-list.c:448
+#: ../src/connection-editor/nm-connection-list.c:476
msgid "Select a connection to edit"
msgstr "編集する接続を選択"
-#: ../src/connection-editor/nm-connection-list.c:450
+#: ../src/connection-editor/nm-connection-list.c:478
msgid "Select a connection to delete"
msgstr "削除する接続を選択"
-#: ../src/connection-editor/nm-connection-list.c:785
+#: ../src/connection-editor/nm-connection-list.c:794
#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
msgid "Name"
msgstr "名前"
-#: ../src/connection-editor/nm-connection-list.c:798
+#: ../src/connection-editor/nm-connection-list.c:807
msgid "Last Used"
msgstr "前回の使用"
-#: ../src/connection-editor/nm-connection-list.c:836
+#: ../src/connection-editor/nm-connection-list.c:845
msgid "Edit the selected connection"
msgstr "選択した接続を編集する"
-#: ../src/connection-editor/nm-connection-list.c:837
+#: ../src/connection-editor/nm-connection-list.c:846
msgid "Authenticate to edit the selected connection"
msgstr "選択した接続の編集を認証する"
-#: ../src/connection-editor/nm-connection-list.c:842
+#: ../src/connection-editor/nm-connection-list.c:851
msgid "Delete the selected connection"
msgstr "選択した接続を削除する"
-#: ../src/connection-editor/nm-connection-list.c:843
+#: ../src/connection-editor/nm-connection-list.c:852
msgid "Authenticate to delete the selected connection"
msgstr "選択した接続の削除を認証する"
-#: ../src/connection-editor/nm-connection-list.c:1048
-#: ../src/connection-editor/nm-connection-list.c:1051
+#: ../src/connection-editor/nm-connection-list.c:1059
+#, fuzzy, c-format
+msgid "Unrecognized connection type"
+msgstr "サポートされていないモバイルブロードバンドの接続タイプ。"
+
+#: ../src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "接続 '%s' の作成方法がわかりません"
+
+#: ../src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "接続の編集エラー"
+
+#: ../src/connection-editor/nm-connection-list.c:1075
+#: ../src/connection-editor/nm-connection-list.c:1090
+#: ../src/connection-editor/nm-connection-list.c:1093
msgid "Error creating connection"
msgstr "接続の作成中にエラー"
-#: ../src/connection-editor/nm-connection-list.c:1049
+#: ../src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "接続を変更できません"
+
+#: ../src/connection-editor/nm-connection-list.c:1091
msgid "No VPN plugins are installed."
msgstr "VPN プラグインがインストールされていません"
-#: ../src/connection-editor/nm-connection-list.c:1052
+#: ../src/connection-editor/nm-connection-list.c:1094
#, c-format
msgid "Don’t know how to create “%s” connections"
msgstr "接続 '%s' の作成方法がわかりません"
-#: ../src/connection-editor/nm-connection-list.c:1085
+#: ../src/connection-editor/nm-connection-list.c:1128
msgid "Error editing connection"
msgstr "接続の編集エラー"
-#: ../src/connection-editor/nm-connection-list.c:1086
+#: ../src/connection-editor/nm-connection-list.c:1129
#, c-format
msgid "Did not find a connection with UUID “%s”"
msgstr "UUID '%s' の接続が見つかりませんでした"
+#: ../src/connection-editor/nm-connection-list.ui.h:1
+msgid "Network Connections"
+msgstr "ネットワーク接続"
+
#: ../src/connection-editor/nm-connection-list.ui.h:2
msgid "Add a new connection"
msgstr "新規接続を追加"
-#: ../src/connection-editor/page-8021x-security.c:116
+#: ../src/connection-editor/page-8021x-security.c:113
msgid "802.1X Security"
msgstr "802.1X セキュリティー"
-#: ../src/connection-editor/page-8021x-security.c:118
+#: ../src/connection-editor/page-8021x-security.c:115
msgid "Could not load 802.1X Security user interface."
msgstr "802.1X セキュリティーユーザーインターフェースを読み込めません。"
-#: ../src/connection-editor/page-8021x-security.c:132
+#: ../src/connection-editor/page-8021x-security.c:129
msgid "Use 802.1_X security for this connection"
msgstr "この接続に 802.1X セキュリティーを使用する(_X)"
@@ -3415,54 +3576,54 @@ msgstr "この接続に 802.1X セキュリティーを使用する(_X)"
msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
msgstr "Bluetooth デバイスの MAC アドレス。例: 00:11:22:33:44:55"
-#: ../src/connection-editor/page-bluetooth.c:125
+#: ../src/connection-editor/page-bluetooth.c:122
msgid "Could not load Bluetooth user interface."
msgstr "Bluetooth ユーザーインターフェースを読み込めませんでした。"
-#: ../src/connection-editor/page-bluetooth.c:173
+#: ../src/connection-editor/page-bluetooth.c:170
#, c-format
msgid "invalid Bluetooth device (%s)"
msgstr "無効な Bluetooth デバイス (%s)"
-#: ../src/connection-editor/page-bluetooth.c:256
+#: ../src/connection-editor/page-bluetooth.c:253
#, c-format
msgid "Bluetooth connection %d"
msgstr "Bluetooth 接続 %d"
-#: ../src/connection-editor/page-bluetooth.c:306
+#: ../src/connection-editor/page-bluetooth.c:304
msgid "Bluetooth Type"
msgstr "Bluetooth タイプ"
-#: ../src/connection-editor/page-bluetooth.c:324
+#: ../src/connection-editor/page-bluetooth.c:322
msgid "Select the type of the Bluetooth connection profile."
msgstr "Bluetooth 接続プロファイルのタイプを選択します。"
-#: ../src/connection-editor/page-bluetooth.c:329
+#: ../src/connection-editor/page-bluetooth.c:327
msgid "_Personal Area Network"
msgstr "パーソナルエリアネットワーク(_P)"
-#: ../src/connection-editor/page-bluetooth.c:334
+#: ../src/connection-editor/page-bluetooth.c:332
msgid "_Dial-Up Network"
msgstr "ダイヤルアップネットワーク(_D)"
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:446
msgid "Could not load bond user interface."
msgstr "bond ユーザーインターフェースを読み込めません。"
-#: ../src/connection-editor/page-bond.c:568
+#: ../src/connection-editor/page-bond.c:565
msgid "primary"
msgstr "プライマリー"
-#: ../src/connection-editor/page-bond.c:623
+#: ../src/connection-editor/page-bond.c:620
#, c-format
msgid "Bond connection %d"
msgstr "ボンド接続 %d"
-#: ../src/connection-editor/page-bridge.c:236
+#: ../src/connection-editor/page-bridge.c:233
msgid "Could not load bridge user interface."
msgstr "ブリッジユーザーインターフェースを読み込めません。"
-#: ../src/connection-editor/page-bridge.c:352
+#: ../src/connection-editor/page-bridge.c:349
#, c-format
msgid "Bridge connection %d"
msgstr "ブリッジ接続 %d"
@@ -3470,31 +3631,31 @@ msgstr "ブリッジ接続 %d"
#. Translators: a "Bridge Port" is a network
#. * device that is part of a bridge.
#.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: ../src/connection-editor/page-bridge-port.c:105
msgid "Bridge Port"
msgstr "ブリッジポート"
-#: ../src/connection-editor/page-bridge-port.c:110
+#: ../src/connection-editor/page-bridge-port.c:107
msgid "Could not load bridge port user interface."
msgstr "ブリッジポートのユーザーインターフェースを読み込めません。"
-#: ../src/connection-editor/page-dcb.c:622
+#: ../src/connection-editor/page-dcb.c:624
msgid "DCB"
msgstr "DCB"
-#: ../src/connection-editor/page-dcb.c:624
+#: ../src/connection-editor/page-dcb.c:626
msgid "Could not load DCB user interface."
msgstr "DCB ユーザーインターフェースをロードできませんでした。"
-#: ../src/connection-editor/page-dsl.c:203
+#: ../src/connection-editor/page-dsl.c:219
msgid "Could not load DSL user interface."
msgstr "DSL ユーザーインターフェースをロードできませんでした。"
-#: ../src/connection-editor/page-dsl.c:298
+#: ../src/connection-editor/page-dsl.c:320
msgid "missing parent interface"
msgstr "不明の親インターフェース"
-#: ../src/connection-editor/page-dsl.c:343
+#: ../src/connection-editor/page-dsl.c:365
#, c-format
msgid "DSL connection %d"
msgstr "DSL 接続 %d"
@@ -3513,37 +3674,37 @@ msgstr ""
msgid "ignored"
msgstr "無視"
-#: ../src/connection-editor/page-ethernet.c:353
+#: ../src/connection-editor/page-ethernet.c:350
msgid "Could not load ethernet user interface."
msgstr "Ethernet のユーザーインターフェースを読み込めません。"
-#: ../src/connection-editor/page-ethernet.c:515
+#: ../src/connection-editor/page-ethernet.c:512
msgid "Ethernet device"
msgstr "Ethernet デバイス"
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: ../src/connection-editor/page-ethernet.c:516
+#: ../src/connection-editor/page-vlan.c:737
+#: ../src/connection-editor/page-wifi.c:571
msgid "cloned MAC"
msgstr "クローン MAC"
-#: ../src/connection-editor/page-ethernet.c:523
+#: ../src/connection-editor/page-ethernet.c:520
msgid "Wake-on-LAN password"
msgstr "Wake-on-LAN パスワード"
-#: ../src/connection-editor/page-ethernet.c:563
+#: ../src/connection-editor/page-ethernet.c:560
#, c-format
msgid "Ethernet connection %d"
msgstr "Ethernet 接続 %d"
#. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: ../src/connection-editor/page-general.c:55
+#: ../src/libnma/nma-mobile-providers.c:802
+#: ../src/libnm-gtk/nm-mobile-providers.c:801
msgid "Default"
msgstr "デフォルト"
-#: ../src/connection-editor/page-general.c:55
+#: ../src/connection-editor/page-general.c:56
msgid ""
"The zone defines the trust level of the connection. Default is not a regular "
"zone, selecting it results in the use of the default zone set in the "
@@ -3569,74 +3730,76 @@ msgstr ""
"“ib0”、“80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65”、“ib0 "
"(80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
-#: ../src/connection-editor/page-infiniband.c:151
+#: ../src/connection-editor/page-infiniband.c:148
msgid "Could not load InfiniBand user interface."
msgstr "InfiniBand ユーザーインターフェースを読み込めません。"
-#: ../src/connection-editor/page-infiniband.c:214
+#: ../src/connection-editor/page-infiniband.c:211
msgid "infiniband device"
msgstr "infiniband デバイス"
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:251
#, c-format
msgid "InfiniBand connection %d"
msgstr "InfiniBand 接続 %d"
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: ../src/connection-editor/page-ip-tunnel.c:175
msgid "Could not load IP tunnel user interface."
msgstr "IP トンネルユーザーインターフェースを読み込めません。"
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: ../src/connection-editor/page-ip-tunnel.c:289
#, c-format
msgid "IP tunnel connection %d"
msgstr "IP トンネル接続 %d"
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:128
+#: ../src/connection-editor/page-ip6.c:137
msgid "Automatic (VPN)"
msgstr "自動 (VPN)"
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:138
msgid "Automatic (VPN) addresses only"
msgstr "自動 (VPN) アドレス専用"
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:144
msgid "Automatic, addresses only"
msgstr "自動、アドレスのみ"
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:135
+#: ../src/connection-editor/page-ip6.c:140
msgid "Automatic (PPPoE)"
msgstr "自動 (PPPoE)"
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:136
+#: ../src/connection-editor/page-ip6.c:141
msgid "Automatic (PPPoE) addresses only"
msgstr "自動 (PPPoE) アドレス専用"
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:138
msgid "Automatic (DHCP)"
msgstr "自動 (DHCP)"
-#: ../src/connection-editor/page-ip4.c:138
+#: ../src/connection-editor/page-ip4.c:139
msgid "Automatic (DHCP) addresses only"
msgstr "自動 (DHCP) アドレス専用"
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:182
+#: ../src/connection-editor/page-ip6.c:205
msgid "Link-Local Only"
msgstr "ローカルへのリンク専用"
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:335
-msgid "Additional DNS ser_vers:"
+#: ../src/connection-editor/page-ip4.c:362
+#: ../src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
msgstr "追加の DNS サーバー(_V):"
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:344
-msgid "Additional s_earch domains:"
+#: ../src/connection-editor/page-ip4.c:371
+#: ../src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
msgstr "追加の検索ドメイン(_E):"
#: ../src/connection-editor/page-ip4.c:1033
@@ -3644,35 +3807,35 @@ msgstr "追加の検索ドメイン(_E):"
msgid "Editing IPv4 routes for %s"
msgstr "%s 用の IPv4 ルートを編集"
-#: ../src/connection-editor/page-ip4.c:1226
+#: ../src/connection-editor/page-ip4.c:1223
msgid "IPv4 Settings"
msgstr "IPv4 設定"
-#: ../src/connection-editor/page-ip4.c:1228
+#: ../src/connection-editor/page-ip4.c:1225
msgid "Could not load IPv4 user interface."
msgstr "IPv4 ユーザーインターフェースを読み込めません。"
-#: ../src/connection-editor/page-ip4.c:1321
+#: ../src/connection-editor/page-ip4.c:1318
#, c-format
msgid "IPv4 address “%s” invalid"
msgstr "IPv4 アドレス '%s' が無効"
-#: ../src/connection-editor/page-ip4.c:1329
+#: ../src/connection-editor/page-ip4.c:1326
#, c-format
msgid "IPv4 address netmask “%s” invalid"
msgstr "IPv4 アドレスネットマスク '%s' が無効"
-#: ../src/connection-editor/page-ip4.c:1338
+#: ../src/connection-editor/page-ip4.c:1335
#, c-format
msgid "IPv4 gateway “%s” invalid"
msgstr "IPv4 ゲートウェイ '%s' が無効"
-#: ../src/connection-editor/page-ip4.c:1381
+#: ../src/connection-editor/page-ip4.c:1378
#, c-format
msgid "IPv4 DNS server “%s” invalid"
msgstr "IPv4 DNS サーバー '%s' が無効"
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:180
msgid "Automatic, DHCP only"
msgstr "自動、DHCP のみ"
@@ -3681,54 +3844,54 @@ msgstr "自動、DHCP のみ"
msgid "Editing IPv6 routes for %s"
msgstr "%s 用の IPv6 ルートを編集"
-#: ../src/connection-editor/page-ip6.c:1208
+#: ../src/connection-editor/page-ip6.c:1205
msgid "IPv6 Settings"
msgstr "IPv6 設定"
-#: ../src/connection-editor/page-ip6.c:1210
+#: ../src/connection-editor/page-ip6.c:1207
msgid "Could not load IPv6 user interface."
msgstr "IPv6 ユーザーインターフェースを読み込めません。"
-#: ../src/connection-editor/page-ip6.c:1302
+#: ../src/connection-editor/page-ip6.c:1299
#, c-format
msgid "IPv6 address “%s” invalid"
msgstr "IPv6 アドレス '%s' が無効"
-#: ../src/connection-editor/page-ip6.c:1310
+#: ../src/connection-editor/page-ip6.c:1307
#, c-format
msgid "IPv6 prefix “%s” invalid"
msgstr "IPv6 プレフィックス “%s” が無効"
-#: ../src/connection-editor/page-ip6.c:1319
+#: ../src/connection-editor/page-ip6.c:1316
#, c-format
msgid "IPv6 gateway “%s” invalid"
msgstr "IPv6 ゲートウェイ '%s' が無効"
-#: ../src/connection-editor/page-ip6.c:1361
+#: ../src/connection-editor/page-ip6.c:1358
#, c-format
msgid "IPv6 DNS server “%s” invalid"
msgstr "IPv6 DNS サーバー '%s' が無効"
-#: ../src/connection-editor/page-macsec.c:192
+#: ../src/connection-editor/page-macsec.c:189
msgid "Could not load MACsec user interface."
msgstr "MACsec ユーザーインターフェースを読み込めませんでした。"
-#: ../src/connection-editor/page-macsec.c:331
+#: ../src/connection-editor/page-macsec.c:328
#, c-format
msgid "MACSEC connection %d"
msgstr "MACSEC 接続 %d"
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: ../src/connection-editor/page-master.c:235
+#: ../src/connection-editor/page-master.c:246
msgid "Duplicate slaves"
msgstr "重複するスレーブ"
-#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:236
#, c-format
msgid "Slaves “%s” and “%s” both apply to device “%s”"
msgstr "スレーブ '%s' と '%s' は、両方ともデバイス '%s' へ適用されます。"
-#: ../src/connection-editor/page-master.c:259
+#: ../src/connection-editor/page-master.c:247
#, c-format
msgid ""
"Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3737,25 +3900,25 @@ msgstr ""
"スレーブ '%s' と '%s' は、それぞれ同じ物理デバイスの異なる仮想ポート ('%s' "
"と '%s') へ適用されます。"
-#: ../src/connection-editor/page-master.c:385
+#: ../src/connection-editor/page-master.c:371
#, c-format
msgid "%s slave %d"
msgstr "%s スレーブ %d"
-#: ../src/connection-editor/page-mobile.c:310
+#: ../src/connection-editor/page-mobile.c:307
msgid "Could not load mobile broadband user interface."
msgstr "モバイルブロードバンドのユーザーインターフェースを読み込めません。"
-#: ../src/connection-editor/page-mobile.c:327
+#: ../src/connection-editor/page-mobile.c:324
msgid "Unsupported mobile broadband connection type."
msgstr "サポートされていないモバイルブロードバンドの接続タイプ。"
#. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: ../src/connection-editor/page-mobile.c:537
msgid "Select Mobile Broadband Provider Type"
msgstr "モバイルブロードバンドプロバイダーのタイプを選択"
-#: ../src/connection-editor/page-mobile.c:567
+#: ../src/connection-editor/page-mobile.c:564
msgid ""
"Select the technology your mobile broadband provider uses. If you are "
"unsure, ask your provider."
@@ -3763,7 +3926,7 @@ msgstr ""
"モバイルブロードバンドのプロバイダーが使用する技術を選択してください。不明な"
"場合は、プロバイダーにお尋ねください。"
-#: ../src/connection-editor/page-mobile.c:572
+#: ../src/connection-editor/page-mobile.c:569
msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
msgstr ""
"私のプロバイダーは GSM ベースの技術 (例えば、 GPRS, EDGE, UMTS, HSDPA) を使用"
@@ -3771,40 +3934,42 @@ msgstr ""
#. Translators: CDMA has 'D' accelerator key; 'C' collides with 'Cancel' button.
#. You may need to change it according to your language.
-#: ../src/connection-editor/page-mobile.c:579
+#: ../src/connection-editor/page-mobile.c:576
msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
msgstr ""
"私のプロバイダーは CDMA ベースの技術 (例えば、1xRTT, EVDO)を使用します(_D)"
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
+#: ../src/connection-editor/page-mobile.c:586
+#: ../src/libnma/nma-mobile-wizard.c:147 ../src/mb-menu-item.c:50
#: ../src/mobile-helpers.c:282
msgid "CDMA"
msgstr "CDMA"
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:589
+#: ../src/libnma/nma-mobile-wizard.c:144 ../src/mb-menu-item.c:54
#: ../src/mobile-helpers.c:280
msgid "GSM"
msgstr "GSM"
#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: ../src/wireless-security/eap-method-ttls.c:288
msgid "PAP"
msgstr "PAP"
#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: ../src/wireless-security/eap-method-ttls.c:354
msgid "CHAP"
msgstr "CHAP"
#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: ../src/wireless-security/eap-method-fast.c:284
+#: ../src/wireless-security/eap-method-peap.c:300
+#: ../src/wireless-security/eap-method-ttls.c:320
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: ../src/wireless-security/eap-method-ttls.c:304
msgid "MSCHAP"
msgstr "MSCHAP"
@@ -3818,19 +3983,19 @@ msgstr "なし"
msgid "Editing PPP authentication methods for %s"
msgstr "%s 用の PPP 認証方法を編集"
-#: ../src/connection-editor/page-ppp.c:279
+#: ../src/connection-editor/page-ppp.c:278
msgid "PPP Settings"
msgstr "PPP の設定"
-#: ../src/connection-editor/page-ppp.c:281
+#: ../src/connection-editor/page-ppp.c:280
msgid "Could not load PPP user interface."
msgstr "PPP ユーザーインターフェースを読み込めません。"
-#: ../src/connection-editor/page-proxy.c:215
+#: ../src/connection-editor/page-proxy.c:212
msgid "Proxy"
msgstr "プロキシー"
-#: ../src/connection-editor/page-proxy.c:217
+#: ../src/connection-editor/page-proxy.c:214
msgid "Could not load proxy user interface."
msgstr "プロキシーユーザーインターフェースを読み込めません。"
@@ -3839,11 +4004,11 @@ msgstr "プロキシーユーザーインターフェースを読み込めませ
msgid "Error: file doesn’t contain a valid JSON configuration"
msgstr "エラー: ファイルに有効な JSON 設定がありません。"
-#: ../src/connection-editor/page-team.c:1034
+#: ../src/connection-editor/page-team.c:1031
msgid "Could not load team user interface."
msgstr "チームユーザーインターフェースを読み込めません。"
-#: ../src/connection-editor/page-team.c:1131
+#: ../src/connection-editor/page-team.c:1128
#, c-format
msgid "Team connection %d"
msgstr "チーム接続 %d"
@@ -3851,68 +4016,68 @@ msgstr "チーム接続 %d"
#. Translators: a "Team Port" is a network
#. * device that is part of a team.
#.
-#: ../src/connection-editor/page-team-port.c:655
+#: ../src/connection-editor/page-team-port.c:652
msgid "Team Port"
msgstr "チームポート"
-#: ../src/connection-editor/page-team-port.c:657
+#: ../src/connection-editor/page-team-port.c:654
msgid "Could not load team port user interface."
msgstr "チームポートのユーザーインターフェースを読み込めません。"
#. Translators: the first %s is a device name (eg, "em1"), the
#. * second is a connection name (eg, "Auto Ethernet").
#.
-#: ../src/connection-editor/page-vlan.c:415
+#: ../src/connection-editor/page-vlan.c:413
#, c-format
msgid "%s (via “%s”)"
msgstr "%s ('%s' 経由)"
-#: ../src/connection-editor/page-vlan.c:427
+#: ../src/connection-editor/page-vlan.c:425
#, c-format
msgid "New connection…"
msgstr "新規接続…"
-#: ../src/connection-editor/page-vlan.c:596
+#: ../src/connection-editor/page-vlan.c:591
msgid "Could not load vlan user interface."
msgstr "vlan ユーザーインターフェースを読み込めません。"
-#: ../src/connection-editor/page-vlan.c:735
+#: ../src/connection-editor/page-vlan.c:730
msgid "vlan parent"
msgstr "vlan 親"
-#: ../src/connection-editor/page-vlan.c:803
+#: ../src/connection-editor/page-vlan.c:798
#, c-format
msgid "VLAN connection %d"
msgstr "VLAN 接続 %d"
-#: ../src/connection-editor/page-vpn.c:67
+#: ../src/connection-editor/page-vpn.c:64
#, c-format
msgid "Could not load editor VPN plugin for “%s” (%s)."
msgstr "'%s' 用のエディター VPN プラグイン (%s) が見つかりませんでした。"
-#: ../src/connection-editor/page-vpn.c:68
+#: ../src/connection-editor/page-vpn.c:65
msgid "unknown failure"
msgstr "原因不明"
-#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/page-vpn.c:102
msgid "Could not load VPN user interface."
msgstr "VPN ユーザーインターフェースを読み込めません。"
-#: ../src/connection-editor/page-vpn.c:120
+#: ../src/connection-editor/page-vpn.c:117
#, c-format
msgid "Could not find VPN plugin for “%s”."
msgstr "'%s' 用の VPN プラグインが見つかりませんでした。"
-#: ../src/connection-editor/page-vpn.c:202
+#: ../src/connection-editor/page-vpn.c:199
#, c-format
msgid "VPN connection %d"
msgstr "VPN 接続 %d"
-#: ../src/connection-editor/page-vpn.c:208
+#: ../src/connection-editor/page-vpn.c:205
msgid "Choose a VPN Connection Type"
msgstr "VPN 接続の種類を選んでください"
-#: ../src/connection-editor/page-vpn.c:209
+#: ../src/connection-editor/page-vpn.c:206
msgid ""
"Select the type of VPN you wish to use for the new connection. If the type "
"of VPN connection you wish to create does not appear in the list, you may "
@@ -3945,68 +4110,68 @@ msgstr ""
msgid "%u (%u MHz)"
msgstr "%u (%u MHz)"
-#: ../src/connection-editor/page-wifi.c:442
+#: ../src/connection-editor/page-wifi.c:439
msgid "Could not load Wi-Fi user interface."
msgstr "Wi-Fi ユーザーインターフェースをロードできませんでした。"
-#: ../src/connection-editor/page-wifi.c:564
+#: ../src/connection-editor/page-wifi.c:561
msgid "bssid"
msgstr "bssid"
-#: ../src/connection-editor/page-wifi.c:570
+#: ../src/connection-editor/page-wifi.c:567
msgid "Wi-Fi device"
msgstr "Wi-Fi デバイス"
-#: ../src/connection-editor/page-wifi.c:617
+#: ../src/connection-editor/page-wifi.c:614
#, c-format
msgid "Wi-Fi connection %d"
msgstr "Wi-Fi 接続 %d"
-#: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: ../src/connection-editor/page-wifi-security.c:355
+#: ../src/libnma/nma-wifi-dialog.c:946 ../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:368
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../src/connection-editor/page-wifi-security.c:365
+#: ../src/libnma/nma-wifi-dialog.c:955 ../src/libnm-gtk/nm-wifi-dialog.c:931
msgid "WEP 128-bit Passphrase"
msgstr "WEP 128-bit パスフレーズ"
-#: ../src/connection-editor/page-wifi-security.c:394
+#: ../src/connection-editor/page-wifi-security.c:391
msgid "Dynamic WEP (802.1X)"
msgstr "動的 WEP (802.1X)"
-#: ../src/connection-editor/page-wifi-security.c:407
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/libnma/nma-wifi-dialog.c:999 ../src/libnm-gtk/nm-wifi-dialog.c:975
msgid "WPA & WPA2 Personal"
msgstr "WPA & WPA2 Personal"
# そういう仕様の名前なので訳すべきでない。
-#: ../src/connection-editor/page-wifi-security.c:420
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: ../src/connection-editor/page-wifi-security.c:417
+#: ../src/libnma/nma-wifi-dialog.c:1017 ../src/libnm-gtk/nm-wifi-dialog.c:989
msgid "WPA & WPA2 Enterprise"
msgstr "WPA & WPA2 Enterprise"
-#: ../src/connection-editor/page-wifi-security.c:463
+#: ../src/connection-editor/page-wifi-security.c:460
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:474
+#: ../src/connection-editor/page-wifi-security.c:471
msgid "Wi-Fi Security"
msgstr "Wi-Fi セキュリティー"
-#: ../src/connection-editor/page-wifi-security.c:476
+#: ../src/connection-editor/page-wifi-security.c:473
msgid "Could not load Wi-Fi security user interface."
msgstr "Wi-Fi セキュリティーユーザーインターフェースを読み込めません。"
-#: ../src/connection-editor/page-wifi-security.c:560
+#: ../src/connection-editor/page-wifi-security.c:557
#, c-format
msgid "missing SSID"
msgstr "不明な SSID"
-#: ../src/connection-editor/page-wifi-security.c:566
+#: ../src/connection-editor/page-wifi-security.c:563
#, c-format
msgid "Security not compatible with Ad-Hoc mode"
msgstr "Ad-Hoc モードとのセキュリティーの互換性がありません"
@@ -4065,31 +4230,31 @@ msgid "Active Network Connections"
msgstr "有効なネットワーク接続"
#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:152
msgid "No certificate set"
msgstr "証明書セットがありません"
#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:176
msgid "No key set"
msgstr "キーセットがありません"
#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
#, 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:374
-#, c-format
-msgid "%s private _key:"
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#, fuzzy, c-format
+msgid "%s private _key"
msgstr "%s プライベートキー(_K):"
#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
-#, c-format
-msgid "%s key _password:"
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#, fuzzy, c-format
+msgid "%s key _password"
msgstr "%s キーパスワード(_P):"
#: ../src/libnma/nma-file-cert-chooser.c:258
@@ -4098,159 +4263,57 @@ msgid "Choose %s Certificate"
msgstr "%s 証明書を選択する"
#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
-#, c-format
-msgid "%s _certificate:"
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:398
+#, fuzzy, c-format
+msgid "%s _certificate"
msgstr "%s 証明書(_C):"
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "ご使用のモバイルブロードバンド接続は、以下のように設定されています。"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "使用デバイス:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "使用プロバイダー:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "使用プラン:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-msgid ""
-"A connection will now be made to your mobile broadband provider using the "
-"settings you selected. If the connection fails or you cannot access network "
-"resources, double-check your settings. To modify your mobile broadband "
-"connection settings, choose “Network Connections” from the System → "
-"Preferences menu."
-msgstr ""
-"選択した設定でモバイルブロードバンドプロバイダーに接続されます。接続が失敗し"
-"たり、ネットワークリソースにアクセスできない場合は、設定をダブルクリックして"
-"ください。モバイルブロードバンド設定を変更するには、システム → 設定メニューか"
-"ら「ネットワーク接続」を選択します。"
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "モバイルブロードバンドセッティングを確定する"
+#: ../src/libnma/nma-mobile-providers.c:991
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "私の国は一覧に有りません"
-#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnma/nma-mobile-wizard.c:252 ../src/libnma/nma-mobile-wizard.c:284
#: ../src/libnm-gtk/nm-mobile-wizard.c:326
msgid "Unlisted"
msgstr "一覧に無い"
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "使用プランの選択(_S):"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "選択した APN (Access Point Name)(_A):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-msgid ""
-"Warning: Selecting an incorrect plan may result in billing issues for your "
-"broadband account or may prevent connectivity.\n"
-"\n"
-"If you are unsure of your plan please ask your provider for your plan’s APN."
-msgstr ""
-"警告: 正しくないプランを選択すると、ブロードバンドアカウントで請求書の問題が"
-"発生したり、接続ができなくなったりする可能性があります。\n"
-"\n"
-"ご自分のプランが分からない場合は、そのプランの APN についてプロバイダーにお尋"
-"ねください。"
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "使用する請求書プランを選択"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnma/nma-mobile-wizard.c:484
#: ../src/libnm-gtk/nm-mobile-wizard.c:558
msgid "My plan is not listed…"
msgstr "プランが一覧にありません..."
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "プロバイダーを一覧から選択(_L):"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnma/nma-mobile-wizard.c:644
#: ../src/libnm-gtk/nm-mobile-wizard.c:724
msgid "Provider"
msgstr "プロバイダー"
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "プロバイダーが見つからないので手動で入力します(_M):"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "プロバイダー:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "私のプロバイダーは GSM 技術 (GPRS, EDGE, UMTS, HSPA) を使用します"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "私のプロバイダーは CDMA 技術 (1xRTT, EVDO) を使用します"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "使用プロバイダーを選択"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "国や地域の一覧:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnma/nma-mobile-wizard.c:932
#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
msgid "Country or region"
msgstr "国や地域"
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "私の国は一覧に有りません"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-msgid "Choose your Provider’s Country or Region"
-msgstr "プロバイダーの国や地域を選択"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnma/nma-mobile-wizard.c:1016
#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
msgid "Installed GSM device"
msgstr "GSM デバイスがインストールされています"
-#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnma/nma-mobile-wizard.c:1019
#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
msgid "Installed CDMA device"
msgstr "CDMA デバイスがインストールされています"
-#: ../src/libnma/nma-mobile-wizard.c:1354
+#: ../src/libnma/nma-mobile-wizard.c:1225
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "すべてのデバイス"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:1
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "新規のモバイルブロードバンド接続"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:2
#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
msgid ""
"This assistant helps you easily set up a mobile broadband connection to a "
@@ -4259,87 +4322,184 @@ msgstr ""
"このアシスタントを使用すると、携帯 (3G) ネットワークへのモバイルブロードバン"
"ド接続が簡単にできます。"
-#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnma/nma-mobile-wizard.ui.h:3
#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
msgid "You will need the following information:"
msgstr "以下の情報が必要です:"
-#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnma/nma-mobile-wizard.ui.h:4
#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
msgid "Your broadband provider’s name"
msgstr "使用するブロードバンドプロバイダー名"
-#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.ui.h:5
#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
msgid "Your broadband billing plan name"
msgstr "使用するブロードバンド請求書プラン名"
-#: ../src/libnma/nma-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.ui.h:6
#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
msgstr "(一部のケースで) ブロードバンド請求書プラン APN (Access Point Name)"
-#: ../src/libnma/nma-mobile-wizard.c:1412
+#: ../src/libnma/nma-mobile-wizard.ui.h:7
#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
msgid "Create a connection for _this mobile broadband device:"
msgstr "このモバイルブロードバンドデバイス用の接続を作成(_T):"
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "すべてのデバイス"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnma/nma-mobile-wizard.ui.h:8
#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
msgid "Set up a Mobile Broadband Connection"
msgstr "モバイルブロードバンド接続のセットアップ"
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "新規のモバイルブロードバンド接続"
+#: ../src/libnma/nma-mobile-wizard.ui.h:9
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "国や地域の一覧:"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:10
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+msgid "Choose your Provider’s Country or Region"
+msgstr "プロバイダーの国や地域を選択"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:11
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "プロバイダーを一覧から選択(_L):"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:12
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "プロバイダーが見つからないので手動で入力します(_M):"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:13
+#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "私のプロバイダーは GSM 技術 (GPRS, EDGE, UMTS, HSPA) を使用します"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:14
+#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "私のプロバイダーは CDMA 技術 (1xRTT, EVDO) を使用します"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:15
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "使用プロバイダーを選択"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:16
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "使用プランの選択(_S):"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:17
+#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "選択した APN (Access Point Name)(_A):"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:18
+#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"警告: 正しくないプランを選択すると、ブロードバンドアカウントで請求書の問題が"
+"発生したり、接続ができなくなったりする可能性があります。\n"
+"\n"
+"ご自分のプランが分からない場合は、そのプランの APN についてプロバイダーにお尋"
+"ねください。"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:21
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "使用する請求書プランを選択"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:22
+#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "ご使用のモバイルブロードバンド接続は、以下のように設定されています。"
+
+#. Device
+#: ../src/libnma/nma-mobile-wizard.ui.h:23
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "使用デバイス:"
+
+#. Provider
+#: ../src/libnma/nma-mobile-wizard.ui.h:24
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "使用プロバイダー:"
+
+#. Plan and APN
+#: ../src/libnma/nma-mobile-wizard.ui.h:25
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "使用プラン:"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:26
+#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"選択した設定でモバイルブロードバンドプロバイダーに接続されます。接続が失敗し"
+"たり、ネットワークリソースにアクセスできない場合は、設定をダブルクリックして"
+"ください。モバイルブロードバンド設定を変更するには、システム → 設定メニューか"
+"ら「ネットワーク接続」を選択します。"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:27
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "モバイルブロードバンドセッティングを確定する"
-#: ../src/libnma/nma-cert-chooser-button.c:165
+#: ../src/libnma/nma-cert-chooser-button.c:167
msgid "(None)"
msgstr "(なし)"
-#: ../src/libnma/nma-cert-chooser-button.c:173
+#: ../src/libnma/nma-cert-chooser-button.c:175
#, c-format
msgid "Key in %s"
msgstr "%s 内のキー"
-#: ../src/libnma/nma-cert-chooser-button.c:174
+#: ../src/libnma/nma-cert-chooser-button.c:176
#, c-format
msgid "Certificate in %s"
msgstr "%s 内の 証明書"
-#: ../src/libnma/nma-cert-chooser-button.c:193
+#: ../src/libnma/nma-cert-chooser-button.c:195
#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
msgid "(Unknown)"
msgstr "(不明)"
-#: ../src/libnma/nma-cert-chooser-button.c:215
-#: ../src/libnma/nma-cert-chooser-button.c:245
+#: ../src/libnma/nma-cert-chooser-button.c:217
+#: ../src/libnma/nma-cert-chooser-button.c:247
msgid "Select"
msgstr "選択"
-#: ../src/libnma/nma-cert-chooser-button.c:216
-#: ../src/libnma/nma-cert-chooser-button.c:246
+#: ../src/libnma/nma-cert-chooser-button.c:218
+#: ../src/libnma/nma-cert-chooser-button.c:248
msgid "Cancel"
msgstr "キャンセル"
-#: ../src/libnma/nma-cert-chooser-button.c:472
+#: ../src/libnma/nma-cert-chooser-button.c:474
msgid "Select from file…"
msgstr "ファイルから選択…"
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:394
#, c-format
msgid "Choose a %s Certificate"
msgstr "%s 証明書を選択する"
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
-#, c-format
-msgid "%s certificate _password:"
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:402
+#, fuzzy, c-format
+msgid "%s certificate _password"
msgstr "%s 証明書のパスワード(_P):"
#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
@@ -4387,51 +4547,48 @@ msgstr "毎回このパスワードを要求する"
msgid "The password is not required"
msgstr "パスワードは不要です"
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "セカンダリーパスワード(_S):"
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "パスワードを表示(_O)"
-#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
msgid "_Tertiary Password:"
msgstr "第 3 のパスワード(_T):"
-#: ../src/libnma/nma-vpn-password-dialog.c:238
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
-msgid "Sh_ow passwords"
-msgstr "パスワードを表示(_O)"
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "セカンダリーパスワード(_S):"
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "パスワード(_P):"
+
+#: ../src/libnma/nma-wifi-dialog.c:127 ../src/libnm-gtk/nm-wifi-dialog.c:141
msgid "Click to connect"
msgstr "クリックして接続する"
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-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-"
-"connection-editor で接続を編集する必要があります。"
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:465
msgid "New…"
msgstr "新規…"
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:905
msgctxt "Wifi/wired security"
msgid "None"
msgstr "なし"
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: ../src/libnma/nma-wifi-dialog.c:985 ../src/libnm-gtk/nm-wifi-dialog.c:961
msgid "Dynamic WEP (802.1x)"
msgstr "動的 WEP (802.1X)"
-#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: ../src/libnma/nma-wifi-dialog.c:1108 ../src/libnm-gtk/nm-wifi-dialog.c:1071
msgid "C_reate"
msgstr "作成(_R)"
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnma/nma-wifi-dialog.c:1186 ../src/libnm-gtk/nm-wifi-dialog.c:1150
#, c-format
msgid ""
"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4439,53 +4596,64 @@ msgstr ""
"Wi-Fi ネットワーク '%s' にアクセスするには、パスワードか暗号化キーが必要で"
"す。"
-#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1152
msgid "Wi-Fi Network Authentication Required"
msgstr "Wi-Fi ネットワークの認証が必要です"
-#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1154
msgid "Authentication required by Wi-Fi network"
msgstr "Wi-Fi ネットワークでは認証が要求されます"
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1159
msgid "Create New Wi-Fi Network"
msgstr "新しい Wi-Fi ネットワークを作成"
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1197 ../src/libnm-gtk/nm-wifi-dialog.c:1161
msgid "New Wi-Fi network"
msgstr "新規 Wi-Fi ネットワーク"
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: ../src/libnma/nma-wifi-dialog.c:1198 ../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:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1200 ../src/libnm-gtk/nm-wifi-dialog.c:1164
msgid "Connect to Hidden Wi-Fi Network"
msgstr "非表示 Wi-Fi ネットワークに接続する"
-#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1202 ../src/libnm-gtk/nm-wifi-dialog.c:1166
msgid "Hidden Wi-Fi network"
msgstr "非表示 Wi-Fi ネットワーク"
-#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: ../src/libnma/nma-wifi-dialog.c:1203 ../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 ネットワークの名前とセキュリティー詳細を入力してください。"
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: ../src/libnma/wifi.ui.h:1
+#, fuzzy
+msgid "Wi-Fi _security"
msgstr "Wi-Fi セキュリティー(_S):"
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: ../src/libnma/wifi.ui.h:3
+#, fuzzy
+msgid "C_onnection"
msgstr "接続(_O):"
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: ../src/libnma/wifi.ui.h:4
+#, fuzzy
+msgid "Wi-Fi _adapter"
msgstr "Wi-Fi アダプター(_A):"
+#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "プロバイダーが見つからないので手動で入力します(_M):"
+
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "プロバイダー:"
+
#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
msgid "Wired"
msgstr "有線"
@@ -4518,6 +4686,30 @@ msgctxt "long device name"
msgid "%s %s"
msgstr "%s %s"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:142
+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-"
+"connection-editor で接続を編集する必要があります。"
+
+#: ../src/libnm-gtk/wifi.ui.h:1
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi セキュリティー(_S):"
+
+#: ../src/libnm-gtk/wifi.ui.h:2
+msgid "_Network name:"
+msgstr "ネットワーク名(_N):"
+
+#: ../src/libnm-gtk/wifi.ui.h:3
+msgid "C_onnection:"
+msgstr "接続(_O):"
+
+#: ../src/libnm-gtk/wifi.ui.h:4
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi アダプター(_A):"
+
#: ../src/main.c:42
msgid "Usage:"
msgstr "使用法:"
@@ -4648,11 +4840,11 @@ msgstr "ローミング"
msgid "%s connection"
msgstr "%s 接続"
-#: ../src/utils/utils.c:565
+#: ../src/utils/utils.c:549
msgid "PEM certificates (*.pem, *.crt, *.cer)"
msgstr "PEM 証明書 (*.pem、*.crt、*.cer)"
-#: ../src/utils/utils.c:577
+#: ../src/utils/utils.c:561
msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
msgstr "DER か、PEM、 PKCS#12 のプライベートキー (*.der, *.pem, *.p12, *.key)"
@@ -4672,21 +4864,21 @@ msgstr "選択された CA 証明書ファイルは存在しません"
msgid "missing EAP-FAST PAC file"
msgstr "EAP-FAST PAC ファイルがありません"
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: ../src/wireless-security/eap-method-fast.c:268
+#: ../src/wireless-security/eap-method-peap.c:332
+#: ../src/wireless-security/eap-method-ttls.c:386
msgid "GTC"
msgstr "GTC"
-#: ../src/wireless-security/eap-method-fast.c:405
+#: ../src/wireless-security/eap-method-fast.c:407
msgid "Choose a PAC file"
msgstr "PAC ファイルを選択"
-#: ../src/wireless-security/eap-method-fast.c:412
+#: ../src/wireless-security/eap-method-fast.c:414
msgid "PAC files (*.pac)"
msgstr "PAC ファイル (*.pac)"
-#: ../src/wireless-security/eap-method-fast.c:416
+#: ../src/wireless-security/eap-method-fast.c:418
msgid "All files"
msgstr "すべてのファイル"
@@ -4705,17 +4897,20 @@ 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:3
-msgid "Anony_mous identity:"
+#, fuzzy
+msgid "Anony_mous identity"
msgstr "匿名の識別子(_M):"
#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#, fuzzy
+msgid "PAC _file"
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:1
-msgid "_Inner authentication:"
+#, fuzzy
+msgid "_Inner authentication"
msgstr "内部認証(_I):"
# see http://www.cisco.com/cisco/web/support/JP/100/1005/1005630_eapfast-wlc-rad-config.html#PAC
@@ -4731,9 +4926,9 @@ msgstr "EAP-LEAP ユーザー名がありません"
msgid "missing EAP-LEAP password"
msgstr "EAP-LEAP パスワードがありません"
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: ../src/wireless-security/eap-method-peap.c:316
+#: ../src/wireless-security/eap-method-ttls.c:370
+#: ../src/wireless-security/wireless-security.c:425
msgid "MD5"
msgstr "MD5"
@@ -4752,7 +4947,8 @@ msgid "No CA certificate is _required"
msgstr "CA 証明書は必要ありません(_R)"
#: ../src/wireless-security/eap-method-peap.ui.h:6
-msgid "PEAP _version:"
+#, fuzzy
+msgid "PEAP _version"
msgstr "PEAP バージョン(_V):"
#: ../src/wireless-security/eap-method-peap.ui.h:8
@@ -4764,17 +4960,32 @@ 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:"
+#, fuzzy
+msgid "_Domain"
msgstr "ドメイン(_D):"
-#: ../src/wireless-security/eap-method-simple.c:75
+#: ../src/wireless-security/eap-method-simple.c:90
msgid "missing EAP username"
msgstr "EAP ユーザー名がありません"
-#: ../src/wireless-security/eap-method-simple.c:88
+#: ../src/wireless-security/eap-method-simple.c:106
msgid "missing EAP password"
msgstr "EAP パスワードがありません"
+#: ../src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.ui.h:4
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bit パスフレーズ"
+
+#: ../src/wireless-security/eap-method-simple.ui.h:5
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "パスワードを表示(_O)"
+
#: ../src/wireless-security/eap-method-tls.c:64
msgid "missing EAP-TLS identity"
msgstr "EAP-TLS アイデンティティーがありません"
@@ -4798,10 +5009,11 @@ msgstr "選択されたキーファイルは存在しません"
# とりあえずこのように訳しておくが "Identity" のままの方が適切かもしれない。
# (WPA-EAP Identity 認証方式: ユーザ ID とパスワードの組で認証)
#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+#, fuzzy
+msgid "I_dentity"
msgstr "アイデンティティー(_D):"
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: ../src/wireless-security/eap-method-ttls.c:337
msgid "MSCHAPv2 (no EAP)"
msgstr "MSCHAPv2 (非 EAP)"
@@ -4809,56 +5021,61 @@ msgstr "MSCHAPv2 (非 EAP)"
msgid "Unknown error validating 802.1X security"
msgstr "802.1X セキュリティーの検証中に原因不明のエラー"
-#: ../src/wireless-security/wireless-security.c:436
+#: ../src/wireless-security/wireless-security.c:437
msgid "TLS"
msgstr "TLS"
-#: ../src/wireless-security/wireless-security.c:460
+#: ../src/wireless-security/wireless-security.c:461
msgid "PWD"
msgstr "PWD"
-#: ../src/wireless-security/wireless-security.c:471
+#: ../src/wireless-security/wireless-security.c:472
msgid "FAST"
msgstr "FAST"
-#: ../src/wireless-security/wireless-security.c:482
+#: ../src/wireless-security/wireless-security.c:483
msgid "Tunneled TLS"
msgstr "トンネル化 TLS"
-#: ../src/wireless-security/wireless-security.c:493
+#: ../src/wireless-security/wireless-security.c:494
msgid "Protected EAP (PEAP)"
msgstr "保護つき EAP (PEAP)"
+#: ../src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
#: ../src/wireless-security/ws-wep-key.ui.h:6
#: ../src/wireless-security/ws-wpa-eap.ui.h:1
-msgid "Au_thentication:"
+#, fuzzy
+msgid "Au_thentication"
msgstr "認証(_T):"
-#: ../src/wireless-security/ws-leap.c:63
+#: ../src/wireless-security/ws-leap.c:64
msgid "missing leap-username"
msgstr "leap-username が見つかりません"
-#: ../src/wireless-security/ws-leap.c:74
+#: ../src/wireless-security/ws-leap.c:82
msgid "missing leap-password"
msgstr "leap-password が見つかりません"
-#: ../src/wireless-security/ws-wep-key.c:107
+#: ../src/wireless-security/ws-wep-key.c:113
msgid "missing wep-key"
msgstr "wep-key が見つかりません"
-#: ../src/wireless-security/ws-wep-key.c:116
+#: ../src/wireless-security/ws-wep-key.c:120
#, c-format
msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
msgstr "無効な wep-key: %zu の長さのキーには、16 進数しか使用できません"
-#: ../src/wireless-security/ws-wep-key.c:124
+#: ../src/wireless-security/ws-wep-key.c:128
#, c-format
msgid ""
"invalid wep-key: key with a length of %zu must contain only ascii characters"
msgstr "無効な wep-key: %zu の長さのキーには、ascii 文字しか使用できません"
-#: ../src/wireless-security/ws-wep-key.c:130
+#: ../src/wireless-security/ws-wep-key.c:134
#, c-format
msgid ""
"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4867,11 +5084,11 @@ msgstr ""
"無効な wep-key: キーの長さ %zu が正しくありません。キーの長さは 5/13 (ascii) "
"か 10/26 (hex) にする必要があります"
-#: ../src/wireless-security/ws-wep-key.c:137
+#: ../src/wireless-security/ws-wep-key.c:141
msgid "invalid wep-key: passphrase must be non-empty"
msgstr "無効な wep-key: パスフレーズを空白にすることはできません"
-#: ../src/wireless-security/ws-wep-key.c:139
+#: ../src/wireless-security/ws-wep-key.c:143
msgid "invalid wep-key: passphrase must be shorter than 64 characters"
msgstr "無効な wep-key: パスフレーズは 64 文字未満にする必要があります。"
@@ -4888,7 +5105,8 @@ msgid "1 (Default)"
msgstr "1 (デフォルト)"
#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#, fuzzy
+msgid "_Key"
msgstr "キー(_K):"
#: ../src/wireless-security/ws-wep-key.ui.h:5
@@ -4896,10 +5114,11 @@ msgid "Sho_w key"
msgstr "キーを表示(_W)"
#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#, fuzzy
+msgid "WEP inde_x"
msgstr "WEP インデックス(_X):"
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: ../src/wireless-security/ws-wpa-psk.c:76
#, c-format
msgid ""
"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4908,10 +5127,39 @@ msgstr ""
"無効な wpa-psk: キーの長さ %zu が無効です。[8,63] バイトもしくは 16 進数で "
"64 桁にする必要があります"
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: ../src/wireless-security/ws-wpa-psk.c:83
msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
msgstr "無効な wpa-psk: 16 進数の 64 バイトでキーを解釈できません"
#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#, fuzzy
+msgid "_Type"
msgstr "タイプ(_T):"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "不明なエラーのため、接続シークレットを更新できませんでした。"
+
+#~ msgid "Priority:"
+#~ msgstr "優先度:"
+
+#~ msgid "_Automatically connect to this network when it is available"
+#~ msgstr "この接続が利用可能になったときに自動的に接続する(_A)"
+
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "自動アクティベーションの接続優先度(_P)"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "VPN 接続をインポートできません"
+
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "ファイル '%s' が読み込めなかったか、認識される VPN 接続情報がありません\n"
+#~ "\n"
+#~ "エラー: %s"
+
+#~ msgid "unknown error"
+#~ msgstr "不明なエラー"
diff --git a/po/ko.po b/po/ko.po
index 166c21bb..39e0c105 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-12 11:18+0100\n"
+"POT-Creation-Date: 2019-02-20 18:18+0100\n"
"PO-Revision-Date: 2017-11-07 06:44+0000\n"
"Last-Translator: Copied by Zanata <copied-by-zanata zanata org>\n"
"Language-Team: GNOME Korea <gnome-kr googlegroups com>\n"
@@ -33,7 +33,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Zanata 4.3.2\n"
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
msgid "Network"
msgstr "네트워크"
@@ -42,9 +42,9 @@ msgid "Manage your network connections"
msgstr "네트워크 연결을 관리합니다"
#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "네트워크 연결"
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "사용 중인 네트워크 연결"
#: ../nm-connection-editor.desktop.in.h:2
msgid "Manage and change your network connection settings"
@@ -197,30 +197,31 @@ msgstr "802.1X 인증"
#: ../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/connection-helpers.c:308
-#: ../src/connection-editor/connection-helpers.c:771
+#: ../src/connection-editor/connection-helpers.c:296
+#: ../src/connection-editor/connection-helpers.c:759
#: ../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-bluetooth.c:307
+#: ../src/connection-editor/page-mobile.c:540
#: ../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/libnma/nma-vpn-password-dialog.ui.h:1
+#: ../src/libnma/nma-wifi-dialog.c:1104
#: ../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/libnma/nma-wifi-dialog.c:1072
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1110
#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
msgid "C_onnect"
msgstr "연결(_O)"
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#, fuzzy
+msgid "_Network name"
msgstr "네트워크 이름(_N):"
#: ../src/ap-menu-item.c:82
@@ -258,12 +259,12 @@ msgstr "연결 끊는 데 실패"
msgid "Connection activation failed"
msgstr "연결 활성화 실패"
-#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
+#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
#, fuzzy
msgid "Don’t show this message again"
msgstr "다시 보지 않기"
-#: ../src/applet.c:899
+#: ../src/applet.c:898
#, fuzzy, c-format
msgid ""
"\n"
@@ -273,7 +274,7 @@ msgstr ""
"\n"
"'%s' 가상 사설망 연결이 실패했습니다. 네트워크 연결이 중단되었습니다."
-#: ../src/applet.c:901
+#: ../src/applet.c:900
#, fuzzy, c-format
msgid ""
"\n"
@@ -283,7 +284,7 @@ msgstr ""
"\n"
"'%s' 가상 사설망 연결이 실패했습니다. 네트워크 연결이 중단되었습니다."
-#: ../src/applet.c:903
+#: ../src/applet.c:902
#, fuzzy, c-format
msgid ""
"\n"
@@ -293,7 +294,7 @@ msgstr ""
"'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 예기치 못하게 중단"
"되었습니다."
-#: ../src/applet.c:905
+#: ../src/applet.c:904
#, fuzzy, c-format
msgid ""
"\n"
@@ -304,7 +305,7 @@ msgstr ""
"'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 잘못된 설정을 반환"
"했습니다."
-#: ../src/applet.c:907
+#: ../src/applet.c:906
#, fuzzy, c-format
msgid ""
"\n"
@@ -313,7 +314,7 @@ msgstr ""
"\n"
"'%s' 가상 사설망 연결이 실패했습니다. 연결 시도가 제한 시간을 초과했습니다."
-#: ../src/applet.c:909
+#: ../src/applet.c:908
#, fuzzy, c-format
msgid ""
"\n"
@@ -323,7 +324,7 @@ msgstr ""
"'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 제 시간에 시작하"
"지 못했습니다."
-#: ../src/applet.c:911
+#: ../src/applet.c:910
#, fuzzy, c-format
msgid ""
"\n"
@@ -333,7 +334,7 @@ msgstr ""
"'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스를 시작하는데 실패했"
"습니다."
-#: ../src/applet.c:913
+#: ../src/applet.c:912
#, fuzzy, c-format
msgid ""
"\n"
@@ -342,7 +343,7 @@ msgstr ""
"\n"
"'%s' 가상 사설망 연결이 실패했습니다. 올바른 가상 사설망 비밀정보가 없습니다."
-#: ../src/applet.c:915
+#: ../src/applet.c:914
#, fuzzy, c-format
msgid ""
"\n"
@@ -351,7 +352,7 @@ msgstr ""
"\n"
"'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 비밀 정보가 잘못되었습니다."
-#: ../src/applet.c:920
+#: ../src/applet.c:919
#, fuzzy, c-format
msgid ""
"\n"
@@ -360,7 +361,7 @@ msgstr ""
"\n"
"'%s' 가상 사설망 연결이 실패했습니다."
-#: ../src/applet.c:947
+#: ../src/applet.c:946
#, c-format
msgid ""
"VPN connection has been successfully established.\n"
@@ -371,19 +372,19 @@ msgstr ""
"\n"
"%s\n"
-#: ../src/applet.c:949
+#: ../src/applet.c:948
msgid "VPN connection has been successfully established.\n"
msgstr "가상 사설망에 성공적으로 연결했습니다.\n"
-#: ../src/applet.c:951
+#: ../src/applet.c:950
msgid "VPN Login Message"
msgstr "가상 사설망 로그인 메시지"
-#: ../src/applet.c:959 ../src/applet.c:999
+#: ../src/applet.c:958 ../src/applet.c:998
msgid "VPN Connection Failed"
msgstr "가상 사설망 연결 실패"
-#: ../src/applet.c:1003
+#: ../src/applet.c:1002
#, fuzzy, c-format
msgid ""
"\n"
@@ -397,7 +398,7 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1006
+#: ../src/applet.c:1005
#, fuzzy, c-format
msgid ""
"\n"
@@ -410,148 +411,148 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1295
+#: ../src/applet.c:1296
msgid "device not ready (firmware missing)"
msgstr "장치가 준비되지 않음(펌웨어 없음)"
-#: ../src/applet.c:1297
+#: ../src/applet.c:1298
msgid "device not ready"
msgstr "장치가 준비되지 않음"
#. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
msgid "disconnected"
msgstr "연결 끊김"
-#: ../src/applet.c:1323
+#: ../src/applet.c:1324
msgid "Disconnect"
msgstr "연결 끊김"
-#: ../src/applet.c:1337
+#: ../src/applet.c:1338
msgid "device not managed"
msgstr "장치가 관리되지 않음"
-#: ../src/applet.c:1410
+#: ../src/applet.c:1411
msgid "No network devices available"
msgstr "네트워크 장치를 찾을 수 없습니다"
-#: ../src/applet.c:1464
+#: ../src/applet.c:1465
msgid "_VPN Connections"
msgstr "가상 사설망 연결(_V)"
-#: ../src/applet.c:1508
+#: ../src/applet.c:1509
#, fuzzy
msgid "_Configure VPN…"
msgstr "가상 사설망 설정(_C)..."
-#: ../src/applet.c:1511
+#: ../src/applet.c:1512
#, fuzzy
msgid "_Add a VPN connection…"
msgstr "가상 사설망 연결(_V)"
-#: ../src/applet.c:1617
+#: ../src/applet.c:1618
#, fuzzy
msgid "NetworkManager is not running…"
msgstr "네트워크 관리가 실행 중이 아닙니다..."
-#: ../src/applet.c:1622 ../src/applet.c:2687
+#: ../src/applet.c:1623 ../src/applet.c:2688
msgid "Networking disabled"
msgstr "네트워크를 사용할 수 없습니다"
#. 'Enable Networking' item
-#: ../src/applet.c:1832
+#: ../src/applet.c:1833
msgid "Enable _Networking"
msgstr "네트워크 사용(_N)"
#. 'Enable Wi-Fi' item
-#: ../src/applet.c:1841
+#: ../src/applet.c:1842
msgid "Enable _Wi-Fi"
msgstr "와이파이 사용(_W)"
#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1850
+#: ../src/applet.c:1851
msgid "Enable _Mobile Broadband"
msgstr "모바일 광대역 사용(_M)"
#. Toggle notifications item
-#: ../src/applet.c:1862
+#: ../src/applet.c:1863
msgid "Enable N_otifications"
msgstr "통지기능 사용(_O)"
#. 'Connection Information' item
-#: ../src/applet.c:1874
+#: ../src/applet.c:1875
msgid "Connection _Information"
msgstr "연결 정보(_I)"
#. 'Edit Connections...' item
-#: ../src/applet.c:1882
+#: ../src/applet.c:1883
#, fuzzy
msgid "Edit Connections…"
msgstr "연결 편집..."
-#: ../src/applet.c:1896
+#: ../src/applet.c:1897
msgid "_About"
msgstr "정보(_A)"
-#: ../src/applet.c:2207
+#: ../src/applet.c:2208
#, fuzzy, c-format
msgid "You are now connected to “%s”."
msgstr "'%s'에 연결되었습니다."
-#: ../src/applet.c:2247
+#: ../src/applet.c:2248
msgid "Disconnected"
msgstr "연결 끊김"
-#: ../src/applet.c:2248
+#: ../src/applet.c:2249
msgid "The network connection has been disconnected."
msgstr "네트워크 연결이 끊겼습니다."
-#: ../src/applet.c:2550
+#: ../src/applet.c:2551
#, fuzzy, c-format
msgid "Preparing network connection “%s”…"
msgstr "네트워크 연결 '%s' 준비 중..."
-#: ../src/applet.c:2553
+#: ../src/applet.c:2554
#, fuzzy, c-format
msgid "User authentication required for network connection “%s”…"
msgstr "네트워크 연결 '%s'에는 사용자 인증이 필요합니다..."
-#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2557 ../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:2559
+#: ../src/applet.c:2560
#, fuzzy, c-format
msgid "Network connection “%s” active"
msgstr "'%s' 네트워크 연결 사용 중"
-#: ../src/applet.c:2632
+#: ../src/applet.c:2633
#, fuzzy, c-format
msgid "Starting VPN connection “%s”…"
msgstr "가상 사설망 연결 '%s' 시작 중..."
-#: ../src/applet.c:2635
+#: ../src/applet.c:2636
#, fuzzy, c-format
msgid "User authentication required for VPN connection “%s”…"
msgstr "가상 사설망 연결 '%s'에는 사용자 인증이 필요합니다..."
-#: ../src/applet.c:2638
+#: ../src/applet.c:2639
#, fuzzy, c-format
msgid "Requesting a VPN address for “%s”…"
msgstr "'%s'에 가상 사설망 주소 요청 중..."
-#: ../src/applet.c:2641
+#: ../src/applet.c:2642
#, fuzzy, c-format
msgid "VPN connection active"
msgstr "가상 사설망 연결 '%s' 사용 중"
-#: ../src/applet.c:2691
+#: ../src/applet.c:2692
msgid "No network connection"
msgstr "네트워크 연결 없음"
-#: ../src/applet.c:3292
+#: ../src/applet.c:3299
msgid "NetworkManager Applet"
msgstr "네트워크 관리 애플릿"
@@ -569,47 +570,47 @@ msgstr "잘못된 PIN 코드. 서비스 업체에 문의하십시오."
msgid "Sending unlock code…"
msgstr "언락 코드를 보내는 중..."
-#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
+#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
#, c-format
msgid "Mobile Broadband (%s)"
msgstr "모바일 광대역(%s)"
-#: ../src/applet-device-broadband.c:739
+#: ../src/applet-device-broadband.c:741
#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:308
+#: ../src/connection-editor/page-mobile.c:305
#: ../src/libnm-gtk/nm-ui-utils.c:329
msgid "Mobile Broadband"
msgstr "모바일 광대역"
-#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-broadband.c:794 ../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:805
+#: ../src/applet-device-broadband.c:807
#, fuzzy
msgid "New Mobile Broadband connection…"
msgstr "새 모바일 광대역 연결"
-#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-broadband.c:821 ../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:820
+#: ../src/applet-device-broadband.c:822
msgid "You are now connected to the Mobile Broadband network."
msgstr "모바일 광대역 네트워크에 연결되었습니다."
-#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
+#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
msgid "Mobile Broadband network."
msgstr "모바일 광대역 네트워크."
-#: ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:963
msgid "You are now registered on the home network."
msgstr "홈 네트워크에 등록되었습니다."
-#: ../src/applet-device-broadband.c:967
+#: ../src/applet-device-broadband.c:969
msgid "You are now registered on a roaming network."
msgstr "로밍 네트워크에 등록되었습니다."
@@ -697,9 +698,9 @@ msgstr "DSL 인증"
#: ../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/connection-editor/page-bluetooth.c:309
+#: ../src/connection-editor/page-mobile.c:542
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
msgid "_OK"
msgstr ""
@@ -804,9 +805,9 @@ msgstr "연결 활성화하는 데 실패"
msgid "Error displaying connection information:"
msgstr "연결 정보 보이기 오류:"
-#: ../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
+#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
+#: ../src/libnma/nma-wifi-dialog.c:972 ../src/libnm-gtk/nm-wifi-dialog.c:948
+#: ../src/wireless-security/wireless-security.c:449
msgid "LEAP"
msgstr "LEAP"
@@ -830,7 +831,7 @@ msgid "WEP"
msgstr "WEP"
#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:332
+#: ../src/connection-editor/page-wifi-security.c:329
msgctxt "Wi-Fi/Ethernet security"
msgid "None"
msgstr "없음"
@@ -1095,7 +1096,7 @@ 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
+#: ../src/connection-editor/ce-page.h:112
#, fuzzy
msgid ""
"IP addresses identify your computer on the network. Click the “Add” button "
@@ -1122,7 +1123,7 @@ msgstr ""
#: ../src/connection-editor/ce-page-ip4.ui.h:8
#: ../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/connection-helpers.c:760
#: ../src/connection-editor/nm-connection-list.ui.h:4
msgid "_Delete"
msgstr "삭제(_D)"
@@ -1204,12 +1205,14 @@ msgid "ARP"
msgstr "ARP"
#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#, fuzzy
+msgid "Bonded _connections"
msgstr "본딩 연결(_C):"
#: ../src/connection-editor/ce-page-bond.ui.h:11
#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#, fuzzy
+msgid "M_ode"
msgstr "모드(_O):"
#: ../src/connection-editor/ce-page-bond.ui.h:13
@@ -1220,7 +1223,8 @@ msgid "_Edit"
msgstr "편집(_E)"
#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#, fuzzy
+msgid "Monitoring _frequency"
msgstr "감시 주기(_F):"
#: ../src/connection-editor/ce-page-bond.ui.h:16
@@ -1230,15 +1234,18 @@ msgstr "밀리초"
#: ../src/connection-editor/ce-page-bond.ui.h:17
#: ../src/connection-editor/ce-page-bridge.ui.h:6
#: ../src/connection-editor/ce-page-team.ui.h:16
-msgid "_Interface name:"
+#, fuzzy
+msgid "_Interface name"
msgstr "인터페이스 이름(_I):"
#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#, fuzzy
+msgid "_Link Monitoring"
msgstr "연결 감시(_L):"
#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#, fuzzy
+msgid "ARP _targets"
msgstr "ARP 대상(_T):"
#: ../src/connection-editor/ce-page-bond.ui.h:20
@@ -1249,15 +1256,18 @@ msgstr ""
"IP 주소 또는 쉼표로 구분한 IP 주소, 연결 상태를 확인할 때 찾아보는 용도."
#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#, fuzzy
+msgid "Link _up delay"
msgstr "연결 지연 시간(_U):"
#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#, fuzzy
+msgid "Link _down delay"
msgstr "해제 지연 시간(_D):"
#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#, fuzzy
+msgid "_Primary"
msgstr "기본(_P):"
#: ../src/connection-editor/ce-page-bond.ui.h:24
@@ -1274,7 +1284,8 @@ msgstr ""
#: ../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
-msgid "_MTU:"
+#, fuzzy
+msgid "_MTU"
msgstr "MTU(_M):"
#: ../src/connection-editor/ce-page-bond.ui.h:26
@@ -1287,28 +1298,34 @@ msgid "bytes"
msgstr "바이트"
#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#, fuzzy
+msgid "Path _cost"
msgstr "경로 비용(_C):"
#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#, fuzzy
+msgid "_Priority"
msgstr "우선 순위(_P):"
#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#, fuzzy
+msgid "_Hairpin mode"
msgstr "헤어핀 모드(_H):"
#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#, fuzzy
+msgid "Bridged _connections"
msgstr "브릿지 연결(_C):"
#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#, fuzzy
+msgid "_Forward delay"
msgstr "앞으로 지연 시간(_F):"
#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#, fuzzy
+msgid "_Hello time"
msgstr "최초 통신 시간(_H):"
#: ../src/connection-editor/ce-page-bridge.ui.h:9
@@ -1351,7 +1368,8 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-bridge.ui.h:17
-msgid "_Max age:"
+#, fuzzy
+msgid "_Max age"
msgstr "최대 기간(_M):"
#: ../src/connection-editor/ce-page-bridge.ui.h:18
@@ -1359,7 +1377,8 @@ msgid "STP maximum message age, in seconds"
msgstr ""
#: ../src/connection-editor/ce-page-bridge.ui.h:19
-msgid "_Aging time:"
+#, fuzzy
+msgid "_Aging time"
msgstr "유지 시간(_A):"
#: ../src/connection-editor/ce-page-bridge.ui.h:20
@@ -1367,7 +1386,7 @@ msgid "The Ethernet MAC address aging time, in seconds"
msgstr ""
#: ../src/connection-editor/ce-page-bridge.ui.h:21
-msgid "Group _forward mask:"
+msgid "Group _forward mask"
msgstr ""
#: ../src/connection-editor/ce-page-bridge.ui.h:22
@@ -1477,10 +1496,6 @@ msgstr "모든 장치"
msgid "invalid %s (%s) "
msgstr ""
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "알려지지 않은 오류로 비밀 정보를 업데이트하는 데 실패했습니다."
-
#: ../src/connection-editor/ce-page-dcb.ui.h:1
#, fuzzy
msgid "_Use Data Center Bridging (DCB) for this connection"
@@ -1548,66 +1563,75 @@ msgid "Enable or disable priority pause transmission for each User Priority."
msgstr "우선순위마다 우선순위 일시중지를 전송할지 지정합니다."
#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "우선 순위:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#, fuzzy
+msgid "0"
msgstr "0:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#, fuzzy
+msgid "1"
msgstr "1:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#, fuzzy
+msgid "2"
msgstr "2:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#, fuzzy
+msgid "3"
msgstr "3:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#, fuzzy
+msgid "4"
msgstr "4:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#, fuzzy
+msgid "5"
msgstr "5:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#, fuzzy
+msgid "6"
msgstr "6:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#, fuzzy
+msgid "7"
msgstr "7:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#, fuzzy
+msgid "Traffic Class"
msgstr "트래픽 클래스:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#, fuzzy
+msgid "Strict Bandwidth"
msgstr "엄격한 대역폭:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#, fuzzy
+msgid "Priority Bandwidth"
msgstr "우선 순위 대역폭:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "Group Bandwidth"
msgstr "모음 대역폭:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "Group ID"
msgstr "그룹 아이디:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
msgid "Enter the priority group ID for each User Priority."
msgstr "사용자 우선 순위마다 우선순위 그룹 아이디를 입력합니다."
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
#, fuzzy, no-c-format
msgid ""
"Enter the allowed link bandwidth percent each Priority Group may use. The "
@@ -1616,17 +1640,17 @@ msgstr ""
"각 우선순위 그룹마다 사용을 허용할 링크 대역폭 퍼센트를 지정합니다. 그룹의 총"
"합은 100%여야 합니다."
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
msgid ""
"Enter the percentage of priority group bandwidth each user priority may use."
msgstr ""
"각 사용자 우선순위가 사용하는 우선순위 그룹 대역폭의 퍼센트를 지정합니다."
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
msgid "Enable or disable strict bandwidth for each user priority."
msgstr "사용자 우선순위마다 엄격한 대역폭을 사용할지 지정합니다."
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
msgid "Enter the traffic class for each user priority."
msgstr "사용자 우선순위마다 트래픽 클래스 지정합니다."
@@ -1635,7 +1659,8 @@ msgstr "사용자 우선순위마다 트래픽 클래스 지정합니다."
#: ../src/wireless-security/eap-method-leap.ui.h:1
#: ../src/wireless-security/eap-method-simple.ui.h:1
#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#, fuzzy
+msgid "_Username"
msgstr "사용자 이름(_U):"
#: ../src/connection-editor/ce-page-dsl.ui.h:2
@@ -1649,10 +1674,12 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-dsl.ui.h:4
-msgid "_Service:"
+#, fuzzy
+msgid "_Service"
msgstr "서비스(_S):"
#: ../src/connection-editor/ce-page-dsl.ui.h:5
+#: ../src/libnma/nma-file-cert-chooser.c:347
#: ../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
@@ -1666,22 +1693,23 @@ 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
#: ../src/wireless-security/eap-method-leap.ui.h:2
#: ../src/wireless-security/eap-method-simple.ui.h:2
#: ../src/wireless-security/ws-leap.ui.h:2
#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#, fuzzy
+msgid "_Password"
msgstr "암호(_P):"
#: ../src/connection-editor/ce-page-dsl.ui.h:8
-msgid "PPP _interface:"
-msgstr ""
+#, fuzzy
+msgid "PPP _interface"
+msgstr "상위 인터페이스(_P):"
#: ../src/connection-editor/ce-page-dsl.ui.h:9
-msgid "P_arent interface:"
-msgstr ""
+#, fuzzy
+msgid "P_arent interface"
+msgstr "상위 인터페이스(_P):"
#: ../src/connection-editor/ce-page-dsl.ui.h:10
msgid "An arbitrary name to assign to the newly created PPP interface."
@@ -1691,13 +1719,27 @@ msgstr ""
msgid "The interface on which the PPP connection will be established."
msgstr ""
+#: ../src/connection-editor/ce-page-dsl.ui.h:12
+#, fuzzy
+msgid "C_laim interface"
+msgstr "상위 인터페이스(_P):"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:13
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
#: ../src/connection-editor/ce-page-ethernet.ui.h:1
+#: ../src/connection-editor/ce-page-general.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:142
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:143
#: ../src/wireless-security/eap-method-peap.ui.h:1
msgid "Automatic"
msgstr "자동"
@@ -1743,37 +1785,40 @@ msgid "Full"
msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:155
+#: ../src/connection-editor/page-ip6.c:156
msgid "Ignore"
msgstr "무시"
#: ../src/connection-editor/ce-page-ethernet.ui.h:13
#: ../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:191
+#: ../src/connection-editor/page-ip4.c:169
+#: ../src/connection-editor/page-ip6.c:192
msgid "Manual"
msgstr "수동"
#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#, fuzzy
+msgid "_Port"
msgstr "포트(_P):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:15
#: ../src/connection-editor/ce-page-infiniband.ui.h:6
#: ../src/connection-editor/ce-page-wifi.ui.h:9
#, fuzzy
-msgid "_Device:"
+msgid "_Device"
msgstr "서비스(_S):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:16
#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+#, fuzzy
+msgid "C_loned MAC address"
msgstr "복제한 MAC 주소(_L):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "비밀키 암호(_P):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:20
#, fuzzy
@@ -1812,7 +1857,7 @@ msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:28
#, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
msgstr "비밀키 암호(_P):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:29
@@ -1821,7 +1866,7 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+msgid "Lin_k negotiation"
msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:31
@@ -1832,7 +1877,8 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:32
-msgid "_Speed:"
+#, fuzzy
+msgid "_Speed"
msgstr "속도(_S):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:33
@@ -1844,7 +1890,7 @@ msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:34
#, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
msgstr "전이중 연결(full duplex)(_X)"
#: ../src/connection-editor/ce-page-ethernet.ui.h:35
@@ -1854,35 +1900,55 @@ msgid ""
"sure your device supports it."
msgstr ""
-#: ../src/connection-editor/ce-page-general.ui.h:1
-msgid "Automatically connect to _VPN when using this connection"
-msgstr "이 연결을 사용할 때 자동으로 가상 사설망에 연결(_V)"
-
#: ../src/connection-editor/ce-page-general.ui.h:2
-msgid "All _users may connect to this network"
-msgstr "모든 사용자가 이 네트워크에 연결 가능(_U)"
+msgid "Yes"
+msgstr ""
#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "사용 가능하면 자동으로 이 네트워크에 연결(_A)"
+#, fuzzy
+msgid "No"
+msgstr "없음"
#: ../src/connection-editor/ce-page-general.ui.h:4
-#, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "연결 정보(_I)"
+msgid "All _users may connect to this network"
+msgstr "모든 사용자가 이 네트워크에 연결 가능(_U)"
#: ../src/connection-editor/ce-page-general.ui.h:5
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "이 연결을 사용할 때 자동으로 가상 사설망에 연결(_V)"
+
+#: ../src/connection-editor/ce-page-general.ui.h:6
+#, fuzzy
+msgid "Firewall _zone"
+msgstr "방화벽 구역(_Z):"
+
+#: ../src/connection-editor/ce-page-general.ui.h:7
+#, fuzzy
+msgid "_Metered connection"
+msgstr "팀 연결(_T):"
+
+#: ../src/connection-editor/ce-page-general.ui.h:8
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:9
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "자동으로 얻은 라우팅 정보 무시(_N)"
+
+#: ../src/connection-editor/ce-page-general.ui.h:10
msgid ""
"Connection priority for automatic activation. Connections with higher "
"numbers are preferred when selecting profiles for automatic activation. "
"Default value is 0."
msgstr ""
-#: ../src/connection-editor/ce-page-general.ui.h:6
-msgid "Firewall _zone:"
-msgstr "방화벽 구역(_Z):"
-
-#: ../src/connection-editor/ce-page.h:111
+#: ../src/connection-editor/ce-page.h:109
#, fuzzy
msgid ""
"IP addresses identify your computer on the network. Click the “Add” button "
@@ -1891,7 +1957,7 @@ msgstr ""
"네트워크에서 컴퓨터를 식별하는 IP 주소. \"추가\" 단추를 눌러 IP 주소를 추가하"
"십시오."
-#: ../src/connection-editor/ce-page.h:116
+#: ../src/connection-editor/ce-page.h:114
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 "
@@ -1899,16 +1965,16 @@ msgid ""
"automatically."
msgstr ""
-#: ../src/connection-editor/ce-page.h:121
+#: ../src/connection-editor/ce-page.h:119
#, fuzzy
msgid "Additional static addresses"
msgstr "주소만 자동"
-#: ../src/connection-editor/ce-page.h:122
+#: ../src/connection-editor/ce-page.h:120
msgid "Addresses"
msgstr "주소"
-#: ../src/connection-editor/ce-page.h:123
+#: ../src/connection-editor/ce-page.h:121
msgid "Address (optional)"
msgstr ""
@@ -1923,7 +1989,8 @@ msgid "Connected"
msgstr "연결"
#: ../src/connection-editor/ce-page-infiniband.ui.h:5
-msgid "_Transport mode:"
+#, fuzzy
+msgid "_Transport mode"
msgstr "전송 모드(_T):"
#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
@@ -1964,38 +2031,41 @@ msgstr ""
#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
#: ../src/connection-editor/ce-page-macsec.ui.h:6
-msgid "Device name:"
-msgstr ""
+#, fuzzy
+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 ""
+#, fuzzy
+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:"
+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
-msgid "MTU:"
-msgstr ""
+#, fuzzy
+msgid "MTU"
+msgstr "MTU(_M):"
#: ../src/connection-editor/ce-page-ip4.ui.h:2
#: ../src/connection-editor/ce-page-ip6.ui.h:2
@@ -2009,14 +2079,15 @@ 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:211
+#: ../src/connection-editor/page-ip4.c:189
+#: ../src/connection-editor/page-ip6.c:212
msgid "Shared to other computers"
msgstr "다른 컴퓨터와 공유"
#: ../src/connection-editor/ce-page-ip4.ui.h:6
#: ../src/connection-editor/ce-page-ip6.ui.h:11
-msgid "_Method:"
+#, fuzzy
+msgid "_Method"
msgstr "방식(_M):"
#: ../src/connection-editor/ce-page-ip4.ui.h:9
@@ -2039,21 +2110,24 @@ msgstr ""
"로 구분하십시오."
#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#, fuzzy
+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:15
-#: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:346
-msgid "S_earch domains:"
+#: ../src/connection-editor/page-ip4.c:373
+#: ../src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
msgstr "검색 도메인(_E):"
#: ../src/connection-editor/ce-page-ip4.ui.h:13
#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:337
-msgid "DNS ser_vers:"
+#: ../src/connection-editor/page-ip4.c:364
+#: ../src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
msgstr "DNS 서버(_V):"
#: ../src/connection-editor/ce-page-ip4.ui.h:14
@@ -2083,7 +2157,7 @@ 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
+#: ../src/connection-editor/page-ip4.c:199
msgid "Disabled"
msgstr "사용안함"
@@ -2114,11 +2188,12 @@ msgstr ""
"인터페이스로 취급합니다."
#: ../src/connection-editor/ce-page-ip6.ui.h:18
-msgid "IPv6 _privacy extensions:"
+#, fuzzy
+msgid "IPv6 _privacy extensions"
msgstr "IPv6 개인 보안 확장(_P):"
#: ../src/connection-editor/ce-page-ip6.ui.h:19
-msgid "IPv6 address _generation mode:"
+msgid "IPv6 address _generation mode"
msgstr ""
#: ../src/connection-editor/ce-page-ip6.ui.h:20
@@ -2182,27 +2257,27 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:14
-msgid "CKN:"
+msgid "CKN"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:15
-msgid "CAK:"
+msgid "CAK"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:17
-msgid "Keys:"
+msgid "Keys"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:18
-msgid "Parameters:"
+msgid "Parameters"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:19
-msgid "Validation:"
+msgid "Validation"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:20
-msgid "SCI port:"
+msgid "SCI port"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:21
@@ -2227,7 +2302,8 @@ msgid "Basic"
msgstr "기본"
#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#, fuzzy
+msgid "Nu_mber"
msgstr "번호(_M):"
#: ../src/connection-editor/ce-page-mobile.ui.h:5
@@ -2235,11 +2311,13 @@ msgid "Advanced"
msgstr "고급"
#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#, fuzzy
+msgid "_APN"
msgstr "_APN:"
#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#, fuzzy
+msgid "N_etwork ID"
msgstr "네트워크 이름(_E):"
#: ../src/connection-editor/ce-page-mobile.ui.h:8
@@ -2248,7 +2326,8 @@ msgid "Change…"
msgstr "바꾸기..."
#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#, fuzzy
+msgid "P_IN"
msgstr "PIN(_I):"
#: ../src/connection-editor/ce-page-mobile.ui.h:10
@@ -2256,6 +2335,7 @@ msgid "Allow _roaming if home network is not available"
msgstr "홈 네트워크가 사용 불가능할 경우 로밍을 허용(_R)"
#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:454
msgid "Sho_w passwords"
msgstr "암호 보이기(_W)"
@@ -2264,7 +2344,8 @@ msgid "Authentication"
msgstr "인증"
#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#, fuzzy
+msgid "Allowed methods"
msgstr "허용된 방식:"
#: ../src/connection-editor/ce-page-ppp.ui.h:3
@@ -2322,11 +2403,11 @@ msgid "Use this proxy configuration for only browser clients/schemes."
msgstr ""
#: ../src/connection-editor/ce-page-proxy.ui.h:5
-msgid "PAC URL:"
+msgid "PAC URL"
msgstr ""
#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC script:"
+msgid "PAC script"
msgstr ""
#: ../src/connection-editor/ce-page-proxy.ui.h:7
@@ -2340,7 +2421,7 @@ msgstr "파일에서 팀 설정 가져오기(_I)..."
#: ../src/connection-editor/ce-page-proxy.ui.h:9
#, fuzzy
-msgid "Method:"
+msgid "Method"
msgstr "방식(_M):"
#: ../src/connection-editor/ce-page-team-port.ui.h:1
@@ -2375,7 +2456,7 @@ msgid "Team Advanced Options"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+msgid "_Queue ID"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:8
@@ -2395,7 +2476,7 @@ msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:11
#, fuzzy
-msgid "_Port priority:"
+msgid "_Port priority"
msgstr "우선 순위(_P):"
#: ../src/connection-editor/ce-page-team-port.ui.h:12
@@ -2414,10 +2495,7 @@ msgid "Port _sticky"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:15
-#: ../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."
+msgid "Do not unselect the port if a better one becomes available."
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:16
@@ -2426,12 +2504,12 @@ msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:17
#, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
msgstr "우선 순위(_P):"
#: ../src/connection-editor/ce-page-team-port.ui.h:18
#, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
msgstr "비밀키(_K):"
#: ../src/connection-editor/ce-page-team-port.ui.h:19
@@ -2462,46 +2540,47 @@ msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:24
#: ../src/connection-editor/ce-page-team.ui.h:70
-msgid "_Link watcher:"
+msgid "_Link watcher"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:25
#: ../src/connection-editor/ce-page-team.ui.h:71
#, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
msgstr "연결 지연 시간(_U):"
#: ../src/connection-editor/ce-page-team-port.ui.h:26
#: ../src/connection-editor/ce-page-team.ui.h:72
#, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
msgstr "해제 지연 시간(_D):"
#: ../src/connection-editor/ce-page-team-port.ui.h:27
#: ../src/connection-editor/ce-page-team.ui.h:73
#, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
msgstr "상위 인터페이스(_P):"
#: ../src/connection-editor/ce-page-team-port.ui.h:28
#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+msgid "Delay _before first send"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:29
#: ../src/connection-editor/ce-page-team.ui.h:75
-msgid "_Maximum missed replies:"
+msgid "_Maximum missed replies"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:30
#: ../src/connection-editor/ce-page-team.ui.h:76
-msgid "_Source host:"
-msgstr ""
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP 대상(_T):"
#: ../src/connection-editor/ce-page-team-port.ui.h:31
#: ../src/connection-editor/ce-page-team.ui.h:77
#, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
msgstr "ARP 대상(_T):"
#: ../src/connection-editor/ce-page-team-port.ui.h:32
@@ -2531,75 +2610,82 @@ msgid "Ignore invalid packets from _active ports"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:36
+#: ../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:37
#: ../src/connection-editor/ce-page-team.ui.h:83
msgid "Ignore invalid packets from i_nactive ports"
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
+#: ../src/connection-editor/ce-page-team-port.ui.h:38
#: ../src/connection-editor/ce-page-team.ui.h:84
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 ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
+#: ../src/connection-editor/ce-page-team-port.ui.h:39
#: ../src/connection-editor/ce-page-team.ui.h:85
msgid "S_end on inactive ports"
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
+#: ../src/connection-editor/ce-page-team-port.ui.h:40
#: ../src/connection-editor/ce-page-team.ui.h:86
msgid ""
"By default, ARP requests are sent on active ports only. This option allows "
"sending even on inactive ports."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
+#: ../src/connection-editor/ce-page-team-port.ui.h:41
#: ../src/connection-editor/ce-page-team.ui.h:87
msgid ""
"The delay between the link coming up and the runner being notified about it."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
+#: ../src/connection-editor/ce-page-team-port.ui.h:42
#: ../src/connection-editor/ce-page-team.ui.h:88
msgid ""
"The delay between the link going down and the runner being notified about it."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:42
+#: ../src/connection-editor/ce-page-team-port.ui.h:43
#: ../src/connection-editor/ce-page-team.ui.h:89
msgid "The interval between requests being sent."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:43
+#: ../src/connection-editor/ce-page-team-port.ui.h:44
#: ../src/connection-editor/ce-page-team.ui.h:90
msgid ""
"The delay between link watch initialization and the first request being sent."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
+#: ../src/connection-editor/ce-page-team-port.ui.h:45
#: ../src/connection-editor/ce-page-team.ui.h:91
msgid "The link watcher to be used."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
+#: ../src/connection-editor/ce-page-team-port.ui.h:46
#: ../src/connection-editor/ce-page-team.ui.h:92
msgid "Link Watcher"
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
+#: ../src/connection-editor/ce-page-team-port.ui.h:47
#: ../src/connection-editor/ce-page-team.ui.h:93
#, fuzzy
msgid "Im_port team configuration from a file…"
msgstr "파일에서 팀 설정 가져오기(_I)..."
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
+#: ../src/connection-editor/ce-page-team-port.ui.h:48
#: ../src/connection-editor/ce-page-team.ui.h:94
#, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
msgstr "_JSON 설정:"
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
+#: ../src/connection-editor/ce-page-team-port.ui.h:49
#: ../src/connection-editor/ce-page-team.ui.h:95
msgid "Raw Configuration"
msgstr ""
@@ -2640,7 +2726,8 @@ msgid "From active to team device"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#, fuzzy
+msgid "_Teamed connections"
msgstr "팀 연결(_T):"
#: ../src/connection-editor/ce-page-team.ui.h:23
@@ -2653,14 +2740,14 @@ msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:27
#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:351
+#: ../src/connection-editor/page-ethernet.c:348
#: ../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:120
-#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
#: ../src/libnm-gtk/nm-ui-utils.c:583
msgid "VLAN"
msgstr "가상 LAN"
@@ -2692,24 +2779,24 @@ msgid "Any L4 protocol"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+msgid "_Peer notification count"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+msgid "Peer _notification interval"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+msgid "_Multicast rejoin count"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+msgid "Multicast _rejoin interval"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:46
#, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
msgstr "하드웨어 주소:"
#: ../src/connection-editor/ce-page-team.ui.h:47
@@ -2719,12 +2806,12 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:49
-msgid "_Runner:"
+msgid "_Runner"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:50
#, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
msgstr "하드웨어 주소:"
#: ../src/connection-editor/ce-page-team.ui.h:51
@@ -2760,15 +2847,15 @@ msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:57
#, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
msgstr "우선 순위(_P):"
#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+msgid "_Minimum ports"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+msgid "_Aggregator selection policy"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:60
@@ -2805,12 +2892,12 @@ msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:67
#, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
msgstr "전송 출력(_W):"
#: ../src/connection-editor/ce-page-team.ui.h:68
#, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
msgstr "전송 출력(_W):"
#: ../src/connection-editor/ce-page-team.ui.h:69
@@ -2818,25 +2905,27 @@ msgid "Runner"
msgstr ""
#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#, fuzzy
+msgid "_Parent interface"
msgstr "상위 인터페이스(_P):"
#: ../src/connection-editor/ce-page-vlan.ui.h:2
#, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
msgstr "가상 LAN 인터페이스 이름(_N):"
#: ../src/connection-editor/ce-page-vlan.ui.h:3
#, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
msgstr "복제한 MAC 주소(_C):"
#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#, fuzzy
+msgid "VLAN _id"
msgstr "가상 LAN 아이디(_I):"
#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+msgid "Flags"
msgstr ""
#: ../src/connection-editor/ce-page-vlan.ui.h:8
@@ -2866,7 +2955,8 @@ msgid "\"vlan\" + number"
msgstr "\"vlan\" + 번호"
#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#, fuzzy
+msgid "S_ecurity"
msgstr "보안(_E):"
#: ../src/connection-editor/ce-page-wifi.ui.h:2
@@ -2894,7 +2984,8 @@ msgid "mW"
msgstr "mW"
#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#, fuzzy
+msgid "Transmission po_wer"
msgstr "전송 출력(_W):"
#: ../src/connection-editor/ce-page-wifi.ui.h:13
@@ -2902,23 +2993,28 @@ msgid "Mb/s"
msgstr "Mb/s"
#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#, fuzzy
+msgid "_Rate"
msgstr "레이트(_R):"
#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#, fuzzy
+msgid "_BSSID"
msgstr "BSSID(_B):"
#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#, fuzzy
+msgid "C_hannel"
msgstr "채널(_H):"
#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#, fuzzy
+msgid "Ban_d"
msgstr "밴드(_D):"
#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#, fuzzy
+msgid "SS_ID"
msgstr "SSID(_I):"
#: ../src/connection-editor/ce-polkit.c:63
@@ -2980,157 +3076,146 @@ msgstr ""
"이 실패하면, 몇몇 방법을 사용하지 않아 보십시오."
#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
msgid "Wi-Fi"
msgstr "와이파이"
#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/connection-editor/page-bluetooth.c:120
#: ../src/libnm-gtk/nm-ui-utils.c:325
msgid "Bluetooth"
msgstr "블루투스"
#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:201
+#: ../src/connection-editor/page-dsl.c:217
msgid "DSL/PPPoE"
msgstr ""
#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:148
+#: ../src/connection-editor/page-infiniband.c:145
#: ../src/libnm-gtk/nm-ui-utils.c:331
msgid "InfiniBand"
msgstr "인피니밴드"
#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../src/connection-editor/page-bond.c:443 ../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:118
-#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/page-team.c:1028 ../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:119
-#: ../src/connection-editor/page-bridge.c:233
+#: ../src/connection-editor/page-bridge.c:230
#: ../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:121
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: ../src/connection-editor/page-ip-tunnel.c:173
msgid "IP tunnel"
msgstr ""
#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:190
+#: ../src/connection-editor/page-macsec.c:187
msgid "MACsec"
msgstr ""
#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:398
-#: ../src/connection-editor/page-vpn.c:96
+#: ../src/connection-editor/connection-helpers.c:386
+#: ../src/connection-editor/page-vpn.c:100
msgid "VPN"
msgstr "가상 사설망"
-#: ../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."
+#: ../src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
msgstr ""
"가상 사설망 플러그인이 가상 사설망 연결을 정상적으로 가져오는 데 실패했습니"
"다\n"
"\n"
"오류: 가상 사설망 서비스 유형이 없음"
-#: ../src/connection-editor/connection-helpers.c:219
-msgid "Cannot import VPN connection"
-msgstr "가상 사설망 연결을 가져올 수 없음"
-
-#: ../src/connection-editor/connection-helpers.c:221
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
-msgstr ""
-"'%s' 파일을 읽을 수 없거나, 파일안에 알아볼 수 있는 가상 사설망 연결 정보가 "
-"없습니다.\n"
-"\n"
-"오류: %s."
-
-#: ../src/connection-editor/connection-helpers.c:222
-#, fuzzy
-msgid "unknown error"
-msgstr "알 수 없는 오류"
-
-#: ../src/connection-editor/connection-helpers.c:305
+#: ../src/connection-editor/connection-helpers.c:293
#: ../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:309
+#: ../src/connection-editor/connection-helpers.c:297
#: ../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
+#: ../src/connection-editor/connection-helpers.c:328
msgid "Hardware"
msgstr "하드웨어"
-#: ../src/connection-editor/connection-helpers.c:367
+#: ../src/connection-editor/connection-helpers.c:355
msgid "Virtual"
msgstr "가상"
-#: ../src/connection-editor/connection-helpers.c:516
-#: ../src/connection-editor/connection-helpers.c:518
+#: ../src/connection-editor/connection-helpers.c:504
+#: ../src/connection-editor/connection-helpers.c:506
#, fuzzy
msgid "Import a saved VPN configuration…"
msgstr "저장한 가상 사설망 설정 가져오기..."
-#: ../src/connection-editor/connection-helpers.c:548
+#: ../src/connection-editor/connection-helpers.c:536
msgid ""
"The connection editor dialog could not be initialized due to an unknown "
"error."
msgstr "연결 에디터 창을 알려지지 않은 오류 때문에 열 수 없습니다."
-#: ../src/connection-editor/connection-helpers.c:557
+#: ../src/connection-editor/connection-helpers.c:545
msgid "Could not create new connection"
msgstr "새로운 연결을 만들 수 없음"
-#: ../src/connection-editor/connection-helpers.c:720
+#: ../src/connection-editor/connection-helpers.c:708
msgid "Connection delete failed"
msgstr "연결 제거가 실패했습니다"
-#: ../src/connection-editor/connection-helpers.c:768
+#: ../src/connection-editor/connection-helpers.c:756
#, c-format
msgid "Are you sure you wish to delete the connection %s?"
msgstr "%s 연결을 정말로 제거하시겠습니까?"
+#: ../src/connection-editor/gtk/menus.ui.h:1
+#, fuzzy
+msgid "_New Connection"
+msgstr "가상 사설망 연결(_V)"
+
+#: ../src/connection-editor/gtk/menus.ui.h:2
+msgid "_Quit"
+msgstr ""
+
#: ../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:1118
+#: ../src/connection-editor/page-ip4.c:1133
+#: ../src/connection-editor/page-ip6.c:1115
msgid "Address"
msgstr "주소"
#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: ../src/connection-editor/page-ip4.c:1152
msgid "Netmask"
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:1156
+#: ../src/connection-editor/page-ip4.c:1171
+#: ../src/connection-editor/page-ip6.c:1153
msgid "Gateway"
msgstr "게이트웨이"
@@ -3140,83 +3225,83 @@ msgid "Metric"
msgstr "매트릭"
#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1137
+#: ../src/connection-editor/page-ip6.c:1134
msgid "Prefix"
msgstr "접두어"
-#: ../src/connection-editor/nm-connection-editor.c:109
+#: ../src/connection-editor/nm-connection-editor.c:110
#, c-format
msgid "Editing %s"
msgstr "%s 편집"
-#: ../src/connection-editor/nm-connection-editor.c:113
+#: ../src/connection-editor/nm-connection-editor.c:114
msgid "Editing un-named connection"
msgstr "이름 없는 연결을 편집"
-#: ../src/connection-editor/nm-connection-editor.c:133
+#: ../src/connection-editor/nm-connection-editor.c:134
#, fuzzy
msgid "Missing connection name"
msgstr "연결 이름(_N):"
-#: ../src/connection-editor/nm-connection-editor.c:353
+#: ../src/connection-editor/nm-connection-editor.c:350
#, fuzzy
msgid "Editor initializing…"
msgstr "에디터 초기화 중 오류"
-#: ../src/connection-editor/nm-connection-editor.c:360
-#: ../src/connection-editor/nm-connection-list.c:443
+#: ../src/connection-editor/nm-connection-editor.c:357
+#: ../src/connection-editor/nm-connection-list.c:471
#, fuzzy
msgid "Connection cannot be modified"
msgstr "연결을 추가하는 데 실패했습니다"
-#: ../src/connection-editor/nm-connection-editor.c:375
+#: ../src/connection-editor/nm-connection-editor.c:372
#, c-format
msgid "Invalid setting %s: %s"
msgstr ""
-#: ../src/connection-editor/nm-connection-editor.c:451
+#: ../src/connection-editor/nm-connection-editor.c:448
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:578
+#: ../src/connection-editor/nm-connection-editor.c:581
#: ../src/connection-editor/vpn-helpers.c:213
msgid "_Save"
msgstr "저장(_S)"
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: ../src/connection-editor/nm-connection-editor.c:582
msgid "Save any changes made to this connection."
msgstr "이 연결에 대해 바뀐 사항을 저장합니다."
-#: ../src/connection-editor/nm-connection-editor.c:580
+#: ../src/connection-editor/nm-connection-editor.c:583
msgid "Authenticate to save this connection for all users of this machine."
msgstr "이 컴퓨터의 모든 사용자에게 이 연결을 적용하도록 인증합니다."
-#: ../src/connection-editor/nm-connection-editor.c:596
+#: ../src/connection-editor/nm-connection-editor.c:599
msgid "Could not create connection"
msgstr "연결을 만들 수 없음"
-#: ../src/connection-editor/nm-connection-editor.c:596
+#: ../src/connection-editor/nm-connection-editor.c:599
msgid "Could not edit connection"
msgstr "연결을 변경할 수 없음"
-#: ../src/connection-editor/nm-connection-editor.c:598
+#: ../src/connection-editor/nm-connection-editor.c:601
msgid "Unknown error creating connection editor dialog."
msgstr "연결 편집 대화 창 만들기에 알 수 없는 오류."
-#: ../src/connection-editor/nm-connection-editor.c:739
+#: ../src/connection-editor/nm-connection-editor.c:742
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:759
+#: ../src/connection-editor/nm-connection-editor.c:762
msgid "Error initializing editor"
msgstr "에디터 초기화 중 오류"
-#: ../src/connection-editor/nm-connection-editor.c:1157
+#: ../src/connection-editor/nm-connection-editor.c:1169
msgid "Connection add failed"
msgstr "연결을 추가하는 데 실패했습니다"
@@ -3232,7 +3317,8 @@ msgid ""
msgstr "참이면 CA 인증서가 EAP 인증이 되었는지 경고를 하지 않습니다."
#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
+#, fuzzy
+msgid "Connection _name"
msgstr "연결 이름(_N):"
#: ../src/connection-editor/nm-connection-editor.ui.h:4
@@ -3262,119 +3348,144 @@ msgstr ""
msgid "Filename"
msgstr ""
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:148
msgid "never"
msgstr "하지 않음"
-#: ../src/connection-editor/nm-connection-list.c:162
-#: ../src/connection-editor/nm-connection-list.c:173
+#: ../src/connection-editor/nm-connection-list.c:159
+#: ../src/connection-editor/nm-connection-list.c:170
msgid "now"
msgstr "지금"
#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:180
+#: ../src/connection-editor/nm-connection-list.c:177
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%d분 전"
-#: ../src/connection-editor/nm-connection-list.c:184
+#: ../src/connection-editor/nm-connection-list.c:181
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%d시간 전"
-#: ../src/connection-editor/nm-connection-list.c:196
+#: ../src/connection-editor/nm-connection-list.c:193
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "%d일 전"
-#: ../src/connection-editor/nm-connection-list.c:202
+#: ../src/connection-editor/nm-connection-list.c:199
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
msgstr[0] "%d달 전"
-#: ../src/connection-editor/nm-connection-list.c:206
+#: ../src/connection-editor/nm-connection-list.c:203
#, c-format
msgid "%d year ago"
msgid_plural "%d years ago"
msgstr[0] "%d년 전"
-#: ../src/connection-editor/nm-connection-list.c:445
+#: ../src/connection-editor/nm-connection-list.c:473
msgid "Connection cannot be deleted"
msgstr ""
-#: ../src/connection-editor/nm-connection-list.c:448
+#: ../src/connection-editor/nm-connection-list.c:476
msgid "Select a connection to edit"
msgstr ""
-#: ../src/connection-editor/nm-connection-list.c:450
+#: ../src/connection-editor/nm-connection-list.c:478
msgid "Select a connection to delete"
msgstr ""
-#: ../src/connection-editor/nm-connection-list.c:785
+#: ../src/connection-editor/nm-connection-list.c:794
#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
msgid "Name"
msgstr "이름"
-#: ../src/connection-editor/nm-connection-list.c:798
+#: ../src/connection-editor/nm-connection-list.c:807
msgid "Last Used"
msgstr "마지막 사용"
-#: ../src/connection-editor/nm-connection-list.c:836
+#: ../src/connection-editor/nm-connection-list.c:845
msgid "Edit the selected connection"
msgstr "선택한 연결을 고칩니다"
-#: ../src/connection-editor/nm-connection-list.c:837
+#: ../src/connection-editor/nm-connection-list.c:846
msgid "Authenticate to edit the selected connection"
msgstr "선택된 연결을 변경하도록 인증합니다"
-#: ../src/connection-editor/nm-connection-list.c:842
+#: ../src/connection-editor/nm-connection-list.c:851
msgid "Delete the selected connection"
msgstr "선택한 연결 삭제"
-#: ../src/connection-editor/nm-connection-list.c:843
+#: ../src/connection-editor/nm-connection-list.c:852
msgid "Authenticate to delete the selected connection"
msgstr "선택한 연결을 삭제하도록 인증"
-#: ../src/connection-editor/nm-connection-list.c:1048
-#: ../src/connection-editor/nm-connection-list.c:1051
+#: ../src/connection-editor/nm-connection-list.c:1059
+#, fuzzy, c-format
+msgid "Unrecognized connection type"
+msgstr "지원하지 않는 모바일 광대역 연결 종류."
+
+#: ../src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "'%s' 연결을 만드는 방법을 알지 못합니다"
+
+#: ../src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "연결을 편집하는데 오류"
+
+#: ../src/connection-editor/nm-connection-list.c:1075
+#: ../src/connection-editor/nm-connection-list.c:1090
+#: ../src/connection-editor/nm-connection-list.c:1093
msgid "Error creating connection"
msgstr "연결을 만드는데 오류"
-#: ../src/connection-editor/nm-connection-list.c:1049
+#: ../src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "연결을 추가하는 데 실패했습니다"
+
+#: ../src/connection-editor/nm-connection-list.c:1091
msgid "No VPN plugins are installed."
msgstr "VPN 플러그인을 하나도 설치하지 않았습니다."
-#: ../src/connection-editor/nm-connection-list.c:1052
+#: ../src/connection-editor/nm-connection-list.c:1094
#, fuzzy, c-format
msgid "Don’t know how to create “%s” connections"
msgstr "'%s' 연결을 만드는 방법을 알지 못합니다"
-#: ../src/connection-editor/nm-connection-list.c:1085
+#: ../src/connection-editor/nm-connection-list.c:1128
msgid "Error editing connection"
msgstr "연결을 편집하는데 오류"
-#: ../src/connection-editor/nm-connection-list.c:1086
+#: ../src/connection-editor/nm-connection-list.c:1129
#, fuzzy, c-format
msgid "Did not find a connection with UUID “%s”"
msgstr "UUID가 '%s'인 연결을 찾을 수 없습니다"
+#: ../src/connection-editor/nm-connection-list.ui.h:1
+msgid "Network Connections"
+msgstr "네트워크 연결"
+
#: ../src/connection-editor/nm-connection-list.ui.h:2
msgid "Add a new connection"
msgstr ""
-#: ../src/connection-editor/page-8021x-security.c:116
+#: ../src/connection-editor/page-8021x-security.c:113
msgid "802.1X Security"
msgstr "802.1X 보안"
-#: ../src/connection-editor/page-8021x-security.c:118
+#: ../src/connection-editor/page-8021x-security.c:115
msgid "Could not load 802.1X Security user interface."
msgstr "802.1X 보안 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-8021x-security.c:132
+#: ../src/connection-editor/page-8021x-security.c:129
msgid "Use 802.1_X security for this connection"
msgstr "이 연결에 802.1X 보안을 사용(_X)"
@@ -3382,59 +3493,59 @@ msgstr "이 연결에 802.1X 보안을 사용(_X)"
msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
msgstr ""
-#: ../src/connection-editor/page-bluetooth.c:125
+#: ../src/connection-editor/page-bluetooth.c:122
#, fuzzy
msgid "Could not load Bluetooth user interface."
msgstr "DCB 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-bluetooth.c:175
+#: ../src/connection-editor/page-bluetooth.c:170
#, c-format
msgid "invalid Bluetooth device (%s)"
msgstr ""
-#: ../src/connection-editor/page-bluetooth.c:258
+#: ../src/connection-editor/page-bluetooth.c:253
#, fuzzy, c-format
msgid "Bluetooth connection %d"
msgstr "본딩 네트워크 연결 %d"
-#: ../src/connection-editor/page-bluetooth.c:308
+#: ../src/connection-editor/page-bluetooth.c:304
#, fuzzy
msgid "Bluetooth Type"
msgstr "블루투스"
-#: ../src/connection-editor/page-bluetooth.c:326
+#: ../src/connection-editor/page-bluetooth.c:322
msgid "Select the type of the Bluetooth connection profile."
msgstr ""
-#: ../src/connection-editor/page-bluetooth.c:331
+#: ../src/connection-editor/page-bluetooth.c:327
#, fuzzy
msgid "_Personal Area Network"
msgstr "이더넷 네트워크"
-#: ../src/connection-editor/page-bluetooth.c:336
+#: ../src/connection-editor/page-bluetooth.c:332
#, fuzzy
msgid "_Dial-Up Network"
msgstr "와이파이 네트워크"
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:446
msgid "Could not load bond user interface."
msgstr "본딩 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-bond.c:568
+#: ../src/connection-editor/page-bond.c:565
#, fuzzy
msgid "primary"
msgstr "기본(_P):"
-#: ../src/connection-editor/page-bond.c:623
+#: ../src/connection-editor/page-bond.c:620
#, c-format
msgid "Bond connection %d"
msgstr "본딩 네트워크 연결 %d"
-#: ../src/connection-editor/page-bridge.c:236
+#: ../src/connection-editor/page-bridge.c:233
msgid "Could not load bridge user interface."
msgstr "브릿지 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-bridge.c:352
+#: ../src/connection-editor/page-bridge.c:349
#, c-format
msgid "Bridge connection %d"
msgstr "브릿지 네트워크 연결 %d"
@@ -3442,31 +3553,31 @@ msgstr "브릿지 네트워크 연결 %d"
#. Translators: a "Bridge Port" is a network
#. * device that is part of a bridge.
#.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: ../src/connection-editor/page-bridge-port.c:105
msgid "Bridge Port"
msgstr "브릿지 포트"
-#: ../src/connection-editor/page-bridge-port.c:110
+#: ../src/connection-editor/page-bridge-port.c:107
msgid "Could not load bridge port user interface."
msgstr "브릿지 네트워크 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-dcb.c:622
+#: ../src/connection-editor/page-dcb.c:624
msgid "DCB"
msgstr "DCB"
-#: ../src/connection-editor/page-dcb.c:624
+#: ../src/connection-editor/page-dcb.c:626
msgid "Could not load DCB user interface."
msgstr "DCB 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-dsl.c:203
+#: ../src/connection-editor/page-dsl.c:219
msgid "Could not load DSL user interface."
msgstr "DSL 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-dsl.c:298
+#: ../src/connection-editor/page-dsl.c:320
msgid "missing parent interface"
msgstr ""
-#: ../src/connection-editor/page-dsl.c:343
+#: ../src/connection-editor/page-dsl.c:365
#, c-format
msgid "DSL connection %d"
msgstr "DSL 연결 %d"
@@ -3486,39 +3597,39 @@ msgstr ""
msgid "ignored"
msgstr "무시함"
-#: ../src/connection-editor/page-ethernet.c:353
+#: ../src/connection-editor/page-ethernet.c:350
msgid "Could not load ethernet user interface."
msgstr "이더넷 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-ethernet.c:515
+#: ../src/connection-editor/page-ethernet.c:512
#, fuzzy
msgid "Ethernet device"
msgstr "이더넷"
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: ../src/connection-editor/page-ethernet.c:516
+#: ../src/connection-editor/page-vlan.c:737
+#: ../src/connection-editor/page-wifi.c:571
#, fuzzy
msgid "cloned MAC"
msgstr "복제한 MAC 주소(_L):"
-#: ../src/connection-editor/page-ethernet.c:523
+#: ../src/connection-editor/page-ethernet.c:520
msgid "Wake-on-LAN password"
msgstr ""
-#: ../src/connection-editor/page-ethernet.c:563
+#: ../src/connection-editor/page-ethernet.c:560
#, c-format
msgid "Ethernet connection %d"
msgstr "이더넷 연결 %d"
#. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: ../src/connection-editor/page-general.c:55
+#: ../src/libnma/nma-mobile-providers.c:802
+#: ../src/libnm-gtk/nm-mobile-providers.c:801
msgid "Default"
msgstr "기본"
-#: ../src/connection-editor/page-general.c:55
+#: ../src/connection-editor/page-general.c:56
msgid ""
"The zone defines the trust level of the connection. Default is not a regular "
"zone, selecting it results in the use of the default zone set in the "
@@ -3543,75 +3654,77 @@ msgstr ""
"이 옵션을 사용하면 이 연결은 여기 입력한 MAC 주소로 지정한 네트워크 장치에만 "
"해당됩니다. 예: 00:11:22:33:44:55"
-#: ../src/connection-editor/page-infiniband.c:151
+#: ../src/connection-editor/page-infiniband.c:148
msgid "Could not load InfiniBand user interface."
msgstr "인피니밴드 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-infiniband.c:214
+#: ../src/connection-editor/page-infiniband.c:211
msgid "infiniband device"
msgstr ""
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:251
#, c-format
msgid "InfiniBand connection %d"
msgstr "인피니밴드 네트워크 연결 %d"
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: ../src/connection-editor/page-ip-tunnel.c:175
#, fuzzy
msgid "Could not load IP tunnel user interface."
msgstr "IPv4 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: ../src/connection-editor/page-ip-tunnel.c:289
#, fuzzy, c-format
msgid "IP tunnel connection %d"
msgstr "이더넷 연결 %d"
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:128
+#: ../src/connection-editor/page-ip6.c:137
msgid "Automatic (VPN)"
msgstr "자동(가상 사설망)"
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:138
msgid "Automatic (VPN) addresses only"
msgstr "자동(가상 사설망), 주소만"
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:144
msgid "Automatic, addresses only"
msgstr "주소만 자동"
-#: ../src/connection-editor/page-ip4.c:134
-#: ../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:140
+msgid "Automatic (PPPoE)"
+msgstr "자동(PPPoE)"
+
+#: ../src/connection-editor/page-ip4.c:136
+#: ../src/connection-editor/page-ip6.c:141
msgid "Automatic (PPPoE) addresses only"
msgstr "주소만 자동(PPPoE)"
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:138
msgid "Automatic (DHCP)"
msgstr "자동(DHCP)"
-#: ../src/connection-editor/page-ip4.c:138
+#: ../src/connection-editor/page-ip4.c:139
msgid "Automatic (DHCP) addresses only"
msgstr "주소만 자동(DHCP)"
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:182
+#: ../src/connection-editor/page-ip6.c:205
msgid "Link-Local Only"
msgstr "연결-로컬 연결만"
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:335
-msgid "Additional DNS ser_vers:"
+#: ../src/connection-editor/page-ip4.c:362
+#: ../src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
msgstr "추가 DNS 서버(_V):"
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:344
-msgid "Additional s_earch domains:"
+#: ../src/connection-editor/page-ip4.c:371
+#: ../src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
msgstr "추가 검색 도메인(_E):"
#: ../src/connection-editor/page-ip4.c:1033
@@ -3619,35 +3732,35 @@ msgstr "추가 검색 도메인(_E):"
msgid "Editing IPv4 routes for %s"
msgstr "%s의 IPv4 경로 편집 중"
-#: ../src/connection-editor/page-ip4.c:1226
+#: ../src/connection-editor/page-ip4.c:1223
msgid "IPv4 Settings"
msgstr "IPv4 설정"
-#: ../src/connection-editor/page-ip4.c:1228
+#: ../src/connection-editor/page-ip4.c:1225
msgid "Could not load IPv4 user interface."
msgstr "IPv4 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-ip4.c:1321
+#: ../src/connection-editor/page-ip4.c:1318
#, c-format
msgid "IPv4 address “%s” invalid"
msgstr ""
-#: ../src/connection-editor/page-ip4.c:1329
+#: ../src/connection-editor/page-ip4.c:1326
#, c-format
msgid "IPv4 address netmask “%s” invalid"
msgstr ""
-#: ../src/connection-editor/page-ip4.c:1338
+#: ../src/connection-editor/page-ip4.c:1335
#, c-format
msgid "IPv4 gateway “%s” invalid"
msgstr ""
-#: ../src/connection-editor/page-ip4.c:1381
+#: ../src/connection-editor/page-ip4.c:1378
#, c-format
msgid "IPv4 DNS server “%s” invalid"
msgstr ""
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:180
msgid "Automatic, DHCP only"
msgstr "자동, DHCP만 사용"
@@ -3656,54 +3769,54 @@ msgstr "자동, DHCP만 사용"
msgid "Editing IPv6 routes for %s"
msgstr "%s의 IPv6 경로 편집"
-#: ../src/connection-editor/page-ip6.c:1208
+#: ../src/connection-editor/page-ip6.c:1205
msgid "IPv6 Settings"
msgstr "IPv6 설정"
-#: ../src/connection-editor/page-ip6.c:1210
+#: ../src/connection-editor/page-ip6.c:1207
msgid "Could not load IPv6 user interface."
msgstr "IPv6 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-ip6.c:1302
+#: ../src/connection-editor/page-ip6.c:1299
#, c-format
msgid "IPv6 address “%s” invalid"
msgstr ""
-#: ../src/connection-editor/page-ip6.c:1310
+#: ../src/connection-editor/page-ip6.c:1307
#, c-format
msgid "IPv6 prefix “%s” invalid"
msgstr ""
-#: ../src/connection-editor/page-ip6.c:1319
+#: ../src/connection-editor/page-ip6.c:1316
#, c-format
msgid "IPv6 gateway “%s” invalid"
msgstr ""
-#: ../src/connection-editor/page-ip6.c:1361
+#: ../src/connection-editor/page-ip6.c:1358
#, c-format
msgid "IPv6 DNS server “%s” invalid"
msgstr ""
-#: ../src/connection-editor/page-macsec.c:192
+#: ../src/connection-editor/page-macsec.c:189
msgid "Could not load MACsec user interface."
msgstr ""
-#: ../src/connection-editor/page-macsec.c:331
+#: ../src/connection-editor/page-macsec.c:328
#, c-format
msgid "MACSEC connection %d"
msgstr ""
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: ../src/connection-editor/page-master.c:235
+#: ../src/connection-editor/page-master.c:246
msgid "Duplicate slaves"
msgstr "슬레이브 중복"
-#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:236
#, fuzzy, c-format
msgid "Slaves “%s” and “%s” both apply to device “%s”"
msgstr "'%s' 및 '%s' 슬레이브가 모두 '%s' 장치에 적용됩니다"
-#: ../src/connection-editor/page-master.c:259
+#: ../src/connection-editor/page-master.c:247
#, fuzzy, c-format
msgid ""
"Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3712,25 +3825,25 @@ msgstr ""
"'%s' 및 '%s' 슬레이브가 같은 물리적 장치의 다른 가상 포트('%s' 및 '%s')에 적"
"용됩니다."
-#: ../src/connection-editor/page-master.c:385
+#: ../src/connection-editor/page-master.c:371
#, c-format
msgid "%s slave %d"
msgstr "%s 슬레이브 %d"
-#: ../src/connection-editor/page-mobile.c:310
+#: ../src/connection-editor/page-mobile.c:307
msgid "Could not load mobile broadband user interface."
msgstr "모바일 광대역 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-mobile.c:327
+#: ../src/connection-editor/page-mobile.c:324
msgid "Unsupported mobile broadband connection type."
msgstr "지원하지 않는 모바일 광대역 연결 종류."
#. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: ../src/connection-editor/page-mobile.c:537
msgid "Select Mobile Broadband Provider Type"
msgstr "모바일 광대역 통신사 종류를 선택하십시오"
-#: ../src/connection-editor/page-mobile.c:567
+#: ../src/connection-editor/page-mobile.c:564
#, fuzzy
msgid ""
"Select the technology your mobile broadband provider uses. If you are "
@@ -3739,45 +3852,47 @@ msgstr ""
"모바일 광대역 통신사가 사용하는 기술을 선택하십시오. 확실하지 않은 경우 통신"
"사에 문의하십시오."
-#: ../src/connection-editor/page-mobile.c:572
+#: ../src/connection-editor/page-mobile.c:569
msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
msgstr "통신사가 _GSM 기반의 기술을 사용합니다(예: GPRS, EDGE, UMTS, HSDPA)"
#. Translators: CDMA has 'D' accelerator key; 'C' collides with 'Cancel' button.
#. You may need to change it according to your language.
-#: ../src/connection-editor/page-mobile.c:579
+#: ../src/connection-editor/page-mobile.c:576
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/connection-editor/page-mobile.c:586
+#: ../src/libnma/nma-mobile-wizard.c:147 ../src/mb-menu-item.c:50
#: ../src/mobile-helpers.c:282
msgid "CDMA"
msgstr "CDMA"
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:589
+#: ../src/libnma/nma-mobile-wizard.c:144 ../src/mb-menu-item.c:54
#: ../src/mobile-helpers.c:280
msgid "GSM"
msgstr "GSM"
#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: ../src/wireless-security/eap-method-ttls.c:288
msgid "PAP"
msgstr "PAP"
#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: ../src/wireless-security/eap-method-ttls.c:354
msgid "CHAP"
msgstr "CHAP"
#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: ../src/wireless-security/eap-method-fast.c:284
+#: ../src/wireless-security/eap-method-peap.c:300
+#: ../src/wireless-security/eap-method-ttls.c:320
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: ../src/wireless-security/eap-method-ttls.c:304
msgid "MSCHAP"
msgstr "MSCHAP"
@@ -3791,19 +3906,19 @@ msgstr "없음"
msgid "Editing PPP authentication methods for %s"
msgstr "%s에 대한 PPP 인증 방법을 변경하십시오"
-#: ../src/connection-editor/page-ppp.c:279
+#: ../src/connection-editor/page-ppp.c:278
msgid "PPP Settings"
msgstr "PPP 설정"
-#: ../src/connection-editor/page-ppp.c:281
+#: ../src/connection-editor/page-ppp.c:280
msgid "Could not load PPP user interface."
msgstr "PPP 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-proxy.c:215
+#: ../src/connection-editor/page-proxy.c:212
msgid "Proxy"
msgstr ""
-#: ../src/connection-editor/page-proxy.c:217
+#: ../src/connection-editor/page-proxy.c:214
#, fuzzy
msgid "Could not load proxy user interface."
msgstr "본딩 사용자 인터페이스를 읽어들일 수 없습니다."
@@ -3814,11 +3929,11 @@ msgstr "본딩 사용자 인터페이스를 읽어들일 수 없습니다."
msgid "Error: file doesn’t contain a valid JSON configuration"
msgstr "오류: 파일에 올바른 JSON 설정이 들어 있지 않습니다"
-#: ../src/connection-editor/page-team.c:1034
+#: ../src/connection-editor/page-team.c:1031
msgid "Could not load team user interface."
msgstr "팀 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-team.c:1131
+#: ../src/connection-editor/page-team.c:1128
#, c-format
msgid "Team connection %d"
msgstr "팀 연결 %d"
@@ -3826,69 +3941,69 @@ msgstr "팀 연결 %d"
#. Translators: a "Team Port" is a network
#. * device that is part of a team.
#.
-#: ../src/connection-editor/page-team-port.c:655
+#: ../src/connection-editor/page-team-port.c:652
msgid "Team Port"
msgstr "팀 포트"
-#: ../src/connection-editor/page-team-port.c:657
+#: ../src/connection-editor/page-team-port.c:654
msgid "Could not load team port user interface."
msgstr "팀 포트 사용자 인터페이스를 읽어들일 수 없습니다."
#. Translators: the first %s is a device name (eg, "em1"), the
#. * second is a connection name (eg, "Auto Ethernet").
#.
-#: ../src/connection-editor/page-vlan.c:415
+#: ../src/connection-editor/page-vlan.c:413
#, fuzzy, c-format
msgid "%s (via “%s”)"
msgstr "%s (\"%s\" 통해)"
-#: ../src/connection-editor/page-vlan.c:427
+#: ../src/connection-editor/page-vlan.c:425
#, fuzzy, c-format
msgid "New connection…"
msgstr "네트워크 연결 없음"
-#: ../src/connection-editor/page-vlan.c:596
+#: ../src/connection-editor/page-vlan.c:591
msgid "Could not load vlan user interface."
msgstr "가상 LAN 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-vlan.c:735
+#: ../src/connection-editor/page-vlan.c:730
msgid "vlan parent"
msgstr ""
-#: ../src/connection-editor/page-vlan.c:803
+#: ../src/connection-editor/page-vlan.c:798
#, c-format
msgid "VLAN connection %d"
msgstr "가상 LAN 연결 %d"
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "가상 사설망 사용자 인터페이스를 읽어들일 수 없습니다."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "'%s'에 대한 가상 사설망 플러그인 서비스를 찾을 수 없습니다."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:64
#, fuzzy, c-format
msgid "Could not load editor VPN plugin for “%s” (%s)."
msgstr "'%s'에 대한 가상 사설망 플러그인 서비스를 찾을 수 없습니다."
-#: ../src/connection-editor/page-vpn.c:123
+#: ../src/connection-editor/page-vpn.c:65
#, fuzzy
msgid "unknown failure"
msgstr "연결에 실패"
-#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "가상 사설망 사용자 인터페이스를 읽어들일 수 없습니다."
+
+#: ../src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "'%s'에 대한 가상 사설망 플러그인 서비스를 찾을 수 없습니다."
+
+#: ../src/connection-editor/page-vpn.c:199
#, c-format
msgid "VPN connection %d"
msgstr "가상 사설망 연결 %d"
-#: ../src/connection-editor/page-vpn.c:211
+#: ../src/connection-editor/page-vpn.c:205
msgid "Choose a VPN Connection Type"
msgstr "가상 사설망 연결 종류 선택"
-#: ../src/connection-editor/page-vpn.c:212
+#: ../src/connection-editor/page-vpn.c:206
#, fuzzy
msgid ""
"Select the type of VPN you wish to use for the new connection. If the type "
@@ -3923,68 +4038,68 @@ msgstr ""
msgid "%u (%u MHz)"
msgstr "%u (%u MHz)"
-#: ../src/connection-editor/page-wifi.c:442
+#: ../src/connection-editor/page-wifi.c:439
msgid "Could not load Wi-Fi user interface."
msgstr "와이파이 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-wifi.c:564
+#: ../src/connection-editor/page-wifi.c:561
msgid "bssid"
msgstr ""
-#: ../src/connection-editor/page-wifi.c:570
+#: ../src/connection-editor/page-wifi.c:567
#, fuzzy
msgid "Wi-Fi device"
msgstr "모든 장치"
-#: ../src/connection-editor/page-wifi.c:617
+#: ../src/connection-editor/page-wifi.c:614
#, c-format
msgid "Wi-Fi connection %d"
msgstr "와이파이 연결 %d"
-#: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: ../src/connection-editor/page-wifi-security.c:355
+#: ../src/libnma/nma-wifi-dialog.c:946 ../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:368
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../src/connection-editor/page-wifi-security.c:365
+#: ../src/libnma/nma-wifi-dialog.c:955 ../src/libnm-gtk/nm-wifi-dialog.c:931
msgid "WEP 128-bit Passphrase"
msgstr "WEP 128비트 열쇠글"
-#: ../src/connection-editor/page-wifi-security.c:394
+#: ../src/connection-editor/page-wifi-security.c:391
msgid "Dynamic WEP (802.1X)"
msgstr "동적 WEP (802.1X)"
-#: ../src/connection-editor/page-wifi-security.c:407
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/libnma/nma-wifi-dialog.c:999 ../src/libnm-gtk/nm-wifi-dialog.c:975
msgid "WPA & WPA2 Personal"
msgstr "개인용 WPA 또는 WPA2"
-#: ../src/connection-editor/page-wifi-security.c:420
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: ../src/connection-editor/page-wifi-security.c:417
+#: ../src/libnma/nma-wifi-dialog.c:1017 ../src/libnm-gtk/nm-wifi-dialog.c:989
msgid "WPA & WPA2 Enterprise"
msgstr "기업용 WPA 또는 WPA2"
-#: ../src/connection-editor/page-wifi-security.c:463
+#: ../src/connection-editor/page-wifi-security.c:460
msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
msgstr ""
"와이파이 보안 사용자 인터페이스를 읽어들일 수 없습니다. 와이파이 설정이 없습"
"니다."
-#: ../src/connection-editor/page-wifi-security.c:474
+#: ../src/connection-editor/page-wifi-security.c:471
msgid "Wi-Fi Security"
msgstr "와이파이 보안"
-#: ../src/connection-editor/page-wifi-security.c:476
+#: ../src/connection-editor/page-wifi-security.c:473
msgid "Could not load Wi-Fi security user interface."
msgstr "와이파이 보안 사용자 인터페이스를 읽어들일 수 없습니다."
-#: ../src/connection-editor/page-wifi-security.c:560
+#: ../src/connection-editor/page-wifi-security.c:557
#, c-format
msgid "missing SSID"
msgstr ""
-#: ../src/connection-editor/page-wifi-security.c:566
+#: ../src/connection-editor/page-wifi-security.c:563
#, c-format
msgid "Security not compatible with Ad-Hoc mode"
msgstr ""
@@ -4044,32 +4159,32 @@ msgid "Active Network Connections"
msgstr "사용 중인 네트워크 연결"
#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:152
#, fuzzy
msgid "No certificate set"
msgstr "CA 인증서 불필요(_R)"
#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:176
msgid "No key set"
msgstr ""
#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
#, 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:374
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
#, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
msgstr "비밀키(_K):"
#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
#, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
msgstr "비밀키 암호(_P):"
#: ../src/libnma/nma-file-cert-chooser.c:258
@@ -4078,163 +4193,58 @@ msgid "Choose %s Certificate"
msgstr "개인 인증서 선택..."
#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:398
#, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
msgstr "사용자 인증서(_U):"
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "모바일 광대역 연결이 다음과 같이 설정되었습니다:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "장치:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "통신사:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "요금제:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-msgid ""
-"A connection will now be made to your mobile broadband provider using the "
-"settings you selected. If the connection fails or you cannot access network "
-"resources, double-check your settings. To modify your mobile broadband "
-"connection settings, choose “Network Connections” from the System → "
-"Preferences menu."
-msgstr ""
-"선택한 설정을 사용해 모바일 광대역 통신사에 연결합니다. 만약 연결이 실패하거"
-"나 네트워크에 연결할 수 없다면, 설정을 여러번 다시 검토하십시오. 모바일 광대"
-"역 연결 설정을 변경하려면, 시스템 >> 기본 설정 메뉴에서 \"네트워크 연결\"을 "
-"선택하십시오."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "모바일 광대역 설정 확인"
+#: ../src/libnma/nma-mobile-providers.c:991
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "내 나라가 목록에 없습니다"
-#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnma/nma-mobile-wizard.c:252 ../src/libnma/nma-mobile-wizard.c:284
#: ../src/libnm-gtk/nm-mobile-wizard.c:326
msgid "Unlisted"
msgstr "목록에없음"
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "요금제 선택(_S):"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "요금제 _APN(억세스 포인트 이름):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-msgid ""
-"Warning: Selecting an incorrect plan may result in billing issues for your "
-"broadband account or may prevent connectivity.\n"
-"\n"
-"If you are unsure of your plan please ask your provider for your plan’s APN."
-msgstr ""
-"경고: 잘못된 요금제를 선택하면 휴대전화 인터넷 과금에 문제가 발생하거나, 연결"
-"이 불가능할 수 있습니다.\n"
-"\n"
-"만약 요금제가 확실하지 않다면, 통신사에 요금제의 APN에 대해 문의하십시오."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "요금제를 선택하십시오"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnma/nma-mobile-wizard.c:484
#: ../src/libnm-gtk/nm-mobile-wizard.c:558
#, fuzzy
msgid "My plan is not listed…"
msgstr "내 요금제가 목록에 없습니다..."
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "목록에서 통신사 선택(_L):"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnma/nma-mobile-wizard.c:644
#: ../src/libnm-gtk/nm-mobile-wizard.c:724
msgid "Provider"
msgstr "통신사"
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "통신사가 없으므로 직접 입력(_M):"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "통신사:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "내 통신사는 GSM 기반 기술을 사용합니다(GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "내 통신사는 CDMA 기반 기술을 사용합니다(1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "통신사를 선택하십시오"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "국가 혹은 지역 목록:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnma/nma-mobile-wizard.c:932
#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
msgid "Country or region"
msgstr "국가 혹은 지역"
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "내 나라가 목록에 없습니다"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "통신사의 국가 혹은 지역 선택"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnma/nma-mobile-wizard.c:1016
#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
msgid "Installed GSM device"
msgstr "설치된 GSM 장치"
-#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnma/nma-mobile-wizard.c:1019
#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
msgid "Installed CDMA device"
msgstr "설치된 CDMA 장치"
-#: ../src/libnma/nma-mobile-wizard.c:1354
+#: ../src/libnma/nma-mobile-wizard.c:1225
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "모든 장치"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:1
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "새 모바일 광대역 연결"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:2
#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
msgid ""
"This assistant helps you easily set up a mobile broadband connection to a "
@@ -4243,90 +4253,189 @@ msgstr ""
"이 도우미를 이용해 휴대전화(3G) 네트워크를 사용하는 모바일 광대역 연결을 손쉽"
"게 설정할 수 있습니다."
-#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnma/nma-mobile-wizard.ui.h:3
#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
msgid "You will need the following information:"
msgstr "다음 정보가 필요합니다:"
-#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnma/nma-mobile-wizard.ui.h:4
#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
#, fuzzy
msgid "Your broadband provider’s name"
msgstr "통신사의 이름"
-#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.ui.h:5
#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
msgid "Your broadband billing plan name"
msgstr "통신사의 요금제 이름"
-#: ../src/libnma/nma-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.ui.h:6
#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
msgstr "(어떤 경우엔) 통신사의 요금제 APN (AP 이름)"
-#: ../src/libnma/nma-mobile-wizard.c:1412
+#: ../src/libnma/nma-mobile-wizard.ui.h:7
#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
msgid "Create a connection for _this mobile broadband device:"
msgstr "이 모바일 광대역 장치에 대한 연결 만들기(_T):"
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "모든 장치"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnma/nma-mobile-wizard.ui.h:8
#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
msgid "Set up a Mobile Broadband Connection"
msgstr "모바일 광대역 연결을 설정"
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "새 모바일 광대역 연결"
+#: ../src/libnma/nma-mobile-wizard.ui.h:9
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "국가 혹은 지역 목록:"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:10
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "통신사의 국가 혹은 지역 선택"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:11
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "목록에서 통신사 선택(_L):"
-#: ../src/libnma/nma-cert-chooser-button.c:165
+#: ../src/libnma/nma-mobile-wizard.ui.h:12
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "통신사가 없으므로 직접 입력(_M):"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:13
+#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "내 통신사는 GSM 기반 기술을 사용합니다(GPRS, EDGE, UMTS, HSPA)"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:14
+#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "내 통신사는 CDMA 기반 기술을 사용합니다(1xRTT, EVDO)"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:15
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "통신사를 선택하십시오"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:16
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "요금제 선택(_S):"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:17
+#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "요금제 _APN(억세스 포인트 이름):"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:18
+#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"경고: 잘못된 요금제를 선택하면 휴대전화 인터넷 과금에 문제가 발생하거나, 연결"
+"이 불가능할 수 있습니다.\n"
+"\n"
+"만약 요금제가 확실하지 않다면, 통신사에 요금제의 APN에 대해 문의하십시오."
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:21
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "요금제를 선택하십시오"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:22
+#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "모바일 광대역 연결이 다음과 같이 설정되었습니다:"
+
+#. Device
+#: ../src/libnma/nma-mobile-wizard.ui.h:23
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "장치:"
+
+#. Provider
+#: ../src/libnma/nma-mobile-wizard.ui.h:24
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "통신사:"
+
+#. Plan and APN
+#: ../src/libnma/nma-mobile-wizard.ui.h:25
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "요금제:"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:26
+#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"선택한 설정을 사용해 모바일 광대역 통신사에 연결합니다. 만약 연결이 실패하거"
+"나 네트워크에 연결할 수 없다면, 설정을 여러번 다시 검토하십시오. 모바일 광대"
+"역 연결 설정을 변경하려면, 시스템 >> 기본 설정 메뉴에서 \"네트워크 연결\"을 "
+"선택하십시오."
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:27
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "모바일 광대역 설정 확인"
+
+#: ../src/libnma/nma-cert-chooser-button.c:167
#, fuzzy
msgid "(None)"
msgstr "(없음)"
-#: ../src/libnma/nma-cert-chooser-button.c:173
+#: ../src/libnma/nma-cert-chooser-button.c:175
#, c-format
msgid "Key in %s"
msgstr ""
-#: ../src/libnma/nma-cert-chooser-button.c:174
+#: ../src/libnma/nma-cert-chooser-button.c:176
#, fuzzy, c-format
msgid "Certificate in %s"
msgstr "CA 인증서(_A):"
-#: ../src/libnma/nma-cert-chooser-button.c:193
+#: ../src/libnma/nma-cert-chooser-button.c:195
#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
#, fuzzy
msgid "(Unknown)"
msgstr "알 수 없음"
-#: ../src/libnma/nma-cert-chooser-button.c:215
-#: ../src/libnma/nma-cert-chooser-button.c:245
+#: ../src/libnma/nma-cert-chooser-button.c:217
+#: ../src/libnma/nma-cert-chooser-button.c:247
msgid "Select"
msgstr ""
-#: ../src/libnma/nma-cert-chooser-button.c:216
-#: ../src/libnma/nma-cert-chooser-button.c:246
+#: ../src/libnma/nma-cert-chooser-button.c:218
+#: ../src/libnma/nma-cert-chooser-button.c:248
msgid "Cancel"
msgstr ""
-#: ../src/libnma/nma-cert-chooser-button.c:472
+#: ../src/libnma/nma-cert-chooser-button.c:474
msgid "Select from file…"
msgstr ""
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:394
#, fuzzy, c-format
msgid "Choose a %s Certificate"
msgstr "개인 인증서 선택..."
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:402
#, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
msgstr "사용자 인증서(_U):"
#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
@@ -4380,104 +4489,115 @@ msgstr "접속할 때마다 암호 물어보기(_K)"
msgid "The password is not required"
msgstr "'%s'에 연결하려면 암호가 필요합니다."
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "보조 암호(_S):"
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "암호 보이기(_O)"
-#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
#, fuzzy
msgid "_Tertiary Password:"
msgstr "보조 암호(_S):"
-#: ../src/libnma/nma-vpn-password-dialog.c:238
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
-msgid "Sh_ow passwords"
-msgstr "암호 보이기(_O)"
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "보조 암호(_S):"
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "암호(_P):"
+
+#: ../src/libnma/nma-wifi-dialog.c:127 ../src/libnm-gtk/nm-wifi-dialog.c:141
#, fuzzy
msgid "Click to connect"
msgstr "연결 끊김"
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-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 ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:465
msgid "New…"
msgstr ""
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:905
msgctxt "Wifi/wired security"
msgid "None"
msgstr "없음"
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: ../src/libnma/nma-wifi-dialog.c:985 ../src/libnm-gtk/nm-wifi-dialog.c:961
#, fuzzy
msgid "Dynamic WEP (802.1x)"
msgstr "동적 WEP (802.1X)"
-#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: ../src/libnma/nma-wifi-dialog.c:1108 ../src/libnm-gtk/nm-wifi-dialog.c:1071
msgid "C_reate"
msgstr "만들기(_R)"
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnma/nma-wifi-dialog.c:1186 ../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:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1152
msgid "Wi-Fi Network Authentication Required"
msgstr "와이파이 네트워크 인증이 필요합니다"
-#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1154
msgid "Authentication required by Wi-Fi network"
msgstr "와이파이 네트워크에 인증이 필요합니다"
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1159
msgid "Create New Wi-Fi Network"
msgstr "새 와이파이 네트워크 만들기"
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1197 ../src/libnm-gtk/nm-wifi-dialog.c:1161
msgid "New Wi-Fi network"
msgstr "새 와이파이 네트워크"
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: ../src/libnma/nma-wifi-dialog.c:1198 ../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:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1200 ../src/libnm-gtk/nm-wifi-dialog.c:1164
msgid "Connect to Hidden Wi-Fi Network"
msgstr "감춰진 와이파이 네트워크에 연결"
-#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1202 ../src/libnm-gtk/nm-wifi-dialog.c:1166
msgid "Hidden Wi-Fi network"
msgstr "숨겨진 와이파이 네트워크"
-#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: ../src/libnma/nma-wifi-dialog.c:1203 ../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 "연결하려는 숨겨진 와이파이 네트워크의 이름과 보안 설정을 입력하십시오."
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: ../src/libnma/wifi.ui.h:1
+#, fuzzy
+msgid "Wi-Fi _security"
msgstr "와이파이 보안(_S):"
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: ../src/libnma/wifi.ui.h:3
+#, fuzzy
+msgid "C_onnection"
msgstr "연결 이름(_O):"
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: ../src/libnma/wifi.ui.h:4
+#, fuzzy
+msgid "Wi-Fi _adapter"
msgstr "와이파이 어댑터(_A):"
+#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "통신사가 없으므로 직접 입력(_M):"
+
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "통신사:"
+
#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
msgid "Wired"
msgstr "유선"
@@ -4510,6 +4630,28 @@ msgctxt "long device name"
msgid "%s %s"
msgstr "%s %s"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:142
+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 ""
+
+#: ../src/libnm-gtk/wifi.ui.h:1
+msgid "Wi-Fi _security:"
+msgstr "와이파이 보안(_S):"
+
+#: ../src/libnm-gtk/wifi.ui.h:2
+msgid "_Network name:"
+msgstr "네트워크 이름(_N):"
+
+#: ../src/libnm-gtk/wifi.ui.h:3
+msgid "C_onnection:"
+msgstr "연결 이름(_O):"
+
+#: ../src/libnm-gtk/wifi.ui.h:4
+msgid "Wi-Fi _adapter:"
+msgstr "와이파이 어댑터(_A):"
+
#: ../src/main.c:42
msgid "Usage:"
msgstr "사용법:"
@@ -4640,12 +4782,12 @@ msgstr "로밍"
msgid "%s connection"
msgstr "%s 연결"
-#: ../src/utils/utils.c:565
+#: ../src/utils/utils.c:549
#, fuzzy
msgid "PEM certificates (*.pem, *.crt, *.cer)"
msgstr "DEP 혹은 PEM 인증서(*.det, *.pem, *.crt, *.cer)"
-#: ../src/utils/utils.c:577
+#: ../src/utils/utils.c:561
msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
msgstr "DER, PEM, 또는 PKCS#12 비밀 키(*.der, *.pem, *.p12, *.key)"
@@ -4666,22 +4808,22 @@ msgstr ""
msgid "missing EAP-FAST PAC file"
msgstr ""
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: ../src/wireless-security/eap-method-fast.c:268
+#: ../src/wireless-security/eap-method-peap.c:332
+#: ../src/wireless-security/eap-method-ttls.c:386
msgid "GTC"
msgstr "GTC"
-#: ../src/wireless-security/eap-method-fast.c:405
+#: ../src/wireless-security/eap-method-fast.c:407
#, fuzzy
msgid "Choose a PAC file"
msgstr "PAC 파일 선택..."
-#: ../src/wireless-security/eap-method-fast.c:412
+#: ../src/wireless-security/eap-method-fast.c:414
msgid "PAC files (*.pac)"
msgstr "PAC 파일(*.pac)"
-#: ../src/wireless-security/eap-method-fast.c:416
+#: ../src/wireless-security/eap-method-fast.c:418
msgid "All files"
msgstr "모든 파일"
@@ -4700,17 +4842,20 @@ 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:3
-msgid "Anony_mous identity:"
+#, fuzzy
+msgid "Anony_mous identity"
msgstr "익명 사용(_M):"
#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#, fuzzy
+msgid "PAC _file"
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:1
-msgid "_Inner authentication:"
+#, fuzzy
+msgid "_Inner authentication"
msgstr "내부 인증(_I):"
#: ../src/wireless-security/eap-method-fast.ui.h:7
@@ -4725,9 +4870,9 @@ msgstr ""
msgid "missing EAP-LEAP password"
msgstr ""
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: ../src/wireless-security/eap-method-peap.c:316
+#: ../src/wireless-security/eap-method-ttls.c:370
+#: ../src/wireless-security/wireless-security.c:425
msgid "MD5"
msgstr "MD5"
@@ -4746,7 +4891,8 @@ msgid "No CA certificate is _required"
msgstr "CA 인증서 불필요(_R)"
#: ../src/wireless-security/eap-method-peap.ui.h:6
-msgid "PEAP _version:"
+#, fuzzy
+msgid "PEAP _version"
msgstr "PEAP 버전(_V):"
#: ../src/wireless-security/eap-method-peap.ui.h:8
@@ -4758,17 +4904,31 @@ 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:"
+msgid "_Domain"
msgstr ""
-#: ../src/wireless-security/eap-method-simple.c:75
+#: ../src/wireless-security/eap-method-simple.c:90
msgid "missing EAP username"
msgstr ""
-#: ../src/wireless-security/eap-method-simple.c:88
+#: ../src/wireless-security/eap-method-simple.c:106
msgid "missing EAP password"
msgstr ""
+#: ../src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.ui.h:4
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128비트 열쇠글"
+
+#: ../src/wireless-security/eap-method-simple.ui.h:5
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "암호 보이기(_O)"
+
#: ../src/wireless-security/eap-method-tls.c:64
msgid "missing EAP-TLS identity"
msgstr ""
@@ -4791,10 +4951,11 @@ msgid "selected key file does not exist"
msgstr ""
#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+#, fuzzy
+msgid "I_dentity"
msgstr "인증 정보(_D):"
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: ../src/wireless-security/eap-method-ttls.c:337
#, fuzzy
msgid "MSCHAPv2 (no EAP)"
msgstr "MSCHAPv2"
@@ -4803,68 +4964,73 @@ msgstr "MSCHAPv2"
msgid "Unknown error validating 802.1X security"
msgstr ""
-#: ../src/wireless-security/wireless-security.c:436
+#: ../src/wireless-security/wireless-security.c:437
msgid "TLS"
msgstr "TLS"
-#: ../src/wireless-security/wireless-security.c:460
+#: ../src/wireless-security/wireless-security.c:461
msgid "PWD"
msgstr "PWD"
# NOTE: 무선랜 인증방식. '빠르게' 라고 번역하지 말것.
-#: ../src/wireless-security/wireless-security.c:471
+#: ../src/wireless-security/wireless-security.c:472
msgid "FAST"
msgstr "FAST"
-#: ../src/wireless-security/wireless-security.c:482
+#: ../src/wireless-security/wireless-security.c:483
msgid "Tunneled TLS"
msgstr "터널링을 사용하는 TLS"
-#: ../src/wireless-security/wireless-security.c:493
+#: ../src/wireless-security/wireless-security.c:494
msgid "Protected EAP (PEAP)"
msgstr "보호되는 EAP (PEAP)"
+#: ../src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
#: ../src/wireless-security/ws-wep-key.ui.h:6
#: ../src/wireless-security/ws-wpa-eap.ui.h:1
-msgid "Au_thentication:"
+#, fuzzy
+msgid "Au_thentication"
msgstr "인증(_T):"
-#: ../src/wireless-security/ws-leap.c:63
+#: ../src/wireless-security/ws-leap.c:64
msgid "missing leap-username"
msgstr ""
-#: ../src/wireless-security/ws-leap.c:74
+#: ../src/wireless-security/ws-leap.c:82
msgid "missing leap-password"
msgstr ""
-#: ../src/wireless-security/ws-wep-key.c:107
+#: ../src/wireless-security/ws-wep-key.c:113
msgid "missing wep-key"
msgstr ""
-#: ../src/wireless-security/ws-wep-key.c:116
+#: ../src/wireless-security/ws-wep-key.c:120
#, c-format
msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
msgstr ""
-#: ../src/wireless-security/ws-wep-key.c:124
+#: ../src/wireless-security/ws-wep-key.c:128
#, c-format
msgid ""
"invalid wep-key: key with a length of %zu must contain only ascii characters"
msgstr ""
-#: ../src/wireless-security/ws-wep-key.c:130
+#: ../src/wireless-security/ws-wep-key.c:134
#, c-format
msgid ""
"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
"(ascii) or 10/26 (hex)"
msgstr ""
-#: ../src/wireless-security/ws-wep-key.c:137
+#: ../src/wireless-security/ws-wep-key.c:141
msgid "invalid wep-key: passphrase must be non-empty"
msgstr ""
-#: ../src/wireless-security/ws-wep-key.c:139
+#: ../src/wireless-security/ws-wep-key.c:143
msgid "invalid wep-key: passphrase must be shorter than 64 characters"
msgstr ""
@@ -4881,7 +5047,8 @@ msgid "1 (Default)"
msgstr "1 (기본값)"
#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#, fuzzy
+msgid "_Key"
msgstr "키(_K):"
#: ../src/wireless-security/ws-wep-key.ui.h:5
@@ -4889,20 +5056,54 @@ msgid "Sho_w key"
msgstr "키 표시(_W)"
#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#, fuzzy
+msgid "WEP inde_x"
msgstr "WEP 인덱스(_X):"
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: ../src/wireless-security/ws-wpa-psk.c:76
#, c-format
msgid ""
"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
"digits"
msgstr ""
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: ../src/wireless-security/ws-wpa-psk.c:83
msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
msgstr ""
#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#, fuzzy
+msgid "_Type"
msgstr "형식(_T):"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "알려지지 않은 오류로 비밀 정보를 업데이트하는 데 실패했습니다."
+
+#~ msgid "Priority:"
+#~ msgstr "우선 순위:"
+
+#~ msgid "_Automatically connect to this network when it is available"
+#~ msgstr "사용 가능하면 자동으로 이 네트워크에 연결(_A)"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "연결 정보(_I)"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "가상 사설망 연결을 가져올 수 없음"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "'%s' 파일을 읽을 수 없거나, 파일안에 알아볼 수 있는 가상 사설망 연결 정보"
+#~ "가 없습니다.\n"
+#~ "\n"
+#~ "오류: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "알 수 없는 오류"
diff --git a/po/ru.po b/po/ru.po
index 235748a1..3df8bcc8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,9 +12,8 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2018-07-26 11:30+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-02-20 18:18+0100\n"
"PO-Revision-Date: 2018-09-12 20:54+0300\n"
"Last-Translator: Stas Solovey <whats_up tut by>\n"
"Language-Team: Русский <gnome-cyr gnome org>\n"
@@ -35,9 +34,9 @@ msgid "Manage your network connections"
msgstr "Управление сетевыми соединениями"
#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "Сетевые соединения"
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Активные сетевые соединения"
#: ../nm-connection-editor.desktop.in.h:2
msgid "Manage and change your network connection settings"
@@ -221,13 +220,13 @@ msgstr "Аутентификация 802.1X"
#: ../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.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1062
+#: ../src/libnma/nma-wifi-dialog.c:1104
#: ../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/libnma/nma-wifi-dialog.c:1068
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1110
#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
msgid "C_onnect"
msgstr "П_одключиться"
@@ -811,8 +810,8 @@ msgid "Error displaying connection information:"
msgstr "Ошибка показа сведений о соединении:"
#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
-#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:448
+#: ../src/libnma/nma-wifi-dialog.c:972 ../src/libnm-gtk/nm-wifi-dialog.c:948
+#: ../src/wireless-security/wireless-security.c:449
msgid "LEAP"
msgstr "LEAP"
@@ -1661,6 +1660,7 @@ msgid "_Service"
msgstr "С_лужба"
#: ../src/connection-editor/ce-page-dsl.ui.h:5
+#: ../src/libnma/nma-file-cert-chooser.c:347
#: ../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
@@ -2286,6 +2286,7 @@ msgid "Allow _roaming if home network is not available"
msgstr "Включать _роуминг, если домашняя сеть недоступна"
#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:454
msgid "Sho_w passwords"
msgstr "По_казывать пароли"
@@ -2438,10 +2439,7 @@ msgid "Port _sticky"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:15
-#: ../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."
+msgid "Do not unselect the port if a better one becomes available."
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:16
@@ -2549,73 +2547,80 @@ msgid "Ignore invalid packets from _active ports"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:36
+#: ../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:37
#: ../src/connection-editor/ce-page-team.ui.h:83
msgid "Ignore invalid packets from i_nactive ports"
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
+#: ../src/connection-editor/ce-page-team-port.ui.h:38
#: ../src/connection-editor/ce-page-team.ui.h:84
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 ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
+#: ../src/connection-editor/ce-page-team-port.ui.h:39
#: ../src/connection-editor/ce-page-team.ui.h:85
msgid "S_end on inactive ports"
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
+#: ../src/connection-editor/ce-page-team-port.ui.h:40
#: ../src/connection-editor/ce-page-team.ui.h:86
msgid ""
"By default, ARP requests are sent on active ports only. This option allows "
"sending even on inactive ports."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
+#: ../src/connection-editor/ce-page-team-port.ui.h:41
#: ../src/connection-editor/ce-page-team.ui.h:87
msgid ""
"The delay between the link coming up and the runner being notified about it."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
+#: ../src/connection-editor/ce-page-team-port.ui.h:42
#: ../src/connection-editor/ce-page-team.ui.h:88
msgid ""
"The delay between the link going down and the runner being notified about it."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:42
+#: ../src/connection-editor/ce-page-team-port.ui.h:43
#: ../src/connection-editor/ce-page-team.ui.h:89
msgid "The interval between requests being sent."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:43
+#: ../src/connection-editor/ce-page-team-port.ui.h:44
#: ../src/connection-editor/ce-page-team.ui.h:90
msgid ""
"The delay between link watch initialization and the first request being sent."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
+#: ../src/connection-editor/ce-page-team-port.ui.h:45
#: ../src/connection-editor/ce-page-team.ui.h:91
msgid "The link watcher to be used."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
+#: ../src/connection-editor/ce-page-team-port.ui.h:46
#: ../src/connection-editor/ce-page-team.ui.h:92
msgid "Link Watcher"
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
+#: ../src/connection-editor/ce-page-team-port.ui.h:47
#: ../src/connection-editor/ce-page-team.ui.h:93
msgid "Im_port team configuration from a file…"
msgstr "И_мпортировать параметры агрегированного соединения (team) из файла…"
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
+#: ../src/connection-editor/ce-page-team-port.ui.h:48
#: ../src/connection-editor/ce-page-team.ui.h:94
msgid "Edit _JSON configuration"
msgstr "Редактировать _конфигурацию JSON"
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
+#: ../src/connection-editor/ce-page-team-port.ui.h:49
#: ../src/connection-editor/ce-page-team.ui.h:95
msgid "Raw Configuration"
msgstr ""
@@ -3378,6 +3383,10 @@ msgstr "Ошибка изменения соединения"
msgid "Did not find a connection with UUID “%s”"
msgstr "Соединение с UUID «%s» не найдено"
+#: ../src/connection-editor/nm-connection-list.ui.h:1
+msgid "Network Connections"
+msgstr "Сетевые соединения"
+
#: ../src/connection-editor/nm-connection-list.ui.h:2
msgid "Add a new connection"
msgstr "Добавить новое соединение"
@@ -3524,8 +3533,8 @@ msgstr "Соединение Ethernet %d"
#. TRANSLATORS: Default zone set for firewall, when no zone is selected
#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:806
-#: ../src/libnm-gtk/nm-mobile-providers.c:805
+#: ../src/libnma/nma-mobile-providers.c:802
+#: ../src/libnm-gtk/nm-mobile-providers.c:801
msgid "Default"
msgstr "По умолчанию"
@@ -3760,35 +3769,37 @@ msgstr "Оператор использует технологию _GSM (GPRS, E
msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
msgstr "Оператор использует технологию _CDMA (1xRTT, EVDO)"
-#: ../src/connection-editor/page-mobile.c:586 ../src/mb-menu-item.c:50
+#: ../src/connection-editor/page-mobile.c:586
+#: ../src/libnma/nma-mobile-wizard.c:147 ../src/mb-menu-item.c:50
#: ../src/mobile-helpers.c:282
msgid "CDMA"
msgstr "CDMA"
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:589
+#: ../src/libnma/nma-mobile-wizard.c:144 ../src/mb-menu-item.c:54
#: ../src/mobile-helpers.c:280
msgid "GSM"
msgstr "GSM"
#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: ../src/wireless-security/eap-method-ttls.c:288
msgid "PAP"
msgstr "PAP"
#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: ../src/wireless-security/eap-method-ttls.c:354
msgid "CHAP"
msgstr "CHAP"
#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: ../src/wireless-security/eap-method-fast.c:284
+#: ../src/wireless-security/eap-method-peap.c:300
+#: ../src/wireless-security/eap-method-ttls.c:320
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: ../src/wireless-security/eap-method-ttls.c:304
msgid "MSCHAP"
msgstr "MSCHAP"
@@ -3950,12 +3961,12 @@ msgid "Wi-Fi connection %d"
msgstr "Соединение Wi-Fi %d"
#: ../src/connection-editor/page-wifi-security.c:355
-#: ../src/libnma/nma-wifi-dialog.c:920 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: ../src/libnma/nma-wifi-dialog.c:946 ../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:365
-#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../src/libnma/nma-wifi-dialog.c:955 ../src/libnm-gtk/nm-wifi-dialog.c:931
msgid "WEP 128-bit Passphrase"
msgstr "WEP (128-битный ключ)"
@@ -3964,12 +3975,12 @@ msgid "Dynamic WEP (802.1X)"
msgstr "Динамический WEP (802.1X)"
#: ../src/connection-editor/page-wifi-security.c:404
-#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: ../src/libnma/nma-wifi-dialog.c:999 ../src/libnm-gtk/nm-wifi-dialog.c:975
msgid "WPA & WPA2 Personal"
msgstr "WPA/WPA2 Personal"
#: ../src/connection-editor/page-wifi-security.c:417
-#: ../src/libnma/nma-wifi-dialog.c:987 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: ../src/libnma/nma-wifi-dialog.c:1017 ../src/libnm-gtk/nm-wifi-dialog.c:989
msgid "WPA & WPA2 Enterprise"
msgstr "WPA/WPA2 Enterprise"
@@ -4051,29 +4062,29 @@ msgid "Active Network Connections"
msgstr "Активные сетевые соединения"
#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:152
msgid "No certificate set"
msgstr "Сертификатов не установлено"
#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:176
msgid "No key set"
msgstr "Нет установленного ключа"
#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
#, 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:374
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
#, c-format
msgid "%s private _key"
msgstr "Приватный _ключ %s"
#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
#, c-format
msgid "%s key _password"
msgstr "_Пароль приватного ключа %s"
@@ -4084,47 +4095,47 @@ msgid "Choose %s Certificate"
msgstr "Выбрать сертификат %s"
#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:398
#, c-format
msgid "%s _certificate"
msgstr "_Сертификат %s"
-#: ../src/libnma/nma-mobile-wizard.c:281
+#: ../src/libnma/nma-mobile-providers.c:991
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Моей страны нет в списке"
+
+#: ../src/libnma/nma-mobile-wizard.c:252 ../src/libnma/nma-mobile-wizard.c:284
#: ../src/libnm-gtk/nm-mobile-wizard.c:326
msgid "Unlisted"
msgstr "Нет в списке"
-#: ../src/libnma/nma-mobile-wizard.c:465
+#: ../src/libnma/nma-mobile-wizard.c:484
#: ../src/libnm-gtk/nm-mobile-wizard.c:558
msgid "My plan is not listed…"
msgstr "Моего тарифного плана нет в списке…"
-#: ../src/libnma/nma-mobile-wizard.c:626
+#: ../src/libnma/nma-mobile-wizard.c:644
#: ../src/libnm-gtk/nm-mobile-wizard.c:724
msgid "Provider"
msgstr "Оператор"
-#: ../src/libnma/nma-mobile-wizard.c:908
+#: ../src/libnma/nma-mobile-wizard.c:932
#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
msgid "Country or region"
msgstr "Страна или регион"
-#: ../src/libnma/nma-mobile-wizard.c:918
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Моей страны нет в списке"
-
-#: ../src/libnma/nma-mobile-wizard.c:999
+#: ../src/libnma/nma-mobile-wizard.c:1016
#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
msgid "Installed GSM device"
msgstr "Установленное GSM-устройство"
-#: ../src/libnma/nma-mobile-wizard.c:1002
+#: ../src/libnma/nma-mobile-wizard.c:1019
#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
msgid "Installed CDMA device"
msgstr "Установленное CDMA-устройство"
-#: ../src/libnma/nma-mobile-wizard.c:1208
+#: ../src/libnma/nma-mobile-wizard.c:1225
#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
msgid "Any device"
msgstr "Любое устройство"
@@ -4190,8 +4201,8 @@ msgid "Select your provider from a _list:"
msgstr "Выбор оператора из _списка:"
#: ../src/libnma/nma-mobile-wizard.ui.h:12
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-msgid "I can’t find my provider and I wish to enter it _manually:"
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
msgstr "_Указать оператора вручную:"
#: ../src/libnma/nma-mobile-wizard.ui.h:13
@@ -4205,26 +4216,21 @@ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
msgstr "Оператор использует технологию CDMA (1xRTT, EVDO)"
#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Оператор:"
-
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
#: ../src/libnm-gtk/nm-mobile-wizard.c:792
msgid "Choose your Provider"
msgstr "Выберите оператора"
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
+#: ../src/libnma/nma-mobile-wizard.ui.h:16
#: ../src/libnm-gtk/nm-mobile-wizard.c:457
msgid "_Select your plan:"
msgstr "_Выберите тарифный план:"
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
+#: ../src/libnma/nma-mobile-wizard.ui.h:17
#: ../src/libnm-gtk/nm-mobile-wizard.c:481
msgid "Selected plan _APN (Access Point Name):"
msgstr "Выберите точку доступа (APN) этого тарифного плана:"
-#: ../src/libnma/nma-mobile-wizard.ui.h:19
+#: ../src/libnma/nma-mobile-wizard.ui.h:18
#: ../src/libnm-gtk/nm-mobile-wizard.c:501
msgid ""
"Warning: Selecting an incorrect plan may result in billing issues for your "
@@ -4238,36 +4244,36 @@ msgstr ""
"Если не уверены, какой тарифный план выбрать, уточните APN у оператора "
"мобильной связи."
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
+#: ../src/libnma/nma-mobile-wizard.ui.h:21
#: ../src/libnm-gtk/nm-mobile-wizard.c:509
msgid "Choose your Billing Plan"
msgstr "Выберите тарифный план"
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
+#: ../src/libnma/nma-mobile-wizard.ui.h:22
#: ../src/libnm-gtk/nm-mobile-wizard.c:199
msgid ""
"Your mobile broadband connection is configured with the following settings:"
msgstr "Соединение мобильной связи настроено со следующими параметрами:"
#. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
+#: ../src/libnma/nma-mobile-wizard.ui.h:23
#: ../src/libnm-gtk/nm-mobile-wizard.c:206
msgid "Your Device:"
msgstr "Устройство:"
#. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
+#: ../src/libnma/nma-mobile-wizard.ui.h:24
#: ../src/libnm-gtk/nm-mobile-wizard.c:217
msgid "Your Provider:"
msgstr "Оператор:"
#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
+#: ../src/libnma/nma-mobile-wizard.ui.h:25
#: ../src/libnm-gtk/nm-mobile-wizard.c:228
msgid "Your Plan:"
msgstr "Тарифный план:"
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
+#: ../src/libnma/nma-mobile-wizard.ui.h:26
#: ../src/libnm-gtk/nm-mobile-wizard.c:249
msgid ""
"A connection will now be made to your mobile broadband provider using the "
@@ -4281,7 +4287,7 @@ msgstr ""
"ресурсам, попробуйте изменить параметры. Чтобы изменить параметры соединения "
"мобильной связи, выберите «Сеть» в Параметрах системы."
-#: ../src/libnma/nma-mobile-wizard.ui.h:28
+#: ../src/libnma/nma-mobile-wizard.ui.h:27
#: ../src/libnm-gtk/nm-mobile-wizard.c:262
msgid "Confirm Mobile Broadband Settings"
msgstr "Подтвердить параметры мобильной связи"
@@ -4319,12 +4325,12 @@ msgstr "Отменить"
msgid "Select from file…"
msgstr "Выбрать из файла…"
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:394
#, c-format
msgid "Choose a %s Certificate"
msgstr "Выбрать сертификат %s"
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:402
#, c-format
msgid "%s certificate _password"
msgstr "Пароль сертификата %s"
@@ -4394,70 +4400,62 @@ msgstr "_Второй пароль:"
msgid "_Password:"
msgstr "_Пароль:"
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: ../src/libnma/nma-wifi-dialog.c:127 ../src/libnm-gtk/nm-wifi-dialog.c:141
msgid "Click to connect"
msgstr "Нажмите для подключения"
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-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-connection-editor"
-
-#: ../src/libnma/nma-wifi-dialog.c:465 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:465
msgid "New…"
msgstr "Создать…"
-#: ../src/libnma/nma-wifi-dialog.c:903 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:905
msgctxt "Wifi/wired security"
msgid "None"
msgstr "Нет"
-#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: ../src/libnma/nma-wifi-dialog.c:985 ../src/libnm-gtk/nm-wifi-dialog.c:961
msgid "Dynamic WEP (802.1x)"
msgstr "Динамический WEP (802.1x)"
-#: ../src/libnma/nma-wifi-dialog.c:1066 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: ../src/libnma/nma-wifi-dialog.c:1108 ../src/libnm-gtk/nm-wifi-dialog.c:1071
msgid "C_reate"
msgstr "С_оздать"
-#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnma/nma-wifi-dialog.c:1186 ../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:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1152
msgid "Wi-Fi Network Authentication Required"
msgstr "Для сети Wi-Fi требуется аутентификация"
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1154
msgid "Authentication required by Wi-Fi network"
msgstr "Сеть Wi-Fi требует аутентификацию"
-#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1159
msgid "Create New Wi-Fi Network"
msgstr "Создать новую сеть Wi-Fi"
-#: ../src/libnma/nma-wifi-dialog.c:1156 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1197 ../src/libnm-gtk/nm-wifi-dialog.c:1161
msgid "New Wi-Fi network"
msgstr "Новая сеть Wi-Fi"
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: ../src/libnma/nma-wifi-dialog.c:1198 ../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:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1200 ../src/libnm-gtk/nm-wifi-dialog.c:1164
msgid "Connect to Hidden Wi-Fi Network"
msgstr "Подключение к скрытой сети Wi-Fi"
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1202 ../src/libnm-gtk/nm-wifi-dialog.c:1166
msgid "Hidden Wi-Fi network"
msgstr "Скрытая сеть Wi-Fi"
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: ../src/libnma/nma-wifi-dialog.c:1203 ../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."
@@ -4477,6 +4475,14 @@ msgstr "Сое_динение"
msgid "Wi-Fi _adapter"
msgstr "_Адаптер Wi-Fi"
+#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "_Указать оператора вручную:"
+
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Оператор:"
+
#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
msgid "Wired"
msgstr "Проводная"
@@ -4509,6 +4515,14 @@ msgctxt "long device name"
msgid "%s %s"
msgstr "%s %s"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:142
+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-connection-editor"
+
#: ../src/libnm-gtk/wifi.ui.h:1
msgid "Wi-Fi _security:"
msgstr "_Безопасность Wi-Fi:"
@@ -4679,21 +4693,21 @@ msgstr "выбранный файл сертификата УЦ не сущес
msgid "missing EAP-FAST PAC file"
msgstr "отсутствует файл EAP-FAST PAC"
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: ../src/wireless-security/eap-method-fast.c:268
+#: ../src/wireless-security/eap-method-peap.c:332
+#: ../src/wireless-security/eap-method-ttls.c:386
msgid "GTC"
msgstr "GTC"
-#: ../src/wireless-security/eap-method-fast.c:405
+#: ../src/wireless-security/eap-method-fast.c:407
msgid "Choose a PAC file"
msgstr "Выбрать файл PAC"
-#: ../src/wireless-security/eap-method-fast.c:412
+#: ../src/wireless-security/eap-method-fast.c:414
msgid "PAC files (*.pac)"
msgstr "Файлы PAC (*.pac)"
-#: ../src/wireless-security/eap-method-fast.c:416
+#: ../src/wireless-security/eap-method-fast.c:418
msgid "All files"
msgstr "Все файлы"
@@ -4737,9 +4751,9 @@ msgstr "отсутствует имя пользователя EAP-LEAP"
msgid "missing EAP-LEAP password"
msgstr "отсутствует пароль EAP-LEAP"
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: ../src/wireless-security/eap-method-peap.c:316
+#: ../src/wireless-security/eap-method-ttls.c:370
+#: ../src/wireless-security/wireless-security.c:425
msgid "MD5"
msgstr "MD5"
@@ -4773,14 +4787,28 @@ msgstr "Суффикс имени сертификата сервера."
msgid "_Domain"
msgstr "_Домен"
-#: ../src/wireless-security/eap-method-simple.c:75
+#: ../src/wireless-security/eap-method-simple.c:90
msgid "missing EAP username"
msgstr "отсутствует имя пользователя EAP"
-#: ../src/wireless-security/eap-method-simple.c:88
+#: ../src/wireless-security/eap-method-simple.c:106
msgid "missing EAP password"
msgstr "отсутствует пароль EAP"
+#: ../src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.ui.h:4
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP (128-битный ключ)"
+
+#: ../src/wireless-security/eap-method-simple.ui.h:5
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "По_казывать пароли"
+
#: ../src/wireless-security/eap-method-tls.c:64
msgid "missing EAP-TLS identity"
msgstr "отсутствует идентичность EAP-TLS"
@@ -4805,7 +4833,7 @@ msgstr "выбранный файл ключа не существует"
msgid "I_dentity"
msgstr "_Подлинность"
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: ../src/wireless-security/eap-method-ttls.c:337
msgid "MSCHAPv2 (no EAP)"
msgstr "MSCHAPv2 (без EAP)"
@@ -4813,27 +4841,31 @@ msgstr "MSCHAPv2 (без EAP)"
msgid "Unknown error validating 802.1X security"
msgstr "Неизвестная ошибка проверки безопасности 802.1x"
-#: ../src/wireless-security/wireless-security.c:436
+#: ../src/wireless-security/wireless-security.c:437
msgid "TLS"
msgstr "TLS"
-#: ../src/wireless-security/wireless-security.c:460
+#: ../src/wireless-security/wireless-security.c:461
msgid "PWD"
msgstr "PWD"
# Метод аутентификации
-#: ../src/wireless-security/wireless-security.c:471
+#: ../src/wireless-security/wireless-security.c:472
msgid "FAST"
msgstr "FAST"
-#: ../src/wireless-security/wireless-security.c:482
+#: ../src/wireless-security/wireless-security.c:483
msgid "Tunneled TLS"
msgstr "Туннелированный TLS"
-#: ../src/wireless-security/wireless-security.c:493
+#: ../src/wireless-security/wireless-security.c:494
msgid "Protected EAP (PEAP)"
msgstr "Защищённый EAP (PEAP)"
+#: ../src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
#: ../src/wireless-security/ws-wep-key.ui.h:6
#: ../src/wireless-security/ws-wpa-eap.ui.h:1
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0db7fa1a..b1266394 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-12 11:18+0100\n"
+"POT-Creation-Date: 2019-02-20 18:18+0100\n"
"PO-Revision-Date: 2017-11-07 06:44+0000\n"
"Last-Translator: Copied by Zanata <copied-by-zanata zanata org>\n"
"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
@@ -29,7 +29,7 @@ msgstr ""
"X-Launchpad-Export-Date: 2016-03-22 13:39+0000\n"
"X-Generator: Zanata 4.3.2\n"
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
msgid "Network"
msgstr "网络"
@@ -38,9 +38,9 @@ msgid "Manage your network connections"
msgstr "管理网络连接"
#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "网络连接"
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "活动的网络连接"
#: ../nm-connection-editor.desktop.in.h:2
msgid "Manage and change your network connection settings"
@@ -192,31 +192,32 @@ msgstr "802.1X 认证"
#: ../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/connection-helpers.c:308
-#: ../src/connection-editor/connection-helpers.c:771
+#: ../src/connection-editor/connection-helpers.c:296
+#: ../src/connection-editor/connection-helpers.c:759
#: ../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-bluetooth.c:307
+#: ../src/connection-editor/page-mobile.c:540
#: ../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/libnma/nma-vpn-password-dialog.ui.h:1
+#: ../src/libnma/nma-wifi-dialog.c:1104
#: ../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/libnma/nma-wifi-dialog.c:1072
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1110
#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
#, fuzzy
msgid "C_onnect"
msgstr "已连接"
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#, fuzzy
+msgid "_Network name"
msgstr "网络名称(_N):"
#: ../src/ap-menu-item.c:82
@@ -253,12 +254,12 @@ msgstr "断开失败"
msgid "Connection activation failed"
msgstr "连接启用失败"
-#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
+#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
#, fuzzy
msgid "Don’t show this message again"
msgstr "不再显示此信息"
-#: ../src/applet.c:899
+#: ../src/applet.c:898
#, fuzzy, c-format
msgid ""
"\n"
@@ -268,7 +269,7 @@ msgstr ""
"\n"
"VPN 连接“%s”已断开。网络连接被中断。"
-#: ../src/applet.c:901
+#: ../src/applet.c:900
#, fuzzy, c-format
msgid ""
"\n"
@@ -278,7 +279,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。网络连接被中断。"
-#: ../src/applet.c:903
+#: ../src/applet.c:902
#, fuzzy, c-format
msgid ""
"\n"
@@ -287,7 +288,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。VPN 服务异常中断。"
-#: ../src/applet.c:905
+#: ../src/applet.c:904
#, fuzzy, c-format
msgid ""
"\n"
@@ -297,7 +298,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。VPN 服务返回了一个非法配置。"
-#: ../src/applet.c:907
+#: ../src/applet.c:906
#, fuzzy, c-format
msgid ""
"\n"
@@ -306,7 +307,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。连接超时。"
-#: ../src/applet.c:909
+#: ../src/applet.c:908
#, fuzzy, c-format
msgid ""
"\n"
@@ -315,7 +316,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。VPN 服务未在所需时间内启动。"
-#: ../src/applet.c:911
+#: ../src/applet.c:910
#, fuzzy, c-format
msgid ""
"\n"
@@ -324,7 +325,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。VPN 服务启动失败。"
-#: ../src/applet.c:913
+#: ../src/applet.c:912
#, fuzzy, c-format
msgid ""
"\n"
@@ -333,7 +334,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。没有合法的 VPN secret。"
-#: ../src/applet.c:915
+#: ../src/applet.c:914
#, fuzzy, c-format
msgid ""
"\n"
@@ -342,7 +343,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。VPN secret 非法。"
-#: ../src/applet.c:920
+#: ../src/applet.c:919
#, fuzzy, c-format
msgid ""
"\n"
@@ -351,7 +352,7 @@ msgstr ""
"\n"
"VPN 连接“%s”失败。"
-#: ../src/applet.c:947
+#: ../src/applet.c:946
#, c-format
msgid ""
"VPN connection has been successfully established.\n"
@@ -362,19 +363,19 @@ msgstr ""
"\n"
"%s\n"
-#: ../src/applet.c:949
+#: ../src/applet.c:948
msgid "VPN connection has been successfully established.\n"
msgstr "已成功建立 VPN 连接。\n"
-#: ../src/applet.c:951
+#: ../src/applet.c:950
msgid "VPN Login Message"
msgstr "VPN 登录消息"
-#: ../src/applet.c:959 ../src/applet.c:999
+#: ../src/applet.c:958 ../src/applet.c:998
msgid "VPN Connection Failed"
msgstr "VPN 连接失败"
-#: ../src/applet.c:1003
+#: ../src/applet.c:1002
#, fuzzy, c-format
msgid ""
"\n"
@@ -387,7 +388,7 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1006
+#: ../src/applet.c:1005
#, fuzzy, c-format
msgid ""
"\n"
@@ -400,151 +401,151 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1295
+#: ../src/applet.c:1296
msgid "device not ready (firmware missing)"
msgstr "设备未就绪(缺少固件)"
-#: ../src/applet.c:1297
+#: ../src/applet.c:1298
msgid "device not ready"
msgstr "设备未就绪"
#. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
msgid "disconnected"
msgstr "已断开"
-#: ../src/applet.c:1323
+#: ../src/applet.c:1324
msgid "Disconnect"
msgstr "断开"
-#: ../src/applet.c:1337
+#: ../src/applet.c:1338
msgid "device not managed"
msgstr "设备未托管"
-#: ../src/applet.c:1410
+#: ../src/applet.c:1411
msgid "No network devices available"
msgstr "没有可用的网络设备"
-#: ../src/applet.c:1464
+#: ../src/applet.c:1465
msgid "_VPN Connections"
msgstr "_VPN 连接"
-#: ../src/applet.c:1508
+#: ../src/applet.c:1509
#, fuzzy
msgid "_Configure VPN…"
msgstr "配置 VPN(_C)..."
-#: ../src/applet.c:1511
+#: ../src/applet.c:1512
#, fuzzy
msgid "_Add a VPN connection…"
msgstr "_VPN 连接"
-#: ../src/applet.c:1617
+#: ../src/applet.c:1618
#, fuzzy
msgid "NetworkManager is not running…"
msgstr "网络管理器未运行..."
-#: ../src/applet.c:1622 ../src/applet.c:2687
+#: ../src/applet.c:1623 ../src/applet.c:2688
msgid "Networking disabled"
msgstr "网络已禁用"
#. 'Enable Networking' item
-#: ../src/applet.c:1832
+#: ../src/applet.c:1833
msgid "Enable _Networking"
msgstr "启用联网(_N)"
#. 'Enable Wi-Fi' item
-#: ../src/applet.c:1841
+#: ../src/applet.c:1842
msgid "Enable _Wi-Fi"
msgstr "启用 _Wi-Fi"
#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1850
+#: ../src/applet.c:1851
msgid "Enable _Mobile Broadband"
msgstr "启用移动宽带(_M)"
#. Toggle notifications item
-#: ../src/applet.c:1862
+#: ../src/applet.c:1863
msgid "Enable N_otifications"
msgstr "启用通知(_O)"
#. 'Connection Information' item
-#: ../src/applet.c:1874
+#: ../src/applet.c:1875
msgid "Connection _Information"
msgstr "连接信息(_I)"
#. 'Edit Connections...' item
-#: ../src/applet.c:1882
+#: ../src/applet.c:1883
#, fuzzy
msgid "Edit Connections…"
msgstr "编辑连接..."
-#: ../src/applet.c:1896
+#: ../src/applet.c:1897
msgid "_About"
msgstr "关于(_A)"
-#: ../src/applet.c:2207
+#: ../src/applet.c:2208
#, fuzzy, c-format
msgid "You are now connected to “%s”."
msgstr "您现在已连接到“%s”。"
-#: ../src/applet.c:2247
+#: ../src/applet.c:2248
msgid "Disconnected"
msgstr "已断开连接"
-#: ../src/applet.c:2248
+#: ../src/applet.c:2249
#, fuzzy
msgid "The network connection has been disconnected."
msgstr ""
"\n"
"VPN 连接“%s”已断开。"
-#: ../src/applet.c:2550
+#: ../src/applet.c:2551
#, fuzzy, c-format
msgid "Preparing network connection “%s”…"
msgstr "正在准备网络连接“%s”..."
-#: ../src/applet.c:2553
+#: ../src/applet.c:2554
#, fuzzy, c-format
msgid "User authentication required for network connection “%s”…"
msgstr "网络连接“%s”需要用户认证..."
-#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2557 ../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:2559
+#: ../src/applet.c:2560
#, fuzzy, c-format
msgid "Network connection “%s” active"
msgstr "网络连接“%s”已处于活动状态"
-#: ../src/applet.c:2632
+#: ../src/applet.c:2633
#, fuzzy, c-format
msgid "Starting VPN connection “%s”…"
msgstr "正在启动 VPN 连接“%s”..."
-#: ../src/applet.c:2635
+#: ../src/applet.c:2636
#, fuzzy, c-format
msgid "User authentication required for VPN connection “%s”…"
msgstr "VPN 连接“%s”需要用户认证..."
-#: ../src/applet.c:2638
+#: ../src/applet.c:2639
#, fuzzy, c-format
msgid "Requesting a VPN address for “%s”…"
msgstr "正在为“%s”请求一个 VPN 地址..."
-#: ../src/applet.c:2641
+#: ../src/applet.c:2642
#, fuzzy, c-format
msgid "VPN connection active"
msgstr "VPN 连接“%s”已处于活动状态"
-#: ../src/applet.c:2691
+#: ../src/applet.c:2692
msgid "No network connection"
msgstr "没有网络连接"
-#: ../src/applet.c:3292
+#: ../src/applet.c:3299
msgid "NetworkManager Applet"
msgstr "网络管理器小程序"
@@ -562,48 +563,48 @@ msgstr "错误的 PIN 代码;请联络您的供应商。"
msgid "Sending unlock code…"
msgstr "正在发送解锁码..."
-#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
+#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
#, c-format
msgid "Mobile Broadband (%s)"
msgstr "移动宽带(%s)"
-#: ../src/applet-device-broadband.c:739
+#: ../src/applet-device-broadband.c:741
#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:308
+#: ../src/connection-editor/page-mobile.c:305
#: ../src/libnm-gtk/nm-ui-utils.c:329
msgid "Mobile Broadband"
msgstr "移动宽带"
-#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-broadband.c:794 ../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:805
+#: ../src/applet-device-broadband.c:807
#, fuzzy
msgid "New Mobile Broadband connection…"
msgstr "新移动宽带连接"
-#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-broadband.c:821 ../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:820
+#: ../src/applet-device-broadband.c:822
msgid "You are now connected to the Mobile Broadband network."
msgstr "您现在已连接到移动宽带网络。"
-#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
+#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
msgid "Mobile Broadband network."
msgstr "移动宽带网络。"
# 这里的"home network"与下面的“漫游网络”是对比的关闭,应和下文的其他地方译法一致为“主网络”才说的通。
-#: ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:963
msgid "You are now registered on the home network."
msgstr "您现在已注册到主网络。"
-#: ../src/applet-device-broadband.c:967
+#: ../src/applet-device-broadband.c:969
msgid "You are now registered on a roaming network."
msgstr "您现在已注册到一个漫游网络。"
@@ -691,9 +692,9 @@ msgstr "DSL 认证"
#: ../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/connection-editor/page-bluetooth.c:309
+#: ../src/connection-editor/page-mobile.c:542
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
msgid "_OK"
msgstr ""
@@ -798,9 +799,9 @@ msgstr "无法启用连接"
msgid "Error displaying connection information:"
msgstr "显示连接信息时出错:"
-#: ../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
+#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
+#: ../src/libnma/nma-wifi-dialog.c:972 ../src/libnm-gtk/nm-wifi-dialog.c:948
+#: ../src/wireless-security/wireless-security.c:449
msgid "LEAP"
msgstr "LEAP"
@@ -824,7 +825,7 @@ msgid "WEP"
msgstr "WEP"
#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:332
+#: ../src/connection-editor/page-wifi-security.c:329
msgctxt "Wi-Fi/Ethernet security"
msgid "None"
msgstr "无"
@@ -1087,7 +1088,7 @@ 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
+#: ../src/connection-editor/ce-page.h:112
#, fuzzy
msgid ""
"IP addresses identify your computer on the network. Click the “Add” button "
@@ -1112,7 +1113,7 @@ msgstr ""
#: ../src/connection-editor/ce-page-ip4.ui.h:8
#: ../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/connection-helpers.c:760
#: ../src/connection-editor/nm-connection-list.ui.h:4
msgid "_Delete"
msgstr "删除(_D)"
@@ -1195,12 +1196,14 @@ msgid "ARP"
msgstr "ARP"
#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#, fuzzy
+msgid "Bonded _connections"
msgstr "已绑定连接(_C):"
#: ../src/connection-editor/ce-page-bond.ui.h:11
#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#, fuzzy
+msgid "M_ode"
msgstr "模式(_O):"
#: ../src/connection-editor/ce-page-bond.ui.h:13
@@ -1211,7 +1214,8 @@ msgid "_Edit"
msgstr "编辑(_E)"
#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#, fuzzy
+msgid "Monitoring _frequency"
msgstr "监控频率(_F):"
#: ../src/connection-editor/ce-page-bond.ui.h:16
@@ -1221,15 +1225,18 @@ msgstr "毫秒"
#: ../src/connection-editor/ce-page-bond.ui.h:17
#: ../src/connection-editor/ce-page-bridge.ui.h:6
#: ../src/connection-editor/ce-page-team.ui.h:16
-msgid "_Interface name:"
+#, fuzzy
+msgid "_Interface name"
msgstr "接口名称(_I):"
#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#, fuzzy
+msgid "_Link Monitoring"
msgstr "链路监视(_L):"
#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#, fuzzy
+msgid "ARP _targets"
msgstr "ARP 目标(_T):"
#: ../src/connection-editor/ce-page-bond.ui.h:20
@@ -1239,15 +1246,18 @@ msgid ""
msgstr "检测连接状态时使用的 IP 地址,或以逗号分隔的 IP 地址列表。"
#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#, fuzzy
+msgid "Link _up delay"
msgstr "链接建立延时(_U):"
#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#, fuzzy
+msgid "Link _down delay"
msgstr "链接断开延时(_D):"
#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#, fuzzy
+msgid "_Primary"
msgstr "主要(_P):"
#: ../src/connection-editor/ce-page-bond.ui.h:24
@@ -1262,7 +1272,8 @@ msgstr "主设备的接口名称。如果设置,在此设备可用时将一直
#: ../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
-msgid "_MTU:"
+#, fuzzy
+msgid "_MTU"
msgstr "_MTU:"
#: ../src/connection-editor/ce-page-bond.ui.h:26
@@ -1275,28 +1286,34 @@ msgid "bytes"
msgstr "字节"
#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#, fuzzy
+msgid "Path _cost"
msgstr "路径成本(_C):"
#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#, fuzzy
+msgid "_Priority"
msgstr "优先级(_P):"
#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#, fuzzy
+msgid "_Hairpin mode"
msgstr "_Hairpin 模式:"
#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#, fuzzy
+msgid "Bridged _connections"
msgstr "桥接连接(_C):"
#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#, fuzzy
+msgid "_Forward delay"
msgstr "转发延时(_F):"
#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#, fuzzy
+msgid "_Hello time"
msgstr "问候时间(_H):"
#: ../src/connection-editor/ce-page-bridge.ui.h:9
@@ -1339,7 +1356,8 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-bridge.ui.h:17
-msgid "_Max age:"
+#, fuzzy
+msgid "_Max age"
msgstr "最大老化时间(_M):"
#: ../src/connection-editor/ce-page-bridge.ui.h:18
@@ -1347,7 +1365,8 @@ msgid "STP maximum message age, in seconds"
msgstr ""
#: ../src/connection-editor/ce-page-bridge.ui.h:19
-msgid "_Aging time:"
+#, fuzzy
+msgid "_Aging time"
msgstr "老化时间(_A):"
#: ../src/connection-editor/ce-page-bridge.ui.h:20
@@ -1355,7 +1374,7 @@ msgid "The Ethernet MAC address aging time, in seconds"
msgstr ""
#: ../src/connection-editor/ce-page-bridge.ui.h:21
-msgid "Group _forward mask:"
+msgid "Group _forward mask"
msgstr ""
#: ../src/connection-editor/ce-page-bridge.ui.h:22
@@ -1462,10 +1481,6 @@ msgstr "设备"
msgid "invalid %s (%s) "
msgstr "无效 %s (%s)"
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "由于一个未知错误,更新连接 secret 时失败。"
-
#: ../src/connection-editor/ce-page-dcb.ui.h:1
#, fuzzy
msgid "_Use Data Center Bridging (DCB) for this connection"
@@ -1534,82 +1549,91 @@ msgid "Enable or disable priority pause transmission for each User Priority."
msgstr "对每个用户优先级启用或禁用按优先级暂停传输。"
#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "优先级:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#, fuzzy
+msgid "0"
msgstr "0:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#, fuzzy
+msgid "1"
msgstr "1:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#, fuzzy
+msgid "2"
msgstr "2:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#, fuzzy
+msgid "3"
msgstr "3:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#, fuzzy
+msgid "4"
msgstr "4:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#, fuzzy
+msgid "5"
msgstr "5:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#, fuzzy
+msgid "6"
msgstr "6:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#, fuzzy
+msgid "7"
msgstr "7:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#, fuzzy
+msgid "Traffic Class"
msgstr "流量等级:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#, fuzzy
+msgid "Strict Bandwidth"
msgstr "严格带宽:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#, fuzzy
+msgid "Priority Bandwidth"
msgstr "优先级带宽:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "Group Bandwidth"
msgstr "组带宽:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "Group ID"
msgstr "组标识:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
msgid "Enter the priority group ID for each User Priority."
msgstr "为每个 用户优先级 输入 优先级组 标识。"
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
#, fuzzy, no-c-format
msgid ""
"Enter the allowed link bandwidth percent each Priority Group may use. The "
"sum of all groups must total 100%."
msgstr "输入允许各 优先级组 使用的链接带宽百分比。所有组的总和必须为 100%。"
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
msgid ""
"Enter the percentage of priority group bandwidth each user priority may use."
msgstr "输入允许各个 用户优先级 使用的 优先级组 带宽百分比。"
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
msgid "Enable or disable strict bandwidth for each user priority."
msgstr "为各个 用户优先级 启用或禁用带宽限制。"
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
msgid "Enter the traffic class for each user priority."
msgstr "为各个 用户优先级 输入流量等级。"
@@ -1618,7 +1642,8 @@ msgstr "为各个 用户优先级 输入流量等级。"
#: ../src/wireless-security/eap-method-leap.ui.h:1
#: ../src/wireless-security/eap-method-simple.ui.h:1
#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#, fuzzy
+msgid "_Username"
msgstr "用户名(_U):"
#: ../src/connection-editor/ce-page-dsl.ui.h:2
@@ -1632,10 +1657,12 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-dsl.ui.h:4
-msgid "_Service:"
+#, fuzzy
+msgid "_Service"
msgstr "服务(_S):"
#: ../src/connection-editor/ce-page-dsl.ui.h:5
+#: ../src/libnma/nma-file-cert-chooser.c:347
#: ../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
@@ -1649,22 +1676,23 @@ 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
#: ../src/wireless-security/eap-method-leap.ui.h:2
#: ../src/wireless-security/eap-method-simple.ui.h:2
#: ../src/wireless-security/ws-leap.ui.h:2
#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#, fuzzy
+msgid "_Password"
msgstr "密码(_P):"
#: ../src/connection-editor/ce-page-dsl.ui.h:8
-msgid "PPP _interface:"
-msgstr ""
+#, fuzzy
+msgid "PPP _interface"
+msgstr "上级接口(_P):"
#: ../src/connection-editor/ce-page-dsl.ui.h:9
-msgid "P_arent interface:"
-msgstr ""
+#, fuzzy
+msgid "P_arent interface"
+msgstr "上级接口(_P):"
#: ../src/connection-editor/ce-page-dsl.ui.h:10
msgid "An arbitrary name to assign to the newly created PPP interface."
@@ -1674,13 +1702,27 @@ msgstr ""
msgid "The interface on which the PPP connection will be established."
msgstr ""
+#: ../src/connection-editor/ce-page-dsl.ui.h:12
+#, fuzzy
+msgid "C_laim interface"
+msgstr "上级接口(_P):"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:13
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
#: ../src/connection-editor/ce-page-ethernet.ui.h:1
+#: ../src/connection-editor/ce-page-general.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:142
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:143
#: ../src/wireless-security/eap-method-peap.ui.h:1
msgid "Automatic"
msgstr "自动"
@@ -1726,36 +1768,40 @@ msgid "Full"
msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:155
+#: ../src/connection-editor/page-ip6.c:156
msgid "Ignore"
msgstr "忽略"
#: ../src/connection-editor/ce-page-ethernet.ui.h:13
#: ../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:191
+#: ../src/connection-editor/page-ip4.c:169
+#: ../src/connection-editor/page-ip6.c:192
msgid "Manual"
msgstr "手动"
#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#, fuzzy
+msgid "_Port"
msgstr "端口(_P):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:15
#: ../src/connection-editor/ce-page-infiniband.ui.h:6
#: ../src/connection-editor/ce-page-wifi.ui.h:9
-msgid "_Device:"
+#, fuzzy
+msgid "_Device"
msgstr "设备(_D):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:16
#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+#, fuzzy
+msgid "C_loned MAC address"
msgstr "克隆 MAC 地址(_L):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "私钥密码(_P):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:20
#, fuzzy
@@ -1794,7 +1840,7 @@ msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:28
#, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
msgstr "私钥密码(_P):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:29
@@ -1803,7 +1849,7 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+msgid "Lin_k negotiation"
msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:31
@@ -1814,7 +1860,8 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:32
-msgid "_Speed:"
+#, fuzzy
+msgid "_Speed"
msgstr "速度(_S):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:33
@@ -1826,7 +1873,7 @@ msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:34
#, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
msgstr "全双工(_X)"
#: ../src/connection-editor/ce-page-ethernet.ui.h:35
@@ -1836,42 +1883,62 @@ msgid ""
"sure your device supports it."
msgstr ""
-#: ../src/connection-editor/ce-page-general.ui.h:1
-msgid "Automatically connect to _VPN when using this connection"
-msgstr "使用此连接时自动连接 _VPN"
-
#: ../src/connection-editor/ce-page-general.ui.h:2
-msgid "All _users may connect to this network"
-msgstr "所有用户都可以连接这个网络(_U)"
+msgid "Yes"
+msgstr ""
#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "可用时自动链接到这个网络(_A)"
+#, fuzzy
+msgid "No"
+msgstr "无"
#: ../src/connection-editor/ce-page-general.ui.h:4
-#, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "连接信息(_I)"
+msgid "All _users may connect to this network"
+msgstr "所有用户都可以连接这个网络(_U)"
#: ../src/connection-editor/ce-page-general.ui.h:5
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "使用此连接时自动连接 _VPN"
+
+#: ../src/connection-editor/ce-page-general.ui.h:6
+#, fuzzy
+msgid "Firewall _zone"
+msgstr "防火墙区(_Z):"
+
+#: ../src/connection-editor/ce-page-general.ui.h:7
+#, fuzzy
+msgid "_Metered connection"
+msgstr "已组队的连接(_T):"
+
+#: ../src/connection-editor/ce-page-general.ui.h:8
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:9
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "忽略自动获取的路由(_N)"
+
+#: ../src/connection-editor/ce-page-general.ui.h:10
msgid ""
"Connection priority for automatic activation. Connections with higher "
"numbers are preferred when selecting profiles for automatic activation. "
"Default value is 0."
msgstr ""
-#: ../src/connection-editor/ce-page-general.ui.h:6
-msgid "Firewall _zone:"
-msgstr "防火墙区(_Z):"
-
-#: ../src/connection-editor/ce-page.h:111
+#: ../src/connection-editor/ce-page.h:109
#, fuzzy
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."
msgstr "IP 地址可在网络上标识您的计算机。单击“添加”按钮添加一个 IP 地址。"
-#: ../src/connection-editor/ce-page.h:116
+#: ../src/connection-editor/ce-page.h:114
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 "
@@ -1879,16 +1946,16 @@ msgid ""
"automatically."
msgstr ""
-#: ../src/connection-editor/ce-page.h:121
+#: ../src/connection-editor/ce-page.h:119
#, fuzzy
msgid "Additional static addresses"
msgstr "自动,仅地址"
-#: ../src/connection-editor/ce-page.h:122
+#: ../src/connection-editor/ce-page.h:120
msgid "Addresses"
msgstr "地址"
-#: ../src/connection-editor/ce-page.h:123
+#: ../src/connection-editor/ce-page.h:121
msgid "Address (optional)"
msgstr ""
@@ -1903,7 +1970,8 @@ msgid "Connected"
msgstr "已连接"
#: ../src/connection-editor/ce-page-infiniband.ui.h:5
-msgid "_Transport mode:"
+#, fuzzy
+msgid "_Transport mode"
msgstr "传输模式(_T):"
#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
@@ -1944,38 +2012,41 @@ msgstr ""
#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
#: ../src/connection-editor/ce-page-macsec.ui.h:6
-msgid "Device name:"
-msgstr ""
+#, fuzzy
+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 ""
+#, fuzzy
+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:"
+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
-msgid "MTU:"
-msgstr ""
+#, fuzzy
+msgid "MTU"
+msgstr "_MTU:"
#: ../src/connection-editor/ce-page-ip4.ui.h:2
#: ../src/connection-editor/ce-page-ip6.ui.h:2
@@ -1989,14 +2060,15 @@ 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:211
+#: ../src/connection-editor/page-ip4.c:189
+#: ../src/connection-editor/page-ip6.c:212
msgid "Shared to other computers"
msgstr "与其它计算机共享"
#: ../src/connection-editor/ce-page-ip4.ui.h:6
#: ../src/connection-editor/ce-page-ip6.ui.h:11
-msgid "_Method:"
+#, fuzzy
+msgid "_Method"
msgstr "方法(_M):"
#: ../src/connection-editor/ce-page-ip4.ui.h:9
@@ -2017,21 +2089,24 @@ msgid ""
msgstr "解析主机名时使用的域。用逗号分隔多个域。"
#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#, fuzzy
+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:15
-#: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:346
-msgid "S_earch domains:"
+#: ../src/connection-editor/page-ip4.c:373
+#: ../src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
msgstr "搜索域(_E):"
#: ../src/connection-editor/ce-page-ip4.ui.h:13
#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:337
-msgid "DNS ser_vers:"
+#: ../src/connection-editor/page-ip4.c:364
+#: ../src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
msgstr "_DNS 服务器:"
#: ../src/connection-editor/ce-page-ip4.ui.h:14
@@ -2059,7 +2134,7 @@ 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
+#: ../src/connection-editor/page-ip4.c:199
msgid "Disabled"
msgstr "已禁用"
@@ -2089,11 +2164,12 @@ msgstr ""
"地址会自动配置到连接中的接口。"
#: ../src/connection-editor/ce-page-ip6.ui.h:18
-msgid "IPv6 _privacy extensions:"
+#, fuzzy
+msgid "IPv6 _privacy extensions"
msgstr "IPv6 隐私扩展(_P):"
#: ../src/connection-editor/ce-page-ip6.ui.h:19
-msgid "IPv6 address _generation mode:"
+msgid "IPv6 address _generation mode"
msgstr ""
#: ../src/connection-editor/ce-page-ip6.ui.h:20
@@ -2157,27 +2233,27 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:14
-msgid "CKN:"
+msgid "CKN"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:15
-msgid "CAK:"
+msgid "CAK"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:17
-msgid "Keys:"
+msgid "Keys"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:18
-msgid "Parameters:"
+msgid "Parameters"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:19
-msgid "Validation:"
+msgid "Validation"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:20
-msgid "SCI port:"
+msgid "SCI port"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:21
@@ -2202,7 +2278,8 @@ msgid "Basic"
msgstr "基本"
#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#, fuzzy
+msgid "Nu_mber"
msgstr "编号(_M):"
#: ../src/connection-editor/ce-page-mobile.ui.h:5
@@ -2210,11 +2287,13 @@ msgid "Advanced"
msgstr "高级"
#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#, fuzzy
+msgid "_APN"
msgstr "_APN:"
#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#, fuzzy
+msgid "N_etwork ID"
msgstr "网络 ID (_E):"
#: ../src/connection-editor/ce-page-mobile.ui.h:8
@@ -2223,7 +2302,8 @@ msgid "Change…"
msgstr "更改..."
#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#, fuzzy
+msgid "P_IN"
msgstr "P_IN:"
#: ../src/connection-editor/ce-page-mobile.ui.h:10
@@ -2231,6 +2311,7 @@ msgid "Allow _roaming if home network is not available"
msgstr "如果主网络不可用则允许漫游(_R)"
#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:454
msgid "Sho_w passwords"
msgstr "显示密码(_W)"
@@ -2239,7 +2320,8 @@ msgid "Authentication"
msgstr "认证"
#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#, fuzzy
+msgid "Allowed methods"
msgstr "允许的方法:"
#: ../src/connection-editor/ce-page-ppp.ui.h:3
@@ -2297,11 +2379,11 @@ msgid "Use this proxy configuration for only browser clients/schemes."
msgstr ""
#: ../src/connection-editor/ce-page-proxy.ui.h:5
-msgid "PAC URL:"
+msgid "PAC URL"
msgstr ""
#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC script:"
+msgid "PAC script"
msgstr ""
#: ../src/connection-editor/ce-page-proxy.ui.h:7
@@ -2315,7 +2397,7 @@ msgstr "从文件导入组队配置(_I)..."
#: ../src/connection-editor/ce-page-proxy.ui.h:9
#, fuzzy
-msgid "Method:"
+msgid "Method"
msgstr "方法(_M):"
#: ../src/connection-editor/ce-page-team-port.ui.h:1
@@ -2350,7 +2432,7 @@ msgid "Team Advanced Options"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+msgid "_Queue ID"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:8
@@ -2370,7 +2452,7 @@ msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:11
#, fuzzy
-msgid "_Port priority:"
+msgid "_Port priority"
msgstr "优先级(_P):"
#: ../src/connection-editor/ce-page-team-port.ui.h:12
@@ -2389,10 +2471,7 @@ msgid "Port _sticky"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:15
-#: ../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."
+msgid "Do not unselect the port if a better one becomes available."
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:16
@@ -2401,12 +2480,12 @@ msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:17
#, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
msgstr "优先级(_P):"
#: ../src/connection-editor/ce-page-team-port.ui.h:18
#, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
msgstr "私钥(_K):"
#: ../src/connection-editor/ce-page-team-port.ui.h:19
@@ -2437,46 +2516,47 @@ msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:24
#: ../src/connection-editor/ce-page-team.ui.h:70
-msgid "_Link watcher:"
+msgid "_Link watcher"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:25
#: ../src/connection-editor/ce-page-team.ui.h:71
#, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
msgstr "链接建立延时(_U):"
#: ../src/connection-editor/ce-page-team-port.ui.h:26
#: ../src/connection-editor/ce-page-team.ui.h:72
#, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
msgstr "链接断开延时(_D):"
#: ../src/connection-editor/ce-page-team-port.ui.h:27
#: ../src/connection-editor/ce-page-team.ui.h:73
#, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
msgstr "上级接口(_P):"
#: ../src/connection-editor/ce-page-team-port.ui.h:28
#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+msgid "Delay _before first send"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:29
#: ../src/connection-editor/ce-page-team.ui.h:75
-msgid "_Maximum missed replies:"
+msgid "_Maximum missed replies"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:30
#: ../src/connection-editor/ce-page-team.ui.h:76
-msgid "_Source host:"
-msgstr ""
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP 目标(_T):"
#: ../src/connection-editor/ce-page-team-port.ui.h:31
#: ../src/connection-editor/ce-page-team.ui.h:77
#, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
msgstr "ARP 目标(_T):"
#: ../src/connection-editor/ce-page-team-port.ui.h:32
@@ -2506,75 +2586,82 @@ msgid "Ignore invalid packets from _active ports"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:36
+#: ../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:37
#: ../src/connection-editor/ce-page-team.ui.h:83
msgid "Ignore invalid packets from i_nactive ports"
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
+#: ../src/connection-editor/ce-page-team-port.ui.h:38
#: ../src/connection-editor/ce-page-team.ui.h:84
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 ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
+#: ../src/connection-editor/ce-page-team-port.ui.h:39
#: ../src/connection-editor/ce-page-team.ui.h:85
msgid "S_end on inactive ports"
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
+#: ../src/connection-editor/ce-page-team-port.ui.h:40
#: ../src/connection-editor/ce-page-team.ui.h:86
msgid ""
"By default, ARP requests are sent on active ports only. This option allows "
"sending even on inactive ports."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
+#: ../src/connection-editor/ce-page-team-port.ui.h:41
#: ../src/connection-editor/ce-page-team.ui.h:87
msgid ""
"The delay between the link coming up and the runner being notified about it."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
+#: ../src/connection-editor/ce-page-team-port.ui.h:42
#: ../src/connection-editor/ce-page-team.ui.h:88
msgid ""
"The delay between the link going down and the runner being notified about it."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:42
+#: ../src/connection-editor/ce-page-team-port.ui.h:43
#: ../src/connection-editor/ce-page-team.ui.h:89
msgid "The interval between requests being sent."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:43
+#: ../src/connection-editor/ce-page-team-port.ui.h:44
#: ../src/connection-editor/ce-page-team.ui.h:90
msgid ""
"The delay between link watch initialization and the first request being sent."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
+#: ../src/connection-editor/ce-page-team-port.ui.h:45
#: ../src/connection-editor/ce-page-team.ui.h:91
msgid "The link watcher to be used."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
+#: ../src/connection-editor/ce-page-team-port.ui.h:46
#: ../src/connection-editor/ce-page-team.ui.h:92
msgid "Link Watcher"
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
+#: ../src/connection-editor/ce-page-team-port.ui.h:47
#: ../src/connection-editor/ce-page-team.ui.h:93
#, fuzzy
msgid "Im_port team configuration from a file…"
msgstr "从文件导入组配置(_P)..."
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
+#: ../src/connection-editor/ce-page-team-port.ui.h:48
#: ../src/connection-editor/ce-page-team.ui.h:94
#, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
msgstr "_JSON 配置:"
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
+#: ../src/connection-editor/ce-page-team-port.ui.h:49
#: ../src/connection-editor/ce-page-team.ui.h:95
msgid "Raw Configuration"
msgstr ""
@@ -2615,7 +2702,8 @@ msgid "From active to team device"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#, fuzzy
+msgid "_Teamed connections"
msgstr "已组队的连接(_T):"
#: ../src/connection-editor/ce-page-team.ui.h:23
@@ -2628,14 +2716,14 @@ msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:27
#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:351
+#: ../src/connection-editor/page-ethernet.c:348
#: ../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:120
-#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
#: ../src/libnm-gtk/nm-ui-utils.c:583
msgid "VLAN"
msgstr "VLAN"
@@ -2667,24 +2755,24 @@ msgid "Any L4 protocol"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+msgid "_Peer notification count"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+msgid "Peer _notification interval"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+msgid "_Multicast rejoin count"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+msgid "Multicast _rejoin interval"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:46
#, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
msgstr "硬件地址:"
#: ../src/connection-editor/ce-page-team.ui.h:47
@@ -2694,12 +2782,12 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:49
-msgid "_Runner:"
+msgid "_Runner"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:50
#, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
msgstr "硬件地址:"
#: ../src/connection-editor/ce-page-team.ui.h:51
@@ -2735,15 +2823,15 @@ msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:57
#, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
msgstr "优先级(_P):"
#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+msgid "_Minimum ports"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+msgid "_Aggregator selection policy"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:60
@@ -2780,12 +2868,12 @@ msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:67
#, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
msgstr "传输功率(_W):"
#: ../src/connection-editor/ce-page-team.ui.h:68
#, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
msgstr "传输功率(_W):"
#: ../src/connection-editor/ce-page-team.ui.h:69
@@ -2793,25 +2881,28 @@ msgid "Runner"
msgstr ""
#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#, fuzzy
+msgid "_Parent interface"
msgstr "上级接口(_P):"
#: ../src/connection-editor/ce-page-vlan.ui.h:2
#, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
msgstr "VLAN 接口名称(_N):"
#: ../src/connection-editor/ce-page-vlan.ui.h:3
#, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
msgstr "克隆 MAC 地址(_C):"
#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#, fuzzy
+msgid "VLAN _id"
msgstr "VLAN 标签(_I):"
#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#, fuzzy
+msgid "Flags"
msgstr "标志:"
#: ../src/connection-editor/ce-page-vlan.ui.h:8
@@ -2841,7 +2932,8 @@ msgid "\"vlan\" + number"
msgstr "vlan + 数字"
#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#, fuzzy
+msgid "S_ecurity"
msgstr "安全(_E):"
#: ../src/connection-editor/ce-page-wifi.ui.h:2
@@ -2869,7 +2961,8 @@ msgid "mW"
msgstr "mW"
#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#, fuzzy
+msgid "Transmission po_wer"
msgstr "传输功率(_W):"
#: ../src/connection-editor/ce-page-wifi.ui.h:13
@@ -2877,23 +2970,28 @@ msgid "Mb/s"
msgstr "Mb/秒"
#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#, fuzzy
+msgid "_Rate"
msgstr "速率(_R):"
#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#, fuzzy
+msgid "_BSSID"
msgstr "_BSSID:"
#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#, fuzzy
+msgid "C_hannel"
msgstr "频道(_H):"
#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#, fuzzy
+msgid "Ban_d"
msgstr "波段(_D):"
#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#, fuzzy
+msgid "SS_ID"
msgstr "SS_ID:"
#: ../src/connection-editor/ce-polkit.c:63
@@ -2955,155 +3053,145 @@ msgstr ""
"些方法的支持。"
#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
msgid "Wi-Fi"
msgstr "Wi-Fi"
#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/connection-editor/page-bluetooth.c:120
#: ../src/libnm-gtk/nm-ui-utils.c:325
msgid "Bluetooth"
msgstr "蓝牙"
#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:201
+#: ../src/connection-editor/page-dsl.c:217
msgid "DSL/PPPoE"
msgstr ""
#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:148
+#: ../src/connection-editor/page-infiniband.c:145
#: ../src/libnm-gtk/nm-ui-utils.c:331
msgid "InfiniBand"
msgstr "InfiniBand"
#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../src/connection-editor/page-bond.c:443 ../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:118
-#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/page-team.c:1028 ../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:119
-#: ../src/connection-editor/page-bridge.c:233
+#: ../src/connection-editor/page-bridge.c:230
#: ../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:121
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: ../src/connection-editor/page-ip-tunnel.c:173
msgid "IP tunnel"
msgstr ""
#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:190
+#: ../src/connection-editor/page-macsec.c:187
msgid "MACsec"
msgstr ""
#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:398
-#: ../src/connection-editor/page-vpn.c:96
+#: ../src/connection-editor/connection-helpers.c:386
+#: ../src/connection-editor/page-vpn.c:100
msgid "VPN"
msgstr "VPN"
-#: ../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."
+#: ../src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
msgstr ""
-"VPN 插件无法正确导入 VPN 连接。\n"
-"\n"
-"错误:没有 VPN 服务类型。"
-
-#: ../src/connection-editor/connection-helpers.c:219
-msgid "Cannot import VPN connection"
-msgstr "无法导入 VPN 连接"
-#: ../src/connection-editor/connection-helpers.c:221
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: ../src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
msgstr ""
-"无法读取 %s 或文件中不包含可识别的 VPN 连接信息\n"
+"VPN 插件无法正确导入 VPN 连接。\n"
"\n"
-"错误:%s。"
-
-#: ../src/connection-editor/connection-helpers.c:222
-#, fuzzy
-msgid "unknown error"
-msgstr "未知错误"
+"错误:没有 VPN 服务类型。"
-#: ../src/connection-editor/connection-helpers.c:305
+#: ../src/connection-editor/connection-helpers.c:293
#: ../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:309
+#: ../src/connection-editor/connection-helpers.c:297
#: ../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
+#: ../src/connection-editor/connection-helpers.c:328
msgid "Hardware"
msgstr "硬件"
-#: ../src/connection-editor/connection-helpers.c:367
+#: ../src/connection-editor/connection-helpers.c:355
msgid "Virtual"
msgstr "虚拟"
-#: ../src/connection-editor/connection-helpers.c:516
-#: ../src/connection-editor/connection-helpers.c:518
+#: ../src/connection-editor/connection-helpers.c:504
+#: ../src/connection-editor/connection-helpers.c:506
#, fuzzy
msgid "Import a saved VPN configuration…"
msgstr "导入 VPN 配置..."
-#: ../src/connection-editor/connection-helpers.c:548
+#: ../src/connection-editor/connection-helpers.c:536
msgid ""
"The connection editor dialog could not be initialized due to an unknown "
"error."
msgstr "由于一个未知错误,连接编辑器对话框无法初始化。"
-#: ../src/connection-editor/connection-helpers.c:557
+#: ../src/connection-editor/connection-helpers.c:545
msgid "Could not create new connection"
msgstr "无法建立新连接"
-#: ../src/connection-editor/connection-helpers.c:720
+#: ../src/connection-editor/connection-helpers.c:708
msgid "Connection delete failed"
msgstr "删除连接失败"
-#: ../src/connection-editor/connection-helpers.c:768
+#: ../src/connection-editor/connection-helpers.c:756
#, c-format
msgid "Are you sure you wish to delete the connection %s?"
msgstr "是否确认删除连接 %s?"
+#: ../src/connection-editor/gtk/menus.ui.h:1
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN 连接"
+
+#: ../src/connection-editor/gtk/menus.ui.h:2
+msgid "_Quit"
+msgstr ""
+
#: ../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:1118
+#: ../src/connection-editor/page-ip4.c:1133
+#: ../src/connection-editor/page-ip6.c:1115
msgid "Address"
msgstr "地址"
#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: ../src/connection-editor/page-ip4.c:1152
msgid "Netmask"
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:1156
+#: ../src/connection-editor/page-ip4.c:1171
+#: ../src/connection-editor/page-ip6.c:1153
msgid "Gateway"
msgstr "网关"
@@ -3113,80 +3201,80 @@ msgid "Metric"
msgstr "度量"
#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1137
+#: ../src/connection-editor/page-ip6.c:1134
msgid "Prefix"
msgstr "前缀"
-#: ../src/connection-editor/nm-connection-editor.c:109
+#: ../src/connection-editor/nm-connection-editor.c:110
#, c-format
msgid "Editing %s"
msgstr "正在编辑 %s"
-#: ../src/connection-editor/nm-connection-editor.c:113
+#: ../src/connection-editor/nm-connection-editor.c:114
msgid "Editing un-named connection"
msgstr "编辑未命名连接"
-#: ../src/connection-editor/nm-connection-editor.c:133
+#: ../src/connection-editor/nm-connection-editor.c:134
msgid "Missing connection name"
msgstr "缺少连接名"
-#: ../src/connection-editor/nm-connection-editor.c:353
+#: ../src/connection-editor/nm-connection-editor.c:350
#, fuzzy
msgid "Editor initializing…"
msgstr "编辑器正在初始化…"
-#: ../src/connection-editor/nm-connection-editor.c:360
-#: ../src/connection-editor/nm-connection-list.c:443
+#: ../src/connection-editor/nm-connection-editor.c:357
+#: ../src/connection-editor/nm-connection-list.c:471
msgid "Connection cannot be modified"
msgstr "连接不能被修改"
-#: ../src/connection-editor/nm-connection-editor.c:375
+#: ../src/connection-editor/nm-connection-editor.c:372
#, c-format
msgid "Invalid setting %s: %s"
msgstr "无效设置 %s: %s"
-#: ../src/connection-editor/nm-connection-editor.c:451
+#: ../src/connection-editor/nm-connection-editor.c:448
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:578
+#: ../src/connection-editor/nm-connection-editor.c:581
#: ../src/connection-editor/vpn-helpers.c:213
msgid "_Save"
msgstr "保存(_S)"
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: ../src/connection-editor/nm-connection-editor.c:582
msgid "Save any changes made to this connection."
msgstr "保存对此连接的全部更改。"
-#: ../src/connection-editor/nm-connection-editor.c:580
+#: ../src/connection-editor/nm-connection-editor.c:583
msgid "Authenticate to save this connection for all users of this machine."
msgstr "为本机所有用户保存此连接需要认证。"
-#: ../src/connection-editor/nm-connection-editor.c:596
+#: ../src/connection-editor/nm-connection-editor.c:599
msgid "Could not create connection"
msgstr "无法创建连接"
-#: ../src/connection-editor/nm-connection-editor.c:596
+#: ../src/connection-editor/nm-connection-editor.c:599
msgid "Could not edit connection"
msgstr "无法编辑连接"
-#: ../src/connection-editor/nm-connection-editor.c:598
+#: ../src/connection-editor/nm-connection-editor.c:601
msgid "Unknown error creating connection editor dialog."
msgstr "创建连接编辑器对话框出现未知错误。"
-#: ../src/connection-editor/nm-connection-editor.c:739
+#: ../src/connection-editor/nm-connection-editor.c:742
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:759
+#: ../src/connection-editor/nm-connection-editor.c:762
msgid "Error initializing editor"
msgstr "初始化编辑器错误"
-#: ../src/connection-editor/nm-connection-editor.c:1157
+#: ../src/connection-editor/nm-connection-editor.c:1169
msgid "Connection add failed"
msgstr "添加连接失败"
@@ -3202,7 +3290,8 @@ msgid ""
msgstr "将此项设为 true 以禁用在 EAP 认证中关于 CA 证书的警告。"
#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
+#, fuzzy
+msgid "Connection _name"
msgstr "连接名称(_N):"
#: ../src/connection-editor/nm-connection-editor.ui.h:4
@@ -3232,119 +3321,144 @@ msgstr ""
msgid "Filename"
msgstr ""
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:148
msgid "never"
msgstr "从不"
-#: ../src/connection-editor/nm-connection-list.c:162
-#: ../src/connection-editor/nm-connection-list.c:173
+#: ../src/connection-editor/nm-connection-list.c:159
+#: ../src/connection-editor/nm-connection-list.c:170
msgid "now"
msgstr "现在"
#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:180
+#: ../src/connection-editor/nm-connection-list.c:177
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%d 分钟以前"
-#: ../src/connection-editor/nm-connection-list.c:184
+#: ../src/connection-editor/nm-connection-list.c:181
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%d 小时以前"
-#: ../src/connection-editor/nm-connection-list.c:196
+#: ../src/connection-editor/nm-connection-list.c:193
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "%d 天以前"
-#: ../src/connection-editor/nm-connection-list.c:202
+#: ../src/connection-editor/nm-connection-list.c:199
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
msgstr[0] "%d 个月以前"
-#: ../src/connection-editor/nm-connection-list.c:206
+#: ../src/connection-editor/nm-connection-list.c:203
#, c-format
msgid "%d year ago"
msgid_plural "%d years ago"
msgstr[0] "%d 年以前"
-#: ../src/connection-editor/nm-connection-list.c:445
+#: ../src/connection-editor/nm-connection-list.c:473
msgid "Connection cannot be deleted"
msgstr ""
-#: ../src/connection-editor/nm-connection-list.c:448
+#: ../src/connection-editor/nm-connection-list.c:476
msgid "Select a connection to edit"
msgstr ""
-#: ../src/connection-editor/nm-connection-list.c:450
+#: ../src/connection-editor/nm-connection-list.c:478
msgid "Select a connection to delete"
msgstr ""
-#: ../src/connection-editor/nm-connection-list.c:785
+#: ../src/connection-editor/nm-connection-list.c:794
#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
msgid "Name"
msgstr "名称"
-#: ../src/connection-editor/nm-connection-list.c:798
+#: ../src/connection-editor/nm-connection-list.c:807
msgid "Last Used"
msgstr "最后使用的"
-#: ../src/connection-editor/nm-connection-list.c:836
+#: ../src/connection-editor/nm-connection-list.c:845
msgid "Edit the selected connection"
msgstr "编辑选中的连接"
-#: ../src/connection-editor/nm-connection-list.c:837
+#: ../src/connection-editor/nm-connection-list.c:846
msgid "Authenticate to edit the selected connection"
msgstr "进行认证以编辑选中的连接"
-#: ../src/connection-editor/nm-connection-list.c:842
+#: ../src/connection-editor/nm-connection-list.c:851
msgid "Delete the selected connection"
msgstr "删除选中的连接"
-#: ../src/connection-editor/nm-connection-list.c:843
+#: ../src/connection-editor/nm-connection-list.c:852
msgid "Authenticate to delete the selected connection"
msgstr "进行认证以删除选中的连接"
-#: ../src/connection-editor/nm-connection-list.c:1048
-#: ../src/connection-editor/nm-connection-list.c:1051
+#: ../src/connection-editor/nm-connection-list.c:1059
+#, fuzzy, c-format
+msgid "Unrecognized connection type"
+msgstr "不支持的移动宽带连接类型。"
+
+#: ../src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "不知道如何创建“%s”连接"
+
+#: ../src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "编辑连接出错"
+
+#: ../src/connection-editor/nm-connection-list.c:1075
+#: ../src/connection-editor/nm-connection-list.c:1090
+#: ../src/connection-editor/nm-connection-list.c:1093
msgid "Error creating connection"
msgstr "创建连接出错"
-#: ../src/connection-editor/nm-connection-list.c:1049
+#: ../src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "连接不能被修改"
+
+#: ../src/connection-editor/nm-connection-list.c:1091
msgid "No VPN plugins are installed."
msgstr "未安装 VPN 插件。"
-#: ../src/connection-editor/nm-connection-list.c:1052
+#: ../src/connection-editor/nm-connection-list.c:1094
#, fuzzy, c-format
msgid "Don’t know how to create “%s” connections"
msgstr "不知道如何创建“%s”连接"
-#: ../src/connection-editor/nm-connection-list.c:1085
+#: ../src/connection-editor/nm-connection-list.c:1128
msgid "Error editing connection"
msgstr "编辑连接出错"
-#: ../src/connection-editor/nm-connection-list.c:1086
+#: ../src/connection-editor/nm-connection-list.c:1129
#, fuzzy, c-format
msgid "Did not find a connection with UUID “%s”"
msgstr "没有找到“%s”连接"
+#: ../src/connection-editor/nm-connection-list.ui.h:1
+msgid "Network Connections"
+msgstr "网络连接"
+
#: ../src/connection-editor/nm-connection-list.ui.h:2
msgid "Add a new connection"
msgstr ""
-#: ../src/connection-editor/page-8021x-security.c:116
+#: ../src/connection-editor/page-8021x-security.c:113
msgid "802.1X Security"
msgstr "802.1X 安全性"
-#: ../src/connection-editor/page-8021x-security.c:118
+#: ../src/connection-editor/page-8021x-security.c:115
msgid "Could not load 802.1X Security user interface."
msgstr "无法加载 802.1X 安全配置用户界面。"
-#: ../src/connection-editor/page-8021x-security.c:132
+#: ../src/connection-editor/page-8021x-security.c:129
msgid "Use 802.1_X security for this connection"
msgstr "对此连接使用 802.1_X 安全配置"
@@ -3352,54 +3466,54 @@ msgstr "对此连接使用 802.1_X 安全配置"
msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
msgstr "蓝牙设备的 MAC 地址。例如:00:11:22:33:44:55"
-#: ../src/connection-editor/page-bluetooth.c:125
+#: ../src/connection-editor/page-bluetooth.c:122
msgid "Could not load Bluetooth user interface."
msgstr "无法加载蓝牙用户界面。"
-#: ../src/connection-editor/page-bluetooth.c:175
+#: ../src/connection-editor/page-bluetooth.c:170
#, c-format
msgid "invalid Bluetooth device (%s)"
msgstr "无效的蓝牙设备 (%s)"
-#: ../src/connection-editor/page-bluetooth.c:258
+#: ../src/connection-editor/page-bluetooth.c:253
#, c-format
msgid "Bluetooth connection %d"
msgstr "蓝牙连接 %d "
-#: ../src/connection-editor/page-bluetooth.c:308
+#: ../src/connection-editor/page-bluetooth.c:304
msgid "Bluetooth Type"
msgstr "蓝牙类型"
-#: ../src/connection-editor/page-bluetooth.c:326
+#: ../src/connection-editor/page-bluetooth.c:322
msgid "Select the type of the Bluetooth connection profile."
msgstr "选择蓝牙连接配置的类型。"
-#: ../src/connection-editor/page-bluetooth.c:331
+#: ../src/connection-editor/page-bluetooth.c:327
msgid "_Personal Area Network"
msgstr "个人区域网(_P)"
-#: ../src/connection-editor/page-bluetooth.c:336
+#: ../src/connection-editor/page-bluetooth.c:332
msgid "_Dial-Up Network"
msgstr "拨号网络(_D)"
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:446
msgid "Could not load bond user interface."
msgstr "无法加载绑定用户界面。"
-#: ../src/connection-editor/page-bond.c:568
+#: ../src/connection-editor/page-bond.c:565
msgid "primary"
msgstr "主要"
-#: ../src/connection-editor/page-bond.c:623
+#: ../src/connection-editor/page-bond.c:620
#, c-format
msgid "Bond connection %d"
msgstr "绑定连接 %d"
-#: ../src/connection-editor/page-bridge.c:236
+#: ../src/connection-editor/page-bridge.c:233
msgid "Could not load bridge user interface."
msgstr "无法加载桥接用户界面。"
-#: ../src/connection-editor/page-bridge.c:352
+#: ../src/connection-editor/page-bridge.c:349
#, c-format
msgid "Bridge connection %d"
msgstr "桥接连接 %d"
@@ -3407,31 +3521,31 @@ msgstr "桥接连接 %d"
#. Translators: a "Bridge Port" is a network
#. * device that is part of a bridge.
#.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: ../src/connection-editor/page-bridge-port.c:105
msgid "Bridge Port"
msgstr "桥接端口"
-#: ../src/connection-editor/page-bridge-port.c:110
+#: ../src/connection-editor/page-bridge-port.c:107
msgid "Could not load bridge port user interface."
msgstr "无法加载桥接端口用户界面。"
-#: ../src/connection-editor/page-dcb.c:622
+#: ../src/connection-editor/page-dcb.c:624
msgid "DCB"
msgstr "DCB"
-#: ../src/connection-editor/page-dcb.c:624
+#: ../src/connection-editor/page-dcb.c:626
msgid "Could not load DCB user interface."
msgstr "无法加载 DSL 用户界面。"
-#: ../src/connection-editor/page-dsl.c:203
+#: ../src/connection-editor/page-dsl.c:219
msgid "Could not load DSL user interface."
msgstr "无法加载 DSL 用户界面。"
-#: ../src/connection-editor/page-dsl.c:298
+#: ../src/connection-editor/page-dsl.c:320
msgid "missing parent interface"
msgstr ""
-#: ../src/connection-editor/page-dsl.c:343
+#: ../src/connection-editor/page-dsl.c:365
#, c-format
msgid "DSL connection %d"
msgstr "DSL 连接 %d"
@@ -3451,37 +3565,37 @@ msgstr ""
msgid "ignored"
msgstr "已忽略"
-#: ../src/connection-editor/page-ethernet.c:353
+#: ../src/connection-editor/page-ethernet.c:350
msgid "Could not load ethernet user interface."
msgstr "无法加载以太网用户界面。"
-#: ../src/connection-editor/page-ethernet.c:515
+#: ../src/connection-editor/page-ethernet.c:512
msgid "Ethernet device"
msgstr "以太网设备"
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: ../src/connection-editor/page-ethernet.c:516
+#: ../src/connection-editor/page-vlan.c:737
+#: ../src/connection-editor/page-wifi.c:571
msgid "cloned MAC"
msgstr "克隆 MAC"
-#: ../src/connection-editor/page-ethernet.c:523
+#: ../src/connection-editor/page-ethernet.c:520
msgid "Wake-on-LAN password"
msgstr ""
-#: ../src/connection-editor/page-ethernet.c:563
+#: ../src/connection-editor/page-ethernet.c:560
#, c-format
msgid "Ethernet connection %d"
msgstr "以太网连接 %d"
#. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: ../src/connection-editor/page-general.c:55
+#: ../src/libnma/nma-mobile-providers.c:802
+#: ../src/libnm-gtk/nm-mobile-providers.c:801
msgid "Default"
msgstr "默认"
-#: ../src/connection-editor/page-general.c:55
+#: ../src/connection-editor/page-general.c:56
msgid ""
"The zone defines the trust level of the connection. Default is not a regular "
"zone, selecting it results in the use of the default zone set in the "
@@ -3506,75 +3620,77 @@ msgstr ""
"如:“ib0”,“80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65”, "
"“ib0 (80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
-#: ../src/connection-editor/page-infiniband.c:151
+#: ../src/connection-editor/page-infiniband.c:148
msgid "Could not load InfiniBand user interface."
msgstr "无法加载 InfiniBand 用户界面。"
-#: ../src/connection-editor/page-infiniband.c:214
+#: ../src/connection-editor/page-infiniband.c:211
msgid "infiniband device"
msgstr "Infiniband 设备"
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:251
#, c-format
msgid "InfiniBand connection %d"
msgstr "InfiniBand 连接 %d"
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: ../src/connection-editor/page-ip-tunnel.c:175
#, fuzzy
msgid "Could not load IP tunnel user interface."
msgstr "无法加载 IPv4 用户界面。"
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: ../src/connection-editor/page-ip-tunnel.c:289
#, fuzzy, c-format
msgid "IP tunnel connection %d"
msgstr "以太网连接 %d"
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:128
+#: ../src/connection-editor/page-ip6.c:137
msgid "Automatic (VPN)"
msgstr "自动(VPN)"
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:138
msgid "Automatic (VPN) addresses only"
msgstr "自动(VPN)仅地址"
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:144
msgid "Automatic, addresses only"
msgstr "自动,仅地址"
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:135
+#: ../src/connection-editor/page-ip6.c:140
msgid "Automatic (PPPoE)"
msgstr "自动(PPPoE)"
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:136
+#: ../src/connection-editor/page-ip6.c:141
msgid "Automatic (PPPoE) addresses only"
msgstr "自动(PPPoE)仅地址"
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:138
msgid "Automatic (DHCP)"
msgstr "自动(DHCP)"
-#: ../src/connection-editor/page-ip4.c:138
+#: ../src/connection-editor/page-ip4.c:139
msgid "Automatic (DHCP) addresses only"
msgstr "自动(DHCP)仅地址"
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:182
+#: ../src/connection-editor/page-ip6.c:205
msgid "Link-Local Only"
msgstr "仅本地连接"
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:335
-msgid "Additional DNS ser_vers:"
+#: ../src/connection-editor/page-ip4.c:362
+#: ../src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
msgstr "附加 _DNS 服务器:"
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:344
-msgid "Additional s_earch domains:"
+#: ../src/connection-editor/page-ip4.c:371
+#: ../src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
msgstr "附加搜索域(_E):"
#: ../src/connection-editor/page-ip4.c:1033
@@ -3582,35 +3698,35 @@ msgstr "附加搜索域(_E):"
msgid "Editing IPv4 routes for %s"
msgstr "正在编辑 %s 的 IPv4 路由"
-#: ../src/connection-editor/page-ip4.c:1226
+#: ../src/connection-editor/page-ip4.c:1223
msgid "IPv4 Settings"
msgstr "IPv4 设置"
-#: ../src/connection-editor/page-ip4.c:1228
+#: ../src/connection-editor/page-ip4.c:1225
msgid "Could not load IPv4 user interface."
msgstr "无法加载 IPv4 用户界面。"
-#: ../src/connection-editor/page-ip4.c:1321
+#: ../src/connection-editor/page-ip4.c:1318
#, fuzzy, c-format
msgid "IPv4 address “%s” invalid"
msgstr "IPv4 地址 “%s” 无效"
-#: ../src/connection-editor/page-ip4.c:1329
+#: ../src/connection-editor/page-ip4.c:1326
#, fuzzy, c-format
msgid "IPv4 address netmask “%s” invalid"
msgstr "IPv4 地址子网掩码 “%s” 无效"
-#: ../src/connection-editor/page-ip4.c:1338
+#: ../src/connection-editor/page-ip4.c:1335
#, fuzzy, c-format
msgid "IPv4 gateway “%s” invalid"
msgstr "IPv4 网关 “%s” 无效"
-#: ../src/connection-editor/page-ip4.c:1381
+#: ../src/connection-editor/page-ip4.c:1378
#, fuzzy, c-format
msgid "IPv4 DNS server “%s” invalid"
msgstr "IPv4 DNS 服务器 “%s” 无效"
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:180
msgid "Automatic, DHCP only"
msgstr "自动,仅 DHCP"
@@ -3619,124 +3735,126 @@ msgstr "自动,仅 DHCP"
msgid "Editing IPv6 routes for %s"
msgstr "正在编辑 %s 的 IPv6 路由"
-#: ../src/connection-editor/page-ip6.c:1208
+#: ../src/connection-editor/page-ip6.c:1205
msgid "IPv6 Settings"
msgstr "IPv6 设置"
-#: ../src/connection-editor/page-ip6.c:1210
+#: ../src/connection-editor/page-ip6.c:1207
msgid "Could not load IPv6 user interface."
msgstr "无法加载 IPv6 用户界面。"
-#: ../src/connection-editor/page-ip6.c:1302
+#: ../src/connection-editor/page-ip6.c:1299
#, fuzzy, c-format
msgid "IPv6 address “%s” invalid"
msgstr "IPv6 地址 “%s” 无效"
-#: ../src/connection-editor/page-ip6.c:1310
+#: ../src/connection-editor/page-ip6.c:1307
#, fuzzy, c-format
msgid "IPv6 prefix “%s” invalid"
msgstr "IPv6 前缀 “%s” 无效"
-#: ../src/connection-editor/page-ip6.c:1319
+#: ../src/connection-editor/page-ip6.c:1316
#, fuzzy, c-format
msgid "IPv6 gateway “%s” invalid"
msgstr "IPv6 网关 “%s” 无效"
-#: ../src/connection-editor/page-ip6.c:1361
+#: ../src/connection-editor/page-ip6.c:1358
#, fuzzy, c-format
msgid "IPv6 DNS server “%s” invalid"
msgstr "IPv6 DNS 服务器 “%s” 无效"
-#: ../src/connection-editor/page-macsec.c:192
+#: ../src/connection-editor/page-macsec.c:189
msgid "Could not load MACsec user interface."
msgstr ""
-#: ../src/connection-editor/page-macsec.c:331
+#: ../src/connection-editor/page-macsec.c:328
#, c-format
msgid "MACSEC connection %d"
msgstr ""
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: ../src/connection-editor/page-master.c:235
+#: ../src/connection-editor/page-master.c:246
msgid "Duplicate slaves"
msgstr "重叠的从机"
-#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:236
#, fuzzy, c-format
msgid "Slaves “%s” and “%s” both apply to device “%s”"
msgstr "从机“%s”与“%s”都应用于设备“%s“"
-#: ../src/connection-editor/page-master.c:259
+#: ../src/connection-editor/page-master.c:247
#, fuzzy, c-format
msgid ""
"Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
"same physical device."
msgstr "从机“%s”和“%s”应用于同一物理设备的不同虚拟端口(“%s”和“%s”)。"
-#: ../src/connection-editor/page-master.c:385
+#: ../src/connection-editor/page-master.c:371
#, c-format
msgid "%s slave %d"
msgstr "%s 从机 %d"
-#: ../src/connection-editor/page-mobile.c:310
+#: ../src/connection-editor/page-mobile.c:307
msgid "Could not load mobile broadband user interface."
msgstr "无法加载移动宽带用户界面。"
-#: ../src/connection-editor/page-mobile.c:327
+#: ../src/connection-editor/page-mobile.c:324
msgid "Unsupported mobile broadband connection type."
msgstr "不支持的移动宽带连接类型。"
#. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: ../src/connection-editor/page-mobile.c:537
msgid "Select Mobile Broadband Provider Type"
msgstr "选择移动宽带提供商类型"
-#: ../src/connection-editor/page-mobile.c:567
+#: ../src/connection-editor/page-mobile.c:564
#, fuzzy
msgid ""
"Select the technology your mobile broadband provider uses. If you are "
"unsure, ask your provider."
msgstr "选择您的移动宽带提供商使用的技术。如不确定,请询问您的提供商。"
-#: ../src/connection-editor/page-mobile.c:572
+#: ../src/connection-editor/page-mobile.c:569
msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
msgstr "我的提供商使用基于 _GSM 的技术(如 GPRS、EDGE、UMTS、HSDPA)"
#. Translators: CDMA has 'D' accelerator key; 'C' collides with 'Cancel' button.
#. You may need to change it according to your language.
-#: ../src/connection-editor/page-mobile.c:579
+#: ../src/connection-editor/page-mobile.c:576
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/connection-editor/page-mobile.c:586
+#: ../src/libnma/nma-mobile-wizard.c:147 ../src/mb-menu-item.c:50
#: ../src/mobile-helpers.c:282
msgid "CDMA"
msgstr "CDMA"
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:589
+#: ../src/libnma/nma-mobile-wizard.c:144 ../src/mb-menu-item.c:54
#: ../src/mobile-helpers.c:280
msgid "GSM"
msgstr "GSM"
#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: ../src/wireless-security/eap-method-ttls.c:288
msgid "PAP"
msgstr "PAP"
#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: ../src/wireless-security/eap-method-ttls.c:354
msgid "CHAP"
msgstr "CHAP"
#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: ../src/wireless-security/eap-method-fast.c:284
+#: ../src/wireless-security/eap-method-peap.c:300
+#: ../src/wireless-security/eap-method-ttls.c:320
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: ../src/wireless-security/eap-method-ttls.c:304
msgid "MSCHAP"
msgstr "MSCHAP"
@@ -3750,19 +3868,19 @@ msgstr "无"
msgid "Editing PPP authentication methods for %s"
msgstr "正在编辑 %s 的 PPP 认证方法"
-#: ../src/connection-editor/page-ppp.c:279
+#: ../src/connection-editor/page-ppp.c:278
msgid "PPP Settings"
msgstr "PPP 设置"
-#: ../src/connection-editor/page-ppp.c:281
+#: ../src/connection-editor/page-ppp.c:280
msgid "Could not load PPP user interface."
msgstr "无法加载 PPP 用户界面。"
-#: ../src/connection-editor/page-proxy.c:215
+#: ../src/connection-editor/page-proxy.c:212
msgid "Proxy"
msgstr ""
-#: ../src/connection-editor/page-proxy.c:217
+#: ../src/connection-editor/page-proxy.c:214
#, fuzzy
msgid "Could not load proxy user interface."
msgstr "无法加载绑定用户界面。"
@@ -3773,11 +3891,11 @@ msgstr "无法加载绑定用户界面。"
msgid "Error: file doesn’t contain a valid JSON configuration"
msgstr "错误:此文件不含任何有效的 JSON 配置"
-#: ../src/connection-editor/page-team.c:1034
+#: ../src/connection-editor/page-team.c:1031
msgid "Could not load team user interface."
msgstr "无法加载组队用户界面。"
-#: ../src/connection-editor/page-team.c:1131
+#: ../src/connection-editor/page-team.c:1128
#, c-format
msgid "Team connection %d"
msgstr "组队连接 %d"
@@ -3785,69 +3903,69 @@ msgstr "组队连接 %d"
#. Translators: a "Team Port" is a network
#. * device that is part of a team.
#.
-#: ../src/connection-editor/page-team-port.c:655
+#: ../src/connection-editor/page-team-port.c:652
msgid "Team Port"
msgstr "组队端口"
-#: ../src/connection-editor/page-team-port.c:657
+#: ../src/connection-editor/page-team-port.c:654
msgid "Could not load team port user interface."
msgstr "无法加载组队端口用户界面。"
#. Translators: the first %s is a device name (eg, "em1"), the
#. * second is a connection name (eg, "Auto Ethernet").
#.
-#: ../src/connection-editor/page-vlan.c:415
+#: ../src/connection-editor/page-vlan.c:413
#, fuzzy, c-format
msgid "%s (via “%s”)"
msgstr "%s (通过“%s”)"
-#: ../src/connection-editor/page-vlan.c:427
+#: ../src/connection-editor/page-vlan.c:425
#, fuzzy, c-format
msgid "New connection…"
msgstr "没有网络连接"
-#: ../src/connection-editor/page-vlan.c:596
+#: ../src/connection-editor/page-vlan.c:591
msgid "Could not load vlan user interface."
msgstr "无法加载 VLAN 用户界面。"
-#: ../src/connection-editor/page-vlan.c:735
+#: ../src/connection-editor/page-vlan.c:730
msgid "vlan parent"
msgstr "vlan 上级"
-#: ../src/connection-editor/page-vlan.c:803
+#: ../src/connection-editor/page-vlan.c:798
#, c-format
msgid "VLAN connection %d"
msgstr "VLAN 连接 %d"
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "无法加载 VPN 用户界面。"
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "无法找到用于 %s 的 VPN 插件服务。"
-
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:64
#, fuzzy, c-format
msgid "Could not load editor VPN plugin for “%s” (%s)."
msgstr "无法找到用于 %s 的 VPN 插件服务。"
-#: ../src/connection-editor/page-vpn.c:123
+#: ../src/connection-editor/page-vpn.c:65
#, fuzzy
msgid "unknown failure"
msgstr "连接失败"
-#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "无法加载 VPN 用户界面。"
+
+#: ../src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "无法找到用于 %s 的 VPN 插件服务。"
+
+#: ../src/connection-editor/page-vpn.c:199
#, c-format
msgid "VPN connection %d"
msgstr "VPN 连接 %d"
-#: ../src/connection-editor/page-vpn.c:211
+#: ../src/connection-editor/page-vpn.c:205
msgid "Choose a VPN Connection Type"
msgstr "选择 VPN 连接类型"
-#: ../src/connection-editor/page-vpn.c:212
+#: ../src/connection-editor/page-vpn.c:206
#, fuzzy
msgid ""
"Select the type of VPN you wish to use for the new connection. If the type "
@@ -3881,65 +3999,65 @@ msgstr ""
msgid "%u (%u MHz)"
msgstr "%u (%u MHz)"
-#: ../src/connection-editor/page-wifi.c:442
+#: ../src/connection-editor/page-wifi.c:439
msgid "Could not load Wi-Fi user interface."
msgstr "无法加载 Wi-Fi 用户界面。"
-#: ../src/connection-editor/page-wifi.c:564
+#: ../src/connection-editor/page-wifi.c:561
msgid "bssid"
msgstr "bssid"
-#: ../src/connection-editor/page-wifi.c:570
+#: ../src/connection-editor/page-wifi.c:567
msgid "Wi-Fi device"
msgstr "Wi-Fi 设备"
-#: ../src/connection-editor/page-wifi.c:617
+#: ../src/connection-editor/page-wifi.c:614
#, c-format
msgid "Wi-Fi connection %d"
msgstr "Wi-Fi 连接 %d"
-#: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: ../src/connection-editor/page-wifi-security.c:355
+#: ../src/libnma/nma-wifi-dialog.c:946 ../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:368
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../src/connection-editor/page-wifi-security.c:365
+#: ../src/libnma/nma-wifi-dialog.c:955 ../src/libnm-gtk/nm-wifi-dialog.c:931
msgid "WEP 128-bit Passphrase"
msgstr "WEP 128 位密码句"
-#: ../src/connection-editor/page-wifi-security.c:394
+#: ../src/connection-editor/page-wifi-security.c:391
msgid "Dynamic WEP (802.1X)"
msgstr "动态 WEP (802.1X)"
-#: ../src/connection-editor/page-wifi-security.c:407
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/libnma/nma-wifi-dialog.c:999 ../src/libnm-gtk/nm-wifi-dialog.c:975
msgid "WPA & WPA2 Personal"
msgstr "WPA 及 WPA2 个人"
-#: ../src/connection-editor/page-wifi-security.c:420
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: ../src/connection-editor/page-wifi-security.c:417
+#: ../src/libnma/nma-wifi-dialog.c:1017 ../src/libnm-gtk/nm-wifi-dialog.c:989
msgid "WPA & WPA2 Enterprise"
msgstr "WPA 及 WPA2 企业"
-#: ../src/connection-editor/page-wifi-security.c:463
+#: ../src/connection-editor/page-wifi-security.c:460
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:474
+#: ../src/connection-editor/page-wifi-security.c:471
msgid "Wi-Fi Security"
msgstr "Wi-Fi 安全性"
-#: ../src/connection-editor/page-wifi-security.c:476
+#: ../src/connection-editor/page-wifi-security.c:473
msgid "Could not load Wi-Fi security user interface."
msgstr "无法加载 Wi-Fi 安全性用户界面。"
-#: ../src/connection-editor/page-wifi-security.c:560
+#: ../src/connection-editor/page-wifi-security.c:557
#, c-format
msgid "missing SSID"
msgstr "缺少 SSID"
-#: ../src/connection-editor/page-wifi-security.c:566
+#: ../src/connection-editor/page-wifi-security.c:563
#, c-format
msgid "Security not compatible with Ad-Hoc mode"
msgstr "安全与 Ad-Hoc 模式不兼容"
@@ -3999,32 +4117,32 @@ msgid "Active Network Connections"
msgstr "活动的网络连接"
#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:152
#, fuzzy
msgid "No certificate set"
msgstr "不需要 CA 证书(_R)"
#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:176
msgid "No key set"
msgstr ""
#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
#, 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:374
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
#, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
msgstr "私钥(_K):"
#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
#, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
msgstr "私钥密码(_P):"
#: ../src/libnma/nma-file-cert-chooser.c:258
@@ -4033,251 +4151,245 @@ msgid "Choose %s Certificate"
msgstr "选择您的个人证书..."
#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:398
#, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
msgstr "用户证书(_U):"
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "您的移动宽带连接已按以下设定配置:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "您的设备:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "您的服务商:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "您的套餐:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-msgid ""
-"A connection will now be made to your mobile broadband provider using the "
-"settings you selected. If the connection fails or you cannot access network "
-"resources, double-check your settings. To modify your mobile broadband "
-"connection settings, choose “Network Connections” from the System → "
-"Preferences menu."
-msgstr ""
-"现将按照您所选择的设置建立一个到您的移动宽带提供商的连接。如果连接失败或无法"
-"访问网络资源,请检查您的设置。要修改您的移动宽带设置,在系统 >> 首选项菜单中"
-"选择“网络连接”。"
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "确认移动宽带设置"
+#: ../src/libnma/nma-mobile-providers.c:991
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "我所在国家/地区没有被列出"
-#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnma/nma-mobile-wizard.c:252 ../src/libnma/nma-mobile-wizard.c:284
#: ../src/libnm-gtk/nm-mobile-wizard.c:326
msgid "Unlisted"
msgstr "未列出"
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "选择您的套餐(_S):"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "所选套餐的 _APN (访问点名称):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-msgid ""
-"Warning: Selecting an incorrect plan may result in billing issues for your "
-"broadband account or may prevent connectivity.\n"
-"\n"
-"If you are unsure of your plan please ask your provider for your plan’s APN."
-msgstr ""
-"警告:选择一个不正确的套餐可能导致宽带账户费用问题或无法连接。\n"
-"\n"
-"如果您不确定您的套餐,请询问您的提供商以获取套餐的 APN。"
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "选择您的付费套餐"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnma/nma-mobile-wizard.c:484
#: ../src/libnm-gtk/nm-mobile-wizard.c:558
#, fuzzy
msgid "My plan is not listed…"
msgstr "我的套餐未被列出..."
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "从列表中选择您的提供商(_L):"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnma/nma-mobile-wizard.c:644
#: ../src/libnm-gtk/nm-mobile-wizard.c:724
msgid "Provider"
msgstr "提供商"
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "找不到我的提供商,希望手动输入(_M):"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "提供商:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "我的提供商使用 GSM 技术(GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "我的提供商使用 CDMA 技术(1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "选择您的提供商"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "国家或地区列表:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnma/nma-mobile-wizard.c:932
#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
msgid "Country or region"
msgstr "国家或地区"
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "我所在国家/地区没有被列出"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "选择您的提供商的国家或地区"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnma/nma-mobile-wizard.c:1016
#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
msgid "Installed GSM device"
msgstr "已安装的 GSM 设备"
-#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnma/nma-mobile-wizard.c:1019
#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
msgid "Installed CDMA device"
msgstr "已安装的 CDMA 设备"
-#: ../src/libnma/nma-mobile-wizard.c:1354
+#: ../src/libnma/nma-mobile-wizard.c:1225
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "任何设备"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:1
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "新移动宽带连接"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:2
#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
msgid ""
"This assistant helps you easily set up a mobile broadband connection to a "
"cellular (3G) network."
msgstr "此助手程序可帮助您简单地设置一个到蜂窝(3G)网络的移动宽带连接。"
-#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnma/nma-mobile-wizard.ui.h:3
#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
msgid "You will need the following information:"
msgstr "您将需要以下信息:"
-#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnma/nma-mobile-wizard.ui.h:4
#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
#, fuzzy
msgid "Your broadband provider’s name"
msgstr "您的宽带提供商名称"
-#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.ui.h:5
#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
msgid "Your broadband billing plan name"
msgstr "您的宽带付费套餐名称"
-#: ../src/libnma/nma-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.ui.h:6
#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
msgstr "(在某些情况下)您的宽带付费套餐 APN (访问点名称)"
-#: ../src/libnma/nma-mobile-wizard.c:1412
+#: ../src/libnma/nma-mobile-wizard.ui.h:7
#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
msgid "Create a connection for _this mobile broadband device:"
msgstr "为此移动宽带设备创建一个连接(_T):"
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "任何设备"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnma/nma-mobile-wizard.ui.h:8
#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
msgid "Set up a Mobile Broadband Connection"
msgstr "设置一个移动宽带连接"
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "新移动宽带连接"
+#: ../src/libnma/nma-mobile-wizard.ui.h:9
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "国家或地区列表:"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:10
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "选择您的提供商的国家或地区"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:11
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "从列表中选择您的提供商(_L):"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:12
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "找不到我的提供商,希望手动输入(_M):"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:13
+#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "我的提供商使用 GSM 技术(GPRS, EDGE, UMTS, HSPA)"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:14
+#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "我的提供商使用 CDMA 技术(1xRTT, EVDO)"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:15
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "选择您的提供商"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:16
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "选择您的套餐(_S):"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:17
+#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "所选套餐的 _APN (访问点名称):"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:18
+#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"警告:选择一个不正确的套餐可能导致宽带账户费用问题或无法连接。\n"
+"\n"
+"如果您不确定您的套餐,请询问您的提供商以获取套餐的 APN。"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:21
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "选择您的付费套餐"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:22
+#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "您的移动宽带连接已按以下设定配置:"
-#: ../src/libnma/nma-cert-chooser-button.c:165
+#. Device
+#: ../src/libnma/nma-mobile-wizard.ui.h:23
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "您的设备:"
+
+#. Provider
+#: ../src/libnma/nma-mobile-wizard.ui.h:24
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "您的服务商:"
+
+#. Plan and APN
+#: ../src/libnma/nma-mobile-wizard.ui.h:25
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "您的套餐:"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:26
+#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"现将按照您所选择的设置建立一个到您的移动宽带提供商的连接。如果连接失败或无法"
+"访问网络资源,请检查您的设置。要修改您的移动宽带设置,在系统 >> 首选项菜单中"
+"选择“网络连接”。"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:27
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "确认移动宽带设置"
+
+#: ../src/libnma/nma-cert-chooser-button.c:167
#, fuzzy
msgid "(None)"
msgstr "(无)"
-#: ../src/libnma/nma-cert-chooser-button.c:173
+#: ../src/libnma/nma-cert-chooser-button.c:175
#, c-format
msgid "Key in %s"
msgstr ""
-#: ../src/libnma/nma-cert-chooser-button.c:174
+#: ../src/libnma/nma-cert-chooser-button.c:176
#, fuzzy, c-format
msgid "Certificate in %s"
msgstr "C_A 证书:"
-#: ../src/libnma/nma-cert-chooser-button.c:193
+#: ../src/libnma/nma-cert-chooser-button.c:195
#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
#, fuzzy
msgid "(Unknown)"
msgstr "未知"
-#: ../src/libnma/nma-cert-chooser-button.c:215
-#: ../src/libnma/nma-cert-chooser-button.c:245
+#: ../src/libnma/nma-cert-chooser-button.c:217
+#: ../src/libnma/nma-cert-chooser-button.c:247
msgid "Select"
msgstr ""
-#: ../src/libnma/nma-cert-chooser-button.c:216
-#: ../src/libnma/nma-cert-chooser-button.c:246
+#: ../src/libnma/nma-cert-chooser-button.c:218
+#: ../src/libnma/nma-cert-chooser-button.c:248
msgid "Cancel"
msgstr ""
-#: ../src/libnma/nma-cert-chooser-button.c:472
+#: ../src/libnma/nma-cert-chooser-button.c:474
msgid "Select from file…"
msgstr ""
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:394
#, fuzzy, c-format
msgid "Choose a %s Certificate"
msgstr "选择您的个人证书..."
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:402
#, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
msgstr "用户证书(_U):"
#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
@@ -4327,103 +4439,112 @@ msgstr "每次询问这个密码"
msgid "The password is not required"
msgstr "不需要密码"
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "次要密码(_S):"
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "显示密码(_O)"
-#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
msgid "_Tertiary Password:"
msgstr "三元密码(_T):"
-#: ../src/libnma/nma-vpn-password-dialog.c:238
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
-msgid "Sh_ow passwords"
-msgstr "显示密码(_O)"
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "次要密码(_S):"
+
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "密码(_P):"
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: ../src/libnma/nma-wifi-dialog.c:127 ../src/libnm-gtk/nm-wifi-dialog.c:141
msgid "Click to connect"
msgstr "点击连接"
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-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-connection-editor 来编辑网"
-"络连接"
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:465
msgid "New…"
msgstr ""
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:905
msgctxt "Wifi/wired security"
msgid "None"
msgstr "无"
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: ../src/libnma/nma-wifi-dialog.c:985 ../src/libnm-gtk/nm-wifi-dialog.c:961
#, fuzzy
msgid "Dynamic WEP (802.1x)"
msgstr "动态 WEP (802.1X)"
-#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: ../src/libnma/nma-wifi-dialog.c:1108 ../src/libnm-gtk/nm-wifi-dialog.c:1071
msgid "C_reate"
msgstr "创建(_R)"
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnma/nma-wifi-dialog.c:1186 ../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:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1152
msgid "Wi-Fi Network Authentication Required"
msgstr "需要 Wi-Fi 网络认证"
-#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1154
msgid "Authentication required by Wi-Fi network"
msgstr "Wi-Fi 网络要求认证"
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1159
msgid "Create New Wi-Fi Network"
msgstr "创建新的 Wi-Fi 网络"
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1197 ../src/libnm-gtk/nm-wifi-dialog.c:1161
msgid "New Wi-Fi network"
msgstr "新建 Wi-Fi 网络"
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: ../src/libnma/nma-wifi-dialog.c:1198 ../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:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1200 ../src/libnm-gtk/nm-wifi-dialog.c:1164
msgid "Connect to Hidden Wi-Fi Network"
msgstr "连接到隐藏的 Wi-Fi 网络"
-#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1202 ../src/libnm-gtk/nm-wifi-dialog.c:1166
msgid "Hidden Wi-Fi network"
msgstr "隐藏的 Wi-Fi 网络"
-#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: ../src/libnma/nma-wifi-dialog.c:1203 ../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 网络的名称及安全性详细信息。"
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: ../src/libnma/wifi.ui.h:1
+#, fuzzy
+msgid "Wi-Fi _security"
msgstr "Wi-Fi 安全性(_S):"
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: ../src/libnma/wifi.ui.h:3
+#, fuzzy
+msgid "C_onnection"
msgstr "连接(_O):"
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: ../src/libnma/wifi.ui.h:4
+#, fuzzy
+msgid "Wi-Fi _adapter"
msgstr "Wi-Fi 适配器(_A):"
+#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "找不到我的提供商,希望手动输入(_M):"
+
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "提供商:"
+
#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
msgid "Wired"
msgstr "有线"
@@ -4456,6 +4577,30 @@ msgctxt "long device name"
msgid "%s %s"
msgstr "%s %s"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:142
+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-connection-editor 来编辑网"
+"络连接"
+
+#: ../src/libnm-gtk/wifi.ui.h:1
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi 安全性(_S):"
+
+#: ../src/libnm-gtk/wifi.ui.h:2
+msgid "_Network name:"
+msgstr "网络名称(_N):"
+
+#: ../src/libnm-gtk/wifi.ui.h:3
+msgid "C_onnection:"
+msgstr "连接(_O):"
+
+#: ../src/libnm-gtk/wifi.ui.h:4
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi 适配器(_A):"
+
#: ../src/main.c:42
msgid "Usage:"
msgstr "用法:"
@@ -4584,12 +4729,12 @@ msgstr "漫游中"
msgid "%s connection"
msgstr "%s 连接"
-#: ../src/utils/utils.c:565
+#: ../src/utils/utils.c:549
#, fuzzy
msgid "PEM certificates (*.pem, *.crt, *.cer)"
msgstr "DER 或 PEM 证书(*.der, *.pem, *.crt, *.cer)"
-#: ../src/utils/utils.c:577
+#: ../src/utils/utils.c:561
msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
msgstr "DER,PEM 或 PKCS#12 私钥 (*.der, *.pem, *.p12, *.key)"
@@ -4610,22 +4755,22 @@ msgstr ""
msgid "missing EAP-FAST PAC file"
msgstr "缺少 EAP-FAST PAC 文件"
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: ../src/wireless-security/eap-method-fast.c:268
+#: ../src/wireless-security/eap-method-peap.c:332
+#: ../src/wireless-security/eap-method-ttls.c:386
msgid "GTC"
msgstr "GTC"
-#: ../src/wireless-security/eap-method-fast.c:405
+#: ../src/wireless-security/eap-method-fast.c:407
#, fuzzy
msgid "Choose a PAC file"
msgstr "选择一个 PAC 文件..."
-#: ../src/wireless-security/eap-method-fast.c:412
+#: ../src/wireless-security/eap-method-fast.c:414
msgid "PAC files (*.pac)"
msgstr "PAC 文件(*.pac)"
-#: ../src/wireless-security/eap-method-fast.c:416
+#: ../src/wireless-security/eap-method-fast.c:418
msgid "All files"
msgstr "所有文件"
@@ -4644,17 +4789,20 @@ 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:3
-msgid "Anony_mous identity:"
+#, fuzzy
+msgid "Anony_mous identity"
msgstr "匿名身份(_M):"
#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#, fuzzy
+msgid "PAC _file"
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:1
-msgid "_Inner authentication:"
+#, fuzzy
+msgid "_Inner authentication"
msgstr "内部认证(_I):"
#: ../src/wireless-security/eap-method-fast.ui.h:7
@@ -4669,9 +4817,9 @@ msgstr "缺少 EAP-LEAP 用户名"
msgid "missing EAP-LEAP password"
msgstr "缺少 EAP-LEAP 密码"
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: ../src/wireless-security/eap-method-peap.c:316
+#: ../src/wireless-security/eap-method-ttls.c:370
+#: ../src/wireless-security/wireless-security.c:425
msgid "MD5"
msgstr "MD5"
@@ -4690,7 +4838,8 @@ msgid "No CA certificate is _required"
msgstr "不需要 CA 证书(_R)"
#: ../src/wireless-security/eap-method-peap.ui.h:6
-msgid "PEAP _version:"
+#, fuzzy
+msgid "PEAP _version"
msgstr "PEAP 版本(_V):"
#: ../src/wireless-security/eap-method-peap.ui.h:8
@@ -4702,17 +4851,31 @@ 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:"
+msgid "_Domain"
msgstr ""
-#: ../src/wireless-security/eap-method-simple.c:75
+#: ../src/wireless-security/eap-method-simple.c:90
msgid "missing EAP username"
msgstr "缺少 EAP 用户名"
-#: ../src/wireless-security/eap-method-simple.c:88
+#: ../src/wireless-security/eap-method-simple.c:106
msgid "missing EAP password"
msgstr "缺少 EAP 密码"
+#: ../src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.ui.h:4
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128 位密码句"
+
+#: ../src/wireless-security/eap-method-simple.ui.h:5
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "显示密码(_O)"
+
#: ../src/wireless-security/eap-method-tls.c:64
msgid "missing EAP-TLS identity"
msgstr "缺少 EAP-TLS 身份"
@@ -4735,10 +4898,11 @@ msgid "selected key file does not exist"
msgstr ""
#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+#, fuzzy
+msgid "I_dentity"
msgstr "身份(_D):"
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: ../src/wireless-security/eap-method-ttls.c:337
#, fuzzy
msgid "MSCHAPv2 (no EAP)"
msgstr "MSCHAPv2"
@@ -4747,56 +4911,61 @@ msgstr "MSCHAPv2"
msgid "Unknown error validating 802.1X security"
msgstr "未知错误验证 802.1X 安全性"
-#: ../src/wireless-security/wireless-security.c:436
+#: ../src/wireless-security/wireless-security.c:437
msgid "TLS"
msgstr "TLS"
-#: ../src/wireless-security/wireless-security.c:460
+#: ../src/wireless-security/wireless-security.c:461
msgid "PWD"
msgstr "PWD"
-#: ../src/wireless-security/wireless-security.c:471
+#: ../src/wireless-security/wireless-security.c:472
msgid "FAST"
msgstr "FAST"
-#: ../src/wireless-security/wireless-security.c:482
+#: ../src/wireless-security/wireless-security.c:483
msgid "Tunneled TLS"
msgstr "隧道 TLS"
-#: ../src/wireless-security/wireless-security.c:493
+#: ../src/wireless-security/wireless-security.c:494
msgid "Protected EAP (PEAP)"
msgstr "受保护的 EAP (PEAP)"
+#: ../src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
#: ../src/wireless-security/ws-wep-key.ui.h:6
#: ../src/wireless-security/ws-wpa-eap.ui.h:1
-msgid "Au_thentication:"
+#, fuzzy
+msgid "Au_thentication"
msgstr "认证(_T):"
-#: ../src/wireless-security/ws-leap.c:63
+#: ../src/wireless-security/ws-leap.c:64
msgid "missing leap-username"
msgstr "缺少 leap 用户名"
-#: ../src/wireless-security/ws-leap.c:74
+#: ../src/wireless-security/ws-leap.c:82
msgid "missing leap-password"
msgstr "缺少 leap 密码"
-#: ../src/wireless-security/ws-wep-key.c:107
+#: ../src/wireless-security/ws-wep-key.c:113
msgid "missing wep-key"
msgstr "缺少 wep-key"
-#: ../src/wireless-security/ws-wep-key.c:116
+#: ../src/wireless-security/ws-wep-key.c:120
#, c-format
msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
msgstr "无效的 wep-key:%zu 长度的密钥只能包含十六进制数字"
-#: ../src/wireless-security/ws-wep-key.c:124
+#: ../src/wireless-security/ws-wep-key.c:128
#, c-format
msgid ""
"invalid wep-key: key with a length of %zu must contain only ascii characters"
msgstr "无效的 wep-key:%zu 长度的密钥只能包含 ASCII 字符"
-#: ../src/wireless-security/ws-wep-key.c:130
+#: ../src/wireless-security/ws-wep-key.c:134
#, c-format
msgid ""
"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4805,11 +4974,11 @@ msgstr ""
"无效的 wep-key:错误的密钥长度%zu。密钥必须由长度 5/13 (ASCII) 或 10/26 (十六"
"进制)组成"
-#: ../src/wireless-security/ws-wep-key.c:137
+#: ../src/wireless-security/ws-wep-key.c:141
msgid "invalid wep-key: passphrase must be non-empty"
msgstr "无效的 wep-key:密码必须非空"
-#: ../src/wireless-security/ws-wep-key.c:139
+#: ../src/wireless-security/ws-wep-key.c:143
msgid "invalid wep-key: passphrase must be shorter than 64 characters"
msgstr "无效的 wep-key:密码必须少于64个字符"
@@ -4826,7 +4995,8 @@ msgid "1 (Default)"
msgstr "1 (默认)"
#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#, fuzzy
+msgid "_Key"
msgstr "密钥(_K):"
#: ../src/wireless-security/ws-wep-key.ui.h:5
@@ -4834,10 +5004,11 @@ msgid "Sho_w key"
msgstr "显示密钥(_W)"
#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#, fuzzy
+msgid "WEP inde_x"
msgstr "WEP 索引(_X):"
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: ../src/wireless-security/ws-wpa-psk.c:76
#, c-format
msgid ""
"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4845,10 +5016,42 @@ msgid ""
msgstr ""
"无效的 wpa-psk:无效的密钥长度 %zu。必须是 [8,63] 字节或 64 个十六进制数字"
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: ../src/wireless-security/ws-wpa-psk.c:83
msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
msgstr "无效的 wpa-psk:不能用 64 个字节作为十六进制解释密钥"
#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#, fuzzy
+msgid "_Type"
msgstr "类型(_T):"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "由于一个未知错误,更新连接 secret 时失败。"
+
+#~ msgid "Priority:"
+#~ msgstr "优先级:"
+
+#~ msgid "_Automatically connect to this network when it is available"
+#~ msgstr "可用时自动链接到这个网络(_A)"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "连接信息(_I)"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "无法导入 VPN 连接"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "无法读取 %s 或文件中不包含可识别的 VPN 连接信息\n"
+#~ "\n"
+#~ "错误:%s。"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "未知错误"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index de636c17..18858a16 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-12 11:18+0100\n"
+"POT-Creation-Date: 2019-02-20 18:18+0100\n"
"PO-Revision-Date: 2017-11-07 06:45+0000\n"
"Last-Translator: Copied by Zanata <copied-by-zanata zanata org>\n"
"Language-Team: Traditional Chinese <zh-l10n lists linux org tw>\n"
@@ -24,7 +24,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Zanata 4.3.2\n"
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
msgid "Network"
msgstr "網路"
@@ -33,9 +33,9 @@ msgid "Manage your network connections"
msgstr "管理您的網路連線"
#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "網路連線"
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "啟用網路連線"
#: ../nm-connection-editor.desktop.in.h:2
msgid "Manage and change your network connection settings"
@@ -188,30 +188,31 @@ msgstr "802.1X 驗證"
#: ../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/connection-helpers.c:308
-#: ../src/connection-editor/connection-helpers.c:771
+#: ../src/connection-editor/connection-helpers.c:296
+#: ../src/connection-editor/connection-helpers.c:759
#: ../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-bluetooth.c:307
+#: ../src/connection-editor/page-mobile.c:540
#: ../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/libnma/nma-vpn-password-dialog.ui.h:1
+#: ../src/libnma/nma-wifi-dialog.c:1104
#: ../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/libnma/nma-wifi-dialog.c:1072
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1110
#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
msgid "C_onnect"
msgstr "連線(_O)"
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#, fuzzy
+msgid "_Network name"
msgstr "網路名稱(_N):"
#: ../src/ap-menu-item.c:82
@@ -248,12 +249,12 @@ msgstr "斷線失敗"
msgid "Connection activation failed"
msgstr "連線生效失敗"
-#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
+#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
#, fuzzy
msgid "Don’t show this message again"
msgstr "不要再顯示這個訊息"
-#: ../src/applet.c:899
+#: ../src/applet.c:898
#, fuzzy, c-format
msgid ""
"\n"
@@ -263,7 +264,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗,因為網路連線中斷了。"
-#: ../src/applet.c:901
+#: ../src/applet.c:900
#, fuzzy, c-format
msgid ""
"\n"
@@ -273,7 +274,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗,因為網路連線被中斷了。"
-#: ../src/applet.c:903
+#: ../src/applet.c:902
#, fuzzy, c-format
msgid ""
"\n"
@@ -282,7 +283,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗,因為 VPN 服務意外的停止了。"
-#: ../src/applet.c:905
+#: ../src/applet.c:904
#, fuzzy, c-format
msgid ""
"\n"
@@ -292,7 +293,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗,因為 VPN 服務傳回無效的組態。"
-#: ../src/applet.c:907
+#: ../src/applet.c:906
#, fuzzy, c-format
msgid ""
"\n"
@@ -301,7 +302,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗,因為連線的嘗試已逾時。"
-#: ../src/applet.c:909
+#: ../src/applet.c:908
#, fuzzy, c-format
msgid ""
"\n"
@@ -310,7 +311,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗,因為 VPN 服務沒有及時啟動。"
-#: ../src/applet.c:911
+#: ../src/applet.c:910
#, fuzzy, c-format
msgid ""
"\n"
@@ -319,7 +320,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗,因為 VPN 服務啟動失敗。"
-#: ../src/applet.c:913
+#: ../src/applet.c:912
#, fuzzy, c-format
msgid ""
"\n"
@@ -328,7 +329,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗,因為沒有有效的 VPN 服務。"
-#: ../src/applet.c:915
+#: ../src/applet.c:914
#, fuzzy, c-format
msgid ""
"\n"
@@ -337,7 +338,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗,因為無效的 VPN 機密。"
-#: ../src/applet.c:920
+#: ../src/applet.c:919
#, fuzzy, c-format
msgid ""
"\n"
@@ -346,7 +347,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗。"
-#: ../src/applet.c:947
+#: ../src/applet.c:946
#, c-format
msgid ""
"VPN connection has been successfully established.\n"
@@ -356,19 +357,19 @@ msgstr ""
"VPN 連線已成功的。\n"
"%s\n"
-#: ../src/applet.c:949
+#: ../src/applet.c:948
msgid "VPN connection has been successfully established.\n"
msgstr "VPN 連線已成功的。\n"
-#: ../src/applet.c:951
+#: ../src/applet.c:950
msgid "VPN Login Message"
msgstr "VPN 登錄訊息"
-#: ../src/applet.c:959 ../src/applet.c:999
+#: ../src/applet.c:958 ../src/applet.c:998
msgid "VPN Connection Failed"
msgstr "VPN 連線失敗"
-#: ../src/applet.c:1003
+#: ../src/applet.c:1002
#, fuzzy, c-format
msgid ""
"\n"
@@ -381,7 +382,7 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1006
+#: ../src/applet.c:1005
#, fuzzy, c-format
msgid ""
"\n"
@@ -394,148 +395,148 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1295
+#: ../src/applet.c:1296
msgid "device not ready (firmware missing)"
msgstr "裝置尚未就緒 (缺少韌體)"
-#: ../src/applet.c:1297
+#: ../src/applet.c:1298
msgid "device not ready"
msgstr "裝置尚未就緒"
#. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
msgid "disconnected"
msgstr "已斷線"
-#: ../src/applet.c:1323
+#: ../src/applet.c:1324
msgid "Disconnect"
msgstr "斷線"
-#: ../src/applet.c:1337
+#: ../src/applet.c:1338
msgid "device not managed"
msgstr "裝置無法管理"
-#: ../src/applet.c:1410
+#: ../src/applet.c:1411
msgid "No network devices available"
msgstr "沒有可用的網路裝置"
-#: ../src/applet.c:1464
+#: ../src/applet.c:1465
msgid "_VPN Connections"
msgstr "_VPN 連線"
-#: ../src/applet.c:1508
+#: ../src/applet.c:1509
#, fuzzy
msgid "_Configure VPN…"
msgstr "設置 VPN(_C)…"
-#: ../src/applet.c:1511
+#: ../src/applet.c:1512
#, fuzzy
msgid "_Add a VPN connection…"
msgstr "_VPN 連線"
-#: ../src/applet.c:1617
+#: ../src/applet.c:1618
#, fuzzy
msgid "NetworkManager is not running…"
msgstr "NetworkManager 沒有執行…."
-#: ../src/applet.c:1622 ../src/applet.c:2687
+#: ../src/applet.c:1623 ../src/applet.c:2688
msgid "Networking disabled"
msgstr "網路已停用"
#. 'Enable Networking' item
-#: ../src/applet.c:1832
+#: ../src/applet.c:1833
msgid "Enable _Networking"
msgstr "啟用網路(_N)"
#. 'Enable Wi-Fi' item
-#: ../src/applet.c:1841
+#: ../src/applet.c:1842
msgid "Enable _Wi-Fi"
msgstr "啟用 _Wi-Fi"
#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1850
+#: ../src/applet.c:1851
msgid "Enable _Mobile Broadband"
msgstr "啟用行動寬頻(_M)"
#. Toggle notifications item
-#: ../src/applet.c:1862
+#: ../src/applet.c:1863
msgid "Enable N_otifications"
msgstr "啟用通知功能(_O)"
#. 'Connection Information' item
-#: ../src/applet.c:1874
+#: ../src/applet.c:1875
msgid "Connection _Information"
msgstr "連線資訊(_I)"
#. 'Edit Connections...' item
-#: ../src/applet.c:1882
+#: ../src/applet.c:1883
#, fuzzy
msgid "Edit Connections…"
msgstr "編輯連線…"
-#: ../src/applet.c:1896
+#: ../src/applet.c:1897
msgid "_About"
msgstr "關於(_A)"
-#: ../src/applet.c:2207
+#: ../src/applet.c:2208
#, fuzzy, c-format
msgid "You are now connected to “%s”."
msgstr "您現在已連線至「%s」。"
-#: ../src/applet.c:2247
+#: ../src/applet.c:2248
msgid "Disconnected"
msgstr "已斷線"
-#: ../src/applet.c:2248
+#: ../src/applet.c:2249
msgid "The network connection has been disconnected."
msgstr "網路連線已中斷。"
-#: ../src/applet.c:2550
+#: ../src/applet.c:2551
#, fuzzy, c-format
msgid "Preparing network connection “%s”…"
msgstr "正在準備網路連線「%s」…"
-#: ../src/applet.c:2553
+#: ../src/applet.c:2554
#, fuzzy, c-format
msgid "User authentication required for network connection “%s”…"
msgstr "網路連線「%s」需要使用者驗證…"
-#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2557 ../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:2559
+#: ../src/applet.c:2560
#, fuzzy, c-format
msgid "Network connection “%s” active"
msgstr "網路連線「%s」在使用中"
-#: ../src/applet.c:2632
+#: ../src/applet.c:2633
#, fuzzy, c-format
msgid "Starting VPN connection “%s”…"
msgstr "正在啟動 VPN 連線「%s」…"
-#: ../src/applet.c:2635
+#: ../src/applet.c:2636
#, fuzzy, c-format
msgid "User authentication required for VPN connection “%s”…"
msgstr "VPN 連線「%s」需要使用者驗證…"
-#: ../src/applet.c:2638
+#: ../src/applet.c:2639
#, fuzzy, c-format
msgid "Requesting a VPN address for “%s”…"
msgstr "正在要求 VPN 提供「%s」的網路位址…"
-#: ../src/applet.c:2641
+#: ../src/applet.c:2642
#, fuzzy, c-format
msgid "VPN connection active"
msgstr "VPN 連線「%s」在使用中"
-#: ../src/applet.c:2691
+#: ../src/applet.c:2692
msgid "No network connection"
msgstr "沒有網路連接"
-#: ../src/applet.c:3292
+#: ../src/applet.c:3299
msgid "NetworkManager Applet"
msgstr "NetworkManager 面板程式"
@@ -553,47 +554,47 @@ msgstr "PIN 碼錯誤,請聯絡您的供應商。"
msgid "Sending unlock code…"
msgstr "發送解鎖用的密碼…"
-#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
+#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
#, c-format
msgid "Mobile Broadband (%s)"
msgstr "行動寬頻 (%s)"
-#: ../src/applet-device-broadband.c:739
+#: ../src/applet-device-broadband.c:741
#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:308
+#: ../src/connection-editor/page-mobile.c:305
#: ../src/libnm-gtk/nm-ui-utils.c:329
msgid "Mobile Broadband"
msgstr "行動寬頻"
-#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-broadband.c:794 ../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:805
+#: ../src/applet-device-broadband.c:807
#, fuzzy
msgid "New Mobile Broadband connection…"
msgstr "新的行動寬頻連線"
-#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-broadband.c:821 ../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:820
+#: ../src/applet-device-broadband.c:822
msgid "You are now connected to the Mobile Broadband network."
msgstr "您現在已連線至行動寬頻網路。"
-#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
+#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
msgid "Mobile Broadband network."
msgstr "行動寬頻網路。"
-#: ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:963
msgid "You are now registered on the home network."
msgstr "您現在已註冊至家用網路。"
-#: ../src/applet-device-broadband.c:967
+#: ../src/applet-device-broadband.c:969
msgid "You are now registered on a roaming network."
msgstr "您現在已註冊至漫遊網路。"
@@ -681,9 +682,9 @@ msgstr "DSL 驗證"
#: ../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/connection-editor/page-bluetooth.c:309
+#: ../src/connection-editor/page-mobile.c:542
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
msgid "_OK"
msgstr ""
@@ -788,9 +789,9 @@ msgstr "無法使用連線"
msgid "Error displaying connection information:"
msgstr "顯示連線資訊發生錯誤:"
-#: ../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
+#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
+#: ../src/libnma/nma-wifi-dialog.c:972 ../src/libnm-gtk/nm-wifi-dialog.c:948
+#: ../src/wireless-security/wireless-security.c:449
msgid "LEAP"
msgstr "LEAP"
@@ -814,7 +815,7 @@ msgid "WEP"
msgstr "WEP"
#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:332
+#: ../src/connection-editor/page-wifi-security.c:329
msgctxt "Wi-Fi/Ethernet security"
msgid "None"
msgstr "沒有"
@@ -1077,7 +1078,7 @@ 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
+#: ../src/connection-editor/ce-page.h:112
#, fuzzy
msgid ""
"IP addresses identify your computer on the network. Click the “Add” button "
@@ -1102,7 +1103,7 @@ msgstr ""
#: ../src/connection-editor/ce-page-ip4.ui.h:8
#: ../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/connection-helpers.c:760
#: ../src/connection-editor/nm-connection-list.ui.h:4
msgid "_Delete"
msgstr "刪除(_D)"
@@ -1185,12 +1186,14 @@ msgid "ARP"
msgstr "ARP"
#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#, fuzzy
+msgid "Bonded _connections"
msgstr "繫結的連線(_C):"
#: ../src/connection-editor/ce-page-bond.ui.h:11
#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#, fuzzy
+msgid "M_ode"
msgstr "模式(_O):"
#: ../src/connection-editor/ce-page-bond.ui.h:13
@@ -1201,7 +1204,8 @@ msgid "_Edit"
msgstr "編輯(_E)"
#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#, fuzzy
+msgid "Monitoring _frequency"
msgstr "監控頻率(_F):"
#: ../src/connection-editor/ce-page-bond.ui.h:16
@@ -1211,15 +1215,18 @@ msgstr "毫秒"
#: ../src/connection-editor/ce-page-bond.ui.h:17
#: ../src/connection-editor/ce-page-bridge.ui.h:6
#: ../src/connection-editor/ce-page-team.ui.h:16
-msgid "_Interface name:"
+#, fuzzy
+msgid "_Interface name"
msgstr "介面名稱(_I):"
#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#, fuzzy
+msgid "_Link Monitoring"
msgstr "連線監控(_L):"
#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#, fuzzy
+msgid "ARP _targets"
msgstr "ARP 目標(_T):"
#: ../src/connection-editor/ce-page-bond.ui.h:20
@@ -1230,15 +1237,18 @@ msgstr ""
"一個 IP 位址,或以逗號分隔的 IP 位址清單,這是在檢查連線狀態時查詢用的。"
#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#, fuzzy
+msgid "Link _up delay"
msgstr "連線延遲(_U):"
#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#, fuzzy
+msgid "Link _down delay"
msgstr "斷線延遲(_D):"
#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#, fuzzy
+msgid "_Primary"
msgstr "主要(_P):"
#: ../src/connection-editor/ce-page-bond.ui.h:24
@@ -1253,7 +1263,8 @@ msgstr "主要介面的介面名稱。如果設定,這個裝置在可用時會
#: ../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
-msgid "_MTU:"
+#, fuzzy
+msgid "_MTU"
msgstr "_MTU:"
#: ../src/connection-editor/ce-page-bond.ui.h:26
@@ -1266,28 +1277,34 @@ msgid "bytes"
msgstr "位元組"
#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#, fuzzy
+msgid "Path _cost"
msgstr "路徑成本(_C):"
#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#, fuzzy
+msgid "_Priority"
msgstr "優先順序(_P):"
#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#, fuzzy
+msgid "_Hairpin mode"
msgstr "_Hairpin 模式:"
#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#, fuzzy
+msgid "Bridged _connections"
msgstr "橋接的連線(_C):"
#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#, fuzzy
+msgid "_Forward delay"
msgstr "轉送延遲(_F):"
#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#, fuzzy
+msgid "_Hello time"
msgstr "_Hello 時間:"
#: ../src/connection-editor/ce-page-bridge.ui.h:9
@@ -1330,7 +1347,8 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-bridge.ui.h:17
-msgid "_Max age:"
+#, fuzzy
+msgid "_Max age"
msgstr "最大時間(_M):"
#: ../src/connection-editor/ce-page-bridge.ui.h:18
@@ -1338,7 +1356,8 @@ msgid "STP maximum message age, in seconds"
msgstr ""
#: ../src/connection-editor/ce-page-bridge.ui.h:19
-msgid "_Aging time:"
+#, fuzzy
+msgid "_Aging time"
msgstr "存續時間(_A):"
#: ../src/connection-editor/ce-page-bridge.ui.h:20
@@ -1346,7 +1365,7 @@ msgid "The Ethernet MAC address aging time, in seconds"
msgstr ""
#: ../src/connection-editor/ce-page-bridge.ui.h:21
-msgid "Group _forward mask:"
+msgid "Group _forward mask"
msgstr ""
#: ../src/connection-editor/ce-page-bridge.ui.h:22
@@ -1456,10 +1475,6 @@ msgstr "任何裝置"
msgid "invalid %s (%s) "
msgstr ""
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "由於不明的錯誤使連線機密的更新失敗。"
-
#: ../src/connection-editor/ce-page-dcb.ui.h:1
#, fuzzy
msgid "_Use Data Center Bridging (DCB) for this connection"
@@ -1527,66 +1542,75 @@ msgid "Enable or disable priority pause transmission for each User Priority."
msgstr "依每個使用者優先順序啟用或停用優先順序暫停傳輸。"
#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "優先順序:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#, fuzzy
+msgid "0"
msgstr "0:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#, fuzzy
+msgid "1"
msgstr "1:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#, fuzzy
+msgid "2"
msgstr "2:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#, fuzzy
+msgid "3"
msgstr "3:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#, fuzzy
+msgid "4"
msgstr "4:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#, fuzzy
+msgid "5"
msgstr "5:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#, fuzzy
+msgid "6"
msgstr "6:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#, fuzzy
+msgid "7"
msgstr "7:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#, fuzzy
+msgid "Traffic Class"
msgstr "流量類別:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#, fuzzy
+msgid "Strict Bandwidth"
msgstr "限制頻寬:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#, fuzzy
+msgid "Priority Bandwidth"
msgstr "優先順序頻寬:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "Group Bandwidth"
msgstr "群組頻寬:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "Group ID"
msgstr "群組 ID:"
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
msgid "Enter the priority group ID for each User Priority."
msgstr "依每個使用者優先順序輸入優先順序群組 ID。"
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
#, fuzzy, no-c-format
msgid ""
"Enter the allowed link bandwidth percent each Priority Group may use. The "
@@ -1594,16 +1618,16 @@ msgid ""
msgstr ""
"輸入每個優先順序群組可以使用的連線頻寬。所有群組的總合加起來必須為 100%。"
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
msgid ""
"Enter the percentage of priority group bandwidth each user priority may use."
msgstr "輸入每個使用者優先順序可以使用的優先順序群組頻寬百分比。"
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
msgid "Enable or disable strict bandwidth for each user priority."
msgstr "依每個使用者優先順序啟用或停用限制頻寬。"
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
msgid "Enter the traffic class for each user priority."
msgstr "輸入每個使用者優先順序的流量類別。"
@@ -1612,7 +1636,8 @@ msgstr "輸入每個使用者優先順序的流量類別。"
#: ../src/wireless-security/eap-method-leap.ui.h:1
#: ../src/wireless-security/eap-method-simple.ui.h:1
#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#, fuzzy
+msgid "_Username"
msgstr "使用者名稱(_U):"
#: ../src/connection-editor/ce-page-dsl.ui.h:2
@@ -1626,10 +1651,12 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-dsl.ui.h:4
-msgid "_Service:"
+#, fuzzy
+msgid "_Service"
msgstr "服務(_S):"
#: ../src/connection-editor/ce-page-dsl.ui.h:5
+#: ../src/libnma/nma-file-cert-chooser.c:347
#: ../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
@@ -1643,22 +1670,23 @@ 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
#: ../src/wireless-security/eap-method-leap.ui.h:2
#: ../src/wireless-security/eap-method-simple.ui.h:2
#: ../src/wireless-security/ws-leap.ui.h:2
#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#, fuzzy
+msgid "_Password"
msgstr "密碼(_P):"
#: ../src/connection-editor/ce-page-dsl.ui.h:8
-msgid "PPP _interface:"
-msgstr ""
+#, fuzzy
+msgid "PPP _interface"
+msgstr "父介面(_P):"
#: ../src/connection-editor/ce-page-dsl.ui.h:9
-msgid "P_arent interface:"
-msgstr ""
+#, fuzzy
+msgid "P_arent interface"
+msgstr "父介面(_P):"
#: ../src/connection-editor/ce-page-dsl.ui.h:10
msgid "An arbitrary name to assign to the newly created PPP interface."
@@ -1668,13 +1696,27 @@ msgstr ""
msgid "The interface on which the PPP connection will be established."
msgstr ""
+#: ../src/connection-editor/ce-page-dsl.ui.h:12
+#, fuzzy
+msgid "C_laim interface"
+msgstr "父介面(_P):"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:13
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
#: ../src/connection-editor/ce-page-ethernet.ui.h:1
+#: ../src/connection-editor/ce-page-general.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:142
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:143
#: ../src/wireless-security/eap-method-peap.ui.h:1
msgid "Automatic"
msgstr "自動"
@@ -1720,37 +1762,40 @@ msgid "Full"
msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:155
+#: ../src/connection-editor/page-ip6.c:156
msgid "Ignore"
msgstr "忽略"
#: ../src/connection-editor/ce-page-ethernet.ui.h:13
#: ../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:191
+#: ../src/connection-editor/page-ip4.c:169
+#: ../src/connection-editor/page-ip6.c:192
msgid "Manual"
msgstr "手動"
#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#, fuzzy
+msgid "_Port"
msgstr "連接埠(_P):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:15
#: ../src/connection-editor/ce-page-infiniband.ui.h:6
#: ../src/connection-editor/ce-page-wifi.ui.h:9
#, fuzzy
-msgid "_Device:"
+msgid "_Device"
msgstr "服務(_S):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:16
#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+#, fuzzy
+msgid "C_loned MAC address"
msgstr "複製的 MAC 位址(_L):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "私密金鑰密碼(_P):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:20
#, fuzzy
@@ -1789,7 +1834,7 @@ msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:28
#, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
msgstr "私密金鑰密碼(_P):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:29
@@ -1798,7 +1843,7 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+msgid "Lin_k negotiation"
msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:31
@@ -1809,7 +1854,8 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:32
-msgid "_Speed:"
+#, fuzzy
+msgid "_Speed"
msgstr "速度(_S):"
#: ../src/connection-editor/ce-page-ethernet.ui.h:33
@@ -1821,7 +1867,7 @@ msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:34
#, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
msgstr "全雙工(_X)"
#: ../src/connection-editor/ce-page-ethernet.ui.h:35
@@ -1831,42 +1877,62 @@ msgid ""
"sure your device supports it."
msgstr ""
-#: ../src/connection-editor/ce-page-general.ui.h:1
-msgid "Automatically connect to _VPN when using this connection"
-msgstr "當使用這個連線時自動連線至 _VPN"
-
#: ../src/connection-editor/ce-page-general.ui.h:2
-msgid "All _users may connect to this network"
-msgstr "所有的使用者可以連線至這個網路"
+msgid "Yes"
+msgstr ""
#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "當這個網路可用時自動連線(_A)"
+#, fuzzy
+msgid "No"
+msgstr "沒有"
#: ../src/connection-editor/ce-page-general.ui.h:4
-#, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "連線資訊(_I)"
+msgid "All _users may connect to this network"
+msgstr "所有的使用者可以連線至這個網路"
#: ../src/connection-editor/ce-page-general.ui.h:5
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "當使用這個連線時自動連線至 _VPN"
+
+#: ../src/connection-editor/ce-page-general.ui.h:6
+#, fuzzy
+msgid "Firewall _zone"
+msgstr "防火牆地帶(_Z):"
+
+#: ../src/connection-editor/ce-page-general.ui.h:7
+#, fuzzy
+msgid "_Metered connection"
+msgstr "團隊連線(_T):"
+
+#: ../src/connection-editor/ce-page-general.ui.h:8
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:9
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "忽略自動獲得的路由(_N)"
+
+#: ../src/connection-editor/ce-page-general.ui.h:10
msgid ""
"Connection priority for automatic activation. Connections with higher "
"numbers are preferred when selecting profiles for automatic activation. "
"Default value is 0."
msgstr ""
-#: ../src/connection-editor/ce-page-general.ui.h:6
-msgid "Firewall _zone:"
-msgstr "防火牆地帶(_Z):"
-
-#: ../src/connection-editor/ce-page.h:111
+#: ../src/connection-editor/ce-page.h:109
#, fuzzy
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."
msgstr "用來在網路上區別您的電腦的 IP 位址。請按下「新增」按鈕,加入 IP 位址。"
-#: ../src/connection-editor/ce-page.h:116
+#: ../src/connection-editor/ce-page.h:114
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 "
@@ -1874,16 +1940,16 @@ msgid ""
"automatically."
msgstr ""
-#: ../src/connection-editor/ce-page.h:121
+#: ../src/connection-editor/ce-page.h:119
#, fuzzy
msgid "Additional static addresses"
msgstr "自動,僅限位址"
-#: ../src/connection-editor/ce-page.h:122
+#: ../src/connection-editor/ce-page.h:120
msgid "Addresses"
msgstr "地址"
-#: ../src/connection-editor/ce-page.h:123
+#: ../src/connection-editor/ce-page.h:121
msgid "Address (optional)"
msgstr ""
@@ -1898,7 +1964,8 @@ msgid "Connected"
msgstr "成功連線"
#: ../src/connection-editor/ce-page-infiniband.ui.h:5
-msgid "_Transport mode:"
+#, fuzzy
+msgid "_Transport mode"
msgstr "傳輸模式(_T):"
#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
@@ -1939,38 +2006,41 @@ msgstr ""
#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
#: ../src/connection-editor/ce-page-macsec.ui.h:6
-msgid "Device name:"
-msgstr ""
+#, fuzzy
+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 ""
+#, fuzzy
+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:"
+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
-msgid "MTU:"
-msgstr ""
+#, fuzzy
+msgid "MTU"
+msgstr "_MTU:"
#: ../src/connection-editor/ce-page-ip4.ui.h:2
#: ../src/connection-editor/ce-page-ip6.ui.h:2
@@ -1984,14 +2054,15 @@ 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:211
+#: ../src/connection-editor/page-ip4.c:189
+#: ../src/connection-editor/page-ip6.c:212
msgid "Shared to other computers"
msgstr "分享給其他電腦"
#: ../src/connection-editor/ce-page-ip4.ui.h:6
#: ../src/connection-editor/ce-page-ip6.ui.h:11
-msgid "_Method:"
+#, fuzzy
+msgid "_Method"
msgstr "方法(_M):"
#: ../src/connection-editor/ce-page-ip4.ui.h:9
@@ -2012,21 +2083,24 @@ msgid ""
msgstr "用來解析主機名稱的網域。請使用逗號隔開不同的網域。"
#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#, fuzzy
+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:15
-#: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:346
-msgid "S_earch domains:"
+#: ../src/connection-editor/page-ip4.c:373
+#: ../src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
msgstr "搜尋網域(_E):"
#: ../src/connection-editor/ce-page-ip4.ui.h:13
#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:337
-msgid "DNS ser_vers:"
+#: ../src/connection-editor/page-ip4.c:364
+#: ../src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
msgstr "_DNS 伺服器:"
#: ../src/connection-editor/ce-page-ip4.ui.h:14
@@ -2056,7 +2130,7 @@ 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
+#: ../src/connection-editor/page-ip4.c:199
msgid "Disabled"
msgstr "已停用"
@@ -2086,11 +2160,12 @@ msgstr ""
"位址。Link-local 位址會自動設定到連線中的介面。"
#: ../src/connection-editor/ce-page-ip6.ui.h:18
-msgid "IPv6 _privacy extensions:"
+#, fuzzy
+msgid "IPv6 _privacy extensions"
msgstr "I_Pv6 隱私擴充功能:"
#: ../src/connection-editor/ce-page-ip6.ui.h:19
-msgid "IPv6 address _generation mode:"
+msgid "IPv6 address _generation mode"
msgstr ""
#: ../src/connection-editor/ce-page-ip6.ui.h:20
@@ -2154,27 +2229,27 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:14
-msgid "CKN:"
+msgid "CKN"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:15
-msgid "CAK:"
+msgid "CAK"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:17
-msgid "Keys:"
+msgid "Keys"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:18
-msgid "Parameters:"
+msgid "Parameters"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:19
-msgid "Validation:"
+msgid "Validation"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:20
-msgid "SCI port:"
+msgid "SCI port"
msgstr ""
#: ../src/connection-editor/ce-page-macsec.ui.h:21
@@ -2199,7 +2274,8 @@ msgid "Basic"
msgstr "基本"
#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#, fuzzy
+msgid "Nu_mber"
msgstr "數字(_M):"
#: ../src/connection-editor/ce-page-mobile.ui.h:5
@@ -2207,11 +2283,13 @@ msgid "Advanced"
msgstr "進階"
#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#, fuzzy
+msgid "_APN"
msgstr "_APN:"
#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#, fuzzy
+msgid "N_etwork ID"
msgstr "網路 ID(_E):"
#: ../src/connection-editor/ce-page-mobile.ui.h:8
@@ -2220,7 +2298,8 @@ msgid "Change…"
msgstr "變更…"
#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#, fuzzy
+msgid "P_IN"
msgstr "P_IN:"
#: ../src/connection-editor/ce-page-mobile.ui.h:10
@@ -2228,6 +2307,7 @@ msgid "Allow _roaming if home network is not available"
msgstr "如果家用網路無法使用,允許使用漫遊(_R)"
#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:454
msgid "Sho_w passwords"
msgstr "顯示密碼(_W)"
@@ -2236,7 +2316,8 @@ msgid "Authentication"
msgstr "驗證"
#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#, fuzzy
+msgid "Allowed methods"
msgstr "允許的方式:"
#: ../src/connection-editor/ce-page-ppp.ui.h:3
@@ -2294,11 +2375,11 @@ msgid "Use this proxy configuration for only browser clients/schemes."
msgstr ""
#: ../src/connection-editor/ce-page-proxy.ui.h:5
-msgid "PAC URL:"
+msgid "PAC URL"
msgstr ""
#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC script:"
+msgid "PAC script"
msgstr ""
#: ../src/connection-editor/ce-page-proxy.ui.h:7
@@ -2312,7 +2393,7 @@ msgstr "從檔案匯入團隊組態(_I)…"
#: ../src/connection-editor/ce-page-proxy.ui.h:9
#, fuzzy
-msgid "Method:"
+msgid "Method"
msgstr "方法(_M):"
#: ../src/connection-editor/ce-page-team-port.ui.h:1
@@ -2347,7 +2428,7 @@ msgid "Team Advanced Options"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+msgid "_Queue ID"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:8
@@ -2367,7 +2448,7 @@ msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:11
#, fuzzy
-msgid "_Port priority:"
+msgid "_Port priority"
msgstr "優先順序(_P):"
#: ../src/connection-editor/ce-page-team-port.ui.h:12
@@ -2386,10 +2467,7 @@ msgid "Port _sticky"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:15
-#: ../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."
+msgid "Do not unselect the port if a better one becomes available."
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:16
@@ -2398,12 +2476,12 @@ msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:17
#, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
msgstr "優先順序(_P):"
#: ../src/connection-editor/ce-page-team-port.ui.h:18
#, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
msgstr "私密金鑰(_K):"
#: ../src/connection-editor/ce-page-team-port.ui.h:19
@@ -2434,46 +2512,47 @@ msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:24
#: ../src/connection-editor/ce-page-team.ui.h:70
-msgid "_Link watcher:"
+msgid "_Link watcher"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:25
#: ../src/connection-editor/ce-page-team.ui.h:71
#, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
msgstr "連線延遲(_U):"
#: ../src/connection-editor/ce-page-team-port.ui.h:26
#: ../src/connection-editor/ce-page-team.ui.h:72
#, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
msgstr "斷線延遲(_D):"
#: ../src/connection-editor/ce-page-team-port.ui.h:27
#: ../src/connection-editor/ce-page-team.ui.h:73
#, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
msgstr "父介面(_P):"
#: ../src/connection-editor/ce-page-team-port.ui.h:28
#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+msgid "Delay _before first send"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:29
#: ../src/connection-editor/ce-page-team.ui.h:75
-msgid "_Maximum missed replies:"
+msgid "_Maximum missed replies"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:30
#: ../src/connection-editor/ce-page-team.ui.h:76
-msgid "_Source host:"
-msgstr ""
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP 目標(_T):"
#: ../src/connection-editor/ce-page-team-port.ui.h:31
#: ../src/connection-editor/ce-page-team.ui.h:77
#, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
msgstr "ARP 目標(_T):"
#: ../src/connection-editor/ce-page-team-port.ui.h:32
@@ -2503,75 +2582,82 @@ msgid "Ignore invalid packets from _active ports"
msgstr ""
#: ../src/connection-editor/ce-page-team-port.ui.h:36
+#: ../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:37
#: ../src/connection-editor/ce-page-team.ui.h:83
msgid "Ignore invalid packets from i_nactive ports"
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
+#: ../src/connection-editor/ce-page-team-port.ui.h:38
#: ../src/connection-editor/ce-page-team.ui.h:84
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 ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
+#: ../src/connection-editor/ce-page-team-port.ui.h:39
#: ../src/connection-editor/ce-page-team.ui.h:85
msgid "S_end on inactive ports"
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
+#: ../src/connection-editor/ce-page-team-port.ui.h:40
#: ../src/connection-editor/ce-page-team.ui.h:86
msgid ""
"By default, ARP requests are sent on active ports only. This option allows "
"sending even on inactive ports."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
+#: ../src/connection-editor/ce-page-team-port.ui.h:41
#: ../src/connection-editor/ce-page-team.ui.h:87
msgid ""
"The delay between the link coming up and the runner being notified about it."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
+#: ../src/connection-editor/ce-page-team-port.ui.h:42
#: ../src/connection-editor/ce-page-team.ui.h:88
msgid ""
"The delay between the link going down and the runner being notified about it."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:42
+#: ../src/connection-editor/ce-page-team-port.ui.h:43
#: ../src/connection-editor/ce-page-team.ui.h:89
msgid "The interval between requests being sent."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:43
+#: ../src/connection-editor/ce-page-team-port.ui.h:44
#: ../src/connection-editor/ce-page-team.ui.h:90
msgid ""
"The delay between link watch initialization and the first request being sent."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
+#: ../src/connection-editor/ce-page-team-port.ui.h:45
#: ../src/connection-editor/ce-page-team.ui.h:91
msgid "The link watcher to be used."
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
+#: ../src/connection-editor/ce-page-team-port.ui.h:46
#: ../src/connection-editor/ce-page-team.ui.h:92
msgid "Link Watcher"
msgstr ""
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
+#: ../src/connection-editor/ce-page-team-port.ui.h:47
#: ../src/connection-editor/ce-page-team.ui.h:93
#, fuzzy
msgid "Im_port team configuration from a file…"
msgstr "從檔案匯入團隊組態(_I)…"
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
+#: ../src/connection-editor/ce-page-team-port.ui.h:48
#: ../src/connection-editor/ce-page-team.ui.h:94
#, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
msgstr "_JSON 設定:"
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
+#: ../src/connection-editor/ce-page-team-port.ui.h:49
#: ../src/connection-editor/ce-page-team.ui.h:95
msgid "Raw Configuration"
msgstr ""
@@ -2612,7 +2698,8 @@ msgid "From active to team device"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#, fuzzy
+msgid "_Teamed connections"
msgstr "團隊連線(_T):"
#: ../src/connection-editor/ce-page-team.ui.h:23
@@ -2625,14 +2712,14 @@ msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:27
#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:351
+#: ../src/connection-editor/page-ethernet.c:348
#: ../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:120
-#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
#: ../src/libnm-gtk/nm-ui-utils.c:583
msgid "VLAN"
msgstr "VLAN"
@@ -2664,24 +2751,24 @@ msgid "Any L4 protocol"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+msgid "_Peer notification count"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+msgid "Peer _notification interval"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+msgid "_Multicast rejoin count"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+msgid "Multicast _rejoin interval"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:46
#, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
msgstr "硬體位址:"
#: ../src/connection-editor/ce-page-team.ui.h:47
@@ -2691,12 +2778,12 @@ msgid ""
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:49
-msgid "_Runner:"
+msgid "_Runner"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:50
#, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
msgstr "硬體位址:"
#: ../src/connection-editor/ce-page-team.ui.h:51
@@ -2732,15 +2819,15 @@ msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:57
#, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
msgstr "優先順序(_P):"
#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+msgid "_Minimum ports"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+msgid "_Aggregator selection policy"
msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:60
@@ -2777,12 +2864,12 @@ msgstr ""
#: ../src/connection-editor/ce-page-team.ui.h:67
#, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
msgstr "傳輸耗能(_W):"
#: ../src/connection-editor/ce-page-team.ui.h:68
#, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
msgstr "傳輸耗能(_W):"
#: ../src/connection-editor/ce-page-team.ui.h:69
@@ -2790,25 +2877,27 @@ msgid "Runner"
msgstr ""
#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#, fuzzy
+msgid "_Parent interface"
msgstr "父介面(_P):"
#: ../src/connection-editor/ce-page-vlan.ui.h:2
#, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
msgstr "VLAN 介面名稱(_N):"
#: ../src/connection-editor/ce-page-vlan.ui.h:3
#, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
msgstr "複製的 MA_C 位址:"
#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#, fuzzy
+msgid "VLAN _id"
msgstr "VLAN _id:"
#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+msgid "Flags"
msgstr ""
#: ../src/connection-editor/ce-page-vlan.ui.h:8
@@ -2838,7 +2927,8 @@ msgid "\"vlan\" + number"
msgstr "\"vlan\" + 編號"
#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#, fuzzy
+msgid "S_ecurity"
msgstr "安全性(_E):"
#: ../src/connection-editor/ce-page-wifi.ui.h:2
@@ -2866,7 +2956,8 @@ msgid "mW"
msgstr "mW"
#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#, fuzzy
+msgid "Transmission po_wer"
msgstr "傳輸耗能(_W):"
#: ../src/connection-editor/ce-page-wifi.ui.h:13
@@ -2874,23 +2965,28 @@ msgid "Mb/s"
msgstr "Mb/s"
#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#, fuzzy
+msgid "_Rate"
msgstr "速率(_R):"
#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#, fuzzy
+msgid "_BSSID"
msgstr "_BSSID:"
#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#, fuzzy
+msgid "C_hannel"
msgstr "頻道(_H):"
#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#, fuzzy
+msgid "Ban_d"
msgstr "波段(_D):"
#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#, fuzzy
+msgid "SS_ID"
msgstr "SS_ID:"
#: ../src/connection-editor/ce-polkit.c:63
@@ -2952,155 +3048,145 @@ msgstr ""
"嘗試停用某些方法的支援。"
#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
msgid "Wi-Fi"
msgstr "Wi-Fi"
#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/connection-editor/page-bluetooth.c:120
#: ../src/libnm-gtk/nm-ui-utils.c:325
msgid "Bluetooth"
msgstr "藍牙"
#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:201
+#: ../src/connection-editor/page-dsl.c:217
msgid "DSL/PPPoE"
msgstr ""
#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:148
+#: ../src/connection-editor/page-infiniband.c:145
#: ../src/libnm-gtk/nm-ui-utils.c:331
msgid "InfiniBand"
msgstr "InfiniBand"
#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../src/connection-editor/page-bond.c:443 ../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:118
-#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/page-team.c:1028 ../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:119
-#: ../src/connection-editor/page-bridge.c:233
+#: ../src/connection-editor/page-bridge.c:230
#: ../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:121
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: ../src/connection-editor/page-ip-tunnel.c:173
msgid "IP tunnel"
msgstr ""
#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:190
+#: ../src/connection-editor/page-macsec.c:187
msgid "MACsec"
msgstr ""
#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:398
-#: ../src/connection-editor/page-vpn.c:96
+#: ../src/connection-editor/connection-helpers.c:386
+#: ../src/connection-editor/page-vpn.c:100
msgid "VPN"
msgstr "VPN"
-#: ../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."
+#: ../src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
msgstr ""
-"VPN 外掛程式無法正確的匯入 VPN 連線\n"
-"\n"
-"錯誤:沒有 VPN 服務類型。"
-#: ../src/connection-editor/connection-helpers.c:219
-msgid "Cannot import VPN connection"
-msgstr "無法匯入 VPN 網路連線"
-
-#: ../src/connection-editor/connection-helpers.c:221
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: ../src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
msgstr ""
-"檔案「%s」無法讀取或未包含可辨識的 VPN 連線資訊\n"
+"VPN 外掛程式無法正確的匯入 VPN 連線\n"
"\n"
-"錯誤:%s。"
-
-#: ../src/connection-editor/connection-helpers.c:222
-#, fuzzy
-msgid "unknown error"
-msgstr "不明的錯誤"
+"錯誤:沒有 VPN 服務類型。"
-#: ../src/connection-editor/connection-helpers.c:305
+#: ../src/connection-editor/connection-helpers.c:293
#: ../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:309
+#: ../src/connection-editor/connection-helpers.c:297
#: ../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
+#: ../src/connection-editor/connection-helpers.c:328
msgid "Hardware"
msgstr "硬體"
-#: ../src/connection-editor/connection-helpers.c:367
+#: ../src/connection-editor/connection-helpers.c:355
msgid "Virtual"
msgstr "虛擬"
-#: ../src/connection-editor/connection-helpers.c:516
-#: ../src/connection-editor/connection-helpers.c:518
+#: ../src/connection-editor/connection-helpers.c:504
+#: ../src/connection-editor/connection-helpers.c:506
#, fuzzy
msgid "Import a saved VPN configuration…"
msgstr "匯入已儲存的 VPN 組態…"
-#: ../src/connection-editor/connection-helpers.c:548
+#: ../src/connection-editor/connection-helpers.c:536
msgid ""
"The connection editor dialog could not be initialized due to an unknown "
"error."
msgstr "由於不明的錯誤使連線編輯器對話盒無法初始化。"
-#: ../src/connection-editor/connection-helpers.c:557
+#: ../src/connection-editor/connection-helpers.c:545
msgid "Could not create new connection"
msgstr "無法建立新連線"
-#: ../src/connection-editor/connection-helpers.c:720
+#: ../src/connection-editor/connection-helpers.c:708
msgid "Connection delete failed"
msgstr "刪除連線失敗"
-#: ../src/connection-editor/connection-helpers.c:768
+#: ../src/connection-editor/connection-helpers.c:756
#, c-format
msgid "Are you sure you wish to delete the connection %s?"
msgstr "您確定要刪除連線 %s ?"
+#: ../src/connection-editor/gtk/menus.ui.h:1
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN 連線"
+
+#: ../src/connection-editor/gtk/menus.ui.h:2
+msgid "_Quit"
+msgstr ""
+
#: ../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:1118
+#: ../src/connection-editor/page-ip4.c:1133
+#: ../src/connection-editor/page-ip6.c:1115
msgid "Address"
msgstr "地址"
#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: ../src/connection-editor/page-ip4.c:1152
msgid "Netmask"
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:1156
+#: ../src/connection-editor/page-ip4.c:1171
+#: ../src/connection-editor/page-ip6.c:1153
msgid "Gateway"
msgstr "通訊閘"
@@ -3110,82 +3196,82 @@ msgid "Metric"
msgstr "度量 (Metric)"
#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1137
+#: ../src/connection-editor/page-ip6.c:1134
msgid "Prefix"
msgstr "前綴"
-#: ../src/connection-editor/nm-connection-editor.c:109
+#: ../src/connection-editor/nm-connection-editor.c:110
#, c-format
msgid "Editing %s"
msgstr "編輯 %s"
-#: ../src/connection-editor/nm-connection-editor.c:113
+#: ../src/connection-editor/nm-connection-editor.c:114
msgid "Editing un-named connection"
msgstr "編輯未命名的連線"
-#: ../src/connection-editor/nm-connection-editor.c:133
+#: ../src/connection-editor/nm-connection-editor.c:134
#, fuzzy
msgid "Missing connection name"
msgstr "連線名稱(_N):"
-#: ../src/connection-editor/nm-connection-editor.c:353
+#: ../src/connection-editor/nm-connection-editor.c:350
#, fuzzy
msgid "Editor initializing…"
msgstr "初始化編輯器時發生錯誤"
-#: ../src/connection-editor/nm-connection-editor.c:360
-#: ../src/connection-editor/nm-connection-list.c:443
+#: ../src/connection-editor/nm-connection-editor.c:357
+#: ../src/connection-editor/nm-connection-list.c:471
#, fuzzy
msgid "Connection cannot be modified"
msgstr "新增連線失敗"
-#: ../src/connection-editor/nm-connection-editor.c:375
+#: ../src/connection-editor/nm-connection-editor.c:372
#, c-format
msgid "Invalid setting %s: %s"
msgstr ""
-#: ../src/connection-editor/nm-connection-editor.c:451
+#: ../src/connection-editor/nm-connection-editor.c:448
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:578
+#: ../src/connection-editor/nm-connection-editor.c:581
#: ../src/connection-editor/vpn-helpers.c:213
msgid "_Save"
msgstr "儲存(_S)"
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: ../src/connection-editor/nm-connection-editor.c:582
msgid "Save any changes made to this connection."
msgstr "儲存任何對這個連線進行的變更。"
-#: ../src/connection-editor/nm-connection-editor.c:580
+#: ../src/connection-editor/nm-connection-editor.c:583
msgid "Authenticate to save this connection for all users of this machine."
msgstr "驗證以儲存這個連線給此電腦上的所有使用者。"
-#: ../src/connection-editor/nm-connection-editor.c:596
+#: ../src/connection-editor/nm-connection-editor.c:599
msgid "Could not create connection"
msgstr "無法建立連線"
-#: ../src/connection-editor/nm-connection-editor.c:596
+#: ../src/connection-editor/nm-connection-editor.c:599
msgid "Could not edit connection"
msgstr "無法編輯連線"
-#: ../src/connection-editor/nm-connection-editor.c:598
+#: ../src/connection-editor/nm-connection-editor.c:601
msgid "Unknown error creating connection editor dialog."
msgstr "建立連線編輯器對話盒時發生不明錯誤。"
-#: ../src/connection-editor/nm-connection-editor.c:739
+#: ../src/connection-editor/nm-connection-editor.c:742
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:759
+#: ../src/connection-editor/nm-connection-editor.c:762
msgid "Error initializing editor"
msgstr "初始化編輯器時發生錯誤"
-#: ../src/connection-editor/nm-connection-editor.c:1157
+#: ../src/connection-editor/nm-connection-editor.c:1169
msgid "Connection add failed"
msgstr "新增連線失敗"
@@ -3201,7 +3287,8 @@ msgid ""
msgstr "將這設為 True,以停用在 EAP 認證中關於 CA 證書的警告。"
#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
+#, fuzzy
+msgid "Connection _name"
msgstr "連線名稱(_N):"
#: ../src/connection-editor/nm-connection-editor.ui.h:4
@@ -3231,119 +3318,144 @@ msgstr ""
msgid "Filename"
msgstr ""
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:148
msgid "never"
msgstr "永不"
-#: ../src/connection-editor/nm-connection-list.c:162
-#: ../src/connection-editor/nm-connection-list.c:173
+#: ../src/connection-editor/nm-connection-list.c:159
+#: ../src/connection-editor/nm-connection-list.c:170
msgid "now"
msgstr "現在"
#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:180
+#: ../src/connection-editor/nm-connection-list.c:177
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%d 分鐘以前"
-#: ../src/connection-editor/nm-connection-list.c:184
+#: ../src/connection-editor/nm-connection-list.c:181
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%d 小時以前"
-#: ../src/connection-editor/nm-connection-list.c:196
+#: ../src/connection-editor/nm-connection-list.c:193
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "%d 天以前"
-#: ../src/connection-editor/nm-connection-list.c:202
+#: ../src/connection-editor/nm-connection-list.c:199
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
msgstr[0] "%d 個月以前"
-#: ../src/connection-editor/nm-connection-list.c:206
+#: ../src/connection-editor/nm-connection-list.c:203
#, c-format
msgid "%d year ago"
msgid_plural "%d years ago"
msgstr[0] "%d 年以前"
-#: ../src/connection-editor/nm-connection-list.c:445
+#: ../src/connection-editor/nm-connection-list.c:473
msgid "Connection cannot be deleted"
msgstr ""
-#: ../src/connection-editor/nm-connection-list.c:448
+#: ../src/connection-editor/nm-connection-list.c:476
msgid "Select a connection to edit"
msgstr ""
-#: ../src/connection-editor/nm-connection-list.c:450
+#: ../src/connection-editor/nm-connection-list.c:478
msgid "Select a connection to delete"
msgstr ""
-#: ../src/connection-editor/nm-connection-list.c:785
+#: ../src/connection-editor/nm-connection-list.c:794
#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
msgid "Name"
msgstr "名稱"
-#: ../src/connection-editor/nm-connection-list.c:798
+#: ../src/connection-editor/nm-connection-list.c:807
msgid "Last Used"
msgstr "最後使用的"
-#: ../src/connection-editor/nm-connection-list.c:836
+#: ../src/connection-editor/nm-connection-list.c:845
msgid "Edit the selected connection"
msgstr "編輯選取的連線"
-#: ../src/connection-editor/nm-connection-list.c:837
+#: ../src/connection-editor/nm-connection-list.c:846
msgid "Authenticate to edit the selected connection"
msgstr "驗證以編輯選取的連線"
-#: ../src/connection-editor/nm-connection-list.c:842
+#: ../src/connection-editor/nm-connection-list.c:851
msgid "Delete the selected connection"
msgstr "刪除選取的連線"
-#: ../src/connection-editor/nm-connection-list.c:843
+#: ../src/connection-editor/nm-connection-list.c:852
msgid "Authenticate to delete the selected connection"
msgstr "驗證以刪除選取的連線"
-#: ../src/connection-editor/nm-connection-list.c:1048
-#: ../src/connection-editor/nm-connection-list.c:1051
+#: ../src/connection-editor/nm-connection-list.c:1059
+#, fuzzy, c-format
+msgid "Unrecognized connection type"
+msgstr "不支援的行動寬頻連線類型。"
+
+#: ../src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "不知道如何建立「%s」連線"
+
+#: ../src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "編輯連線時發生錯誤"
+
+#: ../src/connection-editor/nm-connection-list.c:1075
+#: ../src/connection-editor/nm-connection-list.c:1090
+#: ../src/connection-editor/nm-connection-list.c:1093
msgid "Error creating connection"
msgstr "建立連線時發生錯誤"
-#: ../src/connection-editor/nm-connection-list.c:1049
+#: ../src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "新增連線失敗"
+
+#: ../src/connection-editor/nm-connection-list.c:1091
msgid "No VPN plugins are installed."
msgstr "尚未安裝任何 VPN 外掛程式。"
-#: ../src/connection-editor/nm-connection-list.c:1052
+#: ../src/connection-editor/nm-connection-list.c:1094
#, fuzzy, c-format
msgid "Don’t know how to create “%s” connections"
msgstr "不知道如何建立「%s」連線"
-#: ../src/connection-editor/nm-connection-list.c:1085
+#: ../src/connection-editor/nm-connection-list.c:1128
msgid "Error editing connection"
msgstr "編輯連線時發生錯誤"
-#: ../src/connection-editor/nm-connection-list.c:1086
+#: ../src/connection-editor/nm-connection-list.c:1129
#, fuzzy, c-format
msgid "Did not find a connection with UUID “%s”"
msgstr "找不到 UUID「%s」的連線"
+#: ../src/connection-editor/nm-connection-list.ui.h:1
+msgid "Network Connections"
+msgstr "網路連線"
+
#: ../src/connection-editor/nm-connection-list.ui.h:2
msgid "Add a new connection"
msgstr ""
-#: ../src/connection-editor/page-8021x-security.c:116
+#: ../src/connection-editor/page-8021x-security.c:113
msgid "802.1X Security"
msgstr "802.1X 防護"
-#: ../src/connection-editor/page-8021x-security.c:118
+#: ../src/connection-editor/page-8021x-security.c:115
msgid "Could not load 802.1X Security user interface."
msgstr "無法載入 802.1X 安全性使用者介面。"
-#: ../src/connection-editor/page-8021x-security.c:132
+#: ../src/connection-editor/page-8021x-security.c:129
msgid "Use 802.1_X security for this connection"
msgstr "在這個連線使用 802.1_X 防護"
@@ -3351,59 +3463,59 @@ msgstr "在這個連線使用 802.1_X 防護"
msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
msgstr ""
-#: ../src/connection-editor/page-bluetooth.c:125
+#: ../src/connection-editor/page-bluetooth.c:122
#, fuzzy
msgid "Could not load Bluetooth user interface."
msgstr "無法載入 DCB 使用者介面。"
-#: ../src/connection-editor/page-bluetooth.c:175
+#: ../src/connection-editor/page-bluetooth.c:170
#, fuzzy, c-format
msgid "invalid Bluetooth device (%s)"
msgstr "找不到藍牙裝置。"
-#: ../src/connection-editor/page-bluetooth.c:258
+#: ../src/connection-editor/page-bluetooth.c:253
#, fuzzy, c-format
msgid "Bluetooth connection %d"
msgstr "繫結的連線 %d"
-#: ../src/connection-editor/page-bluetooth.c:308
+#: ../src/connection-editor/page-bluetooth.c:304
#, fuzzy
msgid "Bluetooth Type"
msgstr "藍牙"
-#: ../src/connection-editor/page-bluetooth.c:326
+#: ../src/connection-editor/page-bluetooth.c:322
msgid "Select the type of the Bluetooth connection profile."
msgstr ""
-#: ../src/connection-editor/page-bluetooth.c:331
+#: ../src/connection-editor/page-bluetooth.c:327
#, fuzzy
msgid "_Personal Area Network"
msgstr "有線網路"
-#: ../src/connection-editor/page-bluetooth.c:336
+#: ../src/connection-editor/page-bluetooth.c:332
#, fuzzy
msgid "_Dial-Up Network"
msgstr "Wi-Fi 網路"
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:446
msgid "Could not load bond user interface."
msgstr "無法載入繫結的使用者介面。"
-#: ../src/connection-editor/page-bond.c:568
+#: ../src/connection-editor/page-bond.c:565
#, fuzzy
msgid "primary"
msgstr "主要(_P):"
-#: ../src/connection-editor/page-bond.c:623
+#: ../src/connection-editor/page-bond.c:620
#, c-format
msgid "Bond connection %d"
msgstr "繫結的連線 %d"
-#: ../src/connection-editor/page-bridge.c:236
+#: ../src/connection-editor/page-bridge.c:233
msgid "Could not load bridge user interface."
msgstr "無法載入橋接的使用者介面。"
-#: ../src/connection-editor/page-bridge.c:352
+#: ../src/connection-editor/page-bridge.c:349
#, c-format
msgid "Bridge connection %d"
msgstr "橋接的連線 %d"
@@ -3411,31 +3523,31 @@ msgstr "橋接的連線 %d"
#. Translators: a "Bridge Port" is a network
#. * device that is part of a bridge.
#.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: ../src/connection-editor/page-bridge-port.c:105
msgid "Bridge Port"
msgstr "橋接連接埠"
-#: ../src/connection-editor/page-bridge-port.c:110
+#: ../src/connection-editor/page-bridge-port.c:107
msgid "Could not load bridge port user interface."
msgstr "無法載入橋接連接埠使用者介面。"
-#: ../src/connection-editor/page-dcb.c:622
+#: ../src/connection-editor/page-dcb.c:624
msgid "DCB"
msgstr "DCB"
-#: ../src/connection-editor/page-dcb.c:624
+#: ../src/connection-editor/page-dcb.c:626
msgid "Could not load DCB user interface."
msgstr "無法載入 DCB 使用者介面。"
-#: ../src/connection-editor/page-dsl.c:203
+#: ../src/connection-editor/page-dsl.c:219
msgid "Could not load DSL user interface."
msgstr "無法載入 DSL 使用者介面。"
-#: ../src/connection-editor/page-dsl.c:298
+#: ../src/connection-editor/page-dsl.c:320
msgid "missing parent interface"
msgstr ""
-#: ../src/connection-editor/page-dsl.c:343
+#: ../src/connection-editor/page-dsl.c:365
#, c-format
msgid "DSL connection %d"
msgstr "DSL 連線 %d"
@@ -3455,39 +3567,39 @@ msgstr ""
msgid "ignored"
msgstr "已忽略"
-#: ../src/connection-editor/page-ethernet.c:353
+#: ../src/connection-editor/page-ethernet.c:350
msgid "Could not load ethernet user interface."
msgstr "無法載入有線網路使用者介面。"
-#: ../src/connection-editor/page-ethernet.c:515
+#: ../src/connection-editor/page-ethernet.c:512
#, fuzzy
msgid "Ethernet device"
msgstr "有線網路"
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: ../src/connection-editor/page-ethernet.c:516
+#: ../src/connection-editor/page-vlan.c:737
+#: ../src/connection-editor/page-wifi.c:571
#, fuzzy
msgid "cloned MAC"
msgstr "複製的 MAC 位址(_L):"
-#: ../src/connection-editor/page-ethernet.c:523
+#: ../src/connection-editor/page-ethernet.c:520
msgid "Wake-on-LAN password"
msgstr ""
-#: ../src/connection-editor/page-ethernet.c:563
+#: ../src/connection-editor/page-ethernet.c:560
#, c-format
msgid "Ethernet connection %d"
msgstr "線網路連線 %d"
#. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: ../src/connection-editor/page-general.c:55
+#: ../src/libnma/nma-mobile-providers.c:802
+#: ../src/libnm-gtk/nm-mobile-providers.c:801
msgid "Default"
msgstr "預設"
-#: ../src/connection-editor/page-general.c:55
+#: ../src/connection-editor/page-general.c:56
msgid ""
"The zone defines the trust level of the connection. Default is not a regular "
"zone, selecting it results in the use of the default zone set in the "
@@ -3511,75 +3623,77 @@ msgstr ""
"此選項會將此連線鎖定至在此所輸入的 MAC 位址所指定的網路裝置。例如:"
"00:11:22:33:44:55"
-#: ../src/connection-editor/page-infiniband.c:151
+#: ../src/connection-editor/page-infiniband.c:148
msgid "Could not load InfiniBand user interface."
msgstr "無法載入 InfiniBand 使用者介面。"
-#: ../src/connection-editor/page-infiniband.c:214
+#: ../src/connection-editor/page-infiniband.c:211
msgid "infiniband device"
msgstr ""
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:251
#, c-format
msgid "InfiniBand connection %d"
msgstr "InfiniBand 連線 %d"
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: ../src/connection-editor/page-ip-tunnel.c:175
#, fuzzy
msgid "Could not load IP tunnel user interface."
msgstr "無法載入 IPv4 使用者介面。"
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: ../src/connection-editor/page-ip-tunnel.c:289
#, fuzzy, c-format
msgid "IP tunnel connection %d"
msgstr "線網路連線 %d"
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:128
+#: ../src/connection-editor/page-ip6.c:137
msgid "Automatic (VPN)"
msgstr "自動 (VPN)"
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:138
msgid "Automatic (VPN) addresses only"
msgstr "只用自動 (VPN) 位址"
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:144
msgid "Automatic, addresses only"
msgstr "自動,僅限位址"
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:135
+#: ../src/connection-editor/page-ip6.c:140
msgid "Automatic (PPPoE)"
msgstr "自動 (PPPoE)"
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:136
+#: ../src/connection-editor/page-ip6.c:141
msgid "Automatic (PPPoE) addresses only"
msgstr "只用自動 (PPPoE) 位址"
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:138
msgid "Automatic (DHCP)"
msgstr "自動 (DHCP)"
-#: ../src/connection-editor/page-ip4.c:138
+#: ../src/connection-editor/page-ip4.c:139
msgid "Automatic (DHCP) addresses only"
msgstr "只用自動 (DHCP) 位址"
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:182
+#: ../src/connection-editor/page-ip6.c:205
msgid "Link-Local Only"
msgstr "只有本機連線"
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:335
-msgid "Additional DNS ser_vers:"
+#: ../src/connection-editor/page-ip4.c:362
+#: ../src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
msgstr "額外的 _DNS 伺服器:"
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:344
-msgid "Additional s_earch domains:"
+#: ../src/connection-editor/page-ip4.c:371
+#: ../src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
msgstr "額外的搜尋網域(_E):"
#: ../src/connection-editor/page-ip4.c:1033
@@ -3587,35 +3701,35 @@ msgstr "額外的搜尋網域(_E):"
msgid "Editing IPv4 routes for %s"
msgstr "編輯 %s 的 IPv4 路由"
-#: ../src/connection-editor/page-ip4.c:1226
+#: ../src/connection-editor/page-ip4.c:1223
msgid "IPv4 Settings"
msgstr "IPv4 設定"
-#: ../src/connection-editor/page-ip4.c:1228
+#: ../src/connection-editor/page-ip4.c:1225
msgid "Could not load IPv4 user interface."
msgstr "無法載入 IPv4 使用者介面。"
-#: ../src/connection-editor/page-ip4.c:1321
+#: ../src/connection-editor/page-ip4.c:1318
#, c-format
msgid "IPv4 address “%s” invalid"
msgstr ""
-#: ../src/connection-editor/page-ip4.c:1329
+#: ../src/connection-editor/page-ip4.c:1326
#, c-format
msgid "IPv4 address netmask “%s” invalid"
msgstr ""
-#: ../src/connection-editor/page-ip4.c:1338
+#: ../src/connection-editor/page-ip4.c:1335
#, c-format
msgid "IPv4 gateway “%s” invalid"
msgstr ""
-#: ../src/connection-editor/page-ip4.c:1381
+#: ../src/connection-editor/page-ip4.c:1378
#, c-format
msgid "IPv4 DNS server “%s” invalid"
msgstr ""
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:180
msgid "Automatic, DHCP only"
msgstr "自動,僅使用 DHCP"
@@ -3624,124 +3738,126 @@ msgstr "自動,僅使用 DHCP"
msgid "Editing IPv6 routes for %s"
msgstr "為 %s 編輯 IPv6 路由"
-#: ../src/connection-editor/page-ip6.c:1208
+#: ../src/connection-editor/page-ip6.c:1205
msgid "IPv6 Settings"
msgstr "IPv6 設定"
-#: ../src/connection-editor/page-ip6.c:1210
+#: ../src/connection-editor/page-ip6.c:1207
msgid "Could not load IPv6 user interface."
msgstr "無法載入 IPv6 使用者介面。"
-#: ../src/connection-editor/page-ip6.c:1302
+#: ../src/connection-editor/page-ip6.c:1299
#, c-format
msgid "IPv6 address “%s” invalid"
msgstr ""
-#: ../src/connection-editor/page-ip6.c:1310
+#: ../src/connection-editor/page-ip6.c:1307
#, c-format
msgid "IPv6 prefix “%s” invalid"
msgstr ""
-#: ../src/connection-editor/page-ip6.c:1319
+#: ../src/connection-editor/page-ip6.c:1316
#, c-format
msgid "IPv6 gateway “%s” invalid"
msgstr ""
-#: ../src/connection-editor/page-ip6.c:1361
+#: ../src/connection-editor/page-ip6.c:1358
#, c-format
msgid "IPv6 DNS server “%s” invalid"
msgstr ""
-#: ../src/connection-editor/page-macsec.c:192
+#: ../src/connection-editor/page-macsec.c:189
msgid "Could not load MACsec user interface."
msgstr ""
-#: ../src/connection-editor/page-macsec.c:331
+#: ../src/connection-editor/page-macsec.c:328
#, c-format
msgid "MACSEC connection %d"
msgstr ""
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: ../src/connection-editor/page-master.c:235
+#: ../src/connection-editor/page-master.c:246
msgid "Duplicate slaves"
msgstr "重製從屬"
-#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:236
#, fuzzy, c-format
msgid "Slaves “%s” and “%s” both apply to device “%s”"
msgstr "從屬「%s」與「%s」都套用到裝置「%s」"
-#: ../src/connection-editor/page-master.c:259
+#: ../src/connection-editor/page-master.c:247
#, fuzzy, c-format
msgid ""
"Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
"same physical device."
msgstr "從屬「%s」與「%s」套用到同個實體裝置不同的虛擬連接埠(「%s」與「%s」)。"
-#: ../src/connection-editor/page-master.c:385
+#: ../src/connection-editor/page-master.c:371
#, c-format
msgid "%s slave %d"
msgstr "%s slave %d"
-#: ../src/connection-editor/page-mobile.c:310
+#: ../src/connection-editor/page-mobile.c:307
msgid "Could not load mobile broadband user interface."
msgstr "無法載入行動寬頻使用者介面。"
-#: ../src/connection-editor/page-mobile.c:327
+#: ../src/connection-editor/page-mobile.c:324
msgid "Unsupported mobile broadband connection type."
msgstr "不支援的行動寬頻連線類型。"
#. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: ../src/connection-editor/page-mobile.c:537
msgid "Select Mobile Broadband Provider Type"
msgstr "選擇行動寬頻供應商類型"
-#: ../src/connection-editor/page-mobile.c:567
+#: ../src/connection-editor/page-mobile.c:564
#, fuzzy
msgid ""
"Select the technology your mobile broadband provider uses. If you are "
"unsure, ask your provider."
msgstr "請選擇您的無線寬頻供應商所使用的技術。如果您不確定,請洽詢供應商。"
-#: ../src/connection-editor/page-mobile.c:572
+#: ../src/connection-editor/page-mobile.c:569
msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
msgstr "我的供應商使用 _GSM 為主的技術(例如 GPRS、EDGE、UMTS、HSDPA)"
#. Translators: CDMA has 'D' accelerator key; 'C' collides with 'Cancel' button.
#. You may need to change it according to your language.
-#: ../src/connection-editor/page-mobile.c:579
+#: ../src/connection-editor/page-mobile.c:576
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/connection-editor/page-mobile.c:586
+#: ../src/libnma/nma-mobile-wizard.c:147 ../src/mb-menu-item.c:50
#: ../src/mobile-helpers.c:282
msgid "CDMA"
msgstr "CDMA"
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:589
+#: ../src/libnma/nma-mobile-wizard.c:144 ../src/mb-menu-item.c:54
#: ../src/mobile-helpers.c:280
msgid "GSM"
msgstr "GSM"
#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: ../src/wireless-security/eap-method-ttls.c:288
msgid "PAP"
msgstr "PAP"
#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: ../src/wireless-security/eap-method-ttls.c:354
msgid "CHAP"
msgstr "CHAP"
#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: ../src/wireless-security/eap-method-fast.c:284
+#: ../src/wireless-security/eap-method-peap.c:300
+#: ../src/wireless-security/eap-method-ttls.c:320
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: ../src/wireless-security/eap-method-ttls.c:304
msgid "MSCHAP"
msgstr "MSCHAP"
@@ -3755,19 +3871,19 @@ msgstr "沒有"
msgid "Editing PPP authentication methods for %s"
msgstr "編輯 %s 的 PPP 驗證方法"
-#: ../src/connection-editor/page-ppp.c:279
+#: ../src/connection-editor/page-ppp.c:278
msgid "PPP Settings"
msgstr "PPP 設定值"
-#: ../src/connection-editor/page-ppp.c:281
+#: ../src/connection-editor/page-ppp.c:280
msgid "Could not load PPP user interface."
msgstr "無法載入 PPP 使用者介面。"
-#: ../src/connection-editor/page-proxy.c:215
+#: ../src/connection-editor/page-proxy.c:212
msgid "Proxy"
msgstr ""
-#: ../src/connection-editor/page-proxy.c:217
+#: ../src/connection-editor/page-proxy.c:214
#, fuzzy
msgid "Could not load proxy user interface."
msgstr "無法載入繫結的使用者介面。"
@@ -3778,11 +3894,11 @@ msgstr "無法載入繫結的使用者介面。"
msgid "Error: file doesn’t contain a valid JSON configuration"
msgstr "錯誤:檔案不含有效的 JSON 組態"
-#: ../src/connection-editor/page-team.c:1034
+#: ../src/connection-editor/page-team.c:1031
msgid "Could not load team user interface."
msgstr "無法載入團隊使用者介面。"
-#: ../src/connection-editor/page-team.c:1131
+#: ../src/connection-editor/page-team.c:1128
#, c-format
msgid "Team connection %d"
msgstr "團隊連線 %d"
@@ -3790,69 +3906,69 @@ msgstr "團隊連線 %d"
#. Translators: a "Team Port" is a network
#. * device that is part of a team.
#.
-#: ../src/connection-editor/page-team-port.c:655
+#: ../src/connection-editor/page-team-port.c:652
msgid "Team Port"
msgstr "團隊連接埠"
-#: ../src/connection-editor/page-team-port.c:657
+#: ../src/connection-editor/page-team-port.c:654
msgid "Could not load team port user interface."
msgstr "無法載入團隊連接埠使用者介面。"
#. Translators: the first %s is a device name (eg, "em1"), the
#. * second is a connection name (eg, "Auto Ethernet").
#.
-#: ../src/connection-editor/page-vlan.c:415
+#: ../src/connection-editor/page-vlan.c:413
#, fuzzy, c-format
msgid "%s (via “%s”)"
msgstr "%s (經由「%s」)"
-#: ../src/connection-editor/page-vlan.c:427
+#: ../src/connection-editor/page-vlan.c:425
#, fuzzy, c-format
msgid "New connection…"
msgstr "沒有網路連接"
-#: ../src/connection-editor/page-vlan.c:596
+#: ../src/connection-editor/page-vlan.c:591
msgid "Could not load vlan user interface."
msgstr "無法載入 vlan 使用者介面。"
-#: ../src/connection-editor/page-vlan.c:735
+#: ../src/connection-editor/page-vlan.c:730
msgid "vlan parent"
msgstr ""
-#: ../src/connection-editor/page-vlan.c:803
+#: ../src/connection-editor/page-vlan.c:798
#, c-format
msgid "VLAN connection %d"
msgstr "VLAN 連線 %d"
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "無法載入 VPN 使用者介面。"
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "找不到「%s」的 VPN 外掛程式服務。"
-
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:64
#, fuzzy, c-format
msgid "Could not load editor VPN plugin for “%s” (%s)."
msgstr "找不到「%s」的 VPN 外掛程式服務。"
-#: ../src/connection-editor/page-vpn.c:123
+#: ../src/connection-editor/page-vpn.c:65
#, fuzzy
msgid "unknown failure"
msgstr "連線失敗"
-#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "無法載入 VPN 使用者介面。"
+
+#: ../src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "找不到「%s」的 VPN 外掛程式服務。"
+
+#: ../src/connection-editor/page-vpn.c:199
#, c-format
msgid "VPN connection %d"
msgstr "VPN 連線 %d"
-#: ../src/connection-editor/page-vpn.c:211
+#: ../src/connection-editor/page-vpn.c:205
msgid "Choose a VPN Connection Type"
msgstr "請選擇 VPN 的連線類型"
-#: ../src/connection-editor/page-vpn.c:212
+#: ../src/connection-editor/page-vpn.c:206
#, fuzzy
msgid ""
"Select the type of VPN you wish to use for the new connection. If the type "
@@ -3886,66 +4002,66 @@ msgstr ""
msgid "%u (%u MHz)"
msgstr "%u (%u MHz)"
-#: ../src/connection-editor/page-wifi.c:442
+#: ../src/connection-editor/page-wifi.c:439
msgid "Could not load Wi-Fi user interface."
msgstr "無法載入 Wi-Fi 使用者介面。"
-#: ../src/connection-editor/page-wifi.c:564
+#: ../src/connection-editor/page-wifi.c:561
msgid "bssid"
msgstr ""
-#: ../src/connection-editor/page-wifi.c:570
+#: ../src/connection-editor/page-wifi.c:567
#, fuzzy
msgid "Wi-Fi device"
msgstr "任何裝置"
-#: ../src/connection-editor/page-wifi.c:617
+#: ../src/connection-editor/page-wifi.c:614
#, c-format
msgid "Wi-Fi connection %d"
msgstr "Wi-Fi 連線 %d"
-#: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: ../src/connection-editor/page-wifi-security.c:355
+#: ../src/libnma/nma-wifi-dialog.c:946 ../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:368
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../src/connection-editor/page-wifi-security.c:365
+#: ../src/libnma/nma-wifi-dialog.c:955 ../src/libnm-gtk/nm-wifi-dialog.c:931
msgid "WEP 128-bit Passphrase"
msgstr "WEP 128-位元 密語"
-#: ../src/connection-editor/page-wifi-security.c:394
+#: ../src/connection-editor/page-wifi-security.c:391
msgid "Dynamic WEP (802.1X)"
msgstr "動態 WEP (802.1X)"
-#: ../src/connection-editor/page-wifi-security.c:407
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/libnma/nma-wifi-dialog.c:999 ../src/libnm-gtk/nm-wifi-dialog.c:975
msgid "WPA & WPA2 Personal"
msgstr "WPA & WPA2 個人版"
-#: ../src/connection-editor/page-wifi-security.c:420
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: ../src/connection-editor/page-wifi-security.c:417
+#: ../src/libnma/nma-wifi-dialog.c:1017 ../src/libnm-gtk/nm-wifi-dialog.c:989
msgid "WPA & WPA2 Enterprise"
msgstr "WPA & WPA2 企業版"
-#: ../src/connection-editor/page-wifi-security.c:463
+#: ../src/connection-editor/page-wifi-security.c:460
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:474
+#: ../src/connection-editor/page-wifi-security.c:471
msgid "Wi-Fi Security"
msgstr "Wi-Fi 安全性"
-#: ../src/connection-editor/page-wifi-security.c:476
+#: ../src/connection-editor/page-wifi-security.c:473
msgid "Could not load Wi-Fi security user interface."
msgstr "無法載入 Wi-Fi 安全性使用者介面。"
-#: ../src/connection-editor/page-wifi-security.c:560
+#: ../src/connection-editor/page-wifi-security.c:557
#, c-format
msgid "missing SSID"
msgstr ""
-#: ../src/connection-editor/page-wifi-security.c:566
+#: ../src/connection-editor/page-wifi-security.c:563
#, c-format
msgid "Security not compatible with Ad-Hoc mode"
msgstr ""
@@ -4005,32 +4121,32 @@ msgid "Active Network Connections"
msgstr "啟用網路連線"
#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:152
#, fuzzy
msgid "No certificate set"
msgstr "不需要 CA 憑證(_R)"
#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:176
msgid "No key set"
msgstr ""
#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
#, 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:374
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
#, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
msgstr "私密金鑰(_K):"
#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
#, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
msgstr "私密金鑰密碼(_P):"
#: ../src/libnma/nma-file-cert-chooser.c:258
@@ -4039,251 +4155,245 @@ msgid "Choose %s Certificate"
msgstr "選擇 CA 憑證"
#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:398
#, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
msgstr "使用者憑證(_U):"
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "行動寬連線已經配置了以下設定:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "您的裝置:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "您的供應商:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "您的方案:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-msgid ""
-"A connection will now be made to your mobile broadband provider using the "
-"settings you selected. If the connection fails or you cannot access network "
-"resources, double-check your settings. To modify your mobile broadband "
-"connection settings, choose “Network Connections” from the System → "
-"Preferences menu."
-msgstr ""
-"現在,根據您所選取的設定,電腦將連上您的行動寬頻供應商。如果連線失敗,或是您"
-"無法存取網路資源,請檢查設定。要修改行動寬頻連線的設定,請從「系統」 >> 「偏"
-"好設定」中,選擇「網路連線」。"
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "確認行動寬頻設定"
+#: ../src/libnma/nma-mobile-providers.c:991
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "我的國家並沒有列出來"
-#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnma/nma-mobile-wizard.c:252 ../src/libnma/nma-mobile-wizard.c:284
#: ../src/libnm-gtk/nm-mobile-wizard.c:326
msgid "Unlisted"
msgstr "未列出的"
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "選擇您的方案(_S):"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "選擇方案的 _APN(Access Point Name,存取點名稱):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-msgid ""
-"Warning: Selecting an incorrect plan may result in billing issues for your "
-"broadband account or may prevent connectivity.\n"
-"\n"
-"If you are unsure of your plan please ask your provider for your plan’s APN."
-msgstr ""
-"警告:選擇不正確的方案可能會引起寬頻帳號的收費爭議,或讓您無法連線。\n"
-"\n"
-"如果您不確定所使用的方案,請洽詢供應商,以得知方案的 APN 為何。"
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "選擇您的計費方案"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnma/nma-mobile-wizard.c:484
#: ../src/libnm-gtk/nm-mobile-wizard.c:558
#, fuzzy
msgid "My plan is not listed…"
msgstr "我的方案沒有列出…"
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "請從清單裡選擇供應商(_L):"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnma/nma-mobile-wizard.c:644
#: ../src/libnm-gtk/nm-mobile-wizard.c:724
msgid "Provider"
msgstr "供應商"
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "我找不到我的供應商,我想要手動輸入(_M):"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "供應商:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "我的供應商使用 GSM 技術(GPRS、EDGE、UMTS、HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "我的供應商使用 CDMA 技術(1xRTT、EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "選擇您的供應商"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "國家或地區清單:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnma/nma-mobile-wizard.c:932
#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
msgid "Country or region"
msgstr "國家或地區"
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "我的國家並沒有列出來"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "選擇您的供應商的國家或地區"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnma/nma-mobile-wizard.c:1016
#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
msgid "Installed GSM device"
msgstr "已安裝的 GSM 裝置"
-#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnma/nma-mobile-wizard.c:1019
#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
msgid "Installed CDMA device"
msgstr "已安裝的 CDMA 裝置"
-#: ../src/libnma/nma-mobile-wizard.c:1354
+#: ../src/libnma/nma-mobile-wizard.c:1225
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "任何裝置"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:1
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "新的行動寬頻連線"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:2
#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
msgid ""
"This assistant helps you easily set up a mobile broadband connection to a "
"cellular (3G) network."
msgstr "這能幫助您輕易地設定行動寬頻連線,連至手機 (3G) 網路。"
-#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnma/nma-mobile-wizard.ui.h:3
#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
msgid "You will need the following information:"
msgstr "您需要以下資訊:"
-#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnma/nma-mobile-wizard.ui.h:4
#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
#, fuzzy
msgid "Your broadband provider’s name"
msgstr "寬頻供應商的名稱"
-#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.ui.h:5
#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
msgid "Your broadband billing plan name"
msgstr "寬頻計費方案的名稱"
-#: ../src/libnma/nma-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.ui.h:6
#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
msgstr "(在有些情況下)您的寬頻計費方案的 APN(存取點名稱)"
-#: ../src/libnma/nma-mobile-wizard.c:1412
+#: ../src/libnma/nma-mobile-wizard.ui.h:7
#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
msgid "Create a connection for _this mobile broadband device:"
msgstr "為這個行動寬頻裝置建立連線(_T)"
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "任何裝置"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnma/nma-mobile-wizard.ui.h:8
#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
msgid "Set up a Mobile Broadband Connection"
msgstr "設定行動寬頻連線"
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "新的行動寬頻連線"
+#: ../src/libnma/nma-mobile-wizard.ui.h:9
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "國家或地區清單:"
-#: ../src/libnma/nma-cert-chooser-button.c:165
+#: ../src/libnma/nma-mobile-wizard.ui.h:10
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "選擇您的供應商的國家或地區"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:11
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "請從清單裡選擇供應商(_L):"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:12
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "我找不到我的供應商,我想要手動輸入(_M):"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:13
+#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "我的供應商使用 GSM 技術(GPRS、EDGE、UMTS、HSPA)"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:14
+#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "我的供應商使用 CDMA 技術(1xRTT、EVDO)"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:15
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "選擇您的供應商"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:16
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "選擇您的方案(_S):"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:17
+#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "選擇方案的 _APN(Access Point Name,存取點名稱):"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:18
+#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"警告:選擇不正確的方案可能會引起寬頻帳號的收費爭議,或讓您無法連線。\n"
+"\n"
+"如果您不確定所使用的方案,請洽詢供應商,以得知方案的 APN 為何。"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:21
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "選擇您的計費方案"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:22
+#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "行動寬連線已經配置了以下設定:"
+
+#. Device
+#: ../src/libnma/nma-mobile-wizard.ui.h:23
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "您的裝置:"
+
+#. Provider
+#: ../src/libnma/nma-mobile-wizard.ui.h:24
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "您的供應商:"
+
+#. Plan and APN
+#: ../src/libnma/nma-mobile-wizard.ui.h:25
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "您的方案:"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:26
+#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"現在,根據您所選取的設定,電腦將連上您的行動寬頻供應商。如果連線失敗,或是您"
+"無法存取網路資源,請檢查設定。要修改行動寬頻連線的設定,請從「系統」 >> 「偏"
+"好設定」中,選擇「網路連線」。"
+
+#: ../src/libnma/nma-mobile-wizard.ui.h:27
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "確認行動寬頻設定"
+
+#: ../src/libnma/nma-cert-chooser-button.c:167
#, fuzzy
msgid "(None)"
msgstr "(無)"
-#: ../src/libnma/nma-cert-chooser-button.c:173
+#: ../src/libnma/nma-cert-chooser-button.c:175
#, c-format
msgid "Key in %s"
msgstr ""
-#: ../src/libnma/nma-cert-chooser-button.c:174
+#: ../src/libnma/nma-cert-chooser-button.c:176
#, fuzzy, c-format
msgid "Certificate in %s"
msgstr "C_A 憑證:"
-#: ../src/libnma/nma-cert-chooser-button.c:193
+#: ../src/libnma/nma-cert-chooser-button.c:195
#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
#, fuzzy
msgid "(Unknown)"
msgstr "不明"
-#: ../src/libnma/nma-cert-chooser-button.c:215
-#: ../src/libnma/nma-cert-chooser-button.c:245
+#: ../src/libnma/nma-cert-chooser-button.c:217
+#: ../src/libnma/nma-cert-chooser-button.c:247
msgid "Select"
msgstr ""
-#: ../src/libnma/nma-cert-chooser-button.c:216
-#: ../src/libnma/nma-cert-chooser-button.c:246
+#: ../src/libnma/nma-cert-chooser-button.c:218
+#: ../src/libnma/nma-cert-chooser-button.c:248
msgid "Cancel"
msgstr ""
-#: ../src/libnma/nma-cert-chooser-button.c:472
+#: ../src/libnma/nma-cert-chooser-button.c:474
msgid "Select from file…"
msgstr ""
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:394
#, fuzzy, c-format
msgid "Choose a %s Certificate"
msgstr "選擇 CA 憑證"
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:402
#, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
msgstr "使用者憑證(_U):"
#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
@@ -4337,103 +4447,114 @@ msgstr "每次都詢問密碼(_K)"
msgid "The password is not required"
msgstr "連線至「%s」需要密碼。"
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "第二密碼(_S):"
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "顯示密碼(_O)"
-#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
#, fuzzy
msgid "_Tertiary Password:"
msgstr "第二密碼(_S):"
-#: ../src/libnma/nma-vpn-password-dialog.c:238
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
-msgid "Sh_ow passwords"
-msgstr "顯示密碼(_O)"
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "第二密碼(_S):"
+
+#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "密碼(_P):"
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: ../src/libnma/nma-wifi-dialog.c:127 ../src/libnm-gtk/nm-wifi-dialog.c:141
#, fuzzy
msgid "Click to connect"
msgstr "斷線"
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-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 ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:465
msgid "New…"
msgstr ""
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:905
msgctxt "Wifi/wired security"
msgid "None"
msgstr "沒有"
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: ../src/libnma/nma-wifi-dialog.c:985 ../src/libnm-gtk/nm-wifi-dialog.c:961
#, fuzzy
msgid "Dynamic WEP (802.1x)"
msgstr "動態 WEP (802.1X)"
-#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: ../src/libnma/nma-wifi-dialog.c:1108 ../src/libnm-gtk/nm-wifi-dialog.c:1071
msgid "C_reate"
msgstr "建立(_R)"
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnma/nma-wifi-dialog.c:1186 ../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:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1152
msgid "Wi-Fi Network Authentication Required"
msgstr "Wi-Fi 網路連線需要驗證"
-#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1154
msgid "Authentication required by Wi-Fi network"
msgstr "Wi-Fi 網路連線需要驗證"
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1159
msgid "Create New Wi-Fi Network"
msgstr "建立新的 Wi-Fi 網路"
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1197 ../src/libnm-gtk/nm-wifi-dialog.c:1161
msgid "New Wi-Fi network"
msgstr "新的 Wi-Fi 網路"
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: ../src/libnma/nma-wifi-dialog.c:1198 ../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:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1200 ../src/libnm-gtk/nm-wifi-dialog.c:1164
msgid "Connect to Hidden Wi-Fi Network"
msgstr "連接到隱藏的 Wi-Fi 網路"
-#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1202 ../src/libnm-gtk/nm-wifi-dialog.c:1166
msgid "Hidden Wi-Fi network"
msgstr "隱藏的 Wi-Fi 網路"
-#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: ../src/libnma/nma-wifi-dialog.c:1203 ../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 網路的名稱與安全性詳細資料。"
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: ../src/libnma/wifi.ui.h:1
+#, fuzzy
+msgid "Wi-Fi _security"
msgstr "Wi-Fi 安全性(_S):"
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: ../src/libnma/wifi.ui.h:3
+#, fuzzy
+msgid "C_onnection"
msgstr "連線(_N):"
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: ../src/libnma/wifi.ui.h:4
+#, fuzzy
+msgid "Wi-Fi _adapter"
msgstr "Wi-Fi 介面卡(_A):"
+#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "我找不到我的供應商,我想要手動輸入(_M):"
+
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "供應商:"
+
#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
msgid "Wired"
msgstr "有線"
@@ -4466,6 +4587,28 @@ msgctxt "long device name"
msgid "%s %s"
msgstr "%s %s"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:142
+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 ""
+
+#: ../src/libnm-gtk/wifi.ui.h:1
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi 安全性(_S):"
+
+#: ../src/libnm-gtk/wifi.ui.h:2
+msgid "_Network name:"
+msgstr "網路名稱(_N):"
+
+#: ../src/libnm-gtk/wifi.ui.h:3
+msgid "C_onnection:"
+msgstr "連線(_N):"
+
+#: ../src/libnm-gtk/wifi.ui.h:4
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi 介面卡(_A):"
+
#: ../src/main.c:42
msgid "Usage:"
msgstr "用法:"
@@ -4594,12 +4737,12 @@ msgstr "漫遊"
msgid "%s connection"
msgstr "%s 連線"
-#: ../src/utils/utils.c:565
+#: ../src/utils/utils.c:549
#, fuzzy
msgid "PEM certificates (*.pem, *.crt, *.cer)"
msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)"
-#: ../src/utils/utils.c:577
+#: ../src/utils/utils.c:561
msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
msgstr "DER、PEM 或是 PKCS#12 私人金鑰 (*.der, *.pem, *.p12, *.key)"
@@ -4620,22 +4763,22 @@ msgstr ""
msgid "missing EAP-FAST PAC file"
msgstr ""
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: ../src/wireless-security/eap-method-fast.c:268
+#: ../src/wireless-security/eap-method-peap.c:332
+#: ../src/wireless-security/eap-method-ttls.c:386
msgid "GTC"
msgstr "GTC"
-#: ../src/wireless-security/eap-method-fast.c:405
+#: ../src/wireless-security/eap-method-fast.c:407
#, fuzzy
msgid "Choose a PAC file"
msgstr "選擇一個 PAC 檔案…"
-#: ../src/wireless-security/eap-method-fast.c:412
+#: ../src/wireless-security/eap-method-fast.c:414
msgid "PAC files (*.pac)"
msgstr "PAC 檔案 (*.pac)"
-#: ../src/wireless-security/eap-method-fast.c:416
+#: ../src/wireless-security/eap-method-fast.c:418
msgid "All files"
msgstr "所有檔案"
@@ -4654,17 +4797,20 @@ 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:3
-msgid "Anony_mous identity:"
+#, fuzzy
+msgid "Anony_mous identity"
msgstr "匿名識別(_M):"
#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#, fuzzy
+msgid "PAC _file"
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:1
-msgid "_Inner authentication:"
+#, fuzzy
+msgid "_Inner authentication"
msgstr "內部驗證(_I):"
#: ../src/wireless-security/eap-method-fast.ui.h:7
@@ -4679,9 +4825,9 @@ msgstr ""
msgid "missing EAP-LEAP password"
msgstr ""
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: ../src/wireless-security/eap-method-peap.c:316
+#: ../src/wireless-security/eap-method-ttls.c:370
+#: ../src/wireless-security/wireless-security.c:425
msgid "MD5"
msgstr "MD5"
@@ -4700,7 +4846,8 @@ msgid "No CA certificate is _required"
msgstr "不需要 CA 憑證(_R)"
#: ../src/wireless-security/eap-method-peap.ui.h:6
-msgid "PEAP _version:"
+#, fuzzy
+msgid "PEAP _version"
msgstr "PEAP 版本(_V):"
#: ../src/wireless-security/eap-method-peap.ui.h:8
@@ -4712,17 +4859,31 @@ 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:"
+msgid "_Domain"
msgstr ""
-#: ../src/wireless-security/eap-method-simple.c:75
+#: ../src/wireless-security/eap-method-simple.c:90
msgid "missing EAP username"
msgstr ""
-#: ../src/wireless-security/eap-method-simple.c:88
+#: ../src/wireless-security/eap-method-simple.c:106
msgid "missing EAP password"
msgstr ""
+#: ../src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.ui.h:4
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-位元 密語"
+
+#: ../src/wireless-security/eap-method-simple.ui.h:5
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "顯示密碼(_O)"
+
#: ../src/wireless-security/eap-method-tls.c:64
msgid "missing EAP-TLS identity"
msgstr ""
@@ -4745,10 +4906,11 @@ msgid "selected key file does not exist"
msgstr ""
#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+#, fuzzy
+msgid "I_dentity"
msgstr "識別(_D):"
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: ../src/wireless-security/eap-method-ttls.c:337
#, fuzzy
msgid "MSCHAPv2 (no EAP)"
msgstr "MSCHAPv2"
@@ -4757,67 +4919,72 @@ msgstr "MSCHAPv2"
msgid "Unknown error validating 802.1X security"
msgstr ""
-#: ../src/wireless-security/wireless-security.c:436
+#: ../src/wireless-security/wireless-security.c:437
msgid "TLS"
msgstr "TLS"
-#: ../src/wireless-security/wireless-security.c:460
+#: ../src/wireless-security/wireless-security.c:461
msgid "PWD"
msgstr "PWD"
-#: ../src/wireless-security/wireless-security.c:471
+#: ../src/wireless-security/wireless-security.c:472
msgid "FAST"
msgstr "快"
-#: ../src/wireless-security/wireless-security.c:482
+#: ../src/wireless-security/wireless-security.c:483
msgid "Tunneled TLS"
msgstr "穿隧式 TLS"
-#: ../src/wireless-security/wireless-security.c:493
+#: ../src/wireless-security/wireless-security.c:494
msgid "Protected EAP (PEAP)"
msgstr "保護式 EAP (PEAP)"
+#: ../src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
#: ../src/wireless-security/ws-wep-key.ui.h:6
#: ../src/wireless-security/ws-wpa-eap.ui.h:1
-msgid "Au_thentication:"
+#, fuzzy
+msgid "Au_thentication"
msgstr "驗證(_E):"
-#: ../src/wireless-security/ws-leap.c:63
+#: ../src/wireless-security/ws-leap.c:64
msgid "missing leap-username"
msgstr ""
-#: ../src/wireless-security/ws-leap.c:74
+#: ../src/wireless-security/ws-leap.c:82
msgid "missing leap-password"
msgstr ""
-#: ../src/wireless-security/ws-wep-key.c:107
+#: ../src/wireless-security/ws-wep-key.c:113
msgid "missing wep-key"
msgstr ""
-#: ../src/wireless-security/ws-wep-key.c:116
+#: ../src/wireless-security/ws-wep-key.c:120
#, c-format
msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
msgstr ""
-#: ../src/wireless-security/ws-wep-key.c:124
+#: ../src/wireless-security/ws-wep-key.c:128
#, c-format
msgid ""
"invalid wep-key: key with a length of %zu must contain only ascii characters"
msgstr ""
-#: ../src/wireless-security/ws-wep-key.c:130
+#: ../src/wireless-security/ws-wep-key.c:134
#, c-format
msgid ""
"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
"(ascii) or 10/26 (hex)"
msgstr ""
-#: ../src/wireless-security/ws-wep-key.c:137
+#: ../src/wireless-security/ws-wep-key.c:141
msgid "invalid wep-key: passphrase must be non-empty"
msgstr ""
-#: ../src/wireless-security/ws-wep-key.c:139
+#: ../src/wireless-security/ws-wep-key.c:143
msgid "invalid wep-key: passphrase must be shorter than 64 characters"
msgstr ""
@@ -4834,7 +5001,8 @@ msgid "1 (Default)"
msgstr "1 (預設值)"
#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#, fuzzy
+msgid "_Key"
msgstr "金鑰(_K):"
#: ../src/wireless-security/ws-wep-key.ui.h:5
@@ -4842,20 +5010,53 @@ msgid "Sho_w key"
msgstr "顯示金鑰(_W)"
#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#, fuzzy
+msgid "WEP inde_x"
msgstr "WEP 索引(_X):"
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: ../src/wireless-security/ws-wpa-psk.c:76
#, c-format
msgid ""
"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
"digits"
msgstr ""
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: ../src/wireless-security/ws-wpa-psk.c:83
msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
msgstr ""
#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#, fuzzy
+msgid "_Type"
msgstr "類型(_T):"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "由於不明的錯誤使連線機密的更新失敗。"
+
+#~ msgid "Priority:"
+#~ msgstr "優先順序:"
+
+#~ msgid "_Automatically connect to this network when it is available"
+#~ msgstr "當這個網路可用時自動連線(_A)"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "連線資訊(_I)"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "無法匯入 VPN 網路連線"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "檔案「%s」無法讀取或未包含可辨識的 VPN 連線資訊\n"
+#~ "\n"
+#~ "錯誤:%s。"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "不明的錯誤"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]