[network-manager-applet] [l10n] Update Japanese translation



commit bd50faecc645a2cfc4d53bbc8a38dfcd9fd73e22
Author: Hideki Yamane <henrich debian org>
Date:   Sun Mar 25 01:02:21 2012 +0900

    [l10n] Update Japanese translation

 po/ja.po | 1687 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 821 insertions(+), 866 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index b49e2b6..462b12b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,6 +6,7 @@
 # Kiyoto Hashida <khashida redhat com>, 2010.
 # KURASAWA Nozomu <nabetaro caldron jp>, 2010.
 # Hideki Yamane <henrich debian or jp>, 2010.
+# Hideki Yamane <henrich debian org>, 2011.
 # Takayuki KUSANO <AE5T-KSN asahi-net or jp>, 2010, 2011.
 # Takayoshi OKANO <kano na rim or jp>, 2011.
 #
@@ -14,9 +15,9 @@ 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: 2011-09-13 14:26+0000\n"
-"PO-Revision-Date: 2011-09-11 08:23+0900\n"
-"Last-Translator: Jiro Matsuzawa <jmatsuzawa src gnome org>\n"
+"POT-Creation-Date: 2012-03-24 13:28+0000\n"
+"PO-Revision-Date: 2012-03-25 00:29+0900\n"
+"Last-Translator: Hideki Yamane <henrich debian org>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,36 +26,36 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../nm-applet.desktop.in.h:1
-msgid "Manage your network connections"
-msgstr "ããããããæçãçç"
-
-#: ../nm-applet.desktop.in.h:2
 msgid "Network"
 msgstr "ãããããã"
 
-#: ../nm-applet.schemas.in.h:1
-msgid "Disable WiFi Create"
-msgstr "WiFi ãäæãçåããã"
+#: ../nm-applet.desktop.in.h:2
+msgid "Manage your network connections"
+msgstr "ããããããæçãçç"
 
-#: ../nm-applet.schemas.in.h:2
+#: ../nm-applet.schemas.in.h:1
 msgid "Disable connected notifications"
 msgstr "æçæãéçãçåããã"
 
+#: ../nm-applet.schemas.in.h:2
+msgid "Set this to TRUE to disable notifications when connecting to a network."
+msgstr ""
+"ãããããããæçããæçãããã TRUE ãããããããéçãçåããããã"
+
 #: ../nm-applet.schemas.in.h:3
 msgid "Disable disconnected notifications"
 msgstr "åææãéçãçåããã"
 
 #: ../nm-applet.schemas.in.h:4
-msgid "Set this to TRUE to disable notifications when connecting to a network."
-msgstr ""
-"ãããããããæçããæçãããã TRUE ãããããããéçãçåããããã"
-
-#: ../nm-applet.schemas.in.h:5
 msgid ""
 "Set this to TRUE to disable notifications when disconnecting from a network."
 msgstr ""
 "ããããããããåæããæçãããã TRUE ãããããããéçãçåããããã"
 
+#: ../nm-applet.schemas.in.h:5
+msgid "Suppress networks available notifications"
+msgstr "ããããããäçåèéçãæåãã"
+
 #: ../nm-applet.schemas.in.h:6
 msgid ""
 "Set this to TRUE to disable notifications when wireless networks are "
@@ -64,49 +65,49 @@ msgstr ""
 "ãã"
 
 #: ../nm-applet.schemas.in.h:7
-msgid ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
-msgstr ""
-"ããããããäçããæãããã TRUE ãããããããããããããããããããä"
-"æãçåããããã"
-
-#: ../nm-applet.schemas.in.h:8
 msgid "Stamp"
 msgstr "ãããã"
 
+#: ../nm-applet.schemas.in.h:8
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "ãããããããæèããããããçèããããããããååãäçããããã"
+
 #: ../nm-applet.schemas.in.h:9
-msgid "Suppress networks available notifications"
-msgstr "ããããããäçåèéçãæåãã"
+msgid "Disable WiFi Create"
+msgstr "WiFi ãäæãçåããã"
 
 #: ../nm-applet.schemas.in.h:10
-msgid "Used to determine whether settings should be migrated to a new version."
-msgstr "ãããããããæèããããããçèããããããããååãäçããããã"
+msgid ""
+"Set to TRUE to disable creation of adhoc networks when using the applet."
+msgstr ""
+"ããããããäçããæãããã TRUE ãããããããããããããããããããä"
+"æãçåããããã"
 
 #: ../nm-connection-editor.desktop.in.h:1
-msgid "Manage and change your network connection settings"
-msgstr "ããããããæçãããããããççãåæ"
-
-#: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Network Connections"
 msgstr "ããããããæç"
 
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "ããããããæçãããããããççãåæ"
+
 #: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:443 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:875 ../src/applet-device-wimax.c:279
+#: ../src/applet-device-gsm.c:446 ../src/applet-device-wired.c:240
+#: ../src/applet-device-wifi.c:864 ../src/applet-device-wimax.c:279
 msgid "Available"
 msgstr "åçåè"
 
 #: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:485 ../src/applet-device-wired.c:269
+#: ../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/applet-device-bt.c:204 ../src/applet-device-cdma.c:445
-#: ../src/applet-device-gsm.c:489 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1280 ../src/applet-device-wimax.c:427
+#: ../src/applet-device-gsm.c:492 ../src/applet-device-wired.c:273
+#: ../src/applet-device-wifi.c:1268 ../src/applet-device-wimax.c:427
 msgid "Connection Established"
 msgstr "æçãççãããã"
 
@@ -115,32 +116,32 @@ msgid "You are now connected to the mobile broadband network."
 msgstr "çåãããããããããããããããããããæçãããããã"
 
 #: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:525 ../src/applet-device-wimax.c:464
+#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:464
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "ãããããããããããæç '%s' ãæåäãã..."
 
 #: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:467
+#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:467
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "ãããããããããããæç '%s' ãèåäãã..."
 
 #: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:470
+#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:470
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "ãããããããããããæç '%s' ããããããèèãåèãã..."
 
 #: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:490
-#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2479
+#: ../src/applet-device-gsm.c:537 ../src/applet-device-wimax.c:473
+#: ../src/applet.c:2503
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "'%s' ããããããããããããèæããããã..."
 
 #: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:552
+#: ../src/applet-device-gsm.c:555
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "ãããããããããããæç '%s' ããããããããã"
@@ -150,16 +151,16 @@ msgstr "ãããããããããããæç '%s' ããããããããã
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:389
-#: ../src/applet-dialogs.c:405
+#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:392
+#: ../src/applet-dialogs.c:424
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "ããããããããããã (%s)"
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:391
+#: ../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:6
-#: ../src/connection-editor/nm-connection-list.c:1474
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-list.c:1510
 msgid "Mobile Broadband"
 msgstr "ããããããããããã"
 
@@ -172,80 +173,79 @@ msgstr "æèãããããããããããã (CDMA) æç..."
 msgid "You are now connected to the CDMA network."
 msgstr "çå CDMA ãããããããæçãããããã"
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:547
+#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:550
 #: ../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:506 ../src/applet-device-gsm.c:550
+#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:553
 #: ../src/applet-device-wimax.c:485
 msgid "roaming"
 msgstr "ããããã"
 
 #: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
-#, fuzzy
-#| msgid "More networks"
 msgid "CDMA network."
-msgstr "ããäããããããã"
+msgstr "CDMA ãããããã"
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1098
-#, fuzzy
-#| msgid "You are now connected to the wired network."
+#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1198
 msgid "You are now registered on the home network."
-msgstr "æçãããããããæçããããã"
+msgstr "ããããããããããæçããããã"
 
-#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1104
-#, fuzzy
-#| msgid "You are now connected to the wired network."
+#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1204
 msgid "You are now registered on a roaming network."
-msgstr "æçãããããããæçããããã"
+msgstr "ããããããããããããæçããããã"
 
-#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:699
+#: ../src/applet-device-gsm.c:213 ../src/connection-editor/page-mobile.c:699
 #: ../src/mb-menu-item.c:59
 msgid "GSM"
 msgstr "GSM"
 
 #. Default connection item
-#: ../src/applet-device-gsm.c:456
+#: ../src/applet-device-gsm.c:459
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "æèãããããããããããã (GSM) æç..."
 
-#: ../src/applet-device-gsm.c:490
+#: ../src/applet-device-gsm.c:493
 msgid "You are now connected to the GSM network."
 msgstr "çå GSM ãããããããæçãããããã"
 
-#: ../src/applet-device-gsm.c:651
+#: ../src/applet-device-gsm.c:654
 msgid "PIN code required"
 msgstr "PIN ããããåèãã"
 
-#: ../src/applet-device-gsm.c:659
+#: ../src/applet-device-gsm.c:662
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "ããããããããããããããããã PIN ããããåèãã"
 
-#: ../src/applet-device-gsm.c:784
+#: ../src/applet-device-gsm.c:783
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "'%2$s' äã SIM ããã '%1$s' ã PIN ããã"
+
+#: ../src/applet-device-gsm.c:875
 msgid "Wrong PIN code; please contact your provider."
 msgstr "PIN ãéããã; ãããããããéçããããããã"
 
-#: ../src/applet-device-gsm.c:807
+#: ../src/applet-device-gsm.c:898
 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:834
+#: ../src/applet-device-gsm.c:925
 msgid "Sending unlock code..."
 msgstr "ééããããéää..."
 
-#: ../src/applet-device-gsm.c:897
+#: ../src/applet-device-gsm.c:988
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN ãééãåèãã"
 
-#: ../src/applet-device-gsm.c:898
+#: ../src/applet-device-gsm.c:989
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN ãééãåèãã"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:900
+#: ../src/applet-device-gsm.c:991
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -255,25 +255,25 @@ msgstr ""
 "ãã"
 
 #. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:902
+#: ../src/applet-device-gsm.c:993
 msgid "PIN code:"
 msgstr "PIN ããã:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:906
+#: ../src/applet-device-gsm.c:997
 msgid "Show PIN code"
 msgstr "PIN ããããèç"
 
-#: ../src/applet-device-gsm.c:909
+#: ../src/applet-device-gsm.c:1000
 msgid "SIM PUK unlock required"
-msgstr "SIM PUK ãééãåèãã"
+msgstr "SIM PUK ãããããããåèãã"
 
