[network-manager-applet/nma-0-9-6] [l10n] Update Japanese translation



commit b59ded1efc6dcc62b826752f034705c89de43c35
Author: OKANO Takayoshi <kano na rim or jp>
Date:   Mon Sep 24 23:53:19 2012 +0900

    [l10n] Update Japanese translation

 po/ja.po | 2969 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1610 insertions(+), 1359 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 763f7c8..533a916 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,15 +8,15 @@
 # Hideki Yamane <henrich debian or jp>, 2010.
 # Hideki Yamane <henrich debian org>, 2011.
 # Takayuki KUSANO <AE5T-KSN asahi-net or jp>, 2010-2012.
-# Takayoshi OKANO <kano na rim or jp>, 2011.
+# Takayoshi OKANO <kano na rim or jp>, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n";
-"POT-Creation-Date: 2012-07-03 12:04+0000\n"
-"PO-Revision-Date: 2012-07-02 21:16+0900\n"
-"Last-Translator: Takayuki KUSANO <AE5T-KSN asahi-net or jp>\n"
+"POT-Creation-Date: 2012-09-21 21:19+0000\n"
+"PO-Revision-Date: 2012-08-19 19:57+0900\n"
+"Last-Translator: OKANO Takayoshi <kano na rim or jp>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
@@ -70,8 +70,8 @@ msgid "Suppress networks available notifications"
 msgstr "ããããããäçåèéçãæåãã"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
-msgid "Set this to true to disable notifications when wireless networks are available."
-msgstr "ããã true ãããããççãããããããåçåèãæãéçãçåããããã"
+msgid "Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "ããã true ãããããWi-Fi ãããããããåçåèãæãéçãçåããããã"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
@@ -101,279 +101,609 @@ msgstr "ããã true ãããããEAP ãèèäã CA èææééã
 msgid "Set this to true to disable warnings about CA certificates in phase 2 of EAP authentication."
 msgstr "ããã true ãããããEAP èèããããã 2 ãã 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:512
+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:514 ../src/applet.c:558 ../src/applet.c:584
+#: ../src/applet-device-wifi.c:1379 ../src/applet-device-wifi.c:1398
+msgid "Unknown error"
+msgstr "äæãããã"
+
+#: ../src/applet.c:517 ../src/applet.c:587 ../src/applet-device-wifi.c:1382
+#: ../src/applet-device-wifi.c:1401
+msgid "Connection failure"
+msgstr "æçãåæ"
+
+#: ../src/applet.c:556
+msgid "Device disconnect failed"
+msgstr "ãããããåæãåæãããã"
+
+#: ../src/applet.c:561
+msgid "Disconnect failure"
+msgstr "åæåæ"
+
+#: ../src/applet.c:582
+msgid "Connection activation failed"
+msgstr "æçãæåãããããåæãããã"
+
+#: ../src/applet.c:948 ../src/applet-device-wifi.c:1072
+msgid "Don't show this message again"
+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:1037
 #, 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:1040
 #, 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 ãããããäæãåæããçãVPN æç '%s' ãåæããããã"
 
-#: ../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:1043
 #, 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 ãããããçåãèåãèãããããVPN æç '%s'ãåæããããã"
 
-#: ../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:1046
 #, 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:1049
 #, 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 ãããããæéåãéåããããããããVPN æç '%s' ãåæããããã"
 
-#: ../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:1052
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"VPN ãããããéåãåæãããããVPN æç '%s' ãåæããããã"
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:392
-#: ../src/applet-dialogs.c:424
+#: ../src/applet.c:1055
 #, 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 secret ããããããVPN æç '%s' ãåæããããã"
 
-#: ../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:1058
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"VPN secret ãçåããããVPN æç '%s' ãåæããããã"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:412
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "æèãããããããããããã (CDMA) æç..."
+#: ../src/applet.c:1065
+#, 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:1083
+#, 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:1086
 #, 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 ãããããåæãããããVPN æç '%s' ãåæãããããã"
 
-#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:553
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "ããããã"
+#: ../src/applet.c:1092
+#, 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:1122
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+"VPN æçãççãæåããããã\n"
+"\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:1124
+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:1126
+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:1132 ../src/applet.c:1140 ../src/applet.c:1190
+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:1197
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN ãããããéåãåæãããããVPN æç '%s' ãåæãããããn\n"
+"%s"
 
-#: ../src/applet-device-gsm.c:493
-msgid "You are now connected to the GSM network."
-msgstr "çå GSM ãããããããæçãããããã"
+#: ../src/applet.c:1200
+#, 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:1520
+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:1522
+msgid "device not ready"
+msgstr "ãããããæåãããããããã"
 
-#: ../src/applet-device-gsm.c:783
-#, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "'%2$s' äã SIM ããã '%1$s' ã PIN ããã"
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1532 ../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:1548
+msgid "Disconnect"
+msgstr "åæãã"
 
-#: ../src/applet-device-gsm.c:898
-msgid "Wrong PUK code; please contact your provider."
-msgstr "PUK ãéããã; ãããããããéçããããããã"
+#: ../src/applet.c:1562
+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:1606
+msgid "No network devices available"
+msgstr "ãããããããããããããããã"
 
-#: ../src/applet-device-gsm.c:988
-msgid "SIM PIN unlock required"
-msgstr "SIM PIN ãééãåèãã"
+#: ../src/applet.c:1694
+msgid "_VPN Connections"
+msgstr "VPN æç(_V)"
 
-#: ../src/applet-device-gsm.c:989
-msgid "SIM PIN Unlock Required"
-msgstr "SIM PIN ãééãåèãã"
+#: ../src/applet.c:1751
+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:1755
+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:1849
+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:1854 ../src/applet.c:2656
+msgid "Networking disabled"
+msgstr "ãããããããçåããããããã"
 
-#: ../src/applet-device-gsm.c:1000
-msgid "SIM PUK unlock required"
-msgstr "SIM PUK ãããããããåèãã"
+#. 'Enable Networking' item
+#: ../src/applet.c:2075
+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:2084
+msgid "Enable _Wi-Fi"
+msgstr "Wi-Fi ãæåããã(_W)"
 
-#. 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:2093
+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:2102
+msgid "Enable WiMA_X Mobile Broadband"
+msgstr "WiMAX ããããããããããããæåããã(_X)"
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "New PIN code:"
-msgstr "æèã PIN ããã:"
+#. Toggle notifications item
+#: ../src/applet.c:2113
+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:2124
+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:2134
+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:2148
+msgid "_Help"
+msgstr "ããã(_H)"
 
