[network-manager-applet/NMA_0_8] Updated Japanese translation.

[Dan Williams <dcbw src gnome org>]

commit ee4c62f6745f47cb91d7c08bdcdd0c89258e2273
Author: KURASAWA Nozomu <nabetaro caldron jp>
Date:   Sat Jul 31 16:38:31 2010 +0900

    Updated Japanese translation.

 po/ja.po |  562 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 300 insertions(+), 262 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 984c249..5921b29 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,23 +1,23 @@
 # translation of ja.po to Japanese
 # Japanese translation for NetworkManager (network-manager-applet)
-# Copyright (C) 2005 Dan Williams <dcbw redhat com>
+# Copyright (C) 2005-2010 Dan Williams <dcbw redhat com>
 # This file is distributed under the same license as the NetworkManager package.
-#
-# Satoru SATOH <ss gnome gr jp>, 2005 - 2007.
+# Satoru SATOH <ss gnome gr jp>, 2005-2007.
 # Kiyoto Hashida <khashida redhat com>, 2010.
+# KURASAWA Nozomu <nabetaro caldron jp>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: ja\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 18:03+0530\n"
-"PO-Revision-Date: 2010-05-19 09:04+0900\n"
-"Last-Translator: Kiyoto Hashida <khashida redhat com>\n"
-"Language-Team: Japanese <jp li org>\n"
+"Project-Id-Version: network-manager-applet master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=NetworkManager&component=nm-applet\n"
+"POT-Creation-Date: 2010-07-31 16:08+0900\n"
+"PO-Revision-Date: 2010-07-31 16:36+0900\n"
+"Last-Translator: KURASAWA Nozomu <nabetaro caldron jp>\n"
+"Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../nm-applet.desktop.in.h:1
 msgid "Control your network connections"
@@ -41,11 +41,14 @@ msgstr "å??æ?­æ¸?ã?¿é??ç?¥ã??ç?¡å?¹ã?«ã??ã??"
 
 #: ../nm-applet.schemas.in.h:4
 msgid "Set this to TRUE to disable notifications when connecting to a network."
-msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã??æ??ç?¹ã?«ã??ã??ã?? TRUE ã?«ã?»ã??ã??ã??ã??ã?¨é??ç?¥ã??ç?¡å?¹ã?«ã??ã?¾ã??ã??"
+msgstr ""
+"ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã??æ??ç?¹ã?«ã??ã??ã?? TRUE ã?«ã?»ã??ã??ã??ã??ã?¨é??ç?¥ã??ç?¡å?¹ã?«ã??ã?¾ã??ã??"
 
 #: ../nm-applet.schemas.in.h:5
-msgid "Set this to TRUE to disable notifications when disconnecting from a network."
-msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã??ã??å??æ?­ã??ã??æ??ç?¹ã?«ã??ã??ã?? TRUE ã?«ã?»ã??ã??ã??ã??ã?¨é??ç?¥ã??ç?¡å?¹ã?«ã??ã?¾ã??ã??"
+msgid ""
+"Set this to TRUE to disable notifications when disconnecting from a network."
+msgstr ""
+"ã??ã??ã??ã?¯ã?¼ã?¯ã??ã??å??æ?­ã??ã??æ??ç?¹ã?«ã??ã??ã?? TRUE ã?«ã?»ã??ã??ã??ã??ã?¨é??ç?¥ã??ç?¡å?¹ã?«ã??ã?¾ã??ã??"
 
 #: ../nm-applet.schemas.in.h:6
 msgid ""
@@ -56,7 +59,8 @@ msgstr ""
 "ã??ã??"
 
 #: ../nm-applet.schemas.in.h:7
-msgid "Set to TRUE to disable creation of adhoc networks when using the applet."
+msgid ""
+"Set to TRUE to disable creation of adhoc networks when using the applet."
 msgstr ""
 "ã?¢ã??ã?¬ã??ã??ã??使ç?¨ã??ã??æ??ã?«ã??ã??ã?? TRUE ã?«ã?»ã??ã??ã??ã??ã?¨ã?¢ã??ã??ã??ã?¯ã??ã??ã??ã?¯ã?¼ã?¯ã?®ä½?"
 "æ??ã??ç?¡å?¹ã?«ã??ã?¾ã??ã??"
@@ -94,7 +98,7 @@ msgstr "%s ã?µã?¼ã??ã?¹ã??å??å¾?ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??(%d)\n"
 
 #: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:332
 #: ../src/applet-device-gsm.c:375 ../src/applet-device-wired.c:241
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:816
 msgid "Available"
 msgstr "����"
 
@@ -106,7 +110,7 @@ msgstr "ç?¾å?¨'%s' ã?«æ?¥ç¶?ã??ã?¦ã??ã?¾ã??ã??"
 
 #: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:378
 #: ../src/applet-device-gsm.c:421 ../src/applet-device-wired.c:274
-#: ../src/applet-device-wifi.c:1214
+#: ../src/applet-device-wifi.c:1257
 msgid "Connection Established"
 msgstr "æ?¥ç¶?ã??確ç«?ã??ã?¾ã??ã??"
 
@@ -114,32 +118,32 @@ msgstr "æ?¥ç¶?ã??確ç«?ã??ã?¾ã??ã??"
 msgid "You are now connected to the mobile broadband network."
 msgstr "ç?¾å?¨ã??ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:413
-#: ../src/applet-device-gsm.c:456
+#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:414
+#: ../src/applet-device-gsm.c:457
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??æ?¥ç¶? '%s' ã??æº?å??中ã?§ã??..."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:416
-#: ../src/applet-device-gsm.c:459
+#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:417
+#: ../src/applet-device-gsm.c:460
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??æ?¥ç¶? '%s' ã??設å®?中ã?§ã??..."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:419
-#: ../src/applet-device-gsm.c:462
+#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:420
+#: ../src/applet-device-gsm.c:463
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??æ?¥ç¶? '%s' ã?«ã?¯ã?¦ã?¼ã?¶ã?¼èª?証ã??å¿?è¦?ã?§ã??..."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:422
-#: ../src/applet-device-gsm.c:465 ../src/applet.c:2266
+#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:423
+#: ../src/applet-device-gsm.c:466 ../src/applet.c:2298
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "'%s' ã?®ã??ã??ã??ã?¯ã?¼ã?¯ã?¢ã??ã?¬ã?¹ã??è¦?æ±?ã??ã?¦ã??ã?¾ã??..."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:439
-#: ../src/applet-device-gsm.c:477
+#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:441
+#: ../src/applet-device-gsm.c:484
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??æ?¥ç¶? '%s' ã?¯ã?¢ã?¯ã??ã?£ã??ã?§ã??ã??"
@@ -170,12 +174,12 @@ msgstr "æ?°è¦?ã?®ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã?? (CDMA) æ?¥ç¶?..."
 msgid "You are now connected to the CDMA network."
 msgstr "ç?¾å?¨ CDMA ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../src/applet-device-cdma.c:434 ../src/applet-device-gsm.c:472
+#: ../src/applet-device-cdma.c:436 ../src/applet-device-gsm.c:479
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??æ?¥ç¶? '%s' ã?¢ã?¯ã??ã?£ã??ã?§ã??: (%d%%%s%s)"
 
-#: ../src/applet-device-cdma.c:437 ../src/applet-device-gsm.c:475
+#: ../src/applet-device-cdma.c:439 ../src/applet-device-gsm.c:482
 msgid "roaming"
 msgstr "ã?­ã?¼ã??ã?³ã?°"
 
@@ -193,45 +197,45 @@ msgstr "æ?°è¦?ã?®ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã?? (GSM) æ?¥ç¶?..."
 msgid "You are now connected to the GSM network."
 msgstr "ç?¾å?¨ GSM ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../src/applet-device-gsm.c:704
+#: ../src/applet-device-gsm.c:711
 msgid "PIN code required"
 msgstr "PIN ã?³ã?¼ã??ã??å¿?è¦?ã?§ã??"
 
-#: ../src/applet-device-gsm.c:706
+#: ../src/applet-device-gsm.c:713
 msgid "PUK code required"
 msgstr "PUK ã?³ã?¼ã??ã??å¿?è¦?ã?§ã??"
 
-#: ../src/applet-device-gsm.c:715
+#: ../src/applet-device-gsm.c:722
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã??ã??ã?¤ã?¹ã?«ã?¯ PIN ã?³ã?¼ã??ã??å¿?è¦?ã?§ã??"
 
-#: ../src/applet-device-gsm.c:717
+#: ../src/applet-device-gsm.c:724
 msgid "PUK code is needed for the mobile broadband device"
 msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã??ã??ã?¤ã?¹ã?«ã?¯ PUK ã?³ã?¼ã??ã??å¿?è¦?ã?§ã??"
 
-#: ../src/applet-device-gsm.c:850
+#: ../src/applet-device-gsm.c:857
 msgid "Wrong PIN code; please contact your provider."
 msgstr "PIN ã??é??ã??ã?¾ã??; ã??ã?­ã??ã?¤ã??ã?«é?£çµ¡ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../src/applet-device-gsm.c:873
