[network-manager-applet] Update Simplified Chinese translation



commit 5a02f6c7e7c566cdc53c7bcda31de0c9dc48a329
Author: Aron Xu <aronxu gnome org>
Date:   Wed Jan 9 07:14:58 2013 +0800

    Update Simplified Chinese translation

 po/zh_CN.po | 2894 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 1649 insertions(+), 1245 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7a44a14..09c7a42 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,15 +13,16 @@
 # EL8LatSPQ <el8latspq hotmail com>, 2012.
 # YunQiang Su <wzssyqa gmail com>, 2012.
 # tuhaihe <wangdianjin linuxdeepin com>, 2012.
+# Aron Xu <aronxu gnome org>, 2010, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2012-09-05 13:35+0000\n"
-"PO-Revision-Date: 2012-08-26 10:32+0800\n"
-"Last-Translator: tuhaihe <1132321739qq gmail com>\n"
+"POT-Creation-Date: 2012-12-18 15:04+0000\n"
+"PO-Revision-Date: 2013-01-09 07:14+0800\n"
+"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -79,8 +80,7 @@ msgstr "ççççåçéç"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
 msgid ""
-"Set this to true to disable notifications when wireless networks are "
-"available."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "åæéèä true äççæçççåçææççéçã"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:9
@@ -116,161 +116,556 @@ msgid ""
 "authentication."
 msgstr "åæéèä true äççå EAP èèç 2 éæäåä CA èäçèåã"
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:396
-#: ../src/applet-device-gsm.c:444 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+msgid "802.1X authentication"
+msgstr "802.1X èè"
+
+#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
+#: ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "ççåç(_N)ï"
+
+#: ../src/applet.c:513
+msgid "Failed to add/activate connection"
+msgstr "æææå/åçèæ"
+
+#: ../src/applet.c:515 ../src/applet.c:559 ../src/applet.c:585
+#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
+msgid "Unknown error"
+msgstr "æçéè"
+
+#: ../src/applet.c:518 ../src/applet.c:588 ../src/applet-device-wifi.c:1379
+#: ../src/applet-device-wifi.c:1398
+msgid "Connection failure"
+msgstr "èæåè"
+
+#: ../src/applet.c:557
+msgid "Device disconnect failed"
+msgstr "èåæååè"
+
+#: ../src/applet.c:562
+msgid "Disconnect failure"
+msgstr "æååè"
+
+#: ../src/applet.c:583
+msgid "Connection activation failed"
+msgstr "èæåçåè"
+
+#: ../src/applet.c:953 ../src/applet-device-wifi.c:1069
+msgid "Don't show this message again"
+msgstr "äåæçæäæ"
+
+#: ../src/applet.c:1042
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"VPN èæâ%sâåèãççèæèäæã"
+
+#: ../src/applet.c:1045
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"VPN èæâ%sâåèãVPN æåååäæã"
+
+#: ../src/applet.c:1048
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"VPN èæâ%sâåèãVPN æåèåäääéæéçã"
+
+#: ../src/applet.c:1051
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"VPN èæâ%sâåèãèæèæã"
+
+#: ../src/applet.c:1054
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"VPN èæâ%sâåèãVPN æåæåæéæéåååã"
+
+#: ../src/applet.c:1057
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"VPN èæâ%sâåèãVPN æååååèã"
+
+#: ../src/applet.c:1060
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"VPN èæâ%sâåèãææåæç VPN secretã"
+
+#: ../src/applet.c:1063
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"VPN èæâ%sâåèãVPN secret éæã"
+
+#: ../src/applet.c:1070
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"VPN èæâ%sâåèã"
+
+#: ../src/applet.c:1088
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"VPN èæâ%sâåæåãççèæèäæã"
+
+#: ../src/applet.c:1091
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"VPN èæâ%sâåæåãVPN æåååæã"
+
+#: ../src/applet.c:1097
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"VPN èæâ%sâåæåã"
+
+#: ../src/applet.c:1127
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+"åæååç VPN èæã\n"
+"\n"
+"%s\n"
+
+#: ../src/applet.c:1129
+msgid "VPN connection has been successfully established.\n"
+msgstr "åæååç VPN èæã\n"
+
+#: ../src/applet.c:1131
+msgid "VPN Login Message"
+msgstr "VPN çåææ"
+
+#: ../src/applet.c:1137 ../src/applet.c:1145 ../src/applet.c:1195
+msgid "VPN Connection Failed"
+msgstr "VPN èæåè"
+
+#: ../src/applet.c:1202
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN èæâ%sâåèãVPN æååååèã\n"
+"\n"
+"%s"
+
+#: ../src/applet.c:1205
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN èæâ%sâåååèã\n"
+"\n"
+"%s"
+
+#: ../src/applet.c:1520
+msgid "device not ready (firmware missing)"
+msgstr "èåæåç(çååä)"
+
+#: ../src/applet.c:1522
+msgid "device not ready"
+msgstr "èåæåç"
+
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1532 ../src/applet-device-ethernet.c:229
+msgid "disconnected"
+msgstr "åæå"
+
+#: ../src/applet.c:1548
+msgid "Disconnect"
+msgstr "æå"
+
+#: ../src/applet.c:1562
+msgid "device not managed"
+msgstr "èåææç"
+
+#: ../src/applet.c:1606
+msgid "No network devices available"
+msgstr "ææåççççèå"
+
+#: ../src/applet.c:1694
+msgid "_VPN Connections"
+msgstr "_VPN èæ"
+
+#: ../src/applet.c:1751
+msgid "_Configure VPN..."
+msgstr "éç VPN(_C)..."
+
+#: ../src/applet.c:1755
+msgid "_Disconnect VPN"
+msgstr "æå VPN(_D)"
+
+#: ../src/applet.c:1849
+msgid "NetworkManager is not running..."
+msgstr "ççççåæèè..."
+
+#: ../src/applet.c:1854 ../src/applet.c:2656
+msgid "Networking disabled"
+msgstr "ççåçç"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:2075
+msgid "Enable _Networking"
+msgstr "åçèç(_N)"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:2084
+msgid "Enable _Wi-Fi"
+msgstr "åç _Wi-Fi"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:2093
+msgid "Enable _Mobile Broadband"
+msgstr "åççååå(_M)"
+
+#. 'Enable WiMAX Mobile Broadband' item
+#: ../src/applet.c:2102
+msgid "Enable WiMA_X Mobile Broadband"
+msgstr "åç WiMA_X çååå"
+
+#. Toggle notifications item
+#: ../src/applet.c:2113
+msgid "Enable N_otifications"
+msgstr "åçéç(_O)"
+
+#. 'Connection Information' item
+#: ../src/applet.c:2124
+msgid "Connection _Information"
+msgstr "èæäæ(_I)"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:2134
+msgid "Edit Connections..."
+msgstr "çèèæ..."
+
+#. Help item
+#: ../src/applet.c:2148
+msgid "_Help"
+msgstr "åå(_H)"
+
+#. About item
+#: ../src/applet.c:2157
+msgid "_About"
+msgstr "åä(_A)"
+
+#: ../src/applet.c:2335
+msgid "Disconnected"
+msgstr "åæåèæ"
+
+#: ../src/applet.c:2336
+msgid "The network connection has been disconnected."
+msgstr "ççèæçåæåã"
+
+#: ../src/applet.c:2519
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "æåååççèæâ%sâ..."
+
+#: ../src/applet.c:2522
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "ççèæâ%sâéèçæèè..."
+
+#: ../src/applet.c:2525 ../src/applet-device-bt.c:235
+#: ../src/applet-device-cdma.c:484 ../src/applet-device-gsm.c:538
+#: ../src/applet-device-wimax.c:469
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "æåäâ%sâèæääççåå..."
+
+#: ../src/applet.c:2528
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "ççèæâ%sâååäæåçæ"
+
+#: ../src/applet.c:2611
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "æååå VPN èæâ%sâ..."
+
+#: ../src/applet.c:2614
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "VPN èæâ%sâéèçæèè..."
+
+#: ../src/applet.c:2617
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "æåäâ%sâèæää VPN åå..."
+
+#: ../src/applet.c:2620
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "VPN èæâ%sâååäæåçæ"
+
+#: ../src/applet.c:2661
+msgid "No network connection"
+msgstr "ææççèæ"
+
+#: ../src/applet.c:3362
+msgid "NetworkManager Applet"
+msgstr "ççççååçå"
+
+#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:393
+#: ../src/applet-device-ethernet.c:237 ../src/applet-device-gsm.c:447
+#: ../src/applet-device-wifi.c:859 ../src/applet-device-wimax.c:275
 msgid "Available"
 msgstr "åçç"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:438
-#: ../src/applet-device-gsm.c:486 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:435
+#: ../src/applet-device-ethernet.c:266 ../src/applet-device-gsm.c:489
+#: ../src/applet-device-wimax.c:419
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "æçååèæåâ%sâã"
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:442
-#: ../src/applet-device-gsm.c:490 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
+#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:439
+#: ../src/applet-device-ethernet.c:270 ../src/applet-device-gsm.c:493
+#: ../src/applet-device-wifi.c:1261 ../src/applet-device-wimax.c:423
 msgid "Connection Established"
 msgstr "èæååç"
 
-#: ../src/applet-device-bt.c:205
+#: ../src/applet-device-bt.c:200
 msgid "You are now connected to the mobile broadband network."
 msgstr "æçååèæåçåååççã"
 
-#: ../src/applet-device-bt.c:231 ../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-cdma.c:475
+#: ../src/applet-device-gsm.c:529 ../src/applet-device-wimax.c:460
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "æåååçåååèæâ%sâ..."
 
-#: ../src/applet-device-bt.c:234 ../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-cdma.c:478
+#: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:463
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "æåéççåååèæâ%sâ..."
 