-#: ../src/applet-device-gsm.c:910
+#: ../src/applet-device-gsm.c:1001
 msgid "SIM PUK Unlock Required"
-msgstr "SIM PUK ãééãåèãã"
+msgstr "SIM PUK ãããããããåèãã"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:912
+#: ../src/applet-device-gsm.c:1003
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -282,30 +282,28 @@ msgstr ""
 "ããããããããããããããã '%s' ãäçãããã SIM PUK ããããåèããã"
 
 #. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:914
+#: ../src/applet-device-gsm.c:1005
 msgid "PUK code:"
 msgstr "PUK ããã:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:917
+#: ../src/applet-device-gsm.c:1008
 msgid "New PIN code:"
 msgstr "æèã PIN ããã:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:919
+#: ../src/applet-device-gsm.c:1010
 msgid "Re-enter new PIN code:"
 msgstr "æèã PIN ããããååå:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:924
+#: ../src/applet-device-gsm.c:1015
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK ããããèç"
 
-#: ../src/applet-device-gsm.c:1097 ../src/applet-device-gsm.c:1103
-#, fuzzy
-#| msgid "More networks"
+#: ../src/applet-device-gsm.c:1197 ../src/applet-device-gsm.c:1203
 msgid "GSM network."
-msgstr "ããäããããããã"
+msgstr "GSM ãããããã"
 
 #: ../src/applet-device-wired.c:62
 msgid "Auto Ethernet"
@@ -330,7 +328,7 @@ msgid "Wired Network"
 msgstr "æçãããããã"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1485
+#: ../src/applet-device-wired.c:232 ../src/applet.c:1509
 msgid "disconnected"
 msgstr "åæãããããã"
 
@@ -379,84 +377,106 @@ msgstr "æããççãããããããäæ(_N)..."
 msgid "(none)"
 msgstr "(ãã)"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:792
 #, c-format
 msgid "Wireless Networks (%s)"
 msgstr "ççãããããã (%s)"
 
-#: ../src/applet-device-wifi.c:805
+#: ../src/applet-device-wifi.c:794
 #, c-format
 msgid "Wireless Network (%s)"
 msgstr "ççãããããã (%s)"
 
-#: ../src/applet-device-wifi.c:807
+#: ../src/applet-device-wifi.c:796
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "ççãããããã"
 
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:829
 msgid "wireless is disabled"
 msgstr "ççãçåããããããã"
 
-#: ../src/applet-device-wifi.c:841
+#: ../src/applet-device-wifi.c:830
 msgid "wireless is disabled by hardware switch"
 msgstr "ççãããããããããããããçåããããããã"
 
-#: ../src/applet-device-wifi.c:902
+#: ../src/applet-device-wifi.c:891
 msgid "More networks"
 msgstr "ããäããããããã"
 
-#: ../src/applet-device-wifi.c:1081
+#: ../src/applet-device-wifi.c:1071
 msgid "Wireless Networks Available"
 msgstr "ççãããããããåçåèãã"
 
-#: ../src/applet-device-wifi.c:1083
-msgid "Click on this icon to connect to a wireless network"
-msgstr "ççãããããããæçããããããããããããããããããã"
-
-#: ../src/applet-device-wifi.c:1084
+#: ../src/applet-device-wifi.c:1072
 msgid "Use the network menu to connect to a wireless network"
 msgstr "ççãããããããæçãããããããããããããããäçãããã"
 
-#: ../src/applet-device-wifi.c:1087 ../src/applet.c:901
+#: ../src/applet-device-wifi.c:1075 ../src/applet.c:925
 msgid "Don't show this message again"
 msgstr "äåãããããããããèçããã"
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1267
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "ççãããããã '%s' ãæçããããã"
 
-#: ../src/applet-device-wifi.c:1310
+#: ../src/applet-device-wifi.c:1298
 #, c-format
 msgid "Preparing wireless network connection '%s'..."
 msgstr "ççããããããæç '%s' ãæåä..."
 
-#: ../src/applet-device-wifi.c:1313
+#: ../src/applet-device-wifi.c:1301
 #, c-format
 msgid "Configuring wireless network connection '%s'..."
 msgstr "ççããããããæç '%s' ãèåä..."
 
-#: ../src/applet-device-wifi.c:1316
+#: ../src/applet-device-wifi.c:1304
 #, c-format
 msgid "User authentication required for wireless network '%s'..."
 msgstr "ççãããããã '%s' ããããããèèãåèãã..."
 
-#: ../src/applet-device-wifi.c:1319
+#: ../src/applet-device-wifi.c:1307
 #, c-format
 msgid "Requesting a wireless network address for '%s'..."
 msgstr "'%s' çãççãããããããããããèæããããã..."
 
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet-device-wifi.c:1328
 #, c-format
 msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgstr "ççããããããæç '%s' ããããããã: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1333
 #, c-format
 msgid "Wireless network connection '%s' active"
 msgstr "ççããããããæç '%s' ããããããã"
 
+#: ../src/applet-device-wifi.c:1381
+#, fuzzy
+#| msgid "Failed to create PAN connection: %s"
+msgid "Failed to activate connection"
+msgstr "PAN æçãäæãåæãããã: %s"
+
+#: ../src/applet-device-wifi.c:1383 ../src/applet-device-wifi.c:1402
+#: ../src/applet.c:491 ../src/applet.c:535 ../src/applet.c:561
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "äæ"
+
+#: ../src/applet-device-wifi.c:1386 ../src/applet-device-wifi.c:1405
+#: ../src/applet.c:494 ../src/applet.c:564
+#, fuzzy
+#| msgid "Connection add failed"
+msgid "Connection failure"
+msgstr "æçãèåãåæãããã"
+
+#: ../src/applet-device-wifi.c:1400
+#, fuzzy
+#| msgid "Could not edit new connection"
+msgid "Failed to add new connection"
+msgstr "æèæçãçéãããããããã"
+
 #: ../src/applet-device-wimax.c:231
 #, c-format
 msgid "WiMAX Mobile Broadband (%s)"
@@ -478,181 +498,211 @@ msgstr "WiMAX ãããããããããããããçåããããããã
 msgid "You are now connected to the WiMAX network."
 msgstr "çå WiMAX ãããããããæçãããããã"
 
-#: ../src/applet-dialogs.c:56
+#: ../src/applet-dialogs.c:57
 msgid "Error displaying connection information:"
 msgstr "æçæåãèçäãããããèãããã:"
 
-#: ../src/applet-dialogs.c:108
-#: ../src/connection-editor/page-wireless-security.c:285
-#: ../src/libnm-gtk/nm-wireless-dialog.c:949
-#: ../src/wireless-security/wireless-security.c:396
+#: ../src/applet-dialogs.c:109
+#: ../src/connection-editor/page-wireless-security.c:313
+#: ../src/libnm-gtk/nm-wireless-dialog.c:948
+#: ../src/wireless-security/wireless-security.c:406
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:110
+#: ../src/applet-dialogs.c:111
 msgid "Dynamic WEP"
 msgstr "åç WEP"
 
-#: ../src/applet-dialogs.c:112 ../src/applet-dialogs.c:221
-#: ../src/applet-dialogs.c:223
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
+#: ../src/applet-dialogs.c:247
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:219
+#: ../src/applet-dialogs.c:243
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:227 ../src/applet-dialogs.c:236
-#: ../src/connection-editor/page-wireless-security.c:239
-#: ../src/libnm-gtk/nm-wireless-dialog.c:906
+#: ../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
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ãã"
 
-#: ../src/applet-dialogs.c:327 ../src/applet-dialogs.c:465
+#: ../src/applet-dialogs.c:277
+#, fuzzy, c-format
+#| msgid "1 (Default)"
+msgid "%s (default)"
+msgstr "1 (ããããã)"
+
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:467
+#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:342
+#: ../src/applet-dialogs.c:361
 #, c-format
 msgid "%d dB"
 msgstr "%d dB"
 
-#: ../src/applet-dialogs.c:344
+#: ../src/applet-dialogs.c:363
 msgctxt "WiMAX CINR"
 msgid "unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:356
+#: ../src/applet-dialogs.c:375
 msgctxt "WiMAX Base Station ID"
 msgid "unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:391
+#: ../src/applet-dialogs.c:410
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:394
+#: ../src/applet-dialogs.c:413
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:401
+#: ../src/applet-dialogs.c:420
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:403
+#: ../src/applet-dialogs.c:422
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:407
+#: ../src/applet-dialogs.c:426
 #, c-format
 msgid "WiMAX (%s)"
 msgstr "WiMAX (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
 msgid "General"
 msgstr "åè"
 
-#: ../src/applet-dialogs.c:417
+#: ../src/applet-dialogs.c:436
 msgid "Interface:"
 msgstr "ãããããããã:"
 
-#: ../src/applet-dialogs.c:433
+#: ../src/applet-dialogs.c:452
 msgid "Hardware Address:"
 msgstr "ãããããããããã:"
 
 #. Driver
-#: ../src/applet-dialogs.c:441
+#: ../src/applet-dialogs.c:460
 msgid "Driver:"
 msgstr "ããããã:"
 
-#: ../src/applet-dialogs.c:470
+#: ../src/applet-dialogs.c:489
 msgid "Speed:"
 msgstr "éå:"
 
-#: ../src/applet-dialogs.c:480
+#: ../src/applet-dialogs.c:499
 msgid "Security:"
 msgstr "ãããããã:"
 
-#: ../src/applet-dialogs.c:493
+#: ../src/applet-dialogs.c:512
 msgid "CINR:"
 msgstr "CINR:"
 
-#: ../src/applet-dialogs.c:506
+#: ../src/applet-dialogs.c:525
 msgid "BSID:"
 msgstr "BSID:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:523
+#: ../src/applet-dialogs.c:542
 msgid "IPv4"
 msgstr "IPv4"
 
 #. Address
-#: ../src/applet-dialogs.c:534 ../src/applet-dialogs.c:641
+#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
 msgid "IP Address:"
 msgstr "IP ãããã:"
 
-#: ../src/applet-dialogs.c:536 ../src/applet-dialogs.c:552
+#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
 msgctxt "Address"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:550
+#: ../src/applet-dialogs.c:569
 msgid "Broadcast Address:"
 msgstr "ãããããããããããã:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:559
+#: ../src/applet-dialogs.c:578
 msgid "Subnet Mask:"
 msgstr "ãããããããã:"
 