+#: ../src/applet-device-gsm.c:880
 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:900
+#: ../src/applet-device-gsm.c:907
 msgid "Sending unlock code..."
 msgstr "é??é? ã?³ã?¼ã??ã??é??信中..."
 
-#: ../src/applet-device-gsm.c:959
+#: ../src/applet-device-gsm.c:966
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN ã?®é??é? ã??å¿?è¦?ã?§ã??"
 
-#: ../src/applet-device-gsm.c:960
+#: ../src/applet-device-gsm.c:967
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN ã?®é??é? ã??å¿?è¦?ã?§ã??"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:962
+#: ../src/applet-device-gsm.c:969
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -240,35 +244,36 @@ msgstr ""
 "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã??ã??ã?¤ã?¹ %s' ã??使ç?¨ã??ã??ã?«ã?¯ SIM PIN ã??ã?³ã?³ã?¼ã??ã??å¿?è¦?ã?§"
 "ã??ã??"
 
-#: ../src/applet-device-gsm.c:963
+#: ../src/applet-device-gsm.c:970
 msgid "PIN code:"
 msgstr "PIN ã?³ã?¼ã??:"
 
-#: ../src/applet-device-gsm.c:968
+#: ../src/applet-device-gsm.c:975
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK ã?®é??é? ã??å¿?è¦?ã?§ã??"
 
-#: ../src/applet-device-gsm.c:969
+#: ../src/applet-device-gsm.c:976
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK ã?®é??é? ã??å¿?è¦?ã?§ã??"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:971
+#: ../src/applet-device-gsm.c:978
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
 "used."
-msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã??ã??ã?¤ã?¹ '%s' ã??使ç?¨ã??ã??ã?«ã?¯ SIM PUK ã?³ã?¼ã??ã??å¿?è¦?ã?§ã??ã??"
+msgstr ""
+"ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã??ã??ã?¤ã?¹ '%s' ã??使ç?¨ã??ã??ã?«ã?¯ SIM PUK ã?³ã?¼ã??ã??å¿?è¦?ã?§ã??ã??"
 
-#: ../src/applet-device-gsm.c:972
+#: ../src/applet-device-gsm.c:979
 msgid "PUK code:"
 msgstr "PUK ã?³ã?¼ã??:"
 
-#: ../src/applet-device-gsm.c:974
+#: ../src/applet-device-gsm.c:981
 msgid "New PIN code:"
 msgstr "æ?°è¦?ã?® PIN ã?³ã?¼ã??:"
 
-#: ../src/applet-device-gsm.c:975
+#: ../src/applet-device-gsm.c:982
 msgid "Re-enter new PIN code:"
 msgstr "æ?°è¦?ã?® PIN ã?³ã?¼ã??ã??å??å?¥å??:"
 
@@ -295,7 +300,7 @@ msgid "Wired Network"
 msgstr "æ??ç·?ã??ã??ã??ã?¯ã?¼ã?¯"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:233 ../src/applet.c:1305
+#: ../src/applet-device-wired.c:233 ../src/applet.c:1309
 msgid "disconnected"
 msgstr "å??æ?­ã??ã??ã?¦ã??ã?¾ã??"
 
@@ -334,83 +339,82 @@ msgstr "DSL �証"
 
 #: ../src/applet-device-wifi.c:87
 msgid "_Connect to Hidden Wireless Network..."
-msgstr "é??表示ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶? (_C)..."
+msgstr "é??表示ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?(_C)..."
 
 #: ../src/applet-device-wifi.c:120
 msgid "Create _New Wireless Network..."
 msgstr "æ?°ã??ã??ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã??ä½?æ??(_N)..."
 
-#: ../src/applet-device-wifi.c:705
+#: ../src/applet-device-wifi.c:748
 #, c-format
 msgid "Wireless Networks (%s)"
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ (%s)"
 
-#: ../src/applet-device-wifi.c:707
+#: ../src/applet-device-wifi.c:750
 #, c-format
 msgid "Wireless Network (%s)"
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ (%s)"
 
-#: ../src/applet-device-wifi.c:709
+#: ../src/applet-device-wifi.c:752
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯"
-msgstr[1] "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯"
 
-#: ../src/applet-device-wifi.c:739
+#: ../src/applet-device-wifi.c:782
 msgid "wireless is disabled"
 msgstr "ç?¡ç·?ã?¯ç?¡å?¹ã?«ã?ªã?£ã?¦ã??ã?¾ã??"
 
-#: ../src/applet-device-wifi.c:800
+#: ../src/applet-device-wifi.c:843
 msgid "More networks"
 msgstr "ã??ã?®ä»?ã?®ã??ã??ã??ã?¯ã?¼ã?¯"
 
-#: ../src/applet-device-wifi.c:1004
+#: ../src/applet-device-wifi.c:1047
 msgid "Wireless Networks Available"
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?¯å?©ç?¨å?¯è?½ã?§ã??"
 
-#: ../src/applet-device-wifi.c:1005
+#: ../src/applet-device-wifi.c:1048
 msgid "Click on this icon to connect to a wireless network"
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã??ã?«ã?¯ã??ã?®ã?¢ã?¤ã?³ã?³ã??ã?¯ã?ªã??ã?¯ã??ã?¾ã??ã??"
 
-#: ../src/applet-device-wifi.c:1008 ../src/applet.c:677
+#: ../src/applet-device-wifi.c:1051 ../src/applet.c:677
 msgid "Don't show this message again"
 msgstr "äº?度ã?¨ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ã??表示ã??ã?ªã??"
 
-#: ../src/applet-device-wifi.c:1212
+#: ../src/applet-device-wifi.c:1255
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ '%s' ã?«æ?¥ç¶?ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet-device-wifi.c:1213 ../src/applet-device-wifi.c:1244
+#: ../src/applet-device-wifi.c:1256 ../src/applet-device-wifi.c:1287
 msgid "(none)"
-msgstr "ï¼?ã?ªã??ï¼?"
+msgstr "(ã?ªã??)"
 
-#: ../src/applet-device-wifi.c:1254
+#: ../src/applet-device-wifi.c:1297
 #, c-format
 msgid "Preparing wireless network connection '%s'..."
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã?®æº?å??中..."
 
-#: ../src/applet-device-wifi.c:1257
+#: ../src/applet-device-wifi.c:1300
 #, c-format
 msgid "Configuring wireless network connection '%s'..."
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã??設å®?中..."
 
-#: ../src/applet-device-wifi.c:1260
+#: ../src/applet-device-wifi.c:1303
 #, c-format
 msgid "User authentication required for wireless network '%s'..."
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ '%s' ã?«ã?¯ã?¦ã?¼ã?¶ã?¼èª?証ã??å¿?è¦?ã?§ã??..."
 
-#: ../src/applet-device-wifi.c:1263
+#: ../src/applet-device-wifi.c:1306
 #, c-format
 msgid "Requesting a wireless network address for '%s'..."
 msgstr "'%s' ç?¨ã?®ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?¢ã??ã?¬ã?¹ã??è¦?æ±?ã??ã?¦ã??ã?¾ã??..."
 
-#: ../src/applet-device-wifi.c:1283
+#: ../src/applet-device-wifi.c:1326
 #, c-format
 msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã?¢ã?¯ã??ã?£ã??ã?§ã??: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1287
+#: ../src/applet-device-wifi.c:1330
 #, c-format
 msgid "Wireless network connection '%s' active"
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã?¢ã?¯ã??ã?£ã??ã?§ã??"
@@ -444,20 +448,17 @@ msgstr "WEP"
 #: ../src/wireless-dialog.c:919
 msgctxt "No wifi security used"
 msgid "None"
-msgstr ""
-"ã?ªã??"
+msgstr "ã?ªã??"
 
 #: ../src/applet-dialogs.c:207
 msgctxt "No wired security used"
 msgid "None"
-msgstr ""
-"ã?ªã??"
+msgstr "ã?ªã??"
 
 #: ../src/applet-dialogs.c:210
 msgctxt "Unknown/unrecognized wired or wifi security"
 msgid "Unknown"
-msgstr ""
-"ä¸?æ??"
+msgstr "ä¸?æ??"
 
 #: ../src/applet-dialogs.c:280 ../src/applet-dialogs.c:382
 #, c-format
@@ -548,7 +549,8 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc."
 
 #: ../src/applet-dialogs.c:676
-msgid "Notification area applet for managing your network devices and connections."
+msgid ""
+"Notification area applet for managing your network devices and connections."
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã??ã??ã?¤ã?¹ã?¨æ?¥ç¶?ã??管ç??ã??ã??ã??ã??ã?®é??ç?¥ã?¨ã?ªã?¢ ã?¢ã??ã?¬ã??ã??"
 
 #: ../src/applet-dialogs.c:678
@@ -557,7 +559,12 @@ msgstr "NetworkManager ã?¦ã?§ã??ã?µã?¤ã??"
 
 #: ../src/applet-dialogs.c:681
 msgid "translator-credits"