-#: ../src/applet-device-wired.c:62
-msgid "Auto Ethernet"
-msgstr "èåãããããã"
+#. About item
+#: ../src/applet.c:2157
+msgid "_About"
+msgstr "ãããããããããããããã(_A)"
+
+#: ../src/applet.c:2335
+msgid "Disconnected"
+msgstr "åæããããã"
+
+#: ../src/applet.c:2336
+msgid "The network connection has been disconnected."
+msgstr "ããããããæçãåæãããããã"
+
+#: ../src/applet.c:2519
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "ããããããæç '%s' ãæåä..."
 
-#: ../src/applet-device-wired.c:205
+#: ../src/applet.c:2522
 #, c-format
-msgid "Wired Networks (%s)"
-msgstr "æçãããããã (%s)"
+msgid "User authentication required for network connection '%s'..."
+msgstr "ããããããæç '%s' ãããããèèãåèãã..."
 
-#: ../src/applet-device-wired.c:207
+#: ../src/applet.c:2525 ../src/applet-device-bt.c:239
+#: ../src/applet-device-cdma.c:487 ../src/applet-device-gsm.c:541
+#: ../src/applet-device-wimax.c:473
 #, c-format
-msgid "Wired Network (%s)"
-msgstr "æçãããããã (%s)"
+msgid "Requesting a network address for '%s'..."
+msgstr "'%s' ããããããããããããèæããããã..."
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
-msgstr "æçãããããã"
+#: ../src/applet.c:2528
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "ããããããæç '%s' ããããããããã"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
-msgstr "æçãããããã"
+#: ../src/applet.c:2611
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "VPN æç '%s' ãéåããããã..."
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1508
-msgid "disconnected"
-msgstr "åæãããããã"
+#: ../src/applet.c:2614
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "VPN æç '%s' ãããããèèãåèãã..."
+
+#: ../src/applet.c:2617
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "'%s' ã VPN ãããããèæããããã..."
+
+#: ../src/applet.c:2620
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "VPN æç '%s' ãããããããã"
+
+#: ../src/applet.c:2661
+msgid "No network connection"
+msgstr "ããããããæçãããããã"
+
+#: ../src/applet.c:3362
+msgid "NetworkManager Applet"
+msgstr "NetworkManager ããããã"
+
+#: ../src/applet-device-bt.c:173 ../src/applet-device-cdma.c:396
+#: ../src/applet-device-ethernet.c:240 ../src/applet-device-gsm.c:450
+#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
+msgid "Available"
+msgstr "åçåè"
+
+#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:438
+#: ../src/applet-device-ethernet.c:269 ../src/applet-device-gsm.c:492
+#: ../src/applet-device-wimax.c:423
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "çå'%s' ãæçãããããã"
+
+#: ../src/applet-device-bt.c:203 ../src/applet-device-cdma.c:442
+#: ../src/applet-device-ethernet.c:273 ../src/applet-device-gsm.c:496
+#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
+msgid "Connection Established"
+msgstr "æçãççãããã"
+
+#: ../src/applet-device-bt.c:204
+msgid "You are now connected to the mobile broadband network."
+msgstr "çåãããããããããããããããããããæçãããããã"
+
+#: ../src/applet-device-bt.c:230 ../src/applet-device-cdma.c:478
+#: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:464
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "ãããããããããããæç '%s' ãæåäãã..."
+
+#: ../src/applet-device-bt.c:233 ../src/applet-device-cdma.c:481
+#: ../src/applet-device-gsm.c:535 ../src/applet-device-wimax.c:467
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "ãããããããããããæç '%s' ãèåäãã..."
+
+#: ../src/applet-device-bt.c:236 ../src/applet-device-cdma.c:484
+#: ../src/applet-device-gsm.c:538 ../src/applet-device-wimax.c:470
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "ãããããããããããæç '%s' ããããããèèãåèãã..."
+
+#: ../src/applet-device-bt.c:243 ../src/applet-device-cdma.c:505
+#: ../src/applet-device-gsm.c:559
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "ãããããããããããæç '%s' ããããããããã"
+
+#: ../src/applet-device-cdma.c:181 ../src/connection-editor/page-mobile.c:714
+#: ../src/mb-menu-item.c:54
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:396
+#: ../src/applet-dialogs.c:424
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "ããããããããããã (%s)"
+
+#: ../src/applet-device-cdma.c:344 ../src/applet-device-gsm.c:398
+#: ../src/connection-editor/new-connection.c:87
+#: ../src/connection-editor/page-mobile.c:388
+msgid "Mobile Broadband"
+msgstr "ããããããããããã"
+
+#. Default connection item
+#: ../src/applet-device-cdma.c:409
+msgid "New Mobile Broadband (CDMA) connection..."
+msgstr "æèãããããããããããã (CDMA) æç..."
+
+#: ../src/applet-device-cdma.c:443
+msgid "You are now connected to the CDMA network."
+msgstr "çå CDMA ãããããããæçãããããã"
+
+#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:554
+#: ../src/applet-device-wimax.c:482
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "ãããããããããããæç '%s' ããããããã: (%d%%%s%s)"
+
+#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:557
+#: ../src/applet-device-wimax.c:485
+msgid "roaming"
+msgstr "ããããã"
+
+#: ../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:1202
+msgid "You are now registered on the home network."
+msgstr "ããããããããããæçããããã"
 
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
-msgstr "æçãããããããæçããããã"
+#: ../src/applet-device-cdma.c:651 ../src/applet-device-gsm.c:1208
+msgid "You are now registered on a roaming network."
+msgstr "ããããããããããããæçããããã"
+
+#: ../src/applet-device-ethernet.c:62
+msgid "Auto Ethernet"
+msgstr "èå Ethernet"
+
+#: ../src/applet-device-ethernet.c:205
+#, c-format
+msgid "Ethernet Networks (%s)"
+msgstr "Ethernet ãããããã (%s)"
+
+#: ../src/applet-device-ethernet.c:207
+#, c-format
+msgid "Ethernet Network (%s)"
+msgstr "Ethernet ãããããã (%s)"
 
-#: ../src/applet-device-wired.c:300
+#: ../src/applet-device-ethernet.c:210
+msgid "Ethernet Networks"
+msgstr "Ethernet ãããããã"
+
+#: ../src/applet-device-ethernet.c:212
+msgid "Ethernet Network"
+msgstr "Ethernet ãããããã"
+
+#: ../src/applet-device-ethernet.c:274
+msgid "You are now connected to the ethernet network."
+msgstr "Ethernet ãããããããæçããããã"
+
+#: ../src/applet-device-ethernet.c:300
 #, c-format