-#: ../src/applet-dialogs.c:561
+#: ../src/applet-dialogs.c:580
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../src/applet-dialogs.c:569 ../src/applet-dialogs.c:656
+#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
 msgid "Default Route:"
 msgstr "ãããããããã:"
 
-#: ../src/applet-dialogs.c:581
+#: ../src/applet-dialogs.c:600
 msgid "Primary DNS:"
 msgstr "çä DNS:"
 
-#: ../src/applet-dialogs.c:590
+#: ../src/applet-dialogs.c:609
 msgid "Secondary DNS:"
 msgstr "çä DNS:"
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:619
 msgid "Ternary DNS:"
 msgstr "çä DNS:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:615
+#: ../src/applet-dialogs.c:634
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:624
+#: ../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:732
+#: ../src/applet-dialogs.c:886
 msgid "No valid active connections found!"
 msgstr "æåããããããæçãããããã!"
 
-#: ../src/applet-dialogs.c:785
+#: ../src/applet-dialogs.c:939
 msgid ""
 "Copyright  2004-2011 Red Hat, Inc.\n"
 "Copyright  2005-2008 Novell, Inc.\n"
@@ -662,33 +712,57 @@ msgstr ""
 "Copyright  2005-2008 Novell, Inc.\n"
 "ããããããããããäãåããèçèãçèè"
 
-#: ../src/applet-dialogs.c:788
+#: ../src/applet-dialogs.c:942
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "ãããããããããããæçãççãããããéçéåãããããã"
 
-#: ../src/applet-dialogs.c:790
+#: ../src/applet-dialogs.c:944
 msgid "NetworkManager Website"
 msgstr "NetworkManager ãããããã"
 
-#: ../src/applet-dialogs.c:805
+#: ../src/applet-dialogs.c:959
 msgid "Missing resources"
 msgstr "äèãããããããã"
 
-#: ../src/applet-dialogs.c:830
+#: ../src/applet-dialogs.c:984
 msgid "Mobile broadband network password"
 msgstr "ããããããããããããããããããããããã"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:993
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' ããæçãããããããåèããã"
 
-#: ../src/applet-dialogs.c:858
+#: ../src/applet-dialogs.c:1012
 msgid "Password:"
 msgstr "ããããã:"
 
-#: ../src/applet.c:990
+#: ../src/applet.c:489
+#, fuzzy
+#| msgid "Failed to create PAN connection: %s"
+msgid "Failed to add/activate connection"
+msgstr "PAN æçãäæãåæãããã: %s"
+
+#: ../src/applet.c:533
+#, fuzzy
+#| msgid "disconnected"
+msgid "Device disconnect failed"
+msgstr "åæãããããã"
+
+#: ../src/applet.c:538
+#, fuzzy
+#| msgid "Disconnected"
+msgid "Disconnect failure"
+msgstr "åæããããã"
+
+#: ../src/applet.c:559
+#, fuzzy
+#| msgid "Connection add failed"
+msgid "Connection activation failed"
+msgstr "æçãèåãåæãããã"
+
+#: ../src/applet.c:1014
 #, c-format
 msgid ""
 "\n"
@@ -698,7 +772,7 @@ msgstr ""
 "\n"
 "ããããããæçãåãèããããçãVPN æç '%s' ãåæããããã"
 
-#: ../src/applet.c:993
+#: ../src/applet.c:1017
 #, c-format
 msgid ""
 "\n"
@@ -707,7 +781,7 @@ msgstr ""
 "\n"
 "VPN ãããããäæãåæããçãVPN æç '%s' ãåæããããã"
 
-#: ../src/applet.c:996
+#: ../src/applet.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -717,7 +791,7 @@ msgstr ""
 "\n"
 "VPN ãããããçåãèåãèãããããVPN æç '%s'ãåæããããã"
 
-#: ../src/applet.c:999
+#: ../src/applet.c:1023
 #, c-format
 msgid ""
 "\n"
@@ -726,7 +800,7 @@ msgstr ""
 "\n"
 "æçèèããããããããããããVPN æç '%s' ãåæããããã"
 
-#: ../src/applet.c:1002
+#: ../src/applet.c:1026
 #, c-format
 msgid ""
 "\n"
@@ -735,7 +809,7 @@ msgstr ""
 "\n"
 "VPN ãããããæéåãéåããããããããVPN æç '%s' ãåæããããã"
 
-#: ../src/applet.c:1005
+#: ../src/applet.c:1029
 #, c-format
 msgid ""
 "\n"
@@ -744,7 +818,7 @@ msgstr ""
 "\n"
 "VPN ãããããéåãåæãããããVPN æç '%s' ãåæããããã"
 
-#: ../src/applet.c:1008
+#: ../src/applet.c:1032
 #, c-format
 msgid ""
 "\n"
@@ -753,7 +827,7 @@ msgstr ""
 "\n"
 "æåã VPN secret ããããããVPN æç '%s' ãåæããããã"
 
-#: ../src/applet.c:1011
+#: ../src/applet.c:1035
 #, c-format
 msgid ""
 "\n"
@@ -762,7 +836,7 @@ msgstr ""
 "\n"
 "VPN secret ãçåããããVPN æç '%s' ãåæããããã"
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:1042
 #, c-format
 msgid ""
 "\n"
@@ -771,7 +845,7 @@ msgstr ""
 "\n"
 "VPN æç '%s' ãåæããããã"
 
-#: ../src/applet.c:1036
+#: ../src/applet.c:1060
 #, c-format
 msgid ""
 "\n"
@@ -781,7 +855,7 @@ msgstr ""
 "\n"
 "ããããããæçãåãèãããããããVPN æç '%s' ãåæãããããã"
 
-#: ../src/applet.c:1039
+#: ../src/applet.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -790,7 +864,7 @@ msgstr ""
 "\n"
 "VPN ãããããåæãããããVPN æç '%s' ãåæãããããã"
 
-#: ../src/applet.c:1045
+#: ../src/applet.c:1069
 #, c-format
 msgid ""
 "\n"
@@ -799,15 +873,15 @@ msgstr ""
 "\n"
 "VPN æç '%s' ãåæãããããã"
 
-#: ../src/applet.c:1079
+#: ../src/applet.c:1103
 msgid "VPN Login Message"
 msgstr "VPN ããããããããã"
 
-#: ../src/applet.c:1085 ../src/applet.c:1093 ../src/applet.c:1143
+#: ../src/applet.c:1109 ../src/applet.c:1117 ../src/applet.c:1167
 msgid "VPN Connection Failed"
 msgstr "VPN æçãåæãããã"
 
-#: ../src/applet.c:1150
+#: ../src/applet.c:1174
 #, c-format
 msgid ""
 "\n"
@@ -819,7 +893,7 @@ msgstr ""
 "VPN ãããããéåãåæãããããVPN æç '%s' ãåæãããããn\n"
 "%s"
 
-#: ../src/applet.c:1153
+#: ../src/applet.c:1177
 #, c-format
 msgid ""
 "\n"
@@ -828,178 +902,182 @@ msgid ""
 "%s"
 msgstr ""
 "\n"
-"VPN æç '%s' ãããéåãåæããããã\n"
+"VPN æç '%s' ãéåãåæããããã\n"
 "\n"
 "%s"
 
-#: ../src/applet.c:1473
+#: ../src/applet.c:1497
 msgid "device not ready (firmware missing)"
-msgstr "ãããããæåãããããããã (ãããããããçã)"
+msgstr "ãããããæåãããããããã (ãããããããææå)"
 
-#: ../src/applet.c:1475
+#: ../src/applet.c:1499
 msgid "device not ready"
 msgstr "ãããããæåãããããããã"
 
-#: ../src/applet.c:1501
+#: ../src/applet.c:1525
 msgid "Disconnect"
 msgstr "åæãã"
 
-#: ../src/applet.c:1515
+#: ../src/applet.c:1539
 msgid "device not managed"
 msgstr "ãããããççããããããã"
 
-#: ../src/applet.c:1559
+#: ../src/applet.c:1583
 msgid "No network devices available"
 msgstr "ãããããããããããããããã"
 
-#: ../src/applet.c:1647
+#: ../src/applet.c:1671
 msgid "_VPN Connections"
 msgstr "VPN æç(_V)"
 
-#: ../src/applet.c:1704
+#: ../src/applet.c:1728
 msgid "_Configure VPN..."
 msgstr "VPN ãèå(_C)..."
 
-#: ../src/applet.c:1708
+#: ../src/applet.c:1732
 msgid "_Disconnect VPN"
 msgstr "VPN ãåæãã(_D)"
 
-#: ../src/applet.c:1806
+#: ../src/applet.c:1830
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager ãåèããããããã..."
 
-#: ../src/applet.c:1811 ../src/applet.c:2604
+#: ../src/applet.c:1835 ../src/applet.c:2634
 msgid "Networking disabled"
 msgstr "ãããããããçåããããããã"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2032
+#: ../src/applet.c:2056
 msgid "Enable _Networking"
 msgstr "ãããããããæåããã(_N)"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2041
+#: ../src/applet.c:2065
 msgid "Enable _Wireless"
 msgstr "ççãæåããã(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2050
+#: ../src/applet.c:2074
 msgid "Enable _Mobile Broadband"
 msgstr "ããããããããããããæåããã(_M)"
 
 #. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2059
+#: ../src/applet.c:2083
 msgid "Enable WiMA_X Mobile Broadband"
 msgstr "WiMAX ããããããããããããæåããã(_X)"
 
 #. Toggle notifications item
-#: ../src/applet.c:2070
+#: ../src/applet.c:2094
 msgid "Enable N_otifications"
 msgstr "éçãæåããã(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2081
+#: ../src/applet.c:2105
 msgid "Connection _Information"
 msgstr "æçæå(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2091
+#: ../src/applet.c:2115
 msgid "Edit Connections..."
 msgstr "æçãçéãã..."
 
 #. Help item
-#: ../src/applet.c:2105
+#: ../src/applet.c:2129
 msgid "_Help"
 msgstr "ããã(_H)"
 
 #. About item
-#: ../src/applet.c:2114
+#: ../src/applet.c:2138
 msgid "_About"
 msgstr "æå(_A)"
 
-#: ../src/applet.c:2291
+#: ../src/applet.c:2315
 msgid "Disconnected"
 msgstr "åæããããã"
 
-#: ../src/applet.c:2292
+#: ../src/applet.c:2316
 msgid "The network connection has been disconnected."
 msgstr "ããããããæçãåæãããããã"
 
