[network-manager-applet] Updated Japanese translation.



commit 493cf40c2f5fac8ad7942a9a56bbb29225e80c85
Author: Takayuki KUSANO <AE5T-KSN asahi-net or jp>
Date:   Thu Mar 31 21:44:35 2011 +0900

    Updated Japanese translation.

 po/ja.po | 2158 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1205 insertions(+), 953 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 08c318f..042d704 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,21 +1,21 @@
 # translation of ja.po to Japanese
 # Japanese translation for NetworkManager (network-manager-applet)
-# Copyright (C) 2005-2010 Dan Williams <dcbw redhat com>
+# Copyright (C) 2005-2011 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.
 # Kiyoto Hashida <khashida redhat com>, 2010.
 # KURASAWA Nozomu <nabetaro caldron jp>, 2010.
 # Hideki Yamane <henrich debian or jp>, 2010.
-# Takayuki KUSANO <AE5T-KSN asahi-net or jp>, 2010.
+# Takayuki KUSANO <AE5T-KSN asahi-net or jp>, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "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-10-17 17:23+0000\n"
-"PO-Revision-Date: 2010-10-19 20:13+0900\n"
-"Last-Translator: KURASAWA Nozomu <nabetaro caldron jp>\n"
+"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
+"POT-Creation-Date: 2011-03-29 21:49+0000\n"
+"PO-Revision-Date: 2011-03-30 22:48+0900\n"
+"Last-Translator: Takayuki KUSANO <AE5T-KSN asahi-net or jp>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,12 +24,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../nm-applet.desktop.in.h:1
-msgid "Control your network connections"
-msgstr "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã??å?¶å¾¡"
+msgid "Manage your network connections"
+msgstr "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã??管ç??"
 
 #: ../nm-applet.desktop.in.h:2
-msgid "Network Manager"
-msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã??ã??ã?¼ã?¸ã?£"
+msgid "Network"
+msgstr "ã??ã??ã??ã?¯ã?¼ã?¯"
 
 #: ../nm-applet.schemas.in.h:1
 msgid "Disable WiFi Create"
@@ -86,35 +86,26 @@ msgid "Manage and change your network connection settings"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã?»ã??ã??ã?£ã?³ã?°ã?®ç®¡ç??ã?¨å¤?æ?´"
 
 #: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.glade.h:7
+#: ../src/connection-editor/nm-connection-editor.ui.h:7
 msgid "Network Connections"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?"
 
-#: ../src/applet-dbus-manager.c:165
-#, c-format
-msgid "An instance of nm-applet is already running.\n"
-msgstr "nm-applet ã?®ã?¤ã?³ã?¹ã?¿ã?³ã?¹ã?¯æ?¢ã?«å®?è¡?ã??ã?¦ã??ã?¾ã??ã??\n"
-
-#: ../src/applet-dbus-manager.c:167
-#, c-format
-msgid "Could not acquire the %s service. (%d)\n"
-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:817
+#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:337
+#: ../src/applet-device-gsm.c:381 ../src/applet-device-wired.c:240
+#: ../src/applet-device-wifi.c:867 ../src/applet-device-wimax.c:279
 msgid "Available"
 msgstr "����"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:374
-#: ../src/applet-device-gsm.c:417 ../src/applet-device-wired.c:270
+#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:379
+#: ../src/applet-device-gsm.c:423 ../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:378
-#: ../src/applet-device-gsm.c:421 ../src/applet-device-wired.c:274
-#: ../src/applet-device-wifi.c:1260
+#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:383
+#: ../src/applet-device-gsm.c:427 ../src/applet-device-wired.c:273
+#: ../src/applet-device-wifi.c:1272 ../src/applet-device-wimax.c:427
 msgid "Connection Established"
 msgstr "æ?¥ç¶?ã??確ç«?ã??ã?¾ã??ã??"
 
@@ -122,116 +113,120 @@ msgstr "æ?¥ç¶?ã??確ç«?ã??ã?¾ã??ã??"
 msgid "You are now connected to the mobile broadband network."
 msgstr "ç?¾å?¨ã??ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:414
-#: ../src/applet-device-gsm.c:457
+#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:419
+#: ../src/applet-device-gsm.c:463 ../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:417
-#: ../src/applet-device-gsm.c:460
+#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:422
+#: ../src/applet-device-gsm.c:466 ../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:420
-#: ../src/applet-device-gsm.c:463
+#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:425
+#: ../src/applet-device-gsm.c:469 ../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:423
-#: ../src/applet-device-gsm.c:466 ../src/applet.c:2301
+#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:428
+#: ../src/applet-device-gsm.c:472 ../src/applet-device-wimax.c:473
+#: ../src/applet.c:2383
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "'%s' ã?®ã??ã??ã??ã?¯ã?¼ã?¯ã?¢ã??ã?¬ã?¹ã??è¦?æ±?ã??ã?¦ã??ã?¾ã??..."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:484
+#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:446
+#: ../src/applet-device-gsm.c:490
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??æ?¥ç¶? '%s' ã?¯ã?¢ã?¯ã??ã?£ã??ã?§ã??ã??"
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:687
-#: ../src/mb-menu-item.c:55
+#: ../src/applet-device-cdma.c:186 ../src/connection-editor/page-mobile.c:681
+#: ../src/mb-menu-item.c:54
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/applet-device-cdma.c:281 ../src/applet-device-gsm.c:325
+#: ../src/applet-device-cdma.c:283 ../src/applet-device-gsm.c:327
+#: ../src/applet-dialogs.c:405
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã?? (%s)"
 
-#: ../src/applet-device-cdma.c:283 ../src/applet-device-gsm.c:327
-#: ../src/connection-editor/page-mobile.c:382
-#: ../src/connection-editor/nm-connection-editor.glade.h:6
-#: ../src/connection-editor/nm-connection-list.c:1401
+#: ../src/applet-device-cdma.c:285 ../src/applet-device-gsm.c:329
+#: ../src/connection-editor/page-mobile.c:372
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-list.c:1440
 msgid "Mobile Broadband"
 msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??"
 
 #. Default connection item
-#: ../src/applet-device-cdma.c:345
+#: ../src/applet-device-cdma.c:350
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "æ?°è¦?ã?®ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã?? (CDMA) æ?¥ç¶?..."
 
-#: ../src/applet-device-cdma.c:379
+#: ../src/applet-device-cdma.c:384
 msgid "You are now connected to the CDMA network."
 msgstr "ç?¾å?¨ CDMA ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../src/applet-device-cdma.c:436 ../src/applet-device-gsm.c:479
+#: ../src/applet-device-cdma.c:441 ../src/applet-device-gsm.c:485
+#: ../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:439 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-cdma.c:444 ../src/applet-device-gsm.c:488
+#: ../src/applet-device-wimax.c:485
 msgid "roaming"
 msgstr "ã?­ã?¼ã??ã?³ã?°"
 
-#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:690
-#: ../src/mb-menu-item.c:60
+#: ../src/applet-device-gsm.c:212 ../src/connection-editor/page-mobile.c:684
+#: ../src/mb-menu-item.c:59
 msgid "GSM"
 msgstr "GSM"
 
 #. Default connection item
-#: ../src/applet-device-gsm.c:388
+#: ../src/applet-device-gsm.c:394
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "æ?°è¦?ã?®ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã?? (GSM) æ?¥ç¶?..."
 
-#: ../src/applet-device-gsm.c:422
+#: ../src/applet-device-gsm.c:428
 msgid "You are now connected to the GSM network."
 msgstr "ç?¾å?¨ GSM ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../src/applet-device-gsm.c:707
+#: ../src/applet-device-gsm.c:589
 msgid "PIN code required"
 msgstr "PIN ã?³ã?¼ã??ã??å¿?è¦?ã?§ã??"
 
-#: ../src/applet-device-gsm.c:715
+#: ../src/applet-device-gsm.c:597
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã??ã??ã?¤ã?¹ã?«ã?¯ PIN ã?³ã?¼ã??ã??å¿?è¦?ã?§ã??"
 
-#: ../src/applet-device-gsm.c:847
+#: ../src/applet-device-gsm.c:718
 msgid "Wrong PIN code; please contact your provider."
 msgstr "PIN ã??é??ã??ã?¾ã??; ã??ã?­ã??ã?¤ã??ã?«é?£çµ¡ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../src/applet-device-gsm.c:870
+#: ../src/applet-device-gsm.c:741
 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:897
+#: ../src/applet-device-gsm.c:768
 msgid "Sending unlock code..."
 msgstr "é??é? ã?³ã?¼ã??ã??é??信中..."
 
-#: ../src/applet-device-gsm.c:960
+#: ../src/applet-device-gsm.c:831
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN ã?®é??é? ã??å¿?è¦?ã?§ã??"
 
-#: ../src/applet-device-gsm.c:961
+#: ../src/applet-device-gsm.c:832
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN ã?®é??é? ã??å¿?è¦?ã?§ã??"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:963
+#: ../src/applet-device-gsm.c:834
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -241,25 +236,25 @@ msgstr ""
 "ã??ã??"
 
 #. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:965
+#: ../src/applet-device-gsm.c:836
 msgid "PIN code:"
 msgstr "PIN ã?³ã?¼ã??:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:969
+#: ../src/applet-device-gsm.c:840
 msgid "Show PIN code"
 msgstr "PIN ã?³ã?¼ã??ã??表示"
 
-#: ../src/applet-device-gsm.c:972
+#: ../src/applet-device-gsm.c:843
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK ã?®é??é? ã??å¿?è¦?ã?§ã??"
 
-#: ../src/applet-device-gsm.c:973
+#: ../src/applet-device-gsm.c:844
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK ã?®é??é? ã??å¿?è¦?ã?§ã??"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:975
+#: ../src/applet-device-gsm.c:846
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -268,341 +263,407 @@ msgstr ""
 "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã??ã??ã?¤ã?¹ '%s' ã??使ç?¨ã??ã??ã?«ã?¯ SIM PUK ã?³ã?¼ã??ã??å¿?è¦?ã?§ã??ã??"
 
 #. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:977
+#: ../src/applet-device-gsm.c:848
 msgid "PUK code:"
 msgstr "PUK ã?³ã?¼ã??:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:980
+#: ../src/applet-device-gsm.c:851
 msgid "New PIN code:"
 msgstr "æ?°è¦?ã?® PIN ã?³ã?¼ã??:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:982
+#: ../src/applet-device-gsm.c:853
 msgid "Re-enter new PIN code:"
 msgstr "æ?°è¦?ã?® PIN ã?³ã?¼ã??ã??å??å?¥å??:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:987
+#: ../src/applet-device-gsm.c:858
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK ã?³ã?¼ã??ã??表示"
 
-#: ../src/applet-device-wired.c:63
+#: ../src/applet-device-wired.c:62
 msgid "Auto Ethernet"
 msgstr "è?ªå??ã?¤ã?¼ã?µã??ã??ã??"
 
-#: ../src/applet-device-wired.c:206
+#: ../src/applet-device-wired.c:205
 #, c-format
 msgid "Wired Networks (%s)"
 msgstr "æ??ç·?ã??ã??ã??ã?¯ã?¼ã?¯ (%s)"
 
-#: ../src/applet-device-wired.c:208
+#: ../src/applet-device-wired.c:207
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "æ??ç·?ã??ã??ã??ã?¯ã?¼ã?¯ (%s)"
 
-#: ../src/applet-device-wired.c:211
+#: ../src/applet-device-wired.c:210
 msgid "Wired Networks"
 msgstr "æ??ç·?ã??ã??ã??ã?¯ã?¼ã?¯"
 
-#: ../src/applet-device-wired.c:213
+#: ../src/applet-device-wired.c:212
 msgid "Wired Network"
 msgstr "æ??ç·?ã??ã??ã??ã?¯ã?¼ã?¯"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:233 ../src/applet.c:1307
+#: ../src/applet-device-wired.c:232 ../src/applet.c:1389
 msgid "disconnected"
 msgstr "å??æ?­ã??ã??ã?¦ã??ã?¾ã??"
 
-#: ../src/applet-device-wired.c:275
+#: ../src/applet-device-wired.c:274
 msgid "You are now connected to the wired network."
 msgstr "æ??ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet-device-wired.c:301
+#: ../src/applet-device-wired.c:300
 #, c-format
 msgid "Preparing wired network connection '%s'..."
 msgstr "æ??ç·?ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã??æº?å??中ã?§ã??..."
 
-#: ../src/applet-device-wired.c:304
+#: ../src/applet-device-wired.c:303
 #, c-format
 msgid "Configuring wired network connection '%s'..."
 msgstr "æ??ç·?ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã??設å®?中ã?§ã??..."
 
-#: ../src/applet-device-wired.c:307
+#: ../src/applet-device-wired.c:306
 #, c-format
 msgid "User authentication required for wired network connection '%s'..."
 msgstr "æ??ç·?ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s'ã?«ã?¯ã?¦ã?¼ã?¶ã?¼èª?証ã??å¿?è¦?ã?§ã??..."
 
-#: ../src/applet-device-wired.c:310
+#: ../src/applet-device-wired.c:309
 #, c-format
 msgid "Requesting a wired network address for '%s'..."
 msgstr "'%s' ç?¨ã?®æ??ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?¢ã??ã?¬ã?¹ã??è¦?æ±?ã??ã?¦ã??ã?¾ã??..."
 
-#: ../src/applet-device-wired.c:314
+#: ../src/applet-device-wired.c:313
 #, c-format
 msgid "Wired network connection '%s' active"
 msgstr "æ??ç·?ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã?¯ã?¢ã?¯ã??ã?£ã??ã?§ã??"
 
-#: ../src/applet-device-wired.c:565
+#: ../src/applet-device-wired.c:494
 msgid "DSL authentication"
 msgstr "DSL �証"
 
-#: ../src/applet-device-wifi.c:88
+#: ../src/applet-device-wifi.c:89
 msgid "_Connect to Hidden Wireless Network..."
 msgstr "é??表示ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?(_C)..."
 
-#: ../src/applet-device-wifi.c:121
+#: ../src/applet-device-wifi.c:142
 msgid "Create _New Wireless Network..."
 msgstr "æ?°ã??ã??ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã??ä½?æ??(_N)..."
 
-#: ../src/applet-device-wifi.c:749
+#: ../src/applet-device-wifi.c:226
+msgid "(none)"
+msgstr "(ã?ªã??)"
+
+#: ../src/applet-device-wifi.c:795
 #, c-format
 msgid "Wireless Networks (%s)"
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ (%s)"
 
-#: ../src/applet-device-wifi.c:751
+#: ../src/applet-device-wifi.c:797
 #, c-format
 msgid "Wireless Network (%s)"
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ (%s)"
 
-#: ../src/applet-device-wifi.c:753
+#: ../src/applet-device-wifi.c:799
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯"
 
-#: ../src/applet-device-wifi.c:783
+#: ../src/applet-device-wifi.c:832
 msgid "wireless is disabled"
 msgstr "ç?¡ç·?ã?¯ç?¡å?¹ã?«ã?ªã?£ã?¦ã??ã?¾ã??"
 
-#: ../src/applet-device-wifi.c:844
+#: ../src/applet-device-wifi.c:833
+msgid "wireless is disabled by hardware switch"
+msgstr "ç?¡ç·?ã?¯ã??ã?¼ã??ã?¦ã?§ã?¢ã?®ã?¹ã?¤ã??ã??ã?§ç?¡å?¹ã?«ã?ªã?£ã?¦ã??ã?¾ã??"
+
+#: ../src/applet-device-wifi.c:894
 msgid "More networks"
 msgstr "ã??ã?®ä»?ã?®ã??ã??ã??ã?¯ã?¼ã?¯"
 
-#: ../src/applet-device-wifi.c:1048
+#: ../src/applet-device-wifi.c:1073
 msgid "Wireless Networks Available"
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?¯å?©ç?¨å?¯è?½ã?§ã??"
 
-#: ../src/applet-device-wifi.c:1050
+#: ../src/applet-device-wifi.c:1075
 msgid "Click on this icon to connect to a wireless network"
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã??ã?«ã?¯ã??ã?®ã?¢ã?¤ã?³ã?³ã??ã?¯ã?ªã??ã?¯ã??ã?¾ã??ã??"
 