-msgid "Preparing wired network connection '%s'..."
-msgstr "æçããããããæç '%s' ãæåäãã..."
+msgid "Preparing ethernet network connection '%s'..."
+msgstr "Ethernet ããããããæç '%s' ãæåäãã..."
 
-#: ../src/applet-device-wired.c:303
+#: ../src/applet-device-ethernet.c:303
 #, c-format
-msgid "Configuring wired network connection '%s'..."
-msgstr "æçããããããæç '%s' ãèåäãã..."
+msgid "Configuring ethernet network connection '%s'..."
+msgstr "Ethernet ããããããæç '%s' ãèåäãã..."
 
-#: ../src/applet-device-wired.c:306
+#: ../src/applet-device-ethernet.c:306
 #, c-format
-msgid "User authentication required for wired network connection '%s'..."
-msgstr "æçããããããæç '%s'ããããããèèãåèãã..."
+msgid "User authentication required for ethernet network connection '%s'..."
+msgstr "Ethernet ããããããæç '%s'ããããããèèãåèãã..."
 
-#: ../src/applet-device-wired.c:309
+#: ../src/applet-device-ethernet.c:309
 #, c-format
-msgid "Requesting a wired network address for '%s'..."
-msgstr "'%s' çãæçãããããããããããèæããããã..."
+msgid "Requesting an ethernet network address for '%s'..."
+msgstr "'%s' çã Ethernet ãããããããããããèæããããã..."
 
-#: ../src/applet-device-wired.c:313
+#: ../src/applet-device-ethernet.c:313
 #, c-format
-msgid "Wired network connection '%s' active"
-msgstr "æçããããããæç '%s' ãããããããã"
+msgid "Ethernet network connection '%s' active"
+msgstr "Ethernet ããããããæç '%s' ãããããããã"
 
-#: ../src/applet-device-wired.c:494
+#: ../src/applet-device-ethernet.c:494
 msgid "DSL authentication"
 msgstr "DSL èè"
 
+#: ../src/applet-device-gsm.c:213 ../src/connection-editor/page-mobile.c:717
+#: ../src/mb-menu-item.c:59
+msgid "GSM"
+msgstr "GSM"
+
+#. Default connection item
+#: ../src/applet-device-gsm.c:463
+msgid "New Mobile Broadband (GSM) connection..."
+msgstr "æèãããããããããããã (GSM) æç..."
+
+#: ../src/applet-device-gsm.c:497
+msgid "You are now connected to the GSM network."
+msgstr "çå GSM ãããããããæçãããããã"
+
+#: ../src/applet-device-gsm.c:658
+msgid "PIN code required"
+msgstr "PIN ããããåèãã"
+
+#: ../src/applet-device-gsm.c:666
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "ããããããããããããããããã PIN ããããåèãã"
+
+#: ../src/applet-device-gsm.c:787
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "'%2$s' äã SIM ããã '%1$s' ã PIN ããã"
+
+#: ../src/applet-device-gsm.c:879
+msgid "Wrong PIN code; please contact your provider."
+msgstr "PIN ãéããã; ãããããããéçããããããã"
+
+#: ../src/applet-device-gsm.c:902
+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:929
+msgid "Sending unlock code..."
+msgstr "ééããããéää..."
+
+#: ../src/applet-device-gsm.c:992
+msgid "SIM PIN unlock required"
+msgstr "SIM PIN ãééãåèãã"
+
+#: ../src/applet-device-gsm.c:993
+msgid "SIM PIN Unlock Required"
+msgstr "SIM PIN ãééãåèãã"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-device-gsm.c:995
+#, 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:997
+msgid "PIN code:"
+msgstr "PIN ããã:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-device-gsm.c:1001
+msgid "Show PIN code"
+msgstr "PIN ããããèç"
+
+#: ../src/applet-device-gsm.c:1004
+msgid "SIM PUK unlock required"
+msgstr "SIM PUK ãããããããåèãã"
+
+#: ../src/applet-device-gsm.c:1005
+msgid "SIM PUK Unlock Required"
+msgstr "SIM PUK ãããããããåèãã"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-device-gsm.c:1007
+#, 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:1009
+msgid "PUK code:"
+msgstr "PUK ããã:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-device-gsm.c:1012
+msgid "New PIN code:"
+msgstr "æèã PIN ããã:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-device-gsm.c:1014
+msgid "Re-enter new PIN code:"
+msgstr "æèã PIN ããããååå:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-device-gsm.c:1019
+msgid "Show PIN/PUK codes"
+msgstr "PIN/PUK ããããèç"
+
+#: ../src/applet-device-gsm.c:1201 ../src/applet-device-gsm.c:1207
+msgid "GSM network."
+msgstr "GSM ãããããã"
+
 #: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
-msgstr "éèçççãããããããæç(_C)..."
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr "éèç Wi-Fi ãããããããæç(_C)..."
 
 #: ../src/applet-device-wifi.c:148
-msgid "Create _New Wireless Network..."
-msgstr "æããççãããããããäæ(_N)..."
+msgid "Create _New Wi-Fi Network..."
+msgstr "æãã Wi-Fi ãããããããäæ(_N)..."
 
 #: ../src/applet-device-wifi.c:292
 msgid "(none)"
@@ -381,92 +711,78 @@ msgstr "(ãã)"
 
 #: ../src/applet-device-wifi.c:790
 #, c-format
-msgid "Wireless Networks (%s)"
-msgstr "ççãããããã (%s)"
+msgid "Wi-Fi Networks (%s)"
+msgstr "Wi-Fi ãããããã (%s)"
 
 #: ../src/applet-device-wifi.c:792
 #, c-format
-msgid "Wireless Network (%s)"
-msgstr "ççãããããã (%s)"
+msgid "Wi-Fi Network (%s)"
+msgstr "Wi-Fi ãããããã (%s)"
 
 #: ../src/applet-device-wifi.c:794
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "ççãããããã"
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Wi-Fi ãããããã"
 
 #: ../src/applet-device-wifi.c:827
-msgid "wireless is disabled"
-msgstr "ççãçåããããããã"
+msgid "Wi-Fi is disabled"
+msgstr "Wi-Fi ãçåããããããã"
 
 #: ../src/applet-device-wifi.c:828
-msgid "wireless is disabled by hardware switch"
-msgstr "ççãããããããããããããçåããããããã"
+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 "Wireless Networks Available"
-msgstr "ççãããããããåçåèãã"
+msgid "Wi-Fi Networks Available"
+msgstr "Wi-Fi ãããããããåçåèãã"
 
 #: ../src/applet-device-wifi.c:1069
