[network-manager-applet] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit 6091ec54a4b9592cd4e60b3250d13bcc81bc2439
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sun Aug 12 23:33:53 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2891 +++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 2894 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 2998 insertions(+), 2787 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 13a3860..091fde1 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet 0.9.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-18 10:00+0800\n"
-"PO-Revision-Date: 2012-07-18 10:00+0800\n"
+"POT-Creation-Date: 2012-08-12 23:32+0800\n"
+"PO-Revision-Date: 2012-08-12 23:32+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: \n"
@@ -71,9 +71,8 @@ msgstr "åæåççççéç"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
 msgid ""
-"Set this to true to disable notifications when wireless networks are "
-"available."
-msgstr "åéèçãTUREãïäåçæççççåçã"
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "åéèçãTUREãïäåçæççççåçæçéçã"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
@@ -108,378 +107,697 @@ msgid ""
 "authentication."
 msgstr "åéèçãTUREãïåçåçä EAP èèä CA èæ"
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:446 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "åç"
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+msgid "802.1X authentication"
+msgstr "802.1X éè"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:488 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "äçååéçèã%sãã"
+#: ../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-device-bt.c:204 ../src/applet-device-cdma.c:445
-#: ../src/applet-device-gsm.c:492 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "ååçéç"
+#: ../src/applet.c:488
+msgid "Failed to add/activate connection"
+msgstr "çæåå/äçéç"
 
-#: ../src/applet-device-bt.c:205
-msgid "You are now connected to the mobile broadband network."
-msgstr "äçååéçèæååéççã"
+#: ../src/applet.c:490 ../src/applet.c:534 ../src/applet.c:560
+#: ../src/applet-device-wifi.c:1379 ../src/applet-device-wifi.c:1398
+msgid "Unknown error"
+msgstr "äæçéè"
+
+#: ../src/applet.c:493 ../src/applet.c:563 ../src/applet-device-wifi.c:1382
+#: ../src/applet-device-wifi.c:1401
+msgid "Connection failure"
+msgstr "éçåæ"
+
+#: ../src/applet.c:532
+msgid "Device disconnect failed"
+msgstr "èçæçåæ"
+
+#: ../src/applet.c:537
+msgid "Disconnect failure"
+msgstr "æçåæ"
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:464
+#: ../src/applet.c:558
+msgid "Connection activation failed"
+msgstr "éççæåæ"
+
+#: ../src/applet.c:924 ../src/applet-device-wifi.c:1072
+msgid "Don't show this message again"
+msgstr "äèåéçéåèæ"
+
+#: ../src/applet.c:1013
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "æåæåæååééçã%sãâ"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"VPN éçã%sãåæïåçççéçèäæäã"
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:467
+#: ../src/applet.c:1016
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "æåèåæååééçã%sãâ"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"VPN éçã%sãåæïåç VPN æåæåçåæäã"
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:1019
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "æååééçã%sãéèäçèéèâ"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"VPN éçã%sãåæïåç VPN æåååçæççæã"
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:490
-#: ../src/applet-device-gsm.c:537 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2500
+#: ../src/applet.c:1022
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "æåèæã%sãæäççäåâ"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"VPN éçã%sãåæïåçéççåèåéæã"
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:555
+#: ../src/applet.c:1025
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "æååééçã%sãåäçä"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"VPN éçã%sãåæïåç VPN æåææåæååã"
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:696
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../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-device-cdma.c:345 ../src/applet-device-gsm.c:392
-#: ../src/applet-dialogs.c:424
+#: ../src/applet.c:1031
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "æååé (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"VPN éçã%sãåæïåçææææç VPN æåã"
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:394
-#: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1510
-msgid "Mobile Broadband"
-msgstr "æååé"
+#: ../src/applet.c:1034
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"VPN éçã%sãåæïåççæç VPN æåã"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:412
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "æçæååé (CDMA) éçâ"
+#: ../src/applet.c:1041
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"VPN éçã%sãåæã"
 
-#: ../src/applet-device-cdma.c:446
-msgid "You are now connected to the CDMA network."
-msgstr "äçååéçè CDMA ççã"
+#: ../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-device-cdma.c:503 ../src/applet-device-gsm.c:550
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:1062
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "æååééçã%sãåäçäï(%d%%%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"VPN éçã%sãåæïåç VPN æåååæã"
 
-#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:553
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "æé"
+#: ../src/applet.c:1068
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"VPN éçã%sãåæçã"
 
-#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
-msgid "CDMA network."
-msgstr "CDMA ççã"
+#: ../src/applet.c:1098
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+"VPN éçåæåçã\n"
+"%s\n"
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1198
-msgid "You are now registered on the home network."
-msgstr "äçååèåèåçççã"
+#: ../src/applet.c:1100
+msgid "VPN connection has been successfully established.\n"
+msgstr "VPN éçåæåçã\n"
 
-#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1204
-msgid "You are now registered on a roaming network."
-msgstr "äçååèåèæéççã"
+#: ../src/applet.c:1102
+msgid "VPN Login Message"
+msgstr "VPN çéèæ"
 
-#: ../src/applet-device-gsm.c:213 ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:1108 ../src/applet.c:1116 ../src/applet.c:1166
+msgid "VPN Connection Failed"
+msgstr "VPN éçåæ"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:459
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "æçæååé (GSM) éçâ"
+#: ../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/applet-device-gsm.c:493
-msgid "You are now connected to the GSM network."
-msgstr "äçååéçè GSM ççã"
+#: ../src/applet.c:1176
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN éçã%sãåååæã\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-gsm.c:654
-msgid "PIN code required"
-msgstr "éè PIN ç"
+#: ../src/applet.c:1496
+msgid "device not ready (firmware missing)"
+msgstr "èçåæåç (çåéé)"
 
-#: ../src/applet-device-gsm.c:662
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "éåæååéèçéè PIN ç"
+#: ../src/applet.c:1498
+msgid "device not ready"
+msgstr "èçåæåç"
 
-#: ../src/applet-device-gsm.c:783
-#, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "SIM åã%sãåã%sãç PIN ç"
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1508 ../src/applet-device-ethernet.c:232
+msgid "disconnected"
+msgstr "åæç"
 
-#: ../src/applet-device-gsm.c:875
-msgid "Wrong PIN code; please contact your provider."
-msgstr "PIN çéèïèèçäçäæåã"
+#: ../src/applet.c:1524
+msgid "Disconnect"
+msgstr "æç"
 
-#: ../src/applet-device-gsm.c:898
-msgid "Wrong PUK code; please contact your provider."
-msgstr "PUK çéèïèèçäçäæåã"
+#: ../src/applet.c:1538
+msgid "device not managed"
+msgstr "èççæçç"
 
-#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:925
-msgid "Sending unlock code..."
-msgstr "çéèéççåçâ"
+#: ../src/applet.c:1582
+msgid "No network devices available"
+msgstr "ææåççççèç"
 
-#: ../src/applet-device-gsm.c:988
-msgid "SIM PIN unlock required"
-msgstr "éèèé SIM PIN ç"
+#: ../src/applet.c:1670
+msgid "_VPN Connections"
+msgstr "_VPN éç"
 
-#: ../src/applet-device-gsm.c:989
-msgid "SIM PIN Unlock Required"
-msgstr "éèèé SIM PIN ç"
+#: ../src/applet.c:1727
+msgid "_Configure VPN..."
+msgstr "èç VPN(_C)â"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:991
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr "èäçæååéèçã%sãäåïéè SIM PIN çã"
+#: ../src/applet.c:1731
+msgid "_Disconnect VPN"
+msgstr "è VPN æç(_D)"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:993
-msgid "PIN code:"
-msgstr "PIN çï"
+#: ../src/applet.c:1825
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager ææåèâ."
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:997
-msgid "Show PIN code"
-msgstr "éç PIN ç"
+#: ../src/applet.c:1830 ../src/applet.c:2631
+msgid "Networking disabled"
+msgstr "ççååç"
 
-#: ../src/applet-device-gsm.c:1000
-msgid "SIM PUK unlock required"
-msgstr "éèèé SIM PUK ç"
+#. 'Enable Networking' item
+#: ../src/applet.c:2051
+msgid "Enable _Networking"
+msgstr "åççç(_N)"
 
-#: ../src/applet-device-gsm.c:1001
-msgid "SIM PUK Unlock Required"
-msgstr "éèèé SIM PUK ç"
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:2060
+msgid "Enable _Wi-Fi"
+msgstr "åç _Wi-Fi"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1003
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr "èäçæååéèçã%sãäåïéè SIM PUK çã"
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:2069
+msgid "Enable _Mobile Broadband"
+msgstr "åçæååé(_M)"
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1005
-msgid "PUK code:"
-msgstr "PUK çï"
+#. 'Enable WiMAX Mobile Broadband' item
+#: ../src/applet.c:2078
+msgid "Enable WiMA_X Mobile Broadband"
+msgstr "åç WiMA_X æååé"
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "New PIN code:"
-msgstr "æç PIN çï"
+#. Toggle notifications item
+#: ../src/applet.c:2089
+msgid "Enable N_otifications"
+msgstr "åçéçåè(_O)"
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1010
-msgid "Re-enter new PIN code:"
-msgstr "éæèå PIN çï"
+#. 'Connection Information' item
+#: ../src/applet.c:2100
+msgid "Connection _Information"
+msgstr "éçèè(_I)"
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1015
-msgid "Show PIN/PUK codes"
-msgstr "éç PIN/PUK ç"
+#. 'Edit Connections...' item
+#: ../src/applet.c:2110
+msgid "Edit Connections..."
+msgstr "çèéçâ"
 
-#: ../src/applet-device-gsm.c:1197 ../src/applet-device-gsm.c:1203
-msgid "GSM network."
-msgstr "GSM ççã"
+#. Help item
+#: ../src/applet.c:2124
+msgid "_Help"
+msgstr "æå(_H)"
 
-#: ../src/applet-device-wired.c:62
-msgid "Auto Ethernet"
-msgstr "èåäåçç"
+#. About item
+#: ../src/applet.c:2133
+msgid "_About"
+msgstr "éæ(_A)"
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
-msgstr "æççç (%s)"
+#: ../src/applet.c:2310
+msgid "Disconnected"
+msgstr "åæç"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
-msgstr "æççç (%s)"
+#: ../src/applet.c:2311
+msgid "The network connection has been disconnected."
+msgstr "ççéçåäæã"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
-msgstr "æççç"
+#: ../src/applet.c:2494
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "æåæåççéçã%sãâ"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
-msgstr "æççç"
+#: ../src/applet.c:2497
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "ççéçã%sãéèäçèéèâ"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1508
-msgid "disconnected"
-msgstr "åæç"
+#: ../src/applet.c:2500 ../src/applet-device-bt.c:239
+#: ../src/applet-device-cdma.c:487 ../src/applet-device-gsm.c:535
+#: ../src/applet-device-wimax.c:473
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "æåèææäã%sãçççäåâ"
 
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
-msgstr "äçååéçèæçççã"
+#: ../src/applet.c:2503
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "ççéçã%sãåäçä"
 
-#: ../src/applet-device-wired.c:300
+#: ../src/applet.c:2586
 #, c-format
-msgid "Preparing wired network connection '%s'..."
-msgstr "æåæåæçççéçã%sãâ"
+msgid "Starting VPN connection '%s'..."
+msgstr "æååå VPN éçã%sãâ"
 
-#: ../src/applet-device-wired.c:303
+#: ../src/applet.c:2589
 #, c-format
-msgid "Configuring wired network connection '%s'..."
-msgstr "æåèåæçççéçã%sãâ"
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "VPN éçã%sãéèäçèéèâ"
 
-#: ../src/applet-device-wired.c:306
+#: ../src/applet.c:2592
 #, c-format
-msgid "User authentication required for wired network connection '%s'..."
-msgstr "æçççéçã%sãéèäçèéèâ"
+msgid "Requesting a VPN address for '%s'..."
+msgstr "æåèæ VPN æäã%sãçççäåâ"
 
-#: ../src/applet-device-wired.c:309
+#: ../src/applet.c:2595
 #, c-format
-msgid "Requesting a wired network address for '%s'..."
-msgstr "æèææçççã%sãæäççäåâ"
+msgid "VPN connection '%s' active"
+msgstr "VPN éçã%sãåäçä"
+
+#: ../src/applet.c:2636
+msgid "No network connection"
+msgstr "ææççéæ"
+
+#: ../src/applet.c:3336
+msgid "NetworkManager Applet"
+msgstr "NetworkManager éæçå"
+
+#: ../src/applet-device-bt.c:173 ../src/applet-device-cdma.c:396
+#: ../src/applet-device-ethernet.c:240 ../src/applet-device-gsm.c:444
+#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
+msgid "Available"
+msgstr "åç"
 
-#: ../src/applet-device-wired.c:313
+#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:438
+#: ../src/applet-device-ethernet.c:269 ../src/applet-device-gsm.c:486
+#: ../src/applet-device-wimax.c:423
 #, c-format
-msgid "Wired network connection '%s' active"
-msgstr "æçççéçã%sãåäçä"
+msgid "You are now connected to '%s'."
+msgstr "äçååéçèã%sãã"
 
-#: ../src/applet-device-wired.c:494
-msgid "DSL authentication"
-msgstr "DSL éè"
+#: ../src/applet-device-bt.c:203 ../src/applet-device-cdma.c:442
+#: ../src/applet-device-ethernet.c:273 ../src/applet-device-gsm.c:490
+#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
+msgid "Connection Established"
+msgstr "ååçéç"
 
-#: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
-msgstr "éæåéèççççç(_C)â"
+#: ../src/applet-device-bt.c:204
+msgid "You are now connected to the mobile broadband network."
+msgstr "äçååéçèæååéççã"
 
-#: ../src/applet-device-wifi.c:148
-msgid "Create _New Wireless Network..."
-msgstr "åçæççççç(_N)â"
+#: ../src/applet-device-bt.c:230 ../src/applet-device-cdma.c:478
+#: ../src/applet-device-gsm.c:526 ../src/applet-device-wimax.c:464
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "æåæåæååééçã%sãâ"
 
-#: ../src/applet-device-wifi.c:292
-msgid "(none)"
-msgstr "(ç)"
+#: ../src/applet-device-bt.c:233 ../src/applet-device-cdma.c:481
+#: ../src/applet-device-gsm.c:529 ../src/applet-device-wimax.c:467
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "æåèåæååééçã%sãâ"
 
-#: ../src/applet-device-wifi.c:790
+#: ../src/applet-device-bt.c:236 ../src/applet-device-cdma.c:484
+#: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:470
 #, c-format
-msgid "Wireless Networks (%s)"
-msgstr "çççç (%s)"
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "æååééçã%sãéèäçèéèâ"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-bt.c:243 ../src/applet-device-cdma.c:505
+#: ../src/applet-device-gsm.c:553
 #, c-format
-msgid "Wireless Network (%s)"
-msgstr "çççç (%s)"
+msgid "Mobile broadband connection '%s' active"
+msgstr "æååééçã%sãåäçä"
 
-#: ../src/applet-device-wifi.c:794
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "çççç"
+#: ../src/applet-device-cdma.c:181 ../src/connection-editor/page-mobile.c:699
+#: ../src/mb-menu-item.c:54
+msgid "CDMA"
+msgstr "CDMA"
 
-#: ../src/applet-device-wifi.c:827
-msgid "wireless is disabled"
-msgstr "ççççååç"
+#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:390
+#: ../src/applet-dialogs.c:424
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "æååé (%s)"
 
-#: ../src/applet-device-wifi.c:828
-msgid "wireless is disabled by hardware switch"
-msgstr "ççççåèçäééåç"
+#: ../src/applet-device-cdma.c:344 ../src/applet-device-gsm.c:392
+#: ../src/connection-editor/new-connection.c:85
+#: ../src/connection-editor/page-mobile.c:379
+msgid "Mobile Broadband"
+msgstr "æååé"
 
-#: ../src/applet-device-wifi.c:889
-msgid "More networks"
-msgstr "æåçç"
+#. Default connection item
+#: ../src/applet-device-cdma.c:409
+msgid "New Mobile Broadband (CDMA) connection..."
+msgstr "æçæååé (CDMA) éçâ"
 
-#: ../src/applet-device-wifi.c:1068
-msgid "Wireless Networks Available"
-msgstr "åçççççç"
+#: ../src/applet-device-cdma.c:443
+msgid "You are now connected to the CDMA network."
+msgstr "äçååéçè CDMA ççã"
 
-#: ../src/applet-device-wifi.c:1069
-msgid "Use the network menu to connect to a wireless network"
-msgstr "äçççéåäéçåçççç"
+#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:548
+#: ../src/applet-device-wimax.c:482
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "æååééçã%sãåäçäï(%d%%%s%s)"
 