-#: ../src/applet.c:2473
+#: ../src/applet.c:2497
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "ããããããæç '%s' ãæåä..."
 
-#: ../src/applet.c:2476
+#: ../src/applet.c:2500
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "ããããããæç '%s' ãããããèèãåèãã..."
 
-#: ../src/applet.c:2482
+#: ../src/applet.c:2506
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "ããããããæç '%s' ããããããããã"
 
-#: ../src/applet.c:2560
+#: ../src/applet.c:2589
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "VPN æç '%s' ãéåããããã..."
 
-#: ../src/applet.c:2563
+#: ../src/applet.c:2592
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN æç '%s' ãããããèèãåèãã..."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2595
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "'%s' ã VPN ãããããèæããããã..."
 
-#: ../src/applet.c:2569
+#: ../src/applet.c:2598
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN æç '%s' ãããããããã"
 
-#: ../src/applet.c:2608
+#: ../src/applet.c:2639
 msgid "No network connection"
 msgstr "ããããããæçãããããã"
 
-#: ../src/applet.c:3258
+#: ../src/applet.c:3394
 msgid "NetworkManager Applet"
 msgstr "NetworkManager ããããã"
 
 #: ../src/gsm-unlock.ui.h:1
+msgid "Automatically unlock this device"
+msgstr "èåçããããããããããããããã"
+
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
-msgstr "éé(_U)"
+msgstr "ããããã(_U)"
 
 #: ../src/info.ui.h:1
-msgid "Active Network Connections"
-msgstr "æåãããããããæç"
-
-#: ../src/info.ui.h:2
 msgid "Connection Information"
 msgstr "æçæå"
 
+#: ../src/info.ui.h:2
+msgid "Active Network Connections"
+msgstr "æåãããããããæç"
+
 #: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
 msgid "Wired 802.1X authentication"
 msgstr "æç 802.1X ãèè"
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "ããããããå(_N):"
 
-#: ../src/connection-editor/ce-page.c:67
+#: ../src/connection-editor/ce-page.c:72
 msgid "automatic"
 msgstr "èå"
 
-#: ../src/connection-editor/ce-page.c:305
+#: ../src/connection-editor/ce-page.c:318
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "äæãããããããæç secret ãææããããããããã"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
+#: ../src/connection-editor/ce-page-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
@@ -1009,389 +1087,389 @@ msgstr ""
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:2
 #: ../src/connection-editor/ce-ip6-routes.ui.h:2
-msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
-msgstr ""
-"æåããããããååãããæçãæããããããããããããããæçããã äç"
-"ãããããã"
+msgid "Ig_nore automatically obtained routes"
+msgstr "èåååããããããçèãã(_N)"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
 #: ../src/connection-editor/ce-ip6-routes.ui.h:3
-msgid "Ig_nore automatically obtained routes"
-msgstr "èåååããããããçèãã(_N)"
+msgid "_Use this connection only for resources on its network"
+msgstr "ããããããããäãããããããããããããæçãäç(_U)"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:4
 #: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid "Use this c_onnection only for resources on its network"
-msgstr "ããããããããäãããããããããããããæçãäç(_O)"
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr ""
+"æåããããããååãããæçãæããããããããããããããæçããã äç"
+"ãããããã"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:1
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 #: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-simple.ui.h:1
 #: ../src/wireless-security/ws-leap.ui.h:1
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "Sho_w password"
-msgstr "ããããããèç(_W)"
+msgid "_Username:"
+msgstr "ããããå(_U):"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Password:"
-msgstr "ããããã(_P):"
-
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
 msgid "_Service:"
 msgstr "ãããã(_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 #: ../src/wireless-security/ws-leap.ui.h:3
-msgid "_Username:"
-msgstr "ããããå(_U):"
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+msgid "Sho_w password"
+msgstr "ããããããèç(_W)"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/wireless-security/eap-method-leap.ui.h:2
+#: ../src/wireless-security/eap-method-simple.ui.h:2
+#: ../src/wireless-security/ws-leap.ui.h:2
+#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+msgid "_Password:"
+msgstr "ããããã(_P):"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-msgid "Addresses"
-msgstr "ãããã"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../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:3
+#: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "èå"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
 msgstr "èå (DNS èåãæå)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-msgid "D_HCP client ID:"
-msgstr "DHCP ãããããã ID(_H):"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
-msgid ""
-"Domains used when resolving host names. Use commas to separate multiple "
-"domains."
-msgstr ""
-"ãããåãèæããæãäçãããããããèæããããããåéããæããããã "
-"äãããã"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-msgid ""
-"IP addresses of domain name servers used to resolve host names. Use commas "
-"to separate multiple domain name server addresses."
-msgstr ""
-"ãããããããããããã IP ããããããããåãèæãããããäçããããã "
-"ããããäçããèæãããããããããããããããããåéãããã"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
-msgid "Link-Local"
-msgstr "ããããããã"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: ../src/connection-editor/ce-page-ip4.ui.h:3
+#: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:169
 #: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "æå"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-msgid "Require IPv4 addressing for this connection to complete"
-msgstr "ããæçãåäãããã IPv4 ããããåãåèããããã"
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+msgid "Link-Local"
+msgstr "ããããããã"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip4.ui.h:5
+#: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:187
 #: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "äãããããããããåæ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+msgid "_Method:"
+msgstr "æå(_M):"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Addresses"
+msgstr "ãããã"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:9
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
 "enter it here."
 msgstr ""
 "DHCP ããããããèååãäçããããããããççèãããããããããèåã "
-"ãããããããããããDHCP ããããããèååãäçãããååããããã ãã"
-"ãååãããã"
+"ãããããããããããDHCP ããããããèååãäçãããååãããããååã"
+"ããã"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid ""
-"When connecting to IPv6-capable networks, allows the connection to complete "
-"if IPv4 configuration fails but IPv6 configuration succeeds."
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
 msgstr ""
-"IPv4 èåãåæãããIPv6 èåãæåããååãIPv6 ååããããããããæçã"
-"ãæãã æçãåäããããåãããã"
+"ãããåãèæããæãäçãããããããèæããããããåéããæããããã "
+"äãããã"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+msgid "D_HCP client ID:"
+msgstr "DHCP ãããããã ID(_H):"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "S_earch domains:"
+msgstr "ãããããæç(_E):"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "_DNS servers:"
 msgstr "DNS ãããã(_D):"
 
+#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
+msgid ""
+"IP addresses of domain name servers used to resolve host names. Use commas "
+"to separate multiple domain name server addresses."
+msgstr ""
+"ãããããããããããã IP ããããããããåãèæãããããäçããããã "
+"ããããäçããèæãããããããããããããããããåéãããã"
+
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-msgid "_Method:"
-msgstr "æå(_M):"
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr "ããæçãåäãããã IPv4 ããããåãåèããããã(_4)"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:16
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
-msgid "_Routesâ"
-msgstr "ããã(_R)â"
+msgid ""
+"When connecting to IPv6-capable networks, allows the connection to complete "
+"if IPv4 configuration fails but IPv6 configuration succeeds."
+msgstr ""
+"IPv4 èåãåæãããIPv6 èåãæåããååãIPv6 ååããããããããæçã"
+"ãæãæçãåäããããåãããã"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
 #: ../src/connection-editor/ce-page-ip6.ui.h:15
-msgid "_Search domains:"
-msgstr "ãããããæç(_S):"
+msgid "_Routesâ"
+msgstr "ããã(_R)â"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "Require IPv6 addressing for this connection to complete"
-msgstr "ããæçãåäãããã IPv6 ããããåãåèããããã"
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
+msgid "Require IPv_6 addressing for this connection to complete"
+msgstr "ããæçãåäãããã IPv6 ããããåãåèããããã(_6)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
 "IPv6 èåãåæãããIPv4 èåãæåããååãIPv4 ååããããããããæçã"
-"ãæã ããæçãåäããããåãããã"
+"ãæãæçãåäããããåãããã"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
+msgid "Any"
+msgstr "äãã"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "3G (UMTS/HSPA)"
 msgstr "3G (UMTS/HSPA)"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "Advanced"
-msgstr "éå"
+msgid "2G (GPRS/EDGE)"
+msgstr "2G (GPRS/EDGE)"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Allow roaming if home network is not available"
-msgstr "ããããããããããåçããããååãããããããèå"
+msgid "Prefer 3G (UMTS/HSPA)"
+msgstr "3G åå (UMTS/HSPA)"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Any"
-msgstr "äãã"
+msgid "Prefer 2G (GPRS/EDGE)"
+msgstr "2G åå (GPRS/EDGE)"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "Basic"
 msgstr "åæ"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Change..."
-msgstr "åæ..."
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
-msgid "N_etwork ID:"
-msgstr "ãããããã ID(_E):"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "Nu_mber:"
 msgstr "çå(_M):"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:10
-msgid "PI_N:"
-msgstr "PIN çå(_N):"
+msgid "Advanced"
+msgstr "éå"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:11
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "2G åå (GPRS/EDGE)"
+msgid "_APN:"
+msgstr "APN(_A):"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:12
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "3G åå (UMTS/HSPA)"
+msgid "N_etwork ID:"
+msgstr "ãããããã ID(_E):"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:13
-msgid "Sho_w passwords"
-msgstr "ããããããèç(_W)"
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "ããã(_T):"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:14
-msgid "_APN:"
-msgstr "APN(_A):"
+msgid "Change..."
+msgstr "åæ..."
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:15
+msgid "P_IN:"
+msgstr "PIN çå(_I):"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:16
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
-msgid "_Type:"
-msgstr "ããã(_T):"
+msgid "Allow _roaming if home network is not available"
+msgstr "ããããããããããåçããããååãããããããèå(_R)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:17
+msgid "Sho_w passwords"
+msgstr "ããããããèç(_W)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:1
-msgid "Allow _BSD data compression"
-msgstr "BSD ãããåçãèåãã(_B)"
+msgid "Authentication"
+msgstr "èè"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allow _Deflate data compression"
-msgstr "Deflate ãããåçãèåãã(_D)"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
 msgid "Allowed methods:"
 msgstr "åçåèãèèææ:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
-msgid "Authentication"
-msgstr "èè"
+# "auth_methods_button"ããããããã
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Configure _Methodsâ"
+msgstr "èèææãèåãã(_M)â"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
 msgid "Compression"
 msgstr "åç"
 