-#: ../src/applet-device-wifi.c:1051
+#: ../src/applet-device-wifi.c:1076
 msgid "Use the network menu to connect to a wireless network"
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã??ã?«ã?¯ã??ã??ã??ã?¯ã?¼ã?¯ã?¡ã??ã?¥ã?¼ã??使ç?¨ã??ã?¾ã??ã??"
 
-#: ../src/applet-device-wifi.c:1054 ../src/applet.c:673
+#: ../src/applet-device-wifi.c:1079 ../src/applet.c:805
 msgid "Don't show this message again"
 msgstr "äº?度ã?¨ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ã??表示ã??ã?ªã??"
 
-#: ../src/applet-device-wifi.c:1258
+#: ../src/applet-device-wifi.c:1271
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ '%s' ã?«æ?¥ç¶?ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet-device-wifi.c:1259 ../src/applet-device-wifi.c:1290
-msgid "(none)"
-msgstr "(ã?ªã??)"
-
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-wifi.c:1302
 #, c-format
 msgid "Preparing wireless network connection '%s'..."
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã?®æº?å??中..."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1305
 #, c-format
 msgid "Configuring wireless network connection '%s'..."
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã??設å®?中..."
 
-#: ../src/applet-device-wifi.c:1306
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "User authentication required for wireless network '%s'..."
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ '%s' ã?«ã?¯ã?¦ã?¼ã?¶ã?¼èª?証ã??å¿?è¦?ã?§ã??..."
 
-#: ../src/applet-device-wifi.c:1309
+#: ../src/applet-device-wifi.c:1311
 #, c-format
 msgid "Requesting a wireless network address for '%s'..."
 msgstr "'%s' ç?¨ã?®ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?¢ã??ã?¬ã?¹ã??è¦?æ±?ã??ã?¦ã??ã?¾ã??..."
 
-#: ../src/applet-device-wifi.c:1329
+#: ../src/applet-device-wifi.c:1332
 #, c-format
 msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã?¢ã?¯ã??ã?£ã??ã?§ã??: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1333
+#: ../src/applet-device-wifi.c:1337
 #, c-format
 msgid "Wireless network connection '%s' active"
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã?¢ã?¯ã??ã?£ã??ã?§ã??"
 
+#: ../src/applet-device-wimax.c:231
+#, c-format
+msgid "WiMAX Mobile Broadband (%s)"
+msgstr "WiMAX ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã?? (%s)"
+
+#: ../src/applet-device-wimax.c:233
+msgid "WiMAX Mobile Broadband"
+msgstr "WiMAX ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??"
+
+#: ../src/applet-device-wimax.c:259
+msgid "WiMAX is disabled"
+msgstr "WiMAX ã?¯ç?¡å?¹ã?«ã?ªã?£ã?¦ã??ã?¾ã??"
+
+#: ../src/applet-device-wimax.c:260
+msgid "WiMAX is disabled by hardware switch"
+msgstr "WiMAX ã?¯ã??ã?¼ã??ã?¦ã?§ã?¢ã?®ã?¹ã?¤ã??ã??ã?§ç?¡å?¹ã?«ã?ªã?£ã?¦ã??ã?¾ã??"
+
+#: ../src/applet-device-wimax.c:428
+msgid "You are now connected to the WiMAX network."
+msgstr "ç?¾å?¨ WiMAX ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã?¦ã??ã?¾ã??ã??"
+
 #: ../src/applet-dialogs.c:56
 msgid "Error displaying connection information:"
 msgstr "æ?¥ç¶?æ??å ±ã?®è¡¨ç¤ºä¸­ã?«ã?¨ã?©ã?¼ã??èµ·ã??ã?¾ã??ã??:"
 
-#: ../src/applet-dialogs.c:87
-#: ../src/connection-editor/page-wireless-security.c:284
-#: ../src/wireless-dialog.c:962
-#: ../src/wireless-security/wireless-security.c:341
+#: ../src/applet-dialogs.c:108
+#: ../src/connection-editor/page-wireless-security.c:285
+#: ../src/wireless-dialog.c:946
+#: ../src/wireless-security/wireless-security.c:392
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:89
+#: ../src/applet-dialogs.c:110
 msgid "Dynamic WEP"
 msgstr "å??ç?? WEP"
 
-#: ../src/applet-dialogs.c:91 ../src/applet-dialogs.c:192
-#: ../src/applet-dialogs.c:194
+#: ../src/applet-dialogs.c:112 ../src/applet-dialogs.c:221
+#: ../src/applet-dialogs.c:223
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:190
+#: ../src/applet-dialogs.c:219
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:198 ../src/applet-dialogs.c:207
-#: ../src/connection-editor/page-wireless-security.c:238
-#: ../src/wireless-dialog.c:919
+#: ../src/applet-dialogs.c:227 ../src/applet-dialogs.c:236
+#: ../src/connection-editor/page-wireless-security.c:239
+#: ../src/wireless-dialog.c:903
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ã?ªã??"
 
-#: ../src/applet-dialogs.c:210
-msgctxt "Wifi/wired security"
-msgid "Unknown"
-msgstr "ä¸?æ??"
-
-#: ../src/applet-dialogs.c:280 ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:327 ../src/applet-dialogs.c:465
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:282 ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:467
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../src/applet-dialogs.c:313
+#: ../src/applet-dialogs.c:342
+#, c-format
+msgid "%d dB"
+msgstr "%d dB"
+
+#: ../src/applet-dialogs.c:344
+msgctxt "WiMAX CINR"
+msgid "unknown"
+msgstr "ä¸?æ??"
+
+#: ../src/applet-dialogs.c:356
+msgctxt "WiMAX Base Station ID"
+msgid "unknown"
+msgstr "ä¸?æ??"
+
+#: ../src/applet-dialogs.c:391
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:315
+#: ../src/applet-dialogs.c:394
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:317
+#: ../src/applet-dialogs.c:401
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:319
+#: ../src/applet-dialogs.c:403
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:324
+#: ../src/applet-dialogs.c:407
+#, c-format
+msgid "WiMAX (%s)"
+msgstr "WiMAX (%s)"
+
+#. --- General ---
+#: ../src/applet-dialogs.c:413
+msgid "General"
+msgstr "��"
+
+#: ../src/applet-dialogs.c:417
 msgid "Interface:"
 msgstr "ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¼ã?¹:"
 
-#: ../src/applet-dialogs.c:340
+#: ../src/applet-dialogs.c:433
 msgid "Hardware Address:"
 msgstr "ã??ã?¼ã??ã?¦ã?§ã?¢ã?¢ã??ã?¬ã?¹:"
 
-#: ../src/applet-dialogs.c:350
+#. Driver
+#: ../src/applet-dialogs.c:441
 msgid "Driver:"
 msgstr "ã??ã?©ã?¤ã??:"
 
-#: ../src/applet-dialogs.c:388
+#: ../src/applet-dialogs.c:470
 msgid "Speed:"
 msgstr "é??度:"
 
-#: ../src/applet-dialogs.c:397
+#: ../src/applet-dialogs.c:480
 msgid "Security:"
 msgstr "ã?»ã?­ã?¥ã?ªã??ã?£:"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:493
+msgid "CINR:"
+msgstr "CINR:"
+
+#: ../src/applet-dialogs.c:506
+msgid "BSID:"
+msgstr "BSID:"
+
+#. --- IPv4 ---
+#: ../src/applet-dialogs.c:523
+msgid "IPv4"
+msgstr "IPv4"
+
+#. Address
+#: ../src/applet-dialogs.c:534 ../src/applet-dialogs.c:641
 msgid "IP Address:"
 msgstr "IP ã?¢ã??ã?¬ã?¹:"
 
-#: ../src/applet-dialogs.c:421 ../src/applet-dialogs.c:439
+#: ../src/applet-dialogs.c:536 ../src/applet-dialogs.c:552
 msgctxt "Address"
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../src/applet-dialogs.c:437
+#: ../src/applet-dialogs.c:550
 msgid "Broadcast Address:"
 msgstr "ã??ã?­ã?¼ã??ã?­ã?£ã?¹ã??ã?¢ã??ã?¬ã?¹:"
 
-#: ../src/applet-dialogs.c:448
+#. Prefix
+#: ../src/applet-dialogs.c:559
 msgid "Subnet Mask:"
 msgstr "ã?µã??ã??ã??ã??ã??ã?¹ã?¯:"
 
-#: ../src/applet-dialogs.c:450
+#: ../src/applet-dialogs.c:561
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:569 ../src/applet-dialogs.c:656
 msgid "Default Route:"
 msgstr "ã??ã??ã?©ã?«ã??ã?«ã?¼ã??:"
 
-#: ../src/applet-dialogs.c:474
+#: ../src/applet-dialogs.c:581
 msgid "Primary DNS:"
 msgstr "第� DNS:"
 
-#: ../src/applet-dialogs.c:485
+#: ../src/applet-dialogs.c:590
 msgid "Secondary DNS:"
 msgstr "第� DNS:"
 
+#: ../src/applet-dialogs.c:600
+msgid "Ternary DNS:"
+msgstr "第� DNS:"
+
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:615
+msgid "IPv6"
+msgstr "IPv6"
+
+#: ../src/applet-dialogs.c:624
+msgid "Ignored"
+msgstr "��"
+
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:548
+#: ../src/applet-dialogs.c:732
 msgid "No valid active connections found!"
 msgstr "æ??å?¹ã?ªã?¢ã?¯ã??ã?£ã??æ?¥ç¶?ã??ã??ã??ã?¾ã??ã??!"
 
-#: ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:785
 msgid ""
-"Copyright © 2004-2008 Red Hat, Inc.\n"
-"Copyright © 2005-2008 Novell, Inc."
+"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2005-2008 Novell, Inc.\n"
+"and many other community contributors and translators"
 msgstr ""
-"Copyright © 2004-2008 Red Hat, Inc.\n"
-"Copyright © 2005-2008 Novell, Inc."
+"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2005-2008 Novell, Inc.\n"
+"ã?¾ã??ã??ã?®ã?³ã??ã?¥ã??ã??ã?£ã?®ä»?ã?®å¤?ã??ã?®è²¢ç?®è??ã??翻訳è??"
 
-#: ../src/applet-dialogs.c:677
+#: ../src/applet-dialogs.c:788
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã??ã??ã?¤ã?¹ã?¨æ?¥ç¶?ã??管ç??ã??ã??ã??ã??ã?®é??ç?¥é ?å?? ã?¢ã??ã?¬ã??ã??"
+msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã??ã??ã?¤ã?¹ã?¨æ?¥ç¶?ã??管ç??ã??ã??ã??ã??ã?®é??ç?¥é ?å??ã?¢ã??ã?¬ã??ã??ã??"
 
-#: ../src/applet-dialogs.c:679
+#: ../src/applet-dialogs.c:790
 msgid "NetworkManager Website"
 msgstr "NetworkManager ã?¦ã?§ã??ã?µã?¤ã??"
 
-#: ../src/applet-dialogs.c:682
-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/>"
-
-#: ../src/applet-dialogs.c:698
+#: ../src/applet-dialogs.c:805
 msgid "Missing resources"
 msgstr "ä¸?足ã??ã?¦ã??ã??ã?ªã?½ã?¼ã?¹"
 
-#: ../src/applet-dialogs.c:725
+#: ../src/applet-dialogs.c:830
 msgid "Mobile broadband network password"
 msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã??ã??ã??ã?¯ã?¼ã?¯ã?®ã??ã?¹ã?¯ã?¼ã??"
 
-#: ../src/applet-dialogs.c:734
+#: ../src/applet-dialogs.c:839
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' ã?¸ã?®æ?¥ç¶?ã?«ã??ã?¹ã?¯ã?¼ã??ã??å¿?è¦?ã?§ã??ã??"
 
-#: ../src/applet-dialogs.c:755
+#: ../src/applet-dialogs.c:854
 msgid "Password:"
 msgstr "ã??ã?¹ã?¯ã?¼ã??:"
 
-#: ../src/applet.c:786
+#: ../src/applet.c:894
 #, c-format
 msgid ""
 "\n"
@@ -612,16 +673,16 @@ msgstr ""
 "\n"
 "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã??å?²ã??è¾¼ã?¿ã??ã??ã??ç?ºã??VPN æ?¥ç¶? '%s' ã?¯å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet.c:789
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service stopped unexpectedly."
 msgstr ""
 "\n"
-"VPN ã?µã?¼ã??ã?¹ã??ä¸?æ??ã?«å??æ­¢ã??ã??ç?ºã??VPN æ?¥ç¶? '%s' ã??失æ??ã??ã?¾ã??ã??."
+"VPN ã?µã?¼ã??ã?¹ã??ä¸?æ??ã?«å??æ­¢ã??ã??ç?ºã??VPN æ?¥ç¶? '%s' ã??失æ??ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet.c:792
+#: ../src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -631,7 +692,7 @@ msgstr ""
 "\n"
 "VPN ã?µã?¼ã??ã?¹ã??ç?¡å?¹ã?ªè¨­å®?ã??è¿?ã??ã??ã??ã??ã??VPN æ?¥ç¶? '%s'失æ??ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet.c:795
+#: ../src/applet.c:903
 #, c-format
 msgid ""
 "\n"
@@ -640,7 +701,7 @@ msgstr ""
 "\n"
 "æ?¥ç¶?試è¡?ã??ã?¿ã?¤ã? ã?¢ã?¦ã??ã??ã??ã??ã??ã??VPN æ?¥ç¶? '%s' ã?¯å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet.c:798
+#: ../src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -649,7 +710,7 @@ msgstr ""
 "\n"
 "VPN ã?µã?¼ã??ã?¹ã??æ??é??å??ã?«é??å§?ã??ã?ªã??ã?£ã??ã??ã??ã??VPN æ?¥ç¶? '%s' ã?¯å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet.c:801
+#: ../src/applet.c:909
 #, c-format
 msgid ""
 "\n"
@@ -658,7 +719,7 @@ msgstr ""
 "\n"
 "VPN ã?µã?¼ã??ã?¹ã??é??å§?ã?«å¤±æ??ã??ã??ã??ã??ã??VPN æ?¥ç¶? '%s' ã?¯å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet.c:804
+#: ../src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -667,7 +728,7 @@ msgstr ""
 "\n"
 "æ??å?¹ã?ª VPN secret ã??ã?ªã??ã??ã??ã??VPN æ?¥ç¶? '%s' ã?¯å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet.c:807
+#: ../src/applet.c:915
 #, c-format
 msgid ""
 "\n"
@@ -676,7 +737,7 @@ msgstr ""
 "\n"
 "VPN secret ã??ç?¡å?¹ã?ªã??ã??ã??VPN æ?¥ç¶? '%s' ã?¯å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet.c:814
+#: ../src/applet.c:922
 #, c-format
 msgid ""
 "\n"
@@ -685,7 +746,7 @@ msgstr ""
 "\n"
 "VPN æ?¥ç¶? '%s' ã?¯å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet.c:832
+#: ../src/applet.c:940
 #, c-format
 msgid ""
 "\n"
@@ -695,7 +756,7 @@ msgstr ""
 "\n"
 "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã??å?²ã??è¾¼ã?¿ã??ã??ã??ã??ã??ã??VPN æ?¥ç¶? '%s' ã?¯å??æ?­ã??ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet.c:835
+#: ../src/applet.c:943
 #, c-format
 msgid ""
 "\n"
@@ -704,7 +765,7 @@ msgstr ""
 "\n"
 "VPN ã?µã?¼ã??ã?¹ã??å??æ­¢ã??ã??ã??ã??ã??VPN æ?¥ç¶? '%s' ã?¯å??æ?­ã??ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet.c:841
+#: ../src/applet.c:949
 #, c-format
 msgid ""
 "\n"
@@ -713,15 +774,15 @@ msgstr ""
 "\n"
 "VPN æ?¥ç¶? '%s' ã??å??æ?­ã??ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet.c:876
+#: ../src/applet.c:983
 msgid "VPN Login Message"
 msgstr "VPN ã?­ã?°ã?¤ã?³ã?¡ã??ã?»ã?¼ã?¸"
 
-#: ../src/applet.c:886 ../src/applet.c:894 ../src/applet.c:941
+#: ../src/applet.c:989 ../src/applet.c:997 ../src/applet.c:1047
 msgid "VPN Connection Failed"
 msgstr "VPN æ?¥ç¶?ã?¯å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../src/applet.c:948