-#: ../src/applet-device-wifi.c:1072 ../src/applet.c:924
-msgid "Don't show this message again"
-msgstr "äèåéçéåèæ"
+#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:551
+#: ../src/applet-device-wimax.c:485
+msgid "roaming"
+msgstr "æé"
 
-#: ../src/applet-device-wifi.c:1263
+#: ../src/applet-device-cdma.c:644 ../src/applet-device-cdma.c:650
+msgid "CDMA network."
+msgstr "CDMA ççã"
+
+#: ../src/applet-device-cdma.c:645 ../src/applet-device-gsm.c:1196
+msgid "You are now registered on the home network."
+msgstr "äçååèåèåçççã"
+
+#: ../src/applet-device-cdma.c:651 ../src/applet-device-gsm.c:1202
+msgid "You are now registered on a roaming network."
+msgstr "äçååèåèæéççã"
+
+#: ../src/applet-device-ethernet.c:62
+msgid "Auto Ethernet"
+msgstr "èåäåçç"
+
+#: ../src/applet-device-ethernet.c:205
 #, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "äçååéçåççççã%sãã"
+msgid "Ethernet Networks (%s)"
+msgstr "æççç (%s)"
 
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-ethernet.c:207
 #, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "æåæåççççéçã%sãâ"
+msgid "Ethernet Network (%s)"
+msgstr "æççç (%s)"
 
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-ethernet.c:210
+msgid "Ethernet Networks"
+msgstr "æççç"
+
+#: ../src/applet-device-ethernet.c:212
+msgid "Ethernet Network"
+msgstr "æççç"
+
+#: ../src/applet-device-ethernet.c:274
+msgid "You are now connected to the ethernet network."
+msgstr "äçååéçèæçççã"
+
+#: ../src/applet-device-ethernet.c:300
 #, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "æåèåççççéçã%sãâ"
+msgid "Preparing ethernet network connection '%s'..."
+msgstr "æåæåæçççéçã%sãâ"
 
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-ethernet.c:303
 #, c-format
-msgid "User authentication required for wireless network '%s'..."
-msgstr "ççççã%sãèæäçèéèâ"
+msgid "Configuring ethernet network connection '%s'..."
+msgstr "æåèåæçççéçã%sãâ"
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-ethernet.c:306
 #, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "æåèæççççã%sãæäççäåâ"
+msgid "User authentication required for ethernet network connection '%s'..."
+msgstr "æçççéçã%sãéèäçèéèâ"
 
-#: ../src/applet-device-wifi.c:1324
+#: ../src/applet-device-ethernet.c:309
 #, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
-msgstr "ççççéçã%sãåäçäï %s (%d%%)"
+msgid "Requesting an ethernet network address for '%s'..."
+msgstr "æèææçççã%sãæäççäåâ"
 
-#: ../src/applet-device-wifi.c:1329
+#: ../src/applet-device-ethernet.c:313
 #, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "ççççéçã%sãåäçä"
+msgid "Ethernet network connection '%s' active"
+msgstr "æçççéçã%sãåäçä"
 
-#: ../src/applet-device-wifi.c:1377
-msgid "Failed to activate connection"
-msgstr "çæäçéç"
+#: ../src/applet-device-ethernet.c:494
+msgid "DSL authentication"
+msgstr "DSL éè"
 
-#: ../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-gsm.c:211 ../src/connection-editor/page-mobile.c:702
+#: ../src/mb-menu-item.c:59
+msgid "GSM"
+msgstr "GSM"
 
-#: ../src/applet-device-wifi.c:1382 ../src/applet-device-wifi.c:1401
-#: ../src/applet.c:493 ../src/applet.c:563
-msgid "Connection failure"
-msgstr "éçåæ"
+#. Default connection item
+#: ../src/applet-device-gsm.c:457
+msgid "New Mobile Broadband (GSM) connection..."
+msgstr "æçæååé (GSM) éçâ"
 
-#: ../src/applet-device-wifi.c:1396
-msgid "Failed to add new connection"
+#: ../src/applet-device-gsm.c:491
+msgid "You are now connected to the GSM network."
+msgstr "äçååéçè GSM ççã"
+
+#: ../src/applet-device-gsm.c:652
+msgid "PIN code required"
+msgstr "éè PIN ç"
+
+#: ../src/applet-device-gsm.c:660
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "éåæååéèçéè PIN ç"
+
+#: ../src/applet-device-gsm.c:781
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "SIM åã%sãåã%sãç PIN ç"
+
+#: ../src/applet-device-gsm.c:873
+msgid "Wrong PIN code; please contact your provider."
+msgstr "PIN çéèïèèçäçäæåã"
+
+#: ../src/applet-device-gsm.c:896
+msgid "Wrong PUK code; please contact your provider."
+msgstr "PUK çéèïèèçäçäæåã"
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-gsm.c:923
+msgid "Sending unlock code..."
+msgstr "çéèéççåçâ"
+
+#: ../src/applet-device-gsm.c:986
+msgid "SIM PIN unlock required"
+msgstr "éèèé SIM PIN ç"
+
+#: ../src/applet-device-gsm.c:987
+msgid "SIM PIN Unlock Required"
+msgstr "éèèé SIM PIN ç"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-device-gsm.c:989
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr "èäçæååéèçã%sãäåïéè SIM PIN çã"
+
+#. Translators: PIN code entry label
+#: ../src/applet-device-gsm.c:991
+msgid "PIN code:"
+msgstr "PIN çï"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-device-gsm.c:995
+msgid "Show PIN code"
+msgstr "éç PIN ç"
+
+#: ../src/applet-device-gsm.c:998
+msgid "SIM PUK unlock required"
+msgstr "éèèé SIM PUK ç"
+
+#: ../src/applet-device-gsm.c:999
+msgid "SIM PUK Unlock Required"
+msgstr "éèèé SIM PUK ç"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-device-gsm.c:1001
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr "èäçæååéèçã%sãäåïéè SIM PUK çã"
+
+#. Translators: PUK code entry label
+#: ../src/applet-device-gsm.c:1003
+msgid "PUK code:"
+msgstr "PUK çï"
+
+#. Translators: New PIN entry label
+#: ../src/applet-device-gsm.c:1006
+msgid "New PIN code:"
+msgstr "æç PIN çï"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-device-gsm.c:1008
+msgid "Re-enter new PIN code:"
+msgstr "éæèå PIN çï"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-device-gsm.c:1013
+msgid "Show PIN/PUK codes"
+msgstr "éç PIN/PUK ç"
+
+#: ../src/applet-device-gsm.c:1195 ../src/applet-device-gsm.c:1201
+msgid "GSM network."
+msgstr "GSM ççã"
+
+#: ../src/applet-device-wifi.c:97
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr "éæåéèç Wi-Fi çç(_C)â"
+
+#: ../src/applet-device-wifi.c:148
+msgid "Create _New Wi-Fi Network..."
+msgstr "åçæç Wi-Fi çç(_N)â"
+
+#: ../src/applet-device-wifi.c:292
+msgid "(none)"
+msgstr "(ç)"
+
+#: ../src/applet-device-wifi.c:790
+#, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "Wi-Fi çç (%s)"
+
+#: ../src/applet-device-wifi.c:792
+#, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "Wi-Fi çç (%s)"
+
+#: ../src/applet-device-wifi.c:794
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Wi-Fi çç"
+
+#: ../src/applet-device-wifi.c:827
+msgid "Wi-Fi is disabled"
+msgstr "Wi-Fi ååç"
+
+#: ../src/applet-device-wifi.c:828
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "Wi-Fi åèçäééåç"
+
+#: ../src/applet-device-wifi.c:889
+msgid "More networks"
+msgstr "æåçç"
+
+#: ../src/applet-device-wifi.c:1068
+msgid "Wi-Fi Networks Available"
+msgstr "æ Wi-Fi ççåç"
+
+#: ../src/applet-device-wifi.c:1069
+msgid "Use the network menu to connect to a Wi-Fi network"
+msgstr "äçççéåäéçå Wi-Fi çç"
+
+#: ../src/applet-device-wifi.c:1263
+#, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr "äçååéçè Wi-Fi ççã%sãã"
+
+#: ../src/applet-device-wifi.c:1294
+#, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "æåæå Wi-Fi ççéçã%sãâ"
+
+#: ../src/applet-device-wifi.c:1297
+#, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "æåèå Wi-Fi ççéçã%sãâ"
+
+#: ../src/applet-device-wifi.c:1300
+#, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr "Wi-Fi ççéçã%sãéèäçèéèâ"
+
+#: ../src/applet-device-wifi.c:1303
+#, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "æåèææäã%sãç Wi-Fi ççäåâ"
+
+#: ../src/applet-device-wifi.c:1324
+#, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
+msgstr "Wi-Fi ççéçã%sãåäçäï %s (%d%%)"
+
+#: ../src/applet-device-wifi.c:1329
+#, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Wi-Fi ççéçã%sãåäçä"
+
+#: ../src/applet-device-wifi.c:1377
+msgid "Failed to activate connection"
+msgstr "çæäçéç"
+
+#: ../src/applet-device-wifi.c:1396
+msgid "Failed to add new connection"
 msgstr "çæååæéç"
 
 #: ../src/applet-device-wimax.c:231
@@ -508,8 +826,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:929
 #: ../src/wireless-security/wireless-security.c:406
 msgid "LEAP"
 msgstr "LEAP"
@@ -528,8 +846,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:886
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ææ"
@@ -635,455 +952,112 @@ msgstr "IP äåï"
 
 #: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
 msgctxt "Address"
-msgid "Unknown"
-msgstr "äæ"
-
-#: ../src/applet-dialogs.c:569
-msgid "Broadcast Address:"
-msgstr "åæäåï"
-
-#. Prefix
-#: ../src/applet-dialogs.c:578
-msgid "Subnet Mask:"
-msgstr "åççéçï"
-
-#: ../src/applet-dialogs.c:580
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "äæ"
-
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
-msgid "Default Route:"
-msgstr "éèèçï"
-
-#: ../src/applet-dialogs.c:600
-msgid "Primary DNS:"
-msgstr "äè DNSï"
-
-#: ../src/applet-dialogs.c:609
-msgid "Secondary DNS:"
-msgstr "æè DNSï"
-
-#: ../src/applet-dialogs.c:619
-msgid "Ternary DNS:"
-msgstr "çä DNSï"
-
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
-msgid "IPv6"
-msgstr "IPv6"
-
-#: ../src/applet-dialogs.c:643
-msgid "Ignored"
-msgstr "ååç"
-
-#: ../src/applet-dialogs.c:796
-msgid "VPN Type:"
-msgstr "VPN éåï"
-
-#: ../src/applet-dialogs.c:803
-msgid "VPN Gateway:"
-msgstr "VPN ééåï"
-
-#: ../src/applet-dialogs.c:809
-msgid "VPN Username:"
-msgstr "VPN äçèåçï"
-
-#: ../src/applet-dialogs.c:815
-msgid "VPN Banner:"
-msgstr "VPN æåï"
-
-#: ../src/applet-dialogs.c:821
-msgid "Base Connection:"
-msgstr "åçéçï"
-
-#: ../src/applet-dialogs.c:823
-msgid "Unknown"
-msgstr "äæ"
-
-#. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
-msgid "No valid active connections found!"
-msgstr "æäåææçäçäéçï"
-
-#: ../src/applet-dialogs.c:939
-msgid ""
-"Copyright  2004-2011 Red Hat, Inc.\n"
-"Copyright  2005-2008 Novell, Inc.\n"
-"and many other community contributors and translators"
-msgstr ""
-"Copyright  2004-2011 Red Hat, Inc.\n"
-"Copyright  2005-2008 Novell, Inc.\n"
-"èèååäççèçèèçèè"
-
-#: ../src/applet-dialogs.c:942
-msgid ""
-"Notification area applet for managing your network devices and connections."
-msgstr "çäççäçççèçèéççéçåéæçåã"
-
-#: ../src/applet-dialogs.c:944
-msgid "NetworkManager Website"
-msgstr "NetworkManager çç"
-
-#: ../src/applet-dialogs.c:959
-msgid "Missing resources"
-msgstr "éåèæ"
-
-#: ../src/applet-dialogs.c:984
-msgid "Mobile broadband network password"
-msgstr "æååéççåç"
-
-#: ../src/applet-dialogs.c:993
-#, c-format
-msgid "A password is required to connect to '%s'."
-msgstr "éçèã%sãéèåçã"
-
-#: ../src/applet-dialogs.c:1012
-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 æåã"
-
-#: ../src/applet.c:1034
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
-msgstr ""
-"\n"
-"VPN éçã%sãåæïåççæç VPN æåã"
-
-#: ../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
-msgid ""
-"VPN connection has been successfully established.\n"
-"\n"
-"%s\n"
-msgstr ""
-"VPN éçåæåçã\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 çéèæ"
-
-#: ../src/applet.c:1108 ../src/applet.c:1116 ../src/applet.c:1166
-msgid "VPN Connection Failed"
-msgstr "VPN éçåæ"
-
-#: ../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/applet.c:1176
-#, c-format
-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 "èçåæåç (çåéé)"
-
-#: ../src/applet.c:1498
-msgid "device not ready"
-msgstr "èçåæåç"
-
-#: ../src/applet.c:1524
-msgid "Disconnect"
-msgstr "æç"
-
-#: ../src/applet.c:1538
-msgid "device not managed"
-msgstr "èççæçç"
-
-#: ../src/applet.c:1582
-msgid "No network devices available"
-msgstr "ææåççççèç"
-
-#: ../src/applet.c:1670
-msgid "_VPN Connections"
-msgstr "_VPN éç"
-
-#: ../src/applet.c:1727
-msgid "_Configure VPN..."
-msgstr "èç VPN(_C)â"
-
-#: ../src/applet.c:1731
-msgid "_Disconnect VPN"
-msgstr "è VPN æç(_D)"
-
-#: ../src/applet.c:1825
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager ææåèâ."
-
-#: ../src/applet.c:1830 ../src/applet.c:2631
-msgid "Networking disabled"
-msgstr "ççååç"
-
-#. 'Enable Networking' item
-#: ../src/applet.c:2051
-msgid "Enable _Networking"
-msgstr "åççç(_N)"
-
-#. 'Enable Wireless' item
-#: ../src/applet.c:2060
-msgid "Enable _Wireless"
-msgstr "åççççç(_W)"
-
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2069
-msgid "Enable _Mobile Broadband"
-msgstr "åçæååé(_M)"
-
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2078
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "åç WiMA_X æååé"
-
-#. Toggle notifications item
-#: ../src/applet.c:2089
-msgid "Enable N_otifications"
-msgstr "åçéçåè(_O)"
+msgid "Unknown"
+msgstr "äæ"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2100
-msgid "Connection _Information"
-msgstr "éçèè(_I)"
+#: ../src/applet-dialogs.c:569
+msgid "Broadcast Address:"
+msgstr "åæäåï"
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2110
-msgid "Edit Connections..."
-msgstr "çèéçâ"
+#. Prefix
+#: ../src/applet-dialogs.c:578
+msgid "Subnet Mask:"
+msgstr "åççéçï"
 
-#. Help item
-#: ../src/applet.c:2124
-msgid "_Help"
-msgstr "æå(_H)"
+#: ../src/applet-dialogs.c:580
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "äæ"
 
-#. About item
-#: ../src/applet.c:2133
-msgid "_About"
-msgstr "éæ(_A)"
+#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+msgid "Default Route:"
+msgstr "éèèçï"
 
-#: ../src/applet.c:2310
-msgid "Disconnected"
-msgstr "åæç"
+#: ../src/applet-dialogs.c:600
+msgid "Primary DNS:"
+msgstr "äè DNSï"
 
-#: ../src/applet.c:2311
-msgid "The network connection has been disconnected."
-msgstr "ççéçåäæã"
+#: ../src/applet-dialogs.c:609
+msgid "Secondary DNS:"
+msgstr "æè DNSï"
 
-#: ../src/applet.c:2494
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "æåæåççéçã%sãâ"
+#: ../src/applet-dialogs.c:619
+msgid "Ternary DNS:"
+msgstr "çä DNSï"
 
-#: ../src/applet.c:2497
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "ççéçã%sãéèäçèéèâ"
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:634
+msgid "IPv6"
+msgstr "IPv6"
 
-#: ../src/applet.c:2503
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "ççéçã%sãåäçä"
+#: ../src/applet-dialogs.c:643
+msgid "Ignored"
+msgstr "ååç"
 
-#: ../src/applet.c:2586
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "æååå VPN éçã%sãâ"
+#: ../src/applet-dialogs.c:796
+msgid "VPN Type:"
+msgstr "VPN éåï"
 