-msgstr "Satoru SATOH <ss gnome gr jp>�� GNOME ����� http://www.gnome.gr.jp";
+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"
+"�� GNOME ����� http://www.gnome.gr.jp/";
 
 #: ../src/applet-dialogs.c:697
 msgid "Missing resources"
@@ -720,134 +727,138 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1296
+#: ../src/applet.c:1297
+msgid "device not ready (firmware missing)"
+msgstr "ã??ã??ã?¤ã?¹ã?®æº?å??ã??ã?§ã??ã?¦ã??ã?¾ã??ã?? (ã??ã?¡ã?¼ã? ã?¦ã?§ã?¢ã??å­?å?¨ã??ã?¾ã??ã??)"
+
+#: ../src/applet.c:1299
 msgid "device not ready"
-msgstr "ã??ã??ã?¤ã?¹ã?¯æº?å??ã?§ã??ã?¦ã??ã?¾ã??ã??"
+msgstr "ã??ã??ã?¤ã?¹ã?®æº?å??ã??ã?§ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../src/applet.c:1321
+#: ../src/applet.c:1325
 msgid "Disconnect"
 msgstr "å??æ?­ã??ã??"
 
-#: ../src/applet.c:1335
+#: ../src/applet.c:1339
 msgid "device not managed"
 msgstr "ã??ã??ã?¤ã?¹ã?¯ç®¡ç??ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../src/applet.c:1381
+#: ../src/applet.c:1385
 msgid "No network devices available"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã??ã??ã?¤ã?¹ã??ã??ã??ã?¾ã??ã??"
 
-#: ../src/applet.c:1469
+#: ../src/applet.c:1473
 msgid "_VPN Connections"
 msgstr "VPN ��(_V)"
 
-#: ../src/applet.c:1522
+#: ../src/applet.c:1526
 msgid "_Configure VPN..."
 msgstr "VPN ã??設å®?(_C)..."
 
-#: ../src/applet.c:1526
+#: ../src/applet.c:1530
 msgid "_Disconnect VPN"
-msgstr "VPN ã??å??æ?­ã??ã?? (_D)"
+msgstr "VPN ã??å??æ?­ã??ã??(_D)"
 
-#: ../src/applet.c:1613
+#: ../src/applet.c:1617
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager ã?¯å®?è¡?ã??ã??ã?¦ã??ã?¾ã??ã??..."
 
-#: ../src/applet.c:1618 ../src/applet.c:2394
+#: ../src/applet.c:1622 ../src/applet.c:2426
 msgid "Networking disabled"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã?¯ç?¡å?¹ã?«ã?ªã?£ã?¦ã??ã?¾ã??"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1835
+#: ../src/applet.c:1851
 msgid "Enable _Networking"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã??æ??å?¹ã?«ã??ã??(_N)"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:1844
+#: ../src/applet.c:1860
 msgid "Enable _Wireless"
 msgstr "ç?¡ç·?ã??æ??å?¹ã?«ã??ã??(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1853
+#: ../src/applet.c:1869
 msgid "Enable _Mobile Broadband"
-msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã??æ??å?¹ã?«ã??ã?? (_M)"
+msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã??æ??å?¹ã?«ã??ã??(_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1864
+#: ../src/applet.c:1880
 msgid "Enable N_otifications"
-msgstr "é??ç?¥ã??æ??å?¹ã?«ã??ã?? (_O)"
+msgstr "é??ç?¥ã??æ??å?¹ã?«ã??ã??(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1875
+#: ../src/applet.c:1891
 msgid "Connection _Information"
 msgstr "æ?¥ç¶?æ??å ±(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1885
+#: ../src/applet.c:1901
 msgid "Edit Connections..."
 msgstr "æ?¥ç¶?ã??ç·¨é??ã??ã??..."
 
 #. Help item
-#: ../src/applet.c:1899
+#: ../src/applet.c:1915
 msgid "_Help"
 msgstr "ã??ã?«ã??(_H)"
 
 #. About item
-#: ../src/applet.c:1908
+#: ../src/applet.c:1924
 msgid "_About"
 msgstr "æ??å ±(_A)"
 
-#: ../src/applet.c:2099
+#: ../src/applet.c:2115
 msgid "Disconnected"
 msgstr "å??æ?­ã??ã??ã?¾ã??ã??"
 
-#: ../src/applet.c:2100
+#: ../src/applet.c:2116
 msgid "The network connection has been disconnected."
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã??å??æ?­ã??ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet.c:2260
+#: ../src/applet.c:2292
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã??æº?å??中..."
 
-#: ../src/applet.c:2263
+#: ../src/applet.c:2295
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã?«ã?¦ã?¼ã?¶ã?¼èª?証ã??å¿?è¦?ã?§ã??..."
 
-#: ../src/applet.c:2269
+#: ../src/applet.c:2301
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã?¯ã?¢ã?¯ã??ã?£ã??ã?§ã??ã??"
 
-#: ../src/applet.c:2350
+#: ../src/applet.c:2382
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "VPN æ?¥ç¶? '%s' ã??é??å§?ã??ã?¦ã??ã?¾ã??..."
 
-#: ../src/applet.c:2353
+#: ../src/applet.c:2385
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN æ?¥ç¶? '%s' ã?«ã?¦ã?¼ã?¶ã?¼èª?証ã??å¿?è¦?ã?§ã??..."
 
-#: ../src/applet.c:2356
+#: ../src/applet.c:2388
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "'%s' ã?® VPN ã?¢ã??ã?¬ã?¹ã??è¦?æ±?ã??ã?¦ã??ã?¾ã??..."
 
-#: ../src/applet.c:2359
+#: ../src/applet.c:2391
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN æ?¥ç¶? '%s' ã?¯ã?¢ã?¯ã??ã?£ã??ã?§ã??"
 
-#: ../src/applet.c:2398
+#: ../src/applet.c:2430
 msgid "No network connection"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã??ã??ã??ã?¾ã??ã??"
 
-#: ../src/applet.c:2938
+#: ../src/applet.c:2979
 msgid "NetworkManager Applet"
 msgstr "NetworkManager ã?¢ã??ã?¬ã??ã??"
 
-#: ../src/applet.c:2944 ../src/wired-dialog.c:128
+#: ../src/applet.c:2985 ../src/wired-dialog.c:128
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -873,15 +884,16 @@ msgstr ""
 
 #: ../src/applet.glade.h:6
 msgid "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">ã?¢ã?¯ã??ã?£ã??ã?ªã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?</span>"
+msgstr ""
+"<span size=\"larger\" weight=\"bold\">ã?¢ã?¯ã??ã?£ã??ã?ªã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?</span>"
 
 #: ../src/applet.glade.h:7
 msgid "Anony_mous identity:"
-msgstr "å?¿å??ã?®è­?å?¥å­? (_M):"
+msgstr "å?¿å??ã?®è­?å?¥å­?(_M):"
 
 #: ../src/applet.glade.h:8
 msgid "As_k for this password every time"
-msgstr "æ¯?å??ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??è¦?æ±?ã??ã?? (_K)"
+msgstr "æ¯?å??ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??è¦?æ±?ã??ã??(_K)"
 
 #: ../src/applet.glade.h:9
 msgid ""
@@ -895,7 +907,7 @@ msgstr ""
 
 #: ../src/applet.glade.h:12
 msgid "C_A certificate:"
-msgstr "CA 証æ??æ?¸ (_A):"
+msgstr "CA 証æ??æ?¸(_A):"
 
 #: ../src/applet.glade.h:13
 msgid "C_onnect"
@@ -903,7 +915,7 @@ msgstr "��(_O)"
 
 #: ../src/applet.glade.h:14
 msgid "Co_nnection:"
-msgstr "�� (_N):"
+msgstr "��(_N):"
 
 #: ../src/applet.glade.h:15
 msgid "Connection Information"
@@ -911,17 +923,17 @@ msgstr "æ?¥ç¶?æ??å ±"
 
 #: ../src/applet.glade.h:16
 msgid "Don't _warn me again"
-msgstr "äº?度ã?¨è­¦å??ã??ã?ªã?? (_W)"
+msgstr "äº?度ã?¨è­¦å??ã??ã?ªã??(_W)"
 
 # ã?¨ã??ã??ã??ã??ã??ã?®ã??ã??ã?«è¨³ã??ã?¦ã??ã??ã?? "Identity" ã?®ã?¾ã?¾ã?®æ?¹ã??é?©å??ã??ã??ã??ã??ã?ªã??ã??
 # (WPA-EAP Identity èª?証æ?¹å¼?: ã?¦ã?¼ã?¶ ID ã?¨ã??ã?¹ã?¯ã?¼ã??ã?®çµ?ã?§èª?証)
 #: ../src/applet.glade.h:17
 msgid "I_dentity:"
-msgstr "��� (_D):"
+msgstr "���(_D):"
 
 #: ../src/applet.glade.h:18
 msgid "I_nner authentication:"
-msgstr "å??é?¨èª?証 (_N):"
+msgstr "å??é?¨èª?証(_N):"
 
 #: ../src/applet.glade.h:19
 msgid "No"
@@ -941,19 +953,19 @@ msgstr "ä»?ã?®ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯..."
 
 #: ../src/applet.glade.h:23
 msgid "Private _key:"
-msgstr "ã??ã?©ã?¤ã??ã?¼ã??ã?­ã?¼ (_K):"
+msgstr "ã??ã?©ã?¤ã??ã?¼ã??ã?­ã?¼(_K):"
 
 #: ../src/applet.glade.h:24
 msgid "Sho_w key"
-msgstr "ã?­ã?¼ã??表示 (_W)"
+msgstr "ã?­ã?¼ã??表示(_W)"
 
 #: ../src/applet.glade.h:25 ../src/connection-editor/ce-page-dsl.glade.h:1
 msgid "Sho_w password"
-msgstr "ã??ã?¹ã?¯ã?¼ã??ã??表示 (_W)"
+msgstr "ã??ã?¹ã?¯ã?¼ã??ã??表示(_W)"
 
 #: ../src/applet.glade.h:26
 msgid "WEP inde_x:"
-msgstr "WEP ã?¤ã?³ã??ã??ã?¯ã?¹ (_X):"
+msgstr "WEP ã?¤ã?³ã??ã??ã?¯ã?¹(_X):"
 
 #: ../src/applet.glade.h:27
 msgid "Wireless _adapter:"
@@ -965,49 +977,49 @@ msgstr "ã?¯ã??"
 
 #: ../src/applet.glade.h:29
 msgid "_Authentication:"
-msgstr "�証 (_A):"
+msgstr "�証(_A):"
 
 #: ../src/applet.glade.h:30
 msgid "_Key:"
-msgstr "ã?­ã?¼ (_K):"
+msgstr "ã?­ã?¼(_K):"
 
 #: ../src/applet.glade.h:31
 msgid "_Network name:"
-msgstr "ã??ã??ã??ã?¯ã?¼ã?¯å?? (_N):"
+msgstr "ã??ã??ã??ã?¯ã?¼ã?¯å??(_N):"
 
 #: ../src/applet.glade.h:32
 msgid "_PEAP version:"
-msgstr "PEAP ã??ã?¼ã?¸ã?§ã?³ (_P):"
+msgstr "PEAP ã??ã?¼ã?¸ã?§ã?³(_P):"
 
 #: ../src/applet.glade.h:33 ../src/connection-editor/ce-page-dsl.glade.h:2
 #: ../src/connection-editor/ce-page-mobile.glade.h:15
 msgid "_Password:"
-msgstr "ã??ã?¹ã?¯ã?¼ã?? (_P):"
+msgstr "ã??ã?¹ã?¯ã?¼ã??(_P):"
 
 #: ../src/applet.glade.h:34
 msgid "_Private key password:"
-msgstr "ã??ã?©ã?¤ã??ã?¼ã??ã?­ã?¼ã??ã?¹ã?¯ã?¼ã?? (_P):"
+msgstr "ã??ã?©ã?¤ã??ã?¼ã??ã?­ã?¼ã??ã?¹ã?¯ã?¼ã??(_P):"
 
 #: ../src/applet.glade.h:35 ../src/connection-editor/ce-page-mobile.glade.h:16
 msgid "_Type:"
-msgstr "ã?¿ã?¤ã?? (_T):"
+msgstr "ã?¿ã?¤ã??(_T):"
 
 #: ../src/applet.glade.h:36
 msgid "_Unlock"
-msgstr "é??é?  (_U)"
+msgstr "é??é? (_U)"
 
 #: ../src/applet.glade.h:37
 msgid "_User certificate:"
-msgstr "ã?¦ã?¼ã?¶ã?¼è¨¼æ??æ?¸ (_U):"
+msgstr "ã?¦ã?¼ã?¶ã?¼è¨¼æ??æ?¸(_U):"
 
 #: ../src/applet.glade.h:38 ../src/connection-editor/ce-page-dsl.glade.h:4
 #: ../src/connection-editor/ce-page-mobile.glade.h:17
 msgid "_Username:"
-msgstr "ã?¦ã?¼ã?¶ã?¼å?? (_U):"
+msgstr "ã?¦ã?¼ã?¶ã?¼å??(_U):"
 
 #: ../src/applet.glade.h:39
 msgid "_Wireless security:"
-msgstr "ç?¡ç·?ã?»ã?­ã?¥ã?ªã??ã?£ (_W):"
+msgstr "ç?¡ç·?ã?»ã?­ã?¥ã?ªã??ã?£(_W):"
 
 #: ../src/applet.glade.h:40
 msgid "label"
@@ -1017,14 +1029,14 @@ msgstr "ã?©ã??ã?«"
 msgid "automatic"
 msgstr "è?ªå??"
 
-#: ../src/connection-editor/ce-page.c:221
+#: ../src/connection-editor/ce-page.c:222
 #: ../src/connection-editor/nm-connection-editor.c:616
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "ä¸?æ??ã?ªã?¨ã?©ã?¼ã?®ã??ã??æ?¥ç¶? secret ã??æ?´æ?°ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
 #: ../src/connection-editor/ce-page-dsl.glade.h:3
 msgid "_Service:"
-msgstr "ã?µã?¼ã??ã?¹ (_S):"
+msgstr "ã?µã?¼ã??ã?¹(_S):"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:1
 #: ../src/connection-editor/ce-page-ip6.glade.h:1
@@ -1041,14 +1053,14 @@ msgid ""
 "Shared to other computers"
 msgstr ""
 "è?ªå??\n"
-"æ??å?? DNS ã?»ã??ã??ã?£ã?³ã?°ä»?ã??ã?®è?ªå??\n"
+"è?ªå?? (DNS 設å®?ã?®ã?¿æ??å??)\n"
 "æ??å??\n"
-"ä»?ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¨\n"
-"å?±æ??ã??ã??ã?­ã?¼ã?«ã?«ã?¸ã?ªã?³ã?¯"
+"�������\n"
+"ä»?ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¨å?±æ??"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:7
 msgid "D_HCP client ID:"
-msgstr "DHCP ã?¯ã?©ã?¤ã?¢ã?³ã?? ID (_H):"
+msgstr "DHCP ã?¯ã?©ã?¤ã?¢ã?³ã?? ID(_H):"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:8
 #: ../src/connection-editor/ce-page-ip6.glade.h:7
@@ -1089,7 +1101,7 @@ msgstr ""
 #: ../src/connection-editor/ce-page-ip4.glade.h:12
 #: ../src/connection-editor/ce-page-ip6.glade.h:11
 msgid "Ig_nore automatically obtained routes"
-msgstr "è?ªå??å??å¾?ã??ã??ã?«ã?¼ã??ã??ç?¡è¦?ã??ã?? (_N)"
+msgstr "è?ªå??å??å¾?ã??ã??ã?«ã?¼ã??ã??ç?¡è¦?ã??ã??(_N)"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:13
 msgid "Require IPv4 addressing for this connection to complete"
@@ -1108,7 +1120,7 @@ msgstr ""
 #: ../src/connection-editor/ce-page-ip4.glade.h:15
 #: ../src/connection-editor/ce-page-ip6.glade.h:13
 msgid "Use this c_onnection only for resources on its network"
-msgstr "ã??ã?®ã??ã??ã??ã?¯ã?¼ã?¯ä¸?ã?®ã?ªã?½ã?¼ã?¹ã?®ã??ã??ã?«ã?®ã?¿ã??ã?®æ?¥ç¶?ã??使ç?¨ (_O)"
+msgstr "ã??ã?®ã??ã??ã??ã?¯ã?¼ã?¯ä¸?ã?®ã?ªã?½ã?¼ã?¹ã?®ã??ã??ã?«ã?®ã?¿ã??ã?®æ?¥ç¶?ã??使ç?¨(_O)"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:16
 msgid ""
@@ -1121,22 +1133,22 @@ msgstr ""
 #: ../src/connection-editor/ce-page-ip4.glade.h:17
 #: ../src/connection-editor/ce-page-ip6.glade.h:15
 msgid "_DNS servers:"
-msgstr "DNS ã?µã?¼ã??ã?¼ (_D):"
+msgstr "DNS ã?µã?¼ã??ã?¼(_D):"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:18
 #: ../src/connection-editor/ce-page-ip6.glade.h:16
 msgid "_Method:"
-msgstr "�� (_M):"
+msgstr "��(_M):"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:19
 #: ../src/connection-editor/ce-page-ip6.glade.h:17
 msgid "_Routes&#x2026;"
-msgstr "ã?«ã?¼ã?? &#x2026; (_R)"
+msgstr "ã?«ã?¼ã?? &#x2026;(_R)"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:20
 #: ../src/connection-editor/ce-page-ip6.glade.h:18
 msgid "_Search domains:"
-msgstr "ã??ã?¡ã?¤ã?³ã??æ¤?ç´¢ (_S):"
+msgstr "ã??ã?¡ã?¤ã?³ã??æ¤?ç´¢(_S):"
 
 #: ../src/connection-editor/ce-page-ip6.glade.h:12
 msgid "Require IPv6 addressing for this connection to complete"
@@ -1182,23 +1194,23 @@ msgstr "��..."
 
 #: ../src/connection-editor/ce-page-mobile.glade.h:10
 msgid "N_etwork ID:"
-msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ ID (_E):"
+msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ ID(_E):"
 
 #: ../src/connection-editor/ce-page-mobile.glade.h:11
 msgid "Nu_mber:"
-msgstr "�� (_M):"
+msgstr "��(_M):"
 
 #: ../src/connection-editor/ce-page-mobile.glade.h:12
 msgid "PI_N:"
-msgstr "PIN �� (_N):"
+msgstr "PIN ��(_N):"
 
 #: ../src/connection-editor/ce-page-mobile.glade.h:13
 msgid "Sho_w passwords"
-msgstr "ã??ã?¹ã?¯ã?¼ã??ã??表示 (_W)"
+msgstr "ã??ã?¹ã?¯ã?¼ã??ã??表示(_W)"
 
 #: ../src/connection-editor/ce-page-mobile.glade.h:14
 msgid "_APN:"
-msgstr "APN (_A):"
+msgstr "APN(_A):"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:1
 msgid "<b>Allowed Authentication Methods</b>"
@@ -1214,7 +1226,7 @@ msgstr "<b>�縮</b>"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:4
 msgid "<b>Echo</b>"
-msgstr "<b>���</b>"
+msgstr "<b>Echo</b>"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:5
 msgid ""
@@ -1227,83 +1239,88 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:6
 msgid "Allow _BSD data compression"
-msgstr "BSD ã??ã?¼ã?¿å?§ç¸®ã??許å?¯ã??ã?? (_B)"
+msgstr "BSD ã??ã?¼ã?¿å?§ç¸®ã??許å?¯ã??ã??(_B)"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:7
 msgid "Allow _Deflate data compression"
-msgstr "Deflate ã??ã?¼ã?¿å?§ç¸®ã??許å?¯ã??ã?? (_D)"
+msgstr "Deflate ã??ã?¼ã?¿å?§ç¸®ã??許å?¯ã??ã??(_D)"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:8
 msgid "Allowed methods:"
-msgstr "æ?¹æ³?ã??許å?¯ã??ã??:"
+msgstr "������証��:"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:9
 msgid "C_HAP"
-msgstr "CHAP (_H)"
+msgstr "CHAP(_H)"
 
+# http://technet.microsoft.com/ja-jp/library/cc757631(WS.10).aspx
 #: ../src/connection-editor/ce-page-ppp.glade.h:10
 msgid "Challenge Handshake Authentication Protocol"
-msgstr "ã??ã?£ã?¬ã?³ã?¸ã??ã?³ã??ã?·ã?§ã?¼ã?¯èª?証ã??ã?­ã??ã?³ã?«ï¼?CHAPï¼?"
+msgstr "ã??ã?£ã?¬ã?³ã?¸ã??ã?³ã??ã?·ã?§ã?¤ã?¯èª?証ã??ã?­ã??ã?³ã?« (CHAP)"
 
+# "auth_methods_button"ã??ã?¿ã?³ã?®ã?©ã??ã?«
 #: ../src/connection-editor/ce-page-ppp.glade.h:11
 msgid "Configure _Methodsâ?¦"
-msgstr "æ?¹æ³?ã??設å®?ã??ã?? (_M)â?¦"
+msgstr "èª?証æ?¹æ³?ã??設å®?ã??ã??(_M)â?¦"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:12
 msgid "Extensible Authentication Protocol"
-msgstr "æ?¡å¼µå??èª?証ã??ã?­ã??ã?³ã?«"
+msgstr "æ?¡å¼µèª?証ã??ã?­ã??ã?³ã?« (EAP)"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:13
 msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
+msgstr "MSCHAP v2(_2)"
 
+# http://technet.microsoft.com/ja-jp/library/cc758984(WS.10).aspx
 #: ../src/connection-editor/ce-page-ppp.glade.h:14
 msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "Microsoft ã??ã?£ã?¬ã?³ã?¸ã??ã?³ã??ã?·ã?§ã?¼ã?¯èª?証ã??ã?­ã??ã?³ã?«"
+msgstr "Microsoft ã??ã?£ã?¬ã?³ã?¸ã??ã?³ã??ã?·ã?§ã?¤ã?¯èª?証ã??ã?­ã??ã?³ã?« (MS-CHAP)"
 
+# http://technet.microsoft.com/ja-jp/library/cc739678(WS.10).aspx
 #: ../src/connection-editor/ce-page-ppp.glade.h:15
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "Microsoft ã??ã?£ã?¬ã?³ã?¸ã??ã?³ã??ã?·ã?§ã?¼ã?¯èª?証ã??ã?­ã??ã?³ã?« ã??ã?¼ã?¸ã?§ã?³ 2"
+msgstr ""
+"Microsoft ã??ã?£ã?¬ã?³ã?¸ã??ã?³ã??ã?·ã?§ã?¤ã?¯èª?証ã??ã?­ã??ã?³ã?« ã??ã?¼ã?¸ã?§ã?³2 (MS-CHAP v2)"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:16
 msgid "Password Authentication Protocol"
-msgstr "ã??ã?¹ã?¯ã?¼ã??èª?証ã??ã?­ã??ã?³ã?«"
+msgstr "ã??ã?¹ã?¯ã?¼ã??èª?証ã??ã?­ã??ã?³ã?« (PAP)"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:17
 msgid "Send PPP _echo packets"
-msgstr "PPP ã?¨ã?³ã?¼ã?®ã??ã?±ã??ã??ã??é??ä¿¡ (_E)"
+msgstr "PPP Echo ã?®ã??ã?±ã??ã??ã??é??ä¿¡(_E)"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:18
 msgid "Use TCP _header compression"
-msgstr "TCP ã??ã??ã??å?§ç¸®ã??使ç?¨ (_H)"
+msgstr "TCP ã??ã??ã??å?§ç¸®ã??使ç?¨(_H)"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:19
 msgid "Use _stateful MPPE"
-msgstr "ã?¹ã??ã?¼ã??ã??ã?« MPPE ã??使ç?¨ (_S)"
+msgstr "ã?¹ã??ã?¼ã??ã??ã?« MPPE ã??使ç?¨(_S)"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:20
 msgid "_EAP"
-msgstr "_EAP"
+msgstr "EAP(_E)"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:21
 msgid "_MSCHAP"
-msgstr "MSCHAP (_M)"
+msgstr "MSCHAP(_M)"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:22
 msgid "_PAP"
-msgstr "_PAP"
+msgstr "PAP(_P)"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:23
 msgid "_Require 128-bit encryption"
-msgstr "128-bit ã?®æ??å?·å??ã??å¿?è¦? (_R)"
+msgstr "128-bit ã?®æ??å?·å??ã??è¦?æ±?(_R)"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:24
 msgid "_Use point-to-point encryption (MPPE)"
-msgstr "MPPE (ã??ã?¤ã?³ã??ã??ã?¼ã??ã?¤ã?³ã??æ??å?·å??) ã??使ç?¨ (_U)"
+msgstr "MPPE (ã??ã?¤ã?³ã??ã??ã?¼ã??ã?¤ã?³ã??æ??å?·å??) ã??使ç?¨(_U)"
 
 #: ../src/connection-editor/ce-page-wired.glade.h:1
 msgid "Aut_onegotiate"
-msgstr "è?ªå??交æ¸? (_O)"
+msgstr "ã?ªã?¼ã??ã??ã?´ã?·ã?¨ã?¼ã?·ã?§ã?³(_O)"
 
 #: ../src/connection-editor/ce-page-wired.glade.h:2
 msgid ""
@@ -1335,28 +1352,53 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-wired.glade.h:12
 msgid "Full duple_x"
-msgstr "å®?å?¨ã??ã?¥ã?¼ã??ã?¬ã??ã?¯ã?¹ (_X)"
+msgstr "å®?å?¨ã??ã?¥ã?¼ã??ã?¬ã??ã?¯ã?¹(_X)"
 
 #: ../src/connection-editor/ce-page-wired.glade.h:13
 #: ../src/connection-editor/ce-page-wireless.glade.h:8
 msgid "MT_U:"
-msgstr "MTU (_U):"
+msgstr "MTU(_U):"
 
 #: ../src/connection-editor/ce-page-wired.glade.h:14
-#: ../src/connection-editor/ce-page-wireless.glade.h:15
-msgid "_MAC address:"
-msgstr "MAC ã?¢ã??ã?¬ã?¹ (_M):"
+#: ../src/connection-editor/ce-page-wireless.glade.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"
 
 #: ../src/connection-editor/ce-page-wired.glade.h:15
-msgid "_Port:"
-msgstr "ã??ã?¼ã?? (_P):"
+#: ../src/connection-editor/ce-page-wireless.glade.h:12
+msgid ""
+"This option locks this connection to the network device specified by its "
+"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+msgstr ""
+"ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã??ã?«å?¥å??ã??ã?¦ã??ã??MACã?¢ã??ã?¬ã?¹ã?§æ??å®?ã??ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯ã??ã??ã?¤ã?¹"
+"ã?§ã??ã??ã?®æ?¥ç¶?ã??ã?­ã??ã?¯ã??ã?¾ã??ã??ä¾?: 00:11:22:33:44:55"
 
 #: ../src/connection-editor/ce-page-wired.glade.h:16
-msgid "_Speed:"
-msgstr "é??度 (_S):"
+#: ../src/connection-editor/ce-page-wireless.glade.h:16
+msgid "_Cloned MAC address:"
+msgstr "ã?¯ã?­ã?¼ã?³ã??ã?? MAC ã?¢ã??ã?¬ã?¹(_C):"
 
 #: ../src/connection-editor/ce-page-wired.glade.h:17
-#: ../src/connection-editor/ce-page-wireless.glade.h:18
+#: ../src/connection-editor/ce-page-wireless.glade.h:17
+msgid "_Device MAC address:"
+msgstr "ã??ã??ã?¤ã?¹ã?® MAC ã?¢ã??ã?¬ã?¹(_D):"
+
+#: ../src/connection-editor/ce-page-wired.glade.h:18
+msgid "_Port:"
+msgstr "ã??ã?¼ã??(_P):"
+
+#: ../src/connection-editor/ce-page-wired.glade.h:19
+msgid "_Speed:"
+msgstr "é??度(_S):"
+
+#: ../src/connection-editor/ce-page-wired.glade.h:20
+#: ../src/connection-editor/ce-page-wireless.glade.h:20
 msgid "bytes"
 msgstr "ã??ã?¤ã??"
 
@@ -1372,11 +1414,11 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:4
 msgid "Ban_d:"
-msgstr "ã??ã?³ã?? (_D):"
+msgstr "ã??ã?³ã??(_D):"
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:5
 msgid "C_hannel:"
-msgstr "ã??ã?£ã?³ã??ã?« (_H):"
+msgstr "ã??ã?£ã?³ã??ã?«(_H):"
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:6
 msgid ""
@@ -1388,21 +1430,13 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:9
 msgid "M_ode:"
-msgstr "ã?¢ã?¼ã?? (_O):"
+msgstr "ã?¢ã?¼ã??(_O):"
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:10
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:11
-msgid ""
-"This option locks this connection to the network device specified by the MAC "
-"address entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-"ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã??ã?«å?¥å??ã??ã?¦ã??ã?? MAC ã?¢ã??ã?¬ã?¹ã?§æ??å®?ã??ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯ã??ã??ã?¤"
-"ã?¹ã?¸ ã??ã?®æ?¥ç¶?ã??ã?­ã??ã?¯ã??ã?¾ã??ã??ä¾?: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wireless.glade.h:12
+#: ../src/connection-editor/ce-page-wireless.glade.h:13
 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"
@@ -1410,29 +1444,29 @@ msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã??ã?«å?¥å??ã??ã?¦ã??ã?? BSSID ã?§æ??å®?ã??ã??ã??ã?¯ã?¤ã?¤ã?¬ã?¹ ã?¢ã?¯ã?»ã?¹ã??ã?¤"
 "ã?³ã?? (AP) ã?¸ã??ã?®æ?¥ç¶?ã??ã?­ã??ã?¯ã??ã?¾ã??ã??"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:13
+#: ../src/connection-editor/ce-page-wireless.glade.h:14
 msgid "Transmission po_wer:"
-msgstr "é??ä¿¡ã??ã?¯ã?¼ (_W):"
+msgstr "é??ä¿¡ã??ã?¯ã?¼(_W):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:14
+#: ../src/connection-editor/ce-page-wireless.glade.h:15
 msgid "_BSSID:"
-msgstr "BSSID (_B):"
+msgstr "BSSID(_B):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:16
+#: ../src/connection-editor/ce-page-wireless.glade.h:18
 msgid "_Rate:"
-msgstr "ã?¬ã?¼ã?? (_R):"
+msgstr "ã?¬ã?¼ã??(_R):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:17
+#: ../src/connection-editor/ce-page-wireless.glade.h:19
 msgid "_SSID:"
-msgstr "SSID (_S):"
+msgstr "SSID(_S):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:19
+#: ../src/connection-editor/ce-page-wireless.glade.h:21
 msgid "mW"
 msgstr "mW"
 
 #: ../src/connection-editor/ce-page-wireless-security.glade.h:1
 msgid "_Security:"
-msgstr "ã?»ã?­ã?¥ã?ªã??ã?£ (_S):"
+msgstr "ã?»ã?­ã?¥ã?ªã??ã?£(_S):"
 
 #: ../src/connection-editor/ce-vpn-wizard.glade.h:2
 msgid ""
@@ -1454,20 +1488,20 @@ msgstr "ä½?æ??â?¦"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:501
 #: ../src/connection-editor/ip6-routes-dialog.c:459
-#: ../src/connection-editor/page-ip4.c:731
-#: ../src/connection-editor/page-ip6.c:716
+#: ../src/connection-editor/page-ip4.c:738
+#: ../src/connection-editor/page-ip6.c:723
 msgid "Address"
 msgstr "ã?¢ã??ã?¬ã?¹"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:517
-#: ../src/connection-editor/page-ip4.c:748
+#: ../src/connection-editor/page-ip4.c:755
 msgid "Netmask"
 msgstr "ã??ã??ã??ã??ã?¹ã?¯"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:533
 #: ../src/connection-editor/ip6-routes-dialog.c:491
-#: ../src/connection-editor/page-ip4.c:765
-#: ../src/connection-editor/page-ip6.c:750
+#: ../src/connection-editor/page-ip4.c:772
+#: ../src/connection-editor/page-ip6.c:757
 msgid "Gateway"
 msgstr "ã?²ã?¼ã??ã?¦ã?§ã?¤"
 
@@ -1477,7 +1511,7 @@ msgid "Metric"
 msgstr "ã?¡ã??ã?ªã??ã?¯"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:475
-#: ../src/connection-editor/page-ip6.c:733
+#: ../src/connection-editor/page-ip6.c:740
 msgid "Prefix"
 msgstr "æ?¥é ­è¾?"
 
@@ -1554,17 +1588,17 @@ msgstr "ä»?ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¸å?±æ??"
 msgid "Disabled"
 msgstr "ç?¡å?¹ã?«ã?ªã?£ã?¦ã??ã?¾ã??"
 
-#: ../src/connection-editor/page-ip4.c:693
+#: ../src/connection-editor/page-ip4.c:700
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s ç?¨ã?® IPv4 ã?«ã?¼ã??ã??ç·¨é??"
 
-#: ../src/connection-editor/page-ip4.c:812
 #: ../src/connection-editor/page-ip4.c:819
+#: ../src/connection-editor/page-ip4.c:826
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../src/connection-editor/page-ip4.c:825
+#: ../src/connection-editor/page-ip4.c:832
 msgid "IPv4 Settings"
 msgstr "IPv4 ã?®ã?»ã??ã??ã?£ã?³ã?°"
 
@@ -1577,7 +1611,7 @@ msgid "Automatic, addresses only"
 msgstr "è?ªå??ã??ã?¢ã??ã?¬ã?¹ã?®ã?¿"
 
 #: ../src/connection-editor/page-ip6.c:148
-#: ../src/wireless-security/eap-method.c:196
+#: ../src/wireless-security/eap-method.c:212
 msgid "Ignore"
 msgstr "ç?¡è¦?ã??ã??"
 
@@ -1585,24 +1619,25 @@ msgstr "ç?¡è¦?ã??ã??"
 msgid "Automatic, DHCP only"
 msgstr "è?ªå??ã?? DHCP ã?®ã?¿"
 
-#: ../src/connection-editor/page-ip6.c:678
+#: ../src/connection-editor/page-ip6.c:685
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s ç?¨ã?® IPv6 ã?«ã?¼ã??ã??ç·¨é??"
 
-#: ../src/connection-editor/page-ip6.c:795
 #: ../src/connection-editor/page-ip6.c:802
+#: ../src/connection-editor/page-ip6.c:809
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../src/connection-editor/page-ip6.c:808
+#: ../src/connection-editor/page-ip6.c:815
 msgid "IPv6 Settings"
 msgstr "IPv6 ã?®ã?»ã??ã??ã?£ã?³ã?°"
 
 #: ../src/connection-editor/page-mobile.c:305
 #: ../src/connection-editor/page-mobile.c:312
 msgid "Could not load mobile broadband user interface."
-msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã?®ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+msgstr ""
+"ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã?®ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
 #: ../src/connection-editor/page-mobile.c:333
 msgid "Unsupported mobile broadband connection type."
@@ -1625,11 +1660,12 @@ msgstr ""
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "ç§?ã?®ã??ã?­ã??ã?¤ã??ã?¯ GSM ã??ã?¼ã?¹ã?®æ??è¡? (ä¾?ã??ã?°ã?? GPRS, EDGE, UMTS, HSDPA) ã??使ç?¨ã??"
-"ã?¾ã?? (_G)"
+"ã?¾ã??(_G)"
 
 #: ../src/connection-editor/page-mobile.c:611
 msgid "My provider uses _CDMA-based technology (i.e. 1xRTT, EVDO)"
-msgstr "ç§?ã?®ã??ã?­ã??ã?¤ã??ã?¯ CDMA ã??ã?¼ã?¹ã?®æ??è¡? (ä¾?ã??ã?°ã??1xRTT, EVDOï¼?ã??使ç?¨ã??ã?¾ã?? (_C)"
+msgstr ""
+"ç§?ã?®ã??ã?­ã??ã?¤ã??ã?¯ CDMA ã??ã?¼ã?¹ã?®æ??è¡? (ä¾?ã??ã?°ã??1xRTT, EVDO)ã??使ç?¨ã??ã?¾ã??(_C)"
 
 #: ../src/connection-editor/page-ppp.c:132
 msgid "EAP"
@@ -1692,18 +1728,18 @@ msgstr "'%s' ç?¨ã?® VPN plugin ã?µã?¼ã??ã?¹ã??è¦?ä»?ã??ã??ã?¾ã??ã??ã?§ã??ã??"
 msgid "VPN connection %d"
 msgstr "VPN �� %d"
 
-#: ../src/connection-editor/page-wired.c:207
-#: ../src/connection-editor/page-wired.c:214
+#: ../src/connection-editor/page-wired.c:213
+#: ../src/connection-editor/page-wired.c:220
 msgid "Could not load wired user interface."
 msgstr "æ??ç·?ã?®ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../src/connection-editor/page-wired.c:220
+#: ../src/connection-editor/page-wired.c:226
 #: ../src/connection-editor/nm-connection-editor.glade.h:9
 #: ../src/connection-editor/nm-connection-list.c:1393
 msgid "Wired"
 msgstr "æ??ç·?"
 
-#: ../src/connection-editor/page-wired.c:339
+#: ../src/connection-editor/page-wired.c:359
 #, c-format
 msgid "Wired connection %d"
 msgstr "æ??ç·?æ?¥ç¶? %d"
@@ -1716,36 +1752,38 @@ msgstr "802.1x ã?»ã?­ã?¥ã?ªã??ã?£"
 msgid "Use 802.1X security for this connection"
 msgstr "ã??ã?®æ?¥ç¶?ã?« 802.1x ã?»ã?­ã?¥ã?ªã??ã?£ã??使ç?¨ã??ã??"
 
-#: ../src/connection-editor/page-wireless.c:144
-#: ../src/connection-editor/page-wireless.c:148
+#: ../src/connection-editor/page-wireless.c:146
+#: ../src/connection-editor/page-wireless.c:150
+#: ../src/connection-editor/page-wireless.c:171
+#, c-format
 msgid "default"
 msgstr "ã??ã??ã?©ã?«ã??"
 
-#: ../src/connection-editor/page-wireless.c:166
+#: ../src/connection-editor/page-wireless.c:175
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:351
-#: ../src/connection-editor/page-wireless.c:358
+#: ../src/connection-editor/page-wireless.c:399
+#: ../src/connection-editor/page-wireless.c:406
 msgid "Could not load WiFi user interface."
 msgstr "WiFi ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??å?ºæ?¥ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../src/connection-editor/page-wireless.c:364
+#: ../src/connection-editor/page-wireless.c:412
 #: ../src/connection-editor/nm-connection-editor.glade.h:10
 #: ../src/connection-editor/nm-connection-list.c:1397
 msgid "Wireless"
 msgstr "ç?¡ç·?"
 
-#: ../src/connection-editor/page-wireless.c:511
+#: ../src/connection-editor/page-wireless.c:574
 #, c-format
 msgid "Wireless connection %d"
 msgstr "���� %d"
 
 #: ../src/connection-editor/page-wireless-security.c:262
 #: ../src/wireless-dialog.c:936
-msgid "WEP 40/128-bit Key"
-msgstr "WEP 40/128-bit ã?­ã?¼"
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr "WEP 40/128-bit ã?­ã?¼ (HEX ã?¾ã??ã?¯ ASCII)"
 
 #: ../src/connection-editor/page-wireless-security.c:271
 #: ../src/wireless-dialog.c:945
@@ -1760,13 +1798,13 @@ msgstr "å??ç?? WEP (802.1x)"
 #: ../src/connection-editor/page-wireless-security.c:311
 #: ../src/wireless-dialog.c:989
 msgid "WPA & WPA2 Personal"
-msgstr "WPA ã?¨ WPA2 ã?®ã??ã?¼ã?½ã??ã?«"
+msgstr "WPA & WPA2 Personal"
 
 # ã??ã??ã??ã??ä»?æ§?ã?®å??å??ã?ªã?®ã?§è¨³ã??ã?¹ã??ã?§ã?ªã??ã??
 #: ../src/connection-editor/page-wireless-security.c:325
 #: ../src/wireless-dialog.c:1003
 msgid "WPA & WPA2 Enterprise"
-msgstr "WPA ã?¨ WPA2 ã?®ã?¨ã?³ã?¿ã?¼ã??ã?©ã?¤ã?º"
+msgstr "WPA & WPA2 Enterprise"
 
 #: ../src/connection-editor/page-wireless-security.c:365
 msgid "Could not load WiFi security user interface; missing WiFi setting."
@@ -1817,8 +1855,8 @@ msgid "Apply"
 msgstr "é?©ç?¨"
 
 #: ../src/connection-editor/nm-connection-editor.c:420
-msgid "Save this connection for all users of this machine."
-msgstr "ã??ã?®ã??ã?·ã?³ã?®å?¨ã?¦ã?®ã?¦ã?¼ã?¶ã?¼ç?¨ã?«ã??ã?®æ?¥ç¶?ã??ä¿?å­?"
+msgid "Save any changes made to this connection."
+msgstr "ã??ã?®æ?¥ç¶?ã?«å¯¾ã??ã?¦ã?®å¤?æ?´ã??ã??ã?¹ã?¦ä¿?å­?ã??ã?¾ã??ã??"
 
 #: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Apply..."
@@ -1834,11 +1872,11 @@ msgstr "������������"
 
 #: ../src/connection-editor/nm-connection-editor.glade.h:2
 msgid "Connect _automatically"
-msgstr "è?ªå??æ?¥ç¶?ã??ã?? (_A) "
+msgstr "è?ªå??æ?¥ç¶?ã??ã??(_A) "
 
 #: ../src/connection-editor/nm-connection-editor.glade.h:3
 msgid "Connection _name:"
-msgstr "æ?¥ç¶?å?? (_N):"
+msgstr "æ?¥ç¶?å??(_N):"
 
 #: ../src/connection-editor/nm-connection-editor.glade.h:5
 msgid "E_xport"
@@ -1846,7 +1884,7 @@ msgstr "ã?¨ã?¯ã?¹ã??ã?¼ã??(_X)"
 
 #: ../src/connection-editor/nm-connection-editor.glade.h:11
 msgid "_Import"
-msgstr "ã?¤ã?³ã??ã?¼ã?? (_)"
+msgstr "ã?¤ã?³ã??ã?¼ã??(_)"
 
 #: ../src/connection-editor/nm-connection-list.c:219
 msgid "never"
@@ -1863,35 +1901,30 @@ msgstr "ä»?"
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d å??å??"
-msgstr[1] "%d å??å??"
 
 #: ../src/connection-editor/nm-connection-list.c:252
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d æ??é??å??"
-msgstr[1] "%d æ??é??å??"
 
 #: ../src/connection-editor/nm-connection-list.c:264
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d æ?¥å??"
-msgstr[1] "%d æ?¥å??"
 
 #: ../src/connection-editor/nm-connection-list.c:270
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ã?¶æ??å??"
-msgstr[1] "%d ã?¶æ??å??"
 
 #: ../src/connection-editor/nm-connection-list.c:274
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d å¹´å??"
-msgstr[1] "%d å¹´å??"
 
 #: ../src/connection-editor/nm-connection-list.c:596
 msgid "Connection add failed"
@@ -2023,7 +2056,7 @@ msgstr "\"%s\" ã?¨è¨?ã??ã??ã?¡ã?¤ã?«ã?¯æ?¢ã?«å­?å?¨ã??ã?¾ã??ã??"
 
 #: ../src/connection-editor/vpn-helpers.c:312
 msgid "_Replace"
-msgstr "å?¥ã??æ?¿ã?? (_R)"
+msgstr "å?¥ã??æ?¿ã??(_R)"
 
 #: ../src/connection-editor/vpn-helpers.c:314
 #, c-format
@@ -2107,16 +2140,17 @@ msgstr ""
 #: ../src/gnome-bluetooth/bt-widget.c:944
 #, c-format
 msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr "Bluetooth ã?®è¨­å®?ã?¯ã?§ã??ã?¾ã??ã??ï¼?D-Bus ã?¸ã?®æ?¥ç¶?ã?«å¤±æ??: %sï¼?"
+msgstr "Bluetooth ã?®è¨­å®?ã?¯ã?§ã??ã?¾ã??ã??(D-Bus ã?¸ã?®æ?¥ç¶?ã?«å¤±æ??: %s)"
 
 #: ../src/gnome-bluetooth/bt-widget.c:954
 msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr "Bluetooth ã?®è¨­å®?ã?¯ã?§ã??ã?¾ã??ã??ï¼?D-Bus ã??ã?­ã?­ã?·ã?®ä½?æ??ã?«å¤±æ??ï¼?"
+msgstr "Bluetooth ã?®è¨­å®?ã?¯ã?§ã??ã?¾ã??ã??(D-Bus ã??ã?­ã?­ã?·ã?®ä½?æ??ã?«å¤±æ??)"
 
 #: ../src/gnome-bluetooth/bt-widget.c:963
 #, c-format
-msgid "Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr "Bluetooth ã?®è¨­å®?ã?¯ã?§ã??ã?¾ã??ã??ï¼?NetworkManager ã?®æ¤?索中ã?«ã?¨ã?©ã?¼ç?ºç??: %sï¼?"
+msgid ""
+"Bluetooth configuration not possible (error finding NetworkManager: %s)."
+msgstr "Bluetooth ã?®è¨­å®?ã?¯ã?§ã??ã?¾ã??ã??(NetworkManager ã?®æ¤?索中ã?«ã?¨ã?©ã?¼ç?ºç??: %s)"
 
 #: ../src/gnome-bluetooth/bt-widget.c:1014
 msgid "Use your mobile phone as a network device (PAN/NAP)"
@@ -2221,8 +2255,10 @@ msgid "Roaming network"
 msgstr "ã?­ã?¼ã??ã?³ã?°ã??ã??ã??ã?¯ã?¼ã?¯"
 
 #: ../src/utils/mobile-wizard.c:196
-msgid "Your mobile broadband connection is configured with the following settings:"
-msgstr "ã??使ç?¨ã?®ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??æ?¥ç¶?ã?¯ä»¥ä¸?ã?®ã?»ã??ã??ã?£ã?³ã?°ã?§è¨­å®?ã??ã??ã?¦ã??ã?¾ã??:"
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"ã??使ç?¨ã?®ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??æ?¥ç¶?ã?¯ä»¥ä¸?ã?®ã?»ã??ã??ã?£ã?³ã?°ã?§è¨­å®?ã??ã??ã?¦ã??ã?¾ã??:"
 
 #. Device
 #: ../src/utils/mobile-wizard.c:203
@@ -2263,11 +2299,11 @@ msgstr "ä¸?覧ã?«ç?¡ã??"
 
 #: ../src/utils/mobile-wizard.c:437
 msgid "_Select your plan:"
-msgstr "使ç?¨ã??ã?©ã?³ã?®é?¸æ?? (_S):"
+msgstr "使ç?¨ã??ã?©ã?³ã?®é?¸æ??(_S):"
 
 #: ../src/utils/mobile-wizard.c:461
 msgid "Selected plan _APN (Access Point Name):"
-msgstr "é?¸æ??ã??ã?? APN (Access Point Name) (_A):"
+msgstr "é?¸æ??ã??ã?? APN (Access Point Name)(_A):"
 
 #: ../src/utils/mobile-wizard.c:480
 msgid ""
@@ -2292,7 +2328,7 @@ msgstr "ç§?ã?®ã??ã?©ã?³ã?¯ä¸?覧ã?«æ??ã??ã?¾ã??ã??..."
 
 #: ../src/utils/mobile-wizard.c:688
 msgid "Select your provider from a _list:"
-msgstr "ã??使ç?¨ã?®ã??ã?­ã??ã?¤ã??ã??ä¸?覧ã??ã??é?¸æ?? (_L):"
+msgstr "ã??使ç?¨ã?®ã??ã?­ã??ã?¤ã??ã??ä¸?覧ã??ã??é?¸æ??(_L):"
 
 #: ../src/utils/mobile-wizard.c:701
 msgid "Provider"
@@ -2386,7 +2422,7 @@ msgstr "æ?°è¦?ã?®ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??æ?¥ç¶?"
 msgid "United Kingdom"
 msgstr "��"
 
-#: ../src/utils/nmn-mobile-providers.c:523
+#: ../src/utils/nmn-mobile-providers.c:508
 msgid "Default"
 msgstr "ã??ã??ã?©ã?«ã??"
 
@@ -2423,7 +2459,7 @@ msgstr "��..."
 
 #: ../src/wireless-dialog.c:1094
 msgid "C_reate"
-msgstr "ä½?æ?? (_R)"
+msgstr "ä½?æ??(_R)"
 
 #: ../src/wireless-dialog.c:1175
 #, c-format
@@ -2468,11 +2504,11 @@ msgid ""
 "to connect to."
 msgstr "æ?¥ç¶?ã??ã??ã??ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?®å??å??ã?¨ã?»ã?­ã?¥ã?ªã??ã?£è©³ç´°ã??å?¥å??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../src/wireless-security/eap-method.c:190
+#: ../src/wireless-security/eap-method.c:206
 msgid "No Certificate Authority certificate chosen"
-msgstr "証æ??æ?¸æ¨©é??ï¼?CAï¼?ã?®è¨¼æ??æ?¸ã??é?¸æ??ã??ã??ã?¦ã??ã?¾ã??ã??"
+msgstr "証æ??æ?¸æ¨©é??(CA)ã?®è¨¼æ??æ?¸ã??é?¸æ??ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../src/wireless-security/eap-method.c:191
+#: ../src/wireless-security/eap-method.c:207
 msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections "
 "to insecure, rogue wireless networks.  Would you like to choose a "
@@ -2481,15 +2517,15 @@ msgstr ""
 "証æ??æ?¸æ¨©é?? (CA) ã?®è¨¼æ??æ?¸ã??使ç?¨ã??ã?ªã??ã?¨ã??å®?å?¨ã?§ã?ªã??è©?欺ç??ã?ªã?¯ã?¤ã?¤ã?¬ã?¹ ã??ã??ã??"
 "ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??ã??証æ??æ?¸æ¨©é?? (CA) ã?®è¨¼æ??æ?¸ã?? é?¸æ??ã??ã?¾ã??ã?? ?"
 
-#: ../src/wireless-security/eap-method.c:200
+#: ../src/wireless-security/eap-method.c:216
 msgid "Choose CA Certificate"
 msgstr "CA 証æ??æ?¸ã??é?¸æ??ã??ã??"
 
-#: ../src/wireless-security/eap-method.c:515
+#: ../src/wireless-security/eap-method.c:531
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DER ã??ã?? PEM ã??ã?? PKCS#12 ã?®ã??ã?©ã?¤ã??ã?¼ã??ã?­ã?¼ (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:518
+#: ../src/wireless-security/eap-method.c:534
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER ã?? PEM ã?®è¨¼æ??æ?¸ (*.der, *.pem, *.crt, *.cer)"
 
@@ -2505,7 +2541,7 @@ msgstr "GTC"
 #: ../src/wireless-security/eap-method-tls.c:457
 #: ../src/wireless-security/eap-method-ttls.c:365
 msgid "Choose a Certificate Authority certificate..."
-msgstr "証æ??æ?¸æ¨©é??ï¼?CAï¼?証æ??æ?¸ã??é?¸æ??..."
+msgstr "証æ??æ?¸æ¨©é??(CA)証æ??æ?¸ã??é?¸æ??..."
 
 #: ../src/wireless-security/eap-method-tls.c:263
 msgid "Unencrypted private keys are insecure"
@@ -2523,7 +2559,7 @@ msgstr ""
 "ç?¨æ??å ±ã?®ä¾µå®³ã??許ã??ã?¦ã??ã?¾ã??ã?¾ã??ã??ã??ã?¹ã?¯ã?¼ã??ä¿?è­·ã?®ã??ã??ã??ã?©ã?¤ã??ã?¼ã??ã?­ã?¼ã?? é?¸æ??ã??"
 "ã?¦ä¸?ã??ã??ã??\n"
 "\n"
-"ï¼?ã??ã?©ã?¤ã??ã?¼ã??ã?­ã?¼ã?¯ openssl ã??使ç?¨ã??ã?¦ã??ã?¹ã?¯ã?¼ã??ä¿?è­·ã??ã?§ã??ã?¾ã??ï¼?"
+"(ã??ã?©ã?¤ã??ã?¼ã??ã?­ã?¼ã?¯ openssl ã??使ç?¨ã??ã?¦ã??ã?¹ã?¯ã?¼ã??ä¿?è­·ã??ã?§ã??ã?¾ã??)"
 
 #: ../src/wireless-security/eap-method-tls.c:451
 msgid "Choose your personal certificate..."
@@ -2545,3 +2581,5 @@ msgstr "ã??ã?³ã??ã?«å?? TLS"
 msgid "Protected EAP (PEAP)"
 msgstr "ä¿?è­·ã?¤ã?? EAP (PEAP)"
 
+#~ msgid "Save this connection for all users of this machine."
+#~ msgstr "ã??ã?®ã??ã?·ã?³ã?®å?¨ã?¦ã?®ã?¦ã?¼ã?¶ã?¼ç?¨ã?«ã??ã?®æ?¥ç¶?ã??ä¿?å­?"