-#: ../src/applet-device-bt.c:237 ../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-cdma.c:481
+#: ../src/applet-device-gsm.c:535 ../src/applet-device-wimax.c:466
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "çåååèæâ%sâéèçæèè..."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:535 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2500
-#, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "æåäâ%sâèæääççåå..."
-
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:505
-#: ../src/applet-device-gsm.c:553
+#: ../src/applet-device-bt.c:239 ../src/applet-device-cdma.c:502
+#: ../src/applet-device-gsm.c:556
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "çåååèæâ%sâååäæåçæ"
 
-#: ../src/applet-device-cdma.c:181 ../src/connection-editor/page-mobile.c:696
+#: ../src/applet-device-cdma.c:182 ../src/connection-editor/page-mobile.c:715
 #: ../src/mb-menu-item.c:54
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:390
+#: ../src/applet-device-cdma.c:339 ../src/applet-device-gsm.c:393
 #: ../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/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1510
+#: ../src/applet-device-cdma.c:341 ../src/applet-device-gsm.c:395
+#: ../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:406
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "æåçååå(CDMA)èæ..."
 
-#: ../src/applet-device-cdma.c:443
+#: ../src/applet-device-cdma.c:440
 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
+#: ../src/applet-device-cdma.c:497 ../src/applet-device-gsm.c:551
+#: ../src/applet-device-wimax.c:478
 #, 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
+#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:554
+#: ../src/applet-device-wimax.c:481
 msgid "roaming"
 msgstr "ææä"
 
-#: ../src/applet-device-cdma.c:644 ../src/applet-device-cdma.c:650
+#: ../src/applet-device-cdma.c:641 ../src/applet-device-cdma.c:647
 msgid "CDMA network."
 msgstr "CDMA ççã"
 
 # èéç"home network"ääéçâææççâæåæçåéïååäæçåäåæèæäèäâäççâæèçéã
-#: ../src/applet-device-cdma.c:645 ../src/applet-device-gsm.c:1196
+#: ../src/applet-device-cdma.c:642 ../src/applet-device-gsm.c:1154
 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:648 ../src/applet-device-gsm.c:1160
 msgid "You are now registered on a roaming network."
 msgstr "æçååæååääææççã"
 
-#: ../src/applet-device-gsm.c:211 ../src/connection-editor/page-mobile.c:699
+#: ../src/applet-device-ethernet.c:62
+msgid "Auto Ethernet"
+msgstr "èåäåç"
+
+#: ../src/applet-device-ethernet.c:202
+#, c-format
+msgid "Ethernet Networks (%s)"
+msgstr "äåç(%s)"
+
+#: ../src/applet-device-ethernet.c:204
+#, c-format
+msgid "Ethernet Network (%s)"
+msgstr "äåç(%s)"
+
+#: ../src/applet-device-ethernet.c:207
+msgid "Ethernet Networks"
+msgstr "äåç"
+
+#: ../src/applet-device-ethernet.c:209
+msgid "Ethernet Network"
+msgstr "äåç"
+
+#: ../src/applet-device-ethernet.c:271
+msgid "You are now connected to the ethernet network."
+msgstr "æçåèæåäåçã"
+
+#: ../src/applet-device-ethernet.c:297
+#, c-format
+msgid "Preparing ethernet network connection '%s'..."
+msgstr "æåååäåçèæ %s..."
+
+#: ../src/applet-device-ethernet.c:300
+#, c-format
+msgid "Configuring ethernet network connection '%s'..."
+msgstr "æåéçäåçèæ %s..."
+
+#: ../src/applet-device-ethernet.c:303
+#, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
+msgstr "äåçèæ %s éèçæèè..."
+
+#: ../src/applet-device-ethernet.c:306
+#, c-format
+msgid "Requesting an ethernet network address for '%s'..."
+msgstr "æåä %s èæäääåçèæåå..."
+
+#: ../src/applet-device-ethernet.c:310
+#, c-format
+msgid "Ethernet network connection '%s' active"
+msgstr "äåçèæ %s ååäæåçæ"
+
+#: ../src/applet-device-ethernet.c:491
+msgid "DSL authentication"
+msgstr "DSL èè"
+
+#: ../src/applet-device-gsm.c:214 ../src/connection-editor/page-mobile.c:718
 #: ../src/mb-menu-item.c:59
 msgid "GSM"
 msgstr "GSM"
 
 #. Default connection item
-#: ../src/applet-device-gsm.c:457
+#: ../src/applet-device-gsm.c:460
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "æåçååå(GSM)èæ..."
 
-#: ../src/applet-device-gsm.c:491
+#: ../src/applet-device-gsm.c:494
 msgid "You are now connected to the GSM network."
 msgstr "æçååèæå GSM ççã"
 
-#: ../src/applet-device-gsm.c:652
+#: ../src/applet-device-gsm.c:655
 msgid "PIN code required"
 msgstr "éè PIN ç"
 
-#: ../src/applet-device-gsm.c:660
+#: ../src/applet-device-gsm.c:663
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "çåååèåéè PIN çã"
 
-#: ../src/applet-device-gsm.c:781
+#: ../src/applet-device-gsm.c:784
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "%2$s ä SIM å %1$s ç PIN ç"
 
-#: ../src/applet-device-gsm.c:873
+#: ../src/applet-device-gsm.c:876
 msgid "Wrong PIN code; please contact your provider."
 msgstr "éèç PIN äçïèèçæçäååã"
 
-#: ../src/applet-device-gsm.c:896
+#: ../src/applet-device-gsm.c:899
 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-gsm.c:926
 msgid "Sending unlock code..."
 msgstr "æååéèéç..."
 
-#: ../src/applet-device-gsm.c:986
+#: ../src/applet-device-gsm.c:989
 msgid "SIM PIN unlock required"
 msgstr "éèèé SIM PIN"
 
-#: ../src/applet-device-gsm.c:987
+#: ../src/applet-device-gsm.c:990
 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
+#: ../src/applet-device-gsm.c:992
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -278,25 +673,25 @@ msgid ""
 msgstr "çåååèåâ%sâååääçäåéèää SIM PIN çã"
 
 #. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:991
+#: ../src/applet-device-gsm.c:994
 msgid "PIN code:"
 msgstr "PIN äçï"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:995
+#: ../src/applet-device-gsm.c:998
 msgid "Show PIN code"
 msgstr "æç PIN ç"
 
-#: ../src/applet-device-gsm.c:998
+#: ../src/applet-device-gsm.c:1001
 msgid "SIM PUK unlock required"
 msgstr "éèèé SIM PUK"
 
-#: ../src/applet-device-gsm.c:999
+#: ../src/applet-device-gsm.c:1002
 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
+#: ../src/applet-device-gsm.c:1004
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -304,211 +699,137 @@ msgid ""
 msgstr "çåååèåâ%sâååääçäåéèää SIM PUK çã"
 
 #. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1003
+#: ../src/applet-device-gsm.c:1006
 msgid "PUK code:"
 msgstr "PUK çï"
 
 #. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1006
+#: ../src/applet-device-gsm.c:1009
 msgid "New PIN code:"
 msgstr "æç PIN çï"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1008
+#: ../src/applet-device-gsm.c:1011
 msgid "Re-enter new PIN code:"
 msgstr "åæèåæç PIN çï"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1013
+#: ../src/applet-device-gsm.c:1016
 msgid "Show PIN/PUK codes"
 msgstr "æç PIN/PUK çï"
 
-#: ../src/applet-device-gsm.c:1195 ../src/applet-device-gsm.c:1201
+#: ../src/applet-device-gsm.c:1153 ../src/applet-device-gsm.c:1159
 msgid "GSM network."
 msgstr "GSM ççã"
 
-#: ../src/applet-device-wired.c:62
-msgid "Auto Ethernet"
-msgstr "èåäåç"
-
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
-msgstr "æççç(%s)"
-
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
-msgstr "æççç(%s)"
-
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
-msgstr "æççç"
-
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
-msgstr "æççç"
-
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1508
-msgid "disconnected"
-msgstr "åæå"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
-msgstr "æçååèæåæçççã"
-
-#: ../src/applet-device-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
-msgstr "æåååæçççèæâ%sâ..."
-
-#: ../src/applet-device-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
-msgstr "æåéçæçççèæâ%sâ..."
-
-#: ../src/applet-device-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
-msgstr "æçççèæâ%sâéèçæèè..."
-
-#: ../src/applet-device-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
-msgstr "æåäâ%sâèæääæçççèæåå..."
-
-#: ../src/applet-device-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
-msgstr "æçççèæâ%sâååäæåçæ"
-
-#: ../src/applet-device-wired.c:494
-msgid "DSL authentication"
-msgstr "DSL èè"
-
-#: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
-msgstr "èæåéèçæçèæ(_C)..."
+#: ../src/applet-device-wifi.c:98
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr "èæåéèç Wi-Fi çç(_C)..."
 
-#: ../src/applet-device-wifi.c:148
-msgid "Create _New Wireless Network..."
-msgstr "ååæçæççç(_N)..."
+#: ../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 "Wireless Networks (%s)"
-msgstr "æççç(%s)"
+msgid "Wi-Fi Networks (%s)"
+msgstr "Wi-Fi çç(%s)"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:789
 #, c-format
-msgid "Wireless Network (%s)"
-msgstr "æççç(%s)"
+msgid "Wi-Fi Network (%s)"
+msgstr "Wi-Fi çç(%s)"
 
-#: ../src/applet-device-wifi.c:794
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "æççç"
+#: ../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
-msgid "wireless is disabled"
-msgstr "æçççåçç"
+#: ../src/applet-device-wifi.c:824
+msgid "Wi-Fi is disabled"
+msgstr "Wi-Fi åçç"
 