-# "auth_methods_button"ããããããã
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr "MPPE (ããããããããããæåå) ãäç(_U)"
+
 #: ../src/connection-editor/ce-page-ppp.ui.h:6
-msgid "Configure _Methodsâ"
-msgstr "èèææãèåãã(_M)â"
+msgid "_Require 128-bit encryption"
+msgstr "128-bit ãæååãèæ(_R)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:7
-msgid "Echo"
-msgstr "Echo"
+msgid "Use _stateful MPPE"
+msgstr "ãããããã MPPE ãäç(_S)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:8
-msgid "Send PPP _echo packets"
-msgstr "PPP Echo ããããããéä(_E)"
+msgid "Allow _BSD data compression"
+msgstr "BSD ãããåçãèåãã(_B)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:9
-msgid "Use TCP _header compression"
-msgstr "TCP ããããåçãäç(_H)"
+msgid "Allow _Deflate data compression"
+msgstr "Deflate ãããåçãèåãã(_D)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:10
-msgid "Use _stateful MPPE"
-msgstr "ãããããã MPPE ãäç(_S)"
+msgid "Use TCP _header compression"
+msgstr "TCP ããããåçãäç(_H)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:11
-msgid "_Require 128-bit encryption"
-msgstr "128-bit ãæååãèæ(_R)"
+msgid "Echo"
+msgstr "Echo"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:12
-msgid "_Use point-to-point encryption (MPPE)"
-msgstr "MPPE (ããããããããããæåå) ãäç(_U)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+msgid "Send PPP _echo packets"
+msgstr "PPP Echo ããããããéä(_E)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+msgid "Twisted Pair (TP)"
+msgstr "ãããããã (TP)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
+msgid "Attachment Unit Interface (AUI)"
+msgstr "Attachment Unit Interface (AUI)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
+msgid "BNC"
+msgstr "BNC"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Attachment Unit Interface (AUI)"
-msgstr "Attachment Unit Interface (AUI)"
+msgid "Media Independent Interface (MII)"
+msgstr "Media Independent Interface (MII)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "Aut_onegotiate"
-msgstr "ããããããããããã(_O)"
+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 "BNC"
-msgstr "BNC"
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "Full duple_x"
-msgstr "åäé(_X)"
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:10
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "MT_U:"
-msgstr "MTU(_U):"
+msgid "_Port:"
+msgstr "ããã(_P):"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "Media Independent Interface (MII)"
-msgstr "Media Independent Interface (MII)"
+msgid "_Speed:"
+msgstr "éå(_S):"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:12
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
-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"
+msgid "Full duple_x"
+msgstr "åäé(_X)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Twisted Pair (TP)"
-msgstr "ãããããã (TP)"
+msgid "Aut_onegotiate"
+msgstr "ããããããããããã(_O)"
 
 #: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid "_Cloned MAC address:"
-msgstr "ãããããã MAC ãããã(_C):"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../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
-msgid "_Port:"
-msgstr "ããã(_P):"
+#: ../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
-msgid "_Speed:"
-msgstr "éå(_S):"
+#: ../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:19
+#: ../src/connection-editor/ce-page-wireless.ui.h:6
 msgid "bytes"
 msgstr "ããã"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
+#: ../src/connection-editor/ce-page-wireless.ui.h:2
 msgid "A (5 GHz)"
 msgstr "a (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
-msgid "Ad-hoc"
-msgstr "ããããã"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
+#: ../src/connection-editor/ce-page-wireless.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "b/g (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
-msgid "Ban_d:"
-msgstr "ããã(_D):"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "C_hannel:"
-msgstr "ããããã(_H):"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
+#: ../src/connection-editor/ce-page-wireless.ui.h:4
 msgid "Infrastructure"
 msgstr "ãããããããããã"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid "M_ode:"
-msgstr "ããã(_O):"
+#: ../src/connection-editor/ce-page-wireless.ui.h:5
+msgid "Ad-hoc"
+msgstr "ããããã"
+
+#: ../src/connection-editor/ce-page-wireless.ui.h:11
+msgid "mW"
+msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
+#: ../src/connection-editor/ce-page-wireless.ui.h:12
+msgid "Transmission po_wer:"
+msgstr "éäããã(_W):"
+
+#: ../src/connection-editor/ce-page-wireless.ui.h:13
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
+#: ../src/connection-editor/ce-page-wireless.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"
@@ -1399,87 +1477,88 @@ msgstr ""
 "ãããããããããããååãããã BSSID ãæåãããããããã ãããããã"
 "ãã (AP) ãããæçãããããããã"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
-msgid "Transmission po_wer:"
-msgstr "éäããã(_W):"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wireless.ui.h:16
 msgid "_BSSID:"
 msgstr "BSSID(_B):"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:17
-msgid "_Rate:"
-msgstr "ããã(_R):"
+msgid "C_hannel:"
+msgstr "ããããã(_H):"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:18
-msgid "_SSID:"
-msgstr "SSID(_S):"
+msgid "Ban_d:"
+msgstr "ããã(_D):"
+
+#: ../src/connection-editor/ce-page-wireless.ui.h:19
+msgid "M_ode:"
+msgstr "ããã(_O):"
 
 #: ../src/connection-editor/ce-page-wireless.ui.h:20
-msgid "mW"
-msgstr "mW"
+msgid "SS_ID:"
+msgstr "SSID(_I):"
 
 #: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "_Security:"
-msgstr "ãããããã(_S):"
+msgid "S_ecurity:"
+msgstr "ãããããã(_E):"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
 msgid "Allowed Authentication Methods"
 msgstr "èåãããèèææ"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "C_HAP"
-msgstr "CHAP(_H)"
+msgid "_EAP"
+msgstr "EAP(_E)"
 
-# http://technet.microsoft.com/ja-jp/library/cc757631(WS.10).aspx
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
-msgid "Challenge Handshake Authentication Protocol"
-msgstr "ããããããããããããèèããããã (CHAP)"
-
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "Extensible Authentication Protocol"
 msgstr "æåèèããããã (EAP)"
 
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_PAP"
+msgstr "PAP(_P)"
+
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
-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 ãããããããããèèææããããããã"
-"ãããã æçãåæããååããäéãèèææãçåãããããããããã"
+msgid "Password Authentication Protocol"
+msgstr "ãããããèèããããã (PAP)"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v2(_2)"
+msgid "C_HAP"
+msgstr "CHAP(_H)"
 
-# http://technet.microsoft.com/ja-jp/library/cc758984(WS.10).aspx
+# http://technet.microsoft.com/ja-jp/library/cc757631(WS.10).aspx
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "Microsoft ããããããããããããèèããããã (MS-CHAP)"
+msgid "Challenge Handshake Authentication Protocol"
+msgstr "ããããããããããããèèããããã (CHAP)"
 
-# http://technet.microsoft.com/ja-jp/library/cc739678(WS.10).aspx
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr ""
-"Microsoft ããããããããããããèèããããã ããããã2 (MS-CHAP v2)"
+msgid "_MSCHAP"
+msgstr "MSCHAP(_M)"
 
+# http://technet.microsoft.com/ja-jp/library/cc758984(WS.10).aspx
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
-msgid "Password Authentication Protocol"
-msgstr "ãããããèèããããã (PAP)"
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "Microsoft ããããããããããããèèããããã (MS-CHAP)"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
-msgid "_EAP"
-msgstr "EAP(_E)"
+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 "_MSCHAP"
-msgstr "MSCHAP(_M)"
+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 "_PAP"
-msgstr "PAP(_P)"
+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/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
@@ -1492,10 +1571,6 @@ msgid "Choose a VPN Connection Type"
 msgstr "VPN æçãçéãéãããããã"
 
 #: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-msgid "Createâ"
-msgstr "äæâ"
-
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
 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 "
@@ -1505,22 +1580,26 @@ msgstr ""
 "éãäèãçãååããæãã VPN ãããããããããããããããããããããã"
 "ããã"
 
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
+msgid "Createâ"
+msgstr "äæâ"
+
 #: ../src/connection-editor/ip4-routes-dialog.c:745
 #: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:901
-#: ../src/connection-editor/page-ip6.c:867
+#: ../src/connection-editor/page-ip4.c:900
+#: ../src/connection-editor/page-ip6.c:866
 msgid "Address"
 msgstr "ãããã"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:918
+#: ../src/connection-editor/page-ip4.c:917
 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:935
-#: ../src/connection-editor/page-ip6.c:901
+#: ../src/connection-editor/page-ip4.c:934
+#: ../src/connection-editor/page-ip6.c:900
 msgid "Gateway"
 msgstr "ãããããã"
 
@@ -1530,13 +1609,13 @@ msgid "Metric"
 msgstr "ããããã"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:884
+#: ../src/connection-editor/page-ip6.c:883
 msgid "Prefix"
-msgstr "æéè"
+msgstr "ããããããã"
 
 #: ../src/connection-editor/page-dsl.c:139
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1482
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: ../src/connection-editor/nm-connection-list.c:1518
 msgid "DSL"
 msgstr "DSL"
 
@@ -1601,13 +1680,13 @@ msgstr "çåããããããã"
 msgid "Editing IPv4 routes for %s"
 msgstr "%s çã IPv4 ããããçé"
 
-#: ../src/connection-editor/page-ip4.c:982
+#: ../src/connection-editor/page-ip4.c:981
 msgid "IPv4 Settings"
 msgstr "IPv4 ããããããã"
 
-#: ../src/connection-editor/page-ip4.c:984
+#: ../src/connection-editor/page-ip4.c:983
 msgid "Could not load IPv4 user interface."
-msgstr "IPv4 ããããããããããããããããããããããããã"
+msgstr "IPv4 ãããããããããããããèãèããããã"
 
 #: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
@@ -1620,25 +1699,24 @@ msgstr "çèãã"
 
 #: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
-msgstr "èåã DHCP ãã"
+msgstr "èåãDHCP ãã"
 
 #: ../src/connection-editor/page-ip6.c:798
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s çã IPv6 ããããçé"
 
-#: ../src/connection-editor/page-ip6.c:946
+#: ../src/connection-editor/page-ip6.c:945
 msgid "IPv6 Settings"
 msgstr "IPv6 ããããããã"
 
-#: ../src/connection-editor/page-ip6.c:948
+#: ../src/connection-editor/page-ip6.c:947
 msgid "Could not load IPv6 user interface."