-#: ../src/applet.c:2589
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "VPN éçã%sãéèäçèéèâ"
+#: ../src/applet-dialogs.c:803
+msgid "VPN Gateway:"
+msgstr "VPN ééåï"
 
-#: ../src/applet.c:2592
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "æåèæ VPN æäã%sãçççäåâ"
+#: ../src/applet-dialogs.c:809
+msgid "VPN Username:"
+msgstr "VPN äçèåçï"
 
-#: ../src/applet.c:2595
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "VPN éçã%sãåäçä"
+#: ../src/applet-dialogs.c:815
+msgid "VPN Banner:"
+msgstr "VPN æåï"
 
-#: ../src/applet.c:2636
-msgid "No network connection"
-msgstr "ææççéæ"
+#: ../src/applet-dialogs.c:821
+msgid "Base Connection:"
+msgstr "åçéçï"
 
-#: ../src/applet.c:3327
-msgid "NetworkManager Applet"
-msgstr "NetworkManager éæçå"
+#: ../src/applet-dialogs.c:823
+msgid "Unknown"
+msgstr "äæ"
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "èåèééåèç"
+#. Shouldn't really happen but ...
+#: ../src/applet-dialogs.c:886
+msgid "No valid active connections found!"
+msgstr "æäåææçäçäéçï"
 
-#: ../src/gsm-unlock.ui.h:2
-msgid "_Unlock"
-msgstr "èé(_U)"
+#: ../src/applet-dialogs.c:939
+msgid ""
+"Copyright  2004-2011 Red Hat, Inc.\n"
+"Copyright  2005-2008 Novell, Inc.\n"
+"and many other community contributors and translators"
+msgstr ""
+"Copyright  2004-2011 Red Hat, Inc.\n"
+"Copyright  2005-2008 Novell, Inc.\n"
+"èèååäççèçèèçèè"
 
-#: ../src/info.ui.h:1
-msgid "Connection Information"
-msgstr "éçèè"
+#: ../src/applet-dialogs.c:942
+msgid ""
+"Notification area applet for managing your network devices and connections."
+msgstr "çäççäçççèçèéççéçåéæçåã"
 
-#: ../src/info.ui.h:2
-msgid "Active Network Connections"
-msgstr "åçççéç"
+#: ../src/applet-dialogs.c:944
+msgid "NetworkManager Website"
+msgstr "NetworkManager çç"
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "æççç 802.1X éè"
+#: ../src/applet-dialogs.c:959
+msgid "Missing resources"
+msgstr "éåèæ"
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:3
-msgid "_Network name:"
-msgstr "ççåç(_N)ï"
+#: ../src/applet-dialogs.c:984
+msgid "Mobile broadband network password"
+msgstr "æååéççåç"
 
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "èå"
+#: ../src/applet-dialogs.c:993
+#, c-format
+msgid "A password is required to connect to '%s'."
+msgstr "éçèã%sãéèåçã"
 
-#: ../src/connection-editor/ce-page.c:318
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "çæäæçéèäéçæåçææåæã"
+#: ../src/applet-dialogs.c:1012
+msgid "Password:"
+msgstr "åçï"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
@@ -1111,6 +1085,43 @@ msgid ""
 "connection."
 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/connection-editor/ce-new-connection.ui.h:2
+msgid "Choose a Connection Type"
+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 éçéåææåçåæåäïåèæææåèæçç VPN åæçåã"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:6
+msgid "Createâ"
+msgstr "åçâ"
+
+#: ../src/connection-editor/ce-page.c:72
+msgid "automatic"
+msgstr "èå"
+
+#: ../src/connection-editor/ce-page.c:288
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "çæäæçéèäéçæåçææåæã"
+
 #: ../src/connection-editor/ce-page-dsl.ui.h:1
 #: ../src/connection-editor/ce-page-mobile.ui.h:8
 #: ../src/wireless-security/eap-method-leap.ui.h:1
@@ -1123,32 +1134,126 @@ msgstr "äçèåç(_U):"
 msgid "_Service:"
 msgstr "æå(_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
-msgid "Sho_w password"
-msgstr "éçåç(_W)"
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: ../src/wireless-security/eap-method-leap.ui.h:3
+#: ../src/wireless-security/eap-method-simple.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../src/wireless-security/ws-leap.ui.h:3
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+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/wireless-security/eap-method-leap.ui.h:2
+#: ../src/wireless-security/eap-method-simple.ui.h:2
+#: ../src/wireless-security/ws-leap.ui.h:2
+#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+msgid "_Password:"
+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-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/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../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-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-wifi.ui.h:6
+msgid "bytes"
+msgstr "äåç"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
-msgstr "åç(_P)ï"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:1
+msgid "_Transport mode:"
+msgstr "åèæå(_T):"
 
-#: ../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/page-ip6.c:142
-#: ../src/wireless-security/eap-method-peap.ui.h:2
-msgid "Automatic"
-msgstr "èå"
+#. IP-over-InfiniBand "datagram mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+msgid "Datagram"
+msgstr "Datagram"
+
+#. 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
@@ -1357,144 +1462,68 @@ msgstr "åé"
 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/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "_Port:"
-msgstr "éæå(_P)ï"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "éå(_S)ï"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "åéå(_X)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "èååè(_O)"
-
-#: ../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-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-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"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
-
-#: ../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/s"
 
-#: ../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
+#: ../src/connection-editor/ce-page-wifi.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"
+"This option locks this connection to the Wi-Fi access point (AP) specified "
+"by the BSSID entered here.  Example: 00:11:22:33:44:55"
+msgstr "æééæåæéçéåèåææèåç BSSID ææåç Wi-Fi ååéïAPïãäåï00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "éé(_H)ï"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "éå(_D):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
 msgid "M_ode:"
 msgstr "æå(_O)ï"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 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 "åèçéèæå"
@@ -1545,74 +1574,319 @@ msgid ""
 "methods.  If connections fail, try disabling support for some methods."
 msgstr "åååæææäïççäæèç PPP äæåæææææçéèææãåæéçåæïèåèåçæäææçææã"
 
-#: ../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/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/ip4-routes-dialog.c:762
+#: ../src/connection-editor/page-ip4.c:928
+msgid "Netmask"
+msgstr "ççéç"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:779
+#: ../src/connection-editor/ip6-routes-dialog.c:721
+#: ../src/connection-editor/page-ip4.c:945
+#: ../src/connection-editor/page-ip6.c:911
+msgid "Gateway"
+msgstr "éèé"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:796
+#: ../src/connection-editor/ip6-routes-dialog.c:738
+msgid "Metric"
+msgstr "åå"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:704
+#: ../src/connection-editor/page-ip6.c:894
+msgid "Prefix"
+msgstr "åç"
+
+#: ../src/connection-editor/new-connection.c:75
+#: ../src/connection-editor/page-ethernet.c:273
+msgid "Ethernet"
+msgstr "æççç"
+
+#: ../src/connection-editor/new-connection.c:80
+#: ../src/connection-editor/page-wifi.c:462
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
+#: ../src/connection-editor/new-connection.c:90
+#: ../src/connection-editor/page-wimax.c:157 ../src/mb-menu-item.c:73
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#: ../src/connection-editor/new-connection.c:95
+#: ../src/connection-editor/page-dsl.c:139
+msgid "DSL"
+msgstr "DSL"
+
+#: ../src/connection-editor/new-connection.c:100
+#: ../src/connection-editor/page-infiniband.c:189
+msgid "InfiniBand"
+msgstr "InfiniBand"
+
+#: ../src/connection-editor/new-connection.c:112
+#: ../src/connection-editor/page-vpn.c:111
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/new-connection.c:245
+msgid "Import a saved VPN configuration..."
+msgstr "åååååç VPN çæâ"
+
+#: ../src/connection-editor/nm-connection-editor.c:106
+#, c-format
+msgid "Editing %s"
+msgstr "çè %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:110
+msgid "Editing un-named connection"
+msgstr "çèæååçéç"
+
+#: ../src/connection-editor/nm-connection-editor.c:297
+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:401
+msgid "Error creating connection editor dialog."
+msgstr "åçéççèååèçæççéèã"
+
+#: ../src/connection-editor/nm-connection-editor.c:413
+msgid "_Save"
+msgstr "åå(_S)"
+
+#: ../src/connection-editor/nm-connection-editor.c:414
+msgid "Save any changes made to this connection."
+msgstr "ååääåéåéçéèçææã"
+
+#: ../src/connection-editor/nm-connection-editor.c:415
+msgid "_Save..."
+msgstr "åå(_S)â"
+
+#: ../src/connection-editor/nm-connection-editor.c:416
+msgid "Authenticate to save this connection for all users of this machine."
+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 "Connect _automatically"
+msgstr "èåéç(_A)"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
+msgid "A_vailable to all users"
+msgstr "ææäçèçåç"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+msgid "_Export..."
+msgstr "åå(_E)â"
+
+#: ../src/connection-editor/nm-connection-list.c:169
+msgid "never"
+msgstr "æä"
+
+#: ../src/connection-editor/nm-connection-list.c:180
+#: ../src/connection-editor/nm-connection-list.c:191
+msgid "now"
+msgstr "çå"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:198
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d åéäå"
+
+#: ../src/connection-editor/nm-connection-list.c:202
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d åæäå"
+
+#: ../src/connection-editor/nm-connection-list.c:214
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d åäå"
+
+#: ../src/connection-editor/nm-connection-list.c:220
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d åæäå"
+
+#: ../src/connection-editor/nm-connection-list.c:224
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d åäå"
+
+#: ../src/connection-editor/nm-connection-list.c:443
+msgid "Connection add failed"
+msgstr "æåéçåæ"
+
+#: ../src/connection-editor/nm-connection-list.c:472
+msgid "Error saving connection"
+msgstr "ååéçæéè"
+
+#: ../src/connection-editor/nm-connection-list.c:473
+#, c-format
+msgid "The property '%s' / '%s' is invalid: %d"
+msgstr "åæã%sã/ã%sãæçæçï%d"
+
+#: ../src/connection-editor/nm-connection-list.c:480
+#: ../src/connection-editor/nm-connection-list.c:598
+msgid "An unknown error occurred."
+msgstr "ççäæçéèã"
+
+#: ../src/connection-editor/nm-connection-list.c:485
+#: ../src/connection-editor/nm-connection-list.c:638
+msgid "Error initializing editor"
+msgstr "åååçèåæççéè"
+
+#: ../src/connection-editor/nm-connection-list.c:503
+#: ../src/connection-editor/nm-connection-list.c:655
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr "çæäæçéèäéççèååèççæåååã"
+
+#: ../src/connection-editor/nm-connection-list.c:512
+msgid "Could not create new connection"
+msgstr "çæåçæéç"
+
+#: ../src/connection-editor/nm-connection-list.c:524
+msgid "Could not edit new connection"
+msgstr "çæçèæéç"
+
+#: ../src/connection-editor/nm-connection-list.c:669
+msgid "Could not edit connection"
+msgstr "çæçèéç"
+
+#: ../src/connection-editor/nm-connection-list.c:699
+msgid "Connection delete failed"
+msgstr "åééçåæ"
+
+#: ../src/connection-editor/nm-connection-list.c:731
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr "äçåèåééç %s ï"
+
+#: ../src/connection-editor/nm-connection-list.c:972
+msgid "Name"
+msgstr "åç"
+
+#: ../src/connection-editor/nm-connection-list.c:985
+msgid "Last Used"
+msgstr "æåäçç"
+
+#. Edit
+#: ../src/connection-editor/nm-connection-list.c:1026
+msgid "_Edit"
+msgstr "çè(_E)"
+
+#: ../src/connection-editor/nm-connection-list.c:1027
+msgid "Edit the selected connection"
+msgstr "çèéåçéç"
+
+#: ../src/connection-editor/nm-connection-list.c:1028
+msgid "_Edit..."
+msgstr "çè(_E)â"
+
+#: ../src/connection-editor/nm-connection-list.c:1029
+msgid "Authenticate to edit the selected connection"
+msgstr "éèäçèéåçéç"
+
+#. Delete
+#: ../src/connection-editor/nm-connection-list.c:1043
+msgid "_Delete"
+msgstr "åé(_D)"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
-msgstr "èéæ VPN çéçéå"
+#: ../src/connection-editor/nm-connection-list.c:1044
+msgid "Delete the selected connection"
+msgstr "åééåçéç"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-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:1045
+msgid "_Delete..."
+msgstr "åé(_D)â"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
-msgid "Createâ"
-msgstr "åçâ"
+#: ../src/connection-editor/nm-connection-list.c:1046
+msgid "Authenticate to delete the selected connection"
+msgstr "éèäåééåçéç"
 
-#: ../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/nm-connection-list.c:1285
+msgid "Error creating connection"
+msgstr "åçéçæççéè"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:928
-msgid "Netmask"
-msgstr "ççéç"
+#: ../src/connection-editor/nm-connection-list.c:1286
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "äçéåäåçã%sãéç"
 
-#: ../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 "éèé"
+#: ../src/connection-editor/nm-connection-list.c:1341
+msgid "Error editing connection"
+msgstr "çèéçæççéè"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
-msgid "Metric"
-msgstr "åå"
+#: ../src/connection-editor/nm-connection-list.c:1342
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr "æäå UUIDã%sãçéç"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:894
-msgid "Prefix"
-msgstr "åç"
+#: ../src/connection-editor/page-8021x-security.c:119
+msgid "802.1x Security"
+msgstr "802.1x éè"
 
-#: ../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-8021x-security.c:121
+msgid "Could not load 802.1x Security user interface."
+msgstr "çæèå 802.1x ååæäçèäéã"
+
+#: ../src/connection-editor/page-8021x-security.c:139
+msgid "Use 802.1_X security for this connection"
+msgstr "åéåéçäç 802.1_X éè"
 
 #: ../src/connection-editor/page-dsl.c:141
 msgid "Could not load DSL user interface."
 msgstr "çæèå DSL äçèäéã"
 
-#: ../src/connection-editor/page-dsl.c:232
+#: ../src/connection-editor/page-dsl.c:233
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL éç %d"
 
+#: ../src/connection-editor/page-ethernet.c:89
+#: ../src/connection-editor/page-infiniband.c:74
+#: ../src/connection-editor/page-wifi.c:94
+#: ../src/connection-editor/page-wimax.c:70
+msgid ""
+"This option locks this connection to the network device specified by its "
+"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+msgstr "æééæåæéçéåèåææèåç MAC äåææåçççèçãäåï00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-ethernet.c:275
+msgid "Could not load ethernet user interface."
+msgstr "çæèåæçççäçèäéã"
+
+#: ../src/connection-editor/page-ethernet.c:451
+#, c-format
+msgid "Ethernet connection %d"
+msgstr "çççéç %d"
+
+#: ../src/connection-editor/page-infiniband.c:192
+msgid "Could not load InfiniBand user interface."
+msgstr "çæèå InfiniBand äçèäéã"
+
+#: ../src/connection-editor/page-infiniband.c:317
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "InfiniBand éç %d"
+
 #: ../src/connection-editor/page-ip4.c:133
 #: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (VPN)"
@@ -1718,340 +1992,84 @@ 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:642
 msgid "Select Mobile Broadband Provider Type"
 msgstr "éææååéäæåéå"
 
-#: ../src/connection-editor/page-mobile.c:674
+#: ../src/connection-editor/page-mobile.c:677
 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:89
-#: ../src/connection-editor/page-wireless.c:94
-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:272
-#: ../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:274
-msgid "Could not load wired user interface."
-msgstr "çæèåæçççäçèäéã"
-
-#: ../src/connection-editor/page-wired.c:449
-#, 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 "çæèå Wired Security ååäçèäéã"
-
-#: ../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:171
-#: ../src/connection-editor/page-wireless.c:175
-#: ../src/connection-editor/page-wireless.c:196
-#, c-format
-msgid "default"
-msgstr "éè"
-
-#: ../src/connection-editor/page-wireless.c:200
-#, c-format
-msgid "%u (%u MHz)"
-msgstr "%u (%u MHz)"
-
-#: ../src/connection-editor/page-wireless.c:457
-#: ../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:459
-msgid "Could not load WiFi user interface."
-msgstr "çæèå WiFi äçèäéã"
-
-#: ../src/connection-editor/page-wireless.c:663
-#, 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-äå åçå (Hex æ 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 "ææäçèçåç"
-
-#: ../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 åéäå"
-
-#: ../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/nm-connection-list.c:261
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d åäå"
-
-#: ../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-mobile.c:682
+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:271
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%d åäå"
+#: ../src/connection-editor/page-mobile.c:689
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+msgstr "æçäæåäç C_DMA çäçæèïäå 1xRTTãEVDOï"
 
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Connection add failed"
-msgstr "æåéçåæ"
+#: ../src/connection-editor/page-ppp.c:134
+msgid "EAP"
+msgstr "EAP"
 
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "ååéçæéè"
+#: ../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:516
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "åæã%sã/ã%sãæçæçï%d"
+#: ../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:523
-#: ../src/connection-editor/nm-connection-list.c:662
-msgid "An unknown error occurred."
-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:528
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "Error initializing editor"
-msgstr "åååçèåæççéè"
+#: ../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: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 "çæäæçéèäéççèååèççæåååã"
+#. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:141
+msgid "none"
+msgstr "ææ"
 
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-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:569
-msgid "Could not edit new connection"
-msgstr "çæçèæéç"
+#: ../src/connection-editor/page-ppp.c:282
+msgid "PPP Settings"
+msgstr "PPP èåå"
 