-#: ../src/applet-device-wifi.c:828
-msgid "wireless is disabled by hardware switch"
-msgstr "æçççåéèçäååçç"
+#: ../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
-msgid "Wireless Networks Available"
-msgstr "æçççåç"
+#: ../src/applet-device-wifi.c:1065
+msgid "Wi-Fi Networks Available"
+msgstr "Wi-Fi ççåç"
 
-#: ../src/applet-device-wifi.c:1069
-msgid "Use the network menu to connect to a wireless network"
-msgstr "äçççèåèæåæççç"
+#: ../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:1072 ../src/applet.c:924
-msgid "Don't show this message again"
-msgstr "äåæçæäæ"
+#: ../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:1263
+#: ../src/applet-device-wifi.c:1291
 #, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "æçååèæåæççç '%s'ã"
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "æååå Wi-Fi ççèæ %s..."
 
 #: ../src/applet-device-wifi.c:1294
 #, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "æåååæçççèæâ%sâ..."
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "æåéç Wi-Fi ççèæ %s..."
 
 #: ../src/applet-device-wifi.c:1297
 #, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "æåéçæçççèæâ%sâ..."
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr "Wi-Fi çç %s éèçæèè..."
 
 #: ../src/applet-device-wifi.c:1300
 #, c-format
-msgid "User authentication required for wireless network '%s'..."
-msgstr "æçççâ%sâéèçæèè..."
-
-#: ../src/applet-device-wifi.c:1303
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "æåäâ%sâèæääæçççåå..."
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "æåä %s èæääççåå..."
 
-#: ../src/applet-device-wifi.c:1324
+#: ../src/applet-device-wifi.c:1321
 #, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
-msgstr "æçççèæâ%sâåäæåçæï%s (%d%%)"
+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 "Wireless network connection '%s' active"
-msgstr "æçççèæâ%sâåäæåçæ"
+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:1379 ../src/applet-device-wifi.c:1398
-#: ../src/applet.c:490 ../src/applet.c:534 ../src/applet.c:560
-msgid "Unknown error"
-msgstr "æçéè"
-
-#: ../src/applet-device-wifi.c:1382 ../src/applet-device-wifi.c:1401
-#: ../src/applet.c:493 ../src/applet.c:563
-msgid "Connection failure"
-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 ççã"
 
@@ -517,8 +838,8 @@ msgid "Error displaying connection information:"
 msgstr "æçèæäææåéï"
 
 #: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wireless-security.c:313
-#: ../src/libnm-gtk/nm-wireless-dialog.c:948
+#: ../src/connection-editor/page-wifi-security.c:313
+#: ../src/libnm-gtk/nm-wifi-dialog.c:924
 #: ../src/wireless-security/wireless-security.c:406
 msgid "LEAP"
 msgstr "LEAP"
@@ -537,8 +858,7 @@ msgid "WEP"
 msgstr "WEP"
 
 #: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/connection-editor/page-wireless-security.c:265
-#: ../src/libnm-gtk/nm-wireless-dialog.c:905
+#: ../src/libnm-gtk/nm-wifi-dialog.c:881
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "æ"
@@ -600,6 +920,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 "åè"
 
@@ -706,7 +1027,7 @@ msgstr "VPN Bannerï"
 msgid "Base Connection:"
 msgstr "åæèæï"
 
-#: ../src/applet-dialogs.c:823
+#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "æç"
 
@@ -751,378 +1072,207 @@ msgstr "èæåâ%sâéèåçã"
 msgid "Password:"
 msgstr "åçï"
 
-#: ../src/applet.c:488
-msgid "Failed to add/activate connection"
-msgstr "æææå/åçèæ"
-
-#: ../src/applet.c:532
-msgid "Device disconnect failed"
-msgstr "èåæååè"
-
-#: ../src/applet.c:537
-msgid "Disconnect failure"
-msgstr "æååè"
-
-#: ../src/applet.c:558
-msgid "Connection activation failed"
-msgstr "èæåçåè"
-
-#: ../src/applet.c:1013
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
-msgstr ""
-"\n"
-"VPN èæâ%sâåèãççèæèäæã"
-
-#: ../src/applet.c:1016
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
-msgstr ""
-"\n"
-"VPN èæâ%sâåèãVPN æåååäæã"
-
-#: ../src/applet.c:1019
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
-msgstr ""
-"\n"
-"VPN èæâ%sâåèãVPN æåèåäääéæéçã"
-
-#: ../src/applet.c:1022
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
-msgstr ""
-"\n"
-"VPN èæâ%sâåèãèæèæã"
-
-#: ../src/applet.c:1025
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
-msgstr ""
-"\n"
-"VPN èæâ%sâåèãVPN æåæåæéæéåååã"
-
-#: ../src/applet.c:1028
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
-msgstr ""
-"\n"
-"VPN èæâ%sâåèãVPN æååååèã"
-
-#: ../src/applet.c:1031
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
-msgstr ""
-"\n"
-"VPN èæâ%sâåèãææåæç VPN secretã"
-
-#: ../src/applet.c:1034
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
-msgstr ""
-"\n"
-"VPN èæâ%sâåèãVPN secret éæã"
-
-#: ../src/applet.c:1041
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
-msgstr ""
-"\n"
-"VPN èæâ%sâåèã"
-
-#: ../src/applet.c:1059
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
-msgstr ""
-"\n"
-"VPN èæâ%sâåæåãççèæèäæã"
-
-#: ../src/applet.c:1062
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
-msgstr ""
-"\n"
-"VPN èæâ%sâåæåãVPN æåååæã"
-
-#: ../src/applet.c:1068
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
-msgstr ""
-"\n"
-"VPN èæâ%sâåæåã"
-
-#: ../src/applet.c:1098
-#, c-format
+#: ../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
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
 msgid ""
-"VPN connection has been successfully established.\n"
-"\n"
-"%s\n"
-msgstr ""
-"åæååç VPN èæã\n"
-"\n"
-"%s\n"
-
-#: ../src/applet.c:1100
-msgid "VPN connection has been successfully established.\n"
-msgstr "åæååç VPN èæã\n"
-
-#: ../src/applet.c:1102
-msgid "VPN Login Message"
-msgstr "VPN çåææ"
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
+msgstr "IP ååååççäæèæçèçæãååâæåâæéæåää IP ååã"
 
-#: ../src/applet.c:1108 ../src/applet.c:1116 ../src/applet.c:1166
-msgid "VPN Connection Failed"
-msgstr "VPN èæåè"
+#: ../src/connection-editor/ce-ip4-routes.ui.h:2
+#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+msgid "Ig_nore automatically obtained routes"
+msgstr "åçèåèåçèç(_N)"
 
-#: ../src/applet.c:1173
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
-msgstr ""
-"\n"
-"VPN èæâ%sâåèãVPN æååååèã\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-ip4-routes.ui.h:3
+#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+msgid "_Use this connection only for resources on its network"
+msgstr "äåæèæçäçååçççäçèæ(_U)"
 
-#: ../src/applet.c:1176
-#, c-format
+#: ../src/connection-editor/ce-ip4-routes.ui.h:4
+#: ../src/connection-editor/ce-ip6-routes.ui.h:4
 msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
-msgstr ""
-"\n"
-"VPN èæâ%sâåååèã\n"
-"\n"
-"%s"
-
-#: ../src/applet.c:1496
-msgid "device not ready (firmware missing)"
-msgstr "èåæåç(çååä)"
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr "ååçïæèæåääèçäéèççèæã"
 
-#: ../src/applet.c:1498
-msgid "device not ready"
-msgstr "èåæåç"
+#: ../src/connection-editor/ce-new-connection.ui.h:1
+#: ../src/libnm-gtk/wifi.ui.h:1
+#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../src/wireless-security/ws-wpa-eap.ui.h:1
+msgid " "
+msgstr " "
 
-#: ../src/applet.c:1524
-msgid "Disconnect"
-msgstr "æå"
+#: ../src/connection-editor/ce-new-connection.ui.h:2
+msgid "Choose a Connection Type"
+msgstr "éæèæçå"
 
-#: ../src/applet.c:1538
-msgid "device not managed"
-msgstr "èåææç"
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+msgid ""
+"Select the type of connection you wish to create.\n"
+"\n"
+"If you are creating a VPN, and the VPN connection you wish to create does "
+"not appear in the list, you may not have the correct VPN plugin installed."
+msgstr ""
+"èéææåæååçèæççåã\n"
+"\n"
+"åææèåå VPN èæïäéèççåäååèäïæåèææåèçåç VPN "
+"æäã"
 
-#: ../src/applet.c:1582
-msgid "No network devices available"
-msgstr "ææåççççèå"
+#: ../src/connection-editor/ce-new-connection.ui.h:6
+msgid "Createâ"
+msgstr "æå..."
 
-#: ../src/applet.c:1670
-msgid "_VPN Connections"
-msgstr "_VPN èæ"
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr "èå"
 
-#: ../src/applet.c:1727
-msgid "_Configure VPN..."
-msgstr "éç VPN(_C)..."
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr "çå"
 
-#: ../src/applet.c:1731
-msgid "_Disconnect VPN"
-msgstr "æå VPN(_D)"
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr "åæ"
 
-#: ../src/applet.c:1825
-msgid "NetworkManager is not running..."
-msgstr "ççççåæèè..."
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+msgid "Broadcast"
+msgstr "åæ"
 
-#: ../src/applet.c:1830 ../src/applet.c:2631
-msgid "Networking disabled"
-msgstr "ççåçç"
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr "802.3ad"
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2051
-msgid "Enable _Networking"
-msgstr "åçèç(_N)"
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr "èéåäèèèåè"
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2060
-msgid "Enable _Wireless"
-msgstr "åçæç(_W)"
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr "èéåèèåè"
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2069
-msgid "Enable _Mobile Broadband"
-msgstr "åççååå(_M)"
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr "MII(æè)"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2078
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "åç WiMA_X çååå"
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+msgid "ARP"
+msgstr "ARP"
 