-msgstr "IPv6 ããããããããããããããããããããããããã"
+msgstr "IPv6 ãããããããããããããèãèããããã"
 
 #: ../src/connection-editor/page-mobile.c:381
 msgid "Could not load mobile broadband user interface."
-msgstr ""
-"ããããããããããããããããããããããããããããããããããããã"
+msgstr "ãããããããããããããããããããããããããèãèããããã"
 
 #: ../src/connection-editor/page-mobile.c:398
 msgid "Unsupported mobile broadband connection type."
@@ -1683,6 +1761,7 @@ 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"
@@ -1701,139 +1780,139 @@ msgstr "ãã"
 #: ../src/connection-editor/page-ppp.c:201
 #, c-format
 msgid "Editing PPP authentication methods for %s"
-msgstr "%s çã PPP èèæãçé"
+msgstr "%s çã PPP èèææãçé"
 
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:282
 msgid "PPP Settings"
-msgstr "PPP ããããããã"
+msgstr "PPP ãèå"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:284
 msgid "Could not load PPP user interface."
-msgstr "PPP ããããããããããããããããããããããããã"
+msgstr "PPP ãããããããããããããèãèããããã"
 
 #: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1478
+#: ../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 ããããããããããããããããããããããããã"
+msgstr "VPN ãããããããããããããèãèããããã"
 
 #: ../src/connection-editor/page-vpn.c:126
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
-msgstr "'%s' çã VPN ãããããããããããèäããããããããã"
+msgstr "'%s' çã VPN ããããããããããèäããããããããã"
 
 #: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:884
+#: ../src/connection-editor/nm-connection-list.c:899
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN æç %d"
 
-#: ../src/connection-editor/page-wired.c:88
-#: ../src/connection-editor/page-wireless.c:93
+#: ../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"
+"ãããããããããããååãããã MAC ãããããæåãããããããããããã"
+"ãããããæçããããããããä: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wired.c:267
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-#: ../src/connection-editor/nm-connection-list.c:1466
+#: ../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:269
+#: ../src/connection-editor/page-wired.c:274
 msgid "Could not load wired user interface."
-msgstr "æçãããããããããããããããããããããããããã"
+msgstr "æçããããããããããããããèãèããããã"
 
-#: ../src/connection-editor/page-wired.c:444
+#: ../src/connection-editor/page-wired.c:449
 #, c-format
 msgid "Wired connection %d"
 msgstr "æçæç %d"
 
-#: ../src/connection-editor/page-wired-security.c:116
+#: ../src/connection-editor/page-wired-security.c:119
 msgid "802.1x Security"
 msgstr "802.1x ãããããã"
 
-#: ../src/connection-editor/page-wired-security.c:118
+#: ../src/connection-editor/page-wired-security.c:121
 msgid "Could not load Wired Security security user interface."
-msgstr "æçããããããããããããããããããããèãèãããããããã"
+msgstr "æçããããããããããããããããããããèãèããããã"
 
-#: ../src/connection-editor/page-wired-security.c:136
-msgid "Use 802.1X security for this connection"
-msgstr "ããæçã 802.1x ãããããããäçãã"
+#: ../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:166
-#: ../src/connection-editor/page-wireless.c:170
-#: ../src/connection-editor/page-wireless.c:191
+#: ../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:195
+#: ../src/connection-editor/page-wireless.c:200
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:452
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-#: ../src/connection-editor/nm-connection-list.c:1470
+#: ../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:454
+#: ../src/connection-editor/page-wireless.c:459
 msgid "Could not load WiFi user interface."
 msgstr "WiFi ããããããããããããããããåæããããããã"
 
-#: ../src/connection-editor/page-wireless.c:658
+#: ../src/connection-editor/page-wireless.c:663
 #, c-format
 msgid "Wireless connection %d"
 msgstr "ççæç %d"
 
-#: ../src/connection-editor/page-wireless-security.c:263
-#: ../src/libnm-gtk/nm-wireless-dialog.c:923
+#: ../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:272
-#: ../src/libnm-gtk/nm-wireless-dialog.c:932
+#: ../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:298
-#: ../src/libnm-gtk/nm-wireless-dialog.c:962
+#: ../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:312
-#: ../src/libnm-gtk/nm-wireless-dialog.c:976
+#: ../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:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:990
+#: ../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:360
+#: ../src/connection-editor/page-wireless-security.c:395
 msgid "Could not load WiFi security user interface; missing WiFi setting."
 msgstr ""
-"WiFi ããããããããããããããããããããããåæãããããããWiFi ãã"
-"ããããããããããã"
+"WiFi ãããããããããããããããããããèãèãããããWiFi èåãããã"
+"ããã"
 
-#: ../src/connection-editor/page-wireless-security.c:370
+#: ../src/connection-editor/page-wireless-security.c:405
 msgid "Wireless Security"
 msgstr "ççãããããã"
 
-#: ../src/connection-editor/page-wireless-security.c:372
+#: ../src/connection-editor/page-wireless-security.c:407
 msgid "Could not load WiFi security user interface."
-msgstr "WiFi ããããããããããããããããããããããåæããããããã"
+msgstr "WiFi ãããããããããããããããããããèãèããããã"
 
 #: ../src/connection-editor/nm-connection-editor.c:101
 #, c-format
@@ -1844,7 +1923,7 @@ msgstr "%s ãçé"
 msgid "Editing un-named connection"
 msgstr "çåãæçãçé"
 
-#: ../src/connection-editor/nm-connection-editor.c:288
+#: ../src/connection-editor/nm-connection-editor.c:291
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -1852,45 +1931,45 @@ msgstr ""
 "æçããããããåèãããããããããããããããããããããã (.ui ããã"
 "ãããããããããããã)ã"
 
-#: ../src/connection-editor/nm-connection-editor.c:391
+#: ../src/connection-editor/nm-connection-editor.c:394
 msgid "Error creating connection editor dialog."
 msgstr "æçãããããããããããäæäããããããã"
 
-#: ../src/connection-editor/nm-connection-editor.c:403
+#: ../src/connection-editor/nm-connection-editor.c:406
 msgid "_Save"
 msgstr "äå(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:404
+#: ../src/connection-editor/nm-connection-editor.c:407
 msgid "Save any changes made to this connection."
 msgstr "ããæçãåãããåæããããäåãããã"
 
-#: ../src/connection-editor/nm-connection-editor.c:405
+#: ../src/connection-editor/nm-connection-editor.c:408
 msgid "_Save..."
 msgstr "äå(_S)..."
 
-#: ../src/connection-editor/nm-connection-editor.c:406
+#: ../src/connection-editor/nm-connection-editor.c:409
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "ããããããããããããããçæçãäåãèèããã"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Available to all users"
-msgstr "ãããããããããåçåè"
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+msgid "_Import"
+msgstr "ããããã(_I)"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-msgid "Connect _automatically"
-msgstr "èåæçãã(_A) "
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
+msgid "E_xport"
+msgstr "ãããããã(_X)"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
 msgid "Connection _name:"
 msgstr "æçå(_N):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "E_xport"
-msgstr "ãããããã(_X)"
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
+msgid "Connect _automatically"
+msgstr "èåæçãã(_A) "
 
 #: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "_Import"
-msgstr "ããããã(_I)"
+msgid "Available to all users"
+msgstr "ãããããããããåçåè"
 
 #: ../src/connection-editor/nm-connection-list.c:216
 msgid "never"
@@ -1946,18 +2025,18 @@ msgid "The property '%s' / '%s' is invalid: %d"
 msgstr "ããããã '%s' / '%s' ãçåãã: %d"
 
 #: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:642
+#: ../src/connection-editor/nm-connection-list.c:662
 msgid "An unknown error occurred."
 msgstr "äæãããããççããããã"
 
 #: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:702
 msgid "Error initializing editor"
 msgstr "ããããããåæåäãããããã"
 
 #: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:703
-#: ../src/connection-editor/nm-connection-list.c:870
+#: ../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."
@@ -1972,25 +2051,25 @@ msgstr "æããæçãäæãããããããã"
 msgid "Could not edit new connection"
 msgstr "æèæçãçéãããããããã"
 
-#: ../src/connection-editor/nm-connection-list.c:717
+#: ../src/connection-editor/nm-connection-list.c:733
 msgid "Could not edit connection"
 msgstr "æçãçéãããããããã"
 
-#: ../src/connection-editor/nm-connection-list.c:747
+#: ../src/connection-editor/nm-connection-list.c:763
 msgid "Connection delete failed"
 msgstr "æçãåéãåæãããã"
 
-#: ../src/connection-editor/nm-connection-list.c:779
+#: ../src/connection-editor/nm-connection-list.c:795
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "æåã æç %s ãåéããããããã ?"
 
-#: ../src/connection-editor/nm-connection-list.c:914
-#: ../src/connection-editor/vpn-helpers.c:227
+#: ../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/nm-connection-list.c:916
+#: ../src/connection-editor/nm-connection-list.c:931
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2000,81 +2079,81 @@ msgstr ""
 "\n"
 "ããã: VPN ãããããããããããããã"
 
-#: ../src/connection-editor/nm-connection-list.c:929
+#: ../src/connection-editor/nm-connection-list.c:944
 msgid "Could not edit imported connection"
 msgstr "ãããããããæçãçéãããããããã"
 
-#: ../src/connection-editor/nm-connection-list.c:1099
+#: ../src/connection-editor/nm-connection-list.c:1125
 msgid "Name"
 msgstr "åå"
 
-#: ../src/connection-editor/nm-connection-list.c:1111
+#: ../src/connection-editor/nm-connection-list.c:1137
 msgid "Last Used"
 msgstr "ååãäç"
 
-#: ../src/connection-editor/nm-connection-list.c:1227
+#: ../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/nm-connection-list.c:1238
+#: ../src/connection-editor/nm-connection-list.c:1274
 msgid "_Edit"
 msgstr "çé(_E)"
 
-#: ../src/connection-editor/nm-connection-list.c:1239
+#: ../src/connection-editor/nm-connection-list.c:1275
 msgid "Edit the selected connection"
 msgstr "éæããæçãçéãã"
 
-#: ../src/connection-editor/nm-connection-list.c:1240
+#: ../src/connection-editor/nm-connection-list.c:1276
 msgid "_Edit..."
 msgstr "çé(_E)..."
 