-#: ../src/connection-editor/nm-connection-list.c:733
-msgid "Could not edit connection"
-msgstr "çæçèéç"
+#: ../src/connection-editor/page-ppp.c:284
+msgid "Could not load PPP user interface."
+msgstr "çæèå PPP äçèäéã"
 
-#: ../src/connection-editor/nm-connection-list.c:763
-msgid "Connection delete failed"
-msgstr "åééçåæ"
+#: ../src/connection-editor/page-vpn.c:113
+msgid "Could not load VPN user interface."
+msgstr "çæèå VPN äçèäéã"
 
-#: ../src/connection-editor/nm-connection-list.c:795
+#: ../src/connection-editor/page-vpn.c:128
 #, 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:222
+#: ../src/connection-editor/page-vpn.c:305
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN éç %d"
 
-#: ../src/connection-editor/nm-connection-list.c:931
+#: ../src/connection-editor/page-vpn.c:248
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2061,79 +2079,94 @@ msgstr ""
 "\n"
 "éèïææ VPN æåéåã"
 
-#: ../src/connection-editor/nm-connection-list.c:944
-msgid "Could not edit imported connection"
-msgstr "çæçèååçéç"
+#: ../src/connection-editor/page-vpn.c:273
+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:274
+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:171
+#: ../src/connection-editor/page-wifi.c:175
+#: ../src/connection-editor/page-wifi.c:196
+#, c-format
+msgid "default"
+msgstr "éè"
 
-#: ../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:200
+#, c-format
+msgid "%u (%u MHz)"
+msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/nm-connection-list.c:1274
-msgid "_Edit"
-msgstr "çè(_E)"
+#: ../src/connection-editor/page-wifi.c:464
+msgid "Could not load Wi-Fi user interface."
+msgstr "çæèå Wi-Fi äçèäéã"
 
-#: ../src/connection-editor/nm-connection-list.c:1275
-msgid "Edit the selected connection"
-msgstr "çèéåçéç"
+#: ../src/connection-editor/page-wifi.c:669
+#, c-format
+msgid "Wi-Fi connection %d"
+msgstr "Wi-Fi éç %d"
 
-#: ../src/connection-editor/nm-connection-list.c:1276
-msgid "_Edit..."
-msgstr "çè(_E)â"
+#: ../src/connection-editor/page-wifi-security.c:265
+msgctxt "Wi-Fi/Ethernet security"
+msgid "None"
+msgstr "ææ"
 
-#: ../src/connection-editor/nm-connection-list.c:1277
-msgid "Authenticate to edit the selected connection"
-msgstr "éèäçèéåçéç"
+#: ../src/connection-editor/page-wifi-security.c:290
+#: ../src/libnm-gtk/nm-wifi-dialog.c:903
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr "WEP 40/128-äå åçå (Hex æ ASCII)"
 
-#: ../src/connection-editor/nm-connection-list.c:1292
-msgid "_Delete"
-msgstr "åé(_D)"
+#: ../src/connection-editor/page-wifi-security.c:300
+#: ../src/libnm-gtk/nm-wifi-dialog.c:912
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128-äå åè"
 
-#: ../src/connection-editor/nm-connection-list.c:1293
-msgid "Delete the selected connection"
-msgstr "åééåçéç"
+#: ../src/connection-editor/page-wifi-security.c:326
+#: ../src/libnm-gtk/nm-wifi-dialog.c:942
+msgid "Dynamic WEP (802.1x)"
+msgstr "åæ WEP (802.1x)"
 
-#: ../src/connection-editor/nm-connection-list.c:1294
-msgid "_Delete..."
-msgstr "åé(_D)â"
+#: ../src/connection-editor/page-wifi-security.c:340
+#: ../src/libnm-gtk/nm-wifi-dialog.c:956
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 åäç"
 
-#: ../src/connection-editor/nm-connection-list.c:1295
-msgid "Authenticate to delete the selected connection"
-msgstr "éèäåééåçéç"
+#: ../src/connection-editor/page-wifi-security.c:354
+#: ../src/libnm-gtk/nm-wifi-dialog.c:970
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA & WPA2 äæç"
 
-#: ../src/connection-editor/nm-connection-list.c:1574
-msgid "Error creating connection"
-msgstr "åçéçæççéè"
+#: ../src/connection-editor/page-wifi-security.c:395
+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:1575
-#, c-format
-msgid "Don't know how to create '%s' connections"
-msgstr "äçéåäåçã%sãéç"
+#: ../src/connection-editor/page-wifi-security.c:405
+msgid "Wi-Fi Security"
+msgstr "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 "Could not load Wi-Fi security user interface."
+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-wimax.c:160
+msgid "Could not load WiMAX user interface."
+msgstr "çæèå WiMAX äçèäéã"
 
-#: ../src/connection-editor/nm-connection-list.c:1643
+#: ../src/connection-editor/page-wimax.c:289
 #, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr "æäå UUIDã%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 "
@@ -2145,29 +2178,29 @@ msgstr ""
 "\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 "äæåèäæåååç VPN éçåä %sï"
 
-#: ../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"
@@ -2178,114 +2211,133 @@ msgstr ""
 "\n"
 "éèï%sã"
 
-#: ../src/connection-editor/vpn-helpers.c:391
+#: ../src/connection-editor/vpn-helpers.c:369
 msgid "Export VPN connection..."
 msgstr "åå VPN éçâ"
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "çæåç PAN éçï%s"
+#: ../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 "NetworkManager éæçåçææåääéèçèæïæäå .ui æïã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:225
-#: ../src/gnome-bluetooth/bt-widget.c:493
-msgid "Your phone is now ready to use!"
-msgstr "äçéèçååçåääçï"
+#: ../src/gnome-bluetooth/bt-widget.c:321
+#, c-format
+msgid ""
+"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
+msgstr "çæéèèççéçïçæéè D-Busï(%s) %sïã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:249
+#: ../src/gnome-bluetooth/bt-widget.c:330
 #, c-format
-msgid "%s Network"
-msgstr "%s çç"
+msgid ""
+"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
+msgstr "çæéèèççéçïæäå NetworkManagerï(%s) %sïã"
+
+#: ../src/gnome-bluetooth/bt-widget.c:445
+msgid "Use your mobile phone as a network device (PAN/NAP)"
+msgstr "äçææäçççèçïPAN/NAPï"
+
+#: ../src/gnome-bluetooth/bt-widget.c:454
+msgid "Access the Internet using your mobile phone (DUN)"
+msgstr "äçææååäèçïDUNï"
 
-#: ../src/gnome-bluetooth/bt-widget.c:375
+#: ../src/gnome-bluetooth/nma-bt-device.c:318
 #, c-format
 msgid "Error: %s"
 msgstr "éèï%s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:488
+#: ../src/gnome-bluetooth/nma-bt-device.c:425
 #, c-format
 msgid "Failed to create DUN connection: %s"
 msgstr "çæåç DUN éçï%s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:511
+#: ../src/gnome-bluetooth/nma-bt-device.c:427
+#: ../src/gnome-bluetooth/nma-bt-device.c:833
+msgid "Your phone is now ready to use!"
+msgstr "äçéèçååçåääçï"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:450
 msgid "Mobile wizard was canceled"
 msgstr "èåçéåçåæ"
 
-#: ../src/gnome-bluetooth/bt-widget.c:520
+#: ../src/gnome-bluetooth/nma-bt-device.c:459
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "äæçéèèçéåïé GSM æ CDMAï"
 
-#: ../src/gnome-bluetooth/bt-widget.c:714
-#: ../src/gnome-bluetooth/bt-widget.c:720
+#: ../src/gnome-bluetooth/nma-bt-device.c:567
+msgid "unknown modem type."
+msgstr "äæçæææéåã"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:639
+#: ../src/gnome-bluetooth/nma-bt-device.c:645
 msgid "failed to connect to the phone."
 msgstr "çæéçèéèã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:753
+#: ../src/gnome-bluetooth/nma-bt-device.c:676
 msgid "unexpectedly disconnected from the phone."
 msgstr "éèçéæéçã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:762
+#: ../src/gnome-bluetooth/nma-bt-device.c:686
 msgid "timed out detecting phone details."
 msgstr "åæéååæäåéèçèçèæã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:774
+#: ../src/gnome-bluetooth/nma-bt-device.c:697
 msgid "Detecting phone configuration..."
 msgstr "åæéèçéçâ"
 
-#: ../src/gnome-bluetooth/bt-widget.c:840
-msgid "could not find the Bluetooth device."
-msgstr "æäåèçèçã"
-
-#: ../src/gnome-bluetooth/bt-widget.c:980
+#: ../src/gnome-bluetooth/nma-bt-device.c:794
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 msgstr "éèçèçéæååéåèåæèççéçååçã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1012
+#: ../src/gnome-bluetooth/nma-bt-device.c:831
 #, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr "çæéèèççéçïçæéè D-Busï%sïã"
-
-#: ../src/gnome-bluetooth/bt-widget.c:1022
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr "çæéèèççéçïçæéè D-Bus proxyïã"
+msgid "Failed to create PAN connection: %s"
+msgstr "çæåç PAN éçï%s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1031
+#: ../src/gnome-bluetooth/nma-bt-device.c:852
 #, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr "çæéèèççéçïæäå NetworkManagerï%sïã"
+msgid "%s Network"
+msgstr "%s çç"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1098
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "äçææäçççèçïPAN/NAPï"
+#: ../src/gsm-unlock.ui.h:1
+msgid "Automatically unlock this device"
+msgstr "èåèééåèç"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1107
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "äçææååäèçïDUNï"
+#: ../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:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:207
 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:214
 msgid "Your Device:"
 msgstr "äçèç:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:223
+#: ../src/libnm-gtk/nm-mobile-wizard.c:225
 msgid "Your Provider:"
 msgstr "äçäæå:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:234
+#: ../src/libnm-gtk/nm-mobile-wizard.c:236
 msgid "Your Plan:"
 msgstr "äçèå:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:259
+#: ../src/libnm-gtk/nm-mobile-wizard.c:261
 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 "
@@ -2294,23 +2346,23 @@ msgid ""
 "Preferences menu."
 msgstr "çåïææäæéåçèåïéèåéääçæååéäæåãåæéçåæïææäçæååççèæïèææèåãèäææååééççèåïèåãççã >> ãååèåãäïéæãççéçãã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:271
+#: ../src/libnm-gtk/nm-mobile-wizard.c:273
 msgid "Confirm Mobile Broadband Settings"
 msgstr "çèæååéèå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:332
+#: ../src/libnm-gtk/nm-mobile-wizard.c:337
 msgid "Unlisted"
 msgstr "æååç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:487
+#: ../src/libnm-gtk/nm-mobile-wizard.c:492
 msgid "_Select your plan:"
 msgstr "éæäçèå(_S)ï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:511
+#: ../src/libnm-gtk/nm-mobile-wizard.c:516
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "éæèåç _APNïAccess Point Nameïååéåçïï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../src/libnm-gtk/nm-mobile-wizard.c:540
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
@@ -2321,164 +2373,163 @@ msgstr ""
 "\n"
 "åæääçåæäççèåïèæèäæåïäåçèåç APN çäã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:542
+#: ../src/libnm-gtk/nm-mobile-wizard.c:547
 msgid "Choose your Billing Plan"
 msgstr "éæäçèèèå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:590
+#: ../src/libnm-gtk/nm-mobile-wizard.c:596
 msgid "My plan is not listed..."
 msgstr "æçèåææååâ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:747
+#: ../src/libnm-gtk/nm-mobile-wizard.c:753
 msgid "Select your provider from a _list:"
 msgstr "èåæåèéæäæå(_L):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:760
+#: ../src/libnm-gtk/nm-mobile-wizard.c:766
 msgid "Provider"
 msgstr "äæå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:785
+#: ../src/libnm-gtk/nm-mobile-wizard.c:791
 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:802
 msgid "Provider:"
 msgstr "äæåï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:820
+#: ../src/libnm-gtk/nm-mobile-wizard.c:826
 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:832
 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:843
 msgid "Choose your Provider"
 msgstr "éæäçäæå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1088
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1094
 msgid "Country or Region List:"
 msgstr "ååæååæåï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1106
 msgid "Country or region"
 msgstr "ååæåå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1107
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
 msgid "My country is not listed"
 msgstr "æçååäææååä"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1153
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1159
 msgid "Choose your Provider's Country or Region"
 msgstr "éæäçäæåçååæåå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1207
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1213
 msgid "Installed GSM device"
 msgstr "ååèç GSM èç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1210
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1216
 msgid "Installed CDMA device"
 msgstr "ååèç CDMA èç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1382
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1388
 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:1393
 msgid "You will need the following information:"
 msgstr "äéèääèèï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
 msgid "Your broadband provider's name"
 msgstr "åéäæåçåç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
 msgid "Your broadband billing plan name"
 msgstr "åéèèèåçåç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1420
 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:1447
 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:1462
 msgid "Any device"
 msgstr "ääèç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1469
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1475
 msgid "Set up a Mobile Broadband Connection"
 msgstr "èåæååééç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1633
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1639
 msgid "New Mobile Broadband Connection"
 msgstr "æçæååééç"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../src/libnm-gtk/nm-wifi-dialog.c:438
 msgid "New..."
 msgstr "æåâ"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1076
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1057
 msgid "C_reate"
 msgstr "åç(_R)"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1160
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
 #, 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:1143
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wi-Fi ççéçã%sãéèéè"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1164
-msgid "Authentication required by wireless network"
-msgstr "ççççæéèçéè"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wi-Fi ççéçã%sãéèéè"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1169
-msgid "Create New Wireless Network"
-msgstr "åçæççççç"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+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:1152
+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:1153
+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:1155
+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:1157
+msgid "Hidden Wi-Fi network"
+msgstr "éèç Wi-Fi çç"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1158
 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 "ççççåå(_W):"
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi ååæ(_S):"
 
 #: ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "éç(_N):"
 
 #: ../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:"
@@ -2524,10 +2575,6 @@ msgstr "HSUPA"
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
-
 #: ../src/mb-menu-item.c:109
 msgid "not enabled"
 msgstr "æåç"
@@ -2578,11 +2625,11 @@ msgstr "æéçç"
 msgid "Default"
 msgstr "éè"
 
-#: ../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 "NetworkManager éæçåçææåääéèçèæïæäå .ui æïã"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:325
+#, c-format
+msgid "%s connection"
+msgstr "%s éç"
 
 #: ../src/wireless-security/eap-method.c:275
 msgid "No Certificate Authority certificate chosen"
@@ -2591,9 +2638,9 @@ msgstr "æéæääèæææåä(CA)èæ"
 #: ../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?"
-msgstr "ääçèæäå (CA) çèææéæéçäååãææçççç(åèèçåãåèäæ)ãæåèéæäåèæäåçèæï"
+"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
+"Authority certificate?"
+msgstr "ääçèæäå (CA) çèææéæéçäååãææ Wi-Fi çç (åèèçåãåèäæ)ãæåèéæäåèæäåçèæï"
 
 #: ../src/wireless-security/eap-method.c:285
 msgid "Choose CA Certificate"
@@ -2607,6 +2654,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 "åå"
@@ -2639,23 +2703,6 @@ 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"
@@ -2799,5 +2846,63 @@ 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 "Wired"
+#~ msgstr "æç"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "çæèå Wired Security ååäçèäéã"
+
+#~ msgid "Wireless"
+#~ msgstr "çççè"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "çççèéç %d"
+
+#~ msgid "_Import"
+#~ msgstr "åå(_I)"
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "çæçèååçéç"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr "ææ VPN åæçååçãèåèåääçäåçéåæéã"
+
+#~ msgid "Don't know how to edit '%s' connections"
+#~ msgstr "äçéåäçèã%sãéç"
+
+#~ msgid "could not find the Bluetooth device."
+#~ msgstr "æäåèçèçã"
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr "çæéèèççéçïçæéè D-Bus proxyïã"
+
 #~ msgid "_Security:"
 #~ msgstr "ååæ(_S)ï"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 935446c..fdb5a29 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet 0.9.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-18 10:00+0800\n"
