[network-manager-applet] Updated Traditional Chinese translation(Hong Kong and Taiwan)
- From: Chao-Hsiung Liao <chliao src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] Updated Traditional Chinese translation(Hong Kong and Taiwan)
- Date: Wed, 30 Jan 2013 06:42:46 +0000 (UTC)
commit c0b34ac30e85b0ff77d1a68d944e62a834a01a49
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date: Wed Jan 30 14:42:29 2013 +0800
Updated Traditional Chinese translation(Hong Kong and Taiwan)
po/zh_HK.po | 1202 +++++++++++++++++++++++++++++++++++------------------------
po/zh_TW.po | 1208 +++++++++++++++++++++++++++++++++++------------------------
2 files changed, 1430 insertions(+), 980 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 9baa639..d2157ed 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: network-manager-applet 0.9.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 19:45+0800\n"
-"PO-Revision-Date: 2012-08-21 19:45+0800\n"
+"POT-Creation-Date: 2013-01-30 14:41+0800\n"
+"PO-Revision-Date: 2013-01-30 14:41+0800\n"
"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
"Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
"Language: \n"
@@ -20,6 +20,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.5.4\n"
#: ../nm-applet.desktop.in.h:1
msgid "Network"
@@ -116,37 +117,37 @@ msgstr "802.1X éè"
msgid "_Network name:"
msgstr "ççåç(_N)ï"
-#: ../src/applet.c:512
+#: ../src/applet.c:545
msgid "Failed to add/activate connection"
msgstr "çæåå/äçéç"
-#: ../src/applet.c:514 ../src/applet.c:558 ../src/applet.c:584
-#: ../src/applet-device-wifi.c:1379 ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:547 ../src/applet.c:591 ../src/applet.c:617
+#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
msgid "Unknown error"
msgstr "äæçéè"
-#: ../src/applet.c:517 ../src/applet.c:587 ../src/applet-device-wifi.c:1382
-#: ../src/applet-device-wifi.c:1401
+#: ../src/applet.c:550 ../src/applet.c:620 ../src/applet-device-wifi.c:1379
+#: ../src/applet-device-wifi.c:1398
msgid "Connection failure"
msgstr "éçåæ"
-#: ../src/applet.c:556
+#: ../src/applet.c:589
msgid "Device disconnect failed"
msgstr "èçæçåæ"
-#: ../src/applet.c:561
+#: ../src/applet.c:594
msgid "Disconnect failure"
msgstr "æçåæ"
-#: ../src/applet.c:582
+#: ../src/applet.c:615
msgid "Connection activation failed"
msgstr "éççæåæ"
-#: ../src/applet.c:948 ../src/applet-device-wifi.c:1072
+#: ../src/applet.c:986 ../src/applet-device-wifi.c:1069
msgid "Don't show this message again"
msgstr "äèåéçéåèæ"
-#: ../src/applet.c:1037
+#: ../src/applet.c:1075
#, c-format
msgid ""
"\n"
@@ -156,7 +157,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåçççéçèäæäã"
-#: ../src/applet.c:1040
+#: ../src/applet.c:1078
#, c-format
msgid ""
"\n"
@@ -165,7 +166,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåç VPN æåæåçåæäã"
-#: ../src/applet.c:1043
+#: ../src/applet.c:1081
#, c-format
msgid ""
"\n"
@@ -175,7 +176,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåç VPN æåååçæççæã"
-#: ../src/applet.c:1046
+#: ../src/applet.c:1084
#, c-format
msgid ""
"\n"
@@ -184,7 +185,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåçéççåèåéæã"
-#: ../src/applet.c:1049
+#: ../src/applet.c:1087
#, c-format
msgid ""
"\n"
@@ -193,7 +194,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåç VPN æåææåæååã"
-#: ../src/applet.c:1052
+#: ../src/applet.c:1090
#, c-format
msgid ""
"\n"
@@ -202,7 +203,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåç VPN æååååæã"
-#: ../src/applet.c:1055
+#: ../src/applet.c:1093
#, c-format
msgid ""
"\n"
@@ -211,7 +212,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåçææææç VPN æåã"
-#: ../src/applet.c:1058
+#: ../src/applet.c:1096
#, c-format
msgid ""
"\n"
@@ -220,7 +221,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåççæç VPN æåã"
-#: ../src/applet.c:1065
+#: ../src/applet.c:1103
#, c-format
msgid ""
"\n"
@@ -229,7 +230,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæã"
-#: ../src/applet.c:1083
+#: ../src/applet.c:1121
#, c-format
msgid ""
"\n"
@@ -239,7 +240,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåçççéçäæäã"
-#: ../src/applet.c:1086
+#: ../src/applet.c:1124
#, c-format
msgid ""
"\n"
@@ -248,7 +249,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåç VPN æåååæã"
-#: ../src/applet.c:1092
+#: ../src/applet.c:1130
#, c-format
msgid ""
"\n"
@@ -257,7 +258,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæçã"
-#: ../src/applet.c:1122
+#: ../src/applet.c:1160
#, c-format
msgid ""
"VPN connection has been successfully established.\n"
@@ -267,19 +268,19 @@ msgstr ""
"VPN éçåæåçã\n"
"%s\n"
-#: ../src/applet.c:1124
+#: ../src/applet.c:1162
msgid "VPN connection has been successfully established.\n"
msgstr "VPN éçåæåçã\n"
-#: ../src/applet.c:1126
+#: ../src/applet.c:1164
msgid "VPN Login Message"
msgstr "VPN çéèæ"
-#: ../src/applet.c:1132 ../src/applet.c:1140 ../src/applet.c:1190
+#: ../src/applet.c:1170 ../src/applet.c:1178 ../src/applet.c:1228
msgid "VPN Connection Failed"
msgstr "VPN éçåæ"
-#: ../src/applet.c:1197
+#: ../src/applet.c:1235
#, c-format
msgid ""
"\n"
@@ -292,7 +293,7 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1200
+#: ../src/applet.c:1238
#, c-format
msgid ""
"\n"
@@ -305,247 +306,235 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1520
+#: ../src/applet.c:1553
msgid "device not ready (firmware missing)"
msgstr "èçåæåç (çåéé)"
-#: ../src/applet.c:1522
+#: ../src/applet.c:1555
msgid "device not ready"
msgstr "èçåæåç"
#. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1532 ../src/applet-device-ethernet.c:232
+#: ../src/applet.c:1565 ../src/applet-device-ethernet.c:229
msgid "disconnected"
msgstr "åæç"
-#: ../src/applet.c:1548
+#: ../src/applet.c:1581
msgid "Disconnect"
msgstr "æç"
-#: ../src/applet.c:1562
+#: ../src/applet.c:1595
msgid "device not managed"
msgstr "èççæçç"
-#: ../src/applet.c:1606
+#: ../src/applet.c:1639
msgid "No network devices available"
msgstr "ææåççççèç"
-#: ../src/applet.c:1694
+#: ../src/applet.c:1727
msgid "_VPN Connections"
msgstr "_VPN éç"
-#: ../src/applet.c:1751
+#: ../src/applet.c:1784
msgid "_Configure VPN..."
msgstr "èç VPN(_C)â"
-#: ../src/applet.c:1755
+#: ../src/applet.c:1788
msgid "_Disconnect VPN"
msgstr "è VPN æç(_D)"
-#: ../src/applet.c:1849
+#: ../src/applet.c:1882
msgid "NetworkManager is not running..."
msgstr "NetworkManager ææåèâ."
-#: ../src/applet.c:1854 ../src/applet.c:2656
+#: ../src/applet.c:1887 ../src/applet.c:2739
msgid "Networking disabled"
msgstr "ççååç"
#. 'Enable Networking' item
-#: ../src/applet.c:2075
+#: ../src/applet.c:2108
msgid "Enable _Networking"
msgstr "åççç(_N)"
#. 'Enable Wi-Fi' item
-#: ../src/applet.c:2084
+#: ../src/applet.c:2117
msgid "Enable _Wi-Fi"
msgstr "åç _Wi-Fi"
#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2093
+#: ../src/applet.c:2126
msgid "Enable _Mobile Broadband"
msgstr "åçæååé(_M)"
#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2102
+#: ../src/applet.c:2135
msgid "Enable WiMA_X Mobile Broadband"
msgstr "åç WiMA_X æååé"
#. Toggle notifications item
-#: ../src/applet.c:2113
+#: ../src/applet.c:2146
msgid "Enable N_otifications"
msgstr "åçéçåè(_O)"
#. 'Connection Information' item
-#: ../src/applet.c:2124
+#: ../src/applet.c:2157
msgid "Connection _Information"
msgstr "éçèè(_I)"
#. 'Edit Connections...' item
-#: ../src/applet.c:2134
+#: ../src/applet.c:2167
msgid "Edit Connections..."
msgstr "çèéçâ"
#. Help item
-#: ../src/applet.c:2148
+#: ../src/applet.c:2181
msgid "_Help"
msgstr "æå(_H)"
#. About item
-#: ../src/applet.c:2157
+#: ../src/applet.c:2190
msgid "_About"
msgstr "éæ(_A)"
-#: ../src/applet.c:2335
+#: ../src/applet.c:2368
msgid "Disconnected"
msgstr "åæç"
-#: ../src/applet.c:2336
+#: ../src/applet.c:2369
msgid "The network connection has been disconnected."
msgstr "ççéçåäæã"
-#: ../src/applet.c:2519
+#: ../src/applet.c:2602
#, c-format
msgid "Preparing network connection '%s'..."
msgstr "æåæåççéçã%sãâ"
-#: ../src/applet.c:2522
+#: ../src/applet.c:2605
#, c-format
msgid "User authentication required for network connection '%s'..."
msgstr "ççéçã%sãéèäçèéèâ"
-#: ../src/applet.c:2525 ../src/applet-device-bt.c:239
-#: ../src/applet-device-cdma.c:487 ../src/applet-device-gsm.c:535
-#: ../src/applet-device-wimax.c:473
+#: ../src/applet.c:2608 ../src/applet-device-bt.c:235
+#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:615
#, c-format
msgid "Requesting a network address for '%s'..."
msgstr "æåèææäã%sãçççäåâ"
-#: ../src/applet.c:2528
+#: ../src/applet.c:2611
#, c-format
msgid "Network connection '%s' active"
msgstr "ççéçã%sãåäçä"
-#: ../src/applet.c:2611
+#: ../src/applet.c:2694
#, c-format
msgid "Starting VPN connection '%s'..."
msgstr "æååå VPN éçã%sãâ"
-#: ../src/applet.c:2614
+#: ../src/applet.c:2697
#, c-format
msgid "User authentication required for VPN connection '%s'..."
msgstr "VPN éçã%sãéèäçèéèâ"
-#: ../src/applet.c:2617
+#: ../src/applet.c:2700
#, c-format
msgid "Requesting a VPN address for '%s'..."
msgstr "æåèæ VPN æäã%sãçççäåâ"
-#: ../src/applet.c:2620
+#: ../src/applet.c:2703
#, c-format
msgid "VPN connection '%s' active"
msgstr "VPN éçã%sãåäçä"
-#: ../src/applet.c:2661
+#: ../src/applet.c:2744
msgid "No network connection"
msgstr "ææççéæ"
-#: ../src/applet.c:3361
+#: ../src/applet.c:3445
msgid "NetworkManager Applet"
msgstr "NetworkManager éæçå"
-#: ../src/applet-device-bt.c:173 ../src/applet-device-cdma.c:396
-#: ../src/applet-device-ethernet.c:240 ../src/applet-device-gsm.c:444
-#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
+#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
+#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:767
+#: ../src/applet-device-gsm.c:357 ../src/applet-device-wifi.c:859
+#: ../src/applet-device-wimax.c:275
msgid "Available"
msgstr "åç"
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:438
-#: ../src/applet-device-ethernet.c:269 ../src/applet-device-gsm.c:486
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
+#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:811
+#: ../src/applet-device-gsm.c:399 ../src/applet-device-wimax.c:419
#, c-format
msgid "You are now connected to '%s'."
msgstr "äçååéçèã%sãã"
-#: ../src/applet-device-bt.c:203 ../src/applet-device-cdma.c:442
-#: ../src/applet-device-ethernet.c:273 ../src/applet-device-gsm.c:490
-#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
+#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
+#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:815
+#: ../src/applet-device-gsm.c:403 ../src/applet-device-wifi.c:1261
+#: ../src/applet-device-wimax.c:423
msgid "Connection Established"
msgstr "ååçéç"
-#: ../src/applet-device-bt.c:204
+#: ../src/applet-device-bt.c:200
msgid "You are now connected to the mobile broadband network."
msgstr "äçååéçèæååéççã"
-#: ../src/applet-device-bt.c:230 ../src/applet-device-cdma.c:478
-#: ../src/applet-device-gsm.c:526 ../src/applet-device-wimax.c:464
+#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
+#: ../src/mobile-helpers.c:606
#, c-format
msgid "Preparing mobile broadband connection '%s'..."
msgstr "æåæåæååééçã%sãâ"
-#: ../src/applet-device-bt.c:233 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:529 ../src/applet-device-wimax.c:467
+#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
+#: ../src/mobile-helpers.c:609
#, c-format
msgid "Configuring mobile broadband connection '%s'..."
msgstr "æåèåæååééçã%sãâ"
-#: ../src/applet-device-bt.c:236 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:470
+#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
+#: ../src/mobile-helpers.c:612
#, c-format
msgid "User authentication required for mobile broadband connection '%s'..."
msgstr "æååééçã%sãéèäçèéèâ"
-#: ../src/applet-device-bt.c:243 ../src/applet-device-cdma.c:505
-#: ../src/applet-device-gsm.c:553
+#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:632
#, c-format
msgid "Mobile broadband connection '%s' active"
msgstr "æååééçã%sãåäçä"
-#: ../src/applet-device-cdma.c:181 ../src/connection-editor/page-mobile.c:700
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
-
-#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:390
-#: ../src/applet-dialogs.c:424
+#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:713
+#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:424
#, c-format
msgid "Mobile Broadband (%s)"
msgstr "æååé (%s)"
-#: ../src/applet-device-cdma.c:344 ../src/applet-device-gsm.c:392
-#: ../src/connection-editor/new-connection.c:87
-#: ../src/connection-editor/page-mobile.c:380
+#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:715
+#: ../src/applet-device-gsm.c:305
+#: ../src/connection-editor/new-connection.c:113
+#: ../src/connection-editor/page-mobile.c:389
+#: ../src/libnm-gtk/nm-ui-utils.c:333
msgid "Mobile Broadband"
msgstr "æååé"
#. Default connection item
-#: ../src/applet-device-cdma.c:409
+#: ../src/applet-device-cdma.c:316
msgid "New Mobile Broadband (CDMA) connection..."
msgstr "æçæååé (CDMA) éçâ"
-#: ../src/applet-device-cdma.c:443
+#: ../src/applet-device-cdma.c:350
msgid "You are now connected to the CDMA network."
msgstr "äçååéçè CDMA ççã"
-#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:548
-#: ../src/applet-device-wimax.c:482
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "æååééçã%sãåäçäï(%d%%%s%s)"
-
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:551
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "æé"
-
-#: ../src/applet-device-cdma.c:644 ../src/applet-device-cdma.c:650
+#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
msgid "CDMA network."
msgstr "CDMA ççã"
-#: ../src/applet-device-cdma.c:645 ../src/applet-device-gsm.c:1196
+#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:953
+#: ../src/applet-device-gsm.c:677
msgid "You are now registered on the home network."
msgstr "äçååèåèåçççã"
-#: ../src/applet-device-cdma.c:651 ../src/applet-device-gsm.c:1202
+#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:959
+#: ../src/applet-device-gsm.c:683
msgid "You are now registered on a roaming network."
msgstr "äçååèåèæéççã"
@@ -553,281 +542,223 @@ msgstr "äçååèåèæéççã"
msgid "Auto Ethernet"
msgstr "èåäåçç"
-#: ../src/applet-device-ethernet.c:205
+#: ../src/applet-device-ethernet.c:202
#, c-format
msgid "Ethernet Networks (%s)"
msgstr "æççç (%s)"
-#: ../src/applet-device-ethernet.c:207
+#: ../src/applet-device-ethernet.c:204
#, c-format
msgid "Ethernet Network (%s)"
msgstr "æççç (%s)"
-#: ../src/applet-device-ethernet.c:210
+#: ../src/applet-device-ethernet.c:207
msgid "Ethernet Networks"
msgstr "æççç"
-#: ../src/applet-device-ethernet.c:212
+#: ../src/applet-device-ethernet.c:209
msgid "Ethernet Network"
msgstr "æççç"
-#: ../src/applet-device-ethernet.c:274
+#: ../src/applet-device-ethernet.c:271
msgid "You are now connected to the ethernet network."
msgstr "äçååéçèæçççã"
-#: ../src/applet-device-ethernet.c:300
+#: ../src/applet-device-ethernet.c:297
#, c-format
msgid "Preparing ethernet network connection '%s'..."
msgstr "æåæåæçççéçã%sãâ"
-#: ../src/applet-device-ethernet.c:303
+#: ../src/applet-device-ethernet.c:300
#, c-format
msgid "Configuring ethernet network connection '%s'..."
msgstr "æåèåæçççéçã%sãâ"
-#: ../src/applet-device-ethernet.c:306
+#: ../src/applet-device-ethernet.c:303
#, c-format
msgid "User authentication required for ethernet network connection '%s'..."
msgstr "æçççéçã%sãéèäçèéèâ"
-#: ../src/applet-device-ethernet.c:309
+#: ../src/applet-device-ethernet.c:306
#, c-format
msgid "Requesting an ethernet network address for '%s'..."
msgstr "æèææçççã%sãæäççäåâ"
-#: ../src/applet-device-ethernet.c:313
+#: ../src/applet-device-ethernet.c:310
#, c-format
msgid "Ethernet network connection '%s' active"
msgstr "æçççéçã%sãåäçä"
-#: ../src/applet-device-ethernet.c:494
+#: ../src/applet-device-ethernet.c:491
msgid "DSL authentication"
msgstr "DSL éè"
-#: ../src/applet-device-gsm.c:211 ../src/connection-editor/page-mobile.c:703
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:457
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "æçæååé (GSM) éçâ"
-
-#: ../src/applet-device-gsm.c:491
-msgid "You are now connected to the GSM network."
-msgstr "äçååéçè GSM ççã"
-
-#: ../src/applet-device-gsm.c:652
-msgid "PIN code required"
-msgstr "éè PIN ç"
-
-#: ../src/applet-device-gsm.c:660
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "éåæååéèçéè PIN ç"
-
-#: ../src/applet-device-gsm.c:781
-#, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "SIM åã%sãåã%sãç PIN ç"
+#: ../src/applet-device-broadband.c:165 ../src/applet-device-gsm.c:518
+msgid "Wrong PUK code; please contact your provider."
+msgstr "PUK çéèïèèçäçäæåã"
-#: ../src/applet-device-gsm.c:873
+#: ../src/applet-device-broadband.c:207 ../src/applet-device-gsm.c:495
msgid "Wrong PIN code; please contact your provider."
msgstr "PIN çéèïèèçäçäæåã"
-#: ../src/applet-device-gsm.c:896
-msgid "Wrong PUK code; please contact your provider."
-msgstr "PUK çéèïèèçäçäæåã"
-
#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:923
+#: ../src/applet-device-broadband.c:258 ../src/applet-device-gsm.c:545
msgid "Sending unlock code..."
msgstr "çéèéççåçâ"
-#: ../src/applet-device-gsm.c:986
-msgid "SIM PIN unlock required"
-msgstr "éèèé SIM PIN ç"
-
-#: ../src/applet-device-gsm.c:987
-msgid "SIM PIN Unlock Required"
-msgstr "éèèé SIM PIN ç"
-
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:989
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr "èäçæååéèçã%sãäåïéè SIM PIN çã"
-
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:991
-msgid "PIN code:"
-msgstr "PIN çï"
-
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:995
-msgid "Show PIN code"
-msgstr "éç PIN ç"
-
-#: ../src/applet-device-gsm.c:998
-msgid "SIM PUK unlock required"
-msgstr "éèèé SIM PUK ç"
-
-#: ../src/applet-device-gsm.c:999
-msgid "SIM PUK Unlock Required"
-msgstr "éèèé SIM PUK ç"
-
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1001
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr "èäçæååéèçã%sãäåïéè SIM PUK çã"
+#. Default connection item
+#: ../src/applet-device-broadband.c:780
+msgid "New Mobile Broadband connection..."
+msgstr "æçæååééçâ"
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1003
-msgid "PUK code:"
-msgstr "PUK çï"
+#: ../src/applet-device-broadband.c:816
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "äçååéçèæååéççã"
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1006
-msgid "New PIN code:"
-msgstr "æç PIN çï"
+#: ../src/applet-device-broadband.c:952 ../src/applet-device-broadband.c:958
+msgid "Mobile Broadband network."
+msgstr "æååéççã"
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "Re-enter new PIN code:"
-msgstr "éæèå PIN çï"
+#. Default connection item
+#: ../src/applet-device-gsm.c:370
+msgid "New Mobile Broadband (GSM) connection..."
+msgstr "æçæååé (GSM) éçâ"
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1013
-msgid "Show PIN/PUK codes"
-msgstr "éç PIN/PUK ç"
+#: ../src/applet-device-gsm.c:404
+msgid "You are now connected to the GSM network."
+msgstr "äçååéçè GSM ççã"
-#: ../src/applet-device-gsm.c:1195 ../src/applet-device-gsm.c:1201
+#: ../src/applet-device-gsm.c:676 ../src/applet-device-gsm.c:682
msgid "GSM network."
msgstr "GSM ççã"
-#: ../src/applet-device-wifi.c:97
+#: ../src/applet-device-wifi.c:98
msgid "_Connect to Hidden Wi-Fi Network..."
msgstr "éæåéèç Wi-Fi çç(_C)â"
-#: ../src/applet-device-wifi.c:148
+#: ../src/applet-device-wifi.c:149
msgid "Create _New Wi-Fi Network..."
msgstr "åçæç Wi-Fi çç(_N)â"
-#: ../src/applet-device-wifi.c:292
+#: ../src/applet-device-wifi.c:293
msgid "(none)"
msgstr "(ç)"
-#: ../src/applet-device-wifi.c:790
+#: ../src/applet-device-wifi.c:787
#, c-format
msgid "Wi-Fi Networks (%s)"
msgstr "Wi-Fi çç (%s)"
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:789
#, c-format
msgid "Wi-Fi Network (%s)"
msgstr "Wi-Fi çç (%s)"
-#: ../src/applet-device-wifi.c:794
+#: ../src/applet-device-wifi.c:791
msgid "Wi-Fi Network"
msgid_plural "Wi-Fi Networks"
msgstr[0] "Wi-Fi çç"
-#: ../src/applet-device-wifi.c:827
+#: ../src/applet-device-wifi.c:824
msgid "Wi-Fi is disabled"
msgstr "Wi-Fi ååç"
-#: ../src/applet-device-wifi.c:828
+#: ../src/applet-device-wifi.c:825
msgid "Wi-Fi is disabled by hardware switch"
msgstr "Wi-Fi åèçäééåç"
-#: ../src/applet-device-wifi.c:889
+#: ../src/applet-device-wifi.c:886
msgid "More networks"
msgstr "æåçç"
-#: ../src/applet-device-wifi.c:1068
+#: ../src/applet-device-wifi.c:1065
msgid "Wi-Fi Networks Available"
msgstr "æ Wi-Fi ççåç"
-#: ../src/applet-device-wifi.c:1069
+#: ../src/applet-device-wifi.c:1066
msgid "Use the network menu to connect to a Wi-Fi network"
msgstr "äçççéåäéçå Wi-Fi çç"
-#: ../src/applet-device-wifi.c:1263
+#: ../src/applet-device-wifi.c:1260
#, c-format
msgid "You are now connected to the Wi-Fi network '%s'."
msgstr "äçååéçè Wi-Fi ççã%sãã"
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-wifi.c:1291
#, c-format
msgid "Preparing Wi-Fi network connection '%s'..."
msgstr "æåæå Wi-Fi ççéçã%sãâ"
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-wifi.c:1294
#, c-format
msgid "Configuring Wi-Fi network connection '%s'..."
msgstr "æåèå Wi-Fi ççéçã%sãâ"
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-wifi.c:1297
#, c-format
msgid "User authentication required for Wi-Fi network '%s'..."
msgstr "Wi-Fi ççéçã%sãéèäçèéèâ"
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1300
#, c-format
msgid "Requesting a Wi-Fi network address for '%s'..."
msgstr "æåèææäã%sãç Wi-Fi ççäåâ"
-#: ../src/applet-device-wifi.c:1324
+#: ../src/applet-device-wifi.c:1321
#, c-format
msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
msgstr "Wi-Fi ççéçã%sãåäçäï %s (%d%%)"
-#: ../src/applet-device-wifi.c:1329
+#: ../src/applet-device-wifi.c:1326
#, c-format
msgid "Wi-Fi network connection '%s' active"
msgstr "Wi-Fi ççéçã%sãåäçä"
-#: ../src/applet-device-wifi.c:1377
+#: ../src/applet-device-wifi.c:1374
msgid "Failed to activate connection"
msgstr "çæäçéç"
-#: ../src/applet-device-wifi.c:1396
+#: ../src/applet-device-wifi.c:1393
msgid "Failed to add new connection"
msgstr "çæååæéç"
-#: ../src/applet-device-wimax.c:231
+#: ../src/applet-device-wimax.c:227
#, c-format
msgid "WiMAX Mobile Broadband (%s)"
msgstr "WiMAX æååé (%s)"
-#: ../src/applet-device-wimax.c:233
+#: ../src/applet-device-wimax.c:229
msgid "WiMAX Mobile Broadband"
msgstr "WiMAX æååé"
-#: ../src/applet-device-wimax.c:259
+#: ../src/applet-device-wimax.c:255
msgid "WiMAX is disabled"
msgstr "WiMAX ååç"
-#: ../src/applet-device-wimax.c:260
+#: ../src/applet-device-wimax.c:256
msgid "WiMAX is disabled by hardware switch"
msgstr "WiMAX åèçäééåç"
-#: ../src/applet-device-wimax.c:428
+#: ../src/applet-device-wimax.c:424
msgid "You are now connected to the WiMAX network."
msgstr "äçååéçè WiMAX ççã"
+#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:627
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "æååééçã%sãåäçäï(%d%%%s%s)"
+
+#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:630
+msgid "roaming"
+msgstr "æé"
+
#: ../src/applet-dialogs.c:57
msgid "Error displaying connection information:"
msgstr "éçéçèèççéèï"
#: ../src/applet-dialogs.c:109
#: ../src/connection-editor/page-wifi-security.c:313
-#: ../src/libnm-gtk/nm-wifi-dialog.c:929
+#: ../src/libnm-gtk/nm-wifi-dialog.c:924
#: ../src/wireless-security/wireless-security.c:406
msgid "LEAP"
msgstr "LEAP"
@@ -846,7 +777,7 @@ msgid "WEP"
msgstr "WEP"
#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/libnm-gtk/nm-wifi-dialog.c:886
+#: ../src/libnm-gtk/nm-wifi-dialog.c:881
msgctxt "Wifi/wired security"
msgid "None"
msgstr "ææ"
@@ -908,6 +839,7 @@ msgstr "WiMAX (%s)"
#. --- General ---
#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
+#: ../src/connection-editor/page-general.c:327
msgid "General"
msgstr "äè"
@@ -1014,7 +946,7 @@ msgstr "VPN æåï"
msgid "Base Connection:"
msgstr "åçéçï"
-#: ../src/applet-dialogs.c:823
+#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:345
msgid "Unknown"
msgstr "äæ"
@@ -1059,6 +991,68 @@ msgstr "éçèã%sãéèåçã"
msgid "Password:"
msgstr "åçï"
+#: ../src/applet-dialogs.c:1310
+msgid "SIM PIN unlock required"
+msgstr "éèèé SIM PIN ç"
+
+#: ../src/applet-dialogs.c:1311
+msgid "SIM PIN Unlock Required"
+msgstr "éèèé SIM PIN ç"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1313
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr "èäçæååéèçã%sãäåïéè SIM PIN çã"
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1315
+msgid "PIN code:"
+msgstr "PIN çï"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1319
+msgid "Show PIN code"
+msgstr "éç PIN ç"
+
+#: ../src/applet-dialogs.c:1321
+msgid "SIM PUK unlock required"
+msgstr "éèèé SIM PUK ç"
+
+#: ../src/applet-dialogs.c:1322
+msgid "SIM PUK Unlock Required"
+msgstr "éèèé SIM PUK ç"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1324
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr "èäçæååéèçã%sãäåïéè SIM PUK çã"
+
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1326
+msgid "PUK code:"
+msgstr "PUK çï"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1329
+msgid "New PIN code:"
+msgstr "æç PIN çï"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1331
+msgid "Re-enter new PIN code:"
+msgstr "éæèå PIN çï"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1336
+msgid "Show PIN/PUK codes"
+msgstr "éç PIN/PUK ç"
+
#: ../src/connection-editor/ce-ip4-routes.ui.h:1
#: ../src/connection-editor/ce-ip6-routes.ui.h:1
#: ../src/connection-editor/ce-page-ip4.ui.h:8
@@ -1114,23 +1108,14 @@ msgstr ""
msgid "Createâ"
msgstr "åçâ"
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "èå"
-
-#: ../src/connection-editor/ce-page.c:294
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "çæäæçéèäéçæåçææåæã"
-
#: ../src/connection-editor/ce-page-bond.ui.h:1
#, fuzzy
msgid "Round-robin"
msgstr "åæäåäæ"
#: ../src/connection-editor/ce-page-bond.ui.h:2
-#, fuzzy
msgid "Active backup"
-msgstr "åéåä(_A)"
+msgstr "åçåä"
#: ../src/connection-editor/ce-page-bond.ui.h:3
msgid "XOR"
@@ -1161,10 +1146,8 @@ msgid "ARP"
msgstr "ARP"
#: ../src/connection-editor/ce-page-bond.ui.h:10
-#, fuzzy
-#| msgid "Base Connection:"
msgid "Bonded _connections:"
-msgstr "VPN éç"
+msgstr "çççéç(_C):"
#: ../src/connection-editor/ce-page-bond.ui.h:11
msgid "_Mode:"
@@ -1172,13 +1155,15 @@ msgstr "æå(_M):"
#. Edit
#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/nm-connection-list.c:680
+#: ../src/connection-editor/ce-page-bridge.ui.h:2
+#: ../src/connection-editor/nm-connection-list.c:685
msgid "_Edit"
msgstr "çè(_E)"
#. Delete
#: ../src/connection-editor/ce-page-bond.ui.h:13
-#: ../src/connection-editor/nm-connection-list.c:697
+#: ../src/connection-editor/ce-page-bridge.ui.h:3
+#: ../src/connection-editor/nm-connection-list.c:702
msgid "_Delete"
msgstr "åé(_D)"
@@ -1191,6 +1176,7 @@ msgid "ms"
msgstr "æç"
#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
msgid "_Interface name:"
msgstr "äéåç(_I):"
@@ -1216,8 +1202,59 @@ msgstr "éçåé(_U):"
msgid "Link _down delay:"
msgstr "æçåé(_D):"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr "èåæè(_C):"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:4
+msgid "_Priority:"
+msgstr "ååéå(_P):"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#, fuzzy
+#| msgid "_Transport mode:"
+msgid "_Hairpin mode:"
+msgstr "åéææåæå"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+msgid "Bridged _connections:"
+msgstr "ææçéç(_C):"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:6
+msgid "_Forward delay:"
+msgstr "èéåé(_F):"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Hello time:"
+msgstr "_Hello æé:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "s"
+msgstr "ç"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr "åç _STP (çææåè)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+msgid "_Max age:"
+msgstr "æåæé(_M):"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "_Aging time:"
+msgstr "åçæé(_A):"
+
+#: ../src/connection-editor/ce-page.c:72
+msgid "automatic"
+msgstr "èå"
+
+#: ../src/connection-editor/ce-page.c:356
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "çæäæçéèäéçæåçææåæã"
+
#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
#: ../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
@@ -1238,7 +1275,7 @@ msgid "Sho_w password"
msgstr "éçåç(_W)"
#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
#: ../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
@@ -1325,16 +1362,34 @@ msgstr "åéèèåç MAC äåææçéåéçäççççèç
#: ../src/connection-editor/ce-page-ethernet.ui.h:17
#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
#: ../src/connection-editor/ce-page-wifi.ui.h:7
msgid "_MTU:"
msgstr "_MTU:"
#: ../src/connection-editor/ce-page-ethernet.ui.h:18
#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
#: ../src/connection-editor/ce-page-wifi.ui.h:6
msgid "bytes"
msgstr "äåç"
+#: ../src/connection-editor/ce-page-general.ui.h:1
+msgid "_Automatically connect to this network when it is available"
+msgstr "çéåççåçæèåéç(_A)"
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+msgid "All _users may connect to this network"
+msgstr "ææçäçèåäéçèéåçç"
+
+#: ../src/connection-editor/ce-page-general.ui.h:3
+msgid "Firewall _zone:"
+msgstr "éççåå(_Z):"
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Automatically connect to _VPN when using this connection"
+msgstr "çäçéåéçæèåéçè _VPN"
+
#: ../src/connection-editor/ce-page-infiniband.ui.h:1
msgid "_Transport mode:"
msgstr "åèæå(_T):"
@@ -1468,43 +1523,51 @@ msgid "Prefer 2G (GPRS/EDGE)"
msgstr "åå 2G (GPRS/EDGE)"
#: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "Prefer 4G (LTE)"
+msgstr "åå 4G (LTE)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+msgid "Use only 4G (LTE)"
+msgstr "åäç 4G (LTE)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
msgid "Basic"
msgstr "åæ"
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
msgid "Nu_mber:"
msgstr "æå(_M):"
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:12
msgid "Advanced"
msgstr "éé"
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:13
msgid "_APN:"
msgstr "_APN:"
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:14
msgid "N_etwork ID:"
msgstr "çç ID(_E):"
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:15
#: ../src/wireless-security/ws-wpa-psk.ui.h:2
msgid "_Type:"
msgstr "éå(_T)ï"
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:16
msgid "Change..."
msgstr "ææâ"
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/connection-editor/ce-page-mobile.ui.h:17
msgid "P_IN:"
msgstr "P_IN:"
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:18
msgid "Allow _roaming if home network is not available"
msgstr "åæåççççæäçïåèäçæé(_R)"
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:19
msgid "Sho_w passwords"
msgstr "éçåç(_W)"
@@ -1556,6 +1619,32 @@ msgstr "åé"
msgid "Send PPP _echo packets"
msgstr "åé PPP åéåå(_E)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+msgid "_Parent interface:"
+msgstr "çäé(_P):"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN interface _name:"
+msgstr "VLAN äéåç(_N):"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+msgid "_Cloned MAC address:"
+msgstr "èèç MA_C äåï"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr "VLAN _id:"
+
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "Device name + number"
+msgstr "èçåç + çè"
+
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "\"vlan\" + number"
+msgstr "\"vlan\" + çè"
+
#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
msgid "S_ecurity:"
msgstr "ååæ(_E):"
@@ -1593,28 +1682,22 @@ msgid "_Rate:"
msgstr "éç(_R):"
#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid ""
-"This option locks this connection to the Wi-Fi access point (AP) specified "
-"by the BSSID entered here. Example: 00:11:22:33:44:55"
-msgstr "æééæåæéçéåèåææèåç BSSID ææåç Wi-Fi ååéïAPïãäåï00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
msgid "_BSSID:"
msgstr "_BSSID:"
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
msgid "C_hannel:"
msgstr "éé(_H)ï"
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
msgid "Ban_d:"
msgstr "éå(_D):"
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
msgid "M_ode:"
msgstr "æå(_O)ï"
-#: ../src/connection-editor/ce-page-wifi.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
msgid "SS_ID:"
msgstr "SS_ID:"
@@ -1668,150 +1751,176 @@ msgid ""
"methods. If connections fail, try disabling support for some methods."
msgstr "åååæææäïççäæèç PPP äæåæææææçéèææãåæéçåæïèåèåçæäææçææã"
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:911
-#: ../src/connection-editor/page-ip6.c:877
+#: ../src/connection-editor/ip4-routes-dialog.c:762
+#: ../src/connection-editor/ip6-routes-dialog.c:704
+#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/page-ip6.c:894
msgid "Address"
msgstr "åå"
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/ip4-routes-dialog.c:779
+#: ../src/connection-editor/page-ip4.c:945
msgid "Netmask"
msgstr "ççéç"
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:945
-#: ../src/connection-editor/page-ip6.c:911
+#: ../src/connection-editor/ip4-routes-dialog.c:796
+#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/page-ip4.c:962
+#: ../src/connection-editor/page-ip6.c:928
msgid "Gateway"
msgstr "éèé"
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:813
+#: ../src/connection-editor/ip6-routes-dialog.c:755
msgid "Metric"
msgstr "åå"
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:894
+#: ../src/connection-editor/ip6-routes-dialog.c:721
+#: ../src/connection-editor/page-ip6.c:911
msgid "Prefix"
msgstr "åç"
-#: ../src/connection-editor/new-connection.c:77
-#: ../src/connection-editor/page-ethernet.c:274
+#: ../src/connection-editor/new-connection.c:101
+#: ../src/connection-editor/page-ethernet.c:251
+#: ../src/libnm-gtk/nm-ui-utils.c:323
msgid "Ethernet"
msgstr "æççç"
-#: ../src/connection-editor/new-connection.c:82
-#: ../src/connection-editor/page-wifi.c:463
+#: ../src/connection-editor/new-connection.c:107
+#: ../src/connection-editor/page-wifi.c:471 ../src/libnm-gtk/nm-ui-utils.c:325
msgid "Wi-Fi"
msgstr "Wi-Fi"
-#: ../src/connection-editor/new-connection.c:92
-#: ../src/connection-editor/page-wimax.c:158 ../src/mb-menu-item.c:73
+#: ../src/connection-editor/new-connection.c:119
+#: ../src/connection-editor/page-wimax.c:134
+#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
msgid "WiMAX"
msgstr "WiMAX"
-#: ../src/connection-editor/new-connection.c:97
-#: ../src/connection-editor/page-dsl.c:140
+#: ../src/connection-editor/new-connection.c:125
+#: ../src/connection-editor/page-dsl.c:141
msgid "DSL"
msgstr "DSL"
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-infiniband.c:190
+#: ../src/connection-editor/new-connection.c:131
+#: ../src/connection-editor/page-infiniband.c:168
+#: ../src/libnm-gtk/nm-ui-utils.c:335
msgid "InfiniBand"
msgstr "InfiniBand"
-#: ../src/connection-editor/new-connection.c:107
-#: ../src/connection-editor/page-bond.c:746
+#: ../src/connection-editor/new-connection.c:137
+#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/libnm-gtk/nm-ui-utils.c:559
msgid "Bond"
-msgstr ""
-
-#: ../src/connection-editor/new-connection.c:119
-#: ../src/connection-editor/page-vpn.c:112
+msgstr "çç"
+
+#: ../src/connection-editor/new-connection.c:143
+#: ../src/connection-editor/page-bridge.c:211
+#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+msgid "Bridge"
+msgstr "ææ"
+
+#: ../src/connection-editor/new-connection.c:149
+#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:341
+#: ../src/libnm-gtk/nm-ui-utils.c:563
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../src/connection-editor/new-connection.c:162
+#: ../src/connection-editor/new-connection.c:302
+#: ../src/connection-editor/page-vpn.c:113
msgid "VPN"
msgstr "VPN"
#: ../src/connection-editor/new-connection.c:252
+msgid "Hardware"
+msgstr "çä"
+
+#: ../src/connection-editor/new-connection.c:272
+msgid "Virtual"
+msgstr "èæ"
+
+#: ../src/connection-editor/new-connection.c:340
+#: ../src/connection-editor/new-connection.c:342
msgid "Import a saved VPN configuration..."
msgstr "åååååç VPN çæâ"
-#: ../src/connection-editor/new-connection.c:274
+#: ../src/connection-editor/new-connection.c:371
msgid ""
"The connection editor dialog could not be initialized due to an unknown "
"error."
msgstr "çæäæçéèäéççèååèççæåååã"
-#: ../src/connection-editor/new-connection.c:283
+#: ../src/connection-editor/new-connection.c:380
msgid "Could not create new connection"
msgstr "çæåçæéç"
-#: ../src/connection-editor/new-connection.c:419
+#: ../src/connection-editor/new-connection.c:515
msgid "Connection delete failed"
msgstr "åééçåæ"
-#: ../src/connection-editor/new-connection.c:466
+#: ../src/connection-editor/new-connection.c:562
#, c-format
msgid "Are you sure you wish to delete the connection %s?"
msgstr "äçåèåééç %s ï"
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: ../src/connection-editor/nm-connection-editor.c:118
#, c-format
msgid "Editing %s"
msgstr "çè %s"
-#: ../src/connection-editor/nm-connection-editor.c:114
+#: ../src/connection-editor/nm-connection-editor.c:122
msgid "Editing un-named connection"
msgstr "çèæååçéç"
-#: ../src/connection-editor/nm-connection-editor.c:301
+#: ../src/connection-editor/nm-connection-editor.c:282
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:428
+#: ../src/connection-editor/nm-connection-editor.c:408
msgid "_Save"
msgstr "åå(_S)"
-#: ../src/connection-editor/nm-connection-editor.c:429
+#: ../src/connection-editor/nm-connection-editor.c:409
msgid "Save any changes made to this connection."
msgstr "ååääåéåéçéèçææã"
-#: ../src/connection-editor/nm-connection-editor.c:430
+#: ../src/connection-editor/nm-connection-editor.c:410
msgid "_Save..."
msgstr "åå(_S)â"
-#: ../src/connection-editor/nm-connection-editor.c:431
+#: ../src/connection-editor/nm-connection-editor.c:411
msgid "Authenticate to save this connection for all users of this machine."
msgstr "éèäååéåéççæéèäçææäçèã"
-#: ../src/connection-editor/nm-connection-editor.c:447
+#: ../src/connection-editor/nm-connection-editor.c:427
msgid "Could not create connection"
msgstr "çæåçéç"
-#: ../src/connection-editor/nm-connection-editor.c:447
+#: ../src/connection-editor/nm-connection-editor.c:427
msgid "Could not edit connection"
msgstr "çæçèéç"
-#: ../src/connection-editor/nm-connection-editor.c:449
+#: ../src/connection-editor/nm-connection-editor.c:429
msgid "Unknown error creating connection editor dialog."
msgstr "åçéççèååèçæççäæéèã"
-#: ../src/connection-editor/nm-connection-editor.c:555
+#: ../src/connection-editor/nm-connection-editor.c:536
msgid "Error saving connection"
msgstr "ååéçæéè"
-#: ../src/connection-editor/nm-connection-editor.c:556
+#: ../src/connection-editor/nm-connection-editor.c:537
#, c-format
msgid "The property '%s' / '%s' is invalid: %d"
msgstr "åæã%sã/ã%sãæçæçï%d"
-#: ../src/connection-editor/nm-connection-editor.c:658
+#: ../src/connection-editor/nm-connection-editor.c:631
msgid "Error initializing editor"
msgstr "åååçèåæççéè"
-#: ../src/connection-editor/nm-connection-editor.c:967
+#: ../src/connection-editor/nm-connection-editor.c:952
msgid "Connection add failed"
msgstr "æåéçåæ"
@@ -1820,14 +1929,6 @@ msgid "Connection _name:"
msgstr "éçåç(_N)ï"
#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connect _automatically"
-msgstr "èåéç(_A)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-msgid "A_vailable to all users"
-msgstr "ææäçèçåç"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
msgid "_Export..."
msgstr "åå(_E)â"
@@ -1871,117 +1972,150 @@ msgid "%d year ago"
msgid_plural "%d years ago"
msgstr[0] "%d åäå"
-#: ../src/connection-editor/nm-connection-list.c:626
+#: ../src/connection-editor/nm-connection-list.c:631
msgid "Name"
msgstr "åç"
-#: ../src/connection-editor/nm-connection-list.c:639
+#: ../src/connection-editor/nm-connection-list.c:644
msgid "Last Used"
msgstr "æåäçç"
-#: ../src/connection-editor/nm-connection-list.c:681
+#: ../src/connection-editor/nm-connection-list.c:686
msgid "Edit the selected connection"
msgstr "çèéåçéç"
-#: ../src/connection-editor/nm-connection-list.c:682
+#: ../src/connection-editor/nm-connection-list.c:687
msgid "_Edit..."
msgstr "çè(_E)â"
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:688
msgid "Authenticate to edit the selected connection"
msgstr "éèäçèéåçéç"
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:703
msgid "Delete the selected connection"
msgstr "åééåçéç"
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:704
msgid "_Delete..."
msgstr "åé(_D)â"
-#: ../src/connection-editor/nm-connection-list.c:700
+#: ../src/connection-editor/nm-connection-list.c:705
msgid "Authenticate to delete the selected connection"
msgstr "éèäåééåçéç"
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:942
msgid "Error creating connection"
msgstr "åçéçæççéè"
-#: ../src/connection-editor/nm-connection-list.c:938
+#: ../src/connection-editor/nm-connection-list.c:943
#, c-format
msgid "Don't know how to create '%s' connections"
msgstr "äçéåäåçã%sãéç"
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:998
msgid "Error editing connection"
msgstr "çèéçæççéè"
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:999
#, c-format
msgid "Did not find a connection with UUID '%s'"
msgstr "æäå UUIDã%sãçéç"
-#: ../src/connection-editor/page-8021x-security.c:120
+#: ../src/connection-editor/page-8021x-security.c:121
msgid "802.1x Security"
msgstr "802.1x éè"
-#: ../src/connection-editor/page-8021x-security.c:122
+#: ../src/connection-editor/page-8021x-security.c:123
msgid "Could not load 802.1x Security user interface."
msgstr "çæèå 802.1x ååæäçèäéã"
-#: ../src/connection-editor/page-8021x-security.c:140
+#: ../src/connection-editor/page-8021x-security.c:141
msgid "Use 802.1_X security for this connection"
msgstr "åéåéçäç 802.1_X éè"
-#: ../src/connection-editor/page-bond.c:559
-#, c-format
-msgid "%s slave %d"
-msgstr "%s æå %d"
-
-#: ../src/connection-editor/page-bond.c:749
-#, fuzzy
-#| msgid "Could not load DSL user interface."
+#: ../src/connection-editor/page-bond.c:422
msgid "Could not load bond user interface."
-msgstr "çæèå DSL äçèäéã"
+msgstr "çæèåçççäçèäéã"
-#: ../src/connection-editor/page-bond.c:909
-#, fuzzy, c-format
-#| msgid "InfiniBand connection %d"
+#: ../src/connection-editor/page-bond.c:561
+#, c-format
msgid "Bond connection %d"
-msgstr "æåääçéç"
+msgstr "çççéç %d"
+
+#: ../src/connection-editor/page-bridge.c:214
+msgid "Could not load bridge user interface."
+msgstr "çæèåææçäçèäéã"
+
+#: ../src/connection-editor/page-bridge.c:309
+#, c-format
+msgid "Bridge connection %d"
+msgstr "ææçéç %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:115
+msgid "Bridge Port"
+msgstr "ææéæå"
+
+#: ../src/connection-editor/page-bridge-port.c:117
+msgid "Could not load bridge port user interface."
+msgstr "çæèåææéæåäçèäéã"
-#: ../src/connection-editor/page-dsl.c:142
+#: ../src/connection-editor/page-dsl.c:143
msgid "Could not load DSL user interface."
msgstr "çæèå DSL äçèäéã"
-#: ../src/connection-editor/page-dsl.c:234
+#: ../src/connection-editor/page-dsl.c:235
#, c-format
msgid "DSL connection %d"
msgstr "DSL éç %d"
-#: ../src/connection-editor/page-ethernet.c:89
+#: ../src/connection-editor/page-ethernet.c:90
#: ../src/connection-editor/page-infiniband.c:74
-#: ../src/connection-editor/page-wifi.c:94
+#: ../src/connection-editor/page-wifi.c:113
#: ../src/connection-editor/page-wimax.c:70
msgid ""
"This option locks this connection to the network device specified by its "
"permanent MAC address entered here. Example: 00:11:22:33:44:55"
msgstr "æééæåæéçéåèåææèåç MAC äåææåçççèçãäåï00:11:22:33:44:55"
-#: ../src/connection-editor/page-ethernet.c:276
+#: ../src/connection-editor/page-ethernet.c:253
msgid "Could not load ethernet user interface."
msgstr "çæèåæçççäçèäéã"
-#: ../src/connection-editor/page-ethernet.c:452
+#: ../src/connection-editor/page-ethernet.c:396
#, c-format
msgid "Ethernet connection %d"
msgstr "çççéç %d"
-#: ../src/connection-editor/page-infiniband.c:193
+#. TRANSLATORS: Default zone set for firewall, when no zone is selected
+#: ../src/connection-editor/page-general.c:57
+#: ../src/libnm-gtk/nm-mobile-providers.c:808
+msgid "Default"
+msgstr "éè"
+
+#: ../src/connection-editor/page-general.c:58
+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 "
+"firewall. Only usable if firewalld is active."
+msgstr "åçéçääçççååãéèåäææåçååïéæåæçæäçéççäéèçååèåãåæå firewalld åçææçã"
+
+#: ../src/connection-editor/page-general.c:59
+msgid "FirewallD is not running."
+msgstr "FirewallD ææåèã"
+
+#: ../src/connection-editor/page-general.c:330
+msgid "Could not load General user interface."
+msgstr "çæèåäèäçèäéã"
+
+#: ../src/connection-editor/page-infiniband.c:171
msgid "Could not load InfiniBand user interface."
msgstr "çæèå InfiniBand äçèäéã"
-#: ../src/connection-editor/page-infiniband.c:318
+#: ../src/connection-editor/page-infiniband.c:263
#, c-format
msgid "InfiniBand connection %d"
msgstr "InfiniBand éç %d"
@@ -2043,16 +2177,16 @@ msgstr "éåç _DNS äæåï"
msgid "Additional s_earch domains:"
msgstr "éåçæåçåï domains:"
-#: ../src/connection-editor/page-ip4.c:843
+#: ../src/connection-editor/page-ip4.c:860
#, c-format
msgid "Editing IPv4 routes for %s"
msgstr "çè %s ç IPv4 èç"
-#: ../src/connection-editor/page-ip4.c:993
+#: ../src/connection-editor/page-ip4.c:1011
msgid "IPv4 Settings"
msgstr "IPv4 èå"
-#: ../src/connection-editor/page-ip4.c:995
+#: ../src/connection-editor/page-ip4.c:1013
msgid "Could not load IPv4 user interface."
msgstr "çæèå IPv4 äçèäéã"
@@ -2069,46 +2203,61 @@ msgstr "åç"
msgid "Automatic, DHCP only"
msgstr "èåïåäç DHCP"
-#: ../src/connection-editor/page-ip6.c:809
+#: ../src/connection-editor/page-ip6.c:826
#, c-format
msgid "Editing IPv6 routes for %s"
msgstr "ç %s çè IPv6 èç"
-#: ../src/connection-editor/page-ip6.c:957
+#: ../src/connection-editor/page-ip6.c:975
msgid "IPv6 Settings"
msgstr "IPv6 èå"
-#: ../src/connection-editor/page-ip6.c:959
+#: ../src/connection-editor/page-ip6.c:977
msgid "Could not load IPv6 user interface."
msgstr "çæèå IPv6 äçèäéã"
-#: ../src/connection-editor/page-mobile.c:382
+#: ../src/connection-editor/page-master.c:290
+#, c-format
+msgid "%s slave %d"
+msgstr "%s æå %d"
+
+#: ../src/connection-editor/page-mobile.c:391
msgid "Could not load mobile broadband user interface."
msgstr "çæèåæååéäçèäéã"
-#: ../src/connection-editor/page-mobile.c:399
+#: ../src/connection-editor/page-mobile.c:408
msgid "Unsupported mobile broadband connection type."
msgstr "äææçæååééçéåã"
#. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:643
+#: ../src/connection-editor/page-mobile.c:658
msgid "Select Mobile Broadband Provider Type"
msgstr "éææååéäæåéå"
-#: ../src/connection-editor/page-mobile.c:678
+#: ../src/connection-editor/page-mobile.c:693
msgid ""
"Select the technology your mobile broadband provider uses. If you are "
"unsure, ask your provider."
msgstr "èéæäçççåéäæåæäççæèãåæääçåïèæèäæåã"
-#: ../src/connection-editor/page-mobile.c:683
+#: ../src/connection-editor/page-mobile.c:698
msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
msgstr "æçäæåäç _GSM çäçæèïäå GPRSãEDGEãUMTSãHSDPAï"
-#: ../src/connection-editor/page-mobile.c:690
+#: ../src/connection-editor/page-mobile.c:705
msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
msgstr "æçäæåäç C_DMA çäçæèïäå 1xRTTãEVDOï"
+#: ../src/connection-editor/page-mobile.c:715 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:268
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:718 ../src/mb-menu-item.c:58
+#: ../src/mobile-helpers.c:266
+msgid "GSM"
+msgstr "GSM"
+
#: ../src/connection-editor/page-ppp.c:134
msgid "EAP"
msgstr "EAP"
@@ -2145,30 +2294,39 @@ msgstr "ææ"
msgid "Editing PPP authentication methods for %s"
msgstr "çè %s ç PPP éèææ"
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:284
msgid "PPP Settings"
msgstr "PPP èåå"
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:286
msgid "Could not load PPP user interface."
msgstr "çæèå PPP äçèäéã"
-#: ../src/connection-editor/page-vpn.c:114
+#: ../src/connection-editor/page-vlan.c:482
+msgid "Could not load vlan user interface."
+msgstr "çæèå vlan äçèäéã"
+
+#: ../src/connection-editor/page-vlan.c:678
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN éç %d"
+
+#: ../src/connection-editor/page-vpn.c:115
msgid "Could not load VPN user interface."
msgstr "çæèå VPN äçèäéã"
-#: ../src/connection-editor/page-vpn.c:129
+#: ../src/connection-editor/page-vpn.c:130
#, c-format
msgid "Could not find VPN plugin service for '%s'."
msgstr "æäåã%sãç VPN åæçåæåã"
-#: ../src/connection-editor/page-vpn.c:223
-#: ../src/connection-editor/page-vpn.c:320
+#: ../src/connection-editor/page-vpn.c:224
+#: ../src/connection-editor/page-vpn.c:321
#, c-format
msgid "VPN connection %d"
msgstr "VPN éç %d"
-#: ../src/connection-editor/page-vpn.c:249
+#: ../src/connection-editor/page-vpn.c:250
msgid ""
"The VPN plugin failed to import the VPN connection correctly\n"
"\n"
@@ -2178,34 +2336,40 @@ msgstr ""
"\n"
"éèïææ VPN æåéåã"
-#: ../src/connection-editor/page-vpn.c:274
+#: ../src/connection-editor/page-vpn.c:275
msgid "Choose a VPN Connection Type"
msgstr "èéæ VPN çéçéå"
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:276
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 "
"not have the correct VPN plugin installed."
msgstr "éæäæèçåæéçäç VPN éåãåæäæèåçç VPN éçéåææåçåæåäïåèæææåèæçç VPN åæçåã"
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:98
+msgid ""
+"This option locks this connection to the Wi-Fi access point (AP) specified "
+"by the BSSID entered here. Example: 00:11:22:33:44:55"
+msgstr "æééæåæéçéåèåææèåç BSSID ææåç Wi-Fi ååéïAPïãäåï00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:190
+#: ../src/connection-editor/page-wifi.c:194
+#: ../src/connection-editor/page-wifi.c:215
#, c-format
msgid "default"
msgstr "éè"
-#: ../src/connection-editor/page-wifi.c:200
+#: ../src/connection-editor/page-wifi.c:219
#, c-format
msgid "%u (%u MHz)"
msgstr "%u (%u MHz)"
-#: ../src/connection-editor/page-wifi.c:465
+#: ../src/connection-editor/page-wifi.c:473
msgid "Could not load Wi-Fi user interface."
msgstr "çæèå Wi-Fi äçèäéã"
-#: ../src/connection-editor/page-wifi.c:670
+#: ../src/connection-editor/page-wifi.c:650
#, c-format
msgid "Wi-Fi connection %d"
msgstr "Wi-Fi éç %d"
@@ -2216,27 +2380,27 @@ msgid "None"
msgstr "ææ"
#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:903
+#: ../src/libnm-gtk/nm-wifi-dialog.c:898
msgid "WEP 40/128-bit Key (Hex or ASCII)"
msgstr "WEP 40/128-äå åçå (Hex æ ASCII)"
#: ../src/connection-editor/page-wifi-security.c:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:912
+#: ../src/libnm-gtk/nm-wifi-dialog.c:907
msgid "WEP 128-bit Passphrase"
msgstr "WEP 128-äå åè"
#: ../src/connection-editor/page-wifi-security.c:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:942
+#: ../src/libnm-gtk/nm-wifi-dialog.c:937
msgid "Dynamic WEP (802.1x)"
msgstr "åæ WEP (802.1x)"
#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:956
+#: ../src/libnm-gtk/nm-wifi-dialog.c:951
msgid "WPA & WPA2 Personal"
msgstr "WPA & WPA2 åäç"
#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:970
+#: ../src/libnm-gtk/nm-wifi-dialog.c:965
msgid "WPA & WPA2 Enterprise"
msgstr "WPA & WPA2 äæç"
@@ -2244,19 +2408,19 @@ msgstr "WPA & WPA2 äæç"
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:406
+#: ../src/connection-editor/page-wifi-security.c:407
msgid "Wi-Fi Security"
msgstr "Wi-Fi ååæ"
-#: ../src/connection-editor/page-wifi-security.c:408
+#: ../src/connection-editor/page-wifi-security.c:409
msgid "Could not load Wi-Fi security user interface."
msgstr "çæèå Wi-Fi ååæäçèäéã"
-#: ../src/connection-editor/page-wimax.c:161
+#: ../src/connection-editor/page-wimax.c:137
msgid "Could not load WiMAX user interface."
msgstr "çæèå WiMAX äçèäéã"
-#: ../src/connection-editor/page-wimax.c:290
+#: ../src/connection-editor/page-wimax.c:233
#, c-format
msgid "WiMAX connection %d"
msgstr "WiMAX éç %d"
@@ -2340,62 +2504,66 @@ msgstr "äçææäçççèçïPAN/NAPï"
msgid "Access the Internet using your mobile phone (DUN)"
msgstr "äçææååäèçïDUNï"
-#: ../src/gnome-bluetooth/nma-bt-device.c:318
+#: ../src/gnome-bluetooth/nma-bt-device.c:336
#, c-format
msgid "Error: %s"
msgstr "éèï%s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:425
+#: ../src/gnome-bluetooth/nma-bt-device.c:443
#, c-format
msgid "Failed to create DUN connection: %s"
msgstr "çæåç DUN éçï%s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:427
-#: ../src/gnome-bluetooth/nma-bt-device.c:833
+#: ../src/gnome-bluetooth/nma-bt-device.c:445
+#: ../src/gnome-bluetooth/nma-bt-device.c:959
msgid "Your phone is now ready to use!"
msgstr "äçéèçååçåääçï"
-#: ../src/gnome-bluetooth/nma-bt-device.c:450
+#: ../src/gnome-bluetooth/nma-bt-device.c:468
msgid "Mobile wizard was canceled"
msgstr "èåçéåçåæ"
-#: ../src/gnome-bluetooth/nma-bt-device.c:459
+#: ../src/gnome-bluetooth/nma-bt-device.c:477
msgid "Unknown phone device type (not GSM or CDMA)"
msgstr "äæçéèèçéåïé GSM æ CDMAï"
-#: ../src/gnome-bluetooth/nma-bt-device.c:567
+#: ../src/gnome-bluetooth/nma-bt-device.c:513
msgid "unknown modem type."
msgstr "äæçæææéåã"
-#: ../src/gnome-bluetooth/nma-bt-device.c:639
-#: ../src/gnome-bluetooth/nma-bt-device.c:645
+#: ../src/gnome-bluetooth/nma-bt-device.c:733
+#: ../src/gnome-bluetooth/nma-bt-device.c:739
msgid "failed to connect to the phone."
msgstr "çæéçèéèã"
-#: ../src/gnome-bluetooth/nma-bt-device.c:676
+#: ../src/gnome-bluetooth/nma-bt-device.c:770
msgid "unexpectedly disconnected from the phone."
msgstr "éèçéæéçã"
-#: ../src/gnome-bluetooth/nma-bt-device.c:686
+#: ../src/gnome-bluetooth/nma-bt-device.c:780
msgid "timed out detecting phone details."
msgstr "åæéååæäåéèçèçèæã"
-#: ../src/gnome-bluetooth/nma-bt-device.c:697
+#: ../src/gnome-bluetooth/nma-bt-device.c:791
msgid "Detecting phone configuration..."
msgstr "åæéèçéçâ"
-#: ../src/gnome-bluetooth/nma-bt-device.c:794
+#: ../src/gnome-bluetooth/nma-bt-device.c:823
+msgid "error getting bus connection"
+msgstr "åååææéçæççéè"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:920
msgid ""
"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
"Networking connection."
msgstr "éèçèçéæååéåèåæèççéçååçã"
-#: ../src/gnome-bluetooth/nma-bt-device.c:831
+#: ../src/gnome-bluetooth/nma-bt-device.c:957
#, c-format
msgid "Failed to create PAN connection: %s"
msgstr "çæåç PAN éçï%s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:852
+#: ../src/gnome-bluetooth/nma-bt-device.c:978
#, c-format
msgid "%s Network"
msgstr "%s çç"
@@ -2416,27 +2584,27 @@ msgstr "éçèè"
msgid "Active Network Connections"
msgstr "åçççéç"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:207
+#: ../src/libnm-gtk/nm-mobile-wizard.c:208
msgid ""
"Your mobile broadband connection is configured with the following settings:"
msgstr "èååéçåçéçäääèåï"
#. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:214
+#: ../src/libnm-gtk/nm-mobile-wizard.c:215
msgid "Your Device:"
msgstr "äçèç:"
#. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:225
+#: ../src/libnm-gtk/nm-mobile-wizard.c:226
msgid "Your Provider:"
msgstr "äçäæå:"
#. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:236
+#: ../src/libnm-gtk/nm-mobile-wizard.c:237
msgid "Your Plan:"
msgstr "äçèå:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
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 "
@@ -2445,23 +2613,23 @@ msgid ""
"Preferences menu."
msgstr "çåïææäæéåçèåïéèåéääçæååéäæåãåæéçåæïææäçæååççèæïèææèåãèäææååééççèåïèåãççã >> ãååèåãäïéæãççéçãã"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:273
+#: ../src/libnm-gtk/nm-mobile-wizard.c:274
msgid "Confirm Mobile Broadband Settings"
msgstr "çèæååéèå"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:337
+#: ../src/libnm-gtk/nm-mobile-wizard.c:338
msgid "Unlisted"
msgstr "æååç"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:492
+#: ../src/libnm-gtk/nm-mobile-wizard.c:493
msgid "_Select your plan:"
msgstr "éæäçèå(_S)ï"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:516
+#: ../src/libnm-gtk/nm-mobile-wizard.c:517
msgid "Selected plan _APN (Access Point Name):"
msgstr "éæèåç _APNïAccess Point Nameïååéåçïï"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:540
+#: ../src/libnm-gtk/nm-mobile-wizard.c:541
msgid ""
"Warning: Selecting an incorrect plan may result in billing issues for your "
"broadband account or may prevent connectivity.\n"
@@ -2472,147 +2640,183 @@ msgstr ""
"\n"
"åæääçåæäççèåïèæèäæåïäåçèåç APN çäã"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:547
+#: ../src/libnm-gtk/nm-mobile-wizard.c:548
msgid "Choose your Billing Plan"
msgstr "éæäçèèèå"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:596
+#: ../src/libnm-gtk/nm-mobile-wizard.c:597
msgid "My plan is not listed..."
msgstr "æçèåææååâ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnm-gtk/nm-mobile-wizard.c:754
msgid "Select your provider from a _list:"
msgstr "èåæåèéæäæå(_L):"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:766
+#: ../src/libnm-gtk/nm-mobile-wizard.c:767
msgid "Provider"
msgstr "äæå"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
msgid "I can't find my provider and I wish to enter it _manually:"
msgstr "ææäåæçäæåïææèæåèå(_M):"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:802
+#: ../src/libnm-gtk/nm-mobile-wizard.c:803
msgid "Provider:"
msgstr "äæåï"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:826
+#: ../src/libnm-gtk/nm-mobile-wizard.c:827
msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
msgstr "æçäæåäç GSM æèïGPRSãEDGEãUMTSãHSPAï"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:832
+#: ../src/libnm-gtk/nm-mobile-wizard.c:833
msgid "My provider uses CDMA technology (1xRTT, EVDO)"
msgstr "æçäæåäç CDMA æèï1xRTTãEVDOï"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:843
+#: ../src/libnm-gtk/nm-mobile-wizard.c:844
msgid "Choose your Provider"
msgstr "éæäçäæå"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1094
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
msgid "Country or Region List:"
msgstr "ååæååæåï"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1106
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
msgid "Country or region"
msgstr "ååæåå"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
msgid "My country is not listed"
msgstr "æçååäææååä"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1159
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
msgid "Choose your Provider's Country or Region"
msgstr "éæäçäæåçååæåå"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1213
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1227
msgid "Installed GSM device"
msgstr "ååèç GSM èç"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
msgid "Installed CDMA device"
msgstr "ååèç CDMA èç"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1388
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
msgid ""
"This assistant helps you easily set up a mobile broadband connection to a "
"cellular (3G) network."
msgstr "éèååäèæåèåæååééçïéèææï3Gïççã"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1393
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
msgid "You will need the following information:"
msgstr "äéèääèèï"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
msgid "Your broadband provider's name"
msgstr "åéäæåçåç"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
msgid "Your broadband billing plan name"
msgstr "åéèèèåçåç"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1420
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
msgstr "ïåæäææäïäçåéèèèåç APNïååéåçï"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1447
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
msgid "Create a connection for _this mobile broadband device:"
msgstr "çéåæååéèçåçéç(_T)"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1462
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
msgid "Any device"
msgstr "ääèç"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1475
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
msgid "Set up a Mobile Broadband Connection"
msgstr "èåæååééç"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1639
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
msgid "New Mobile Broadband Connection"
msgstr "æçæååééç"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:438
+#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
+msgid "Wired"
+msgstr "æç"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:327
+msgid "Bluetooth"
+msgstr "èç"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:329
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:405
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:407
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%$2s (%$1s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:437
msgid "New..."
msgstr "æåâ"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1057
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
msgid "C_reate"
msgstr "åç(_R)"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
#, c-format
msgid ""
"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
msgstr "éèåçææåååçåäåå Wi-Fi ççã%sãã"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1143
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
msgid "Wi-Fi Network Authentication Required"
msgstr "Wi-Fi ççéçã%sãéèéè"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
msgid "Authentication required by Wi-Fi network"
msgstr "Wi-Fi ççéçã%sãéèéè"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
msgid "Create New Wi-Fi Network"
msgstr "åçæç Wi-Fi çç"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
msgid "New Wi-Fi network"
msgstr "æç Wi-Fi çç"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
msgid "Enter a name for the Wi-Fi network you wish to create."
msgstr "èåäèåçç Wi-Fi çççåçã"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1155
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
msgid "Connect to Hidden Wi-Fi Network"
msgstr "éæåéèç Wi-Fi çç"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1157
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
msgid "Hidden Wi-Fi network"
msgstr "éèç Wi-Fi çç"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1158
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
msgid ""
"Enter the name and security details of the hidden Wi-Fi network you wish to "
"connect to."
@@ -2646,86 +2850,103 @@ msgid ""
"GNOME desktop environment."
msgstr "çäå GNOME æéçåäéèïèäæäçåäåã"
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:56
msgid "EVDO"
msgstr "EVDO"
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:60
msgid "GPRS"
msgstr "GPRS"
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:62
msgid "EDGE"
msgstr "EDGE"
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:64
msgid "UMTS"
msgstr "UMTS"
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:66
msgid "HSDPA"
msgstr "HSDPA"
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:68
msgid "HSUPA"
msgstr "HSUPA"
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:70
msgid "HSPA"
msgstr "HSPA"
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:72
+msgid "HSPA+"
+msgstr "HSPA+"
+
+#: ../src/mb-menu-item.c:76
+msgid "LTE"
+msgstr "LTE"
+
+#: ../src/mb-menu-item.c:112
msgid "not enabled"
msgstr "æåç"
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:118
msgid "not registered"
msgstr "æèå"
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:136
#, c-format
msgid "Home network (%s)"
msgstr "åçççï%sï"
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:138
#, c-format
msgid "Home network"
msgstr "åççç"
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:146
msgid "searching"
msgstr "æåä"
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:149
msgid "registration denied"
msgstr "èåèæ"
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
#, c-format
msgid "%s (%s roaming)"
msgstr "%s (%s æé)"
-#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:156 ../src/mb-menu-item.c:162
#, c-format
msgid "%s (roaming)"
msgstr "%sïæéï"
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:165
#, c-format
msgid "Roaming network (%s)"
msgstr "æéççï%sï"
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:167
#, c-format
msgid "Roaming network"
msgstr "æéçç"
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "éè"
+#: ../src/mobile-helpers.c:297
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "SIM åã%sãåã%sãç PIN ç"
+
+#: ../src/mobile-helpers.c:471
+msgid "PIN code required"
+msgstr "éè PIN ç"
+
+#: ../src/mobile-helpers.c:479
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "éåæååéèçéè PIN ç"
#. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:325
+#: ../src/utils/utils.c:174
#, c-format
msgid "%s connection"
msgstr "%s éç"
@@ -2808,7 +3029,7 @@ msgid "MD5"
msgstr "MD5"
#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
+#: ../src/wireless-security/eap-method-tls.c:434
#: ../src/wireless-security/eap-method-ttls.c:350
msgid "Choose a Certificate Authority certificate..."
msgstr "éæèæææåä(CA)èæâ"
@@ -2835,11 +3056,11 @@ msgstr "PEAP çæ(_V):"
msgid "As_k for this password every time"
msgstr "ææéèååç(_K)"
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:260
msgid "Unencrypted private keys are insecure"
msgstr "æååççååçåæäååç"
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../src/wireless-security/eap-method-tls.c:263
msgid ""
"The selected private key does not appear to be protected by a password. "
"This could allow your security credentials to be compromised. Please select "
@@ -2851,11 +3072,11 @@ msgstr ""
"\n"
"ïäåääç openssl äååäççååçåï"
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:428
msgid "Choose your personal certificate..."
msgstr "éæäçåäèæâ"
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:440
msgid "Choose your private key..."
msgstr "éæäççååçåâ"
@@ -2945,6 +3166,12 @@ msgstr "éçåçå(_W)"
msgid "WEP inde_x:"
msgstr "WEP çå(_X):"
+#~ msgid "Connect _automatically"
+#~ msgstr "èåéç(_A)"
+
+#~ msgid "A_vailable to all users"
+#~ msgstr "ææäçèçåç"
+
#~ msgid "An unknown error occurred."
#~ msgstr "ççäæçéèã"
@@ -2979,9 +3206,6 @@ msgstr "WEP çå(_X):"
#~ msgid "Wireless network connection '%s' active"
#~ msgstr "çççèéçã%sãåäçä"
-#~ msgid "Wired"
-#~ msgstr "æç"
-
#~ msgid "Could not load Wired Security security user interface."
#~ msgstr "çæèå Wired Security ååäçèäéã"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3c4420b..1d72769 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: network-manager-applet 0.9.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-21 19:45+0800\n"
-"PO-Revision-Date: 2012-08-21 13:16+0800\n"
+"POT-Creation-Date: 2013-01-30 14:41+0800\n"
+"PO-Revision-Date: 2013-01-28 20:20+0800\n"
"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
"Language-Team: Traditional Chinese <zh-l10n lists linux org tw>\n"
"Language: \n"
@@ -20,6 +20,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.5.4\n"
#: ../nm-applet.desktop.in.h:1
msgid "Network"
@@ -116,37 +117,37 @@ msgstr "802.1X éè"
msgid "_Network name:"
msgstr "çèåç(_N)ï"
-#: ../src/applet.c:512
+#: ../src/applet.c:545
msgid "Failed to add/activate connection"
msgstr "çæåå/äçéç"
-#: ../src/applet.c:514 ../src/applet.c:558 ../src/applet.c:584
-#: ../src/applet-device-wifi.c:1379 ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:547 ../src/applet.c:591 ../src/applet.c:617
+#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
msgid "Unknown error"
msgstr "äæçéè"
-#: ../src/applet.c:517 ../src/applet.c:587 ../src/applet-device-wifi.c:1382
-#: ../src/applet-device-wifi.c:1401
+#: ../src/applet.c:550 ../src/applet.c:620 ../src/applet-device-wifi.c:1379
+#: ../src/applet-device-wifi.c:1398
msgid "Connection failure"
msgstr "éçåæ"
-#: ../src/applet.c:556
+#: ../src/applet.c:589
msgid "Device disconnect failed"
msgstr "èçæçåæ"
-#: ../src/applet.c:561
+#: ../src/applet.c:594
msgid "Disconnect failure"
msgstr "æçåæ"
-#: ../src/applet.c:582
+#: ../src/applet.c:615
msgid "Connection activation failed"
msgstr "éççæåæ"
-#: ../src/applet.c:948 ../src/applet-device-wifi.c:1072
+#: ../src/applet.c:986 ../src/applet-device-wifi.c:1069
msgid "Don't show this message again"
msgstr "äèåéçéåèæ"
-#: ../src/applet.c:1037
+#: ../src/applet.c:1075
#, c-format
msgid ""
"\n"
@@ -156,7 +157,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåççèéçèäæäã"
-#: ../src/applet.c:1040
+#: ../src/applet.c:1078
#, c-format
msgid ""
"\n"
@@ -165,7 +166,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåç VPN æåæåçåæäã"
-#: ../src/applet.c:1043
+#: ../src/applet.c:1081
#, c-format
msgid ""
"\n"
@@ -175,7 +176,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåç VPN æåååçæççæã"
-#: ../src/applet.c:1046
+#: ../src/applet.c:1084
#, c-format
msgid ""
"\n"
@@ -184,7 +185,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåçéççåèåéæã"
-#: ../src/applet.c:1049
+#: ../src/applet.c:1087
#, c-format
msgid ""
"\n"
@@ -193,7 +194,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåç VPN æåææåæååã"
-#: ../src/applet.c:1052
+#: ../src/applet.c:1090
#, c-format
msgid ""
"\n"
@@ -202,7 +203,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåç VPN æååååæã"
-#: ../src/applet.c:1055
+#: ../src/applet.c:1093
#, c-format
msgid ""
"\n"
@@ -211,7 +212,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåçææææç VPN æåã"
-#: ../src/applet.c:1058
+#: ../src/applet.c:1096
#, c-format
msgid ""
"\n"
@@ -220,7 +221,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåççæç VPN æåã"
-#: ../src/applet.c:1065
+#: ../src/applet.c:1103
#, c-format
msgid ""
"\n"
@@ -229,7 +230,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæã"
-#: ../src/applet.c:1083
+#: ../src/applet.c:1121
#, c-format
msgid ""
"\n"
@@ -239,7 +240,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåççèéçäæäã"
-#: ../src/applet.c:1086
+#: ../src/applet.c:1124
#, c-format
msgid ""
"\n"
@@ -248,7 +249,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæïåç VPN æåååæã"
-#: ../src/applet.c:1092
+#: ../src/applet.c:1130
#, c-format
msgid ""
"\n"
@@ -257,7 +258,7 @@ msgstr ""
"\n"
"VPN éçã%sãåæçã"
-#: ../src/applet.c:1122
+#: ../src/applet.c:1160
#, c-format
msgid ""
"VPN connection has been successfully established.\n"
@@ -267,19 +268,19 @@ msgstr ""
"VPN éçåæåçã\n"
"%s\n"
-#: ../src/applet.c:1124
+#: ../src/applet.c:1162
msgid "VPN connection has been successfully established.\n"
msgstr "VPN éçåæåçã\n"
-#: ../src/applet.c:1126
+#: ../src/applet.c:1164
msgid "VPN Login Message"
msgstr "VPN çéèæ"
-#: ../src/applet.c:1132 ../src/applet.c:1140 ../src/applet.c:1190
+#: ../src/applet.c:1170 ../src/applet.c:1178 ../src/applet.c:1228
msgid "VPN Connection Failed"
msgstr "VPN éçåæ"
-#: ../src/applet.c:1197
+#: ../src/applet.c:1235
#, c-format
msgid ""
"\n"
@@ -292,7 +293,7 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1200
+#: ../src/applet.c:1238
#, c-format
msgid ""
"\n"
@@ -305,247 +306,235 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1520
+#: ../src/applet.c:1553
msgid "device not ready (firmware missing)"
msgstr "èçåæåç (çåéé)"
-#: ../src/applet.c:1522
+#: ../src/applet.c:1555
msgid "device not ready"
msgstr "èçåæåç"
#. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1532 ../src/applet-device-ethernet.c:232
+#: ../src/applet.c:1565 ../src/applet-device-ethernet.c:229
msgid "disconnected"
msgstr "åæç"
-#: ../src/applet.c:1548
+#: ../src/applet.c:1581
msgid "Disconnect"
msgstr "æç"
-#: ../src/applet.c:1562
+#: ../src/applet.c:1595
msgid "device not managed"
msgstr "èççæçç"
-#: ../src/applet.c:1606
+#: ../src/applet.c:1639
msgid "No network devices available"
msgstr "ææåçççèèç"
-#: ../src/applet.c:1694
+#: ../src/applet.c:1727
msgid "_VPN Connections"
msgstr "_VPN éç"
-#: ../src/applet.c:1751
+#: ../src/applet.c:1784
msgid "_Configure VPN..."
msgstr "èç VPN(_C)â"
-#: ../src/applet.c:1755
+#: ../src/applet.c:1788
msgid "_Disconnect VPN"
msgstr "è VPN æç(_D)"
-#: ../src/applet.c:1849
+#: ../src/applet.c:1882
msgid "NetworkManager is not running..."
msgstr "NetworkManager ææåèâ."
-#: ../src/applet.c:1854 ../src/applet.c:2656
+#: ../src/applet.c:1887 ../src/applet.c:2739
msgid "Networking disabled"
msgstr "çèååç"
#. 'Enable Networking' item
-#: ../src/applet.c:2075
+#: ../src/applet.c:2108
msgid "Enable _Networking"
msgstr "åççè(_N)"
#. 'Enable Wi-Fi' item
-#: ../src/applet.c:2084
+#: ../src/applet.c:2117
msgid "Enable _Wi-Fi"
msgstr "åç _Wi-Fi"
#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2093
+#: ../src/applet.c:2126
msgid "Enable _Mobile Broadband"
msgstr "åçèååé(_M)"
#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2102
+#: ../src/applet.c:2135
msgid "Enable WiMA_X Mobile Broadband"
msgstr "åç WiMA_X èååé"
#. Toggle notifications item
-#: ../src/applet.c:2113
+#: ../src/applet.c:2146
msgid "Enable N_otifications"
msgstr "åçéçåè(_O)"
#. 'Connection Information' item
-#: ../src/applet.c:2124
+#: ../src/applet.c:2157
msgid "Connection _Information"
msgstr "éçèè(_I)"
#. 'Edit Connections...' item
-#: ../src/applet.c:2134
+#: ../src/applet.c:2167
msgid "Edit Connections..."
msgstr "çèéçâ"
#. Help item
-#: ../src/applet.c:2148
+#: ../src/applet.c:2181
msgid "_Help"
msgstr "æå(_H)"
#. About item
-#: ../src/applet.c:2157
+#: ../src/applet.c:2190
msgid "_About"
msgstr "éæ(_A)"
-#: ../src/applet.c:2335
+#: ../src/applet.c:2368
msgid "Disconnected"
msgstr "åæç"
-#: ../src/applet.c:2336
+#: ../src/applet.c:2369
msgid "The network connection has been disconnected."
msgstr "çèéçåäæã"
-#: ../src/applet.c:2519
+#: ../src/applet.c:2602
#, c-format
msgid "Preparing network connection '%s'..."
msgstr "æåæåçèéçã%sãâ"
-#: ../src/applet.c:2522
+#: ../src/applet.c:2605
#, c-format
msgid "User authentication required for network connection '%s'..."
msgstr "çèéçã%sãéèäçèéèâ"
-#: ../src/applet.c:2525 ../src/applet-device-bt.c:239
-#: ../src/applet-device-cdma.c:487 ../src/applet-device-gsm.c:535
-#: ../src/applet-device-wimax.c:473
+#: ../src/applet.c:2608 ../src/applet-device-bt.c:235
+#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:615
#, c-format
msgid "Requesting a network address for '%s'..."
msgstr "æåèææäã%sãççèäåâ"
-#: ../src/applet.c:2528
+#: ../src/applet.c:2611
#, c-format
msgid "Network connection '%s' active"
msgstr "çèéçã%sãåäçä"
-#: ../src/applet.c:2611
+#: ../src/applet.c:2694
#, c-format
msgid "Starting VPN connection '%s'..."
msgstr "æååå VPN éçã%sãâ"
-#: ../src/applet.c:2614
+#: ../src/applet.c:2697
#, c-format
msgid "User authentication required for VPN connection '%s'..."
msgstr "VPN éçã%sãéèäçèéèâ"
-#: ../src/applet.c:2617
+#: ../src/applet.c:2700
#, c-format
msgid "Requesting a VPN address for '%s'..."
msgstr "æåèæ VPN æäã%sãççèäåâ"
-#: ../src/applet.c:2620
+#: ../src/applet.c:2703
#, c-format
msgid "VPN connection '%s' active"
msgstr "VPN éçã%sãåäçä"
-#: ../src/applet.c:2661
+#: ../src/applet.c:2744
msgid "No network connection"
msgstr "ææçèéæ"
-#: ../src/applet.c:3361
+#: ../src/applet.c:3445
msgid "NetworkManager Applet"
msgstr "NetworkManager éæçå"
-#: ../src/applet-device-bt.c:173 ../src/applet-device-cdma.c:396
-#: ../src/applet-device-ethernet.c:240 ../src/applet-device-gsm.c:444
-#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
+#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
+#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:767
+#: ../src/applet-device-gsm.c:357 ../src/applet-device-wifi.c:859
+#: ../src/applet-device-wimax.c:275
msgid "Available"
msgstr "åç"
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:438
-#: ../src/applet-device-ethernet.c:269 ../src/applet-device-gsm.c:486
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
+#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:811
+#: ../src/applet-device-gsm.c:399 ../src/applet-device-wimax.c:419
#, c-format
msgid "You are now connected to '%s'."
msgstr "æçååéçèã%sãã"
-#: ../src/applet-device-bt.c:203 ../src/applet-device-cdma.c:442
-#: ../src/applet-device-ethernet.c:273 ../src/applet-device-gsm.c:490
-#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
+#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
+#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:815
+#: ../src/applet-device-gsm.c:403 ../src/applet-device-wifi.c:1261
+#: ../src/applet-device-wimax.c:423
msgid "Connection Established"
msgstr "ååçéç"
-#: ../src/applet-device-bt.c:204
+#: ../src/applet-device-bt.c:200
msgid "You are now connected to the mobile broadband network."
msgstr "æçååéçèèååéçèã"
-#: ../src/applet-device-bt.c:230 ../src/applet-device-cdma.c:478
-#: ../src/applet-device-gsm.c:526 ../src/applet-device-wimax.c:464
+#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
+#: ../src/mobile-helpers.c:606
#, c-format
msgid "Preparing mobile broadband connection '%s'..."
msgstr "æåæåèååééçã%sãâ"
-#: ../src/applet-device-bt.c:233 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:529 ../src/applet-device-wimax.c:467
+#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
+#: ../src/mobile-helpers.c:609
#, c-format
msgid "Configuring mobile broadband connection '%s'..."
msgstr "æåèåèååééçã%sãâ"
-#: ../src/applet-device-bt.c:236 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:470
+#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
+#: ../src/mobile-helpers.c:612
#, c-format
msgid "User authentication required for mobile broadband connection '%s'..."
msgstr "èååééçã%sãéèäçèéèâ"
-#: ../src/applet-device-bt.c:243 ../src/applet-device-cdma.c:505
-#: ../src/applet-device-gsm.c:553
+#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:632
#, c-format
msgid "Mobile broadband connection '%s' active"
msgstr "èååééçã%sãåäçä"
-#: ../src/applet-device-cdma.c:181 ../src/connection-editor/page-mobile.c:700
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
-
-#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:390
-#: ../src/applet-dialogs.c:424
+#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:713
+#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:424
#, c-format
msgid "Mobile Broadband (%s)"
msgstr "èååé (%s)"
-#: ../src/applet-device-cdma.c:344 ../src/applet-device-gsm.c:392
-#: ../src/connection-editor/new-connection.c:87
-#: ../src/connection-editor/page-mobile.c:380
+#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:715
+#: ../src/applet-device-gsm.c:305
+#: ../src/connection-editor/new-connection.c:113
+#: ../src/connection-editor/page-mobile.c:389
+#: ../src/libnm-gtk/nm-ui-utils.c:333
msgid "Mobile Broadband"
msgstr "èååé"
#. Default connection item
-#: ../src/applet-device-cdma.c:409
+#: ../src/applet-device-cdma.c:316
msgid "New Mobile Broadband (CDMA) connection..."
msgstr "æçèååé (CDMA) éçâ"
-#: ../src/applet-device-cdma.c:443
+#: ../src/applet-device-cdma.c:350
msgid "You are now connected to the CDMA network."
msgstr "æçååéçè CDMA çèã"
-#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:548
-#: ../src/applet-device-wimax.c:482
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "èååééçã%sãåäçäï(%d%%%s%s)"
-
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:551
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "æé"
-
-#: ../src/applet-device-cdma.c:644 ../src/applet-device-cdma.c:650
+#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
msgid "CDMA network."
msgstr "CDMA çèã"
-#: ../src/applet-device-cdma.c:645 ../src/applet-device-gsm.c:1196
+#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:953
+#: ../src/applet-device-gsm.c:677
msgid "You are now registered on the home network."
msgstr "æçååèåèåççèã"
-#: ../src/applet-device-cdma.c:651 ../src/applet-device-gsm.c:1202
+#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:959
+#: ../src/applet-device-gsm.c:683
msgid "You are now registered on a roaming network."
msgstr "æçååèåèæéçèã"
@@ -553,281 +542,223 @@ msgstr "æçååèåèæéçèã"
msgid "Auto Ethernet"
msgstr "èåäåçè"
-#: ../src/applet-device-ethernet.c:205
+#: ../src/applet-device-ethernet.c:202
#, c-format
msgid "Ethernet Networks (%s)"
msgstr "æççè (%s)"
-#: ../src/applet-device-ethernet.c:207
+#: ../src/applet-device-ethernet.c:204
#, c-format
msgid "Ethernet Network (%s)"
msgstr "æççè (%s)"
-#: ../src/applet-device-ethernet.c:210
+#: ../src/applet-device-ethernet.c:207
msgid "Ethernet Networks"
msgstr "æççè"
-#: ../src/applet-device-ethernet.c:212
+#: ../src/applet-device-ethernet.c:209
msgid "Ethernet Network"
msgstr "æççè"
-#: ../src/applet-device-ethernet.c:274
+#: ../src/applet-device-ethernet.c:271
msgid "You are now connected to the ethernet network."
msgstr "æçååéçèæççèã"
-#: ../src/applet-device-ethernet.c:300
+#: ../src/applet-device-ethernet.c:297
#, c-format
msgid "Preparing ethernet network connection '%s'..."
msgstr "æåæåæççèéçã%sãâ"
-#: ../src/applet-device-ethernet.c:303
+#: ../src/applet-device-ethernet.c:300
#, c-format
msgid "Configuring ethernet network connection '%s'..."
msgstr "æåèåæççèéçã%sãâ"
-#: ../src/applet-device-ethernet.c:306
+#: ../src/applet-device-ethernet.c:303
#, c-format
msgid "User authentication required for ethernet network connection '%s'..."
msgstr "æççèéçã%sãéèäçèéèâ"
-#: ../src/applet-device-ethernet.c:309
+#: ../src/applet-device-ethernet.c:306
#, c-format
msgid "Requesting an ethernet network address for '%s'..."
msgstr "æèææççèã%sãæäçèäåâ"
-#: ../src/applet-device-ethernet.c:313
+#: ../src/applet-device-ethernet.c:310
#, c-format
msgid "Ethernet network connection '%s' active"
msgstr "æççèéçã%sãåäçä"
-#: ../src/applet-device-ethernet.c:494
+#: ../src/applet-device-ethernet.c:491
msgid "DSL authentication"
msgstr "DSL éè"
-#: ../src/applet-device-gsm.c:211 ../src/connection-editor/page-mobile.c:703
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:457
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "æçèååé (GSM) éçâ"
-
-#: ../src/applet-device-gsm.c:491
-msgid "You are now connected to the GSM network."
-msgstr "æçååéçè GSM çèã"
-
-#: ../src/applet-device-gsm.c:652
-msgid "PIN code required"
-msgstr "éè PIN ç"
-
-#: ../src/applet-device-gsm.c:660
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "éåèååéèçéè PIN ç"
-
-#: ../src/applet-device-gsm.c:781
-#, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "SIM åã%sãåã%sãç PIN ç"
+#: ../src/applet-device-broadband.c:165 ../src/applet-device-gsm.c:518
+msgid "Wrong PUK code; please contact your provider."
+msgstr "PUK çéèïèèçæçäæåã"
-#: ../src/applet-device-gsm.c:873
+#: ../src/applet-device-broadband.c:207 ../src/applet-device-gsm.c:495
msgid "Wrong PIN code; please contact your provider."
msgstr "PIN çéèïèèçæçäæåã"
-#: ../src/applet-device-gsm.c:896
-msgid "Wrong PUK code; please contact your provider."
-msgstr "PUK çéèïèèçæçäæåã"
-
#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:923
+#: ../src/applet-device-broadband.c:258 ../src/applet-device-gsm.c:545
msgid "Sending unlock code..."
msgstr "çéèéççåçâ"
-#: ../src/applet-device-gsm.c:986
-msgid "SIM PIN unlock required"
-msgstr "éèèé SIM PIN ç"
-
-#: ../src/applet-device-gsm.c:987
-msgid "SIM PIN Unlock Required"
-msgstr "éèèé SIM PIN ç"
-
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:989
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr "èäçèååéèçã%sãäåïéè SIM PIN çã"
-
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:991
-msgid "PIN code:"
-msgstr "PIN çï"
-
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:995
-msgid "Show PIN code"
-msgstr "éç PIN ç"
-
-#: ../src/applet-device-gsm.c:998
-msgid "SIM PUK unlock required"
-msgstr "éèèé SIM PUK ç"
-
-#: ../src/applet-device-gsm.c:999
-msgid "SIM PUK Unlock Required"
-msgstr "éèèé SIM PUK ç"
-
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1001
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr "èäçèååéèçã%sãäåïéè SIM PUK çã"
+#. Default connection item
+#: ../src/applet-device-broadband.c:780
+msgid "New Mobile Broadband connection..."
+msgstr "æçèååééçâ"
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1003
-msgid "PUK code:"
-msgstr "PUK çï"
+#: ../src/applet-device-broadband.c:816
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "æçååéçèèååéçèã"
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1006
-msgid "New PIN code:"
-msgstr "æç PIN çï"
+#: ../src/applet-device-broadband.c:952 ../src/applet-device-broadband.c:958
+msgid "Mobile Broadband network."
+msgstr "èååéçèã"
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "Re-enter new PIN code:"
-msgstr "éæèå PIN çï"
+#. Default connection item
+#: ../src/applet-device-gsm.c:370
+msgid "New Mobile Broadband (GSM) connection..."
+msgstr "æçèååé (GSM) éçâ"
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1013
-msgid "Show PIN/PUK codes"
-msgstr "éç PIN/PUK ç"
+#: ../src/applet-device-gsm.c:404
+msgid "You are now connected to the GSM network."
+msgstr "æçååéçè GSM çèã"
-#: ../src/applet-device-gsm.c:1195 ../src/applet-device-gsm.c:1201
+#: ../src/applet-device-gsm.c:676 ../src/applet-device-gsm.c:682
msgid "GSM network."
msgstr "GSM çèã"
-#: ../src/applet-device-wifi.c:97
+#: ../src/applet-device-wifi.c:98
msgid "_Connect to Hidden Wi-Fi Network..."
msgstr "éæåéèç Wi-Fi çè(_C)â"
-#: ../src/applet-device-wifi.c:148
+#: ../src/applet-device-wifi.c:149
msgid "Create _New Wi-Fi Network..."
msgstr "åçæç Wi-Fi çè(_N)â"
-#: ../src/applet-device-wifi.c:292
+#: ../src/applet-device-wifi.c:293
msgid "(none)"
msgstr "(ç)"
-#: ../src/applet-device-wifi.c:790
+#: ../src/applet-device-wifi.c:787
#, c-format
msgid "Wi-Fi Networks (%s)"
msgstr "Wi-Fi çè (%s)"
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:789
#, c-format
msgid "Wi-Fi Network (%s)"
msgstr "Wi-Fi çè (%s)"
-#: ../src/applet-device-wifi.c:794
+#: ../src/applet-device-wifi.c:791
msgid "Wi-Fi Network"
msgid_plural "Wi-Fi Networks"
msgstr[0] "Wi-Fi çè"
-#: ../src/applet-device-wifi.c:827
+#: ../src/applet-device-wifi.c:824
msgid "Wi-Fi is disabled"
msgstr "Wi-Fi ååç"
-#: ../src/applet-device-wifi.c:828
+#: ../src/applet-device-wifi.c:825
msgid "Wi-Fi is disabled by hardware switch"
msgstr "Wi-Fi åèçéééåç"
-#: ../src/applet-device-wifi.c:889
+#: ../src/applet-device-wifi.c:886
msgid "More networks"
msgstr "æåçè"
-#: ../src/applet-device-wifi.c:1068
+#: ../src/applet-device-wifi.c:1065
msgid "Wi-Fi Networks Available"
msgstr "æ Wi-Fi çèåç"
-#: ../src/applet-device-wifi.c:1069
+#: ../src/applet-device-wifi.c:1066
msgid "Use the network menu to connect to a Wi-Fi network"
msgstr "äççèéåäéçå Wi-Fi çè"
-#: ../src/applet-device-wifi.c:1263
+#: ../src/applet-device-wifi.c:1260
#, c-format
msgid "You are now connected to the Wi-Fi network '%s'."
msgstr "æçååéçè Wi-Fi çèã%sãã"
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-wifi.c:1291
#, c-format
msgid "Preparing Wi-Fi network connection '%s'..."
msgstr "æåæå Wi-Fi çèéçã%sãâ"
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-wifi.c:1294
#, c-format
msgid "Configuring Wi-Fi network connection '%s'..."
msgstr "æåèå Wi-Fi çèéçã%sãâ"
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-wifi.c:1297
#, c-format
msgid "User authentication required for Wi-Fi network '%s'..."
msgstr "Wi-Fi çèéçã%sãéèäçèéèâ"
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1300
#, c-format
msgid "Requesting a Wi-Fi network address for '%s'..."
msgstr "æåèææäã%sãç Wi-Fi çèäåâ"
-#: ../src/applet-device-wifi.c:1324
+#: ../src/applet-device-wifi.c:1321
#, c-format
msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
msgstr "Wi-Fi çèéçã%sãåäçäï %s (%d%%)"
-#: ../src/applet-device-wifi.c:1329
+#: ../src/applet-device-wifi.c:1326
#, c-format
msgid "Wi-Fi network connection '%s' active"
msgstr "Wi-Fi çèéçã%sãåäçä"
-#: ../src/applet-device-wifi.c:1377
+#: ../src/applet-device-wifi.c:1374
msgid "Failed to activate connection"
msgstr "çæäçéç"
-#: ../src/applet-device-wifi.c:1396
+#: ../src/applet-device-wifi.c:1393
msgid "Failed to add new connection"
msgstr "çæååæéç"
-#: ../src/applet-device-wimax.c:231
+#: ../src/applet-device-wimax.c:227
#, c-format
msgid "WiMAX Mobile Broadband (%s)"
msgstr "WiMAX èååé (%s)"
-#: ../src/applet-device-wimax.c:233
+#: ../src/applet-device-wimax.c:229
msgid "WiMAX Mobile Broadband"
msgstr "WiMAX èååé"
-#: ../src/applet-device-wimax.c:259
+#: ../src/applet-device-wimax.c:255
msgid "WiMAX is disabled"
msgstr "WiMAX ååç"
-#: ../src/applet-device-wimax.c:260
+#: ../src/applet-device-wimax.c:256
msgid "WiMAX is disabled by hardware switch"
msgstr "WiMAX åèçéééåç"
-#: ../src/applet-device-wimax.c:428
+#: ../src/applet-device-wimax.c:424
msgid "You are now connected to the WiMAX network."
msgstr "æçååéçè WiMAX çèã"
+#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:627
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "èååééçã%sãåäçäï(%d%%%s%s)"
+
+#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:630
+msgid "roaming"
+msgstr "æé"
+
#: ../src/applet-dialogs.c:57
msgid "Error displaying connection information:"
msgstr "éçéçèèççéèï"
#: ../src/applet-dialogs.c:109
#: ../src/connection-editor/page-wifi-security.c:313
-#: ../src/libnm-gtk/nm-wifi-dialog.c:929
+#: ../src/libnm-gtk/nm-wifi-dialog.c:924
#: ../src/wireless-security/wireless-security.c:406
msgid "LEAP"
msgstr "LEAP"
@@ -846,7 +777,7 @@ msgid "WEP"
msgstr "WEP"
#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/libnm-gtk/nm-wifi-dialog.c:886
+#: ../src/libnm-gtk/nm-wifi-dialog.c:881
msgctxt "Wifi/wired security"
msgid "None"
msgstr "ææ"
@@ -908,6 +839,7 @@ msgstr "WiMAX (%s)"
#. --- General ---
#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
+#: ../src/connection-editor/page-general.c:327
msgid "General"
msgstr "äè"
@@ -1014,7 +946,7 @@ msgstr "VPN æåï"
msgid "Base Connection:"
msgstr "åçéçï"
-#: ../src/applet-dialogs.c:823
+#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:345
msgid "Unknown"
msgstr "äæ"
@@ -1059,6 +991,68 @@ msgstr "éçèã%sãéèåçã"
msgid "Password:"
msgstr "åçï"
+#: ../src/applet-dialogs.c:1310
+msgid "SIM PIN unlock required"
+msgstr "éèèé SIM PIN ç"
+
+#: ../src/applet-dialogs.c:1311
+msgid "SIM PIN Unlock Required"
+msgstr "éèèé SIM PIN ç"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1313
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr "èäçèååéèçã%sãäåïéè SIM PIN çã"
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1315
+msgid "PIN code:"
+msgstr "PIN çï"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1319
+msgid "Show PIN code"
+msgstr "éç PIN ç"
+
+#: ../src/applet-dialogs.c:1321
+msgid "SIM PUK unlock required"
+msgstr "éèèé SIM PUK ç"
+
+#: ../src/applet-dialogs.c:1322
+msgid "SIM PUK Unlock Required"
+msgstr "éèèé SIM PUK ç"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1324
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr "èäçèååéèçã%sãäåïéè SIM PUK çã"
+
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1326
+msgid "PUK code:"
+msgstr "PUK çï"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1329
+msgid "New PIN code:"
+msgstr "æç PIN çï"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1331
+msgid "Re-enter new PIN code:"
+msgstr "éæèå PIN çï"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1336
+msgid "Show PIN/PUK codes"
+msgstr "éç PIN/PUK ç"
+
#: ../src/connection-editor/ce-ip4-routes.ui.h:1
#: ../src/connection-editor/ce-ip6-routes.ui.h:1
#: ../src/connection-editor/ce-page-ip4.ui.h:8
@@ -1115,23 +1109,14 @@ msgstr ""
msgid "Createâ"
msgstr "åçâ"
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "èå"
-
-#: ../src/connection-editor/ce-page.c:294
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "çæäæçéèäéçæåçææåæã"
-
#: ../src/connection-editor/ce-page-bond.ui.h:1
#, fuzzy
msgid "Round-robin"
msgstr "åæäåäæ"
#: ../src/connection-editor/ce-page-bond.ui.h:2
-#, fuzzy
msgid "Active backup"
-msgstr "åéåä(_A)"
+msgstr "åçåä"
#: ../src/connection-editor/ce-page-bond.ui.h:3
msgid "XOR"
@@ -1162,10 +1147,8 @@ msgid "ARP"
msgstr "ARP"
#: ../src/connection-editor/ce-page-bond.ui.h:10
-#, fuzzy
-#| msgid "Base Connection:"
msgid "Bonded _connections:"
-msgstr "VPN éç"
+msgstr "çççéç(_C):"
#: ../src/connection-editor/ce-page-bond.ui.h:11
msgid "_Mode:"
@@ -1173,13 +1156,15 @@ msgstr "æå(_M):"
#. Edit
#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/nm-connection-list.c:680
+#: ../src/connection-editor/ce-page-bridge.ui.h:2
+#: ../src/connection-editor/nm-connection-list.c:685
msgid "_Edit"
msgstr "çè(_E)"
#. Delete
#: ../src/connection-editor/ce-page-bond.ui.h:13
-#: ../src/connection-editor/nm-connection-list.c:697
+#: ../src/connection-editor/ce-page-bridge.ui.h:3
+#: ../src/connection-editor/nm-connection-list.c:702
msgid "_Delete"
msgstr "åé(_D)"
@@ -1192,6 +1177,7 @@ msgid "ms"
msgstr "æç"
#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
msgid "_Interface name:"
msgstr "äéåç(_I):"
@@ -1218,8 +1204,59 @@ msgstr "éçåé(_U):"
msgid "Link _down delay:"
msgstr "æçåé(_D):"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr "èåæè(_C):"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:4
+msgid "_Priority:"
+msgstr "ååéå(_P):"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#, fuzzy
+#| msgid "_Transport mode:"
+msgid "_Hairpin mode:"
+msgstr "åéææåæå"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+msgid "Bridged _connections:"
+msgstr "ææçéç(_C):"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:6
+msgid "_Forward delay:"
+msgstr "èéåé(_F):"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Hello time:"
+msgstr "_Hello æé:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "s"
+msgstr "ç"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr "åç _STP (çææåè)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+msgid "_Max age:"
+msgstr "æåæé(_M):"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "_Aging time:"
+msgstr "åçæé(_A):"
+
+#: ../src/connection-editor/ce-page.c:72
+msgid "automatic"
+msgstr "èå"
+
+#: ../src/connection-editor/ce-page.c:356
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "çæäæçéèäéçæåçææåæã"
+
#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
#: ../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
@@ -1240,7 +1277,7 @@ msgid "Sho_w password"
msgstr "éçåç(_W)"
#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
#: ../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
@@ -1329,16 +1366,34 @@ msgstr ""
#: ../src/connection-editor/ce-page-ethernet.ui.h:17
#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
#: ../src/connection-editor/ce-page-wifi.ui.h:7
msgid "_MTU:"
msgstr "_MTU:"
#: ../src/connection-editor/ce-page-ethernet.ui.h:18
#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
#: ../src/connection-editor/ce-page-wifi.ui.h:6
msgid "bytes"
msgstr "äåç"
+#: ../src/connection-editor/ce-page-general.ui.h:1
+msgid "_Automatically connect to this network when it is available"
+msgstr "çéåçèåçæèåéç(_A)"
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+msgid "All _users may connect to this network"
+msgstr "ææçäçèåäéçèéåçè"
+
+#: ../src/connection-editor/ce-page-general.ui.h:3
+msgid "Firewall _zone:"
+msgstr "éççåå(_Z):"
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Automatically connect to _VPN when using this connection"
+msgstr "çäçéåéçæèåéçè _VPN"
+
#: ../src/connection-editor/ce-page-infiniband.ui.h:1
msgid "_Transport mode:"
msgstr "åèæå(_T):"
@@ -1480,43 +1535,51 @@ msgid "Prefer 2G (GPRS/EDGE)"
msgstr "åå 2G (GPRS/EDGE)"
#: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "Prefer 4G (LTE)"
+msgstr "åå 4G (LTE)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+msgid "Use only 4G (LTE)"
+msgstr "åäç 4G (LTE)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
msgid "Basic"
msgstr "åæ"
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
msgid "Nu_mber:"
msgstr "æå(_M):"
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:12
msgid "Advanced"
msgstr "éé"
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:13
msgid "_APN:"
msgstr "_APN:"
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:14
msgid "N_etwork ID:"
msgstr "çè ID(_E):"
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:15
#: ../src/wireless-security/ws-wpa-psk.ui.h:2
msgid "_Type:"
msgstr "éå(_T)ï"
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:16
msgid "Change..."
msgstr "èæâ"
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/connection-editor/ce-page-mobile.ui.h:17
msgid "P_IN:"
msgstr "P_IN:"
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:18
msgid "Allow _roaming if home network is not available"
msgstr "åæåççèçæäçïåèäçæé(_R)"
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:19
msgid "Sho_w passwords"
msgstr "éçåç(_W)"
@@ -1568,6 +1631,32 @@ msgstr "åé"
msgid "Send PPP _echo packets"
msgstr "åé PPP åéåå(_E)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+msgid "_Parent interface:"
+msgstr "çäé(_P):"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN interface _name:"
+msgstr "VLAN äéåç(_N):"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+msgid "_Cloned MAC address:"
+msgstr "èèç MA_C äåï"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr "VLAN _id:"
+
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "Device name + number"
+msgstr "èçåç + çè"
+
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "\"vlan\" + number"
+msgstr "\"vlan\" + çè"
+
#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
msgid "S_ecurity:"
msgstr "ååæ(_E):"
@@ -1605,30 +1694,22 @@ msgid "_Rate:"
msgstr "éç(_R):"
#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid ""
-"This option locks this connection to the Wi-Fi access point (AP) specified "
-"by the BSSID entered here. Example: 00:11:22:33:44:55"
-msgstr ""
-"æééæåæéçéåèåææèåç BSSID ææåç Wi-Fi ååéïAPïãäåï"
-"00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
msgid "_BSSID:"
msgstr "_BSSID:"
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
msgid "C_hannel:"
msgstr "éé(_H)ï"
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
msgid "Ban_d:"
msgstr "éå(_D):"
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
msgid "M_ode:"
msgstr "æå(_O)ï"
-#: ../src/connection-editor/ce-page-wifi.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
msgid "SS_ID:"
msgstr "SS_ID:"
@@ -1684,150 +1765,176 @@ msgstr ""
"åååæææäïçèäæèç PPP äæåæææææçéèææãåæéçåæïè"
"åèåçæäææçææã"
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:911
-#: ../src/connection-editor/page-ip6.c:877
+#: ../src/connection-editor/ip4-routes-dialog.c:762
+#: ../src/connection-editor/ip6-routes-dialog.c:704
+#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/page-ip6.c:894
msgid "Address"
msgstr "åå"
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/ip4-routes-dialog.c:779
+#: ../src/connection-editor/page-ip4.c:945
msgid "Netmask"
msgstr "çèéç"
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:945
-#: ../src/connection-editor/page-ip6.c:911
+#: ../src/connection-editor/ip4-routes-dialog.c:796
+#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/page-ip4.c:962
+#: ../src/connection-editor/page-ip6.c:928
msgid "Gateway"
msgstr "éèé"
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:813
+#: ../src/connection-editor/ip6-routes-dialog.c:755
msgid "Metric"
msgstr "åå"
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:894
+#: ../src/connection-editor/ip6-routes-dialog.c:721
+#: ../src/connection-editor/page-ip6.c:911
msgid "Prefix"
msgstr "åç"
-#: ../src/connection-editor/new-connection.c:77
-#: ../src/connection-editor/page-ethernet.c:274
+#: ../src/connection-editor/new-connection.c:101
+#: ../src/connection-editor/page-ethernet.c:251
+#: ../src/libnm-gtk/nm-ui-utils.c:323
msgid "Ethernet"
msgstr "æççè"
-#: ../src/connection-editor/new-connection.c:82
-#: ../src/connection-editor/page-wifi.c:463
+#: ../src/connection-editor/new-connection.c:107
+#: ../src/connection-editor/page-wifi.c:471 ../src/libnm-gtk/nm-ui-utils.c:325
msgid "Wi-Fi"
msgstr "Wi-Fi"
-#: ../src/connection-editor/new-connection.c:92
-#: ../src/connection-editor/page-wimax.c:158 ../src/mb-menu-item.c:73
+#: ../src/connection-editor/new-connection.c:119
+#: ../src/connection-editor/page-wimax.c:134
+#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
msgid "WiMAX"
msgstr "WiMAX"
-#: ../src/connection-editor/new-connection.c:97
-#: ../src/connection-editor/page-dsl.c:140
+#: ../src/connection-editor/new-connection.c:125
+#: ../src/connection-editor/page-dsl.c:141
msgid "DSL"
msgstr "DSL"
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-infiniband.c:190
+#: ../src/connection-editor/new-connection.c:131
+#: ../src/connection-editor/page-infiniband.c:168
+#: ../src/libnm-gtk/nm-ui-utils.c:335
msgid "InfiniBand"
msgstr "InfiniBand"
-#: ../src/connection-editor/new-connection.c:107
-#: ../src/connection-editor/page-bond.c:746
+#: ../src/connection-editor/new-connection.c:137
+#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/libnm-gtk/nm-ui-utils.c:559
msgid "Bond"
-msgstr ""
-
-#: ../src/connection-editor/new-connection.c:119
-#: ../src/connection-editor/page-vpn.c:112
+msgstr "çç"
+
+#: ../src/connection-editor/new-connection.c:143
+#: ../src/connection-editor/page-bridge.c:211
+#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+msgid "Bridge"
+msgstr "ææ"
+
+#: ../src/connection-editor/new-connection.c:149
+#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:341
+#: ../src/libnm-gtk/nm-ui-utils.c:563
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../src/connection-editor/new-connection.c:162
+#: ../src/connection-editor/new-connection.c:302
+#: ../src/connection-editor/page-vpn.c:113
msgid "VPN"
msgstr "VPN"
#: ../src/connection-editor/new-connection.c:252
+msgid "Hardware"
+msgstr "çé"
+
+#: ../src/connection-editor/new-connection.c:272
+msgid "Virtual"
+msgstr "èæ"
+
+#: ../src/connection-editor/new-connection.c:340
+#: ../src/connection-editor/new-connection.c:342
msgid "Import a saved VPN configuration..."
msgstr "åååååç VPN çæâ"
-#: ../src/connection-editor/new-connection.c:274
+#: ../src/connection-editor/new-connection.c:371
msgid ""
"The connection editor dialog could not be initialized due to an unknown "
"error."
msgstr "çæäæçéèäéççèååèççæåååã"
-#: ../src/connection-editor/new-connection.c:283
+#: ../src/connection-editor/new-connection.c:380
msgid "Could not create new connection"
msgstr "çæåçæéç"
-#: ../src/connection-editor/new-connection.c:419
+#: ../src/connection-editor/new-connection.c:515
msgid "Connection delete failed"
msgstr "åééçåæ"
-#: ../src/connection-editor/new-connection.c:466
+#: ../src/connection-editor/new-connection.c:562
#, c-format
msgid "Are you sure you wish to delete the connection %s?"
msgstr "æçåèåééç %s ï"
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: ../src/connection-editor/nm-connection-editor.c:118
#, c-format
msgid "Editing %s"
msgstr "çè %s"
-#: ../src/connection-editor/nm-connection-editor.c:114
+#: ../src/connection-editor/nm-connection-editor.c:122
msgid "Editing un-named connection"
msgstr "çèæååçéç"
-#: ../src/connection-editor/nm-connection-editor.c:301
+#: ../src/connection-editor/nm-connection-editor.c:282
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:428
+#: ../src/connection-editor/nm-connection-editor.c:408
msgid "_Save"
msgstr "åå(_S)"
-#: ../src/connection-editor/nm-connection-editor.c:429
+#: ../src/connection-editor/nm-connection-editor.c:409
msgid "Save any changes made to this connection."
msgstr "ååääåéåéçéèçèæã"
-#: ../src/connection-editor/nm-connection-editor.c:430
+#: ../src/connection-editor/nm-connection-editor.c:410
msgid "_Save..."
msgstr "åå(_S)â"
-#: ../src/connection-editor/nm-connection-editor.c:431
+#: ../src/connection-editor/nm-connection-editor.c:411
msgid "Authenticate to save this connection for all users of this machine."
msgstr "éèäååéåéççæéèäçææäçèã"
-#: ../src/connection-editor/nm-connection-editor.c:447
+#: ../src/connection-editor/nm-connection-editor.c:427
msgid "Could not create connection"
msgstr "çæåçéç"
-#: ../src/connection-editor/nm-connection-editor.c:447
+#: ../src/connection-editor/nm-connection-editor.c:427
msgid "Could not edit connection"
msgstr "çæçèéç"
-#: ../src/connection-editor/nm-connection-editor.c:449
+#: ../src/connection-editor/nm-connection-editor.c:429
msgid "Unknown error creating connection editor dialog."
msgstr "åçéççèååèçæççäæéèã"
-#: ../src/connection-editor/nm-connection-editor.c:555
+#: ../src/connection-editor/nm-connection-editor.c:536
msgid "Error saving connection"
msgstr "ååéçæéè"
-#: ../src/connection-editor/nm-connection-editor.c:556
+#: ../src/connection-editor/nm-connection-editor.c:537
#, c-format
msgid "The property '%s' / '%s' is invalid: %d"
msgstr "åæã%sã/ã%sãæçæçï%d"
-#: ../src/connection-editor/nm-connection-editor.c:658
+#: ../src/connection-editor/nm-connection-editor.c:631
msgid "Error initializing editor"
msgstr "åååçèåæççéè"
-#: ../src/connection-editor/nm-connection-editor.c:967
+#: ../src/connection-editor/nm-connection-editor.c:952
msgid "Connection add failed"
msgstr "æåéçåæ"
@@ -1836,14 +1943,6 @@ msgid "Connection _name:"
msgstr "éçåç(_N)ï"
#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connect _automatically"
-msgstr "èåéç(_A)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-msgid "A_vailable to all users"
-msgstr "ææäçèçåç"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
msgid "_Export..."
msgstr "åå(_E)â"
@@ -1887,97 +1986,109 @@ msgid "%d year ago"
msgid_plural "%d years ago"
msgstr[0] "%d åäå"
-#: ../src/connection-editor/nm-connection-list.c:626
+#: ../src/connection-editor/nm-connection-list.c:631
msgid "Name"
msgstr "åç"
-#: ../src/connection-editor/nm-connection-list.c:639
+#: ../src/connection-editor/nm-connection-list.c:644
msgid "Last Used"
msgstr "æåäçç"
-#: ../src/connection-editor/nm-connection-list.c:681
+#: ../src/connection-editor/nm-connection-list.c:686
msgid "Edit the selected connection"
msgstr "çèéåçéç"
-#: ../src/connection-editor/nm-connection-list.c:682
+#: ../src/connection-editor/nm-connection-list.c:687
msgid "_Edit..."
msgstr "çè(_E)â"
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:688
msgid "Authenticate to edit the selected connection"
msgstr "éèäçèéåçéç"
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:703
msgid "Delete the selected connection"
msgstr "åééåçéç"
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:704
msgid "_Delete..."
msgstr "åé(_D)â"
-#: ../src/connection-editor/nm-connection-list.c:700
+#: ../src/connection-editor/nm-connection-list.c:705
msgid "Authenticate to delete the selected connection"
msgstr "éèäåééåçéç"
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:942
msgid "Error creating connection"
msgstr "åçéçæççéè"
-#: ../src/connection-editor/nm-connection-list.c:938
+#: ../src/connection-editor/nm-connection-list.c:943
#, c-format
msgid "Don't know how to create '%s' connections"
msgstr "äçéåäåçã%sãéç"
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:998
msgid "Error editing connection"
msgstr "çèéçæççéè"
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:999
#, c-format
msgid "Did not find a connection with UUID '%s'"
msgstr "æäå UUIDã%sãçéç"
-#: ../src/connection-editor/page-8021x-security.c:120
+#: ../src/connection-editor/page-8021x-security.c:121
msgid "802.1x Security"
msgstr "802.1x éè"
-#: ../src/connection-editor/page-8021x-security.c:122
+#: ../src/connection-editor/page-8021x-security.c:123
msgid "Could not load 802.1x Security user interface."
msgstr "çæèå 802.1x ååæäçèäéã"
-#: ../src/connection-editor/page-8021x-security.c:140
+#: ../src/connection-editor/page-8021x-security.c:141
msgid "Use 802.1_X security for this connection"
msgstr "åéåéçäç 802.1_X éè"
-#: ../src/connection-editor/page-bond.c:559
-#, c-format
-msgid "%s slave %d"
-msgstr "%s æå %d"
-
-#: ../src/connection-editor/page-bond.c:749
-#, fuzzy
-#| msgid "Could not load DSL user interface."
+#: ../src/connection-editor/page-bond.c:422
msgid "Could not load bond user interface."
-msgstr "çæèå DSL äçèäéã"
+msgstr "çæèåçççäçèäéã"
-#: ../src/connection-editor/page-bond.c:909
-#, fuzzy, c-format
-#| msgid "InfiniBand connection %d"
+#: ../src/connection-editor/page-bond.c:561
+#, c-format
msgid "Bond connection %d"
-msgstr "æåääçéç"
+msgstr "çççéç %d"
+
+#: ../src/connection-editor/page-bridge.c:214
+msgid "Could not load bridge user interface."
+msgstr "çæèåææçäçèäéã"
-#: ../src/connection-editor/page-dsl.c:142
+#: ../src/connection-editor/page-bridge.c:309
+#, c-format
+msgid "Bridge connection %d"
+msgstr "ææçéç %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:115
+msgid "Bridge Port"
+msgstr "ææéæå"
+
+#: ../src/connection-editor/page-bridge-port.c:117
+msgid "Could not load bridge port user interface."
+msgstr "çæèåææéæåäçèäéã"
+
+#: ../src/connection-editor/page-dsl.c:143
msgid "Could not load DSL user interface."
msgstr "çæèå DSL äçèäéã"
-#: ../src/connection-editor/page-dsl.c:234
+#: ../src/connection-editor/page-dsl.c:235
#, c-format
msgid "DSL connection %d"
msgstr "DSL éç %d"
-#: ../src/connection-editor/page-ethernet.c:89
+#: ../src/connection-editor/page-ethernet.c:90
#: ../src/connection-editor/page-infiniband.c:74
-#: ../src/connection-editor/page-wifi.c:94
+#: ../src/connection-editor/page-wifi.c:113
#: ../src/connection-editor/page-wimax.c:70
msgid ""
"This option locks this connection to the network device specified by its "
@@ -1986,20 +2097,43 @@ msgstr ""
"æééæåæéçéåèåææèåç MAC äåææåççèèçãäåï"
"00:11:22:33:44:55"
-#: ../src/connection-editor/page-ethernet.c:276
+#: ../src/connection-editor/page-ethernet.c:253
msgid "Could not load ethernet user interface."
msgstr "çæèåæççèäçèäéã"
-#: ../src/connection-editor/page-ethernet.c:452
+#: ../src/connection-editor/page-ethernet.c:396
#, c-format
msgid "Ethernet connection %d"
msgstr "ççèéç %d"
-#: ../src/connection-editor/page-infiniband.c:193
+#. TRANSLATORS: Default zone set for firewall, when no zone is selected
+#: ../src/connection-editor/page-general.c:57
+#: ../src/libnm-gtk/nm-mobile-providers.c:808
+msgid "Default"
+msgstr "éè"
+
+#: ../src/connection-editor/page-general.c:58
+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 "
+"firewall. Only usable if firewalld is active."
+msgstr ""
+"åçéçääçççååãéèåäææåçååïéæåæçæäçéççäéèç"
+"ååèåãåæå firewalld åçææçã"
+
+#: ../src/connection-editor/page-general.c:59
+msgid "FirewallD is not running."
+msgstr "FirewallD ææåèã"
+
+#: ../src/connection-editor/page-general.c:330
+msgid "Could not load General user interface."
+msgstr "çæèåäèäçèäéã"
+
+#: ../src/connection-editor/page-infiniband.c:171
msgid "Could not load InfiniBand user interface."
msgstr "çæèå InfiniBand äçèäéã"
-#: ../src/connection-editor/page-infiniband.c:318
+#: ../src/connection-editor/page-infiniband.c:263
#, c-format
msgid "InfiniBand connection %d"
msgstr "InfiniBand éç %d"
@@ -2061,16 +2195,16 @@ msgstr "éåç _DNS äæåï"
msgid "Additional s_earch domains:"
msgstr "éåçæåçåï domains:"
-#: ../src/connection-editor/page-ip4.c:843
+#: ../src/connection-editor/page-ip4.c:860
#, c-format
msgid "Editing IPv4 routes for %s"
msgstr "çè %s ç IPv4 èç"
-#: ../src/connection-editor/page-ip4.c:993
+#: ../src/connection-editor/page-ip4.c:1011
msgid "IPv4 Settings"
msgstr "IPv4 èå"
-#: ../src/connection-editor/page-ip4.c:995
+#: ../src/connection-editor/page-ip4.c:1013
msgid "Could not load IPv4 user interface."
msgstr "çæèå IPv4 äçèäéã"
@@ -2087,46 +2221,61 @@ msgstr "åç"
msgid "Automatic, DHCP only"
msgstr "èåïåäç DHCP"
-#: ../src/connection-editor/page-ip6.c:809
+#: ../src/connection-editor/page-ip6.c:826
#, c-format
msgid "Editing IPv6 routes for %s"
msgstr "ç %s çè IPv6 èç"
-#: ../src/connection-editor/page-ip6.c:957
+#: ../src/connection-editor/page-ip6.c:975
msgid "IPv6 Settings"
msgstr "IPv6 èå"
-#: ../src/connection-editor/page-ip6.c:959
+#: ../src/connection-editor/page-ip6.c:977
msgid "Could not load IPv6 user interface."
msgstr "çæèå IPv6 äçèäéã"
-#: ../src/connection-editor/page-mobile.c:382
+#: ../src/connection-editor/page-master.c:290
+#, c-format
+msgid "%s slave %d"
+msgstr "%s æå %d"
+
+#: ../src/connection-editor/page-mobile.c:391
msgid "Could not load mobile broadband user interface."
msgstr "çæèåèååéäçèäéã"
-#: ../src/connection-editor/page-mobile.c:399
+#: ../src/connection-editor/page-mobile.c:408
msgid "Unsupported mobile broadband connection type."
msgstr "äææçèååééçéåã"
#. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:643
+#: ../src/connection-editor/page-mobile.c:658
msgid "Select Mobile Broadband Provider Type"
msgstr "éæèååéäæåéå"
-#: ../src/connection-editor/page-mobile.c:678
+#: ../src/connection-editor/page-mobile.c:693
msgid ""
"Select the technology your mobile broadband provider uses. If you are "
"unsure, ask your provider."
msgstr "èéææçççåéäæåæäççæèãåææäçåïèæèäæåã"
-#: ../src/connection-editor/page-mobile.c:683
+#: ../src/connection-editor/page-mobile.c:698
msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
msgstr "æçäæåäç _GSM çäçæèïäå GPRSãEDGEãUMTSãHSDPAï"
-#: ../src/connection-editor/page-mobile.c:690
+#: ../src/connection-editor/page-mobile.c:705
msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
msgstr "æçäæåäç C_DMA çäçæèïäå 1xRTTãEVDOï"
+#: ../src/connection-editor/page-mobile.c:715 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:268
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:718 ../src/mb-menu-item.c:58
+#: ../src/mobile-helpers.c:266
+msgid "GSM"
+msgstr "GSM"
+
#: ../src/connection-editor/page-ppp.c:134
msgid "EAP"
msgstr "EAP"
@@ -2163,30 +2312,39 @@ msgstr "ææ"
msgid "Editing PPP authentication methods for %s"
msgstr "çè %s ç PPP éèææ"
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:284
msgid "PPP Settings"
msgstr "PPP èåå"
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:286
msgid "Could not load PPP user interface."
msgstr "çæèå PPP äçèäéã"
-#: ../src/connection-editor/page-vpn.c:114
+#: ../src/connection-editor/page-vlan.c:482
+msgid "Could not load vlan user interface."
+msgstr "çæèå vlan äçèäéã"
+
+#: ../src/connection-editor/page-vlan.c:678
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN éç %d"
+
+#: ../src/connection-editor/page-vpn.c:115
msgid "Could not load VPN user interface."
msgstr "çæèå VPN äçèäéã"
-#: ../src/connection-editor/page-vpn.c:129
+#: ../src/connection-editor/page-vpn.c:130
#, c-format
msgid "Could not find VPN plugin service for '%s'."
msgstr "æäåã%sãç VPN åæçåæåã"
-#: ../src/connection-editor/page-vpn.c:223
-#: ../src/connection-editor/page-vpn.c:320
+#: ../src/connection-editor/page-vpn.c:224
+#: ../src/connection-editor/page-vpn.c:321
#, c-format
msgid "VPN connection %d"
msgstr "VPN éç %d"
-#: ../src/connection-editor/page-vpn.c:249
+#: ../src/connection-editor/page-vpn.c:250
msgid ""
"The VPN plugin failed to import the VPN connection correctly\n"
"\n"
@@ -2196,11 +2354,11 @@ msgstr ""
"\n"
"éèïææ VPN æåéåã"
-#: ../src/connection-editor/page-vpn.c:274
+#: ../src/connection-editor/page-vpn.c:275
msgid "Choose a VPN Connection Type"
msgstr "èéæ VPN çéçéå"
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:276
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 "
@@ -2209,23 +2367,31 @@ msgstr ""
"éæææèçåæéçäç VPN éåãåæææèåçç VPN éçéåææåçåæ"
"åäïåèæææåèæçç VPN åæçåã"
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:98
+msgid ""
+"This option locks this connection to the Wi-Fi access point (AP) specified "
+"by the BSSID entered here. Example: 00:11:22:33:44:55"
+msgstr ""
+"æééæåæéçéåèåææèåç BSSID ææåç Wi-Fi ååéïAPïãäåï"
+"00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:190
+#: ../src/connection-editor/page-wifi.c:194
+#: ../src/connection-editor/page-wifi.c:215
#, c-format
msgid "default"
msgstr "éè"
-#: ../src/connection-editor/page-wifi.c:200
+#: ../src/connection-editor/page-wifi.c:219
#, c-format
msgid "%u (%u MHz)"
msgstr "%u (%u MHz)"
-#: ../src/connection-editor/page-wifi.c:465
+#: ../src/connection-editor/page-wifi.c:473
msgid "Could not load Wi-Fi user interface."
msgstr "çæèå Wi-Fi äçèäéã"
-#: ../src/connection-editor/page-wifi.c:670
+#: ../src/connection-editor/page-wifi.c:650
#, c-format
msgid "Wi-Fi connection %d"
msgstr "Wi-Fi éç %d"
@@ -2236,27 +2402,27 @@ msgid "None"
msgstr "ææ"
#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:903
+#: ../src/libnm-gtk/nm-wifi-dialog.c:898
msgid "WEP 40/128-bit Key (Hex or ASCII)"
msgstr "WEP 40/128-äå éé (Hex æ ASCII)"
#: ../src/connection-editor/page-wifi-security.c:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:912
+#: ../src/libnm-gtk/nm-wifi-dialog.c:907
msgid "WEP 128-bit Passphrase"
msgstr "WEP 128-äå åè"
#: ../src/connection-editor/page-wifi-security.c:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:942
+#: ../src/libnm-gtk/nm-wifi-dialog.c:937
msgid "Dynamic WEP (802.1x)"
msgstr "åæ WEP (802.1x)"
#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:956
+#: ../src/libnm-gtk/nm-wifi-dialog.c:951
msgid "WPA & WPA2 Personal"
msgstr "WPA & WPA2 åäç"
#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:970
+#: ../src/libnm-gtk/nm-wifi-dialog.c:965
msgid "WPA & WPA2 Enterprise"
msgstr "WPA & WPA2 äæç"
@@ -2264,19 +2430,19 @@ msgstr "WPA & WPA2 äæç"
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:406
+#: ../src/connection-editor/page-wifi-security.c:407
msgid "Wi-Fi Security"
msgstr "Wi-Fi ååæ"
-#: ../src/connection-editor/page-wifi-security.c:408
+#: ../src/connection-editor/page-wifi-security.c:409
msgid "Could not load Wi-Fi security user interface."
msgstr "çæèå Wi-Fi ååæäçèäéã"
-#: ../src/connection-editor/page-wimax.c:161
+#: ../src/connection-editor/page-wimax.c:137
msgid "Could not load WiMAX user interface."
msgstr "çæèå WiMAX äçèäéã"
-#: ../src/connection-editor/page-wimax.c:290
+#: ../src/connection-editor/page-wimax.c:233
#, c-format
msgid "WiMAX connection %d"
msgstr "WiMAX éç %d"
@@ -2360,62 +2526,66 @@ msgstr "äçææäççèèçïPAN/NAPï"
msgid "Access the Internet using your mobile phone (DUN)"
msgstr "äçææååçéçèïDUNï"
-#: ../src/gnome-bluetooth/nma-bt-device.c:318
+#: ../src/gnome-bluetooth/nma-bt-device.c:336
#, c-format
msgid "Error: %s"
msgstr "éèï%s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:425
+#: ../src/gnome-bluetooth/nma-bt-device.c:443
#, c-format
msgid "Failed to create DUN connection: %s"
msgstr "çæåç DUN éçï%s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:427
-#: ../src/gnome-bluetooth/nma-bt-device.c:833
+#: ../src/gnome-bluetooth/nma-bt-device.c:445
+#: ../src/gnome-bluetooth/nma-bt-device.c:959
msgid "Your phone is now ready to use!"
msgstr "æçéèçååçåääçï"
-#: ../src/gnome-bluetooth/nma-bt-device.c:450
+#: ../src/gnome-bluetooth/nma-bt-device.c:468
msgid "Mobile wizard was canceled"
msgstr "èåçéåçåæ"
-#: ../src/gnome-bluetooth/nma-bt-device.c:459
+#: ../src/gnome-bluetooth/nma-bt-device.c:477
msgid "Unknown phone device type (not GSM or CDMA)"
msgstr "äæçéèèçéåïé GSM æ CDMAï"
-#: ../src/gnome-bluetooth/nma-bt-device.c:567
+#: ../src/gnome-bluetooth/nma-bt-device.c:513
msgid "unknown modem type."
msgstr "äæçæææéåã"
-#: ../src/gnome-bluetooth/nma-bt-device.c:639
-#: ../src/gnome-bluetooth/nma-bt-device.c:645
+#: ../src/gnome-bluetooth/nma-bt-device.c:733
+#: ../src/gnome-bluetooth/nma-bt-device.c:739
msgid "failed to connect to the phone."
msgstr "çæéçèéèã"
-#: ../src/gnome-bluetooth/nma-bt-device.c:676
+#: ../src/gnome-bluetooth/nma-bt-device.c:770
msgid "unexpectedly disconnected from the phone."
msgstr "éèçéæéçã"
-#: ../src/gnome-bluetooth/nma-bt-device.c:686
+#: ../src/gnome-bluetooth/nma-bt-device.c:780
msgid "timed out detecting phone details."
msgstr "åæéååæäåéèçèçèæã"
-#: ../src/gnome-bluetooth/nma-bt-device.c:697
+#: ../src/gnome-bluetooth/nma-bt-device.c:791
msgid "Detecting phone configuration..."
msgstr "åæéèçéçâ"
-#: ../src/gnome-bluetooth/nma-bt-device.c:794
+#: ../src/gnome-bluetooth/nma-bt-device.c:823
+msgid "error getting bus connection"
+msgstr "åååææéçæççéè"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:920
msgid ""
"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
"Networking connection."
msgstr "éèçèçéæååéåèåææçèéçååçã"
-#: ../src/gnome-bluetooth/nma-bt-device.c:831
+#: ../src/gnome-bluetooth/nma-bt-device.c:957
#, c-format
msgid "Failed to create PAN connection: %s"
msgstr "çæåç PAN éçï%s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:852
+#: ../src/gnome-bluetooth/nma-bt-device.c:978
#, c-format
msgid "%s Network"
msgstr "%s çè"
@@ -2436,27 +2606,27 @@ msgstr "éçèè"
msgid "Active Network Connections"
msgstr "åççèéç"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:207
+#: ../src/libnm-gtk/nm-mobile-wizard.c:208
msgid ""
"Your mobile broadband connection is configured with the following settings:"
msgstr "èååéçåçéçäääèåï"
#. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:214
+#: ../src/libnm-gtk/nm-mobile-wizard.c:215
msgid "Your Device:"
msgstr "æçèç:"
#. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:225
+#: ../src/libnm-gtk/nm-mobile-wizard.c:226
msgid "Your Provider:"
msgstr "æçäæå:"
#. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:236
+#: ../src/libnm-gtk/nm-mobile-wizard.c:237
msgid "Your Plan:"
msgstr "æçææ:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
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 "
@@ -2468,23 +2638,23 @@ msgstr ""
"çæååçèèæïèææèåãèäæèååééççèåïèåãççã >> ãå"
"åèåãäïéæãçèéçãã"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:273
+#: ../src/libnm-gtk/nm-mobile-wizard.c:274
msgid "Confirm Mobile Broadband Settings"
msgstr "çèèååéèå"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:337
+#: ../src/libnm-gtk/nm-mobile-wizard.c:338
msgid "Unlisted"
msgstr "æååç"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:492
+#: ../src/libnm-gtk/nm-mobile-wizard.c:493
msgid "_Select your plan:"
msgstr "éææçææ(_S)ï"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:516
+#: ../src/libnm-gtk/nm-mobile-wizard.c:517
msgid "Selected plan _APN (Access Point Name):"
msgstr "éæææç _APNïAccess Point Nameïååéåçïï"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:540
+#: ../src/libnm-gtk/nm-mobile-wizard.c:541
msgid ""
"Warning: Selecting an incorrect plan may result in billing issues for your "
"broadband account or may prevent connectivity.\n"
@@ -2495,147 +2665,183 @@ msgstr ""
"\n"
"åææäçåæäççææïèæèäæåïäåçææç APN çäã"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:547
+#: ../src/libnm-gtk/nm-mobile-wizard.c:548
msgid "Choose your Billing Plan"
msgstr "éææçèèææ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:596
+#: ../src/libnm-gtk/nm-mobile-wizard.c:597
msgid "My plan is not listed..."
msgstr "æçææææååâ"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnm-gtk/nm-mobile-wizard.c:754
msgid "Select your provider from a _list:"
msgstr "èåæåèéæäæå(_L):"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:766
+#: ../src/libnm-gtk/nm-mobile-wizard.c:767
msgid "Provider"
msgstr "äæå"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
msgid "I can't find my provider and I wish to enter it _manually:"
msgstr "ææäåæçäæåïææèæåèå(_M):"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:802
+#: ../src/libnm-gtk/nm-mobile-wizard.c:803
msgid "Provider:"
msgstr "äæåï"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:826
+#: ../src/libnm-gtk/nm-mobile-wizard.c:827
msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
msgstr "æçäæåäç GSM æèïGPRSãEDGEãUMTSãHSPAï"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:832
+#: ../src/libnm-gtk/nm-mobile-wizard.c:833
msgid "My provider uses CDMA technology (1xRTT, EVDO)"
msgstr "æçäæåäç CDMA æèï1xRTTãEVDOï"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:843
+#: ../src/libnm-gtk/nm-mobile-wizard.c:844
msgid "Choose your Provider"
msgstr "éææçäæå"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1094
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
msgid "Country or Region List:"
msgstr "ååæååæåï"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1106
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
msgid "Country or region"
msgstr "ååæåå"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
msgid "My country is not listed"
msgstr "æçååäææååä"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1159
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
msgid "Choose your Provider's Country or Region"
msgstr "éææçäæåçååæåå"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1213
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1227
msgid "Installed GSM device"
msgstr "ååèç GSM èç"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
msgid "Installed CDMA device"
msgstr "ååèç CDMA èç"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1388
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
msgid ""
"This assistant helps you easily set up a mobile broadband connection to a "
"cellular (3G) network."
msgstr "éèååæèæåèåèååééçïéèææï3Gïçèã"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1393
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
msgid "You will need the following information:"
msgstr "æéèääèèï"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
msgid "Your broadband provider's name"
msgstr "åéäæåçåç"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
msgid "Your broadband billing plan name"
msgstr "åéèèææçåç"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1420
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
msgstr "ïåæäææäïæçåéèèææç APNïååéåçï"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1447
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
msgid "Create a connection for _this mobile broadband device:"
msgstr "çéåèååéèçåçéç(_T)"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1462
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
msgid "Any device"
msgstr "ääèç"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1475
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
msgid "Set up a Mobile Broadband Connection"
msgstr "èåèååééç"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1639
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
msgid "New Mobile Broadband Connection"
msgstr "æçèååééç"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:438
+#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
+msgid "Wired"
+msgstr "æç"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:327
+msgid "Bluetooth"
+msgstr "èç"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:329
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:405
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:407
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%$2s (%$1s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:437
msgid "New..."
msgstr "æåâ"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1057
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
msgid "C_reate"
msgstr "åç(_R)"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
#, c-format
msgid ""
"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
msgstr "éèåçææååééäåå Wi-Fi çèã%sãã"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1143
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
msgid "Wi-Fi Network Authentication Required"
msgstr "Wi-Fi çèéçã%sãéèéè"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
msgid "Authentication required by Wi-Fi network"
msgstr "Wi-Fi çèéçã%sãéèéè"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
msgid "Create New Wi-Fi Network"
msgstr "åçæç Wi-Fi çè"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
msgid "New Wi-Fi network"
msgstr "æç Wi-Fi çè"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
msgid "Enter a name for the Wi-Fi network you wish to create."
msgstr "èåæèåçç Wi-Fi çèçåçã"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1155
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
msgid "Connect to Hidden Wi-Fi Network"
msgstr "éæåéèç Wi-Fi çè"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1157
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
msgid "Hidden Wi-Fi network"
msgstr "éèç Wi-Fi çè"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1158
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
msgid ""
"Enter the name and security details of the hidden Wi-Fi network you wish to "
"connect to."
@@ -2670,86 +2876,103 @@ msgid ""
"GNOME desktop environment."
msgstr "çäå GNOME æéçåäéèïèäæäçåäåã"
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:56
msgid "EVDO"
msgstr "EVDO"
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:60
msgid "GPRS"
msgstr "GPRS"
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:62
msgid "EDGE"
msgstr "EDGE"
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:64
msgid "UMTS"
msgstr "UMTS"
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:66
msgid "HSDPA"
msgstr "HSDPA"
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:68
msgid "HSUPA"
msgstr "HSUPA"
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:70
msgid "HSPA"
msgstr "HSPA"
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:72
+msgid "HSPA+"
+msgstr "HSPA+"
+
+#: ../src/mb-menu-item.c:76
+msgid "LTE"
+msgstr "LTE"
+
+#: ../src/mb-menu-item.c:112
msgid "not enabled"
msgstr "æåç"
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:118
msgid "not registered"
msgstr "æèå"
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:136
#, c-format
msgid "Home network (%s)"
msgstr "åççèï%sï"
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:138
#, c-format
msgid "Home network"
msgstr "åççè"
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:146
msgid "searching"
msgstr "æåä"
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:149
msgid "registration denied"
msgstr "èåèæ"
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
#, c-format
msgid "%s (%s roaming)"
msgstr "%s (%s æé)"
-#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:156 ../src/mb-menu-item.c:162
#, c-format
msgid "%s (roaming)"
msgstr "%sïæéï"
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:165
#, c-format
msgid "Roaming network (%s)"
msgstr "æéçèï%sï"
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:167
#, c-format
msgid "Roaming network"
msgstr "æéçè"
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "éè"
+#: ../src/mobile-helpers.c:297
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "SIM åã%sãåã%sãç PIN ç"
+
+#: ../src/mobile-helpers.c:471
+msgid "PIN code required"
+msgstr "éè PIN ç"
+
+#: ../src/mobile-helpers.c:479
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "éåèååéèçéè PIN ç"
#. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:325
+#: ../src/utils/utils.c:174
#, c-format
msgid "%s connection"
msgstr "%s éç"
@@ -2834,7 +3057,7 @@ msgid "MD5"
msgstr "MD5"
#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
+#: ../src/wireless-security/eap-method-tls.c:434
#: ../src/wireless-security/eap-method-ttls.c:350
msgid "Choose a Certificate Authority certificate..."
msgstr "éææèææåä(CA)æèâ"
@@ -2861,11 +3084,11 @@ msgstr "PEAP çæ(_V):"
msgid "As_k for this password every time"
msgstr "ææéèååç(_K)"
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:260
msgid "Unencrypted private keys are insecure"
msgstr "æååççåééæäååç"
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../src/wireless-security/eap-method-tls.c:263
msgid ""
"The selected private key does not appear to be protected by a password. "
"This could allow your security credentials to be compromised. Please select "
@@ -2878,11 +3101,11 @@ msgstr ""
"\n"
"ïæåääç openssl äååæççåééï"
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:428
msgid "Choose your personal certificate..."
msgstr "éææçåäæèâ"
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:440
msgid "Choose your private key..."
msgstr "éææççåééâ"
@@ -2972,6 +3195,12 @@ msgstr "éçéé(_W)"
msgid "WEP inde_x:"
msgstr "WEP çå(_X):"
+#~ msgid "Connect _automatically"
+#~ msgstr "èåéç(_A)"
+
+#~ msgid "A_vailable to all users"
+#~ msgstr "ææäçèçåç"
+
#~ msgid "An unknown error occurred."
#~ msgstr "ççäæçéèã"
@@ -3006,9 +3235,6 @@ msgstr "WEP çå(_X):"
#~ msgid "Wireless network connection '%s' active"
#~ msgstr "çççèéçã%sãåäçä"
-#~ msgid "Wired"
-#~ msgstr "æç"
-
#~ msgid "Could not load Wired Security security user interface."
#~ msgstr "çæèå Wired Security ååäçèäéã"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