-#: ../src/connection-editor/nm-connection-list.c:1241
+#: ../src/connection-editor/nm-connection-list.c:1277
 msgid "Authenticate to edit the selected connection"
 msgstr "éæããæçãçéãèèãã"
 
-#: ../src/connection-editor/nm-connection-list.c:1256
+#: ../src/connection-editor/nm-connection-list.c:1292
 msgid "_Delete"
 msgstr "åé(_D)"
 
-#: ../src/connection-editor/nm-connection-list.c:1257
+#: ../src/connection-editor/nm-connection-list.c:1293
 msgid "Delete the selected connection"
 msgstr "éæããæçãåéãã"
 
-#: ../src/connection-editor/nm-connection-list.c:1258
+#: ../src/connection-editor/nm-connection-list.c:1294
 msgid "_Delete..."
 msgstr "åé(_D)..."
 
-#: ../src/connection-editor/nm-connection-list.c:1259
+#: ../src/connection-editor/nm-connection-list.c:1295
 msgid "Authenticate to delete the selected connection"
 msgstr "éæããæçãåéãèèãã"
 
-#: ../src/connection-editor/nm-connection-list.c:1538
+#: ../src/connection-editor/nm-connection-list.c:1574
 msgid "Error creating connection"
 msgstr "æçãäæäãããã"
 
-#: ../src/connection-editor/nm-connection-list.c:1539
+#: ../src/connection-editor/nm-connection-list.c:1575
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "æç '%s' ãäæææããããããã"
 
-#: ../src/connection-editor/nm-connection-list.c:1594
-#: ../src/connection-editor/nm-connection-list.c:1606
+#: ../src/connection-editor/nm-connection-list.c:1630
+#: ../src/connection-editor/nm-connection-list.c:1642
 msgid "Error editing connection"
 msgstr "æçãçéããããããããã"
 
-#: ../src/connection-editor/nm-connection-list.c:1595
+#: ../src/connection-editor/nm-connection-list.c:1631
 #, c-format
 msgid "Don't know how to edit '%s' connections"
 msgstr "æç '%s' ãçéããææããããããã"
 
-#: ../src/connection-editor/nm-connection-list.c:1607
+#: ../src/connection-editor/nm-connection-list.c:1643
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "UUID '%s' ãæçãçèãããããããã"
 
-#: ../src/connection-editor/vpn-helpers.c:229
+#: ../src/connection-editor/vpn-helpers.c:230
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2087,29 +2166,29 @@ msgstr ""
 "\n"
 "ããã: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:261
+#: ../src/connection-editor/vpn-helpers.c:263
 msgid "Select file to import"
 msgstr "ããããããããããããéæãã"
 
-#: ../src/connection-editor/vpn-helpers.c:309
+#: ../src/connection-editor/vpn-helpers.c:314
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "\"%s\" ãèããããããæãååãããã"
 
-#: ../src/connection-editor/vpn-helpers.c:311
+#: ../src/connection-editor/vpn-helpers.c:316
 msgid "_Replace"
 msgstr "åãæã(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:313
+#: ../src/connection-editor/vpn-helpers.c:318
 #, 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:349
+#: ../src/connection-editor/vpn-helpers.c:354
 msgid "Cannot export VPN connection"
 msgstr "VPN æçãããããããããããã"
 
-#: ../src/connection-editor/vpn-helpers.c:351
+#: ../src/connection-editor/vpn-helpers.c:356
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2120,7 +2199,7 @@ msgstr ""
 "\n"
 "ããã: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:385
+#: ../src/connection-editor/vpn-helpers.c:391
 msgid "Export VPN connection..."
 msgstr "VPN æçããããããããã..."
 
@@ -2178,35 +2257,35 @@ msgstr "éèãèåãæåäãã..."
 msgid "could not find the Bluetooth device."
 msgstr "Bluetooth ãããããèäããããããããã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:975
+#: ../src/gnome-bluetooth/bt-widget.c:980
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 msgstr ""
 "ãããããã Bluetooth ããããããæåãããããåãããããããããããã"
-"ããããã æçãããããããããããããã"
+"ãããæçãããããããããããããã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1007
+#: ../src/gnome-bluetooth/bt-widget.c:1012
 #, 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:1017
+#: ../src/gnome-bluetooth/bt-widget.c:1022
 msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 msgstr "Bluetooth ãèåãããããã (D-Bus ãããããäæãåæ)ã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1026
+#: ../src/gnome-bluetooth/bt-widget.c:1031
 #, c-format
 msgid ""
 "Bluetooth configuration not possible (error finding NetworkManager: %s)."
 msgstr ""
 "Bluetooth ãèåãããããã (NetworkManager ãæçäããããçç: %s)ã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1093
+#: ../src/gnome-bluetooth/bt-widget.c:1098
 msgid "Use your mobile phone as a network device (PAN/NAP)"
 msgstr "ããããéèããããããããããã (PAN/NAP) ãããäçãã"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1102
+#: ../src/gnome-bluetooth/bt-widget.c:1107
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr "ããããéè (DUN) ãäçãããããããããããããããã"
 
@@ -2268,7 +2347,7 @@ msgid ""
 "\n"
 "If you are unsure of your plan please ask your provider for your plan's APN."
 msgstr ""
-"èå: ééããããããéæãããããããããããããããããèææåéã åå"
+"èå: ééããããããéæãããããããããããããããããèææåéãåå"
 "ããããããæçãéæãããããåèæãããããã\n"
 "\n"
 "ãèåãããããäæãååãããããããã APN ããããããããããããåãã"
@@ -2304,73 +2383,73 @@ msgstr "çãããããããã GSM æè (GPRS, EDGE, UMTS, HSPA) ãä
 
 #: ../src/libnm-gtk/nm-mobile-wizard.c:819
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "çãããããããã CDMA æè (1xRTT, EVDO) ãäçãããã"
+msgstr "çãããããããã CDMA æè (1xRTT, EVDO) ãäçããã"
 
 #: ../src/libnm-gtk/nm-mobile-wizard.c:830
 msgid "Choose your Provider"
 msgstr "äçãããããããéæ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1080
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1081
 msgid "Country or Region List:"
 msgstr "åãååãäè:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1092
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1093
 msgid "Country or region"
 msgstr "åãåå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1099
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
 msgid "My country is not listed"
 msgstr "çãåãäèãæãããã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1145
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1146
 msgid "Choose your Provider's Country or Region"
 msgstr "äçãããããããåãååãéæ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1199
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1200
 msgid "Installed GSM device"
 msgstr "GSM ããããããããããããããããã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1202
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1203
 msgid "Installed CDMA device"
 msgstr "CDMA ããããããããããããããããã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1374
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1375
 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:1379
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1380
 msgid "You will need the following information:"
 msgstr "ääãæåãåèãã:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1394
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1395
 msgid "Your broadband provider's name"
 msgstr "äçãããããããããããããããå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1400
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1401
 msgid "Your broadband billing plan name"
 msgstr "äçãããããããããèææãããå"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1406
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(äéããããã) ãããããããèææããã APN (Access Point Name)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "ãããããããããããããããããçãæçãäæ(_T):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1448
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1449
 msgid "Any device"
 msgstr "ãããããããã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1462
 msgid "Set up a Mobile Broadband Connection"
 msgstr "ãããããããããããæçããããããã"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1625
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1626
 msgid "New Mobile Broadband Connection"
 msgstr "æèããããããããããããæç"
 
@@ -2378,11 +2457,11 @@ msgstr "æèããããããããããããæç"
 msgid "New..."
 msgstr "æè..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1077
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1076
 msgid "C_reate"
 msgstr "äæ(_R)"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1161
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1160
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network '%"
@@ -2391,52 +2470,52 @@ msgstr ""
 "ççãããããã '%s' ããããããããããããããããåãæååãããåèã"
 "ãã"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1163
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1162
 msgid "Wireless Network Authentication Required"
 msgstr "ççãããããããèèãåèãã"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1165
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1164
 msgid "Authentication required by wireless network"
 msgstr "ççããããããããèèãèæãããã"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1170
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1169
 msgid "Create New Wireless Network"
 msgstr "æããççãããããããäæ"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1171
 msgid "New wireless network"
 msgstr "æèççãããããã"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1173
+#: ../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-wireless-dialog.c:1175
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1174
 msgid "Connect to Hidden Wireless Network"
 msgstr "éèçççãããããããæçãã"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
+#: ../src/libnm-gtk/nm-wireless-dialog.c:1176
 msgid "Hidden wireless network"
 msgstr "éèçççãããããã"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1178
+#: ../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/wifi.ui.h:2
+msgid "_Wireless security:"
+msgstr "ççãããããã(_W):"
+
+#: ../src/libnm-gtk/wifi.ui.h:4
 msgid "Co_nnection:"
 msgstr "æç(_N):"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wireless _adapter:"
 msgstr "ççããããã(_A):"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-msgid "_Wireless security:"
-msgstr "ççãããããã(_W):"
-
 #: ../src/main.c:73
 msgid "Usage:"
 msgstr "äçæ:"
@@ -2454,8 +2533,8 @@ msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
-"ãããããããåèçããæåãããããããããããäããã GNOME ããããã"
-"ã çåãåèãããã"
+"ãããããããããåçãæåãããããããããããäããã GNOME ãããããã"
+"çåãåèãããã"
 
 #: ../src/mb-menu-item.c:57
 msgid "EVDO"