-"PO-Revision-Date: 2012-07-17 22:56+0800\n"
+"POT-Creation-Date: 2012-08-12 23:32+0800\n"
+"PO-Revision-Date: 2012-08-12 12:28+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Traditional Chinese <zh-l10n lists linux org tw>\n"
 "Language: \n"
@@ -71,9 +71,8 @@ msgstr "åæåççèçéç"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
 msgid ""
-"Set this to true to disable notifications when wireless networks are "
-"available."
-msgstr "åéèçãTUREãïäåçæçççèåçã"
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "åéèçãTUREãïäåçæçççèåçæçéçã"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
@@ -108,378 +107,697 @@ msgid ""
 "authentication."
 msgstr "åéèçãTUREãïåçåçä EAP èèä CA æè"
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:446 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "åç"
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+msgid "802.1X authentication"
+msgstr "802.1X éè"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:488 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "æçååéçèã%sãã"
+#: ../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-device-bt.c:204 ../src/applet-device-cdma.c:445
-#: ../src/applet-device-gsm.c:492 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "ååçéç"
+#: ../src/applet.c:488
+msgid "Failed to add/activate connection"
+msgstr "çæåå/äçéç"
 
-#: ../src/applet-device-bt.c:205
-msgid "You are now connected to the mobile broadband network."
-msgstr "æçååéçèèååéçèã"
+#: ../src/applet.c:490 ../src/applet.c:534 ../src/applet.c:560
+#: ../src/applet-device-wifi.c:1379 ../src/applet-device-wifi.c:1398
+msgid "Unknown error"
+msgstr "äæçéè"
+
+#: ../src/applet.c:493 ../src/applet.c:563 ../src/applet-device-wifi.c:1382
+#: ../src/applet-device-wifi.c:1401
+msgid "Connection failure"
+msgstr "éçåæ"
+
+#: ../src/applet.c:532
+msgid "Device disconnect failed"
+msgstr "èçæçåæ"
+
+#: ../src/applet.c:537
+msgid "Disconnect failure"
+msgstr "æçåæ"
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:464
+#: ../src/applet.c:558
+msgid "Connection activation failed"
+msgstr "éççæåæ"
+
+#: ../src/applet.c:924 ../src/applet-device-wifi.c:1072
+msgid "Don't show this message again"
+msgstr "äèåéçéåèæ"
+
+#: ../src/applet.c:1013
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "æåæåèååééçã%sãâ"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"VPN éçã%sãåæïåççèéçèäæäã"
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:467
+#: ../src/applet.c:1016
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "æåèåèååééçã%sãâ"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"VPN éçã%sãåæïåç VPN æåæåçåæäã"
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:1019
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "èååééçã%sãéèäçèéèâ"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"VPN éçã%sãåæïåç VPN æåååçæççæã"
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:490
-#: ../src/applet-device-gsm.c:537 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2500
+#: ../src/applet.c:1022
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "æåèæã%sãæäçèäåâ"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"VPN éçã%sãåæïåçéççåèåéæã"
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:555
+#: ../src/applet.c:1025
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "èååééçã%sãåäçä"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"VPN éçã%sãåæïåç VPN æåææåæååã"
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:696
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../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-device-cdma.c:345 ../src/applet-device-gsm.c:392
-#: ../src/applet-dialogs.c:424
+#: ../src/applet.c:1031
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "èååé (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"VPN éçã%sãåæïåçææææç VPN æåã"
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:394
-#: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1510
-msgid "Mobile Broadband"
-msgstr "èååé"
+#: ../src/applet.c:1034
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"VPN éçã%sãåæïåççæç VPN æåã"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:412
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "æçèååé (CDMA) éçâ"
+#: ../src/applet.c:1041
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"VPN éçã%sãåæã"
 
-#: ../src/applet-device-cdma.c:446
-msgid "You are now connected to the CDMA network."
-msgstr "æçååéçè CDMA çèã"
+#: ../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-device-cdma.c:503 ../src/applet-device-gsm.c:550
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:1062
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "èååééçã%sãåäçäï(%d%%%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"VPN éçã%sãåæïåç VPN æåååæã"
 
-#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:553
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "æé"
+#: ../src/applet.c:1068
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"VPN éçã%sãåæçã"
 
-#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
-msgid "CDMA network."
-msgstr "CDMA çèã"
+#: ../src/applet.c:1098
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+"VPN éçåæåçã\n"
+"%s\n"
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1198
-msgid "You are now registered on the home network."
-msgstr "æçååèåèåççèã"
+#: ../src/applet.c:1100
+msgid "VPN connection has been successfully established.\n"
+msgstr "VPN éçåæåçã\n"
 
-#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1204
-msgid "You are now registered on a roaming network."
-msgstr "æçååèåèæéçèã"
+#: ../src/applet.c:1102
+msgid "VPN Login Message"
+msgstr "VPN çéèæ"
 
-#: ../src/applet-device-gsm.c:213 ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:1108 ../src/applet.c:1116 ../src/applet.c:1166
+msgid "VPN Connection Failed"
+msgstr "VPN éçåæ"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:459
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "æçèååé (GSM) éçâ"
+#: ../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/applet-device-gsm.c:493
-msgid "You are now connected to the GSM network."
-msgstr "æçååéçè GSM çèã"
+#: ../src/applet.c:1176
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN éçã%sãåååæã\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-gsm.c:654
-msgid "PIN code required"
-msgstr "éè PIN ç"
+#: ../src/applet.c:1496
+msgid "device not ready (firmware missing)"
+msgstr "èçåæåç (çåéé)"
 
-#: ../src/applet-device-gsm.c:662
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "éåèååéèçéè PIN ç"
+#: ../src/applet.c:1498
+msgid "device not ready"
+msgstr "èçåæåç"
 
-#: ../src/applet-device-gsm.c:783
-#, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "SIM åã%sãåã%sãç PIN ç"
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1508 ../src/applet-device-ethernet.c:232
+msgid "disconnected"
+msgstr "åæç"
 
-#: ../src/applet-device-gsm.c:875
-msgid "Wrong PIN code; please contact your provider."
-msgstr "PIN çéèïèèçæçäæåã"
+#: ../src/applet.c:1524
+msgid "Disconnect"
+msgstr "æç"
 
-#: ../src/applet-device-gsm.c:898
-msgid "Wrong PUK code; please contact your provider."
-msgstr "PUK çéèïèèçæçäæåã"
+#: ../src/applet.c:1538
+msgid "device not managed"
+msgstr "èççæçç"
 
-#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:925
-msgid "Sending unlock code..."
-msgstr "çéèéççåçâ"
+#: ../src/applet.c:1582
+msgid "No network devices available"
+msgstr "ææåçççèèç"
 
-#: ../src/applet-device-gsm.c:988
-msgid "SIM PIN unlock required"
-msgstr "éèèé SIM PIN ç"
+#: ../src/applet.c:1670
+msgid "_VPN Connections"
+msgstr "_VPN éç"
 
-#: ../src/applet-device-gsm.c:989
-msgid "SIM PIN Unlock Required"
-msgstr "éèèé SIM PIN ç"
+#: ../src/applet.c:1727
+msgid "_Configure VPN..."
+msgstr "èç VPN(_C)â"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:991
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr "èäçèååéèçã%sãäåïéè SIM PIN çã"
+#: ../src/applet.c:1731
+msgid "_Disconnect VPN"
+msgstr "è VPN æç(_D)"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:993
-msgid "PIN code:"
-msgstr "PIN çï"
+#: ../src/applet.c:1825
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager ææåèâ."
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:997
-msgid "Show PIN code"
-msgstr "éç PIN ç"
+#: ../src/applet.c:1830 ../src/applet.c:2631
+msgid "Networking disabled"
+msgstr "çèååç"
 
-#: ../src/applet-device-gsm.c:1000
-msgid "SIM PUK unlock required"
-msgstr "éèèé SIM PUK ç"
+#. 'Enable Networking' item
+#: ../src/applet.c:2051
+msgid "Enable _Networking"
+msgstr "åççè(_N)"
 
-#: ../src/applet-device-gsm.c:1001
-msgid "SIM PUK Unlock Required"
-msgstr "éèèé SIM PUK ç"
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:2060
+msgid "Enable _Wi-Fi"
+msgstr "åç _Wi-Fi"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1003
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr "èäçèååéèçã%sãäåïéè SIM PUK çã"
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:2069
+msgid "Enable _Mobile Broadband"
+msgstr "åçèååé(_M)"
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1005
-msgid "PUK code:"
-msgstr "PUK çï"
+#. 'Enable WiMAX Mobile Broadband' item
+#: ../src/applet.c:2078
+msgid "Enable WiMA_X Mobile Broadband"
+msgstr "åç WiMA_X èååé"
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "New PIN code:"
-msgstr "æç PIN çï"
+#. Toggle notifications item
+#: ../src/applet.c:2089
+msgid "Enable N_otifications"
+msgstr "åçéçåè(_O)"
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1010
-msgid "Re-enter new PIN code:"
-msgstr "éæèå PIN çï"
+#. 'Connection Information' item
+#: ../src/applet.c:2100
+msgid "Connection _Information"
+msgstr "éçèè(_I)"
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1015
-msgid "Show PIN/PUK codes"
-msgstr "éç PIN/PUK ç"
+#. 'Edit Connections...' item
+#: ../src/applet.c:2110
+msgid "Edit Connections..."
+msgstr "çèéçâ"
 
-#: ../src/applet-device-gsm.c:1197 ../src/applet-device-gsm.c:1203
-msgid "GSM network."
-msgstr "GSM çèã"
+#. Help item
+#: ../src/applet.c:2124
+msgid "_Help"
+msgstr "æå(_H)"
 
-#: ../src/applet-device-wired.c:62
-msgid "Auto Ethernet"
-msgstr "èåäåçè"
+#. About item
+#: ../src/applet.c:2133
+msgid "_About"
+msgstr "éæ(_A)"
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
-msgstr "æççè (%s)"
+#: ../src/applet.c:2310
+msgid "Disconnected"
+msgstr "åæç"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
-msgstr "æççè (%s)"
+#: ../src/applet.c:2311
+msgid "The network connection has been disconnected."
+msgstr "çèéçåäæã"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
-msgstr "æççè"
+#: ../src/applet.c:2494
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "æåæåçèéçã%sãâ"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
-msgstr "æççè"
+#: ../src/applet.c:2497
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "çèéçã%sãéèäçèéèâ"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1508
-msgid "disconnected"
-msgstr "åæç"
+#: ../src/applet.c:2500 ../src/applet-device-bt.c:239
+#: ../src/applet-device-cdma.c:487 ../src/applet-device-gsm.c:535
+#: ../src/applet-device-wimax.c:473
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "æåèææäã%sãççèäåâ"
 
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
-msgstr "æçååéçèæççèã"
+#: ../src/applet.c:2503
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "çèéçã%sãåäçä"
 
-#: ../src/applet-device-wired.c:300
+#: ../src/applet.c:2586
 #, c-format
-msgid "Preparing wired network connection '%s'..."
-msgstr "æåæåæççèéçã%sãâ"
+msgid "Starting VPN connection '%s'..."
+msgstr "æååå VPN éçã%sãâ"
 
-#: ../src/applet-device-wired.c:303
+#: ../src/applet.c:2589
 #, c-format
-msgid "Configuring wired network connection '%s'..."
-msgstr "æåèåæççèéçã%sãâ"
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "VPN éçã%sãéèäçèéèâ"
 
-#: ../src/applet-device-wired.c:306
+#: ../src/applet.c:2592
 #, c-format
-msgid "User authentication required for wired network connection '%s'..."
-msgstr "æççèéçã%sãéèäçèéèâ"
+msgid "Requesting a VPN address for '%s'..."
+msgstr "æåèæ VPN æäã%sãççèäåâ"
 
-#: ../src/applet-device-wired.c:309
+#: ../src/applet.c:2595
 #, c-format
-msgid "Requesting a wired network address for '%s'..."
-msgstr "æèææççèã%sãæäçèäåâ"
+msgid "VPN connection '%s' active"
+msgstr "VPN éçã%sãåäçä"
+
+#: ../src/applet.c:2636
+msgid "No network connection"
+msgstr "ææçèéæ"
+
+#: ../src/applet.c:3336
+msgid "NetworkManager Applet"
+msgstr "NetworkManager éæçå"
+
+#: ../src/applet-device-bt.c:173 ../src/applet-device-cdma.c:396
+#: ../src/applet-device-ethernet.c:240 ../src/applet-device-gsm.c:444
+#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
+msgid "Available"
+msgstr "åç"
 
-#: ../src/applet-device-wired.c:313
+#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:438
+#: ../src/applet-device-ethernet.c:269 ../src/applet-device-gsm.c:486
+#: ../src/applet-device-wimax.c:423
 #, c-format
-msgid "Wired network connection '%s' active"
-msgstr "æççèéçã%sãåäçä"
+msgid "You are now connected to '%s'."
+msgstr "æçååéçèã%sãã"
 
-#: ../src/applet-device-wired.c:494
-msgid "DSL authentication"
-msgstr "DSL éè"
+#: ../src/applet-device-bt.c:203 ../src/applet-device-cdma.c:442
+#: ../src/applet-device-ethernet.c:273 ../src/applet-device-gsm.c:490
+#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
+msgid "Connection Established"
+msgstr "ååçéç"
 
-#: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
-msgstr "éæåéèççççè(_C)â"
+#: ../src/applet-device-bt.c:204
+msgid "You are now connected to the mobile broadband network."
+msgstr "æçååéçèèååéçèã"
 
-#: ../src/applet-device-wifi.c:148
-msgid "Create _New Wireless Network..."
-msgstr "åçæççççè(_N)â"
+#: ../src/applet-device-bt.c:230 ../src/applet-device-cdma.c:478
+#: ../src/applet-device-gsm.c:526 ../src/applet-device-wimax.c:464
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "æåæåèååééçã%sãâ"
 
-#: ../src/applet-device-wifi.c:292
-msgid "(none)"
-msgstr "(ç)"
+#: ../src/applet-device-bt.c:233 ../src/applet-device-cdma.c:481
+#: ../src/applet-device-gsm.c:529 ../src/applet-device-wimax.c:467
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "æåèåèååééçã%sãâ"
 
-#: ../src/applet-device-wifi.c:790
+#: ../src/applet-device-bt.c:236 ../src/applet-device-cdma.c:484
+#: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:470
 #, c-format
-msgid "Wireless Networks (%s)"
-msgstr "çççè (%s)"
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "èååééçã%sãéèäçèéèâ"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-bt.c:243 ../src/applet-device-cdma.c:505
+#: ../src/applet-device-gsm.c:553
 #, c-format
-msgid "Wireless Network (%s)"
-msgstr "çççè (%s)"
+msgid "Mobile broadband connection '%s' active"
+msgstr "èååééçã%sãåäçä"
 
-#: ../src/applet-device-wifi.c:794
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "çççè"
+#: ../src/applet-device-cdma.c:181 ../src/connection-editor/page-mobile.c:699
+#: ../src/mb-menu-item.c:54
+msgid "CDMA"
+msgstr "CDMA"
 
-#: ../src/applet-device-wifi.c:827
-msgid "wireless is disabled"
-msgstr "çççèååç"
+#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:390
+#: ../src/applet-dialogs.c:424
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "èååé (%s)"
 
-#: ../src/applet-device-wifi.c:828
-msgid "wireless is disabled by hardware switch"
-msgstr "çççèåèçéééåç"
+#: ../src/applet-device-cdma.c:344 ../src/applet-device-gsm.c:392
+#: ../src/connection-editor/new-connection.c:85
+#: ../src/connection-editor/page-mobile.c:379
+msgid "Mobile Broadband"
+msgstr "èååé"
 
-#: ../src/applet-device-wifi.c:889
-msgid "More networks"
-msgstr "æåçè"
+#. Default connection item
+#: ../src/applet-device-cdma.c:409
+msgid "New Mobile Broadband (CDMA) connection..."
+msgstr "æçèååé (CDMA) éçâ"
 
-#: ../src/applet-device-wifi.c:1068
-msgid "Wireless Networks Available"
-msgstr "åçççççè"
+#: ../src/applet-device-cdma.c:443
+msgid "You are now connected to the CDMA network."
+msgstr "æçååéçè CDMA çèã"
 