+#: ../src/applet.c:1054
 #, c-format
 msgid ""
 "\n"
@@ -733,7 +794,7 @@ msgstr ""
 "VPN ã?µã?¼ã??ã?¹ã??é??å§?ã?«å¤±æ??ã??ã??ã??ã??ã??VPN æ?¥ç¶? '%s' ã?¯å¤±æ??ã??ã?¾ã??ã??ã??n\n"
 "%s"
 
-#: ../src/applet.c:951
+#: ../src/applet.c:1057
 #, c-format
 msgid ""
 "\n"
@@ -746,343 +807,279 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1295
+#: ../src/applet.c:1377
 msgid "device not ready (firmware missing)"
 msgstr "ã??ã??ã?¤ã?¹ã?®æº?å??ã??ã?§ã??ã?¦ã??ã?¾ã??ã?? (ã??ã?¡ã?¼ã? ã?¦ã?§ã?¢ã??å­?å?¨ã??ã?¾ã??ã??)"
 
-#: ../src/applet.c:1297
+#: ../src/applet.c:1379
 msgid "device not ready"
 msgstr "ã??ã??ã?¤ã?¹ã?®æº?å??ã??ã?§ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../src/applet.c:1323
+#: ../src/applet.c:1405
 msgid "Disconnect"
 msgstr "å??æ?­ã??ã??"
 
-#: ../src/applet.c:1337
+#: ../src/applet.c:1419
 msgid "device not managed"
 msgstr "ã??ã??ã?¤ã?¹ã?¯ç®¡ç??ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../src/applet.c:1383
+#: ../src/applet.c:1463
 msgid "No network devices available"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã??ã??ã?¤ã?¹ã??ã??ã??ã?¾ã??ã??"
 
-#: ../src/applet.c:1471
+#: ../src/applet.c:1551
 msgid "_VPN Connections"
 msgstr "VPN ��(_V)"
 
-#: ../src/applet.c:1524
+#: ../src/applet.c:1608
 msgid "_Configure VPN..."
 msgstr "VPN ã??設å®?(_C)..."
 
-#: ../src/applet.c:1528
+#: ../src/applet.c:1612
 msgid "_Disconnect VPN"
 msgstr "VPN ã??å??æ?­ã??ã??(_D)"
 
-#: ../src/applet.c:1615
+#: ../src/applet.c:1710
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager ã?¯å®?è¡?ã??ã??ã?¦ã??ã?¾ã??ã??..."
 
-#: ../src/applet.c:1620 ../src/applet.c:2429
+#: ../src/applet.c:1715 ../src/applet.c:2508
 msgid "Networking disabled"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã?¯ç?¡å?¹ã?«ã?ªã?£ã?¦ã??ã?¾ã??"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1849
+#: ../src/applet.c:1936
 msgid "Enable _Networking"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ã??æ??å?¹ã?«ã??ã??(_N)"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:1858
+#: ../src/applet.c:1945
 msgid "Enable _Wireless"
 msgstr "ç?¡ç·?ã??æ??å?¹ã?«ã??ã??(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1867
+#: ../src/applet.c:1954
 msgid "Enable _Mobile Broadband"
 msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã??æ??å?¹ã?«ã??ã??(_M)"
 
+#. 'Enable WiMAX Mobile Broadband' item
+#: ../src/applet.c:1963
+msgid "Enable WiMA_X Mobile Broadband"
+msgstr "WiMAX ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã??æ??å?¹ã?«ã??ã??(_X)"
+
 #. Toggle notifications item
-#: ../src/applet.c:1878
+#: ../src/applet.c:1974
 msgid "Enable N_otifications"
 msgstr "é??ç?¥ã??æ??å?¹ã?«ã??ã??(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1889
+#: ../src/applet.c:1985
 msgid "Connection _Information"
 msgstr "æ?¥ç¶?æ??å ±(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1899
+#: ../src/applet.c:1995
 msgid "Edit Connections..."
 msgstr "æ?¥ç¶?ã??ç·¨é??ã??ã??..."
 
 #. Help item
-#: ../src/applet.c:1913
+#: ../src/applet.c:2009
 msgid "_Help"
 msgstr "ã??ã?«ã??(_H)"
 
 #. About item
-#: ../src/applet.c:1922
+#: ../src/applet.c:2018
 msgid "_About"
 msgstr "æ??å ±(_A)"
 
-#: ../src/applet.c:2113
+#: ../src/applet.c:2195
 msgid "Disconnected"
 msgstr "å??æ?­ã??ã??ã?¾ã??ã??"
 
-#: ../src/applet.c:2114
+#: ../src/applet.c:2196
 msgid "The network connection has been disconnected."
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã??å??æ?­ã??ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet.c:2295
+#: ../src/applet.c:2377
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã??æº?å??中..."
 
-#: ../src/applet.c:2298
+#: ../src/applet.c:2380
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã?«ã?¦ã?¼ã?¶ã?¼èª?証ã??å¿?è¦?ã?§ã??..."
 
-#: ../src/applet.c:2304
+#: ../src/applet.c:2386
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶? '%s' ã?¯ã?¢ã?¯ã??ã?£ã??ã?§ã??ã??"
 
-#: ../src/applet.c:2385
+#: ../src/applet.c:2464
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "VPN æ?¥ç¶? '%s' ã??é??å§?ã??ã?¦ã??ã?¾ã??..."
 
-#: ../src/applet.c:2388
+#: ../src/applet.c:2467
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN æ?¥ç¶? '%s' ã?«ã?¦ã?¼ã?¶ã?¼èª?証ã??å¿?è¦?ã?§ã??..."
 
-#: ../src/applet.c:2391
+#: ../src/applet.c:2470
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "'%s' ã?® VPN ã?¢ã??ã?¬ã?¹ã??è¦?æ±?ã??ã?¦ã??ã?¾ã??..."
 
-#: ../src/applet.c:2394
+#: ../src/applet.c:2473
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN æ?¥ç¶? '%s' ã?¯ã?¢ã?¯ã??ã?£ã??ã?§ã??"
 
-#: ../src/applet.c:2433
+#: ../src/applet.c:2512
 msgid "No network connection"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã??ã??ã??ã?¾ã??ã??"
 
-#: ../src/applet.c:2997
+#: ../src/applet.c:3161
 msgid "NetworkManager Applet"
 msgstr "NetworkManager ã?¢ã??ã?¬ã??ã??"
 
-#: ../src/applet.c:3003 ../src/wired-dialog.c:128
-msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
-msgstr ""
-"NetworkManager ã?¢ã??ã?¬ã??ã??ã?¯å¿?è¦?ã?ªã??ã??ã?¤ã??ã?®ã?ªã?½ã?¼ã?¹ã??ã?¿ã?¤ã??ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??"
-"(glade ã??ã?¡ã?¤ã?«ã??ã?¿ã?¤ã??ã??ã?¾ã??ã??ã??)"
-
-#: ../src/applet.glade.h:1 ../src/connection-editor/ce-vpn-wizard.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../src/applet.glade.h:2
-msgid ""
-"1 (Default)\n"
-"2\n"
-"3\n"
-"4"
-msgstr ""
-"1 (ã??ã??ã?©ã?«ã??)\n"
-"2\n"
-"3\n"
-"4"
-
-#: ../src/applet.glade.h:6
-msgid "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
-msgstr ""
-"<span size=\"larger\" weight=\"bold\">ã?¢ã?¯ã??ã?£ã??ã?ªã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?</span>"
-
-#: ../src/applet.glade.h:7
-msgid "Anony_mous identity:"
-msgstr "å?¿å??ã?®è­?å?¥å­?(_M):"
+#: ../src/gsm-unlock.ui.h:1
+msgid "_Unlock"
+msgstr "é??é? (_U)"
 
-#: ../src/applet.glade.h:8
-msgid "As_k for this password every time"
-msgstr "æ¯?å??ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??è¦?æ±?ã??ã??(_K)"
+#: ../src/gsm-unlock.ui.h:2
+msgid "label"
+msgstr "ã?©ã??ã?«"
 
-#: ../src/applet.glade.h:9
-msgid ""
-"Automatic\n"
-"Version 0\n"
-"Version 1"
-msgstr ""
-"è?ªå??\n"
-"ã??ã?¼ã?¸ã?§ã?³ 0\n"
-"ã??ã?¼ã?¸ã?§ã?³ 1"
+#: ../src/info.ui.h:1
+msgid "Active Network Connections"
+msgstr "æ??å?¹ã?ªã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?"
 
-#: ../src/applet.glade.h:12
-msgid "C_A certificate:"
-msgstr "CA 証æ??æ?¸(_A):"
+#: ../src/info.ui.h:2
+msgid "Connection Information"
+msgstr "æ?¥ç¶?æ??å ±"
 
-#: ../src/applet.glade.h:13
-msgid "C_onnect"
-msgstr "��(_O)"
+#: ../src/wifi.ui.h:1 ../src/connection-editor/ce-vpn-wizard.ui.h:1
+#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../src/wireless-security/ws-wpa-eap.ui.h:1
+msgid " "
+msgstr " "
 
-#: ../src/applet.glade.h:14
+#: ../src/wifi.ui.h:2
 msgid "Co_nnection:"
 msgstr "��(_N):"
 
-#: ../src/applet.glade.h:15
-msgid "Connection Information"
-msgstr "æ?¥ç¶?æ??å ±"
+#: ../src/wifi.ui.h:3
+msgid "Wireless _adapter:"
+msgstr "ç?¡ç·?ã?¢ã??ã??ã?¿(_A):"
 
-#: ../src/applet.glade.h:16
-msgid "Don't _warn me again"
-msgstr "äº?度ã?¨è­¦å??ã??ã?ªã??(_W)"
+#: ../src/wifi.ui.h:4 ../src/wired-8021x.ui.h:2
+msgid "_Network name:"
+msgstr "ã??ã??ã??ã?¯ã?¼ã?¯å??(_N):"
 
-# ã?¨ã??ã??ã??ã??ã??ã?®ã??ã??ã?«è¨³ã??ã?¦ã??ã??ã?? "Identity" ã?®ã?¾ã?¾ã?®æ?¹ã??é?©å??ã??ã??ã??ã??ã?ªã??ã??
-# (WPA-EAP Identity èª?証æ?¹å¼?: ã?¦ã?¼ã?¶ ID ã?¨ã??ã?¹ã?¯ã?¼ã??ã?®çµ?ã?§èª?証)
-#: ../src/applet.glade.h:17
-msgid "I_dentity:"
-msgstr "���(_D):"
+#: ../src/wifi.ui.h:5
+msgid "_Wireless security:"
+msgstr "ç?¡ç·?ã?»ã?­ã?¥ã?ªã??ã?£(_W):"
 
-#: ../src/applet.glade.h:18
-msgid "I_nner authentication:"
-msgstr "å??é?¨èª?証(_N):"
+#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
+msgid "Wired 802.1X authentication"
+msgstr "æ??ç·? 802.1X ã?®èª?証"
 
-#: ../src/applet.glade.h:19
-msgid "No"
-msgstr "ã??ã??ã??"
+#: ../src/connection-editor/ce-page.c:67
+msgid "automatic"
+msgstr "è?ªå??"
 
-#: ../src/applet.glade.h:20
+#: ../src/connection-editor/ce-page.c:294
+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
 msgid ""
-"Open System\n"
-"Shared Key"
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"ã?ªã?¼ã??ã?³ã?·ã?¹ã??ã? \n"
-"å?±æ??é?µ"
+"IP ã?¢ã??ã?¬ã?¹ã?¯ã??ã??ã??ã?¯ã?¼ã?¯ä¸?ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã??è­?å?¥ã??ã?¾ã??ã??\"追å? \" ã??ã?¿ã?³ã??æ?¼ã??"
+"ã?¨IP ã?¢ã??ã?¬ã?¹ã??追å? ã?§ã??ã?¾ã??ã??"
 
-#: ../src/applet.glade.h:22
-msgid "Other Wireless Network..."
-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 ""
+"æ??å?¹ã?«ã?ªã?£ã?¦ã??ã??å ´å??ã??ã??ã?®æ?¥ç¶?ã?¯æ±ºã??ã?¦ã??ã??ã?©ã?«ã??ã?®ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã?¨ã??ã?¦ 使ç?¨"
+"ã??ã??ã?¾ã??ã??ã??"
 
-#: ../src/applet.glade.h:23
-msgid "Private _key:"
-msgstr "ã??ã?©ã?¤ã??ã?¼ã??ã?­ã?¼(_K):"
+#: ../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)"
 
-#: ../src/applet.glade.h:24
-msgid "Sho_w key"
-msgstr "ã?­ã?¼ã??表示(_W)"
+#: ../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)"
 
-#: ../src/applet.glade.h:25 ../src/connection-editor/ce-page-dsl.glade.h:1
+#: ../src/connection-editor/ce-page-dsl.ui.h:1
+#: ../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/ws-leap.ui.h:1
+#: ../src/wireless-security/ws-wpa-psk.ui.h:1
 msgid "Sho_w password"
 msgstr "ã??ã?¹ã?¯ã?¼ã??ã??表示(_W)"
 
-#: ../src/applet.glade.h:26
-msgid "WEP inde_x:"
-msgstr "WEP ã?¤ã?³ã??ã??ã?¯ã?¹(_X):"
-
-#: ../src/applet.glade.h:27
-msgid "Wireless _adapter:"
-msgstr "ç?¡ç·?ã?¢ã??ã??ã?¿(_A):"
-
-#: ../src/applet.glade.h:28
-msgid "Yes"
-msgstr "ã?¯ã??"
-
-#: ../src/applet.glade.h:29
-msgid "_Authentication:"
-msgstr "�証(_A):"
-
-#: ../src/applet.glade.h:30
-msgid "_Key:"
-msgstr "ã?­ã?¼(_K):"
-
-#: ../src/applet.glade.h:31
-msgid "_Network name:"
-msgstr "ã??ã??ã??ã?¯ã?¼ã?¯å??(_N):"
-
-#: ../src/applet.glade.h:32
-msgid "_PEAP version:"
-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
+#: ../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/applet.glade.h:34
-msgid "_Private key password:"
-msgstr "ã??ã?©ã?¤ã??ã?¼ã??ã?­ã?¼ã??ã?¹ã?¯ã?¼ã??(_P):"
-
-#: ../src/applet.glade.h:35 ../src/connection-editor/ce-page-mobile.glade.h:16
-msgid "_Type:"
-msgstr "ã?¿ã?¤ã??(_T):"
-
-#: ../src/applet.glade.h:36
-msgid "_Unlock"
-msgstr "é??é? (_U)"
-
-#: ../src/applet.glade.h:37
-msgid "_User certificate:"
-msgstr "ã?¦ã?¼ã?¶ã?¼è¨¼æ??æ?¸(_U):"
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
+msgid "_Service:"
+msgstr "ã?µã?¼ã??ã?¹(_S):"
 
-#: ../src/applet.glade.h:38 ../src/connection-editor/ce-page-dsl.glade.h:4
-#: ../src/connection-editor/ce-page-mobile.glade.h:17
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/wireless-security/eap-method-leap.ui.h:3
+#: ../src/wireless-security/eap-method-simple.ui.h:4
+#: ../src/wireless-security/ws-leap.ui.h:3
 msgid "_Username:"
 msgstr "ã?¦ã?¼ã?¶ã?¼å??(_U):"
 
-#: ../src/applet.glade.h:39
-msgid "_Wireless security:"
-msgstr "ç?¡ç·?ã?»ã?­ã?¥ã?ªã??ã?£(_W):"
-
-#: ../src/applet.glade.h:40
-msgid "label"
-msgstr "ã?©ã??ã?«"
+#: ../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.c:69
-msgid "automatic"
+#: ../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/page-ip6.c:136
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Automatic"
 msgstr "è?ªå??"
 
-#: ../src/connection-editor/ce-page.c:222
-#: ../src/connection-editor/nm-connection-editor.c:617
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "ä¸?æ??ã?ªã?¨ã?©ã?¼ã?®ã??ã??æ?¥ç¶? secret ã??æ?´æ?°ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+#: ../src/connection-editor/ce-page-ip4.ui.h:3
+#: ../src/connection-editor/ce-page-ip6.ui.h:3
+msgid "Automatic with manual DNS settings"
+msgstr "è?ªå?? (DNS 設å®?ã?¯æ??å??)"
 