-msgid "Use the network menu to connect to a wireless network"
-msgstr "ççãããããããæçãããããããããããããããäçãããã"
-
-#: ../src/applet-device-wifi.c:1072 ../src/applet.c:924
-msgid "Don't show this message again"
-msgstr "äåãããããããããèçããã"
+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 wireless network '%s'."
-msgstr "ççãããããã '%s' ãæçããããã"
+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 wireless network connection '%s'..."
-msgstr "ççããããããæç '%s' ãæåä..."
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "Wi-Fi ããããããæç '%s' ãæåä..."
 
 #: ../src/applet-device-wifi.c:1297
 #, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "ççããããããæç '%s' ãèåä..."
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "Wi-Fi ããããããæç '%s' ãèåäãã..."
 
 #: ../src/applet-device-wifi.c:1300
 #, c-format
-msgid "User authentication required for wireless network '%s'..."
-msgstr "ççãããããã '%s' ããããããèèãåèãã..."
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr "Wi-Fi ãããããã '%s' ããããããèèãåèãã..."
 
 #: ../src/applet-device-wifi.c:1303
 #, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "'%s' çãççãããããããããããèæããããã..."
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "'%s' ã Wi-Fi ãããããããããããèæããããã..."
 
 #: ../src/applet-device-wifi.c:1324
 #, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
-msgstr "ççããããããæç '%s' ããããããã: %s (%d%%)"
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
+msgstr "Wi-Fi ããããããæç '%s' ããããããã: %s (%d%%)"
 
 #: ../src/applet-device-wifi.c:1329
 #, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "ççããããããæç '%s' ããããããã"
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Wi-Fi ããããããæç '%s' ãããããããã"
 
 #: ../src/applet-device-wifi.c:1377
 msgid "Failed to activate connection"
 msgstr "æçãæåãããããåæãããã"
 
-#: ../src/applet-device-wifi.c:1379 ../src/applet-device-wifi.c:1398
-#: ../src/applet.c:490 ../src/applet.c:534 ../src/applet.c:560
-msgid "Unknown error"
-msgstr "äæãããã"
-
-#: ../src/applet-device-wifi.c:1382 ../src/applet-device-wifi.c:1401
-#: ../src/applet.c:493 ../src/applet.c:563
-msgid "Connection failure"
-msgstr "æçãåæ"
-
 #: ../src/applet-device-wifi.c:1396
 msgid "Failed to add new connection"
 msgstr "æèæçãèåãåæãããã"
@@ -497,8 +813,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:930
 #: ../src/wireless-security/wireless-security.c:406
 msgid "LEAP"
 msgstr "LEAP"
@@ -517,8 +833,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:887
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ãã"
@@ -637,438 +952,98 @@ 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 ãããããäæãåæããçãVPN æç '%s' ãåæããããã"
-
-#: ../src/applet.c:1019
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid configuration."
-msgstr ""
-"\n"
-"VPN ãããããçåãèåãèãããããVPN æç '%s'ãåæããããã"
-
-#: ../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 ãããããæéåãéåããããããããVPN æç '%s' ãåæããããã"
-
-#: ../src/applet.c:1028
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
-msgstr ""
-"\n"
-"VPN ãããããéåãåæãããããVPN æç '%s' ãåæããããã"
-
-#: ../src/applet.c:1031
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
-msgstr ""
-"\n"
-"æåã VPN secret ããããããVPN æç '%s' ãåæããããã"
-
-#: ../src/applet.c:1034
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
-msgstr ""
-"\n"
-"VPN secret ãçåããããVPN æç '%s' ãåæããããã"
-
-#: ../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 ãããããåæãããããVPN æç '%s' ãåæãããããã"
-
-#: ../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"
-"\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 ãããããéåãåæãããããVPN æç '%s' ãåæããããã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 æç(_V)"
-
-#: ../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 "WiMAX ããããããããããããæåããã(_X)"
-
-#. Toggle notifications item
-#: ../src/applet.c:2089
-msgid "Enable N_otifications"
-msgstr "éçãæåããã(_O)"
-
-#. 'Connection Information' item
-#: ../src/applet.c:2100
-msgid "Connection _Information"
-msgstr "æçæå(_I)"
-
-#. 'Edit Connections...' item
-#: ../src/applet.c:2110
-msgid "Edit Connections..."
-msgstr "æçãçéãã..."
-
-#. Help item
-#: ../src/applet.c:2124
-msgid "_Help"
-msgstr "ããã(_H)"
+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 "'%s' ã VPN ãããããèæããããã..."
+#: ../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 "äæãããããããæç secret ãææããããããããã"
+#: ../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
@@ -1092,8 +1067,143 @@ msgstr "ããããããããäãããããããããããããæç
 msgid "If enabled, this connection will never be used as the default network 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
+#, fuzzy
+#| msgid "Choose a VPN Connection Type"
+msgid "Choose a Connection Type"
+msgstr "VPN æçãçéãéãããããã"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+#, fuzzy
+#| 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."
+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 "æèæçãäçããã 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:294
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "äæãããããããæç secret ãææããããããããã"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+#| msgid "Broadcast Address:"
+msgid "Broadcast"
+msgstr "ãããããããããããã:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#, fuzzy
+#| msgid "EAP"
+msgid "ARP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+#| msgid "Base Connection:"
+msgid "Bonded _connections:"
+msgstr "ãããæç:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#, fuzzy
+#| msgid "M_ode:"
+msgid "_Mode:"
+msgstr "ããã(_O):"
+
+#. Edit
+#: ../src/connection-editor/ce-page-bond.ui.h:12
+#: ../src/connection-editor/nm-connection-list.c:680
+msgid "_Edit"
+msgstr "çé(_E)"
+
+#. Delete
+#: ../src/connection-editor/ce-page-bond.ui.h:13
+#: ../src/connection-editor/nm-connection-list.c:697
+msgid "_Delete"
+msgstr "åé(_D)"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:14
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "ms"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+#, fuzzy
+#| msgid "Interface:"
+msgid "_Interface name:"
+msgstr "ãããããããã:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:17
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "An IP address, or a comma-separated list of IP addresses, to look for when checking the link status."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+msgid "Link _up delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _down delay:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 #: ../src/wireless-security/eap-method-leap.ui.h:1
 #: ../src/wireless-security/eap-method-simple.ui.h:1
 #: ../src/wireless-security/ws-leap.ui.h:1
@@ -1114,7 +1224,7 @@ msgid "Sho_w password"
 msgstr "ããããããèç(_W)"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 #: ../src/wireless-security/eap-method-leap.ui.h:2
 #: ../src/wireless-security/eap-method-simple.ui.h:2
 #: ../src/wireless-security/ws-leap.ui.h:2