-#. Toggle notifications item
-#: ../src/applet.c:2089
-msgid "Enable N_otifications"
-msgstr "åçéç(_O)"
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+msgid "Bonded _connections:"
+msgstr ""
 
-#. 'Connection Information' item
-#: ../src/applet.c:2100
-msgid "Connection _Information"
-msgstr "èæäæ(_I)"
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+msgid "_Mode:"
+msgstr "æå(_M)ï"
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2110
-msgid "Edit Connections..."
-msgstr "çèèæ..."
+#. Edit
+#: ../src/connection-editor/ce-page-bond.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:2
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "_Edit"
+msgstr "çè(_E)"
 
-#. Help item
-#: ../src/applet.c:2124
-msgid "_Help"
-msgstr "åå(_H)"
+#. Delete
+#: ../src/connection-editor/ce-page-bond.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:3
+#: ../src/connection-editor/nm-connection-list.c:702
+msgid "_Delete"
+msgstr "åé(_D)"
 
-#. About item
-#: ../src/applet.c:2133
-msgid "_About"
-msgstr "åä(_A)"
+#: ../src/connection-editor/ce-page-bond.ui.h:14
+msgid "Monitoring _frequency:"
+msgstr "çæéç(_F)ï"
 
-#: ../src/applet.c:2310
-msgid "Disconnected"
-msgstr "åæåèæ"
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "ms"
+msgstr "æç"
 
-#: ../src/applet.c:2311
-msgid "The network connection has been disconnected."
-msgstr "ççèæçåæåã"
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+msgid "_Interface name:"
+msgstr "æååç(_I)ï"
 
-#: ../src/applet.c:2494
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "æåååççèæâ%sâ..."
+#: ../src/connection-editor/ce-page-bond.ui.h:17
+msgid "_Link Monitoring:"
+msgstr "éèçè(_L)ï"
 
-#: ../src/applet.c:2497
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "ççèæâ%sâéèçæèè..."
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "ARP _targets:"
+msgstr "ARP çæ(_T)ï"
 
-#: ../src/applet.c:2503
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "ççèæâ%sâååäæåçæ"
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid ""
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
+msgstr ""
+"ææèæçææäçç IP ååïæäéååéç IP åååèã"
 
-#: ../src/applet.c:2586
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "æååå VPN èæâ%sâ..."
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+msgid "Link _up delay:"
+msgstr ""
 
-#: ../src/applet.c:2589
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "VPN èæâ%sâéèçæèè..."
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _down delay:"
+msgstr ""
 
-#: ../src/applet.c:2592
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "æåäâ%sâèæää VPN åå..."
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
 
-#: ../src/applet.c:2595
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "VPN èæâ%sâååäæåçæ"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:4
+msgid "_Priority:"
+msgstr "äåç(_P)ï"
 
-#: ../src/applet.c:2636
-msgid "No network connection"
-msgstr "ææççèæ"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
 
-#: ../src/applet.c:3336
-msgid "NetworkManager Applet"
-msgstr "ççççååçå"
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+msgid "Bridged _connections:"
+msgstr "ææèæ(_C)ï"
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "èåèéæèå"
+#: ../src/connection-editor/ce-page-bridge.ui.h:6
+msgid "_Forward delay:"
+msgstr "èååæ(_F)ï"
 
-#: ../src/gsm-unlock.ui.h:2
-msgid "_Unlock"
-msgstr "èé(_U)"
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Hello time:"
+msgstr ""
 
-#: ../src/info.ui.h:1
-msgid "Connection Information"
-msgstr "èæäæ"
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "s"
+msgstr "ç"
 
-#: ../src/info.ui.h:2
-msgid "Active Network Connections"
-msgstr "æåçççèæ"
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr "åç _STP"
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "æç 802.1X èè"
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+msgid "_Max age:"
+msgstr "æåèåæé(_M)ï"
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:3
-msgid "_Network name:"
-msgstr "ççåç(_N)ï"
+#: ../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:318
+#: ../src/connection-editor/ce-page.c:356
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "çäääæçéèïææèæ secret æåèã"
 
-#: ../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
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
-msgstr "IP ååååççäæèæçèçæãååâæåâæéæåää IP ååã"
-
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-msgid "Ig_nore automatically obtained routes"
-msgstr "åçèåèåçèç(_N)"
-
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-msgid "_Use this connection only for resources on its network"
-msgstr "äåæèæçäçååçççäçèæ(_U)"
-
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
-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
@@ -1143,7 +1293,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
@@ -1151,15 +1301,129 @@ msgstr "æçåç(_W)"
 msgid "_Password:"
 msgstr "åç(_P)ï"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
+#: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "èå"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "åçç(TP)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "éäååæå(AUI)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "åäççæå(MII)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/ç"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/ç"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/ç"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/ç"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "çå(_P)ï"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "éå(_S)ï"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "ååå(_X)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "èåææ(_O)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+#: ../src/connection-editor/ce-page-wimax.ui.h:1
+msgid "_Device MAC address:"
+msgstr "èå MAC åå(_D)ï"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
+msgid "C_loned MAC address:"
+msgstr "åé MAC åå(_L)ï"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+msgid ""
+"The MAC address entered here will be used as hardware address for the "
+"network device this connection is activated on.  This feature is known as "
+"MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
+msgstr ""
+"æåèåç MAC ååååèåååæèæèäççèåçäååïèçæèçäMAC å"
+"éãäåï00:11:22:33:44:55"
+
+#: ../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 "ææçæéåäèæèäçç(_U)"
+
+#: ../src/connection-editor/ce-page-general.ui.h:3
+msgid "Firewall _zone:"
+msgstr ""
+
+#: ../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)ï"
+
+#. IP-over-InfiniBand "datagram mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+msgid "Connected"
+msgstr "åèæ"
+
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
@@ -1285,43 +1549,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)"
 
@@ -1361,160 +1633,100 @@ msgstr "åè _BSD ææåç"
 msgid "Allow _Deflate data compression"
 msgstr "åè _Deflate ææåç"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
-msgid "Use TCP _header compression"
-msgstr "äç TCP ååç(_H)"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
-msgid "Echo"
-msgstr "åå"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
-msgid "Send PPP _echo packets"
-msgstr "åé PPP ååå(_E)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "Twisted Pair (TP)"
-msgstr "åçç(TP)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "Attachment Unit Interface (AUI)"
-msgstr "éäååæå(AUI)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "BNC"
-msgstr "BNC"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Media Independent Interface (MII)"
-msgstr "åäççæå(MII)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "10 Mb/s"
-msgstr "10 Mb/ç"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-msgid "100 Mb/s"
-msgstr "100 Mb/ç"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "1 Gb/s"
-msgstr "1 Gb/ç"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "10 Gb/s"
-msgstr "10 Gb/ç"
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
+msgid "Use TCP _header compression"
+msgstr "äç TCP ååç(_H)"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "_Port:"
-msgstr "çå(_P)ï"
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
+msgid "Echo"
+msgstr "åå"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "éå(_S)ï"
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
+msgid "Send PPP _echo packets"
+msgstr "åé PPP ååå(_E)"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "ååå(_X)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+msgid "_Parent interface:"
+msgstr "äçæå(_P)ï"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "èåææ(_O)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN interface _name:"
+msgstr "VLAN æååç(_N)ï"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "_Device MAC address:"
-msgstr "èå MAC åå(_D)ï"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+msgid "_Cloned MAC address:"
+msgstr "åé MAC åå(_C)ï"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-msgid "C_loned MAC address:"
-msgstr "åé MAC åå(_L)ï"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr "VLAN æç(_I)ï"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid ""
-"The MAC address entered here will be used as hardware address for the "
-"network device this connection is activated on.  This feature is known as "
-"MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
-msgstr ""
-"æåèåç MAC ååååèåååæèæèäççèåçäååïèçæèçäMAC å"
-"éãäåï00:11:22:33:44:55"
+#. 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 "èååç + çå"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "_MTU:"
-msgstr "_MTUï"
+#. 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-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "bytes"
-msgstr "åè"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+msgid "S_ecurity:"
+msgstr "åå(_E)ï"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
 msgid "Infrastructure"
 msgstr "ææ"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "Transmission po_wer:"
 msgstr "äèåç(_W)ï"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Mb/s"
 msgstr "Mb/ç"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "_Rate:"
 msgstr "éç(_R)ï"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-"æééååæèæéåèäåæèåç BSSID æåçæçèéç(AP)ãäåï"
-"00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_BSSID:"
 msgstr "_BSSIDï"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "C_hannel:"
 msgstr "éé(_H)ï"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "Ban_d:"
 msgstr "ææ(_D)ï"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "M_ode:"
 msgstr "æå(_O)ï"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
 msgid "SS_ID:"
 msgstr "SS_IDï"
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "S_ecurity:"
-msgstr "ååæ(_E)ï"
-
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
 msgid "Allowed Authentication Methods"
 msgstr "åèçèèææ"
@@ -1535,107 +1747,405 @@ msgstr "_PAP"
 msgid "Password Authentication Protocol"
 msgstr "åçèèåè"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