-#: ../src/connection-editor/ce-page-dsl.glade.h:3
-msgid "_Service:"
-msgstr "ã?µã?¼ã??ã?¹(_S):"
-
-#: ../src/connection-editor/ce-page-ip4.glade.h:1
-#: ../src/connection-editor/ce-page-ip6.glade.h:1
-msgid "<b>Addresses</b>"
-msgstr "<b>ã?¢ã??ã?¬ã?¹</b>"
-
-#: ../src/connection-editor/ce-page-ip4.glade.h:2
-#: ../src/connection-editor/ce-page-ip6.glade.h:2
-msgid ""
-"Automatic\n"
-"Automatic with manual DNS settings\n"
-"Manual\n"
-"Link-Local\n"
-"Shared to other computers"
-msgstr ""
-"è?ªå??\n"
-"è?ªå?? (DNS 設å®?ã?®ã?¿æ??å??)\n"
-"æ??å??\n"
-"�������\n"
-"ä»?ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¨å?±æ??"
-
-#: ../src/connection-editor/ce-page-ip4.glade.h:7
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
 msgid "D_HCP client ID:"
 msgstr "DHCP ã?¯ã?©ã?¤ã?¢ã?³ã?? ID(_H):"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:8
-#: ../src/connection-editor/ce-page-ip6.glade.h:7
+#: ../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."
@@ -1090,17 +1087,8 @@ msgstr ""
 "ã??ã?¹ã??å??ã??解決ã??ã??æ??ã?«ä½¿ç?¨ã??ã??ã??ã?¡ã?¤ã?³ã??è¤?æ?°ã?®ã??ã?¡ã?¤ã?³ã??å??é?¢ã??ã??æ??ã?¯ã?³ã?³ã??ã?? "
 "使ã??ã?¾ã??ã??"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:9
-#: ../src/connection-editor/ce-page-ip6.glade.h:8
-msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
-msgstr ""
-"IP ã?¢ã??ã?¬ã?¹ã?¯ã??ã??ã??ã?¯ã?¼ã?¯ä¸?ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã??è­?å?¥ã??ã?¾ã??ã??\"追å? \" ã??ã?¿ã?³ã??æ?¼ã??"
-"ã?¨IP ã?¢ã??ã?¬ã?¹ã??追å? ã?§ã??ã?¾ã??ã??"
-
-#: ../src/connection-editor/ce-page-ip4.glade.h:10
-#: ../src/connection-editor/ce-page-ip6.glade.h:9
+#: ../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."
@@ -1108,25 +1096,30 @@ msgstr ""
 "ã??ã?¡ã?¤ã?³ã??ã?¼ã? ã?µã?¼ã??ã?¼ã?® IP ã?¢ã??ã?¬ã?¹ã?¯ã??ã?¹ã??å??ã??解決ã??ã??ã??ã??ã?«ä½¿ç?¨ã??ã??ã?¾ã??ã?? "
 "ã?³ã?³ã??ã??使ç?¨ã??ã?¦è¤?æ?°ã?®ã??ã?¡ã?¤ã?³ã??ã?¼ã? ã?µã?¼ã??ã?¼ã?¢ã??ã?¬ã?¹ã??å??é?¢ã??ã?¾ã??ã??"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:11
-#: ../src/connection-editor/ce-page-ip6.glade.h:10
-msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
-msgstr ""
-"æ??å?¹ã?«ã?ªã?£ã?¦ã??ã??å ´å??ã??ã??ã?®æ?¥ç¶?ã?¯æ±ºã??ã?¦ã??ã??ã?©ã?«ã??ã?®ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã?¨ã??ã?¦ 使ç?¨"
-"ã??ã??ã?¾ã??ã??ã??"
+#: ../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.glade.h:12
-#: ../src/connection-editor/ce-page-ip6.glade.h:11
-msgid "Ig_nore automatically obtained routes"
-msgstr "è?ªå??å??å¾?ã??ã??ã?«ã?¼ã??ã??ç?¡è¦?ã??ã??(_N)"
+#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: ../src/connection-editor/page-ip4.c:163
+#: ../src/connection-editor/page-ip6.c:185
+msgid "Manual"
+msgstr "æ??å??"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:13
+#: ../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.glade.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/page-ip4.c:181
+#: ../src/connection-editor/page-ip6.c:205
+msgid "Shared to other computers"
+msgstr "ä»?ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¸å?±æ??"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1136,12 +1129,7 @@ msgstr ""
 "ã?¹ã?¿ã??ã?¤ã?ºã?§ã??ã?¾ã??ã??DHCP ã?¯ã?©ã?¤ã?¢ã?³ã??è­?å?¥å­?ã??使ç?¨ã??ã??ã??å ´å??ã?¯ã??ã??ã??ã?« ã??ã??ã??"
 "å?¥å??ã??ã?¾ã??ã??"
 
-#: ../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)"
-
-#: ../src/connection-editor/ce-page-ip4.glade.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1149,31 +1137,31 @@ msgstr ""
 "IPv4 設å®?ã??失æ??ã??ã?¦ã??IPv6 設å®?ã??æ??å??ã??ã??å ´å??ã??IPv6 対å¿?ã?®ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??"
 "ã??æ??ã?«ã?? æ?¥ç¶?ã??å®?äº?ã??ã??ã?¾ã?§å¾?ã?¡ã?¾ã??ã??"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:17
-#: ../src/connection-editor/ce-page-ip6.glade.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 msgid "_DNS servers:"
 msgstr "DNS ã?µã?¼ã??ã?¼(_D):"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:18
-#: ../src/connection-editor/ce-page-ip6.glade.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 msgid "_Method:"
 msgstr "��(_M):"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:19
-#: ../src/connection-editor/ce-page-ip6.glade.h:17
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid "_Routesâ?¦"
 msgstr "ã?«ã?¼ã??(_R)â?¦"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:20
-#: ../src/connection-editor/ce-page-ip6.glade.h:18
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 msgid "_Search domains:"
 msgstr "ã??ã?¡ã?¤ã?³ã??æ¤?ç´¢(_S):"
 
-#: ../src/connection-editor/ce-page-ip6.glade.h:12
+#: ../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.glade.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1181,205 +1169,159 @@ msgstr ""
 "IPv6 設å®?ã??失æ??ã??ã?¦ã??IPv4 設å®?ã??æ??å??ã??ã??å ´å??ã??IPv4 対å¿?ã?®ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??"
 "ã??æ??ã?« ã??ã?®æ?¥ç¶?ã??å®?äº?ã??ã??ã?¾ã?§å¾?ã?¡ã?¾ã??ã??"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>�度�</b>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:1
+msgid "2G (GPRS/EDGE)"
+msgstr "2G (GPRS/EDGE)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
+msgid "3G (UMTS/HSPA)"
+msgstr "3G (UMTS/HSPA)"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:2
-msgid "<b>Basic</b>"
-msgstr "<b>å?ºæ?¬ç??ã?ª</b>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:3
+msgid "Advanced"
+msgstr "�度"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:3
+#: ../src/connection-editor/ce-page-mobile.ui.h:4
 msgid "Allow roaming if home network is not available"
 msgstr "ã??ã?¼ã? ã??ã??ã??ã?¯ã?¼ã?¯ã??å?©ç?¨ã?§ã??ã?ªã??å ´å??ã?«ã?­ã?¼ã??ã?³ã?°ã??許å?¯"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:4
-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)"
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+msgid "Any"
+msgstr "ä½?ã?§ã??"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "Basic"
+msgstr "��"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "Change..."
 msgstr "��..."
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "N_etwork ID:"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯ ID(_E):"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "Nu_mber:"
 msgstr "��(_M):"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "PI_N:"
 msgstr "PIN ��(_N):"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+msgid "Prefer 2G (GPRS/EDGE)"
+msgstr "2G å?ªå?? (GPRS/EDGE)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:12
+msgid "Prefer 3G (UMTS/HSPA)"
+msgstr "3G å?ªå?? (UMTS/HSPA)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:13
 msgid "Sho_w passwords"
 msgstr "ã??ã?¹ã?¯ã?¼ã??ã??表示(_W)"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:14
 msgid "_APN:"
 msgstr "APN(_A):"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:1
-msgid "<b>Allowed Authentication Methods</b>"
-msgstr "<b>許å?¯ã??ã??ã??èª?証æ?¹æ³?</b>"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:2
-msgid "<b>Authentication</b>"
-msgstr "<b>�証</b>"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:3
-msgid "<b>Compression</b>"
-msgstr "<b>�縮</b>"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:4
-msgid "<b>Echo</b>"
-msgstr "<b>Echo</b>"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:5
-msgid ""
-"<i>In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods.</i>"
-msgstr ""
-"<i>ã?»ã?¨ã??ã?©ã?®ã?±ã?¼ã?¹ã?§ã??ã?­ã??ã?¤ã??ã?® PPP ã?µã?¼ã??ã?¼ã?¯ã??ã?¹ã?¦ã?®èª?証æ³?ã??ã?µã??ã?¼ã??ã??ã?¦"
-"ã??ã?¾ã??ã?? æ?¥ç¶?ã??失æ??ã??ã??å ´å??ã?¯ã??ä¸?é?¨ã?®èª?証æ³?ã?¸ã?®ã?µã??ã?¼ã??ã??ç?¡å?¹ã?«ã??ã??ã??ã?¨ã??試ã??"
-"ã?¦ã??ã? ã??ã??ã??</i>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+msgid "_Type:"
+msgstr "ã?¿ã?¤ã??(_T):"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:6
+#: ../src/connection-editor/ce-page-ppp.ui.h:1
 msgid "Allow _BSD data compression"
 msgstr "BSD ã??ã?¼ã?¿å?§ç¸®ã??許å?¯ã??ã??(_B)"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:7
+#: ../src/connection-editor/ce-page-ppp.ui.h:2
 msgid "Allow _Deflate data compression"
 msgstr "Deflate ã??ã?¼ã?¿å?§ç¸®ã??許å?¯ã??ã??(_D)"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:8
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
 msgid "Allowed methods:"
 msgstr "������証��:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:9
-msgid "C_HAP"
-msgstr "CHAP(_H)"
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
+msgid "Authentication"
+msgstr "�証"
 
-# 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)"
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "Compression"
+msgstr "�縮"
 
 # "auth_methods_button"ã??ã?¿ã?³ã?®ã?©ã??ã?«
-#: ../src/connection-editor/ce-page-ppp.glade.h:11
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
 msgid "Configure _Methodsâ?¦"
 msgstr "èª?証æ?¹æ³?ã??設å®?ã??ã??(_M)â?¦"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:12
-msgid "Extensible Authentication Protocol"
-msgstr "æ?¡å¼µèª?証ã??ã?­ã??ã?³ã?« (EAP)"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:13
-msgid "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 ã??ã?£ã?¬ã?³ã?¸ã??ã?³ã??ã?·ã?§ã?¤ã?¯èª?証ã??ã?­ã??ã?³ã?« (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 (MS-CHAP v2)"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:16
-msgid "Password Authentication Protocol"
-msgstr "ã??ã?¹ã?¯ã?¼ã??èª?証ã??ã?­ã??ã?³ã?« (PAP)"
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
+msgid "Echo"
+msgstr "Echo"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:17
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
 msgid "Send PPP _echo packets"
 msgstr "PPP Echo ã?®ã??ã?±ã??ã??ã??é??ä¿¡(_E)"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:18
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
 msgid "Use TCP _header compression"
 msgstr "TCP ã??ã??ã??å?§ç¸®ã??使ç?¨(_H)"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:19
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
 msgid "Use _stateful MPPE"
 msgstr "ã?¹ã??ã?¼ã??ã??ã?« MPPE ã??使ç?¨(_S)"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:20
-msgid "_EAP"
-msgstr "EAP(_E)"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:21
-msgid "_MSCHAP"
-msgstr "MSCHAP(_M)"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:22
-msgid "_PAP"
-msgstr "PAP(_P)"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:23
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
 msgid "_Require 128-bit encryption"
 msgstr "128-bit ã?®æ??å?·å??ã??è¦?æ±?(_R)"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:24
+#: ../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.glade.h:1
+#: ../src/connection-editor/ce-page-wired.ui.h:1
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:2
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:3
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:4
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:5
+msgid "Attachment Unit Interface (AUI)"
+msgstr "Attachment Unit Interface (AUI)"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:6
 msgid "Aut_onegotiate"
 msgstr "ã?ªã?¼ã??ã??ã?´ã?·ã?¨ã?¼ã?·ã?§ã?³(_O)"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:2
-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"
+#: ../src/connection-editor/ce-page-wired.ui.h:8
+msgid "BNC"
+msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:7
-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)"
-
-#: ../src/connection-editor/ce-page-wired.glade.h:12
+#: ../src/connection-editor/ce-page-wired.ui.h:9
 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
+#: ../src/connection-editor/ce-page-wired.ui.h:10
+#: ../src/connection-editor/ce-page-wireless.ui.h:8
 msgid "MT_U:"
 msgstr "MTU(_U):"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:14
-#: ../src/connection-editor/ce-page-wireless.glade.h:11
+#: ../src/connection-editor/ce-page-wired.ui.h:11
+msgid "Media Independent Interface (MII)"
+msgstr "Media Independent Interface (MII)"
+
+#: ../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 "
@@ -1389,8 +1331,8 @@ msgstr ""
 "ã??ã??ã??ã?¼ã??ã?¦ã?§ã?¢ã?¢ã??ã?¬ã?¹ã?¨ã??ã?¦ä½¿ç?¨ã??ã??ã?¾ã??ã??ã??ã?®æ©?è?½ã?¯ MACã?¯ã?­ã?¼ã??ã?³ã?°ã??ã??ã??"
 "ã?¯MAC ã?¹ã??ã?¼ã??ã?£ã?³ã?°ã?¨ã??ã?¦ç?¥ã??ã??ã?¦ã??ã?¾ã??ã??ä¾?: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:15
-#: ../src/connection-editor/ce-page-wireless.glade.h:12
+#: ../src/connection-editor/ce-page-wired.ui.h:13
+#: ../src/connection-editor/ce-page-wireless.ui.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"
@@ -1398,64 +1340,66 @@ msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã??ã?«å?¥å??ã??ã?¦ã??ã??MACã?¢ã??ã?¬ã?¹ã?§æ??å®?ã??ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯ã??ã??ã?¤ã?¹"
 "ã?§ã??ã??ã?®æ?¥ç¶?ã??ã?­ã??ã?¯ã??ã?¾ã??ã??ä¾?: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:16
-#: ../src/connection-editor/ce-page-wireless.glade.h:16
+#: ../src/connection-editor/ce-page-wired.ui.h:14
+msgid "Twisted Pair (TP)"
+msgstr "ã??ã?¤ã?¹ã??ã??ã?¢ (TP)"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:15
+#: ../src/connection-editor/ce-page-wireless.ui.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:17
+#: ../src/connection-editor/ce-page-wired.ui.h:16
+#: ../src/connection-editor/ce-page-wireless.ui.h:17
 msgid "_Device MAC address:"
 msgstr "ã??ã??ã?¤ã?¹ã?® MAC ã?¢ã??ã?¬ã?¹(_D):"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:18
+#: ../src/connection-editor/ce-page-wired.ui.h:17
 msgid "_Port:"
 msgstr "ã??ã?¼ã??(_P):"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:19
+#: ../src/connection-editor/ce-page-wired.ui.h:18
 msgid "_Speed:"
 msgstr "é??度(_S):"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:20
-#: ../src/connection-editor/ce-page-wireless.glade.h:20
+#: ../src/connection-editor/ce-page-wired.ui.h:19
+#: ../src/connection-editor/ce-page-wireless.ui.h:20
 msgid "bytes"
 msgstr "ã??ã?¤ã??"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:1
-msgid ""
-"Automatic\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
-msgstr ""
-"è?ªå??\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
+#: ../src/connection-editor/ce-page-wireless.ui.h:1
+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
+msgid "B/G (2.4 GHz)"
+msgstr "b/g (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:4
+#: ../src/connection-editor/ce-page-wireless.ui.h:5
 msgid "Ban_d:"
 msgstr "ã??ã?³ã??(_D):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:5