@@ -1122,14 +1232,107 @@ 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 "Attachment Unit Interface (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 "Media Independent Interface (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 ãããããããããã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(_M):"
+
+#: ../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 ""
+
+#. IP-over-InfiniBand "datagram mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+#| msgid "disconnected"
+msgid "Connected"
+msgstr "åæãããããã"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
@@ -1239,43 +1442,53 @@ msgid "Prefer 2G (GPRS/EDGE)"
 msgstr "2G åå (GPRS/EDGE)"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:6
+#, fuzzy
+#| msgid "Prefer 3G (UMTS/HSPA)"
+msgid "Prefer 4G (LTE)"
+msgstr "3G åå (UMTS/HSPA)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+msgid "Use only 4G (LTE)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "åæ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "Nu_mber:"
 msgstr "çå(_M):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:12
 msgid "Advanced"
 msgstr "éå"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:13
 msgid "_APN:"
 msgstr "APN(_A):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:14
 msgid "N_etwork ID:"
 msgstr "ãããããã ID(_E):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:15
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "ããã(_T):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:16
 msgid "Change..."
 msgstr "åæ..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/connection-editor/ce-page-mobile.ui.h:17
 msgid "P_IN:"
 msgstr "PIN çå(_I):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:18
 msgid "Allow _roaming if home network is not available"
 msgstr "ããããããããããåçããããååãããããããèå(_R)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:19
 msgid "Sho_w passwords"
 msgstr "ããããããèç(_W)"
 
@@ -1328,139 +1541,66 @@ msgstr "Echo"
 msgid "Send PPP _echo packets"
 msgstr "PPP Echo ããããããéä(_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 "Attachment Unit Interface (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 "Media Independent Interface (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 ãããããããããã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(_M):"
-
-#: ../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 "ããããã"
 
-#: ../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
-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) ãããæçãããããããã"
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "This option locks this connection to the Wi-Fi access point (AP) specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
+msgstr "ãããããããããããååãããã BSSID ãæåããã Wi-Fi ãããããããã (AP) ãããæçãããããããã"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "BSSID(_B):"
 
-#: ../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 "SSID(_I):"
 
-#: ../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 "èåãããèèææ"
@@ -1499,84 +1639,342 @@ msgstr "MSCHAP(_M)"
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft ããããããããããããèèããããã (MS-CHAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v2(_2)"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v2(_2)"
+
+# http://technet.microsoft.com/ja-jp/library/cc739678(WS.10).aspx
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "Microsoft ããããããããããããèèããããã ããããã2 (MS-CHAP v2)"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "In most cases, the provider's PPP servers will support all authentication methods.  If connections fail, try disabling support for some methods."
+msgstr "ãããããååãããããããã PPP ãããããããããèèææããããããããããã æçãåæããååããäéãèèææãçåãããããããããã"
+
+#: ../src/connection-editor/ip4-routes-dialog.c: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:77
+#: ../src/connection-editor/page-ethernet.c:272
+msgid "Ethernet"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/new-connection.c:82
+#: ../src/connection-editor/page-wifi.c:460
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
+#: ../src/connection-editor/new-connection.c:92
+#: ../src/connection-editor/page-wimax.c:155 ../src/mb-menu-item.c:75
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#: ../src/connection-editor/new-connection.c:97
+#: ../src/connection-editor/page-dsl.c:140
+msgid "DSL"
+msgstr "DSL"
+
+#: ../src/connection-editor/new-connection.c:102
+#: ../src/connection-editor/page-infiniband.c:191
+msgid "InfiniBand"
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:107
+#: ../src/connection-editor/page-bond.c:746
+msgid "Bond"
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:119
+#: ../src/connection-editor/page-vpn.c:112
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/new-connection.c:252
+#, fuzzy
+#| msgid "Export VPN connection..."
+msgid "Import a saved VPN configuration..."
+msgstr "VPN æçããããããããã..."
+
+#: ../src/connection-editor/new-connection.c:274
+msgid "The connection editor dialog could not be initialized due to an unknown error."
+msgstr "æçããããããããããããäæããããããããåæååæããããããã"
+
+#: ../src/connection-editor/new-connection.c:283
+msgid "Could not create new connection"
+msgstr "æããæçãäæãããããããã"
+
+#: ../src/connection-editor/new-connection.c:419
+msgid "Connection delete failed"
+msgstr "æçãåéãåæãããã"
+
+#: ../src/connection-editor/new-connection.c:466
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr "æåã æç %s ãåéããããããã ?"
+
+#: ../src/connection-editor/nm-connection-editor.c:110
+#, c-format
+msgid "Editing %s"
+msgstr "%s ãçé"
+
+#: ../src/connection-editor/nm-connection-editor.c:114
+msgid "Editing un-named connection"
+msgstr "çåãæçãçé"
+
+#: ../src/connection-editor/nm-connection-editor.c:301
+msgid "The connection editor could not find some required resources (the .ui file was not found)."
+msgstr "æçããããããåèãããããããããããããããããããããã (.ui ããããããããããããããã)ã"
+
+#: ../src/connection-editor/nm-connection-editor.c:428
+msgid "_Save"
+msgstr "äå(_S)"
+
+#: ../src/connection-editor/nm-connection-editor.c:429
+msgid "Save any changes made to this connection."
+msgstr "ããæçãåãããåæããããäåãããã"
+
+#: ../src/connection-editor/nm-connection-editor.c:430
+msgid "_Save..."
+msgstr "äå(_S)..."
+
+#: ../src/connection-editor/nm-connection-editor.c:431
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr "ããããããããããããããçæçãäåãèèããã"
+
+#: ../src/connection-editor/nm-connection-editor.c:447
+#, fuzzy
+#| msgid "Could not create new connection"
+msgid "Could not create connection"
+msgstr "æããæçãäæãããããããã"
+
+#: ../src/connection-editor/nm-connection-editor.c:447
+msgid "Could not edit connection"
+msgstr "æçãçéãããããããã"
+
+#: ../src/connection-editor/nm-connection-editor.c:449
+#, fuzzy
+#| msgid "Error creating connection editor dialog."
+msgid "Unknown error creating connection editor dialog."
+msgstr "æçãããããããããããäæäããããããã"
+
+#: ../src/connection-editor/nm-connection-editor.c:555
+msgid "Error saving connection"
+msgstr "æçæåãäåäãããã"
+
+#: ../src/connection-editor/nm-connection-editor.c:556
+#, c-format
+msgid "The property '%s' / '%s' is invalid: %d"
+msgstr "ããããã '%s' / '%s' ãçåãã: %d"
+
+#: ../src/connection-editor/nm-connection-editor.c:658
+msgid "Error initializing editor"
+msgstr "ããããããåæåäãããããã"
+
+#: ../src/connection-editor/nm-connection-editor.c:967
+msgid "Connection add failed"
+msgstr "æçãèåãåæãããã"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
+msgid "Connection _name:"
+msgstr "æçå(_N):"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
+msgid "Connect _automatically"
+msgstr "èåæçãã(_A) "
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
+msgid "A_vailable to all users"
+msgstr "ãããããããããåçåè(_V)"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+#| msgid "E_xport"
+msgid "_Export..."
+msgstr "ãããããã(_X)"
+
+#: ../src/connection-editor/nm-connection-list.c:143
+msgid "never"
+msgstr "ææç"
+
+#: ../src/connection-editor/nm-connection-list.c:154
+#: ../src/connection-editor/nm-connection-list.c:165
+msgid "now"
+msgstr "æçä"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:172
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d åå"
+
+#: ../src/connection-editor/nm-connection-list.c:176
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d æéå"
+
+#: ../src/connection-editor/nm-connection-list.c:188
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d æå"
+
+#: ../src/connection-editor/nm-connection-list.c:194
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d ãæå"
+
+#: ../src/connection-editor/nm-connection-list.c:198
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d åå"
+
+#: ../src/connection-editor/nm-connection-list.c:626
+msgid "Name"
+msgstr "åå"
+
+#: ../src/connection-editor/nm-connection-list.c:639
+msgid "Last Used"
+msgstr "ååãäç"
+
+#: ../src/connection-editor/nm-connection-list.c:681
+msgid "Edit the selected connection"
+msgstr "éæããæçãçéãã"
+
+#: ../src/connection-editor/nm-connection-list.c:682
+msgid "_Edit..."
+msgstr "çé(_E)..."
+
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "Authenticate to edit the selected connection"
+msgstr "éæããæçãçéãèèãã"
 
-# http://technet.microsoft.com/ja-jp/library/cc739678(WS.10).aspx
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "Microsoft ããããããããããããèèããããã ããããã2 (MS-CHAP v2)"
+#: ../src/connection-editor/nm-connection-list.c:698
+msgid "Delete the selected connection"
+msgstr "éæããæçãåéãã"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
-msgid "In most cases, the provider's PPP servers will support all authentication methods.  If connections fail, try disabling support for some methods."
-msgstr "ãããããååãããããããã PPP ãããããããããèèææããããããããããã æçãåæããååããäéãèèææãçåãããããããããã"
+#: ../src/connection-editor/nm-connection-list.c:699
+msgid "_Delete..."
+msgstr "åé(_D)..."
 
-#: ../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/nm-connection-list.c:700
+msgid "Authenticate to 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:937
+msgid "Error creating 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:938
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "æç '%s' ãäæææããããããã"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
-msgid "Createâ"
-msgstr "äæâ"
+#: ../src/connection-editor/nm-connection-list.c:993
+msgid "Error editing 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:994
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr "UUID '%s' ãæçãçèãããããããã"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:928
-msgid "Netmask"
-msgstr "ãããããã"
+#: ../src/connection-editor/page-8021x-security.c:120
+msgid "802.1x Security"
+msgstr "802.1x ãããããã"
 
-#: ../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/page-8021x-security.c:122
+msgid "Could not load 802.1x Security user interface."
+msgstr "802.1x ãããããããããããããããããããèãèããããã"
 
-#: ../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:140
+msgid "Use 802.1_X security for this connection"
+msgstr "ããæçã 802.1x ãããããããäçãã(_X)"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:894
-msgid "Prefix"
-msgstr "ããããããã"
+#: ../src/connection-editor/page-bond.c:559
+#, c-format
+msgid "%s slave %d"
+msgstr ""
 
-#: ../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-bond.c:749
+#, fuzzy
+#| msgid "Could not load DSL user interface."
+msgid "Could not load bond user interface."
+msgstr "DSL ããããããããããããããããããããããããã"
 
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/page-bond.c:909
+#, fuzzy, c-format
+#| msgid "Wired connection %d"
+msgid "Bond connection %d"
+msgstr "æçæç %d"
+
+#: ../src/connection-editor/page-dsl.c:142
 msgid "Could not load DSL user interface."
 msgstr "DSL ããããããããããããããããããããããããã"
 
-#: ../src/connection-editor/page-dsl.c:232
+#: ../src/connection-editor/page-dsl.c:234
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL æç %d"
 
+#: ../src/connection-editor/page-ethernet.c:90
+#: ../src/connection-editor/page-infiniband.c:74
+#: ../src/connection-editor/page-wifi.c:94
+#: ../src/connection-editor/page-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:274
+msgid "Could not load ethernet user interface."
+msgstr "Ethernet ããããããããããããããèãèããããã"
+
+#: ../src/connection-editor/page-ethernet.c:450
+#, c-format
+msgid "Ethernet connection %d"
+msgstr "Ethernet æç %d"
+
+#: ../src/connection-editor/page-infiniband.c:194
+#, fuzzy
+#| msgid "Could not load WiFi user interface."
+msgid "Could not load InfiniBand user interface."
+msgstr "WiFi ããããããããããããããããåæããããããã"
+
+#: ../src/connection-editor/page-infiniband.c:319
+#, fuzzy, c-format
+#| msgid "Wired connection %d"
+msgid "InfiniBand connection %d"
+msgstr "æçæç %d"
+
 #: ../src/connection-editor/page-ip4.c:133
 #: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (VPN)"
@@ -1639,11 +2037,11 @@ msgstr "èåãæçãããã(_E):"
 msgid "Editing IPv4 routes for %s"
 msgstr "%s çã IPv4 ããããçé"
 
-#: ../src/connection-editor/page-ip4.c:992
+#: ../src/connection-editor/page-ip4.c:993
 msgid "IPv4 Settings"
 msgstr "IPv4 ããããããã"
 
-#: ../src/connection-editor/page-ip4.c:994
+#: ../src/connection-editor/page-ip4.c:995
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 ãããããããããããããèãèããããã"
 
@@ -1652,7 +2050,7 @@ msgid "Automatic, addresses only"
 msgstr "èåããããããã"
 
 #: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:280
+#: ../src/wireless-security/eap-method.c:281
 msgid "Ignore"
 msgstr "çèãã"
 
@@ -1665,350 +2063,99 @@ msgstr "èåãDHCP ãã"
 msgid "Editing IPv6 routes for %s"
 msgstr "%s çã IPv6 ããããçé"
 
-#: ../src/connection-editor/page-ip6.c:956
+#: ../src/connection-editor/page-ip6.c:957
 msgid "IPv6 Settings"
 msgstr "IPv6 ããããããã"
 
-#: ../src/connection-editor/page-ip6.c:958
+#: ../src/connection-editor/page-ip6.c:959
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ãããããããããããããèãèããããã"
 
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-mobile.c:390
 msgid "Could not load mobile broadband user interface."
 msgstr "ãããããããããããããããããããããããããèãèããããã"
 
-#: ../src/connection-editor/page-mobile.c:398
+#: ../src/connection-editor/page-mobile.c:407
 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:657
 msgid "Select Mobile Broadband Provider Type"
 msgstr "ããããããããããããããããããããããéæ"
 
-#: ../src/connection-editor/page-mobile.c:674
-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) ãäçããã(_G)"
-
-#: ../src/connection-editor/page-mobile.c:686
-msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
-msgstr "çãããããããã CDMA ããããæè (äããã1xRTT, EVDO)ãäçããã(_D)"
-
-#: ../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 "æçããããããããããããããããããããèãèããããã"
-
-#: ../src/connection-editor/page-wired-security.c:139
-msgid "Use 802.1_X security for this connection"
-msgstr "ããæçã 802.1x ãããããããäçãã(_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-bit ãã (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-bit ãããããã"
-
-#: ../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 Personal"
-
-# ããããäæãååãããèããããããã
-#: ../src/connection-editor/page-wireless-security.c:354
-#: ../src/libnm-gtk/nm-wireless-dialog.c:989
-msgid "WPA & WPA2 Enterprise"
-msgstr "WPA & WPA2 Enterprise"
-
-#: ../src/connection-editor/page-wireless-security.c:395
-msgid "Could not load WiFi security user interface; missing WiFi setting."
-msgstr "WiFi ãããããããããããããããããããèãèãããããWiFi èåããããããã"
-
-#: ../src/connection-editor/page-wireless-security.c:405
-msgid "Wireless Security"
-msgstr "ççãããããã"
-
-#: ../src/connection-editor/page-wireless-security.c:407
-msgid "Could not load WiFi security user interface."
-msgstr "WiFi ãããããããããããããããããããèãèããããã"
-
-#: ../src/connection-editor/nm-connection-editor.c:102
-#, c-format
-msgid "Editing %s"
-msgstr "%s ãçé"
-
-#: ../src/connection-editor/nm-connection-editor.c:106
-msgid "Editing un-named connection"
-msgstr "çåãæçãçé"
-
-#: ../src/connection-editor/nm-connection-editor.c:292
-msgid "The connection editor could not find some required resources (the .ui file was not found)."
-msgstr "æçããããããåèãããããããããããããããããããããã (.ui ããããããããããããããã)ã"
-
-#: ../src/connection-editor/nm-connection-editor.c:395
-msgid "Error creating connection editor dialog."
-msgstr "æçãããããããããããäæäããããããã"
-
-#: ../src/connection-editor/nm-connection-editor.c:407
-msgid "_Save"
-msgstr "äå(_S)"
-
-#: ../src/connection-editor/nm-connection-editor.c:408
-msgid "Save any changes made to this connection."
-msgstr "ããæçãåãããåæããããäåãããã"
-
-#: ../src/connection-editor/nm-connection-editor.c:409
-msgid "_Save..."
-msgstr "äå(_S)..."
-
-#: ../src/connection-editor/nm-connection-editor.c:410
-msgid "Authenticate to save this connection for all users of this machine."
-msgstr "ããããããããããããããçæçãäåãèèããã"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "_Import"
-msgstr "ããããã(_I)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "E_xport"
-msgstr "ãããããã(_X)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-msgid "Connection _name:"
-msgstr "æçå(_N):"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-msgid "Connect _automatically"
-msgstr "èåæçãã(_A) "
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "A_vailable to all users"
-msgstr "ãããããããããåçåè(_V)"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "ææç"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "æçä"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d åå"
-
-#: ../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/page-mobile.c:692
+msgid "Select the technology your mobile broadband provider uses.  If you are unsure, ask your provider."
+msgstr "ãããããããããããããããããããäçããæèãéæããããããã äæãååãããããããããåããããããã"
 
-#: ../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:697
+msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
+msgstr "çãããããããã GSM ããããæè (äããã GPRS, EDGE, UMTS, HSDPA) ãäçããã(_G)"
 
-#: ../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:704
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+msgstr "çãããããããã CDMA ããããæè (äããã1xRTT, EVDO)ãäçããã(_D)"
 
-#: ../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:283
+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:285
+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:114
+msgid "Could not load VPN user interface."
+msgstr "VPN ãããããããããããããèãèããããã"
 
-#: ../src/connection-editor/nm-connection-list.c:795
+#: ../src/connection-editor/page-vpn.c:129
 #, 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:223
+#: ../src/connection-editor/page-vpn.c:320
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN æç %d"
 
-#: ../src/connection-editor/nm-connection-list.c:931
+#: ../src/connection-editor/page-vpn.c:249
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2018,79 +2165,92 @@ msgstr ""
 "\n"
 "ããã: VPN ãããããããããããããã"
 
-#: ../src/connection-editor/nm-connection-list.c:944
-msgid "Could not edit imported connection"
-msgstr "ãããããããæçãçéãããããããã"
+#: ../src/connection-editor/page-vpn.c:274
+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:275
+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:462
+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:667
+#, 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:904
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr "WEP 40/128-bit ãã (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:913
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128-bit ãããããã"
 
-#: ../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:943
+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:957
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 Personal"
 
-#: ../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:971
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/nm-connection-list.c:1574
-msgid "Error creating connection"
-msgstr "æçãäæäãããã"
+#: ../src/connection-editor/page-wifi-security.c:396
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr "Wi-Fi ãããããããããããããããããããèãèãããããWi-Fi èåããããããã"
 
-#: ../src/connection-editor/nm-connection-list.c:1575
-#, c-format
-msgid "Don't know how to create '%s' connections"
-msgstr "æç '%s' ãäæææããããããã"
+#: ../src/connection-editor/page-wifi-security.c:406
+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:408
+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:158
+msgid "Could not load WiMAX user interface."
+msgstr "WiMAX ããããããããããããããããåæããããããã"
 
-#: ../src/connection-editor/nm-connection-list.c:1643
+#: ../src/connection-editor/page-wimax.c:287
 #, 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 connection information\n"
@@ -2101,29 +2261,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 "%s ããäåãããã VPN æçãåãæãããããã ?"
 
-#: ../src/connection-editor/vpn-helpers.c:354
+#: ../src/connection-editor/vpn-helpers.c:332
 msgid "Cannot export VPN connection"
 msgstr "VPN æçãããããããããããã"
 
-#: ../src/connection-editor/vpn-helpers.c:356
+#: ../src/connection-editor/vpn-helpers.c:334
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2134,130 +2294,148 @@ 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
+#, fuzzy, c-format
+#| msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+msgid "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
+msgstr "Bluetooth ãèåãããããã (D-Bus ããæçãåæ: %s)ã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:249
-#, c-format
-msgid "%s Network"
-msgstr "%s ãããããã"
+#: ../src/gnome-bluetooth/bt-widget.c:330
+#, fuzzy, c-format
+#| msgid "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+msgid "Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
+msgstr "Bluetooth ãèåãããããã (NetworkManager ãæçäããããçç: %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 "Bluetooth ãããããèäããããããããã"
-
-#: ../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 "ãããããã Bluetooth ããããããæåãããããåãããããããããããããããæçãããããããããããããã"
 
-#: ../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 "Bluetooth ãèåãããããã (D-Bus ããæçãåæ: %s)ã"
-
-#: ../src/gnome-bluetooth/bt-widget.c:1022
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr "Bluetooth ãèåãããããã (D-Bus ãããããäæãåæ)ã"
+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 "Bluetooth ãèåãããããã (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 resources, double-check your settings.  To modify your mobile broadband connection settings, choose \"Network Connections\" from the System >> 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)(_A):"
 
-#: ../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"
 "\n"
@@ -2267,158 +2445,158 @@ 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 (Access Point Name)"
 
-#: ../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:439
 msgid "New..."
 msgstr "æè..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1076
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1058
 msgid "C_reate"
 msgstr "äæ(_R)"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1160
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1142
 #, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "ççãããããã '%s' ããããããããããããããããåãæååãããåèããã"
+msgid "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:1144
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wi-Fi ãããããããèèãåèãã"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1164
-msgid "Authentication required by wireless network"
-msgstr "ççããããããããèèãèæãããã"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wi-Fi ããããããããèèãèæãããã"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1169
-msgid "Create New Wireless Network"
-msgstr "æããççãããããããäæ"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+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:1153
+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:1154
+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:1156
+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:1158
+msgid "Hidden Wi-Fi network"
+msgstr "éèç Wi-Fi ãããããã"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "æçãããççãããããããååãããããããèçãååããããããã"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1159
+msgid "Enter the name and security details of the hidden Wi-Fi network you wish to connect to."
+msgstr "æçããã Wi-Fi ãããããããååãããããããèçãååããããããã"
 
 #: ../src/libnm-gtk/wifi.ui.h:2
-msgid "Wireless _security:"
-msgstr "ççãããããã(_S):"
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi ãããããã(_S):"
 
 #: ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "æç(_O):"
 
 #: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _adapter:"
-msgstr "ççããããã(_A):"
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi ããããã(_A):"
 
 #: ../src/main.c:73
 msgid "Usage:"
@@ -2461,51 +2639,57 @@ msgid "HSPA"
 msgstr "HSPA"
 
 #: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
+#, fuzzy
+#| msgid "HSPA"
+msgid "HSPA+"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:77
+msgid "LTE"
+msgstr ""
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:113
 msgid "not enabled"
 msgstr "æåãããããããã"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:119
 msgid "not registered"
 msgstr "çéããããããã"
 
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:137
 #, c-format
 msgid "Home network (%s)"
 msgstr "ããããããããã (%s)"
 
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:139
 #, c-format
 msgid "Home network"
 msgstr "ããããããããã"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:147
 msgid "searching"
 msgstr "æçä"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:150
 msgid "registration denied"
 msgstr "çéãæåããããã"
 
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:155 ../src/mb-menu-item.c:161
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s ããããã)"
 