-msgid "C_HAP"
-msgstr "C_HAP"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "C_HAP"
+msgstr "C_HAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Challenge Handshake Authentication Protocol"
+msgstr "ææææèèåè"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "_MSCHAP"
+msgstr "_MSCHAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "åèææææèèåè"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "åèææææèèåèçäç"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
+"ååææåäïæååç PPP æååææææçèèææãåèæåèïèåèççä"
+"äææçææã"
+
+#: ../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:779
+#: ../src/connection-editor/page-ip4.c:945
+msgid "Netmask"
+msgstr "åçæç"
+
+#: ../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:813
+#: ../src/connection-editor/ip6-routes-dialog.c:755
+msgid "Metric"
+msgstr "åå"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:721
+#: ../src/connection-editor/page-ip6.c:911
+msgid "Prefix"
+msgstr "åç"
+
+#: ../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:107
+#: ../src/connection-editor/page-wifi.c:470 ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
+#: ../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:75
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#: ../src/connection-editor/new-connection.c:125
+#: ../src/connection-editor/page-dsl.c:141
+msgid "DSL"
+msgstr "DSL"
+
+#: ../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 ""
+
+#: ../src/connection-editor/new-connection.c:137
+#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
+msgid "Bond"
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:143
+#: ../src/connection-editor/page-bridge.c:211
+msgid "Bridge"
+msgstr "ææ"
+
+#: ../src/connection-editor/new-connection.c:149
+#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:339
+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:371
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr "çäääæçéèïèæçèååèæææåååã"
+
+#: ../src/connection-editor/new-connection.c:380
+msgid "Could not create new connection"
+msgstr "ææåçæèæ"
+
+#: ../src/connection-editor/new-connection.c:515
+msgid "Connection delete failed"
+msgstr "åéèæåè"
+
+#: ../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:118
+#, c-format
+msgid "Editing %s"
+msgstr "æåçè %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:122
+msgid "Editing un-named connection"
+msgstr "çèæååèæ"
+
+#: ../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:408
+msgid "_Save"
+msgstr "äå(_S)"
+
+#: ../src/connection-editor/nm-connection-editor.c:409
+msgid "Save any changes made to this connection."
+msgstr "äååæèæçåéææã"
+
+#: ../src/connection-editor/nm-connection-editor.c:410
+msgid "_Save..."
+msgstr "äå(_S)..."
+
+#: ../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:427
+msgid "Could not create connection"
+msgstr "ææååèæ"
+
+#: ../src/connection-editor/nm-connection-editor.c:427
+msgid "Could not edit connection"
+msgstr "ææçèèæ"
+
+#: ../src/connection-editor/nm-connection-editor.c:429
+msgid "Unknown error creating connection editor dialog."
+msgstr "ååèæçèååèæåçæçéèã"
+
+#: ../src/connection-editor/nm-connection-editor.c:536
+msgid "Error saving connection"
+msgstr "äåèæåé"
+
+#: ../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:631
+msgid "Error initializing editor"
+msgstr "åååçèåéè"
+
+#: ../src/connection-editor/nm-connection-editor.c:968
+msgid "Connection add failed"
+msgstr "æåèæåè"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
+msgid "Connection _name:"
+msgstr "èæåç(_N)ï"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
+msgid "_Export..."
+msgstr "åå(_E)..."
+
+#: ../src/connection-editor/nm-connection-list.c:143
+msgid "never"
+msgstr "ää"
+
+#: ../src/connection-editor/nm-connection-list.c:154
+#: ../src/connection-editor/nm-connection-list.c:165
+msgid "now"
+msgstr "çå"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:172
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d åéäå"
+
+#: ../src/connection-editor/nm-connection-list.c:176
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d åæäå"
+
+#: ../src/connection-editor/nm-connection-list.c:188
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d åäå"
+
+#: ../src/connection-editor/nm-connection-list.c:194
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d äæäå"
+
+#: ../src/connection-editor/nm-connection-list.c:198
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d åäå"
+
+#: ../src/connection-editor/nm-connection-list.c:631
+msgid "Name"
+msgstr "åç"
+
+#: ../src/connection-editor/nm-connection-list.c:644
+msgid "Last Used"
+msgstr "æåäçç"
+
+#: ../src/connection-editor/nm-connection-list.c:686
+msgid "Edit the selected connection"
+msgstr "çèéäçèæ"
+
+#: ../src/connection-editor/nm-connection-list.c:687
+msgid "_Edit..."
+msgstr "çè(_E)..."
+
+#: ../src/connection-editor/nm-connection-list.c:688
+msgid "Authenticate to edit the selected connection"
+msgstr "èèèèäçèéäçèæ"
+
+#: ../src/connection-editor/nm-connection-list.c:703
+msgid "Delete the selected connection"
+msgstr "åééäçèæ"
+
+#: ../src/connection-editor/nm-connection-list.c:704
+msgid "_Delete..."
+msgstr "åé(_D)..."
+
+#: ../src/connection-editor/nm-connection-list.c:705
+msgid "Authenticate to delete the selected connection"
+msgstr "èèèèäåééäçèæ"
+
+#: ../src/connection-editor/nm-connection-list.c:942
+msgid "Error creating connection"
+msgstr "ååèæåé"
+
+#: ../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:998
+msgid "Error editing connection"
+msgstr "çèèæåé"
+
+#: ../src/connection-editor/nm-connection-list.c:999
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr "æææåâ%sâèæ"
+
+#: ../src/connection-editor/page-8021x-security.c:121
+msgid "802.1x Security"
+msgstr "802.1X ååæ"
+
+#: ../src/connection-editor/page-8021x-security.c:123
+msgid "Could not load 802.1x Security user interface."
+msgstr "ææåè 802.1X ååéççæçéã"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
-msgid "Challenge Handshake Authentication Protocol"
-msgstr "ææææèèåè"
+#: ../src/connection-editor/page-8021x-security.c:141
+msgid "Use 802.1_X security for this connection"
+msgstr "åæèæäç 802.1_X ååéç"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
-msgid "_MSCHAP"
-msgstr "_MSCHAP"
+#: ../src/connection-editor/page-bond.c:422
+msgid "Could not load bond user interface."
+msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "åèææææèèåè"
+#: ../src/connection-editor/page-bond.c:561
+#, c-format
+msgid "Bond connection %d"
+msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
+#: ../src/connection-editor/page-bridge.c:214
+msgid "Could not load bridge user interface."
+msgstr "ææåèææçæçéã"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "åèææææèèåèçäç"
+#: ../src/connection-editor/page-bridge.c:309
+#, c-format
+msgid "Bridge connection %d"
+msgstr "ææèæ %d"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
-msgid ""
-"In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods."
-msgstr ""
-"ååææåäïæååç PPP æååææææçèèææãåèæåèïèåèççä"
-"äææçææã"
+#. 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/ce-vpn-wizard.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
-#: ../src/wireless-security/eap-method-peap.ui.h:1
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
-#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../src/wireless-security/ws-wpa-eap.ui.h:1
-msgid " "
-msgstr " "
+#: ../src/connection-editor/page-bridge-port.c:117
+msgid "Could not load bridge port user interface."
+msgstr "ææåèææçåçæçéã"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
-msgstr "éæ VPN èæçå"
+#: ../src/connection-editor/page-dsl.c:143
+msgid "Could not load DSL user interface."
+msgstr "ææåè DSL çæçéã"
+
+#: ../src/connection-editor/page-dsl.c:235
+#, c-format
+msgid "DSL connection %d"
+msgstr "DSL èæ %d"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
+#: ../src/connection-editor/page-ethernet.c:90
+#: ../src/connection-editor/page-infiniband.c:74
+#: ../src/connection-editor/page-wifi.c:113
+#: ../src/connection-editor/page-wimax.c:70
 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."
+"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 ""
-"èäæåèæéæää VPN çåãåææåæåçç VPN èæçåæåçååèäï"
-"æåèææåèæçç VPN æäã"
-
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
-msgid "Createâ"
-msgstr "æå..."
+"æééååæèæéåèäåæèåç MAC ååæåçççèåãäåï"
+"00:11:22:33:44:55"
 
-#: ../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
-msgid "Address"
-msgstr "åå"
+#: ../src/connection-editor/page-ethernet.c:253
+msgid "Could not load ethernet user interface."
+msgstr "ææåèäåççæçéã"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:928
-msgid "Netmask"
-msgstr "åçæç"
+#: ../src/connection-editor/page-ethernet.c:396
+#, c-format
+msgid "Ethernet connection %d"
+msgstr "äåçèæ %d"
 
-#: ../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
-msgid "Gateway"
-msgstr "çå"
+#. 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/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
-msgid "Metric"
-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 ""
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:894
-msgid "Prefix"
-msgstr "åç"
+#: ../src/connection-editor/page-general.c:59
+msgid "FirewallD is not running."
+msgstr "FirewallD æèèã"
 
-#: ../src/connection-editor/page-dsl.c:139
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1518
-msgid "DSL"
-msgstr "DSL"
+#: ../src/connection-editor/page-general.c:330
+msgid "Could not load General user interface."
+msgstr "ææåèåèçæçéã"
 
-#: ../src/connection-editor/page-dsl.c:141
-msgid "Could not load DSL user interface."
-msgstr "ææåè DSL çæçéã"
+#: ../src/connection-editor/page-infiniband.c:171
+msgid "Could not load InfiniBand user interface."
+msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:232
+#: ../src/connection-editor/page-infiniband.c:263
 #, c-format
-msgid "DSL connection %d"
-msgstr "DSL èæ %d"
+msgid "InfiniBand connection %d"
+msgstr ""
 
 #: ../src/connection-editor/page-ip4.c:133
 #: ../src/connection-editor/page-ip6.c:132
@@ -1694,16 +2204,16 @@ msgstr "éå _DNS æååï"
 msgid "Additional s_earch domains:"
 msgstr "éåæçå(_E)ï"
 
-#: ../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:992
+#: ../src/connection-editor/page-ip4.c:1011
 msgid "IPv4 Settings"
 msgstr "IPv4 èç"
 