-#: ../src/applet-device-wifi.c:1069
-msgid "Use the network menu to connect to a wireless network"
-msgstr "äççèéåäéçåçççè"
+#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:548
+#: ../src/applet-device-wimax.c:482
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "èååééçã%sãåäçäï(%d%%%s%s)"
 
-#: ../src/applet-device-wifi.c:1072 ../src/applet.c:924
-msgid "Don't show this message again"
-msgstr "äèåéçéåèæ"
+#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:551
+#: ../src/applet-device-wimax.c:485
+msgid "roaming"
+msgstr "æé"
 
-#: ../src/applet-device-wifi.c:1263
+#: ../src/applet-device-cdma.c:644 ../src/applet-device-cdma.c:650
+msgid "CDMA network."
+msgstr "CDMA çèã"
+
+#: ../src/applet-device-cdma.c:645 ../src/applet-device-gsm.c:1196
+msgid "You are now registered on the home network."
+msgstr "æçååèåèåççèã"
+
+#: ../src/applet-device-cdma.c:651 ../src/applet-device-gsm.c:1202
+msgid "You are now registered on a roaming network."
+msgstr "æçååèåèæéçèã"
+
+#: ../src/applet-device-ethernet.c:62
+msgid "Auto Ethernet"
+msgstr "èåäåçè"
+
+#: ../src/applet-device-ethernet.c:205
 #, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "æçååéçåçççèã%sãã"
+msgid "Ethernet Networks (%s)"
+msgstr "æççè (%s)"
 
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-ethernet.c:207
 #, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "æåæåçççèéçã%sãâ"
+msgid "Ethernet Network (%s)"
+msgstr "æççè (%s)"
 
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-ethernet.c:210
+msgid "Ethernet Networks"
+msgstr "æççè"
+
+#: ../src/applet-device-ethernet.c:212
+msgid "Ethernet Network"
+msgstr "æççè"
+
+#: ../src/applet-device-ethernet.c:274
+msgid "You are now connected to the ethernet network."
+msgstr "æçååéçèæççèã"
+
+#: ../src/applet-device-ethernet.c:300
 #, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "æåèåçççèéçã%sãâ"
+msgid "Preparing ethernet network connection '%s'..."
+msgstr "æåæåæççèéçã%sãâ"
 
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-ethernet.c:303
 #, c-format
-msgid "User authentication required for wireless network '%s'..."
-msgstr "çççèã%sãèæäçèéèâ"
+msgid "Configuring ethernet network connection '%s'..."
+msgstr "æåèåæççèéçã%sãâ"
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-ethernet.c:306
 #, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "æåèæçççèã%sãæäçèäåâ"
+msgid "User authentication required for ethernet network connection '%s'..."
+msgstr "æççèéçã%sãéèäçèéèâ"
 
-#: ../src/applet-device-wifi.c:1324
+#: ../src/applet-device-ethernet.c:309
 #, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
-msgstr "çççèéçã%sãåäçäï %s (%d%%)"
+msgid "Requesting an ethernet network address for '%s'..."
+msgstr "æèææççèã%sãæäçèäåâ"
 
-#: ../src/applet-device-wifi.c:1329
+#: ../src/applet-device-ethernet.c:313
 #, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "çççèéçã%sãåäçä"
+msgid "Ethernet network connection '%s' active"
+msgstr "æççèéçã%sãåäçä"
 
-#: ../src/applet-device-wifi.c:1377
-msgid "Failed to activate connection"
-msgstr "çæäçéç"
+#: ../src/applet-device-ethernet.c:494
+msgid "DSL authentication"
+msgstr "DSL éè"
 
-#: ../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-gsm.c:211 ../src/connection-editor/page-mobile.c:702
+#: ../src/mb-menu-item.c:59
+msgid "GSM"
+msgstr "GSM"
 
-#: ../src/applet-device-wifi.c:1382 ../src/applet-device-wifi.c:1401
-#: ../src/applet.c:493 ../src/applet.c:563
-msgid "Connection failure"
-msgstr "éçåæ"
+#. Default connection item
+#: ../src/applet-device-gsm.c:457
+msgid "New Mobile Broadband (GSM) connection..."
+msgstr "æçèååé (GSM) éçâ"
 
-#: ../src/applet-device-wifi.c:1396
-msgid "Failed to add new connection"
+#: ../src/applet-device-gsm.c:491
+msgid "You are now connected to the GSM network."
+msgstr "æçååéçè GSM çèã"
+
+#: ../src/applet-device-gsm.c:652
+msgid "PIN code required"
+msgstr "éè PIN ç"
+
+#: ../src/applet-device-gsm.c:660
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "éåèååéèçéè PIN ç"
+
+#: ../src/applet-device-gsm.c:781
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "SIM åã%sãåã%sãç PIN ç"
+
+#: ../src/applet-device-gsm.c:873
+msgid "Wrong PIN code; please contact your provider."
+msgstr "PIN çéèïèèçæçäæåã"
+
+#: ../src/applet-device-gsm.c:896
+msgid "Wrong PUK code; please contact your provider."
+msgstr "PUK çéèïèèçæçäæåã"
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-gsm.c:923
+msgid "Sending unlock code..."
+msgstr "çéèéççåçâ"
+
+#: ../src/applet-device-gsm.c:986
+msgid "SIM PIN unlock required"
+msgstr "éèèé SIM PIN ç"
+
+#: ../src/applet-device-gsm.c:987
+msgid "SIM PIN Unlock Required"
+msgstr "éèèé SIM PIN ç"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-device-gsm.c:989
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr "èäçèååéèçã%sãäåïéè SIM PIN çã"
+
+#. Translators: PIN code entry label
+#: ../src/applet-device-gsm.c:991
+msgid "PIN code:"
+msgstr "PIN çï"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-device-gsm.c:995
+msgid "Show PIN code"
+msgstr "éç PIN ç"
+
+#: ../src/applet-device-gsm.c:998
+msgid "SIM PUK unlock required"
+msgstr "éèèé SIM PUK ç"
+
+#: ../src/applet-device-gsm.c:999
+msgid "SIM PUK Unlock Required"
+msgstr "éèèé SIM PUK ç"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-device-gsm.c:1001
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr "èäçèååéèçã%sãäåïéè SIM PUK çã"
+
+#. Translators: PUK code entry label
+#: ../src/applet-device-gsm.c:1003
+msgid "PUK code:"
+msgstr "PUK çï"
+
+#. Translators: New PIN entry label
+#: ../src/applet-device-gsm.c:1006
+msgid "New PIN code:"
+msgstr "æç PIN çï"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-device-gsm.c:1008
+msgid "Re-enter new PIN code:"
+msgstr "éæèå PIN çï"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-device-gsm.c:1013
+msgid "Show PIN/PUK codes"
+msgstr "éç PIN/PUK ç"
+
+#: ../src/applet-device-gsm.c:1195 ../src/applet-device-gsm.c:1201
+msgid "GSM network."
+msgstr "GSM çèã"
+
+#: ../src/applet-device-wifi.c:97
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr "éæåéèç Wi-Fi çè(_C)â"
+
+#: ../src/applet-device-wifi.c:148
+msgid "Create _New Wi-Fi Network..."
+msgstr "åçæç Wi-Fi çè(_N)â"
+
+#: ../src/applet-device-wifi.c:292
+msgid "(none)"
+msgstr "(ç)"
+
+#: ../src/applet-device-wifi.c:790
+#, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "Wi-Fi çè (%s)"
+
+#: ../src/applet-device-wifi.c:792
+#, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "Wi-Fi çè (%s)"
+
+#: ../src/applet-device-wifi.c:794
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Wi-Fi çè"
+
+#: ../src/applet-device-wifi.c:827
+msgid "Wi-Fi is disabled"
+msgstr "Wi-Fi ååç"
+
+#: ../src/applet-device-wifi.c:828
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "Wi-Fi åèçéééåç"
+
+#: ../src/applet-device-wifi.c:889
+msgid "More networks"
+msgstr "æåçè"
+
+#: ../src/applet-device-wifi.c:1068
+msgid "Wi-Fi Networks Available"
+msgstr "æ Wi-Fi çèåç"
+
+#: ../src/applet-device-wifi.c:1069
+msgid "Use the network menu to connect to a Wi-Fi network"
+msgstr "äççèéåäéçå Wi-Fi çè"
+
+#: ../src/applet-device-wifi.c:1263
+#, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr "æçååéçè Wi-Fi çèã%sãã"
+
+#: ../src/applet-device-wifi.c:1294
+#, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "æåæå Wi-Fi çèéçã%sãâ"
+
+#: ../src/applet-device-wifi.c:1297
+#, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "æåèå Wi-Fi çèéçã%sãâ"
+
+#: ../src/applet-device-wifi.c:1300
+#, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr "Wi-Fi çèéçã%sãéèäçèéèâ"
+
+#: ../src/applet-device-wifi.c:1303
+#, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "æåèææäã%sãç Wi-Fi çèäåâ"
+
+#: ../src/applet-device-wifi.c:1324
+#, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
+msgstr "Wi-Fi çèéçã%sãåäçäï %s (%d%%)"
+
+#: ../src/applet-device-wifi.c:1329
+#, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Wi-Fi çèéçã%sãåäçä"
+
+#: ../src/applet-device-wifi.c:1377
+msgid "Failed to activate connection"
+msgstr "çæäçéç"
+
+#: ../src/applet-device-wifi.c:1396
+msgid "Failed to add new connection"
 msgstr "çæååæéç"
 
 #: ../src/applet-device-wimax.c:231
@@ -508,8 +826,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:929
 #: ../src/wireless-security/wireless-security.c:406
 msgid "LEAP"
 msgstr "LEAP"
@@ -528,8 +846,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:886
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ææ"
@@ -625,465 +942,122 @@ msgstr "BSIDï"
 
 #. --- IPv4 ---
 #: ../src/applet-dialogs.c:542
-msgid "IPv4"
-msgstr "IPv4"
-
-#. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
-msgid "IP Address:"
-msgstr "IP äåï"
-
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
-msgctxt "Address"
-msgid "Unknown"
-msgstr "äæ"
-
-#: ../src/applet-dialogs.c:569
-msgid "Broadcast Address:"
-msgstr "åæäåï"
-
-#. Prefix
-#: ../src/applet-dialogs.c:578
-msgid "Subnet Mask:"
-msgstr "åçèéçï"
-
-#: ../src/applet-dialogs.c:580
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "äæ"
-
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
-msgid "Default Route:"
-msgstr "éèèçï"
-
-#: ../src/applet-dialogs.c:600
-msgid "Primary DNS:"
-msgstr "äè DNSï"
-
-#: ../src/applet-dialogs.c:609
-msgid "Secondary DNS:"
-msgstr "æè DNSï"
-
-#: ../src/applet-dialogs.c:619
-msgid "Ternary DNS:"
-msgstr "çä DNSï"
-
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
-msgid "IPv6"
-msgstr "IPv6"
-
-#: ../src/applet-dialogs.c:643
-msgid "Ignored"
-msgstr "ååç"
-
-#: ../src/applet-dialogs.c:796
-msgid "VPN Type:"
-msgstr "VPN éåï"
-
-#: ../src/applet-dialogs.c:803
-msgid "VPN Gateway:"
-msgstr "VPN ééåï"
-
-#: ../src/applet-dialogs.c:809
-msgid "VPN Username:"
-msgstr "VPN äçèåçï"
-
-#: ../src/applet-dialogs.c:815
-msgid "VPN Banner:"
-msgstr "VPN æåï"
-
-#: ../src/applet-dialogs.c:821
-msgid "Base Connection:"
-msgstr "åçéçï"
-
-#: ../src/applet-dialogs.c:823
-msgid "Unknown"
-msgstr "äæ"
-
-#. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
-msgid "No valid active connections found!"
-msgstr "æäåææçäçäéçï"
-
-#: ../src/applet-dialogs.c:939
-msgid ""
-"Copyright  2004-2011 Red Hat, Inc.\n"
-"Copyright  2005-2008 Novell, Inc.\n"
-"and many other community contributors and translators"
-msgstr ""
-"Copyright  2004-2011 Red Hat, Inc.\n"
-"Copyright  2005-2008 Novell, Inc.\n"
-"èèååäççèçèèçèè"
-
-#: ../src/applet-dialogs.c:942
-msgid ""
-"Notification area applet for managing your network devices and connections."
-msgstr "çäççæççèèçèéççéçåéæçåã"
-
-#: ../src/applet-dialogs.c:944
-msgid "NetworkManager Website"
-msgstr "NetworkManager çç"
-
-#: ../src/applet-dialogs.c:959
-msgid "Missing resources"
-msgstr "éåèæ"
-
-#: ../src/applet-dialogs.c:984
-msgid "Mobile broadband network password"
-msgstr "èååéçèåç"
-
-#: ../src/applet-dialogs.c:993
-#, c-format
-msgid "A password is required to connect to '%s'."
-msgstr "éçèã%sãéèåçã"
-
-#: ../src/applet-dialogs.c:1012
-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 æåã"
-
-#: ../src/applet.c:1034
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
-msgstr ""
-"\n"
-"VPN éçã%sãåæïåççæç VPN æåã"
-
-#: ../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
-msgid ""
-"VPN connection has been successfully established.\n"
-"\n"
-"%s\n"
-msgstr ""
-"VPN éçåæåçã\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 çéèæ"
-
-#: ../src/applet.c:1108 ../src/applet.c:1116 ../src/applet.c:1166
-msgid "VPN Connection Failed"
-msgstr "VPN éçåæ"
-
-#: ../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/applet.c:1176
-#, c-format
-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 "èçåæåç (çåéé)"
-
-#: ../src/applet.c:1498
-msgid "device not ready"
-msgstr "èçåæåç"
-
-#: ../src/applet.c:1524
-msgid "Disconnect"
-msgstr "æç"
-
-#: ../src/applet.c:1538
-msgid "device not managed"
-msgstr "èççæçç"
-
-#: ../src/applet.c:1582
-msgid "No network devices available"
-msgstr "ææåçççèèç"
-
-#: ../src/applet.c:1670
-msgid "_VPN Connections"
-msgstr "_VPN éç"
-
-#: ../src/applet.c:1727
-msgid "_Configure VPN..."
-msgstr "èç VPN(_C)â"
-
-#: ../src/applet.c:1731
-msgid "_Disconnect VPN"
-msgstr "è VPN æç(_D)"
-
-#: ../src/applet.c:1825
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager ææåèâ."
-
-#: ../src/applet.c:1830 ../src/applet.c:2631
-msgid "Networking disabled"
-msgstr "çèååç"
-
-#. 'Enable Networking' item
-#: ../src/applet.c:2051
-msgid "Enable _Networking"
-msgstr "åççè(_N)"
-
-#. 'Enable Wireless' item
-#: ../src/applet.c:2060
-msgid "Enable _Wireless"
-msgstr "åççççè(_W)"
-
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2069
-msgid "Enable _Mobile Broadband"
-msgstr "åçèååé(_M)"
+msgid "IPv4"
+msgstr "IPv4"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2078
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "åç WiMA_X èååé"
+#. Address
+#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
+msgid "IP Address:"
+msgstr "IP äåï"
 
-#. Toggle notifications item
-#: ../src/applet.c:2089
-msgid "Enable N_otifications"
-msgstr "åçéçåè(_O)"
+#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
+msgctxt "Address"
+msgid "Unknown"
+msgstr "äæ"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2100
-msgid "Connection _Information"
-msgstr "éçèè(_I)"
+#: ../src/applet-dialogs.c:569
+msgid "Broadcast Address:"
+msgstr "åæäåï"
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2110
-msgid "Edit Connections..."
-msgstr "çèéçâ"
+#. Prefix
+#: ../src/applet-dialogs.c:578
+msgid "Subnet Mask:"
+msgstr "åçèéçï"
 
-#. Help item
-#: ../src/applet.c:2124
-msgid "_Help"
-msgstr "æå(_H)"
+#: ../src/applet-dialogs.c:580
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "äæ"
 
-#. About item
-#: ../src/applet.c:2133
-msgid "_About"
-msgstr "éæ(_A)"
+#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+msgid "Default Route:"
+msgstr "éèèçï"
 
-#: ../src/applet.c:2310
-msgid "Disconnected"
-msgstr "åæç"
+#: ../src/applet-dialogs.c:600
+msgid "Primary DNS:"
+msgstr "äè DNSï"
 
-#: ../src/applet.c:2311
-msgid "The network connection has been disconnected."
-msgstr "çèéçåäæã"
+#: ../src/applet-dialogs.c:609
+msgid "Secondary DNS:"
+msgstr "æè DNSï"
 
-#: ../src/applet.c:2494
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "æåæåçèéçã%sãâ"
+#: ../src/applet-dialogs.c:619
+msgid "Ternary DNS:"
+msgstr "çä DNSï"
 