-#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:157 ../src/mb-menu-item.c:163
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (ããããã)"
 
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:166
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "ããããããããããã (%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:168
 #, c-format
 msgid "Roaming network"
 msgstr "ããããããããããã"
@@ -2514,30 +2698,50 @@ 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
+#, fuzzy, c-format
+#| msgid "Base Connection:"
+msgid "%s connection"
+msgstr "ãããæç:"
 
-#: ../src/wireless-security/eap-method.c:274
+#: ../src/wireless-security/eap-method.c:275
 msgid "No Certificate Authority certificate chosen"
 msgstr "èæææé(CA)ãèææãéæããããããã"
 
-#: ../src/wireless-security/eap-method.c:275
-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) ãèææãäçãããããååãããèæçãããããã ãããããããæçããåèæããããããèæææé (CA) ãèææã éæãããã ?"
+#: ../src/wireless-security/eap-method.c:276
+msgid "Not using a Certificate Authority (CA) certificate can result in connections to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate Authority certificate?"
+msgstr "èæææé (CA) ãèææãäçãããããååãããèæçã Wi-Fi ãããããããæçããåèæããããããèæææé (CA) ãèææã éæãããã ?"
 
-#: ../src/wireless-security/eap-method.c:284
+#: ../src/wireless-security/eap-method.c:285
 msgid "Choose CA Certificate"
 msgstr "CA èææãéæãã"
 