+#: ../src/connection-editor/ce-page-wireless.ui.h:6
 msgid "C_hannel:"
 msgstr "ã??ã?£ã?³ã??ã?«(_H):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:6
-msgid ""
-"Infrastructure\n"
-"Ad-hoc"
-msgstr ""
-"ã?¤ã?³ã??ã?©ã?¹ã??ã?©ã?¯ã??ã?£\n"
-"ã?¢ã??ã??ã??ã?¯"
+#: ../src/connection-editor/ce-page-wireless.ui.h:7
+msgid "Infrastructure"
+msgstr "ã?¤ã?³ã??ã?©ã?¹ã??ã?©ã?¯ã??ã?£"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:9
+#: ../src/connection-editor/ce-page-wireless.ui.h:9
 msgid "M_ode:"
 msgstr "ã?¢ã?¼ã??(_O):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:10
+#: ../src/connection-editor/ce-page-wireless.ui.h:10
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:13
+#: ../src/connection-editor/ce-page-wireless.ui.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"
@@ -1463,211 +1407,249 @@ msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã??ã?«å?¥å??ã??ã?¦ã??ã?? BSSID ã?§æ??å®?ã??ã??ã??ã?¯ã?¤ã?¤ã?¬ã?¹ ã?¢ã?¯ã?»ã?¹ã??ã?¤"
 "ã?³ã?? (AP) ã?¸ã??ã?®æ?¥ç¶?ã??ã?­ã??ã?¯ã??ã?¾ã??ã??"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:14
+#: ../src/connection-editor/ce-page-wireless.ui.h:14
 msgid "Transmission po_wer:"
 msgstr "é??ä¿¡ã??ã?¯ã?¼(_W):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:15
+#: ../src/connection-editor/ce-page-wireless.ui.h:15
 msgid "_BSSID:"
 msgstr "BSSID(_B):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:18
+#: ../src/connection-editor/ce-page-wireless.ui.h:18
 msgid "_Rate:"
 msgstr "ã?¬ã?¼ã??(_R):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:19
+#: ../src/connection-editor/ce-page-wireless.ui.h:19
 msgid "_SSID:"
 msgstr "SSID(_S):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:21
+#: ../src/connection-editor/ce-page-wireless.ui.h:21
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless-security.glade.h:1
+#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
 msgid "_Security:"
 msgstr "ã?»ã?­ã?¥ã?ªã??ã?£(_S):"
 
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:2
+#: ../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)"
+
+# 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:5
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Choose a VPN Connection Type</span>\n"
-"\n"
-"Select the type of VPN you wish to use for the new connection.  If the type "
-"of VPN connection you wish to create does not appear in the list, you may "
-"not have the correct VPN plugin installed."
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">VPN æ?¥ç¶?ã?®ã?¿ã?¤ã??ã??é?¸æ??</span>\n"
-"\n"
-"æ?°è¦?æ?¥ç¶?ã?§ä½¿ç?¨ã??ã??ã?? VPN ã?®ã?¿ã?¤ã??ã??é?¸æ??ã??ã?¾ã??ã??ä½?æ??ã??ã??ã?? VPN æ?¥ç¶?ã?®ã?¿ã?¤ã??ã?? "
-"ä¸?覧å??ã?«ç?¡ã??å ´å??ã?¯ã??æ­£ã??ã?? VPN plugin ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¦ã??ã?ªã??ã??ã??ç?¥ã??ã?¾ã??"
-"ã??ã??"
+"ã?»ã?¨ã??ã?©ã?®ã?±ã?¼ã?¹ã?§ã??ã?­ã??ã?¤ã??ã?® PPP ã?µã?¼ã??ã?¼ã?¯ã??ã?¹ã?¦ã?®èª?証æ?¹æ³?ã??ã?µã??ã?¼ã??ã??ã?¦ã??"
+"ã?¾ã??ã?? æ?¥ç¶?ã??失æ??ã??ã??å ´å??ã?¯ã??ä¸?é?¨ã?®èª?証æ?¹æ³?ã??ç?¡å?¹ã?«ã??ã?¦ã?¿ã?¦ã??ã? ã??ã??ã??"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v2(_2)"
+
+# http://technet.microsoft.com/ja-jp/library/cc758984(WS.10).aspx
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "Microsoft ã??ã?£ã?¬ã?³ã?¸ã??ã?³ã??ã?·ã?§ã?¤ã?¯èª?証ã??ã?­ã??ã?³ã?« (MS-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)"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Password Authentication Protocol"
+msgstr "ã??ã?¹ã?¯ã?¼ã??èª?証ã??ã?­ã??ã?³ã?« (PAP)"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_EAP"
+msgstr "EAP(_E)"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "_MSCHAP"
+msgstr "MSCHAP(_M)"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "_PAP"
+msgstr "PAP(_P)"
+
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
+msgid "Choose a VPN Connection Type"
+msgstr "VPN æ?¥ç¶?ã?®é?¸ã??ã?§ã??ã? ã??ã??"
 
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:5
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
 msgid "Createâ?¦"
 msgstr "ä½?æ??â?¦"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:501
-#: ../src/connection-editor/ip6-routes-dialog.c:459
-#: ../src/connection-editor/page-ip4.c:738
-#: ../src/connection-editor/page-ip6.c:723
+#: ../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 "
+"not have the correct VPN plugin installed."
+msgstr ""
+"æ?°è¦?æ?¥ç¶?ã?§ä½¿ç?¨ã??ã??ã?? VPN ã?®ã?¿ã?¤ã??ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??ã??ä½?æ??ã??ã??ã?? VPN æ?¥ç¶?ã?®ç¨®"
+"é¡?ã??ä¸?覧ã?«ç?¡ã??å ´å??ã?¯ã??æ­£ã??ã?? VPN ã??ã?©ã?°ã?¤ã?³ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¦ã??ã?ªã??ã??ã??ã??ã??ã?¾"
+"ã??ã??ã??"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:505
+#: ../src/connection-editor/ip6-routes-dialog.c:463
+#: ../src/connection-editor/page-ip4.c:733
+#: ../src/connection-editor/page-ip6.c:718
 msgid "Address"
 msgstr "ã?¢ã??ã?¬ã?¹"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:517
-#: ../src/connection-editor/page-ip4.c:755
+#: ../src/connection-editor/ip4-routes-dialog.c:521
+#: ../src/connection-editor/page-ip4.c:750
 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:772
-#: ../src/connection-editor/page-ip6.c:757
+#: ../src/connection-editor/ip4-routes-dialog.c:537
+#: ../src/connection-editor/ip6-routes-dialog.c:495
+#: ../src/connection-editor/page-ip4.c:767
+#: ../src/connection-editor/page-ip6.c:752
 msgid "Gateway"
 msgstr "ã?²ã?¼ã??ã?¦ã?§ã?¤"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:549
-#: ../src/connection-editor/ip6-routes-dialog.c:507
+#: ../src/connection-editor/ip4-routes-dialog.c:553
+#: ../src/connection-editor/ip6-routes-dialog.c:511
 msgid "Metric"
 msgstr "ã?¡ã??ã?ªã??ã?¯"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:475
-#: ../src/connection-editor/page-ip6.c:740
+#: ../src/connection-editor/ip6-routes-dialog.c:479
+#: ../src/connection-editor/page-ip6.c:735
 msgid "Prefix"
 msgstr "�頭�"
 
-#: ../src/connection-editor/page-dsl.c:140
-#: ../src/connection-editor/page-dsl.c:147
-msgid "Could not load DSL user interface."
-msgstr "DSL ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??"
-
-#: ../src/connection-editor/page-dsl.c:153
-#: ../src/connection-editor/nm-connection-editor.glade.h:4
-#: ../src/connection-editor/nm-connection-list.c:1409
+#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-list.c:1448
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/page-dsl.c:241
+#: ../src/connection-editor/page-dsl.c:139
+msgid "Could not load DSL user interface."
+msgstr "DSL ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??"
+
+#: ../src/connection-editor/page-dsl.c:229
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL �� %d"
 
-#: ../src/connection-editor/page-ip4.c:126
-#: ../src/connection-editor/page-ip6.c:125
+#: ../src/connection-editor/page-ip4.c:127
+#: ../src/connection-editor/page-ip6.c:126
 msgid "Automatic (VPN)"
 msgstr "è?ªå?? (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:126
+#: ../src/connection-editor/page-ip4.c:128
+#: ../src/connection-editor/page-ip6.c:127
 msgid "Automatic (VPN) addresses only"
 msgstr "è?ªå?? (VPN) ã?¢ã??ã?¬ã?¹å°?ç?¨"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:129
+#: ../src/connection-editor/page-ip4.c:131
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (PPP)"
 msgstr "è?ªå?? (PPP)"
 
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:131
 msgid "Automatic (PPP) addresses only"
 msgstr "è?ªå?? (PPP) ã?¢ã??ã?¬ã?¹å°?ç?¨"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:134
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE)"
 msgstr "è?ªå?? (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:135
+#: ../src/connection-editor/page-ip6.c:134
 msgid "Automatic (PPPoE) addresses only"
 msgstr "è?ªå?? (PPPoE) ã?¢ã??ã?¬ã?¹å°?ç?¨"
 
-#: ../src/connection-editor/page-ip4.c:136
+#: ../src/connection-editor/page-ip4.c:137
 msgid "Automatic (DHCP)"
 msgstr "è?ªå?? (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP) addresses only"
 msgstr "è?ªå?? (DHCP) ã?¢ã??ã?¬ã?¹å°?ç?¨"
 
-#: ../src/connection-editor/page-ip4.c:162
-#: ../src/connection-editor/page-ip6.c:184
-msgid "Manual"
-msgstr "æ??å??"
-
-#: ../src/connection-editor/page-ip4.c:174
-#: ../src/connection-editor/page-ip6.c:197
+#: ../src/connection-editor/page-ip4.c:175
+#: ../src/connection-editor/page-ip6.c:198
 msgid "Link-Local Only"
 msgstr "�����������"
 
-#: ../src/connection-editor/page-ip4.c:180
-#: ../src/connection-editor/page-ip6.c:204
-msgid "Shared to other computers"
-msgstr "ä»?ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¸å?±æ??"
-
-#: ../src/connection-editor/page-ip4.c:190
+#: ../src/connection-editor/page-ip4.c:191
 msgid "Disabled"
 msgstr "ç?¡å?¹ã?«ã?ªã?£ã?¦ã??ã?¾ã??"
 
-#: ../src/connection-editor/page-ip4.c:700
+#: ../src/connection-editor/page-ip4.c:699
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s ç?¨ã?® IPv4 ã?«ã?¼ã??ã??ç·¨é??"
 
-#: ../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:832
+#: ../src/connection-editor/page-ip4.c:810
 msgid "IPv4 Settings"
 msgstr "IPv4 ã?®ã?»ã??ã??ã?£ã?³ã?°"
 
-#: ../src/connection-editor/page-ip6.c:135
-msgid "Automatic"
-msgstr "è?ªå??"
+#: ../src/connection-editor/page-ip4.c:812
+msgid "Could not load IPv4 user interface."
+msgstr "IPv4 ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic, addresses only"
 msgstr "è?ªå??ã??ã?¢ã??ã?¬ã?¹ã?®ã?¿"
 
-#: ../src/connection-editor/page-ip6.c:148
-#: ../src/wireless-security/eap-method.c:233
+#: ../src/connection-editor/page-ip6.c:149
+#: ../src/wireless-security/eap-method.c:285
 msgid "Ignore"
 msgstr "ç?¡è¦?ã??ã??"
 
-#: ../src/connection-editor/page-ip6.c:172
+#: ../src/connection-editor/page-ip6.c:173
 msgid "Automatic, DHCP only"
 msgstr "è?ªå??ã?? DHCP ã?®ã?¿"
 
-#: ../src/connection-editor/page-ip6.c:685
+#: ../src/connection-editor/page-ip6.c:684
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s ç?¨ã?® IPv6 ã?«ã?¼ã??ã??ç·¨é??"
 
-#: ../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:815
+#: ../src/connection-editor/page-ip6.c:793
 msgid "IPv6 Settings"
 msgstr "IPv6 ã?®ã?»ã??ã??ã?£ã?³ã?°"
 
-#: ../src/connection-editor/page-mobile.c:369
-#: ../src/connection-editor/page-mobile.c:376
+#: ../src/connection-editor/page-ip6.c:795
+msgid "Could not load IPv6 user interface."
+msgstr "IPv6 ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??"
+
+#: ../src/connection-editor/page-mobile.c:374
 msgid "Could not load mobile broadband user interface."
 msgstr ""
-"ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã?®ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+"ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã?®ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../src/connection-editor/page-mobile.c:397
+#: ../src/connection-editor/page-mobile.c:391
 msgid "Unsupported mobile broadband connection type."
-msgstr "ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?ªã??ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã?®æ?¥ç¶?ã?¿ã?¤ã??"
+msgstr "ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?ªã??ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã?®æ?¥ç¶?ã?¿ã?¤ã??ã??"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:638
+#: ../src/connection-editor/page-mobile.c:632
 msgid "Select Mobile Broadband Provider Type"
 msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã??ã?­ã??ã?¤ã??ã?®ã?¿ã?¤ã??ã??é?¸æ??"
 
-#: ../src/connection-editor/page-mobile.c:665
+#: ../src/connection-editor/page-mobile.c:659
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1675,383 +1657,414 @@ msgstr ""
 "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã?®ã??ã?­ã??ã?¤ã??ã??使ç?¨ã??ã??æ??è¡?ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??ã?? ä¸?æ??ã?ªå ´"
 "å??ã?¯ã??ã??ã?­ã??ã?¤ã??ã?«å°?ã?­ã?¦ã??ã? ã??ã??ã??"
 
-#: ../src/connection-editor/page-mobile.c:670
+#: ../src/connection-editor/page-mobile.c:664
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "ç§?ã?®ã??ã?­ã??ã?¤ã??ã?¯ GSM ã??ã?¼ã?¹ã?®æ??è¡? (ä¾?ã??ã?°ã?? GPRS, EDGE, UMTS, HSDPA) ã??使ç?¨ã??"
 "ã?¾ã??(_G)"
 
-#: ../src/connection-editor/page-mobile.c:677
+#: ../src/connection-editor/page-mobile.c:671
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "ç§?ã?®ã??ã?­ã??ã?¤ã??ã?¯ CDMA ã??ã?¼ã?¹ã?®æ??è¡? (ä¾?ã??ã?°ã??1xRTT, EVDO)ã??使ç?¨ã??ã?¾ã??(_D)"
 
-#: ../src/connection-editor/page-ppp.c:132
+#: ../src/connection-editor/page-ppp.c:134
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:228
+#: ../src/connection-editor/page-ppp.c:135
+#: ../src/wireless-security/eap-method-ttls.c:232
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:276
+#: ../src/connection-editor/page-ppp.c:136
+#: ../src/wireless-security/eap-method-ttls.c:280
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-peap.c:245
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: ../src/connection-editor/page-ppp.c:137
+#: ../src/wireless-security/eap-method-peap.c:248
+#: ../src/wireless-security/eap-method-ttls.c:264
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:244
+#: ../src/connection-editor/page-ppp.c:138
+#: ../src/wireless-security/eap-method-ttls.c:248
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:139
+#: ../src/connection-editor/page-ppp.c:141
 msgid "none"
 msgstr "ã?ªã??"
 
-#: ../src/connection-editor/page-ppp.c:199
+#: ../src/connection-editor/page-ppp.c:201
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s ç?¨ã?® PPP èª?証æ³?ã??ç·¨é??"
 
-#: ../src/connection-editor/page-ppp.c:283
-#: ../src/connection-editor/page-ppp.c:290
-msgid "Could not load PPP user interface."
-msgstr "PPP ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../src/connection-editor/page-ppp.c:296
+#: ../src/connection-editor/page-ppp.c:281
 msgid "PPP Settings"
 msgstr "PPP ã?®ã?»ã??ã??ã?£ã?³ã?°"
 