-#: ../src/applet.c:2497
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "çèéçã%sãéèäçèéèâ"
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:634
+msgid "IPv6"
+msgstr "IPv6"
 
-#: ../src/applet.c:2503
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "çèéçã%sãåäçä"
+#: ../src/applet-dialogs.c:643
+msgid "Ignored"
+msgstr "ååç"
 
-#: ../src/applet.c:2586
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "æååå VPN éçã%sãâ"
+#: ../src/applet-dialogs.c:796
+msgid "VPN Type:"
+msgstr "VPN éåï"
 
-#: ../src/applet.c:2589
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "VPN éçã%sãéèäçèéèâ"
+#: ../src/applet-dialogs.c:803
+msgid "VPN Gateway:"
+msgstr "VPN ééåï"
 
-#: ../src/applet.c:2592
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "æåèæ VPN æäã%sãççèäåâ"
+#: ../src/applet-dialogs.c:809
+msgid "VPN Username:"
+msgstr "VPN äçèåçï"
 
-#: ../src/applet.c:2595
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "VPN éçã%sãåäçä"
+#: ../src/applet-dialogs.c:815
+msgid "VPN Banner:"
+msgstr "VPN æåï"
 
-#: ../src/applet.c:2636
-msgid "No network connection"
-msgstr "ææçèéæ"
+#: ../src/applet-dialogs.c:821
+msgid "Base Connection:"
+msgstr "åçéçï"
 
-#: ../src/applet.c:3327
-msgid "NetworkManager Applet"
-msgstr "NetworkManager éæçå"
+#: ../src/applet-dialogs.c:823
+msgid "Unknown"
+msgstr "äæ"
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "èåèééåèç"
+#. Shouldn't really happen but ...
+#: ../src/applet-dialogs.c:886
+msgid "No valid active connections found!"
+msgstr "æäåææçäçäéçï"
 
-#: ../src/gsm-unlock.ui.h:2
-msgid "_Unlock"
-msgstr "èé(_U)"
+#: ../src/applet-dialogs.c:939
+msgid ""
+"Copyright  2004-2011 Red Hat, Inc.\n"
+"Copyright  2005-2008 Novell, Inc.\n"
+"and many other community contributors and translators"
+msgstr ""
+"Copyright  2004-2011 Red Hat, Inc.\n"
+"Copyright  2005-2008 Novell, Inc.\n"
+"èèååäççèçèèçèè"
 
-#: ../src/info.ui.h:1
-msgid "Connection Information"
-msgstr "éçèè"
+#: ../src/applet-dialogs.c:942
+msgid ""
+"Notification area applet for managing your network devices and connections."
+msgstr "çäççæççèèçèéççéçåéæçåã"
 
-#: ../src/info.ui.h:2
-msgid "Active Network Connections"
-msgstr "åççèéç"
+#: ../src/applet-dialogs.c:944
+msgid "NetworkManager Website"
+msgstr "NetworkManager çç"
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "æççè 802.1X éè"
+#: ../src/applet-dialogs.c:959
+msgid "Missing resources"
+msgstr "éåèæ"
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:3
-msgid "_Network name:"
-msgstr "çèåç(_N)ï"
+#: ../src/applet-dialogs.c:984
+msgid "Mobile broadband network password"
+msgstr "èååéçèåç"
 
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "èå"
+#: ../src/applet-dialogs.c:993
+#, c-format
+msgid "A password is required to connect to '%s'."
+msgstr "éçèã%sãéèåçã"
 
-#: ../src/connection-editor/ce-page.c:318
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "çæäæçéèäéçæåçææåæã"
+#: ../src/applet-dialogs.c:1012
+msgid "Password:"
+msgstr "åçï"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
@@ -1111,6 +1085,44 @@ msgid ""
 "connection."
 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/connection-editor/ce-new-connection.ui.h:2
+msgid "Choose a Connection Type"
+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 éçéåææåçåæåäïåèæææåèæ"
+"çç VPN åæçåã"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:6
+msgid "Createâ"
+msgstr "åçâ"
+
+#: ../src/connection-editor/ce-page.c:72
+msgid "automatic"
+msgstr "èå"
+
+#: ../src/connection-editor/ce-page.c:288
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "çæäæçéèäéçæåçææåæã"
+
 #: ../src/connection-editor/ce-page-dsl.ui.h:1
 #: ../src/connection-editor/ce-page-mobile.ui.h:8
 #: ../src/wireless-security/eap-method-leap.ui.h:1
@@ -1141,14 +1153,110 @@ msgstr "éçåç(_W)"
 msgid "_Password:"
 msgstr "åç(_P)ï"
 
-#: ../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/page-ip6.c:142
-#: ../src/wireless-security/eap-method-peap.ui.h:2
-msgid "Automatic"
-msgstr "èå"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:1
+#: ../src/connection-editor/ce-page-ip4.ui.h:1
+#: ../src/connection-editor/ce-page-ip6.ui.h:1
+#: ../src/connection-editor/ce-page-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/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../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-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-wifi.ui.h:6
+msgid "bytes"
+msgstr "äåç"
+
+#: ../src/connection-editor/ce-page-infiniband.ui.h:1
+msgid "_Transport mode:"
+msgstr "åèæå(_T):"
+
+#. IP-over-InfiniBand "datagram mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+msgid "Datagram"
+msgstr "Datagram"
+
+#. 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
@@ -1365,148 +1473,70 @@ msgstr "åé"
 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/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "_Port:"
-msgstr "éæå(_P)ï"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "éå(_S)ï"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "åéå(_X)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "èååè(_O)"
-
-#: ../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-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-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"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
-
-#: ../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/s"
 
-#: ../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
+#: ../src/connection-editor/ce-page-wifi.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"
+"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 ææåççéååéïAPïãäåï"
+"æééæåæéçéåèåææèåç BSSID ææåç Wi-Fi ååéïAPïãäåï"
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "éé(_H)ï"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "éå(_D):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
 msgid "M_ode:"
 msgstr "æå(_O)ï"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 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 "åèçéèæå"
@@ -1559,76 +1589,321 @@ msgstr ""
 "åååæææäïçèäæèç PPP äæåæææææçéèææãåæéçåæïè"
 "åèåçæäææçææã"
 
-#: ../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/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/ip4-routes-dialog.c:762
+#: ../src/connection-editor/page-ip4.c:928
+msgid "Netmask"
+msgstr "çèéç"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:779
+#: ../src/connection-editor/ip6-routes-dialog.c:721
+#: ../src/connection-editor/page-ip4.c:945
+#: ../src/connection-editor/page-ip6.c:911
+msgid "Gateway"
+msgstr "éèé"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:796
+#: ../src/connection-editor/ip6-routes-dialog.c:738
+msgid "Metric"
+msgstr "åå"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:704
+#: ../src/connection-editor/page-ip6.c:894
+msgid "Prefix"
+msgstr "åç"
+
+#: ../src/connection-editor/new-connection.c:75
+#: ../src/connection-editor/page-ethernet.c:273
+msgid "Ethernet"
+msgstr "æççè"
+
+#: ../src/connection-editor/new-connection.c:80
+#: ../src/connection-editor/page-wifi.c:462
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
+#: ../src/connection-editor/new-connection.c:90
+#: ../src/connection-editor/page-wimax.c:157 ../src/mb-menu-item.c:73
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#: ../src/connection-editor/new-connection.c:95
+#: ../src/connection-editor/page-dsl.c:139
+msgid "DSL"
+msgstr "DSL"
+
+#: ../src/connection-editor/new-connection.c:100
+#: ../src/connection-editor/page-infiniband.c:189
+msgid "InfiniBand"
+msgstr "InfiniBand"
+
+#: ../src/connection-editor/new-connection.c:112
+#: ../src/connection-editor/page-vpn.c:111
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/new-connection.c:245
+msgid "Import a saved VPN configuration..."
+msgstr "åååååç VPN çæâ"
+
+#: ../src/connection-editor/nm-connection-editor.c:106
+#, c-format
+msgid "Editing %s"
+msgstr "çè %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:110
+msgid "Editing un-named connection"
+msgstr "çèæååçéç"
+
+#: ../src/connection-editor/nm-connection-editor.c:297
+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:401
+msgid "Error creating connection editor dialog."
+msgstr "åçéççèååèçæççéèã"
+
+#: ../src/connection-editor/nm-connection-editor.c:413
+msgid "_Save"
+msgstr "åå(_S)"
+
+#: ../src/connection-editor/nm-connection-editor.c:414
+msgid "Save any changes made to this connection."
+msgstr "ååääåéåéçéèçèæã"
+
+#: ../src/connection-editor/nm-connection-editor.c:415
+msgid "_Save..."
+msgstr "åå(_S)â"
+
+#: ../src/connection-editor/nm-connection-editor.c:416
+msgid "Authenticate to save this connection for all users of this machine."
+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 "Connect _automatically"
+msgstr "èåéç(_A)"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
+msgid "A_vailable to all users"
+msgstr "ææäçèçåç"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+msgid "_Export..."
+msgstr "åå(_E)â"
+
+#: ../src/connection-editor/nm-connection-list.c:169
+msgid "never"
+msgstr "æä"
+
+#: ../src/connection-editor/nm-connection-list.c:180
+#: ../src/connection-editor/nm-connection-list.c:191
+msgid "now"
+msgstr "çå"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:198
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d åéäå"
+
+#: ../src/connection-editor/nm-connection-list.c:202
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d åæäå"
+
+#: ../src/connection-editor/nm-connection-list.c:214
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d åäå"
+
+#: ../src/connection-editor/nm-connection-list.c:220
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d åæäå"
+
+#: ../src/connection-editor/nm-connection-list.c:224
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d åäå"
+
+#: ../src/connection-editor/nm-connection-list.c:443
+msgid "Connection add failed"
+msgstr "æåéçåæ"
+
+#: ../src/connection-editor/nm-connection-list.c:472
+msgid "Error saving connection"
+msgstr "ååéçæéè"
+
+#: ../src/connection-editor/nm-connection-list.c:473
+#, c-format
+msgid "The property '%s' / '%s' is invalid: %d"
+msgstr "åæã%sã/ã%sãæçæçï%d"
+
+#: ../src/connection-editor/nm-connection-list.c:480
+#: ../src/connection-editor/nm-connection-list.c:598
+msgid "An unknown error occurred."
+msgstr "ççäæçéèã"
+
+#: ../src/connection-editor/nm-connection-list.c:485
+#: ../src/connection-editor/nm-connection-list.c:638
+msgid "Error initializing editor"
+msgstr "åååçèåæççéè"
+
+#: ../src/connection-editor/nm-connection-list.c:503
+#: ../src/connection-editor/nm-connection-list.c:655
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr "çæäæçéèäéççèååèççæåååã"
+
+#: ../src/connection-editor/nm-connection-list.c:512
+msgid "Could not create new connection"
+msgstr "çæåçæéç"
+
+#: ../src/connection-editor/nm-connection-list.c:524
+msgid "Could not edit new connection"
+msgstr "çæçèæéç"
+
+#: ../src/connection-editor/nm-connection-list.c:669
+msgid "Could not edit connection"
+msgstr "çæçèéç"
+
+#: ../src/connection-editor/nm-connection-list.c:699
+msgid "Connection delete failed"
+msgstr "åééçåæ"
+
+#: ../src/connection-editor/nm-connection-list.c:731
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr "æçåèåééç %s ï"
+
+#: ../src/connection-editor/nm-connection-list.c:972
+msgid "Name"
+msgstr "åç"
+
+#: ../src/connection-editor/nm-connection-list.c:985
+msgid "Last Used"
+msgstr "æåäçç"
+
+#. Edit
+#: ../src/connection-editor/nm-connection-list.c:1026
+msgid "_Edit"
+msgstr "çè(_E)"
+
+#: ../src/connection-editor/nm-connection-list.c:1027
+msgid "Edit the selected connection"
+msgstr "çèéåçéç"
+
+#: ../src/connection-editor/nm-connection-list.c:1028
+msgid "_Edit..."
+msgstr "çè(_E)â"
+
+#: ../src/connection-editor/nm-connection-list.c:1029
+msgid "Authenticate to edit the selected connection"
+msgstr "éèäçèéåçéç"
+
+#. Delete
+#: ../src/connection-editor/nm-connection-list.c:1043
+msgid "_Delete"
+msgstr "åé(_D)"
+
+#: ../src/connection-editor/nm-connection-list.c:1044
+msgid "Delete the selected connection"
+msgstr "åééåçéç"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
-msgstr "èéæ VPN çéçéå"
+#: ../src/connection-editor/nm-connection-list.c:1045
+msgid "_Delete..."
+msgstr "åé(_D)â"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-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:1046
+msgid "Authenticate to delete the selected connection"
+msgstr "éèäåééåçéç"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
-msgid "Createâ"
-msgstr "åçâ"
+#: ../src/connection-editor/nm-connection-list.c:1285
+msgid "Error creating connection"
+msgstr "åçéçæççéè"
 
-#: ../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/nm-connection-list.c:1286
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "äçéåäåçã%sãéç"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:928
-msgid "Netmask"
-msgstr "çèéç"
+#: ../src/connection-editor/nm-connection-list.c:1341
+msgid "Error editing connection"
+msgstr "çèéçæççéè"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:945
-#: ../src/connection-editor/page-ip6.c:911
-msgid "Gateway"
-msgstr "éèé"
+#: ../src/connection-editor/nm-connection-list.c:1342
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr "æäå UUIDã%sãçéç"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
-msgid "Metric"
-msgstr "åå"
+#: ../src/connection-editor/page-8021x-security.c:119
+msgid "802.1x Security"
+msgstr "802.1x éè"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:894
-msgid "Prefix"
-msgstr "åç"
+#: ../src/connection-editor/page-8021x-security.c:121
+msgid "Could not load 802.1x Security user interface."
+msgstr "çæèå 802.1x ååæäçèäéã"
 
-#: ../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-8021x-security.c:139
+msgid "Use 802.1_X security for this connection"
+msgstr "åéåéçäç 802.1_X éè"
 
 #: ../src/connection-editor/page-dsl.c:141
 msgid "Could not load DSL user interface."
 msgstr "çæèå DSL äçèäéã"
 
-#: ../src/connection-editor/page-dsl.c:232
+#: ../src/connection-editor/page-dsl.c:233
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL éç %d"
 
+#: ../src/connection-editor/page-ethernet.c:89
+#: ../src/connection-editor/page-infiniband.c:74
+#: ../src/connection-editor/page-wifi.c:94
+#: ../src/connection-editor/page-wimax.c:70
+msgid ""
+"This option locks this connection to the network device specified by its "
+"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+msgstr ""
+"æééæåæéçéåèåææèåç MAC äåææåççèèçãäåï"
+"00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-ethernet.c:275
+msgid "Could not load ethernet user interface."
+msgstr "çæèåæççèäçèäéã"
+
+#: ../src/connection-editor/page-ethernet.c:451
+#, c-format
+msgid "Ethernet connection %d"
+msgstr "ççèéç %d"
+
+#: ../src/connection-editor/page-infiniband.c:192
+msgid "Could not load InfiniBand user interface."
+msgstr "çæèå InfiniBand äçèäéã"
+
+#: ../src/connection-editor/page-infiniband.c:317
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "InfiniBand éç %d"
+
 #: ../src/connection-editor/page-ip4.c:133
 #: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (VPN)"
@@ -1734,342 +2009,84 @@ 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:642
 msgid "Select Mobile Broadband Provider Type"
 msgstr "éæèååéäæåéå"
 
-#: ../src/connection-editor/page-mobile.c:674
+#: ../src/connection-editor/page-mobile.c:677
 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:89
-#: ../src/connection-editor/page-wireless.c:94
-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:272
-#: ../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:274
-msgid "Could not load wired user interface."
-msgstr "çæèåæççèäçèäéã"
-
-#: ../src/connection-editor/page-wired.c:449
-#, 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 "çæèå Wired Security ååäçèäéã"
-
-#: ../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:171
-#: ../src/connection-editor/page-wireless.c:175
-#: ../src/connection-editor/page-wireless.c:196
-#, c-format
-msgid "default"
-msgstr "éè"
-
-#: ../src/connection-editor/page-wireless.c:200
-#, c-format
-msgid "%u (%u MHz)"
-msgstr "%u (%u MHz)"
-
-#: ../src/connection-editor/page-wireless.c:457
-#: ../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:459
-msgid "Could not load WiFi user interface."
-msgstr "çæèå WiFi äçèäéã"
-
-#: ../src/connection-editor/page-wireless.c:663
-#, 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-äå éé (Hex æ 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 "ææäçèçåç"
-
-#: ../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 åéäå"
-
-#: ../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/nm-connection-list.c:261
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d åäå"
-
-#: ../src/connection-editor/nm-connection-list.c:267
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d åæäå"
+msgstr "èéææçççåéäæåæäççæèãåææäçåïèæèäæåã"
 