-#: ../src/connection-editor/page-ip4.c:994
+#: ../src/connection-editor/page-ip4.c:1013
 msgid "Could not load IPv4 user interface."
 msgstr "ææåè IPv4 çæçéã"
 
@@ -1720,364 +2230,120 @@ 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:956
+#: ../src/connection-editor/page-ip6.c:975
 msgid "IPv6 Settings"
 msgstr "IPv6 èç"
 
-#: ../src/connection-editor/page-ip6.c:958
+#: ../src/connection-editor/page-ip6.c:977
 msgid "Could not load IPv6 user interface."
 msgstr "ææåè IPv6 çæçéã"
 
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-master.c:290
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:391
 msgid "Could not load mobile broadband user interface."
 msgstr "ææåèçåååçæçéã"
 
-#: ../src/connection-editor/page-mobile.c:398
+#: ../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:639
+#: ../src/connection-editor/page-mobile.c:658
 msgid "Select Mobile Broadband Provider Type"
 msgstr "éæçåååæäåçå"
 
-#: ../src/connection-editor/page-mobile.c:674
+#: ../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:679
-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:686
-msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
-msgstr "æçæäåäçåä C_DMA çææ(å 1xRTTãEVDO)"
-
-#: ../src/connection-editor/page-ppp.c:134
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
-msgid "PAP"
-msgstr "PAP"
-
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
-msgid "MSCHAPv2"
-msgstr "MSCHAPv2"
-
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
-msgid "MSCHAP"
-msgstr "MSCHAP"
-
-#. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
-msgid "none"
-msgstr "æ"
-
-#: ../src/connection-editor/page-ppp.c:201
-#, c-format
-msgid "Editing PPP authentication methods for %s"
-msgstr "æåçè %s ç PPP èèææ"
-
-#: ../src/connection-editor/page-ppp.c:282
-msgid "PPP Settings"
-msgstr "PPP èç"
-
-#: ../src/connection-editor/page-ppp.c:284
-msgid "Could not load PPP user interface."
-msgstr "ææåè PPP çæçéã"
-
-#: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-#: ../src/connection-editor/nm-connection-list.c:1514
-msgid "VPN"
-msgstr "VPN"
-
-#: ../src/connection-editor/page-vpn.c:111
-msgid "Could not load VPN user interface."
-msgstr "ææåè VPN çæçéã"
-
-#: ../src/connection-editor/page-vpn.c:126
-#, c-format
-msgid "Could not find VPN plugin service for '%s'."
-msgstr "æææååçäâ%sâç VPN æäæåã"
-
-#: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:899
-#, c-format
-msgid "VPN connection %d"
-msgstr "VPN èæ %d"
-
-#: ../src/connection-editor/page-wired.c:91
-#: ../src/connection-editor/page-wireless.c:95
-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-wired.c:271
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:1502
-msgid "Wired"
-msgstr "æç"
-
-#: ../src/connection-editor/page-wired.c:273
-msgid "Could not load wired user interface."
-msgstr "ææåèæççççæçéã"
-
-#: ../src/connection-editor/page-wired.c:448
-#, c-format
-msgid "Wired connection %d"
-msgstr "æçèæ %d"
-
-#: ../src/connection-editor/page-wired-security.c:119
-msgid "802.1x Security"
-msgstr "802.1x ååæ"
-
-#: ../src/connection-editor/page-wired-security.c:121
-msgid "Could not load Wired Security security user interface."
-msgstr "ææåèâæçççååæâååæçæçéã"
-
-#: ../src/connection-editor/page-wired-security.c:139
-msgid "Use 802.1_X security for this connection"
-msgstr "åæèæäç 802.1_X ååæ"
-
-#: ../src/connection-editor/page-wireless.c:172
-#: ../src/connection-editor/page-wireless.c:176
-#: ../src/connection-editor/page-wireless.c:197
-#, c-format
-msgid "default"
-msgstr "éè"
-
-#: ../src/connection-editor/page-wireless.c:201
-#, c-format
-msgid "%u (%u MHz)"
-msgstr "%u (%u MHz)"
-
-#: ../src/connection-editor/page-wireless.c:455
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:1506
-msgid "Wireless"
-msgstr "æç"
-
-#: ../src/connection-editor/page-wireless.c:457
-msgid "Could not load WiFi user interface."
-msgstr "ææåè WiFi çæçéã"
-
-#: ../src/connection-editor/page-wireless.c:661
-#, c-format
-msgid "Wireless connection %d"
-msgstr "æçèæ %d"
-
-#: ../src/connection-editor/page-wireless-security.c:290
-#: ../src/libnm-gtk/nm-wireless-dialog.c:922
-msgid "WEP 40/128-bit Key (Hex or ASCII)"
-msgstr "WEP 40/128 äåé(ååèåæ ASCII)"
-
-#: ../src/connection-editor/page-wireless-security.c:300
-#: ../src/libnm-gtk/nm-wireless-dialog.c:931
-msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128 äåçå"
-
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:961
-msgid "Dynamic WEP (802.1x)"
-msgstr "åæ WEP (802.1x)"
-
-#: ../src/connection-editor/page-wireless-security.c:340
-#: ../src/libnm-gtk/nm-wireless-dialog.c:975
-msgid "WPA & WPA2 Personal"
-msgstr "WPA å WPA2 ää"
-
-#: ../src/connection-editor/page-wireless-security.c:354
-#: ../src/libnm-gtk/nm-wireless-dialog.c:989
-msgid "WPA & WPA2 Enterprise"
-msgstr "WPA å WPA2 ää"
-
-#: ../src/connection-editor/page-wireless-security.c:395
-msgid "Could not load WiFi security user interface; missing WiFi setting."
-msgstr "ææåè WiFi ååæçæçéïçå WiFi èçã"
-
-#: ../src/connection-editor/page-wireless-security.c:405
-msgid "Wireless Security"
-msgstr "æçååæ"
-
-#: ../src/connection-editor/page-wireless-security.c:407
-msgid "Could not load WiFi security user interface."
-msgstr "ææåè WiFi ååæçæçéã"
-
-#: ../src/connection-editor/nm-connection-editor.c:102
-#, c-format
-msgid "Editing %s"
-msgstr "æåçè %s"
-
-#: ../src/connection-editor/nm-connection-editor.c:106
-msgid "Editing un-named connection"
-msgstr "çèæååèæ"
-
-#: ../src/connection-editor/nm-connection-editor.c:292
-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:395
-msgid "Error creating connection editor dialog."
-msgstr "ååèæçèååèæåéã"
-
-#: ../src/connection-editor/nm-connection-editor.c:407
-msgid "_Save"
-msgstr "äå(_S)"
-
-#: ../src/connection-editor/nm-connection-editor.c:408
-msgid "Save any changes made to this connection."
-msgstr "äååæèæçåéææã"
-
-#: ../src/connection-editor/nm-connection-editor.c:409
-msgid "_Save..."
-msgstr "äå(_S)..."
-
-#: ../src/connection-editor/nm-connection-editor.c:410
-msgid "Authenticate to save this connection for all users of this machine."
-msgstr "äææææçæäåæèæéèèèã"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "_Import"
-msgstr "åå(_I)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "E_xport"
-msgstr "åå(_X)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-msgid "Connection _name:"
-msgstr "èæåç(_N)ï"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-msgid "Connect _automatically"
-msgstr "èåèæ(_A)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "A_vailable to all users"
-msgstr "åææçæåç(_V)"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "ää"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "çå"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d åéäå"
+"unsure, ask your provider."
+msgstr "éææççåååæäåäççææãåäçåïèèéæçæäåã"
 
-#: ../src/connection-editor/nm-connection-list.c:249
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d åæäå"
+#: ../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/nm-connection-list.c:261
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d åäå"
+#: ../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/nm-connection-list.c:267
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d äæäå"
+#: ../src/connection-editor/page-ppp.c:134
+msgid "EAP"
+msgstr "EAP"
 
-#: ../src/connection-editor/nm-connection-list.c:271
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%d åäå"
+#: ../src/connection-editor/page-ppp.c:135
+#: ../src/wireless-security/eap-method-ttls.c:230
+msgid "PAP"
+msgstr "PAP"
 
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Connection add failed"
-msgstr "æåèæåè"
+#: ../src/connection-editor/page-ppp.c:136
+#: ../src/wireless-security/eap-method-ttls.c:280
+msgid "CHAP"
+msgstr "CHAP"
 
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "äåèæåé"
+#: ../src/connection-editor/page-ppp.c:137
+#: ../src/wireless-security/eap-method-fast.c:277
+#: ../src/wireless-security/eap-method-peap.c:246
+#: ../src/wireless-security/eap-method-ttls.c:263
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/nm-connection-list.c:516
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "åæâ%sâ/â%sâéæï%d"
+#: ../src/connection-editor/page-ppp.c:138
+#: ../src/wireless-security/eap-method-ttls.c:247
+msgid "MSCHAP"
+msgstr "MSCHAP"
 
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:662
-msgid "An unknown error occurred."
-msgstr "åçäääæçéèã"
+#. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:141
+msgid "none"
+msgstr "æ"
 
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "Error initializing editor"
-msgstr "åååçèåéè"
+#: ../src/connection-editor/page-ppp.c:201
+#, c-format
+msgid "Editing PPP authentication methods for %s"
+msgstr "æåçè %s ç PPP èèææ"
 
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:719
-#: ../src/connection-editor/nm-connection-list.c:885
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
-msgstr "çäääæçéèïèæçèååèæææåååã"
+#: ../src/connection-editor/page-ppp.c:284
+msgid "PPP Settings"
+msgstr "PPP èç"
 
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "ææåçæèæ"
+#: ../src/connection-editor/page-ppp.c:286
+msgid "Could not load PPP user interface."
+msgstr "ææåè PPP çæçéã"
 
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-msgstr "ææçèæèæ"
+#: ../src/connection-editor/page-vlan.c:482
+msgid "Could not load vlan user interface."
+msgstr "ææåè VLAN çæçéã"
 