-#: ../src/connection-editor/page-vpn.c:108
-#: ../src/connection-editor/nm-connection-editor.glade.h:8
-#: ../src/connection-editor/nm-connection-list.c:1405
+#: ../src/connection-editor/page-ppp.c:283
+msgid "Could not load PPP user interface."
+msgstr "PPP ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??"
+
+#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: ../src/connection-editor/nm-connection-list.c:1444
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/page-vpn.c:119
+#: ../src/connection-editor/page-vpn.c:109
+msgid "Could not load VPN user interface."
+msgstr "VPN ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??"
+
+#: ../src/connection-editor/page-vpn.c:124
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
-msgstr "'%s' ç?¨ã?® VPN plugin ã?µã?¼ã??ã?¹ã??è¦?ä»?ã??ã??ã?¾ã??ã??ã?§ã??ã??"
+msgstr "'%s' ç?¨ã?® VPN ã??ã?©ã?°ã?¤ã?³ã?»ã?µã?¼ã??ã?¹ã??è¦?ä»?ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../src/connection-editor/page-vpn.c:213
-#: ../src/connection-editor/nm-connection-list.c:988
+#: ../src/connection-editor/page-vpn.c:218
+#: ../src/connection-editor/nm-connection-list.c:881
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN �� %d"
 
-#: ../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:226
-#: ../src/connection-editor/nm-connection-editor.glade.h:9
-#: ../src/connection-editor/nm-connection-list.c:1393
+#: ../src/connection-editor/page-wired.c:211
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-list.c:1432
 msgid "Wired"
 msgstr "æ??ç·?"
 
-#: ../src/connection-editor/page-wired.c:359
+#: ../src/connection-editor/page-wired.c:213
+msgid "Could not load wired user interface."
+msgstr "æ??ç·?ã?®ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??"
+
+#: ../src/connection-editor/page-wired.c:348
 #, c-format
 msgid "Wired connection %d"
 msgstr "æ??ç·?æ?¥ç¶? %d"
 
-#: ../src/connection-editor/page-wired-security.c:115
+#: ../src/connection-editor/page-wired-security.c:114
 msgid "802.1x Security"
 msgstr "802.1x ã?»ã?­ã?¥ã?ªã??ã?£"
 
-#: ../src/connection-editor/page-wired-security.c:123
+#: ../src/connection-editor/page-wired-security.c:116
+msgid "Could not load Wired Security security user interface."
+msgstr "æ??ç·?ã?»ã?­ã?¥ã?ªã??ã?£ã?®ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??読ã?¿è¾¼ã??ã?¾ã??ã??ã?§ã??ã??ã??"
+
+#: ../src/connection-editor/page-wired-security.c:130
 msgid "Use 802.1X security for this connection"
 msgstr "ã??ã?®æ?¥ç¶?ã?« 802.1x ã?»ã?­ã?¥ã?ªã??ã?£ã??使ç?¨ã??ã??"
 
-#: ../src/connection-editor/page-wireless.c:146
-#: ../src/connection-editor/page-wireless.c:150
-#: ../src/connection-editor/page-wireless.c:171
+#: ../src/connection-editor/page-wireless.c:147
+#: ../src/connection-editor/page-wireless.c:151
+#: ../src/connection-editor/page-wireless.c:172
 #, c-format
 msgid "default"
 msgstr "ã??ã??ã?©ã?«ã??"
 
-#: ../src/connection-editor/page-wireless.c:175
+#: ../src/connection-editor/page-wireless.c:176
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../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:412
-#: ../src/connection-editor/nm-connection-editor.glade.h:10
-#: ../src/connection-editor/nm-connection-list.c:1397
+#: ../src/connection-editor/page-wireless.c:396
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-list.c:1436
 msgid "Wireless"
 msgstr "ç?¡ç·?"
 
-#: ../src/connection-editor/page-wireless.c:574
+#: ../src/connection-editor/page-wireless.c:398
+msgid "Could not load WiFi user interface."
+msgstr "WiFi ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??å?ºæ?¥ã?¾ã??ã??ã?§ã??ã??ã??"
+
+#: ../src/connection-editor/page-wireless.c:562
 #, c-format
 msgid "Wireless connection %d"
 msgstr "���� %d"
 
-#: ../src/connection-editor/page-wireless-security.c:262
-#: ../src/wireless-dialog.c:936
+#: ../src/connection-editor/page-wireless-security.c:263
+#: ../src/wireless-dialog.c:920
 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
+#: ../src/connection-editor/page-wireless-security.c:272
+#: ../src/wireless-dialog.c:929
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit ã??ã?¹ã??ã?¬ã?¼ã?º"
 
-#: ../src/connection-editor/page-wireless-security.c:297
-#: ../src/wireless-dialog.c:975
+#: ../src/connection-editor/page-wireless-security.c:298
+#: ../src/wireless-dialog.c:959
 msgid "Dynamic WEP (802.1x)"
 msgstr "å??ç?? WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:311
-#: ../src/wireless-dialog.c:989
+#: ../src/connection-editor/page-wireless-security.c:312
+#: ../src/wireless-dialog.c:973
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 # ã??ã??ã??ã??ä»?æ§?ã?®å??å??ã?ªã?®ã?§è¨³ã??ã?¹ã??ã?§ã?ªã??ã??
-#: ../src/connection-editor/page-wireless-security.c:325
-#: ../src/wireless-dialog.c:1003
+#: ../src/connection-editor/page-wireless-security.c:326
+#: ../src/wireless-dialog.c:987
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wireless-security.c:365
+#: ../src/connection-editor/page-wireless-security.c:359
 msgid "Could not load WiFi security user interface; missing WiFi setting."
 msgstr ""
 "WiFi ã?»ã?­ã?¥ã?ªã??ã?£ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??å?ºæ?¥ã?¾ã??ã??ã?§ã??ã??ã??WiFi ã?»ã??"
 "ã??ã?£ã?³ã?°ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: ../src/connection-editor/page-wireless-security.c:372
-#: ../src/connection-editor/page-wireless-security.c:379
-msgid "Could not load WiFi security user interface."
-msgstr "WiFi ã?»ã?­ã?¥ã?ªã??ã?£ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??å?ºæ?¥ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../src/connection-editor/page-wireless-security.c:385
+#: ../src/connection-editor/page-wireless-security.c:368
 msgid "Wireless Security"
 msgstr "ç?¡ç·?ã?»ã?­ã?¥ã?ªã??ã?£"
 
-#: ../src/connection-editor/nm-connection-editor.c:100
+#: ../src/connection-editor/page-wireless-security.c:370
+msgid "Could not load WiFi security user interface."
+msgstr "WiFi ã?»ã?­ã?¥ã?ªã??ã?£ã?¦ã?¼ã?¶ã?¼ã?¤ã?³ã?¿ã?¼ã??ã?§ã?¤ã?¹ã??ã?­ã?¼ã??å?ºæ?¥ã?¾ã??ã??ã?§ã??ã??ã??"
+
+#: ../src/connection-editor/nm-connection-editor.c:101
 #, c-format
 msgid "Editing %s"
 msgstr "%s ã?®ç·¨é??"
 
-#: ../src/connection-editor/nm-connection-editor.c:104
+#: ../src/connection-editor/nm-connection-editor.c:105
 msgid "Editing un-named connection"
 msgstr "ç?¡å??ã?®æ?¥ç¶?ã??ç·¨é??"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:294
 msgid ""
-"The connection editor could not find some required resources (the "
-"NetworkManager applet glade file was not found)."
-msgstr ""
-"æ?¥ç¶?ã?¨ã??ã?£ã?¿ã?¯å¿?è¦?ã?ªã??ã??ã?¤ã??ã?®ã?ªã?½ã?¼ã?¹ã??ã?¿ã?¤ã??ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??"
-"(NetworkManager ã?¢ã??ã?¬ã??ã?? glade ã??ã?¡ã?¤ã?«ã??ã?¿ã?¤ã??ã??ã?¾ã??ã??ã??)"
-
-#: ../src/connection-editor/nm-connection-editor.c:300
-msgid ""
-"The connection editor could not find some required resources (the glade file "
+"The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
-"æ?¥ç¶?ã?¨ã??ã?£ã?¿ã?¯å¿?è¦?ã?ªã??ã??ã?¤ã??ã?®ã?ªã?½ã?¼ã?¹ã??ã?¿ã?¤ã??ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??(glade ã??ã?¡ã?¤"
-"ã?«ã??ã?¿ã?¤ã??ã??ã?¾ã??ã??ã??)"
+"æ?¥ç¶?ã?¨ã??ã?£ã?¿ã?¯å¿?è¦?ã?ªã??ã??ã?¤ã??ã?®ã?ªã?½ã?¼ã?¹ã??ã?¿ã?¤ã??ã??ã??ã?¾ã??ã??ã?§ã??ã?? (.ui ã??ã?¡ã?¤ã?«"
+"ã??ã?¿ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã??)ã??"
 
-#: ../src/connection-editor/nm-connection-editor.c:398
+#: ../src/connection-editor/nm-connection-editor.c:397
 msgid "Error creating connection editor dialog."
 msgstr "æ?¥ç¶?ã?¨ã??ã?£ã?¿ã??ã?¤ã?¢ã?­ã?°ã?®ä½?æ??中ã?«ã?¨ã?©ã?¼ã?§ã??ã??"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:409
 msgid "_Save"
 msgstr "ä¿?å­?(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:410
 msgid "Save any changes made to this connection."
 msgstr "ã??ã?®æ?¥ç¶?ã?«å¯¾ã??ã?¦ã?®å¤?æ?´ã??ã??ã?¹ã?¦ä¿?å­?ã??ã?¾ã??ã??"
 
-#: ../src/connection-editor/nm-connection-editor.c:421
+#: ../src/connection-editor/nm-connection-editor.c:411
 msgid "_Save..."
 msgstr "ä¿?å­?(_S)..."
 
-#: ../src/connection-editor/nm-connection-editor.c:422
+#: ../src/connection-editor/nm-connection-editor.c:412
 msgid "Authenticate to save this connection for all users of this machine."
-msgstr "ã??ã?®ã??ã?·ã?³ã?®ã??ã?¹ã?¦ã?®ã?¦ã?¼ã?¶ã?¼ç?¨æ?¥ç¶?ã?®ä¿?å­?ã??èª?証ã??ã??"
+msgstr "ã??ã?®ã??ã?·ã?³ã?®ã??ã?¹ã?¦ã?®ã?¦ã?¼ã?¶ã?¼ç?¨æ?¥ç¶?ã?®ä¿?å­?ã??èª?証ã??ã??ã??"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Available to all users"
 msgstr "ã??ã?¹ã?¦ã?®ã?¦ã?¼ã?¶ã?¼ã?«å?©ç?¨å?¯è?½"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
 msgid "Connect _automatically"
 msgstr "è?ªå??æ?¥ç¶?ã??ã??(_A) "
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "Connection _name:"
 msgstr "æ?¥ç¶?å??(_N):"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:5
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "E_xport"
 msgstr "ã?¨ã?¯ã?¹ã??ã?¼ã??(_X)"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:11
+#: ../src/connection-editor/nm-connection-editor.ui.h:11
 msgid "_Import"
 msgstr "ã?¤ã?³ã??ã?¼ã??(_I)"
 
-#: ../src/connection-editor/nm-connection-list.c:217
+#: ../src/connection-editor/nm-connection-list.c:216
 msgid "never"
 msgstr "���"
 
-#: ../src/connection-editor/nm-connection-list.c:228
-#: ../src/connection-editor/nm-connection-list.c:239
+#: ../src/connection-editor/nm-connection-list.c:227
+#: ../src/connection-editor/nm-connection-list.c:238
 msgid "now"
 msgstr "��中"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:246
+#: ../src/connection-editor/nm-connection-list.c:245
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d å??å??"
 
-#: ../src/connection-editor/nm-connection-list.c:250
+#: ../src/connection-editor/nm-connection-list.c:249
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d æ??é??å??"
 
-#: ../src/connection-editor/nm-connection-list.c:262
+#: ../src/connection-editor/nm-connection-list.c:261
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d æ?¥å??"
 
-#: ../src/connection-editor/nm-connection-list.c:268
+#: ../src/connection-editor/nm-connection-list.c:267
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ã?¶æ??å??"
 
-#: ../src/connection-editor/nm-connection-list.c:272
+#: ../src/connection-editor/nm-connection-list.c:271
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d å¹´å??"
 
-#: ../src/connection-editor/nm-connection-list.c:594
+#: ../src/connection-editor/nm-connection-list.c:486
 msgid "Connection add failed"
 msgstr "æ?¥ç¶?ã?®è¿½å? ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:623
+#: ../src/connection-editor/nm-connection-list.c:515
+msgid "Error saving connection"
+msgstr "æ?¥ç¶?æ??å ±ã?®ä¿?å­?中ã?«ã?¨ã?©ã?¼"
+
+#: ../src/connection-editor/nm-connection-list.c:516
 #, c-format
-msgid "Error editing connection: property '%s' / '%s' invalid: %d"
-msgstr "æ?¥ç¶?ã?®ç·¨é??ã?§ã?¨ã?©ã?¼ç?ºç??: ã??ã?­ã??ã??ã?£ '%s' / '%s' ç?¡å?¹: %d"
+msgid "The property '%s' / '%s' is invalid: %d"
+msgstr "ã??ã?­ã??ã??ã?£ '%s' / '%s' ã?¯ç?¡å?¹ã?§ã??: %d"
 
-#: ../src/connection-editor/nm-connection-list.c:630
-#: ../src/connection-editor/nm-connection-list.c:745
+#: ../src/connection-editor/nm-connection-list.c:523
+#: ../src/connection-editor/nm-connection-list.c:642
 msgid "An unknown error occurred."
 msgstr "ä¸?æ??ã?ªã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/connection-editor/nm-connection-list.c:786
+#: ../src/connection-editor/nm-connection-list.c:528
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "Error initializing editor"
 msgstr "ã?¨ã??ã?£ã?¿ã?®å??æ??å??中ã?«ã?¨ã?©ã?¼ã?§ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:651
-#: ../src/connection-editor/nm-connection-list.c:803
-#: ../src/connection-editor/nm-connection-list.c:971
+#: ../src/connection-editor/nm-connection-list.c:546
+#: ../src/connection-editor/nm-connection-list.c:700
+#: ../src/connection-editor/nm-connection-list.c:867
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "æ?¥ç¶?ã?¨ã??ã?£ã?¿ã?®ã??ã?¤ã?¢ã?­ã?°ã?¯ä¸?æ??ã?ªã?¨ã?©ã?¼ã?®ã??ã??ã?«å??æ??å??å?ºæ?¥ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:660
+#: ../src/connection-editor/nm-connection-list.c:557
 msgid "Could not create new connection"
 msgstr "æ?°ã??ã??æ?¥ç¶?ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:671
+#: ../src/connection-editor/nm-connection-list.c:569
 msgid "Could not edit new connection"
 msgstr "æ?°è¦?æ?¥ç¶?ã??ç·¨é??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:818
+#: ../src/connection-editor/nm-connection-list.c:714
 msgid "Could not edit connection"
 msgstr "æ?¥ç¶?ã??ç·¨é??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:843
+#: ../src/connection-editor/nm-connection-list.c:744
 msgid "Connection delete failed"
 msgstr "æ?¥ç¶?ã?®å??é?¤ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:875
+#: ../src/connection-editor/nm-connection-list.c:776
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "æ?¬å½?ã?« æ?¥ç¶? %s ã??å??é?¤ã??ã??ã??ã?®ã?§ã??ã?? ?"
 
-#: ../src/connection-editor/nm-connection-list.c:1018
-#: ../src/connection-editor/vpn-helpers.c:228
+#: ../src/connection-editor/nm-connection-list.c:911
+#: ../src/connection-editor/vpn-helpers.c:227
 msgid "Cannot import VPN connection"
 msgstr "VPN æ?¥ç¶?ã??ã?¤ã?³ã??ã?¼ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:1020
+#: ../src/connection-editor/nm-connection-list.c:913
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
 "Error: no VPN service type."
 msgstr ""
-"VPN plugin ã?¯ VPN æ?¥ç¶?ã?®æ­£å¸¸ã?ªã?¤ã?³ã??ã?¼ã??ã?«å¤±æ??ã??ã?¾ã??ã??ã??n\n"
-"ã?¨ã?©ã?¼: VPN ã?µã?¼ã??ã?¹ã?¿ã?¤ã??ã??ã??ã??ã?¾ã??ã??"
+"VPN ã??ã?©ã?°ã?¤ã?³ã?¯ VPN æ?¥ç¶?ã?®æ­£å¸¸ã?ªã?¤ã?³ã??ã?¼ã??ã?«å¤±æ??ã??ã?¾ã??ã??\n"
+"\n"
+"ã?¨ã?©ã?¼: VPN ã?µã?¼ã??ã?¹ã?¿ã?¤ã??ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:1033
+#: ../src/connection-editor/nm-connection-list.c:926
 msgid "Could not edit imported connection"
 msgstr "ã?¤ã?³ã??ã?¼ã??ã??ã??æ?¥ç¶?ã??ç·¨é??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:1167