-#: ../src/wireless-security/eap-method.c:643
+#: ../src/wireless-security/eap-method.c:645
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DER ãã PEM ãã PKCS#12 ããããããããã (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:646
+#: ../src/wireless-security/eap-method.c:648
 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 "åå"
@@ -2571,23 +2775,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"
@@ -2731,6 +2918,70 @@ msgstr "ãããèç(_W)"
 msgid "WEP inde_x:"
 msgstr "WEP ãããããã(_X):"
 
+#~ msgid "An unknown error occurred."
+#~ msgstr "äæãããããççããããã"
+
+#~ msgid "Could not edit new connection"
+#~ msgstr "æèæçãçéãããããããã"
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "ççãããããã (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "ççãããããã (%s)"
+
+#~ msgid "Wireless Network"
+#~ msgid_plural "Wireless Networks"
+#~ msgstr[0] "ççãããããã"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "ççãçåããããããã"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "ççãããããããããããããçåããããããã"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "ççããããããæç '%s' ãæåä..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "ççããããããæç '%s' ãèåä..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "'%s' çãççãããããããããããèæããããã..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "ççããããããæç '%s' ããããããã"
+
+#~ msgid "Wired"
+#~ msgstr "æç"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "æçããããããããããããããããããããèãèããããã"
+
+#~ 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 "Bluetooth ãããããèäããããããããã"
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr "Bluetooth ãèåãããããã (D-Bus ãããããäæãåæ)ã"
+
 #~ msgid "Click on this icon to connect to a wireless network"
 #~ msgstr "ççãããããããæçããããããããããããããããããã"
 



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