-#: ../src/connection-editor/nm-connection-list.c:733
-msgid "Could not edit connection"
-msgstr "ææçèèæ"
+#: ../src/connection-editor/page-vlan.c:678
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN èæ %d"
 
-#: ../src/connection-editor/nm-connection-list.c:763
-msgid "Connection delete failed"
-msgstr "åéèæåè"
+#: ../src/connection-editor/page-vpn.c:115
+msgid "Could not load VPN user interface."
+msgstr "ææåè VPN çæçéã"
 
-#: ../src/connection-editor/nm-connection-list.c:795
+#: ../src/connection-editor/page-vpn.c:130
 #, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "æåçèåéèæ %sï"
+msgid "Could not find VPN plugin service for '%s'."
+msgstr "æææåçä %s ç VPN æäæåã"
 
-#: ../src/connection-editor/nm-connection-list.c:929
-#: ../src/connection-editor/vpn-helpers.c:228
-msgid "Cannot import VPN connection"
-msgstr "ææåå VPN èæ"
+#: ../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/nm-connection-list.c:931
+#: ../src/connection-editor/page-vpn.c:250
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2087,79 +2353,104 @@ msgstr ""
 "\n"
 "éèïææ VPN æåçåã"
 
-#: ../src/connection-editor/nm-connection-list.c:944
-msgid "Could not edit imported connection"
-msgstr "ææçèååçèæ"
+#: ../src/connection-editor/page-vpn.c:275
+msgid "Choose a VPN Connection Type"
+msgstr "éæ VPN èæçå"
 
-#: ../src/connection-editor/nm-connection-list.c:1125
-msgid "Name"
-msgstr "åç"
+#: ../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/nm-connection-list.c:1137
-msgid "Last Used"
-msgstr "æåäçç"
+#: ../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/nm-connection-list.c:1263
-msgid "No VPN plugin available. Please install one to enable this button."
-msgstr "æåç VPN æäãèèååèäääåçææéã"
+#: ../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/nm-connection-list.c:1274
-msgid "_Edit"
-msgstr "çè(_E)"
+#: ../src/connection-editor/page-wifi.c:219
+#, c-format
+msgid "%u (%u MHz)"
+msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/nm-connection-list.c:1275
-msgid "Edit the selected connection"
-msgstr "çèéäçèæ"
+#: ../src/connection-editor/page-wifi.c:472
+msgid "Could not load Wi-Fi user interface."
+msgstr "ææåè Wi-Fi çæçéã"
 
-#: ../src/connection-editor/nm-connection-list.c:1276
-msgid "_Edit..."
-msgstr "çè(_E)..."
+#: ../src/connection-editor/page-wifi.c:649
+#, c-format
+msgid "Wi-Fi connection %d"
+msgstr "Wi-Fi èæ %d"
 
-#: ../src/connection-editor/nm-connection-list.c:1277
-msgid "Authenticate to edit the selected connection"
-msgstr "èèèèäçèéäçèæ"
+#: ../src/connection-editor/page-wifi-security.c:265
+msgctxt "Wi-Fi/Ethernet security"
+msgid "None"
+msgstr "æ"
 
-#: ../src/connection-editor/nm-connection-list.c:1292
-msgid "_Delete"
-msgstr "åé(_D)"
+#: ../src/connection-editor/page-wifi-security.c:290
+#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr "WEP 40/128 äåé(ååèåæ ASCII)"
 
-#: ../src/connection-editor/nm-connection-list.c:1293
-msgid "Delete the selected connection"
-msgstr "åééäçèæ"
+#: ../src/connection-editor/page-wifi-security.c:300
+#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128 äåçå"
 
-#: ../src/connection-editor/nm-connection-list.c:1294
-msgid "_Delete..."
-msgstr "åé(_D)..."
+#: ../src/connection-editor/page-wifi-security.c:326
+#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+msgid "Dynamic WEP (802.1x)"
+msgstr "åæ WEP (802.1x)"
 
-#: ../src/connection-editor/nm-connection-list.c:1295
-msgid "Authenticate to delete the selected connection"
-msgstr "èèèèäåééäçèæ"
+#: ../src/connection-editor/page-wifi-security.c:340
+#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+msgid "WPA & WPA2 Personal"
+msgstr "WPA å WPA2 ää"
 
-#: ../src/connection-editor/nm-connection-list.c:1574
-msgid "Error creating connection"
-msgstr "ååèæåé"
+#: ../src/connection-editor/page-wifi-security.c:354
+#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA å WPA2 ää"
 
-#: ../src/connection-editor/nm-connection-list.c:1575
-#, c-format
-msgid "Don't know how to create '%s' connections"
-msgstr "äçéåäååâ%sâèæ"
+#: ../src/connection-editor/page-wifi-security.c:396
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr "ææåè Wi-Fi ååæçæçéïçå Wi-Fi èçã"
 
-#: ../src/connection-editor/nm-connection-list.c:1630
-#: ../src/connection-editor/nm-connection-list.c:1642
-msgid "Error editing connection"
-msgstr "çèèæåé"
+#: ../src/connection-editor/page-wifi-security.c:407
+msgid "Wi-Fi Security"
+msgstr "Wi-Fi ååæ"
 
-#: ../src/connection-editor/nm-connection-list.c:1631
-#, c-format
-msgid "Don't know how to edit '%s' connections"
-msgstr "äçéåäçèâ%sâèæ"
+#: ../src/connection-editor/page-wifi-security.c:409
+msgid "Could not load Wi-Fi security user interface."
+msgstr "ææåè Wi-Fi ååæçæçéã"
 
-#: ../src/connection-editor/nm-connection-list.c:1643
+#: ../src/connection-editor/page-wimax.c:137
+msgid "Could not load WiMAX user interface."
+msgstr "ææåè WiMAX çæçéã"
+
+#: ../src/connection-editor/page-wimax.c:233
 #, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr "æææåâ%sâèæ"
+msgid "WiMAX connection %d"
+msgstr "WiMAX èæ %d"
+
+#: ../src/connection-editor/vpn-helpers.c:207
+msgid "Cannot import VPN connection"
+msgstr "ææåå VPN èæ"
 
-#: ../src/connection-editor/vpn-helpers.c:230
+#: ../src/connection-editor/vpn-helpers.c:209
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2167,33 +2458,33 @@ msgid ""
 "\n"
 "Error: %s."
 msgstr ""
-"æäâ%sâäèèèåïæäåååèåç VPN èæäæ\n"
+"ææèå %s ææäääåååèåç VPN èæäæ\n"
 "\n"
 "éèï%sã"
 
-#: ../src/connection-editor/vpn-helpers.c:263
+#: ../src/connection-editor/vpn-helpers.c:241
 msgid "Select file to import"
 msgstr "éæèååçæä"
 
-#: ../src/connection-editor/vpn-helpers.c:314
+#: ../src/connection-editor/vpn-helpers.c:292
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "åäâ%sâçæäåååã"
 
-#: ../src/connection-editor/vpn-helpers.c:316
+#: ../src/connection-editor/vpn-helpers.c:294
 msgid "_Replace"
 msgstr "ææ(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:318
+#: ../src/connection-editor/vpn-helpers.c:296
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "æåèå %s ææäææåäåç VPN èæï"
 
-#: ../src/connection-editor/vpn-helpers.c:354
+#: ../src/connection-editor/vpn-helpers.c:332
 msgid "Cannot export VPN connection"
 msgstr "ææåå VPN èæ"
 
-#: ../src/connection-editor/vpn-helpers.c:356
+#: ../src/connection-editor/vpn-helpers.c:334
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2204,10 +2495,16 @@ msgstr ""
 "\n"
 "éèï%sã"
 
-#: ../src/connection-editor/vpn-helpers.c:391
+#: ../src/connection-editor/vpn-helpers.c:369
 msgid "Export VPN connection..."
 msgstr "åå VPN èæ..."
 
+#: ../src/ethernet-dialog.c:91 ../src/ethernet-dialog.c:99
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr "ççççååçåæäåæéçèæ(.ui æäææå)ã"
+
 #: ../src/gnome-bluetooth/bt-widget.c:321
 #, c-format
 msgid ""
@@ -2228,87 +2525,107 @@ 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 çç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:205
+#: ../src/gsm-unlock.ui.h:1
+msgid "Automatically unlock this device"
+msgstr "èåèéæèå"
+
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "èé(_U)"
+
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "èæäæ"
+
+#: ../src/info.ui.h:2
+msgid "Active Network Connections"
+msgstr "æåçççèæ"
+
+#: ../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:212
+#: ../src/libnm-gtk/nm-mobile-wizard.c:215
 msgid "Your Device:"
 msgstr "æçèåï"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:223
+#: ../src/libnm-gtk/nm-mobile-wizard.c:226
 msgid "Your Provider:"
 msgstr "æçæååï"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:234
+#: ../src/libnm-gtk/nm-mobile-wizard.c:237
 msgid "Your Plan:"
 msgstr "æçåéï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:259
+#: ../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 "
@@ -2320,23 +2637,23 @@ msgstr ""
 "èéççèæïèæææçèçãèäææççåååèçïåçç >> éééèåä"
 "éæâççèæâã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:271
+#: ../src/libnm-gtk/nm-mobile-wizard.c:274
 msgid "Confirm Mobile Broadband Settings"
 msgstr "çèçåååèç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:332
+#: ../src/libnm-gtk/nm-mobile-wizard.c:338
 msgid "Unlisted"
 msgstr "æåå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:487
+#: ../src/libnm-gtk/nm-mobile-wizard.c:493
 msgid "_Select your plan:"
 msgstr "éææçåé(_S)ï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:511