+#: ../src/connection-editor/nm-connection-list.c:1069
 msgid "Name"
 msgstr "å??å??"
 
-#: ../src/connection-editor/nm-connection-list.c:1179
+#: ../src/connection-editor/nm-connection-list.c:1081
 msgid "Last Used"
 msgstr "å??å??ã?®ä½¿ç?¨"
 
-#: ../src/connection-editor/nm-connection-list.c:1282
+#: ../src/connection-editor/nm-connection-list.c:1197
+msgid "No VPN plugin available. Please install one to enable this button."
+msgstr ""
+"VPN ã??ã?©ã?°ã?¤ã?³ã??å?©ç?¨ã?§ã??ã?¾ã??ã??ã??ã??ã?®ã??ã?¿ã?³ã??æ??å?¹ã?«ã??ã??ã?«ã?¯ä¸?ã?¤ã?¯ã?¤ã?³ã?¹ã??ã?¼ã?«"
+"ã??ã?¦ã??ã? ã??ã??ã??"
+
+#: ../src/connection-editor/nm-connection-list.c:1208
 msgid "_Edit"
 msgstr "ç·¨é??(_E)"
 
-#: ../src/connection-editor/nm-connection-list.c:1283
+#: ../src/connection-editor/nm-connection-list.c:1209
 msgid "Edit the selected connection"
 msgstr "é?¸æ??ã??ã??æ?¥ç¶?ã??ç·¨é??ã??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:1284
+#: ../src/connection-editor/nm-connection-list.c:1210
 msgid "_Edit..."
 msgstr "ç·¨é??(_E)..."
 
-#: ../src/connection-editor/nm-connection-list.c:1285
+#: ../src/connection-editor/nm-connection-list.c:1211
 msgid "Authenticate to edit the selected connection"
 msgstr "é?¸æ??ã??ã??æ?¥ç¶?ã?®ç·¨é??ã??èª?証ã??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:1300
+#: ../src/connection-editor/nm-connection-list.c:1226
 msgid "_Delete"
 msgstr "å??é?¤(_D)"
 
-#: ../src/connection-editor/nm-connection-list.c:1301
+#: ../src/connection-editor/nm-connection-list.c:1227
 msgid "Delete the selected connection"
 msgstr "é?¸æ??ã??ã??æ?¥ç¶?ã??å??é?¤ã??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:1302
+#: ../src/connection-editor/nm-connection-list.c:1228
 msgid "_Delete..."
 msgstr "å??é?¤(_D)..."
 
-#: ../src/connection-editor/nm-connection-list.c:1303
+#: ../src/connection-editor/nm-connection-list.c:1229
 msgid "Authenticate to delete the selected connection"
 msgstr "é?¸æ??ã??ã??æ?¥ç¶?ã?®å??é?¤ã??èª?証ã??ã??"
 
-#: ../src/connection-editor/vpn-helpers.c:230
+#: ../src/connection-editor/nm-connection-list.c:1504
+msgid "Error creating connection"
+msgstr "æ?¥ç¶?ã?®ä½?æ??中ã?«ã?¨ã?©ã?¼"
+
+#: ../src/connection-editor/nm-connection-list.c:1505
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "æ?¥ç¶? '%s' ã?®ä½?æ??æ?¹æ³?ã??ã??ã??ã??ã?¾ã??ã??"
+
+#: ../src/connection-editor/nm-connection-list.c:1559
+#: ../src/connection-editor/nm-connection-list.c:1571
+msgid "Error editing connection"
+msgstr "æ?¥ç¶?ã??ç·¨é??ã??ã??ã??ã?¨ã??ã?¦ã?¨ã?©ã?¼"
+
+#: ../src/connection-editor/nm-connection-list.c:1560
+#, c-format
+msgid "Don't know how to edit '%s' connections"
+msgstr "æ?¥ç¶? '%s' ã??ç·¨é??ã??ã??æ?¹æ³?ã??ã??ã??ã??ã?¾ã??ã??"
+
+#: ../src/connection-editor/nm-connection-list.c:1572
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr "UUID '%s' ã?®æ?¥ç¶?ã??ç?ºè¦?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#: ../src/connection-editor/vpn-helpers.c:229
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2059,96 +2072,103 @@ msgid ""
 "\n"
 "Error: %s."
 msgstr ""
-"ã??ã?¡ã?¤ã?« '%s' ã?¯èª­ã?¿è¾¼ã??ã?ªã??ã?£ã??ã??ã??å??ã?¯æ?¿èª?ã??ã??ã?? VPN æ?¥ç¶?æ??å ±ã?? æ??ã?¡ã?¾ã??"
-"ã??ã??\n"
+"ã??ã?¡ã?¤ã?« '%s' ã?¯èª­ã?¿è¾¼ã??ã?ªã??ã?£ã??ã??ã??ã?¾ã??ã?¯å?¦ç??ã?§ã??ã?? VPN æ?¥ç¶?æ??å ±ã??ã??ã??ã?¾ã??"
+"ã??\n"
 "\n"
-"���: %s."
+"���: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:262
+#: ../src/connection-editor/vpn-helpers.c:261
 msgid "Select file to import"
 msgstr "ã?¤ã?³ã??ã?¼ã??ã??ã??ã??ã?¡ã?¤ã?«ã??é?¸æ??ã??ã??"
 
-#: ../src/connection-editor/vpn-helpers.c:310
+#: ../src/connection-editor/vpn-helpers.c:309
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "\"%s\" ã?¨è¨?ã??ã??ã?¡ã?¤ã?«ã?¯æ?¢ã?«å­?å?¨ã??ã?¾ã??ã??"
 
-#: ../src/connection-editor/vpn-helpers.c:312
+#: ../src/connection-editor/vpn-helpers.c:311
 msgid "_Replace"
 msgstr "å?¥ã??æ?¿ã??(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:314
+#: ../src/connection-editor/vpn-helpers.c:313
 #, 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:350
+#: ../src/connection-editor/vpn-helpers.c:349
 msgid "Cannot export VPN connection"
 msgstr "VPN æ?¥ç¶?ã??ã?¨ã?¯ã?¹ã??ã?¼ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../src/connection-editor/vpn-helpers.c:352
+#: ../src/connection-editor/vpn-helpers.c:351
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
 "\n"
 "Error: %s."
 msgstr ""
-"VPN æ?¥ç¶? '%s' ã?¯ %s ã?«ã?¨ã?¯ã?¹ã??ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??.\n"
+"VPN æ?¥ç¶? '%s' ã?¯ %s ã?«ã?¨ã?¯ã?¹ã??ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??\n"
 "\n"
-"���: %s."
+"���: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:386
+#: ../src/connection-editor/vpn-helpers.c:385
 msgid "Export VPN connection..."
 msgstr "VPN æ?¥ç¶?ã??ã?¨ã?¯ã?¹ã??ã?¼ã??ã??ã??..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:213
+#: ../src/gnome-bluetooth/bt-widget.c:218
+#, c-format
+msgid "Failed to create PAN connection: %s"
+msgstr "PAN æ?¥ç¶?ã?®ä½?æ??ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
+
+#: ../src/gnome-bluetooth/bt-widget.c:223
+#: ../src/gnome-bluetooth/bt-widget.c:491
+msgid "Your phone is now ready to use!"
+msgstr "ã??使ç?¨ã?®é?»è©±ã?¯ä»?ã??使ç?¨æº?å??ã??ã?§ã??ã?¾ã??ã??"
+
+#: ../src/gnome-bluetooth/bt-widget.c:247
 #, c-format
 msgid "%s Network"
 msgstr "%s ã??ã??ã??ã?¯ã?¼ã?¯"
 
-#: ../src/gnome-bluetooth/bt-widget.c:322
+#: ../src/gnome-bluetooth/bt-widget.c:373
 #, c-format
 msgid "Error: %s"
 msgstr "���: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:441
+#: ../src/gnome-bluetooth/bt-widget.c:486
+#, c-format
+msgid "Failed to create DUN connection: %s"
+msgstr "DUN æ?¥ç¶?ã?®ä½?æ??ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
+
+#: ../src/gnome-bluetooth/bt-widget.c:509
 msgid "Mobile wizard was canceled"
 msgstr "ã?¢ã??ã?¤ã?«ã?¦ã?£ã?¶ã?¼ã??ã?¯å??ã??æ¶?ã??ã??ã?¾ã??ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:450
+#: ../src/gnome-bluetooth/bt-widget.c:518
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "ä¸?æ??ã?ªé?»è©±ã?®ã??ã??ã?¤ã?¹ã?¿ã?¤ã??ã?§ã?? (GSM ã?? CDMA ã?§ã?¯ã?ªã??)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:478
-msgid "Your phone is now ready to use!"
-msgstr "ã??使ç?¨ã?®é?»è©±ã?¯ä»?ã??使ç?¨æº?å??ã??ã?§ã??ã?¾ã??ã??"
-
-#: ../src/gnome-bluetooth/bt-widget.c:648
-#: ../src/gnome-bluetooth/bt-widget.c:654
+#: ../src/gnome-bluetooth/bt-widget.c:712
+#: ../src/gnome-bluetooth/bt-widget.c:718
 msgid "failed to connect to the phone."
 msgstr "é?»è©±ã?¸ã?®æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:687
+#: ../src/gnome-bluetooth/bt-widget.c:751
 msgid "unexpectedly disconnected from the phone."
-msgstr "é?»è©±ã??ä¸?æ??ã?«å??æ?­ã??ã??ã?¾ã??ã??"
+msgstr "é?»è©±ã??ä¸?æ??ã?«å??æ?­ã??ã??ã?¾ã??ã??ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:696
+#: ../src/gnome-bluetooth/bt-widget.c:760
 msgid "timed out detecting phone details."
-msgstr "é?»è©±ã?®è©³ç´°æ¤?å?ºã??ã?¿ã?¤ã? ã?¢ã?¦ã??ã?§ã??"
-
-#: ../src/gnome-bluetooth/bt-widget.c:711
-msgid "could not connect to the system bus."
-msgstr "ã?·ã?¹ã??ã? ã??ã?¹ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??"
+msgstr "é?»è©±ã?®è©³ç´°æ¤?å?ºã??ã?¿ã?¤ã? ã?¢ã?¦ã??ã?§ã??ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:716
+#: ../src/gnome-bluetooth/bt-widget.c:772
 msgid "Detecting phone configuration..."
 msgstr "é?»è©±ã?®è¨­å®?ã??æ¤?å?ºä¸­ã?§ã??..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:782
+#: ../src/gnome-bluetooth/bt-widget.c:838
 msgid "could not find the Bluetooth device."
-msgstr "Bluetooth ã??ã??ã?¤ã?¹ã??è¦?ä»?ã??ã??ã?¾ã??ã??ã?§ã??ã??"
+msgstr "Bluetooth ã??ã??ã?¤ã?¹ã??è¦?ä»?ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:912
+#: ../src/gnome-bluetooth/bt-widget.c:971
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
@@ -2156,26 +2176,27 @@ msgstr ""
 "ã??ã??ã?©ã?«ã??ã?® Bluetooth ã?¢ã??ã??ã?¿ã??æ??å?¹ã?«ã??ã?¦ã??ã??å¾?ã?«ã??ã??ã?¤ã?¢ã?«ã?¢ã??ã??ã??ã??ã??ã?¯ã?¼"
 "ã?­ã?³ã?° æ?¥ç¶?ã??ã?»ã??ã??ã?¢ã??ã??ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:944
+#: ../src/gnome-bluetooth/bt-widget.c:1003
 #, 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
+#: ../src/gnome-bluetooth/bt-widget.c:1013
 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
+#: ../src/gnome-bluetooth/bt-widget.c:1022
 #, c-format
 msgid ""
 "Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr "Bluetooth ã?®è¨­å®?ã?¯ã?§ã??ã?¾ã??ã??(NetworkManager ã?®æ¤?索中ã?«ã?¨ã?©ã?¼ç?ºç??: %s)"
+msgstr ""
+"Bluetooth ã?®è¨­å®?ã?¯ã?§ã??ã?¾ã??ã?? (NetworkManager ã?®æ¤?索中ã?«ã?¨ã?©ã?¼ç?ºç??: %s)ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1014
+#: ../src/gnome-bluetooth/bt-widget.c:1085
 msgid "Use your mobile phone as a network device (PAN/NAP)"
 msgstr "ã?¢ã??ã?¤ã?«é?»è©±ã??ã??ã??ã??ã?¯ã?¼ã?¯ã??ã??ã?¤ã?¹ (PAN/NAP) ã?¨ã??ã?¦ä½¿ç?¨ã??ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1023
+#: ../src/gnome-bluetooth/bt-widget.c:1094
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr "ã?¢ã??ã?¤ã?«é?»è©± (DUN) ã??使ç?¨ã??ã?¦ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?«ã?¢ã?¯ã?»ã?¹ã??ã??"
 
@@ -2199,76 +2220,80 @@ msgstr ""
 "ã?³ã??ã?³ã??ã?©ã?¤ã?³å¯¾è©±ç?¨ã?«ã?¯æ??å?³ã??ã??ã?¦ã??ã?¾ã??ã??ã??ã??ã??ã?®ä»£ã??ã??ã?« GNOME ã??ã?¹ã?¯ã??ã??"
 "ã?? ç?°å¢?ã?§å®?è¡?ã??ã?¾ã??ã??"
 
-#: ../src/mb-menu-item.c:58
+#: ../src/mb-menu-item.c:57
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:61
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:63
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:65
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:67
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:69
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:71
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:104
+#: ../src/mb-menu-item.c:73
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#: ../src/mb-menu-item.c:109
 msgid "not enabled"
 msgstr "æ??å?¹ã?«ã?ªã?£ã?¦ã??ã?¾ã??ã??"
 
-#: ../src/mb-menu-item.c:110
+#: ../src/mb-menu-item.c:115
 msgid "not registered"
 msgstr "ç?»é?²ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../src/mb-menu-item.c:128
+#: ../src/mb-menu-item.c:133
 #, c-format
 msgid "Home network (%s)"
 msgstr "ã??ã?¼ã? ã??ã??ã??ã?¯ã?¼ã?¯ (%s)"
 
-#: ../src/mb-menu-item.c:130
+#: ../src/mb-menu-item.c:135
 #, c-format
 msgid "Home network"
 msgstr "ã??ã?¼ã? ã??ã??ã??ã?¯ã?¼ã?¯"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 msgid "searching"
 msgstr "�索中"
 
-#: ../src/mb-menu-item.c:141
+#: ../src/mb-menu-item.c:146
 msgid "registration denied"
 msgstr "ç?»é?²ã?¯æ??å?¦ã??ã??ã?¾ã??ã??"
 
-#: ../src/mb-menu-item.c:146 ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s ã?­ã?¼ã??ã?³ã?°)"
 
-#: ../src/mb-menu-item.c:148 ../src/mb-menu-item.c:154
+#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (ã?­ã?¼ã??ã?³ã?°)"
 
-#: ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:162
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "ã?­ã?¼ã??ã?³ã?°ã??ã??ã??ã?¯ã?¼ã?¯ (%s)"
 
-#: ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:164
 #, c-format
 msgid "Roaming network"
 msgstr "ã?­ã?¼ã??ã?³ã?°ã??ã??ã??ã?¯ã?¼ã?¯"
@@ -2361,43 +2386,43 @@ msgstr "ã??ã?­ã??ã?¤ã??ã??è¦?ã?¤ã??ã??ã??ã?¨ã??ã?§ã??ã?ªã??ã?®ã?§æ??å??ã?§å?¥å??
 msgid "Provider:"
 msgstr "ã??ã?­ã??ã?¤ã??:"
 
-#: ../src/utils/mobile-wizard.c:753
+#: ../src/utils/mobile-wizard.c:761
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "ç§?ã?®ã??ã?­ã??ã?¤ã??ã?¯ GSM æ??è¡? (GPRS, EDGE, UMTS, HSPA) ã??使ç?¨ã??ã?¾ã??"
 