-#: ../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-mobile.c:682
+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:486
-msgid "Connection add failed"
-msgstr "æåéçåæ"
+#: ../src/connection-editor/page-mobile.c:689
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+msgstr "æçäæåäç C_DMA çäçæèïäå 1xRTTãEVDOï"
 
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "ååéçæéè"
+#: ../src/connection-editor/page-ppp.c:134
+msgid "EAP"
+msgstr "EAP"
 
-#: ../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:135
+#: ../src/wireless-security/eap-method-ttls.c:230
+msgid "PAP"
+msgstr "PAP"
 
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:662
-msgid "An unknown error occurred."
-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:528
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "Error initializing editor"
-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: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:138
+#: ../src/wireless-security/eap-method-ttls.c:247
+msgid "MSCHAP"
+msgstr "MSCHAP"
 
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "çæåçæéç"
+#. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:141
+msgid "none"
+msgstr "ææ"
 
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-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:733
-msgid "Could not edit connection"
-msgstr "çæçèéç"
+#: ../src/connection-editor/page-ppp.c:282
+msgid "PPP Settings"
+msgstr "PPP èåå"
 
-#: ../src/connection-editor/nm-connection-list.c:763
-msgid "Connection delete failed"
-msgstr "åééçåæ"
+#: ../src/connection-editor/page-ppp.c:284
+msgid "Could not load PPP user interface."
+msgstr "çæèå PPP äçèäéã"
+
+#: ../src/connection-editor/page-vpn.c:113
+msgid "Could not load VPN user interface."
+msgstr "çæèå VPN äçèäéã"
 
-#: ../src/connection-editor/nm-connection-list.c:795
+#: ../src/connection-editor/page-vpn.c:128
 #, 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:222
+#: ../src/connection-editor/page-vpn.c:305
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN éç %d"
 
-#: ../src/connection-editor/nm-connection-list.c:931
+#: ../src/connection-editor/page-vpn.c:248
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2079,79 +2096,96 @@ msgstr ""
 "\n"
 "éèïææ VPN æåéåã"
 
-#: ../src/connection-editor/nm-connection-list.c:944
-msgid "Could not edit imported connection"
-msgstr "çæçèååçéç"
+#: ../src/connection-editor/page-vpn.c:273
+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:274
+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:171
+#: ../src/connection-editor/page-wifi.c:175
+#: ../src/connection-editor/page-wifi.c:196
+#, c-format
+msgid "default"
+msgstr "éè"
 
-#: ../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:200
+#, c-format
+msgid "%u (%u MHz)"
+msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/nm-connection-list.c:1274
-msgid "_Edit"
-msgstr "çè(_E)"
+#: ../src/connection-editor/page-wifi.c:464
+msgid "Could not load Wi-Fi user interface."
+msgstr "çæèå Wi-Fi äçèäéã"
 
-#: ../src/connection-editor/nm-connection-list.c:1275
-msgid "Edit the selected connection"
-msgstr "çèéåçéç"
+#: ../src/connection-editor/page-wifi.c:669
+#, c-format
+msgid "Wi-Fi connection %d"
+msgstr "Wi-Fi éç %d"
 
-#: ../src/connection-editor/nm-connection-list.c:1276
-msgid "_Edit..."
-msgstr "çè(_E)â"
+#: ../src/connection-editor/page-wifi-security.c:265
+msgctxt "Wi-Fi/Ethernet security"
+msgid "None"
+msgstr "ææ"
 
-#: ../src/connection-editor/nm-connection-list.c:1277
-msgid "Authenticate to edit the selected connection"
-msgstr "éèäçèéåçéç"
+#: ../src/connection-editor/page-wifi-security.c:290
+#: ../src/libnm-gtk/nm-wifi-dialog.c:903
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr "WEP 40/128-äå éé (Hex æ ASCII)"
 
-#: ../src/connection-editor/nm-connection-list.c:1292
-msgid "_Delete"
-msgstr "åé(_D)"
+#: ../src/connection-editor/page-wifi-security.c:300
+#: ../src/libnm-gtk/nm-wifi-dialog.c:912
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128-äå åè"
 
-#: ../src/connection-editor/nm-connection-list.c:1293
-msgid "Delete the selected connection"
-msgstr "åééåçéç"
+#: ../src/connection-editor/page-wifi-security.c:326
+#: ../src/libnm-gtk/nm-wifi-dialog.c:942
+msgid "Dynamic WEP (802.1x)"
+msgstr "åæ WEP (802.1x)"
 
-#: ../src/connection-editor/nm-connection-list.c:1294
-msgid "_Delete..."
-msgstr "åé(_D)â"
+#: ../src/connection-editor/page-wifi-security.c:340
+#: ../src/libnm-gtk/nm-wifi-dialog.c:956
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 åäç"
 
-#: ../src/connection-editor/nm-connection-list.c:1295
-msgid "Authenticate to delete the selected connection"
-msgstr "éèäåééåçéç"
+#: ../src/connection-editor/page-wifi-security.c:354
+#: ../src/libnm-gtk/nm-wifi-dialog.c:970
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA & WPA2 äæç"
 
-#: ../src/connection-editor/nm-connection-list.c:1574
-msgid "Error creating connection"
-msgstr "åçéçæççéè"
+#: ../src/connection-editor/page-wifi-security.c:395
+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:1575
-#, c-format
-msgid "Don't know how to create '%s' connections"
-msgstr "äçéåäåçã%sãéç"
+#: ../src/connection-editor/page-wifi-security.c:405
+msgid "Wi-Fi Security"
+msgstr "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 "Could not load Wi-Fi security user interface."
+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-wimax.c:160
+msgid "Could not load WiMAX user interface."
+msgstr "çæèå WiMAX äçèäéã"
 
-#: ../src/connection-editor/nm-connection-list.c:1643
+#: ../src/connection-editor/page-wimax.c:289
 #, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr "æäå UUIDã%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 "
@@ -2163,29 +2197,29 @@ msgstr ""
 "\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 "ææåèäæåååç VPN éçåä %sï"
 
-#: ../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"
@@ -2196,114 +2230,133 @@ msgstr ""
 "\n"
 "éèï%sã"
 
-#: ../src/connection-editor/vpn-helpers.c:391
+#: ../src/connection-editor/vpn-helpers.c:369
 msgid "Export VPN connection..."
 msgstr "åå VPN éçâ"
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "çæåç PAN éçï%s"
+#: ../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 "NetworkManager éæçåçææåääéèçèæïæäå .ui æïã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:225
-#: ../src/gnome-bluetooth/bt-widget.c:493
-msgid "Your phone is now ready to use!"
-msgstr "æçéèçååçåääçï"
+#: ../src/gnome-bluetooth/bt-widget.c:321
+#, c-format
+msgid ""
+"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
+msgstr "çæéèèççéçïçæéè D-Busï(%s) %sïã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:249
+#: ../src/gnome-bluetooth/bt-widget.c:330
 #, c-format
-msgid "%s Network"
-msgstr "%s çè"
+msgid ""
+"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
+msgstr "çæéèèççéçïæäå NetworkManagerï(%s) %sïã"
+
+#: ../src/gnome-bluetooth/bt-widget.c:445
+msgid "Use your mobile phone as a network device (PAN/NAP)"
+msgstr "äçææäççèèçïPAN/NAPï"
+
+#: ../src/gnome-bluetooth/bt-widget.c:454
+msgid "Access the Internet using your mobile phone (DUN)"
+msgstr "äçææååçéçèïDUNï"
 
-#: ../src/gnome-bluetooth/bt-widget.c:375
+#: ../src/gnome-bluetooth/nma-bt-device.c:318
 #, c-format
 msgid "Error: %s"
 msgstr "éèï%s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:488
+#: ../src/gnome-bluetooth/nma-bt-device.c:425
 #, c-format
 msgid "Failed to create DUN connection: %s"
 msgstr "çæåç DUN éçï%s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:511
+#: ../src/gnome-bluetooth/nma-bt-device.c:427
+#: ../src/gnome-bluetooth/nma-bt-device.c:833
+msgid "Your phone is now ready to use!"
+msgstr "æçéèçååçåääçï"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:450
 msgid "Mobile wizard was canceled"
 msgstr "èåçéåçåæ"
 
-#: ../src/gnome-bluetooth/bt-widget.c:520
+#: ../src/gnome-bluetooth/nma-bt-device.c:459
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "äæçéèèçéåïé GSM æ CDMAï"
 
-#: ../src/gnome-bluetooth/bt-widget.c:714
-#: ../src/gnome-bluetooth/bt-widget.c:720
+#: ../src/gnome-bluetooth/nma-bt-device.c:567
+msgid "unknown modem type."
+msgstr "äæçæææéåã"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:639
+#: ../src/gnome-bluetooth/nma-bt-device.c:645
 msgid "failed to connect to the phone."
 msgstr "çæéçèéèã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:753
+#: ../src/gnome-bluetooth/nma-bt-device.c:676
 msgid "unexpectedly disconnected from the phone."
 msgstr "éèçéæéçã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:762
+#: ../src/gnome-bluetooth/nma-bt-device.c:686
 msgid "timed out detecting phone details."
 msgstr "åæéååæäåéèçèçèæã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:774
+#: ../src/gnome-bluetooth/nma-bt-device.c:697
 msgid "Detecting phone configuration..."
 msgstr "åæéèçéçâ"
 
-#: ../src/gnome-bluetooth/bt-widget.c:840
-msgid "could not find the Bluetooth device."
-msgstr "æäåèçèçã"
-
-#: ../src/gnome-bluetooth/bt-widget.c:980
+#: ../src/gnome-bluetooth/nma-bt-device.c:794
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 msgstr "éèçèçéæååéåèåææçèéçååçã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1012
+#: ../src/gnome-bluetooth/nma-bt-device.c:831
 #, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr "çæéèèççéçïçæéè D-Busï%sïã"
-
-#: ../src/gnome-bluetooth/bt-widget.c:1022
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr "çæéèèççéçïçæéè D-Bus proxyïã"
+msgid "Failed to create PAN connection: %s"
+msgstr "çæåç PAN éçï%s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1031
+#: ../src/gnome-bluetooth/nma-bt-device.c:852
 #, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr "çæéèèççéçïæäå NetworkManagerï%sïã"
+msgid "%s Network"
+msgstr "%s çè"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1098
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "äçææäççèèçïPAN/NAPï"
+#: ../src/gsm-unlock.ui.h:1
+msgid "Automatically unlock this device"
+msgstr "èåèééåèç"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1107
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "äçææååçéçèïDUNï"
+#: ../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:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:207
 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:214
 msgid "Your Device:"
 msgstr "æçèç:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:223
+#: ../src/libnm-gtk/nm-mobile-wizard.c:225
 msgid "Your Provider:"
 msgstr "æçäæå:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:234
+#: ../src/libnm-gtk/nm-mobile-wizard.c:236
 msgid "Your Plan:"
 msgstr "æçææ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:259
+#: ../src/libnm-gtk/nm-mobile-wizard.c:261
 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 "
@@ -2315,23 +2368,23 @@ msgstr ""
 "çæååçèèæïèææèåãèäæèååééççèåïèåãççã >> ãå"
 "åèåãäïéæãçèéçãã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:271
+#: ../src/libnm-gtk/nm-mobile-wizard.c:273
 msgid "Confirm Mobile Broadband Settings"
 msgstr "çèèååéèå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:332
+#: ../src/libnm-gtk/nm-mobile-wizard.c:337
 msgid "Unlisted"
 msgstr "æååç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:487
+#: ../src/libnm-gtk/nm-mobile-wizard.c:492
 msgid "_Select your plan:"
 msgstr "éææçææ(_S)ï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:511
+#: ../src/libnm-gtk/nm-mobile-wizard.c:516
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "éæææç _APNïAccess Point Nameïååéåçïï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../src/libnm-gtk/nm-mobile-wizard.c:540
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
@@ -2342,164 +2395,163 @@ msgstr ""
 "\n"
 "åææäçåæäççææïèæèäæåïäåçææç APN çäã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:542
+#: ../src/libnm-gtk/nm-mobile-wizard.c:547
 msgid "Choose your Billing Plan"
 msgstr "éææçèèææ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:590
+#: ../src/libnm-gtk/nm-mobile-wizard.c:596
 msgid "My plan is not listed..."
 msgstr "æçææææååâ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:747
+#: ../src/libnm-gtk/nm-mobile-wizard.c:753
 msgid "Select your provider from a _list:"
 msgstr "èåæåèéæäæå(_L):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:760
+#: ../src/libnm-gtk/nm-mobile-wizard.c:766
 msgid "Provider"
 msgstr "äæå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:785
+#: ../src/libnm-gtk/nm-mobile-wizard.c:791
 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:802
 msgid "Provider:"
 msgstr "äæåï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:820
+#: ../src/libnm-gtk/nm-mobile-wizard.c:826
 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:832
 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:843
 msgid "Choose your Provider"
 msgstr "éææçäæå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1088
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1094
 msgid "Country or Region List:"
 msgstr "ååæååæåï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1106
 msgid "Country or region"
 msgstr "ååæåå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1107
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
 msgid "My country is not listed"
 msgstr "æçååäææååä"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1153
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1159
 msgid "Choose your Provider's Country or Region"
 msgstr "éææçäæåçååæåå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1207
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1213
 msgid "Installed GSM device"
 msgstr "ååèç GSM èç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1210
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1216
 msgid "Installed CDMA device"
 msgstr "ååèç CDMA èç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1382
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1388
 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:1393
 msgid "You will need the following information:"
 msgstr "æéèääèèï"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
 msgid "Your broadband provider's name"
 msgstr "åéäæåçåç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
 msgid "Your broadband billing plan name"
 msgstr "åéèèææçåç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1420
 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:1447
 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:1462
 msgid "Any device"
 msgstr "ääèç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1469
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1475
 msgid "Set up a Mobile Broadband Connection"
 msgstr "èåèååééç"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1633
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1639
 msgid "New Mobile Broadband Connection"
 msgstr "æçèååééç"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../src/libnm-gtk/nm-wifi-dialog.c:438
 msgid "New..."
 msgstr "æåâ"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1076
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1057
 msgid "C_reate"
 msgstr "åç(_R)"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1160
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
 #, 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:1143
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wi-Fi çèéçã%sãéèéè"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1164
-msgid "Authentication required by wireless network"
-msgstr "çççèæéèçéè"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wi-Fi çèéçã%sãéèéè"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1169
-msgid "Create New Wireless Network"
-msgstr "åçæççççè"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+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:1152
+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:1153
+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:1155
+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:1157
+msgid "Hidden Wi-Fi network"
+msgstr "éèç Wi-Fi çè"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1158
 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 "çççèåå(_W):"
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi ååæ(_S):"
 
 #: ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "éç(_N):"
 
 #: ../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:"
@@ -2546,10 +2598,6 @@ msgstr "HSUPA"
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
-
 #: ../src/mb-menu-item.c:109
 msgid "not enabled"
 msgstr "æåç"
@@ -2600,11 +2648,11 @@ msgstr "æéçè"
 msgid "Default"
 msgstr "éè"
 
-#: ../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 "NetworkManager éæçåçææåääéèçèæïæäå .ui æïã"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:325
+#, c-format
+msgid "%s connection"
+msgstr "%s éç"
 
 #: ../src/wireless-security/eap-method.c:275
 msgid "No Certificate Authority certificate chosen"
@@ -2613,11 +2661,11 @@ msgstr "æéæääæèææåä(CA)æè"
 #: ../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
 msgid "Choose CA Certificate"
@@ -2631,6 +2679,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 "åå"
@@ -2663,23 +2728,6 @@ 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"
@@ -2824,5 +2872,63 @@ 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 "Wired"
+#~ msgstr "æç"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "çæèå Wired Security ååäçèäéã"
+
+#~ msgid "Wireless"
+#~ msgstr "çççè"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "çççèéç %d"
+
+#~ msgid "_Import"
+#~ msgstr "åå(_I)"
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "çæçèååçéç"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr "ææ VPN åæçååçãèåèåääçäåçéåæéã"
+
+#~ msgid "Don't know how to edit '%s' connections"
+#~ msgstr "äçéåäçèã%sãéç"
+
+#~ msgid "could not find the Bluetooth device."
+#~ msgstr "æäåèçèçã"
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr "çæéèèççéçïçæéè D-Bus proxyïã"
+
 #~ msgid "_Security:"
 #~ msgstr "ååæ(_S)ï"



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