+#: ../src/libnm-gtk/nm-mobile-wizard.c:517
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "æéåéç _APN (èéçåç)ï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../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"
@@ -2347,164 +2664,199 @@ msgstr ""
 "\n"
 "åææäçåæçåéïèèéæçæäåäèååéç APNã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:542
+#: ../src/libnm-gtk/nm-mobile-wizard.c:548
 msgid "Choose your Billing Plan"
 msgstr "éææçäèåé"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:590
+#: ../src/libnm-gtk/nm-mobile-wizard.c:597
 msgid "My plan is not listed..."
 msgstr "æçåéæèåå..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:747
+#: ../src/libnm-gtk/nm-mobile-wizard.c:754
 msgid "Select your provider from a _list:"
 msgstr "äåèäéææçæäå(_L)ï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:760
+#: ../src/libnm-gtk/nm-mobile-wizard.c:767
 msgid "Provider"
 msgstr "æäå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:785
+#: ../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:796
+#: ../src/libnm-gtk/nm-mobile-wizard.c:803
 msgid "Provider:"
 msgstr "æäåï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:820
+#: ../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:826
+#: ../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:837
+#: ../src/libnm-gtk/nm-mobile-wizard.c:844
 msgid "Choose your Provider"
 msgstr "éææçæäå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1088
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
 msgid "Country or Region List:"
 msgstr "ååæåååèï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
 msgid "Country or region"
 msgstr "ååæåå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1107
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
 msgid "My country is not listed"
 msgstr "ææååå/ååææèåå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1153
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
 msgid "Choose your Provider's Country or Region"
 msgstr "éææçæäåçååæåå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1207
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1227
 msgid "Installed GSM device"
 msgstr "ååèç GSM èå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1210
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
 msgid "Installed CDMA device"
 msgstr "ååèç CDMA èå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1382
+#: ../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:1387
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
 msgid "You will need the following information:"
 msgstr "æåéèäääæï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
 msgid "Your broadband provider's name"
 msgstr "æçååæäååç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Your broadband billing plan name"
 msgstr "æçååäèåéåç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
+#: ../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:1441
+#: ../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:1456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
 msgid "Any device"
 msgstr "ääèå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1469
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
 msgid "Set up a Mobile Broadband Connection"
 msgstr "èçääçåååèæ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1633
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
 msgid "New Mobile Broadband Connection"
 msgstr "æçåååèæ"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:367
+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:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:402
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+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:480 ../src/libnm-gtk/nm-ui-utils.c:500
+#, 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-wireless-dialog.c:1076
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
 msgid "C_reate"
-msgstr "åç(_R)"
+msgstr "åå(_R)"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1160
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
 #, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
-msgstr "éèåçæåéæèéæçççâ%sâã"
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgstr "éèåçæåéæèé Wi-Fi çç %sã"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1162
-msgid "Wireless Network Authentication Required"
-msgstr "éèæçççèè"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "éè Wi-Fi ççèè"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1164
-msgid "Authentication required by wireless network"
-msgstr "æçççéèèè"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wi-Fi ççèæèè"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1169
-msgid "Create New Wireless Network"
-msgstr "ååæçæççç"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "ååæç Wi-Fi çç"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1171
-msgid "New wireless network"
-msgstr "ææççç"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "æå Wi-Fi çç"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
-msgid "Enter a name for the wireless network you wish to create."
-msgstr "èåæèååçæççççåçã"
+#: ../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-wireless-dialog.c:1174
-msgid "Connect to Hidden Wireless Network"
-msgstr "èæåéèçæççç"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "èæåéèç Wi-Fi çç"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1176
-msgid "Hidden wireless network"
-msgstr "éèçæççç"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "éèç Wi-Fi çç"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
-msgstr "èåæèèæçéèæççççåçåååæèçäæã"
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr "èåæèèæçéèç Wi-Fi çççåçåååæèçäæã"
 
 #: ../src/libnm-gtk/wifi.ui.h:2
-msgid "Wireless _security:"
-msgstr "æçççååæ(_S)ï"
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi ååæ(_S)ï"
 
 #: ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "èæ(_O)ï"
 
 #: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _adapter:"
-msgstr "æçééå(_A)ï"
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi ééå(_A)ï"
 
 #: ../src/main.c:73
 msgid "Usage:"
@@ -2553,71 +2905,65 @@ msgid "HSPA"
 msgstr "HSPA"
 
 #: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
+msgid "HSPA+"
+msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:77
+msgid "LTE"
+msgstr "LTE"
+
+#: ../src/mb-menu-item.c:113
 msgid "not enabled"
 msgstr "æåç"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:119
 msgid "not registered"
 msgstr "ææå"
 
-#: ../src/mb-menu-item.c:133
-#, c-format
+#: ../src/mb-menu-item.c:137
+#, fuzzy, c-format
 msgid "Home network (%s)"
 msgstr "äçç(%s)"
 
-#: ../src/mb-menu-item.c:135
-#, c-format
+#: ../src/mb-menu-item.c:139
+#, fuzzy, c-format
 msgid "Home network"
 msgstr "äçç"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:147
 msgid "searching"
 msgstr "æåæç"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:150
 msgid "registration denied"
 msgstr "æåèæç"
 
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:155 ../src/mb-menu-item.c:161
 #, 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:157 ../src/mb-menu-item.c:163
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s(ææä)"
 
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:166
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "ææçç(%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:168
 #, c-format
 msgid "Roaming network"
 msgstr "ææçç"
 
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "éè"
-
 #. 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 èæ"
 
-#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr "ççççååçåæäåæéçèæ(.ui æäææå)ã"
-
 #: ../src/wireless-security/eap-method.c:275
 msgid "No Certificate Authority certificate chosen"
 msgstr "æéåèèäåèä"
@@ -2625,10 +2971,10 @@ msgstr "æéåèèäåèä"
 #: ../src/wireless-security/eap-method.c:276
 msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
+"Authority certificate?"
 msgstr ""
-"ääçèèäå(CA)èäåèåèèæåäååçãæççæçççãèéæääèè"
+"ääçèèäå(CA)èäåèåèèæåäååç Wi-Fi ççãèéæääèè"
 "äåèäåï"
 
 #: ../src/wireless-security/eap-method.c:285
@@ -2643,6 +2989,23 @@ msgstr "DERïPEM æ PKCS#12 çé (*.der, *.pem, *.p12)"
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER æ PEM èä(*.der, *.pem, *.crt, *.cer)"
 
+#: ../src/wireless-security/eap-method-fast.c:261
+#: ../src/wireless-security/eap-method-peap.c:280
+msgid "GTC"
+msgstr "GTC"
+
+#: ../src/wireless-security/eap-method-fast.c:399
+msgid "Choose a PAC file..."
+msgstr "éæää PAC æä..."
+
+#: ../src/wireless-security/eap-method-fast.c:406
+msgid "PAC files (*.pac)"
+msgstr "PAC æä(*.pac)"
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "All files"
+msgstr "æææä"
+
 #: ../src/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr "åå"
@@ -2675,30 +3038,13 @@ msgstr "åéèè(_I)ï"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "åèèå PAC éç(_V)"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
-msgid "GTC"
-msgstr "GTC"
-
-#: ../src/wireless-security/eap-method-fast.c:399
-msgid "Choose a PAC file..."
-msgstr "éæää PAC æä..."
-
-#: ../src/wireless-security/eap-method-fast.c:406
-msgid "PAC files (*.pac)"
-msgstr "PAC æä(*.pac)"
-
-#: ../src/wireless-security/eap-method-fast.c:410
-msgid "All files"
-msgstr "æææä"
-
 #: ../src/wireless-security/eap-method-peap.c:263
 #: ../src/wireless-security/wireless-security.c:382
 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 "éæääèèäåèä..."
@@ -2725,11 +3071,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 "
@@ -2742,11 +3088,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 "éææççé..."
 
@@ -2836,6 +3182,67 @@ msgstr "æçåé(_W)"
 msgid "WEP inde_x:"
 msgstr "WEP çå(_X)ï"
 
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "æççç(%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "æççç(%s)"
+
+#~ msgid "Wireless Network"
+#~ msgid_plural "Wireless Networks"
+#~ msgstr[0] "æççç"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "æçççåçç"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "æçççåéèçäååçç"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "æåååæçççèæâ%sâ..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "æåéçæçççèæâ%sâ..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "æåäâ%sâèæääæçççåå..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "æçççèæâ%sâåäæåçæ"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "ææåèâäåçååæâååæçæçéã"
+
+#~ msgid "Wireless"
+#~ msgstr "æç"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "æçèæ %d"
+
+#~ msgid "_Import"
+#~ msgstr "åå(_I)"
+
+#~ msgid "Connect _automatically"
+#~ msgstr "èåèæ(_A)"
+
+#~ msgid "A_vailable to all users"
+#~ msgstr "åææçæåç(_V)"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "åçäääæçéèã"
+
+#~ msgid "Could not edit new connection"
+#~ msgstr "ææçèæèæ"
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "ææçèååçèæ"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr "æåç VPN æäãèèååèäääåçææéã"
+
+#~ msgid "Don't know how to edit '%s' connections"
+#~ msgstr "äçéåäçèâ%sâèæ"
+
 #~ msgid "could not find the Bluetooth device."
 #~ msgstr "æææåèçèåã"
 
@@ -2851,9 +3258,6 @@ msgstr "WEP çå(_X)ï"
 #~ msgid "United Kingdom"
 #~ msgstr "èå"
 
-#~ msgid "C_onnect"
-#~ msgstr "èæ(_O)"
-
 #~ msgid "Other Wireless Network..."
 #~ msgstr "ååæççç..."
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]