-#: ../src/utils/mobile-wizard.c:755
+#: ../src/utils/mobile-wizard.c:767
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "ç§?ã?®ã??ã?­ã??ã?¤ã??ã?¯ CDMA æ??è¡? (1xRTT, EVDO) ã??使ç?¨ã??ã?¾ã??ã??"
 
-#: ../src/utils/mobile-wizard.c:766
+#: ../src/utils/mobile-wizard.c:778
 msgid "Choose your Provider"
 msgstr "使ç?¨ã??ã?­ã??ã?¤ã??ã??é?¸æ??"
 
-#: ../src/utils/mobile-wizard.c:1012
-msgid "Country List:"
-msgstr "��覧:"
-
 #: ../src/utils/mobile-wizard.c:1024
-msgid "Country"
-msgstr "å?½"
+msgid "Country or Region List:"
+msgstr "å?½ã??å?°å??ã?®ä¸?覧:"
+
+#: ../src/utils/mobile-wizard.c:1036
+msgid "Country or region"
+msgstr "å?½ã??å?°å??"
 
-#: ../src/utils/mobile-wizard.c:1031
+#: ../src/utils/mobile-wizard.c:1043
 msgid "My country is not listed"
 msgstr "ç§?ã?®å?½ã?¯ä¸?覧ã?«æ??ã??ã?¾ã??ã??"
 
-#: ../src/utils/mobile-wizard.c:1077
-msgid "Choose your Provider's Country"
-msgstr "使ç?¨ã??ã?­ã??ã?¤ã??ã?®å?½ã??é?¸æ??"
+#: ../src/utils/mobile-wizard.c:1089
+msgid "Choose your Provider's Country or Region"
+msgstr "使ç?¨ã??ã?­ã??ã?¤ã??ã?®å?½ã??å?°å??ã??é?¸æ??"
 
-#: ../src/utils/mobile-wizard.c:1126
+#: ../src/utils/mobile-wizard.c:1143
 msgid "Installed GSM device"
 msgstr "GSM ã??ã??ã?¤ã?¹ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã?¾ã??"
 
-#: ../src/utils/mobile-wizard.c:1129
+#: ../src/utils/mobile-wizard.c:1146
 msgid "Installed CDMA device"
 msgstr "CDMA ã??ã??ã?¤ã?¹ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã?¾ã??"
 
-#: ../src/utils/mobile-wizard.c:1297
+#: ../src/utils/mobile-wizard.c:1314
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -2405,82 +2430,63 @@ msgstr ""
 "ã??ã?®ã?¢ã?·ã?¹ã?¿ã?³ã??ã?¯ã?¦ã?¼ã?¶ã?¼ã??ç°¡å??ã?«æ?ºå¸¯ (3G) ã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??"
 "ã??ã?³ã??æ?¥ç¶? ã?§ã??ã??ã??ã??ã?«æ??ä¼?ã??ã?¾ã??ã??"
 
-#: ../src/utils/mobile-wizard.c:1302
+#: ../src/utils/mobile-wizard.c:1319
 msgid "You will need the following information:"
 msgstr "以ä¸?ã?®æ??å ±ã??å¿?è¦?ã?§ã??:"
 
-#: ../src/utils/mobile-wizard.c:1313
+#: ../src/utils/mobile-wizard.c:1330
 msgid "Your broadband provider's name"
 msgstr "使ç?¨ã??ã??ã??ã?­ã?¼ã??ã??ã?³ã??ã??ã?­ã??ã?¤ã??å??"
 
-#: ../src/utils/mobile-wizard.c:1319
+#: ../src/utils/mobile-wizard.c:1336
 msgid "Your broadband billing plan name"
 msgstr "使ç?¨ã??ã??ã??ã?­ã?¼ã??ã??ã?³ã??è«?æ±?æ?¸ã??ã?©ã?³å??"
 
-#: ../src/utils/mobile-wizard.c:1325
+#: ../src/utils/mobile-wizard.c:1342
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(ä¸?é?¨ã?®ã?±ã?¼ã?¹ã?§) ã??ã?­ã?¼ã??ã??ã?³ã??è«?æ±?æ?¸ã??ã?©ã?³ APN (Access Point Name)"
 
-#: ../src/utils/mobile-wizard.c:1352
+#: ../src/utils/mobile-wizard.c:1369
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "ã??ã?®ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??ã??ã??ã?¤ã?¹ç?¨ã?®æ?¥ç¶?ã??ä½?æ??(_T):"
 
-#: ../src/utils/mobile-wizard.c:1367
+#: ../src/utils/mobile-wizard.c:1384
 msgid "Any device"
 msgstr "ã??ã?¹ã?¦ã?®ã??ã??ã?¤ã?¹"
 
-#: ../src/utils/mobile-wizard.c:1380
+#: ../src/utils/mobile-wizard.c:1397
 msgid "Set up a Mobile Broadband Connection"
 msgstr "ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??æ?¥ç¶?ã?®ã?»ã??ã??ã?¢ã??ã??"
 
-#: ../src/utils/mobile-wizard.c:1554
+#: ../src/utils/mobile-wizard.c:1561
 msgid "New Mobile Broadband Connection"
 msgstr "æ?°è¦?ã?®ã?¢ã??ã?¤ã?«ã??ã?­ã?¼ã??ã??ã?³ã??æ?¥ç¶?"
 
-#: ../src/utils/nmn-mobile-providers.c:76
+#: ../src/utils/nmn-mobile-providers.c:78
 msgid "United Kingdom"
 msgstr "��"
 
-#: ../src/utils/nmn-mobile-providers.c:508
+#: ../src/utils/nmn-mobile-providers.c:510
 msgid "Default"
 msgstr "ã??ã??ã?©ã?«ã??"
 
-#: ../src/vpn-password-dialog.c:137 ../src/vpn-password-dialog.c:255
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr "VPN æ?¥ç¶? '%s' ã??é??å§?ã?§ã??ã?¾ã??ã??"
-
-#: ../src/vpn-password-dialog.c:140
-#, c-format
-msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr ""
-"VPN æ?¥ç¶?ã?¿ã?¤ã?? '%s' ã?®èª?証ã??ã?¤ã?¢ã?­ã?°ã??ã?¿ã?¤ã??ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??ã?·ã?¹ã??ã? ç®¡ç??è??"
-"ã?«é?£çµ¡ã??ã?¦ã??ã? ã??ã??ã??"
-
-#: ../src/vpn-password-dialog.c:258
-#, c-format
+#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
 msgid ""
-"There was a problem launching the authentication dialog for VPN connection "
-"type '%s'. Contact your system administrator."
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
 msgstr ""
-"VPN æ?¥ç¶?ã?¿ã?¤ã?? '%s' ã?®èª?証ã??ã?¤ã?¢ã?­ã?°ã??èµ·å??中ã?«å??é¡?ã??ç??ã??ã?¾ã??ã??ã??ã?·ã?¹ã??ã? ç®¡ç??"
-"è??ã?«é?£çµ¡ã??ã?¦ã??ã? ã??ã??ã??"
+"NetworkManager ã?¢ã??ã?¬ã??ã??ã?¯å¿?è¦?ã?ªã??ã??ã?¤ã??ã?®ã?ªã?½ã?¼ã?¹ã??ã?¿ã?¤ã??ã??ã??ã?¾ã??ã??ã?§ã??ã?? "
+"(.ui ã??ã?¡ã?¤ã?«ã??ã?¿ã?¤ã??ã??ã?¾ã??ã??)ã??"
 
-#: ../src/wired-dialog.c:99
-msgid "Wired 802.1X authentication"
-msgstr "æ??ç·? 802.1X ã?®èª?証"
-
-#: ../src/wireless-dialog.c:474
+#: ../src/wireless-dialog.c:454
 msgid "New..."
 msgstr "��..."
 
-#: ../src/wireless-dialog.c:1093
+#: ../src/wireless-dialog.c:1074
 msgid "C_reate"
 msgstr "ä½?æ??(_R)"
 
-#: ../src/wireless-dialog.c:1174
+#: ../src/wireless-dialog.c:1152
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network '%"
@@ -2489,45 +2495,45 @@ msgstr ""
 "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ '%s' ã?«ã?¢ã?¯ã?»ã?¹ã??ã??ã?«ã?¯ã??ã?¹ã?¯ã?¼ã??ã??ã??å??ã?¯æ??å?·å??ã?­ã?¼ã??å¿?è¦?ã?§"
 "ã??ã??"
 
-#: ../src/wireless-dialog.c:1176
+#: ../src/wireless-dialog.c:1154
 msgid "Wireless Network Authentication Required"
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?®èª?証ã??å¿?è¦?ã?§ã??"
 
-#: ../src/wireless-dialog.c:1178
+#: ../src/wireless-dialog.c:1156
 msgid "Authentication required by wireless network"
 msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?§ã?¯èª?証ã??è¦?æ±?ã??ã??ã?¾ã??"
 
-#: ../src/wireless-dialog.c:1183
+#: ../src/wireless-dialog.c:1161
 msgid "Create New Wireless Network"
 msgstr "æ?°ã??ã??ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã??ä½?æ??"
 
-#: ../src/wireless-dialog.c:1185
+#: ../src/wireless-dialog.c:1163
 msgid "New wireless network"
 msgstr "æ?°è¦?ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯"
 
-#: ../src/wireless-dialog.c:1186
+#: ../src/wireless-dialog.c:1164
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "ä½?æ??ã??ã??ã??ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?®å??å??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../src/wireless-dialog.c:1188
+#: ../src/wireless-dialog.c:1166
 msgid "Connect to Hidden Wireless Network"
 msgstr "é??表示ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã??"
 
-#: ../src/wireless-dialog.c:1190
+#: ../src/wireless-dialog.c:1168
 msgid "Hidden wireless network"
 msgstr "é??表示ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯"
 
-#: ../src/wireless-dialog.c:1191
+#: ../src/wireless-dialog.c:1169
 msgid ""
 "Enter the name and security details of the hidden wireless network you wish "
 "to connect to."
 msgstr "æ?¥ç¶?ã??ã??ã??ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ã?®å??å??ã?¨ã?»ã?­ã?¥ã?ªã??ã?£è©³ç´°ã??å?¥å??ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../src/wireless-security/eap-method.c:227
+#: ../src/wireless-security/eap-method.c:279
 msgid "No Certificate Authority certificate chosen"
 msgstr "証æ??æ?¸æ¨©é??(CA)ã?®è¨¼æ??æ?¸ã??é?¸æ??ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../src/wireless-security/eap-method.c:228
+#: ../src/wireless-security/eap-method.c:280
 msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections "
 "to insecure, rogue wireless networks.  Would you like to choose a "
@@ -2536,37 +2542,70 @@ msgstr ""
 "証æ??æ?¸æ¨©é?? (CA) ã?®è¨¼æ??æ?¸ã??使ç?¨ã??ã?ªã??ã?¨ã??å®?å?¨ã?§ã?ªã??è©?欺ç??ã?ªã?¯ã?¤ã?¤ã?¬ã?¹ ã??ã??ã??"
 "ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??ã??証æ??æ?¸æ¨©é?? (CA) ã?®è¨¼æ??æ?¸ã?? é?¸æ??ã??ã?¾ã??ã?? ?"
 
-#: ../src/wireless-security/eap-method.c:237
+#: ../src/wireless-security/eap-method.c:289
 msgid "Choose CA Certificate"
 msgstr "CA 証æ??æ?¸ã??é?¸æ??ã??ã??"
 
-#: ../src/wireless-security/eap-method.c:552
+#: ../src/wireless-security/eap-method.c:627
 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:555
+#: ../src/wireless-security/eap-method.c:630
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER ã?? PEM ã?®è¨¼æ??æ?¸ (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:261
+#: ../src/wireless-security/eap-method-peap.c:264
+#: ../src/wireless-security/wireless-security.c:368
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:277
+#: ../src/wireless-security/eap-method-peap.c:280
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-peap.c:366
-#: ../src/wireless-security/eap-method-tls.c:457
-#: ../src/wireless-security/eap-method-ttls.c:365
+#: ../src/wireless-security/eap-method-peap.c:349
+#: ../src/wireless-security/eap-method-tls.c:419
+#: ../src/wireless-security/eap-method-ttls.c:349
 msgid "Choose a Certificate Authority certificate..."
 msgstr "証æ??æ?¸æ¨©é??(CA)証æ??æ?¸ã??é?¸æ??..."
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../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
+msgid "Version 0"
+msgstr "ã??ã?¼ã?¸ã?§ã?³ 0"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:7
+msgid "Version 1"
+msgstr "ã??ã?¼ã?¸ã?§ã?³ 1"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+msgid "_PEAP version:"
+msgstr "PEAP ã??ã?¼ã?¸ã?§ã?³(_P):"
+
+#: ../src/wireless-security/eap-method-simple.ui.h:1
+msgid "As_k for this password every time"
+msgstr "æ¯?å??ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??è¦?æ±?ã??ã??(_K)"
+
+#: ../src/wireless-security/eap-method-tls.c:250
 msgid "Unencrypted private keys are insecure"
 msgstr "æ??å?·å??ã?®ã?ªã??ã??ã?©ã?¤ã??ã?¼ã??ã?­ã?¼ã?¯å®?å?¨ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../src/wireless-security/eap-method-tls.c:266
+#: ../src/wireless-security/eap-method-tls.c:253
 msgid ""
 "The selected private key does not appear to be protected by a password.  "
 "This could allow your security credentials to be compromised.  Please select "
@@ -2580,26 +2619,239 @@ msgstr ""
 "\n"
 "(ã??ã?©ã?¤ã??ã?¼ã??ã?­ã?¼ã?¯ openssl ã??使ç?¨ã??ã?¦ã??ã?¹ã?¯ã?¼ã??ä¿?è­·ã??ã?§ã??ã?¾ã??)"
 
-#: ../src/wireless-security/eap-method-tls.c:451
+#: ../src/wireless-security/eap-method-tls.c:413
 msgid "Choose your personal certificate..."
 msgstr "å??人ç?¨è¨¼æ??æ?¸ã??é?¸æ??ã??ã??..."
 
-#: ../src/wireless-security/eap-method-tls.c:463
+#: ../src/wireless-security/eap-method-tls.c:425
 msgid "Choose your private key..."
 msgstr "ã??ã?©ã?¤ã??ã?¼ã??ã?­ã?¼ã??é?¸æ??ã??ã??..."
 
-#: ../src/wireless-security/wireless-security.c:329
+# ã?¨ã??ã??ã??ã??ã??ã?®ã??ã??ã?«è¨³ã??ã?¦ã??ã??ã?? "Identity" ã?®ã?¾ã?¾ã?®æ?¹ã??é?©å??ã??ã??ã??ã??ã?ªã??ã??
+# (WPA-EAP Identity èª?証æ?¹å¼?: ã?¦ã?¼ã?¶ ID ã?¨ã??ã?¹ã?¯ã?¼ã??ã?®çµ?ã?§èª?証)
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "I_dentity:"
+msgstr "���(_D):"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+msgid "Private _key:"
+msgstr "ã??ã?©ã?¤ã??ã?¼ã??ã?­ã?¼(_K):"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+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)"
+
+#: ../src/wireless-security/nag-user-dialog.ui.h:2
+msgid "No"
+msgstr "ã??ã??ã??"
+
+#: ../src/wireless-security/nag-user-dialog.ui.h:3
+msgid "Yes"
+msgstr "ã?¯ã??"
+
+#: ../src/wireless-security/wireless-security.c:380
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:353
+#: ../src/wireless-security/wireless-security.c:404
 msgid "Tunneled TLS"
 msgstr "ã??ã?³ã??ã?«å?? TLS"
 
-#: ../src/wireless-security/wireless-security.c:364
+#: ../src/wireless-security/wireless-security.c:415
 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):"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:1
+msgid "1 (Default)"
+msgstr "1 (ã??ã??ã?©ã?«ã??)"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+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 "Sho_w key"
+msgstr "ã?­ã?¼ã??表示(_W)"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+msgid "WEP inde_x:"
+msgstr "WEP ã?¤ã?³ã??ã??ã?¯ã?¹(_X):"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+msgid "_Key:"
+msgstr "ã?­ã?¼(_K):"
+
+#~ 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 "é?©ç?¨"
 



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