@@ -2572,50 +2651,89 @@ msgstr "DER ãã PEM ãã PKCS#12 ããããããããã (*.der, *.pem,
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER ã PEM ãèææ (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:372
-msgid "MD5"
-msgstr "MD5"
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#, fuzzy
+#| msgid "Anony_mous identity:"
+msgid "Anonymous"
+msgstr "ååãèåå(_M):"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#, fuzzy
+#| msgid "Authentication"
+msgid "Authenticated"
+msgstr "èè"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+msgid "Both"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: ../src/wireless-security/eap-method-peap.ui.h:5
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
+msgid "Anony_mous identity:"
+msgstr "ååãèåå(_M):"
 
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+msgid "PAC _file:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "_Inner authentication:"
+msgstr "åéèè(_I):"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/wireless-security/eap-method-fast.c:406
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.c:263
+#: ../src/wireless-security/wireless-security.c:382
+msgid "MD5"
+msgstr "MD5"
+
 #: ../src/wireless-security/eap-method-peap.c:350
 #: ../src/wireless-security/eap-method-tls.c:416
 #: ../src/wireless-security/eap-method-ttls.c:350
 msgid "Choose a Certificate Authority certificate..."
 msgstr "èæææé(CA)èææãéæ..."
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "Anony_mous identity:"
-msgstr "ååãèåå(_M):"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
-msgid "C_A certificate:"
-msgstr "CA èææ(_A):"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
-msgid "I_nner authentication:"
-msgstr "åéèè(_N):"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
 msgstr "ããããã 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-peap.ui.h:4
 msgid "Version 1"
 msgstr "ããããã 1"
 
+#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
+msgid "C_A certificate:"
+msgstr "CA èææ(_A):"
+
 #: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "_PEAP version:"
-msgstr "PEAP ããããã(_P):"
+msgid "PEAP _version:"
+msgstr "PEAP ããããã(_V):"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:1
+#: ../src/wireless-security/eap-method-simple.ui.h:3
 msgid "As_k for this password every time"
 msgstr "æåããããããããèæãã(_K)"
 
@@ -2632,7 +2750,7 @@ msgid ""
 "(You can password-protect your private key with openssl)"
 msgstr ""
 "éæãããããããããããããããããäèãããããããããããããçæã ä"
-"çæåãäåãèãããããããããããããäèãããããããããããã éæã"
+"çæåãäåãèãããããããããããããäèããããããããããããéæã"
 "ãããããã\n"
 "\n"
 "(ããããããããã openssl ãäçãããããããäèããããã)"
@@ -2647,11 +2765,15 @@ msgstr "ãããããããããéæãã..."
 
 # ããããããããããèããããã "Identity" ããããæãéåããããããã
 # (WPA-EAP Identity èèæå: ããã ID ãããããããçãèè)
-#: ../src/wireless-security/eap-method-tls.ui.h:2
+#: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "èåå(_D):"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr "ããããèææ(_U):"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:4
 msgid "Private _key:"
 msgstr "ãããããããã(_K):"
 
@@ -2659,10 +2781,6 @@ msgstr "ãããããããã(_K):"
 msgid "_Private key password:"
 msgstr "ããããããããããããã(_P):"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:6
-msgid "_User certificate:"
-msgstr "ããããèææ(_U):"
-
 #: ../src/wireless-security/nag-user-dialog.ui.h:1
 msgid "Don't _warn me again"
 msgstr "äåãèåããã(_W)"
@@ -2675,229 +2793,66 @@ msgstr "ããã"
 msgid "Yes"
 msgstr "ãã"
 
-#: ../src/wireless-security/wireless-security.c:384
+#: ../src/wireless-security/wireless-security.c:394
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:408
+#: ../src/wireless-security/wireless-security.c:418
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:429
 msgid "Tunneled TLS"
 msgstr "ããããå TLS"
 
-#: ../src/wireless-security/wireless-security.c:419
+#: ../src/wireless-security/wireless-security.c:440
 msgid "Protected EAP (PEAP)"
 msgstr "äèãã EAP (PEAP)"
 
 #: ../src/wireless-security/ws-dynamic-wep.ui.h:2
 #: ../src/wireless-security/ws-wep-key.ui.h:9
 #: ../src/wireless-security/ws-wpa-eap.ui.h:2
-msgid "_Authentication:"
-msgstr "èè(_A):"
+msgid "Au_thentication:"
+msgstr "èè(_T):"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
+msgid "Open System"
+msgstr "ãããããããã"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "Shared Key"
+msgstr "åæé"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:3
 msgid "1 (Default)"
 msgstr "1 (ããããã)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "2"
 msgstr "2"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.ui.h:5
 msgid "3"
 msgstr "3"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: ../src/wireless-security/ws-wep-key.ui.h:6
 msgid "4"
 msgstr "4"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
-msgid "Open System"
-msgstr "ãããããããã"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:6
-msgid "Shared Key"
-msgstr "åæé"
-
 #: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key:"
+msgstr "ãã(_K):"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
 msgid "Sho_w key"
 msgstr "ãããèç(_W)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:8
+#: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x:"
 msgstr "WEP ãããããã(_X):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:10
-msgid "_Key:"
-msgstr "ãã(_K):"
+#~ msgid "Click on this icon to connect to a wireless network"
+#~ msgstr "ççãããããããæçããããããããããããããããããã"
 
-#~ msgid "United Kingdom"
-#~ msgstr "èå"
-
-#~ msgid "label"
-#~ msgstr "ããã"
-
-#~ msgid "Network Manager"
-#~ msgstr "ãããããããããããã"
-
-#~ msgid "An instance of nm-applet is already running.\n"
-#~ msgstr "nm-applet ããããããããæãåèãããããã\n"
-
-#~ msgid "Could not acquire the %s service. (%d)\n"
-#~ msgstr "%s ãããããååããããããããã(%d)\n"
-
-#~ msgid "translator-credits"
-#~ msgstr ""
-#~ "Satoru SATOH <ss gnome gr jp>\n"
-#~ "Kiyoto Hashida <khashida redhat com>\n"
-#~ "KURASAWA Nozomu <nabetaro caldron jp>\n"
-#~ "èéèä <AE5T-KSN asahi-net or jp>\n"
-#~ "Hideki Yamane <henrich debian or jp>\n"
-#~ "ææ GNOME ããããä <http://www.gnome.gr.jp/>"
-
-#~ msgid ""
-#~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
-#~ msgstr ""
-#~ "<span size=\"larger\" weight=\"bold\">ããããããããããããæç</span>"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "Version 0\n"
-#~ "Version 1"
-#~ msgstr ""
-#~ "èå\n"
-#~ "ããããã 0\n"
-#~ "ããããã 1"
-
-#~ msgid "C_onnect"
-#~ msgstr "æç(_O)"
-
-#~ msgid "Other Wireless Network..."
-#~ msgstr "äãççãããããã..."
-
-#~ msgid "<b>Addresses</b>"
-#~ msgstr "<b>ãããã</b>"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "Automatic with manual DNS settings\n"
-#~ "Manual\n"
-#~ "Link-Local\n"
-#~ "Shared to other computers"
-#~ msgstr ""
-#~ "èå\n"
-#~ "èå (DNS èåããæå)\n"
-#~ "æå\n"
-#~ "ããããããã\n"
-#~ "äãããããããããåæ"
-
-#~ msgid "<b>Basic</b>"
-#~ msgstr "<b>åæçã</b>"
-
-#~ msgid ""
-#~ "Any\n"
-#~ "3G (UMTS/HSPA)\n"
-#~ "2G (GPRS/EDGE)\n"
-#~ "Prefer 3G (UMTS/HSPA)\n"
-#~ "Prefer 2G (GPRS/EDGE)"
-#~ msgstr ""
-#~ "ãããã\n"
-#~ "3G (UMTS/HSPA)\n"
-#~ "2G (GPRS/EDGE)\n"
-#~ "åå 3G (UMTS/HSPA)\n"
-#~ "åå 2G (GPRS/EDGE)"
-
-#~ msgid "<b>Authentication</b>"
-#~ msgstr "<b>èè</b>"
-
-#~ msgid "<b>Echo</b>"
-#~ msgstr "<b>Echo</b>"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "10 Mb/s\n"
-#~ "100 Mb/s\n"
-#~ "1 Gb/s\n"
-#~ "10 Gb/s"
-#~ msgstr ""
-#~ "èå\n"
-#~ "10 Mb/s\n"
-#~ "100 Mb/s\n"
-#~ "1 Gb/s\n"
-#~ "10 Gb/s"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "Twisted Pair (TP)\n"
-#~ "Attachment Unit Interface (AUI)\n"
-#~ "BNC\n"
-#~ "Media Independent Interface (MII)"
-#~ msgstr ""
-#~ "èå\n"
-#~ "ãããããã (TP)\n"
-#~ "äåãããããããããããã (AUI)\n"
-#~ "BNC\n"
-#~ "ããããéäåãããããããã (MII)"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "A (5 GHz)\n"
-#~ "B/G (2.4 GHz)"
-#~ msgstr ""
-#~ "èå\n"
-#~ "A (5 GHz)\n"
-#~ "B/G (2.4 GHz)"
-
-#~ msgid ""
-#~ "The connection editor could not find some required resources (the "
-#~ "NetworkManager applet glade file was not found)."
-#~ msgstr ""
-#~ "æçããããããåèããããããããããããããããããããããã"
-#~ "(NetworkManager ããããã glade ããããããããããããã)"
-
-#~ msgid "could not connect to the system bus."
-#~ msgstr "ãããããããæçããããããããã"
-
-#~ msgid "Country"
-#~ msgstr "å"
-
-#~ msgid "Cannot start VPN connection '%s'"
-#~ msgstr "VPN æç '%s' ãéåããããã"
-
-#~ msgid ""
-#~ "Could not find the authentication dialog for VPN connection type '%s'. "
-#~ "Contact your system administrator."
-#~ msgstr ""
-#~ "VPN æçããã '%s' ãèèããããããããããããããããããããããçç"
-#~ "èãéçããããããã"
-
-#~ msgid ""
-#~ "There was a problem launching the authentication dialog for VPN "
-#~ "connection type '%s'. Contact your system administrator."
-#~ msgstr ""
-#~ "VPN æçããã '%s' ãèèããããããèåäãåéãçãããããããããç"
-#~ "çèãéçããããããã"
-
-#~ msgid "Apply"
-#~ msgstr "éç"
-
-#~ msgid "Apply..."
-#~ msgstr "éç..."
-
-#~ msgid "PUK code required"
-#~ msgstr "PUK ããããåèãã"
-
-#~ msgid "PUK code is needed for the mobile broadband device"
-#~ msgstr "ããããããããããããããããã PUK ããããåèãã"
-
-#~ msgctxt "No wired security used"
-#~ msgid "None"
-#~ msgstr "ãã"
-
-#~ msgctxt "Unknown/unrecognized wired or wifi security"
-#~ msgid "Unknown"
-#~ msgstr "äæ"
-
-#~ msgid "_Routes&#x2026;"
-#~ msgstr "ããã &#x2026;(_R)"
-
-#~ msgid "Save this connection for all users of this machine."
-#~ msgstr "ããããããããããããããçãããæçãäå"
+#~ msgid "_Security:"
+#~ msgstr "ãããããã(_S):"



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