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

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [network-manager-applet] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Tue, 25 Jan 2011 11:31:09 +0000 (UTC)
commit 287b57c6c633eba308962952c0ec014212466a6d
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Tue Jan 25 19:30:52 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2896 +++++++++++++++++++++++++++++++++++-----------------------
 po/zh_TW.po | 1939 +++++++++++++++++++++++-----------------
 2 files changed, 2862 insertions(+), 1973 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index dfc15d5..e0dbac6 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,21 +1,25 @@
+# Translation of network-manager-applet to Chinese (Hong Kong).
 # Chinese (Hong Kong) translation of Network Manager.
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2010 Free Software Foundation, Inc.
 # Woodman Tuen <wmtuen gmail com>, 2005.
 # Hialan Liu <hialan liu gmail com>, 2008.
+# Chester Cheng <ccheng redhat com>, 2010.
+# Terry Chuang <tchuang redhat com>, 2010.
+# Wei-Lun Chao <chaoweilun gmail com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Network Manager 0.7.0\n"
+"Project-Id-Version: network-manager-applet 0.8.991\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-21 19:48+0800\n"
-"PO-Revision-Date: 2009-04-21 19:51+0800\n"
+"POT-Creation-Date: 2011-01-25 19:29+0800\n"
+"PO-Revision-Date: 2011-01-25 19:30+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 1.2.1\n"
 
 #: ../nm-applet.desktop.in.h:1
 msgid "Control your network connections"
@@ -25,394 +29,638 @@ msgstr "æ?§å?¶ä½ ç??ç¶²çµ¡é?£ç·?"
 msgid "Network Manager"
 msgstr "ç¶²çµ¡ç®¡ç??å?¡"
 
+#: ../nm-applet.schemas.in.h:1
+msgid "Disable WiFi Create"
+msgstr "ç¦?æ¢å»ºç«? WiFi"
+
+#: ../nm-applet.schemas.in.h:2
+msgid "Disable connected notifications"
+msgstr "å??æ¢å·²é?£ç·?ç??é??ç?¥"
+
+#: ../nm-applet.schemas.in.h:3
+msgid "Disable disconnected notifications"
+msgstr "å??æ¢å·²é?¢ç·?ç??é??ç?¥"
+
+#: ../nm-applet.schemas.in.h:4
+msgid "Set this to TRUE to disable notifications when connecting to a network."
+msgstr "å°?é??è¨ç?ºã??TUREã??ï¼?ä»¥å??ç?¨ç¶²çµ¡é?£ç·?æ??ç??é??ç?¥ã??"
+
+#: ../nm-applet.schemas.in.h:5
+msgid ""
+"Set this to TRUE to disable notifications when disconnecting from a network."
+msgstr "å°?é??è¨ç?ºã??TUREã??ï¼?ä»¥å??ç?¨ç¶²çµ¡é?¢ç·?æ??ç??é??ç?¥ã??"
+
+#: ../nm-applet.schemas.in.h:6
+msgid ""
+"Set this to TRUE to disable notifications when wireless networks are "
+"available."
+msgstr "å°?é??è¨ç?ºã??TUREã??ï¼?ä»¥å??ç?¨æ??ç?¡ç·?ç¶²çµ¡å?¯ç?¨æ??ç??é??ç?¥ã??"
+
+#: ../nm-applet.schemas.in.h:7
+msgid ""
+"Set to TRUE to disable creation of adhoc networks when using the applet."
+msgstr "å°?é??è¨ç?ºã??TUREã??ï¼?ä»¥å??ç?¨ä½¿ç?¨é?¢æ?¿ç¨?å¼?å»ºç«? adhoc ç¶²çµ¡ã??"
+
+#: ../nm-applet.schemas.in.h:8
+msgid "Stamp"
+msgstr "æ?³è¨?"
+
+#: ../nm-applet.schemas.in.h:9
+msgid "Suppress networks available notifications"
+msgstr "å??æ¢å?¯ç?¨ç¶²çµ¡ç??é??ç?¥"
+
+#: ../nm-applet.schemas.in.h:10
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "ç?¨ä¾?æ±ºå®?ç¤¾å®?æ?¯ä¸?æ?¯è¦?è½?ç§»å?°æ?°ç??æ?¬ä¸?ã??"
+
 #: ../nm-connection-editor.desktop.in.h:1
 msgid "Manage and change your network connection settings"
 msgstr "ç®¡ç??è??æ?´æ?¹ä½ ç??é?£ç·?è¨å®?å?¼"
 
 #: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.glade.h:7
+#: ../src/connection-editor/nm-connection-editor.ui.h:7
 msgid "Network Connections"
 msgstr "ç¶²çµ¡é?£ç·?"
 
-#: ../src/applet-device-cdma.c:54
-msgid "Auto Mobile Broadband (CDMA) connection"
-msgstr "è?ªå??è¡?å??å¯¬é » (CDMA) é?£ç·?"
-
-#: ../src/applet-device-cdma.c:204 ../src/applet-device-gsm.c:205
-msgid "Disconnect"
-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-device-cdma.c:243 ../src/applet-device-gsm.c:244
+#: ../src/applet-dbus-manager.c:167
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "è¡?å??å¯¬é » (%s)"
+msgid "Could not acquire the %s service. (%d)\n"
+msgstr "ç?¡æ³?å??å¾? %s æ??å??ã??(%d)\n"
 
-#: ../src/applet-device-cdma.c:245 ../src/applet-device-gsm.c:246
-#: ../src/connection-editor/page-mobile.c:308
-#: ../src/connection-editor/nm-connection-editor.glade.h:6
-#: ../src/connection-editor/nm-connection-list.c:1812
-msgid "Mobile Broadband"
-msgstr "è¡?å??å¯¬é »"
+#: ../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:822 ../src/applet-device-wimax.c:276
+msgid "Available"
+msgstr "å?¯ç?¨"
 
-#: ../src/applet-device-cdma.c:298 ../src/applet-device-gsm.c:299
-#: ../src/applet-device-wired.c:261
+#: ../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-wimax.c:420
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "ä½ ç?¾å?¨å·²é?£ç·?è?³ã??%sã??ã??"
 
-#: ../src/applet-device-cdma.c:302 ../src/applet-device-gsm.c:303
-#: ../src/applet-device-wired.c:265 ../src/applet-device-wifi.c:1184
+#: ../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:1265 ../src/applet-device-wimax.c:424
 msgid "Connection Established"
 msgstr "å·²å»ºç«?é?£ç·?"
 
-#: ../src/applet-device-cdma.c:303
-msgid "You are now connected to the CDMA network."
-msgstr "ä½ ç?¾å?¨å·²é?£ç·?è?³ CDMA ç¶²çµ¡ã??"
+#: ../src/applet-device-bt.c:205
+msgid "You are now connected to the mobile broadband network."
+msgstr "ä½ ç?¾å?¨å·²é?£ç·?è?³è¡?å??å¯¬é »ç¶²çµ¡ã??"
 
-#: ../src/applet-device-cdma.c:329 ../src/applet-device-gsm.c:330
+#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:414
+#: ../src/applet-device-gsm.c:457 ../src/applet-device-wimax.c:461
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
-msgstr "æ£å?¨æº?å??è¡?å??å¯¬é »é?£ç·?ã??%sã??..."
+msgstr "æ£å?¨æº?å??è¡?å??å¯¬é »é?£ç·?ã??%sã??â?¦"
 
-#: ../src/applet-device-cdma.c:332 ../src/applet-device-gsm.c:333
+#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:417
+#: ../src/applet-device-gsm.c:460 ../src/applet-device-wimax.c:464
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
-msgstr "æ£å?¨è¨å®?è¡?å??å¯¬é »é?£ç·?ã??%sã??..."
+msgstr "æ£å?¨è¨å®?è¡?å??å¯¬é »é?£ç·?ã??%sã??â?¦"
 
-#: ../src/applet-device-cdma.c:335 ../src/applet-device-gsm.c:336
+#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:420
+#: ../src/applet-device-gsm.c:463 ../src/applet-device-wimax.c:467
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "è¡?å??å¯¬é »é?£ç·?ã??%sã??é??è¦?ä½¿ç?¨è??é©?è?..."
+msgstr "è¡?å??å¯¬é »é?£ç·?ã??%sã??é??è¦?ä½¿ç?¨è??é©?è?â?¦"
 
-#: ../src/applet-device-cdma.c:338 ../src/applet-device-gsm.c:339
-#: ../src/applet.c:1831
+#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:423
+#: ../src/applet-device-gsm.c:466 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:2353
 #, c-format
 msgid "Requesting a network address for '%s'..."
-msgstr "æ£å?¨è¦?æ±?ã??%sã??æ??ä¾?ç¶²çµ¡ä½?å??..."
+msgstr "æ£å?¨è¦?æ±?ã??%sã??æ??ä¾?ç¶²çµ¡ä½?å??â?¦"
 
-#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:343
+#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:441
+#: ../src/applet-device-gsm.c:484
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "è¡?å??å¯¬é »é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸"
 
-#: ../src/applet-device-cdma.c:458 ../src/applet-device-gsm.c:541
-msgid "Mobile broadband network password"
-msgstr "è¡?å??å¯¬é »ç¶²çµ¡å¯?ç¢¼"
+#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:674
+#: ../src/mb-menu-item.c:55
+msgid "CDMA"
+msgstr "CDMA"
 
-#: ../src/applet-device-cdma.c:467 ../src/applet-device-gsm.c:550
+#: ../src/applet-device-cdma.c:281 ../src/applet-device-gsm.c:325
 #, c-format
-msgid "A password is required to connect to '%s'."
-msgstr "é?£ç·?è?³ã??%sã??é??è¦?å¯?ç¢¼ã??"
+msgid "Mobile Broadband (%s)"
+msgstr "è¡?å??å¯¬é » (%s)"
 
-#: ../src/applet-device-cdma.c:485 ../src/applet-device-gsm.c:568
-#: ../src/applet.glade.h:25 ../src/connection-editor/ce-page-dsl.glade.h:1
-#: ../src/connection-editor/ce-page-mobile.glade.h:14
-msgid "Password:"
-msgstr "å¯?ç¢¼ï¼?"
+#: ../src/applet-device-cdma.c:283 ../src/applet-device-gsm.c:327
+#: ../src/connection-editor/page-mobile.c:365
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-list.c:1412
+msgid "Mobile Broadband"
+msgstr "è¡?å??å¯¬é »"
 
-#: ../src/applet-device-gsm.c:55
-msgid "Auto Mobile Broadband (GSM) connection"
-msgstr "è?ªå??è¡?å??å¯¬é » (GSM) é?£ç·?"
+#. Default connection item
+#: ../src/applet-device-cdma.c:345
+msgid "New Mobile Broadband (CDMA) connection..."
+msgstr "æ?°ç??è¡?å??å¯¬é » (CDMA) é?£ç·?â?¦"
 
-#: ../src/applet-device-gsm.c:304
+#: ../src/applet-device-cdma.c:379
+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-wimax.c:479
+#, 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-wimax.c:482
+msgid "roaming"
+msgstr "æ¼«é??"
+
+#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:677
+#: ../src/mb-menu-item.c:60
+msgid "GSM"
+msgstr "GSM"
+
+#. Default connection item
+#: ../src/applet-device-gsm.c:388
+msgid "New Mobile Broadband (GSM) connection..."
+msgstr "æ?°ç??è¡?å??å¯¬é » (GSM) é?£ç·?â?¦"
+
+#: ../src/applet-device-gsm.c:422
 msgid "You are now connected to the GSM network."
 msgstr "ä½ ç?¾å?¨å·²é?£ç·?è?³ GSM ç¶²çµ¡ã??"
 
-#: ../src/applet-device-gsm.c:481
+#: ../src/applet-device-gsm.c:707
 msgid "PIN code required"
 msgstr "é??è¦? PIN ç¢¼"
 
-#: ../src/applet-device-gsm.c:483
-msgid "PUK code required"
-msgstr "é??è¦? PUK ç¢¼"
-
-#: ../src/applet-device-gsm.c:492
+#: ../src/applet-device-gsm.c:715
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "é??å??è¡?å??å¯¬é »è£?ç½®é??è¦? PIN ç¢¼"
 
-#: ../src/applet-device-gsm.c:494
-msgid "PUK code is needed for the mobile broadband device"
-msgstr "é??å??è¡?å??å¯¬é »è£?ç½®é??è¦? PUK ç¢¼"
+#: ../src/applet-device-gsm.c:847
+msgid "Wrong PIN code; please contact your provider."
+msgstr "PIN ç¢¼é?¯èª¤ï¼?è«?è?¯çµ¡ä½ ç??ä¾?æ??å??ã??"
+
+#: ../src/applet-device-gsm.c:870
+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
+msgid "Sending unlock code..."
+msgstr "ç?¼é??è§£é??ç?¨ç??å¯?ç¢¼â?¦"
+
+#: ../src/applet-device-gsm.c:960
+msgid "SIM PIN unlock required"
+msgstr "é??è¦?è§£é?? SIM PIN ç¢¼"
+
+#: ../src/applet-device-gsm.c:961
+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
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr "è¦?ä½¿ç?¨è¡?å??å¯¬é »è£?ç½®ã??%sã??ä¹?å??ï¼?é??è¦? SIM PIN ç¢¼ã??"
+
+#. Translators: PIN code entry label
+#: ../src/applet-device-gsm.c:965
+msgid "PIN code:"
+msgstr "PIN ç¢¼ï¼?"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-device-gsm.c:969
+msgid "Show PIN code"
+msgstr "é¡¯ç¤º PIN ç¢¼"
+
+#: ../src/applet-device-gsm.c:972
+msgid "SIM PUK unlock required"
+msgstr "é??è¦?è§£é?? SIM PUK ç¢¼"
+
+#: ../src/applet-device-gsm.c:973
+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
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr "è¦?ä½¿ç?¨è¡?å??å¯¬é »è£?ç½®ã??%sã??ä¹?å??ï¼?é??è¦? SIM PUK ç¢¼ã??"
+
+#. Translators: PUK code entry label
+#: ../src/applet-device-gsm.c:977
+msgid "PUK code:"
+msgstr "PUK ç¢¼ï¼?"
+
+#. Translators: New PIN entry label
+#: ../src/applet-device-gsm.c:980
+msgid "New PIN code:"
+msgstr "æ?°ç?? PIN ç¢¼ï¼?"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-device-gsm.c:982
+msgid "Re-enter new PIN code:"
+msgstr "é??æ?°è¼¸å?¥ PIN ç¢¼ï¼?"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-device-gsm.c:987
+msgid "Show PIN/PUK codes"
+msgstr "é¡¯ç¤º PIN/PUK ç¢¼"
 
 #: ../src/applet-device-wired.c:63
 msgid "Auto Ethernet"
 msgstr "è?ªå??ä¹?å¤ªç¶²çµ¡"
 
-#: ../src/applet-device-wired.c:197
+#: ../src/applet-device-wired.c:206
 #, c-format
 msgid "Wired Networks (%s)"
 msgstr "æ??ç·?ç¶²çµ¡ (%s)"
 
-#: ../src/applet-device-wired.c:199
+#: ../src/applet-device-wired.c:208
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "æ??ç·?ç¶²çµ¡ (%s)"
 
-#: ../src/applet-device-wired.c:202
+#: ../src/applet-device-wired.c:211
 msgid "Wired Networks"
 msgstr "æ??ç·?ç¶²çµ¡"
 
-#: ../src/applet-device-wired.c:204
+#: ../src/applet-device-wired.c:213
 msgid "Wired Network"
 msgstr "æ??ç·?ç¶²çµ¡"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:227
+#: ../src/applet-device-wired.c:233 ../src/applet.c:1343
 msgid "disconnected"
 msgstr "å·²æ?·ç·?"
 
-#: ../src/applet-device-wired.c:266
+#: ../src/applet-device-wired.c:275
 msgid "You are now connected to the wired network."
 msgstr "ä½ ç?¾å?¨å·²é?£ç·?è?³æ??ç·?ç¶²çµ¡ã??"
 
-#: ../src/applet-device-wired.c:292
+#: ../src/applet-device-wired.c:301
 #, c-format
 msgid "Preparing wired network connection '%s'..."
-msgstr "æ£å?¨æº?å??æ??ç·?ç¶²çµ¡é?£ç·?ã??%sã??..."
+msgstr "æ£å?¨æº?å??æ??ç·?ç¶²çµ¡é?£ç·?ã??%sã??â?¦"
 
-#: ../src/applet-device-wired.c:295
+#: ../src/applet-device-wired.c:304
 #, c-format
 msgid "Configuring wired network connection '%s'..."
-msgstr "æ£å?¨è¨å®?æ??ç·?ç¶²çµ¡é?£ç·?ã??%sã??..."
+msgstr "æ£å?¨è¨å®?æ??ç·?ç¶²çµ¡é?£ç·?ã??%sã??â?¦"
 
-#: ../src/applet-device-wired.c:298
+#: ../src/applet-device-wired.c:307
 #, c-format
 msgid "User authentication required for wired network connection '%s'..."
-msgstr "æ??ç·?ç¶²çµ¡é?£ç·?ã??%sã??é??è¦?ä½¿ç?¨è??é©?è?..."
+msgstr "æ??ç·?ç¶²çµ¡é?£ç·?ã??%sã??é??è¦?ä½¿ç?¨è??é©?è?â?¦"
 
-#: ../src/applet-device-wired.c:301
+#: ../src/applet-device-wired.c:310
 #, c-format
 msgid "Requesting a wired network address for '%s'..."
-msgstr "æ£è¦?æ±?æ??ç·?ç¶²çµ¡ã??%sã??æ??ä¾?ç¶²çµ¡ä½?å??..."
+msgstr "æ£è¦?æ±?æ??ç·?ç¶²çµ¡ã??%sã??æ??ä¾?ç¶²çµ¡ä½?å??â?¦"
 
-#: ../src/applet-device-wired.c:305
+#: ../src/applet-device-wired.c:314
 #, c-format
 msgid "Wired network connection '%s' active"
 msgstr "æ??ç·?ç¶²çµ¡é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸"
 
-#: ../src/applet-device-wired.c:558
+#: ../src/applet-device-wired.c:568
 msgid "DSL authentication"
 msgstr "DSL é©?è?"
 
-#: ../src/applet-device-wifi.c:91
+#: ../src/applet-device-wifi.c:88
 msgid "_Connect to Hidden Wireless Network..."
-msgstr "é?£æ?¥å?°é?±è??ç??ç?¡ç·?ç¶²çµ¡(_C)..."
+msgstr "é?£æ?¥å?°é?±è??ç??ç?¡ç·?ç¶²çµ¡(_C)â?¦"
 
-#: ../src/applet-device-wifi.c:122
+#: ../src/applet-device-wifi.c:121
 msgid "Create _New Wireless Network..."
-msgstr "å»ºç«?æ?°ç??ç?¡ç·?ç¶²çµ¡(_N)..."
+msgstr "å»ºç«?æ?°ç??ç?¡ç·?ç¶²çµ¡(_N)â?¦"
 
-#: ../src/applet-device-wifi.c:693
+#: ../src/applet-device-wifi.c:750
 #, c-format
 msgid "Wireless Networks (%s)"
 msgstr "ç?¡ç·?ç¶²çµ¡ (%s)"
 
-#: ../src/applet-device-wifi.c:695
+#: ../src/applet-device-wifi.c:752
 #, c-format
 msgid "Wireless Network (%s)"
 msgstr "ç?¡ç·?ç¶²çµ¡ (%s)"
 
-#: ../src/applet-device-wifi.c:697
+#: ../src/applet-device-wifi.c:754
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "ç?¡ç·?ç¶²çµ¡"
 
-#: ../src/applet-device-wifi.c:714
+#: ../src/applet-device-wifi.c:787
 msgid "wireless is disabled"
 msgstr "ç?¡ç·?ç¶²çµ¡å·²å??ç?¨"
 
-#: ../src/applet-device-wifi.c:977
+#: ../src/applet-device-wifi.c:788
+msgid "wireless is disabled by hardware switch"
+msgstr "ç?¡ç·?ç¶²çµ¡å·²è¢«ç¡¬ä»¶é??é??å??ç?¨"
+
+#: ../src/applet-device-wifi.c:849
+msgid "More networks"
+msgstr "æ?´å¤?ç¶²çµ¡"
+
+#: ../src/applet-device-wifi.c:1053
 msgid "Wireless Networks Available"
 msgstr "å?¯ç?¨ç??ç?¡ç·?ç¶²çµ¡"
 
-#: ../src/applet-device-wifi.c:978
+#: ../src/applet-device-wifi.c:1055
 msgid "Click on this icon to connect to a wireless network"
 msgstr "è«?æ??é??å??å??ç¤ºä¾?é?£ç·?å?°ç?¡ç·?ç¶²çµ¡"
 
-#: ../src/applet-device-wifi.c:981 ../src/applet.c:438
+#: ../src/applet-device-wifi.c:1056
+msgid "Use the network menu to connect to a wireless network"
+msgstr "ä½¿ç?¨ç¶²çµ¡é?¸å?®ä¾?é?£ç·?å?°ç?¡ç·?ç¶²çµ¡"
+
+#: ../src/applet-device-wifi.c:1059 ../src/applet.c:714
 msgid "Don't show this message again"
 msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯"
 
-#: ../src/applet-device-wifi.c:1182
+#: ../src/applet-device-wifi.c:1263
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "ä½ ç?¾å?¨å·²é?£ç·?å?°ç?¡ç·?ç¶²çµ¡ã??%sã??ã??"
 
-#: ../src/applet-device-wifi.c:1183 ../src/applet-device-wifi.c:1214
+#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wifi.c:1295
 msgid "(none)"
 msgstr "(ç?¡)"
 
-#: ../src/applet-device-wifi.c:1224
+#: ../src/applet-device-wifi.c:1305
 #, c-format
 msgid "Preparing wireless network connection '%s'..."
-msgstr "æ£å?¨æº?å??ç?¡ç·?ç¶²çµ¡é?£ç·?ã??%sã??..."
+msgstr "æ£å?¨æº?å??ç?¡ç·?ç¶²çµ¡é?£ç·?ã??%sã??â?¦"
 
-#: ../src/applet-device-wifi.c:1227
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "Configuring wireless network connection '%s'..."
-msgstr "æ£å?¨è¨å®?ç?¡ç·?ç¶²çµ¡é?£ç·?ã??%sã??..."
+msgstr "æ£å?¨è¨å®?ç?¡ç·?ç¶²çµ¡é?£ç·?ã??%sã??â?¦"
 
-#: ../src/applet-device-wifi.c:1230
+#: ../src/applet-device-wifi.c:1311
 #, c-format
 msgid "User authentication required for wireless network '%s'..."
-msgstr "ç?¡ç·?ç¶²çµ¡ã??%sã??è¦?æ±?ä½¿ç?¨è??é©?è?..."
+msgstr "ç?¡ç·?ç¶²çµ¡ã??%sã??è¦?æ±?ä½¿ç?¨è??é©?è?â?¦"
 
-#: ../src/applet-device-wifi.c:1233
+#: ../src/applet-device-wifi.c:1314
 #, c-format
 msgid "Requesting a wireless network address for '%s'..."
-msgstr "æ£å?¨è¦?æ±?ç?¡ç·?ç¶²çµ¡ã??%sã??æ??ä¾?ç¶²çµ¡ä½?å??..."
+msgstr "æ£å?¨è¦?æ±?ç?¡ç·?ç¶²çµ¡ã??%sã??æ??ä¾?ç¶²çµ¡ä½?å??â?¦"
 
-#: ../src/applet-device-wifi.c:1253
+#: ../src/applet-device-wifi.c:1334
 #, c-format
 msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgstr "ç?¡ç·?ç¶²çµ¡é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸ï¼? %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1257
+#: ../src/applet-device-wifi.c:1338
 #, c-format
 msgid "Wireless network connection '%s' active"
 msgstr "ç?¡ç·?ç¶²çµ¡é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸"
 
-#: ../src/applet-dialogs.c:53
+#: ../src/applet-device-wimax.c:228
+#, c-format
+msgid "WiMAX Mobile Broadband (%s)"
+msgstr "WiMAX è¡?å??å¯¬é » (%s)"
+
+#: ../src/applet-device-wimax.c:230
+msgid "WiMAX Mobile Broadband"
+msgstr "WiMAX è¡?å??å¯¬é »"
+
+#: ../src/applet-device-wimax.c:256
+msgid "WiMAX is disabled"
+msgstr "WiMAX å·²å??ç?¨"
+
+#: ../src/applet-device-wimax.c:257
+msgid "WiMAX is disabled by hardware switch"
+msgstr "WiMAX å·²è¢«ç¡¬ä»¶é??é??å??ç?¨"
+
+#: ../src/applet-device-wimax.c:425
+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:84
-#: ../src/connection-editor/page-wireless-security.c:277
-#: ../src/wireless-dialog.c:815
-#: ../src/wireless-security/wireless-security.c:317
+#: ../src/applet-dialogs.c:109
+#: ../src/connection-editor/page-wireless-security.c:284
+#: ../src/wireless-dialog.c:969
+#: ../src/wireless-security/wireless-security.c:390
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:86
+#: ../src/applet-dialogs.c:111
 msgid "Dynamic WEP"
 msgstr "å??æ?? WEP"
 
-#: ../src/applet-dialogs.c:88 ../src/applet-dialogs.c:189
-#: ../src/applet-dialogs.c:191
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:187
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:195 ../src/applet-dialogs.c:204
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
 #: ../src/connection-editor/page-wireless-security.c:238
-#: ../src/wireless-dialog.c:768
+#: ../src/wireless-dialog.c:926
+msgctxt "Wifi/wired security"
 msgid "None"
-msgstr "ç?¡"
+msgstr "æ²?æ??"
+
+#: ../src/applet-dialogs.c:334 ../src/applet-dialogs.c:466
+#, c-format
+msgid "%u Mb/s"
+msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:207 ../src/applet-dialogs.c:322
+#: ../src/applet-dialogs.c:336 ../src/applet-dialogs.c:468
+msgctxt "Speed"
 msgid "Unknown"
-msgstr "æ?ªç?¥"
+msgstr "ä¸?æ??"
 
-#: ../src/applet-dialogs.c:258
+#: ../src/applet-dialogs.c:349
+#, c-format
+msgid "%d dB"
+msgstr "%d dB"
+
+#: ../src/applet-dialogs.c:351
+msgctxt "WiMAX CINR"
+msgid "unknown"
+msgstr "ä¸?æ??"
+
+#: ../src/applet-dialogs.c:363
+msgctxt "WiMAX Base Station ID"
+msgid "unknown"
+msgstr "ä¸?æ??"
+
+#: ../src/applet-dialogs.c:398
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ä¹?å¤ªç¶²çµ¡ (%s)"
 
-#: ../src/applet-dialogs.c:260
+#: ../src/applet-dialogs.c:401
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:262
+#: ../src/applet-dialogs.c:404
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:264
+#: ../src/applet-dialogs.c:406
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:269
+#: ../src/applet-dialogs.c:408
+#, c-format
+msgid "WiMAX (%s)"
+msgstr "WiMAX (%s)"
+
+#. --- General ---
+#: ../src/applet-dialogs.c:414
+msgid "General"
+msgstr "ä¸?è?¬"
+
+#: ../src/applet-dialogs.c:418
 msgid "Interface:"
 msgstr "ä»?é?¢ï¼?"
 
-#: ../src/applet-dialogs.c:285
+#: ../src/applet-dialogs.c:434
 msgid "Hardware Address:"
 msgstr "ç¡¬ä»¶ä½?å??ï¼?"
 
-#: ../src/applet-dialogs.c:295
+#. Driver
+#: ../src/applet-dialogs.c:442
 msgid "Driver:"
 msgstr "é©?å??ç¨?å¼?ï¼?"
 
-#: ../src/applet-dialogs.c:314
-#, c-format
-msgid "%u Mb/s"
-msgstr "%u Mb/s"
-
-#: ../src/applet-dialogs.c:319
+#: ../src/applet-dialogs.c:471
 msgid "Speed:"
 msgstr "é??åº¦ï¼?"
 
-#: ../src/applet-dialogs.c:329
-#: ../src/connection-editor/ce-page-wireless-security.glade.h:1
+#: ../src/applet-dialogs.c:481
 msgid "Security:"
 msgstr "å®?å?¨æ?§ï¼?"
 
-#: ../src/applet-dialogs.c:349
+#: ../src/applet-dialogs.c:494
+msgid "CINR:"
+msgstr "CINRï¼?"
+
+#: ../src/applet-dialogs.c:507
+msgid "BSID:"
+msgstr "BSIDï¼?"
+
+#. --- IPv4 ---
+#: ../src/applet-dialogs.c:524
+msgid "IPv4"
+msgstr "IPv4"
+
+#. Address
+#: ../src/applet-dialogs.c:535 ../src/applet-dialogs.c:642
 msgid "IP Address:"
 msgstr "IP ä½?å??ï¼?"
 
-#: ../src/applet-dialogs.c:365
+#: ../src/applet-dialogs.c:537 ../src/applet-dialogs.c:553
+msgctxt "Address"
+msgid "Unknown"
+msgstr "ä¸?æ??"
+
+#: ../src/applet-dialogs.c:551
 msgid "Broadcast Address:"
 msgstr "å»£æ?ä½?å??ï¼?"
 
-#: ../src/applet-dialogs.c:376
+#. Prefix
+#: ../src/applet-dialogs.c:560
 msgid "Subnet Mask:"
 msgstr "å?ç¶²çµ¡é?®ç½©ï¼?"
 
-#: ../src/applet-dialogs.c:388
+#: ../src/applet-dialogs.c:562
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "ä¸?æ??"
+
+#: ../src/applet-dialogs.c:570 ../src/applet-dialogs.c:657
 msgid "Default Route:"
 msgstr "é ?è¨è·¯ç?±ï¼?"
 
-#: ../src/applet-dialogs.c:403
+#: ../src/applet-dialogs.c:582
 msgid "Primary DNS:"
 msgstr "ä¸»è¦? DNSï¼?"
 
-#: ../src/applet-dialogs.c:414
+#: ../src/applet-dialogs.c:591
 msgid "Secondary DNS:"
 msgstr "æ¬¡è¦? DNSï¼?"
 
+#: ../src/applet-dialogs.c:601
+msgid "Ternary DNS:"
+msgstr "ç¬¬ä¸? DNSï¼?"
+
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:616
+msgid "IPv6"
+msgstr "IPv6"
+
+#: ../src/applet-dialogs.c:625
+msgid "Ignored"
+msgstr "å·²å¿½ç?¥"
+
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:477
+#: ../src/applet-dialogs.c:733
 msgid "No valid active connections found!"
 msgstr "æ?¾ä¸?å?°æ??æ??ç??ä½¿ç?¨ä¸é?£ç·?ï¼?"
 
-#: ../src/applet-dialogs.c:603
+#: ../src/applet-dialogs.c:786
 msgid ""
-"Copyright Â© 2004-2008 Red Hat, Inc.\n"
-"Copyright Â© 2005-2008 Novell, Inc."
+"Copyright Â© 2004-2010 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-2010 Red Hat, Inc.\n"
+"Copyright Â© 2005-2008 Novell, Inc.è??è¨±å¤?å?¶ä»?ç¤¾ç¾£è²¢ç?»è??è??ç¿»è¯è??"
 
-#: ../src/applet-dialogs.c:605
+#: ../src/applet-dialogs.c:789
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "ç?¨ä¾?ç®¡ç??ä½ ç??ç¶²çµ¡è£?ç½®è??é?£ç·?ç??é??ç?¥å??é?¢æ?¿ç¨?å¼?ã??"
 
-#: ../src/applet-dialogs.c:607
+#: ../src/applet-dialogs.c:791
 msgid "NetworkManager Website"
 msgstr "NetworkManager ç¶²ç«?"
 
-#: ../src/applet-dialogs.c:610
-msgid "translator-credits"
-msgstr ""
-"å¦?å°?ç¿»è¯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å?é?µä»¶çµ¦\n"
-"ä»¥ä¸?å?°å??ï¼?GNOME ç¿»è¯é??ä¼?æ??å??å¿«å??è¦?ä½ ï¼?\n"
-"community linuxhall org\n"
-"\n"
-"Hialan Liu <hialan liu gmail com>, 2008.\n"
-"Woodman Tuen <wmtuen gmail com>, 2005."
-
-#: ../src/applet-dialogs.c:626
+#: ../src/applet-dialogs.c:806
 msgid "Missing resources"
 msgstr "é?ºå¤±è³?æº?"
 
-#: ../src/applet.c:508
+#: ../src/applet-dialogs.c:833
+msgid "Mobile broadband network password"
+msgstr "è¡?å??å¯¬é »ç¶²çµ¡å¯?ç¢¼"
+
+#: ../src/applet-dialogs.c:842
+#, c-format
+msgid "A password is required to connect to '%s'."
+msgstr "é?£ç·?è?³ã??%sã??é??è¦?å¯?ç¢¼ã??"
+
+#: ../src/applet-dialogs.c:863
+msgid "Password:"
+msgstr "å¯?ç¢¼ï¼?"
+
+#: ../src/applet.c:827
 #, c-format
 msgid ""
 "\n"
@@ -422,7 +670,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?ºç¶²çµ¡é?£ç·?è¢«ä¸æ?·äº?ã??"
 
-#: ../src/applet.c:511
+#: ../src/applet.c:830
 #, c-format
 msgid ""
 "\n"
@@ -431,7 +679,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?º VPN æ??å??æ??å¤?ç??å??æ¢äº?ã??"
 
-#: ../src/applet.c:514
+#: ../src/applet.c:833
 #, c-format
 msgid ""
 "\n"
@@ -441,7 +689,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?º VPN æ??å??å?³å??ç?¡æ??ç??çµ?æ??ã??"
 
-#: ../src/applet.c:517
+#: ../src/applet.c:836
 #, c-format
 msgid ""
 "\n"
@@ -450,7 +698,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?ºé?£ç·?ç??å??è©¦å·²é?¾æ??ã??"
 
-#: ../src/applet.c:520
+#: ../src/applet.c:839
 #, c-format
 msgid ""
 "\n"
@@ -459,7 +707,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?º VPN æ??å??æ²?æ??å??æ??å??å??ã??"
 
-#: ../src/applet.c:523
+#: ../src/applet.c:842
 #, c-format
 msgid ""
 "\n"
@@ -468,7 +716,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?º VPN æ??å??å??å??å¤±æ??ã??"
 
-#: ../src/applet.c:526
+#: ../src/applet.c:845
 #, c-format
 msgid ""
 "\n"
@@ -477,7 +725,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?ºæ²?æ??æ??æ??ç?? VPN æ??å??ã??"
 
-#: ../src/applet.c:529
+#: ../src/applet.c:848
 #, c-format
 msgid ""
 "\n"
@@ -486,7 +734,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?ºç?¡æ??ç?? VPN æ©?å¯?ã??"
 
-#: ../src/applet.c:536
+#: ../src/applet.c:855
 #, c-format
 msgid ""
 "\n"
@@ -495,7 +743,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ã??"
 
-#: ../src/applet.c:554
+#: ../src/applet.c:873
 #, c-format
 msgid ""
 "\n"
@@ -505,7 +753,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?ºç¶²çµ¡é?£ç·?ä¸æ?·äº?ã??"
 
-#: ../src/applet.c:557
+#: ../src/applet.c:876
 #, c-format
 msgid ""
 "\n"
@@ -514,7 +762,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?º VPN æ??å??å·²å??æ¢ã??"
 
-#: ../src/applet.c:563
+#: ../src/applet.c:882
 #, c-format
 msgid ""
 "\n"
@@ -523,15 +771,15 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å·²æ?·ç·?ã??"
 
-#: ../src/applet.c:641
+#: ../src/applet.c:917
 msgid "VPN Login Message"
 msgstr "VPN ç?»é??è¨?æ?¯"
 
-#: ../src/applet.c:653 ../src/applet.c:661 ../src/applet.c:705
+#: ../src/applet.c:927 ../src/applet.c:935 ../src/applet.c:982
 msgid "VPN Connection Failed"
 msgstr "VPN é?£ç·?å¤±æ??"
 
-#: ../src/applet.c:712
+#: ../src/applet.c:989
 #, c-format
 msgid ""
 "\n"
@@ -544,7 +792,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:715
+#: ../src/applet.c:992
 #, c-format
 msgid ""
 "\n"
@@ -557,780 +805,863 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1006
+#: ../src/applet.c:1331
+msgid "device not ready (firmware missing)"
+msgstr "è£?ç½®å°?æ?ªå°±ç·? (ç¼ºå°?é??é«?)"
+
+#: ../src/applet.c:1333
 msgid "device not ready"
 msgstr "è£?ç½®å°?æ?ªå°±ç·?"
 
-#: ../src/applet.c:1022
+#: ../src/applet.c:1359
+msgid "Disconnect"
+msgstr "æ?·ç·?"
+
+#: ../src/applet.c:1373
 msgid "device not managed"
 msgstr "è£?ç½®ç?¡æ³?ç®¡ç??"
 
-#: ../src/applet.c:1066
+#: ../src/applet.c:1417
 msgid "No network devices available"
 msgstr "æ²?æ??å?¯ç?¨ç??ç¶²çµ¡è£?ç½®"
 
-#: ../src/applet.c:1154
+#: ../src/applet.c:1505
 msgid "_VPN Connections"
 msgstr "_VPN é?£ç·?"
 
-#: ../src/applet.c:1204
+#: ../src/applet.c:1558
 msgid "_Configure VPN..."
-msgstr "è¨ç½® VPN(_C)..."
+msgstr "è¨ç½® VPN(_C)â?¦"
 
-#: ../src/applet.c:1208
-msgid "_Disconnect VPN..."
-msgstr "è?? VPN æ?·ç·?(_D)..."
+#: ../src/applet.c:1562
+msgid "_Disconnect VPN"
+msgstr "è?? VPN æ?·ç·?(_D)"
 
-#: ../src/applet.c:1261
+#: ../src/applet.c:1664
 msgid "NetworkManager is not running..."
-msgstr "NetworkManager æ²?æ??å?·è¡?...."
+msgstr "NetworkManager æ²?æ??å?·è¡?â?¦."
 
-#: ../src/applet.c:1266 ../src/applet.c:1959
+#: ../src/applet.c:1669 ../src/applet.c:2481
 msgid "Networking disabled"
 msgstr "ç¶²çµ¡å·²å??ç?¨"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1450
+#: ../src/applet.c:1891
 msgid "Enable _Networking"
 msgstr "å??ç?¨ç¶²çµ¡(_N)"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:1459
+#: ../src/applet.c:1900
 msgid "Enable _Wireless"
 msgstr "å??ç?¨ç?¡ç·?ç¶²çµ¡(_W)"
 
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1909
+msgid "Enable _Mobile Broadband"
+msgstr "å??ç?¨è¡?å??å¯¬é »(_M)"
+
+#. 'Enable WiMAX Mobile Broadband' item
+#: ../src/applet.c:1918
+msgid "Enable WiMA_X Mobile Broadband"
+msgstr "å??ç?¨ WiMA_X è¡?å??å¯¬é »"
+
+#. Toggle notifications item
+#: ../src/applet.c:1929
+msgid "Enable N_otifications"
+msgstr "å??ç?¨é??ç?¥å??è?½(_o)"
+
 #. 'Connection Information' item
-#: ../src/applet.c:1470
+#: ../src/applet.c:1940
 msgid "Connection _Information"
 msgstr "é?£ç·?è³?è¨?(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1480
+#: ../src/applet.c:1950
 msgid "Edit Connections..."
-msgstr "ç·¨è¼¯é?£ç·?..."
+msgstr "ç·¨è¼¯é?£ç·?â?¦"
 
 #. Help item
-#: ../src/applet.c:1494
+#: ../src/applet.c:1964
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
 #. About item
-#: ../src/applet.c:1503
+#: ../src/applet.c:1973
 msgid "_About"
 msgstr "é??æ?¼(_A)"
 
-#: ../src/applet.c:1676
+#: ../src/applet.c:2164
 msgid "Disconnected"
 msgstr "å·²æ?·ç·?"
 
-#: ../src/applet.c:1677
+#: ../src/applet.c:2165
 msgid "The network connection has been disconnected."
 msgstr "ç¶²çµ¡é?£ç·?å·²ä¸æ?·ã??"
 
-#: ../src/applet.c:1825
+#: ../src/applet.c:2347
 #, c-format
 msgid "Preparing network connection '%s'..."
-msgstr "æ£å?¨æº?å??ç¶²çµ¡é?£ç·?ã??%sã??..."
+msgstr "æ£å?¨æº?å??ç¶²çµ¡é?£ç·?ã??%sã??â?¦"
 
-#: ../src/applet.c:1828
+#: ../src/applet.c:2350
 #, c-format
 msgid "User authentication required for network connection '%s'..."
-msgstr "ç¶²çµ¡é?£ç·?ã??%sã??é??è¦?ä½¿ç?¨è??é©?è?..."
+msgstr "ç¶²çµ¡é?£ç·?ã??%sã??é??è¦?ä½¿ç?¨è??é©?è?â?¦"
 
-#: ../src/applet.c:1834
+#: ../src/applet.c:2356
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "ç¶²çµ¡é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸"
 
-#: ../src/applet.c:1915
+#: ../src/applet.c:2437
 #, c-format
 msgid "Starting VPN connection '%s'..."
-msgstr "æ£å?¨å??å?? VPN é?£ç·?ã??%sã??..."
+msgstr "æ£å?¨å??å?? VPN é?£ç·?ã??%sã??â?¦"
 
-#: ../src/applet.c:1918
+#: ../src/applet.c:2440
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
-msgstr "VPN é?£ç·?ã??%sã??é??è¦?ä½¿ç?¨è??é©?è?..."
+msgstr "VPN é?£ç·?ã??%sã??é??è¦?ä½¿ç?¨è??é©?è?â?¦"
 
-#: ../src/applet.c:1921
+#: ../src/applet.c:2443
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
-msgstr "æ£å?¨è¦?æ±? VPN æ??ä¾?ã??%sã??ç??ç¶²çµ¡ä½?å??..."
+msgstr "æ£å?¨è¦?æ±? VPN æ??ä¾?ã??%sã??ç??ç¶²çµ¡ä½?å??â?¦"
 
-#: ../src/applet.c:1924
+#: ../src/applet.c:2446
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸"
 
-#: ../src/applet.c:1963
+#: ../src/applet.c:2485
 msgid "No network connection"
 msgstr "æ²?æ??ç¶²çµ¡é?£æ?¥"
 
-#: ../src/applet.c:2298
-msgid ""
-"The NetworkManager applet could not find some required resources.  It cannot "
-"continue.\n"
-msgstr "NetworkManager é?¢æ?¿ç¨?å¼?ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ã??å®?ç?¡æ³?ç¹¼çº?ã??\n"
-
-#: ../src/applet.c:2485
+#: ../src/applet.c:3082
 msgid "NetworkManager Applet"
 msgstr "NetworkManager é?¢æ?¿ç¨?å¼?"
 
-#: ../src/applet.c:2491 ../src/wired-dialog.c:128
+#: ../src/applet.c:3088 ../src/wired-dialog.c:132
 msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
+"The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
-msgstr "NetworkManager é?¢æ?¿ç¨?å¼?ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼?æ?¾ä¸?å?° glade æª?ï¼?"
+msgstr "NetworkManager é?¢æ?¿ç¨?å¼?ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼?æ?¾ä¸?å?° .ui æª?ï¼?ã??"
 
-#: ../src/applet.glade.h:1 ../src/connection-editor/ce-mobile-wizard.glade.h:1
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:1
+#: ../src/applet.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: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.ui.h:2
+msgid "Active Network Connections"
+msgstr "å??ç?¨ç¶²çµ¡é?£ç·?"
 
-#: ../src/applet.glade.h:7
-msgid "Anonymous Identity:"
-msgstr "å?¿å??è?å?¥ï¼?"
-
-#: ../src/applet.glade.h:8
-msgid "Authentication:"
-msgstr "é©?è?ï¼?"
-
-#: ../src/applet.glade.h:9
-msgid ""
-"Automatic\n"
-"Version 0\n"
-"Version 1"
-msgstr ""
-"è?ªå??\n"
-"ç¬¬ 0 ç??\n"
-"ç¬¬ 1 ç??"
-
-#: ../src/applet.glade.h:12
-msgid "CA Certificate:"
-msgstr "CA è?æ?¸ï¼?"
-
-#: ../src/applet.glade.h:13
+#: ../src/applet.ui.h:3
 msgid "C_onnect"
 msgstr "é?£ç·?(_O)"
 
-#: ../src/applet.glade.h:14
+#: ../src/applet.ui.h:4
+msgid "Co_nnection:"
+msgstr "é?£ç·?(_n):"
+
+#: ../src/applet.ui.h:5
 msgid "Connection Information"
 msgstr "é?£ç·?è³?è¨?"
 
-#: ../src/applet.glade.h:15
-msgid "Connection:"
-msgstr "é?£ç·?:"
-
-#: ../src/applet.glade.h:16
-msgid "Don't warn me again"
-msgstr "ä¸?è¦?å??æ??é??æ??"
-
-#: ../src/applet.glade.h:17
-msgid "Identity:"
-msgstr "è?å?¥ï¼?"
+#: ../src/applet.ui.h:6
+msgid "Other Wireless Network..."
+msgstr "å?¶å®?ç?¡ç·?ç¶²çµ¡â?¦"
 
-#: ../src/applet.glade.h:18
-msgid "Inner Authentication:"
-msgstr "å?§é?¨é©?è?:"
+#: ../src/applet.ui.h:7
+msgid "Wireless _adapter:"
+msgstr "ç?¡ç·?ç¶²çµ¡å?¡(_A)ï¼?"
 
-#: ../src/applet.glade.h:19
-msgid "Key:"
-msgstr "å¯?ç¢¼å??ï¼?"
+#: ../src/applet.ui.h:8
+msgid "_Network name:"
+msgstr "ç¶²çµ¡å??ç¨±(_N)ï¼?"
 
-#: ../src/applet.glade.h:20
-msgid "No"
-msgstr "å?¦"
+#: ../src/applet.ui.h:9
+msgid "_Unlock"
+msgstr "è§£é??(_U)"
 
-#: ../src/applet.glade.h:21
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
-"é??æ?¾ç³»çµ±\n"
-"å?±ç?¨å¯?ç¢¼å??"
+#: ../src/applet.ui.h:10
+msgid "_Wireless security:"
+msgstr "ç?¡ç·?ç¶²çµ¡å®?å?¨(_W):"
 
-#: ../src/applet.glade.h:23
-msgid "Other Wireless Network..."
-msgstr "å?¶å®?ç?¡ç·?ç¶²çµ¡..."
+#: ../src/applet.ui.h:11
+msgid "label"
+msgstr "æ¨?ç±¤"
 
-#: ../src/applet.glade.h:24
-msgid "PEAP Version:"
-msgstr "PEAP ç??æ?¬ï¼?"
+#: ../src/connection-editor/ce-page.c:69
+msgid "automatic"
+msgstr "è?ªå??"
 
-#: ../src/applet.glade.h:26
-msgid "Private Key Password:"
-msgstr "ç§?å¯?å¯?ç¢¼å??å¯?ç¢¼ï¼?"
+#: ../src/connection-editor/ce-page.c:222
+#: ../src/connection-editor/nm-connection-editor.c:613
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "ç?±æ?¼ä¸?æ??ç??é?¯èª¤ä½¿é?£ç·?æ©?å¯?ç??æ?´æ?°å¤±æ??ã??"
 
-#: ../src/applet.glade.h:27
-msgid "Private Key:"
-msgstr "ç§?å¯?å¯?ç¢¼å??ï¼?"
+#: ../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/connection-editor/ce-page-dsl.ui.h:2
+#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/wireless-security/eap-method-leap.ui.h:2
+#: ../src/wireless-security/eap-method-simple.ui.h:3
+#: ../src/wireless-security/ws-leap.ui.h:2
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Password:"
+msgstr "å¯?ç¢¼(_P)ï¼?"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
+msgid "_Service:"
+msgstr "æ??å??(_S):"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/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/connection-editor/ce-page-ip4.ui.h:1
+#: ../src/connection-editor/ce-page-ip6.ui.h:1
+msgid "Addresses"
+msgstr "ä½?å??"
 
-#: ../src/applet.glade.h:28
-msgid "Select A File"
-msgstr "é?¸æ??æª?æ¡?"
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: ../src/connection-editor/ce-page-wired.ui.h:7
+#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/page-ip6.c:135
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Automatic"
+msgstr "è?ªå??"
 
-#: ../src/applet.glade.h:29
-msgid "Show key"
-msgstr "é¡¯ç¤ºå¯?ç¢¼å??"
+#: ../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/applet.glade.h:30 ../src/connection-editor/ce-page-dsl.glade.h:3
-msgid "Show password"
-msgstr "é¡¯ç¤ºå¯?ç¢¼"
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+msgid "D_HCP client ID:"
+msgstr "D_HCP å®¢æ?¶ç«¯ ID:"
 
-#: ../src/applet.glade.h:31 ../src/connection-editor/ce-page-mobile.glade.h:16
-msgid "Type:"
-msgstr "é¡?å??ï¼?"
+#: ../src/connection-editor/ce-page-ip4.ui.h:5
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr "ç?¨ä¾?è§£æ??ä¸»æ©?å??ç¨±ç??ç¶²å??ã??è«?ä½¿ç?¨é??è??é??é??ä¸?å??ç??ç¶²å??ã??"
 
-#: ../src/applet.glade.h:32
-msgid "User Certificate:"
-msgstr "ä½¿ç?¨è??è?æ?¸ï¼?"
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:5
+msgid ""
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
+msgstr "ç?¨ä¾?å?¨ç¶²çµ¡ä¸?å??å?¥ä½ ç??é?»è?¦ç?? IP ä½?å??ã??è«?æ??ä¸?ã??æ?°å¢?ã??æ??é??ï¼?å? å?¥ IP ä½?å??ã??"
 
-#: ../src/applet.glade.h:33
-msgid "User Name:"
-msgstr "ä½¿ç?¨è??å??ç¨±ï¼?"
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+msgid ""
+"IP addresses of domain name servers used to resolve host names. Use commas "
+"to separate multiple domain name server addresses."
+msgstr "ç¶²å??å??ç¨±ä¼ºæ??å?¨ç?? IP ä½?å??ï¼?ç?¨ä¾?è§£æ??ä¸»æ©?å??ç¨±ã??è«?ä½¿ç?¨é??è??ä¾?å??é??å¤?å??ç¶²å??ä¼ºæ??å?¨ç??ä½?å??ã??"
 
-#: ../src/applet.glade.h:34
-msgid "WEP Index:"
-msgstr "WEP ç´¢å¼?:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr "å¦?æ??å??ç?¨ï¼?é??å??é?£ç·?å°?æ°¸é? ä¸?æ??å??ç?ºé ?è¨ç¶²çµ¡é?£ç·?ã??"
 
-#: ../src/applet.glade.h:35
-msgid "Wireless _adapter:"
-msgstr "ç?¡ç·?ç¶²çµ¡å?¡(_A)ï¼?"
+#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Ig_nore automatically obtained routes"
+msgstr "å¿½ç?¥è?ªå??ç?²å¾?ç??è·¯ç?±(_n)"
 
-#: ../src/applet.glade.h:36
-msgid "Yes"
-msgstr "æ?¯"
+#: ../src/connection-editor/ce-page-ip4.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "Link-Local"
+msgstr "æ?¬æ©?é?£ç·?"
 
-#: ../src/applet.glade.h:37
-msgid "_Network Name:"
-msgstr "ç¶²çµ¡å??ç¨±(_N)ï¼?"
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/page-ip4.c:162
+#: ../src/connection-editor/page-ip6.c:184
+msgid "Manual"
+msgstr "æ??å??"
 
-#: ../src/applet.glade.h:38
-msgid "_Wireless Security:"
-msgstr "ç?¡ç·?ç¶²çµ¡é?²è·(_W):"
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+msgid "Require IPv4 addressing for this connection to complete"
+msgstr "é??è¦? IPv4 addressing æ??å?¯å®?æ??æ¤é?£ç·?"
 
-#: ../src/applet.glade.h:39
-msgid "alert text"
-msgstr "è¦ç¤ºæ??å?"
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/page-ip4.c:180
+#: ../src/connection-editor/page-ip6.c:204
+msgid "Shared to other computers"
+msgstr "å??äº«çµ¦å?¶ä»?é?»è?¦"
 
-#: ../src/connection-editor/ce-mobile-wizard.glade.h:2
+#: ../src/connection-editor/ce-page-ip4.ui.h:14
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Choose a Mobile Broadband Connection</"
-"span>\n"
-"\n"
-"Select or connect the mobile broadband device you wish to use for the new "
-"connection.  If the device is not available, you may select a generic "
-"connection type."
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">é?¸æ??ä¸?å??è¡?å??å¯¬é »é?£ç·?</span>\n"
-"\n"
-"é?¸æ??æ??é?£ç·?è?³ä½ å¸?æ??ä½¿ç?¨ç??è¡?å??å¯¬é »è£?ç½®å??ç?ºæ?°ç??é?£ç·?ã??å¦?æ??è©²è£?ç½®ç?¡æ³?ä½¿ç?¨ï¼?ä½ å?¯ä»¥ä½¿ç?¨ä¸?è?¬é?£ç·?é¡?å??ã??"
+"The DHCP client identifier allows the network administrator to customize "
+"your computer's configuration.  If you wish to use a DHCP client identifier, "
+"enter it here."
+msgstr "DHCP ç?¨æ?¶ç«¯è?å?¥è?½è®?ç¶²ç®¡äººå?¡å®¢è£½ä½ é?»è?¦ä¸?ç??é??ç½®ã??å¦?æ??ä½ æ?³è¦?ä½¿ç?¨ DHCP ç?¨æ?¶ç«¯è?å?¥ï¼?è«?å?¨æ¤è¼¸å?¥ã??"
 
-#: ../src/connection-editor/ce-page.c:70
-msgid "automatic"
-msgstr "è?ªå??"
+#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
+msgid "Use this c_onnection only for resources on its network"
+msgstr "å?ªå?¨ä½¿ç?¨é??å??é?£ç·?ç??ç¶²çµ¡è³?æº?æ??ï¼?æ??ä½¿ç?¨æ¤é?£ç·?(_o)"
 
-#: ../src/connection-editor/ce-page.c:201
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
-"Insufficient privileges or unknown error retrieving system connection "
-"secrets."
-msgstr "å??å¾?ç³»çµ±æ©?å¯?æ??æ¬?é??ä¸?è¶³æ??ä¸?æ??ç??é?¯èª¤ã??"
-
-#: ../src/connection-editor/ce-page.c:236
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "ç?±æ?¼ä¸?æ??ç??é?¯èª¤ä½¿é?£ç·?æ©?å¯?ç??æ?´æ?°å¤±æ??ã??"
+"When connecting to IPv6-capable networks, allows the connection to complete "
+"if IPv4 configuration fails but IPv6 configuration succeeds."
+msgstr "ç?¶é?£è?³å?¯ä½¿ç?¨ IPv6 ç??ç¶²çµ¡æ??ï¼?è?¥ IPv4 é??ç½®å¤±æ??ï¼?ä¸?é?? IPv6 é??ç½®å?»æ??å??ç??è©±ï¼?è«?å??è¨±é?£ç·?å®?æ??ã??"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
+msgid "_DNS servers:"
+msgstr "_DNS ä¼ºæ??å?¨:"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
+msgid "_Method:"
+msgstr "æ?¹æ³?(_M):"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+msgid "_Routesâ?¦"
+msgstr "è·¯ç?±(_R)â?¦"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:20
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "_Search domains:"
+msgstr "æ??å°?ç¶²å??(_S):"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
+msgid "Require IPv6 addressing for this connection to complete"
+msgstr "é??è¦? IPv6 addressing æ??å?¯å®?æ??æ¤é?£ç·?"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+msgid ""
+"When connecting to IPv4-capable networks, allows the connection to complete "
+"if IPv6 configuration fails but IPv4 configuration succeeds."
+msgstr "ç?¶é?£è?³å?¯ä½¿ç?¨ IPv4 ç??ç¶²çµ¡æ??ï¼?è?¥ IPv6 é??ç½®å¤±æ??ï¼?ä¸?é?? IPv4 é??ç½®å?»æ??å??ç??è©±ï¼?è«?å??è¨±é?£ç·?å®?æ??ã??"
 
-#: ../src/connection-editor/ce-page.c:269
-msgid "Could not request secrets from the system settings service."
-msgstr "ç?¡æ³?è¦?æ±?ä¾?è?ªç³»çµ±è¨å®?æ??å??ç??æ©?å¯?ã??"
+#: ../src/connection-editor/ce-page-mobile.ui.h:1
+msgid "2G (GPRS/EDGE)"
+msgstr "2G (GPRS/EDGE)"
 
-#: ../src/connection-editor/ce-page.c:299
-msgid "Could not connect to D-Bus to request connection secrets."
-msgstr "ç?¡æ³?é?£ç·?è?³ D-Bus ä»¥è¦?æ±?é?£ç·?æ©?å¯?ã??"
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
+msgid "3G (UMTS/HSPA)"
+msgstr "3G (UMTS/HSPA)"
 
-#: ../src/connection-editor/ce-page.c:312
-msgid "Could not create D-Bus proxy for connection secrets."
-msgstr "ç?¡æ³?ç?ºé?£ç·?æ©?å¯?å»ºç«? D-Bus ä»£ç??ã??"
+#: ../src/connection-editor/ce-page-mobile.ui.h:3
+msgid "Advanced"
+msgstr "é?²é??"
 
-#: ../src/connection-editor/ce-page-dsl.glade.h:2
-msgid "Service:"
-msgstr "æ??å??:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:4
+msgid "Allow roaming if home network is not available"
+msgstr "å¦?æ??å®¶ç?¨ç¶²çµ¡ç?¡æ³?ä½¿ç?¨ï¼?å??è¨±ä½¿ç?¨æ¼«é??"
 
-#: ../src/connection-editor/ce-page-dsl.glade.h:4
-#: ../src/connection-editor/ce-page-mobile.glade.h:17
-msgid "Username:"
-msgstr "ä½¿ç?¨è??å??ç¨±:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+msgid "Any"
+msgstr "ä»»ä½?"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:1
-msgid "<b>Addresses</b>"
-msgstr "<b>ä½?å??</b>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "Basic"
+msgstr "å?ºæ?¬"
 
-#: ../src/connection-editor/ce-page-ip4.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"
-"å??äº«çµ¦å?¶ä»?é?»è?¦"
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+msgid "Change..."
+msgstr "æ?´æ?¹â?¦"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:7
-msgid "DHCP Client ID:"
-msgstr "DHCP å®¢æ?¶ç«¯ ID:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "N_etwork ID:"
+msgstr "ç¶²çµ¡ ID(_e):"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:8
-msgid "DNS Servers:"
-msgstr "DNS ä¼ºæ??å?¨:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+msgid "Nu_mber:"
+msgstr "æ?¸å?(_m):"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:9
-msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
-msgstr "å¦?æ??å??ç?¨ï¼?é??å??é?£ç·?å°?æ°¸é? ä¸?æ??å??ç?ºé ?è¨ç¶²çµ¡é?£ç·?ã??"
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
+msgid "PI_N:"
+msgstr "PI_N:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:10
-msgid "Ignore automatically obtained routes"
-msgstr "å¿½ç?¥è?ªå??ç?²å¾?ç??è·¯ç?±"
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+msgid "Prefer 2G (GPRS/EDGE)"
+msgstr "å??å¥½ 2G (GPRS/EDGE)"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:11
-msgid "Method:"
-msgstr "æ?¹æ³?:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:12
+msgid "Prefer 3G (UMTS/HSPA)"
+msgstr "å??å¥½ 3G (UMTS/HSPA)"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:12
-msgid "Routes..."
-msgstr "è·¯ç?±..."
+#: ../src/connection-editor/ce-page-mobile.ui.h:13
+msgid "Sho_w passwords"
+msgstr "é¡¯ç¤ºå¯?ç¢¼(_w)"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:13
-msgid "Search Domains:"
-msgstr "æ??å°?ç¶²å??:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:14
+msgid "_APN:"
+msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:14
-msgid "Use this connection only for resources on its network"
-msgstr "å?ªå?¨ä½¿ç?¨é??å??é?£ç·?ç??ç¶²çµ¡è³?æº?æ??æ??ä½¿ç?¨å®?"
+#: ../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-mobile.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>é?²é??</b>"
+#: ../src/connection-editor/ce-page-ppp.ui.h:1
+msgid "Allow _BSD data compression"
+msgstr "å??è¨± _BSD è³?æ??å£?ç¸®"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:2
-msgid "<b>Basic</b>"
-msgstr "<b>å?ºæ?¬</b>"
+#: ../src/connection-editor/ce-page-ppp.ui.h:2
+msgid "Allow _Deflate data compression"
+msgstr "å??è¨± _Deflate è³?æ??å£?ç¸®"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:3
-msgid "APN:"
-msgstr "APN:"
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Allowed Authentication Methods"
+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.glade.h:9
-msgid "Band:"
-msgstr "é »å¯¬:"
-
-#: ../src/connection-editor/ce-page-mobile.glade.h:10
-msgid "Network:"
-msgstr "ç¶²çµ¡:"
-
-#: ../src/connection-editor/ce-page-mobile.glade.h:11
-#, fuzzy
-msgid "Number:"
-msgstr "äº?å?è??"
-
-#: ../src/connection-editor/ce-page-mobile.glade.h:12
-msgid "PIN:"
-msgstr "PIN:"
-
-#: ../src/connection-editor/ce-page-mobile.glade.h:13
-msgid "PUK:"
-msgstr "PUK:"
-
-#: ../src/connection-editor/ce-page-mobile.glade.h:15
-msgid "Show passwords"
-msgstr "é¡¯ç¤ºå¯?ç¢¼"
-
-#: ../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>å??é?³</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-ppp.glade.h:6
-msgid "Allow BSD data compression"
-msgstr "å??è¨± BSD è³?æ??å£?ç¸®"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:7
-msgid "Allow Deflate data compression"
-msgstr "å??è¨± Deflate è³?æ??å£?ç¸®"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:8
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
 msgid "Allowed methods:"
 msgstr "å??è¨±ç??æ?¹å¼?:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:9
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:268
-msgid "CHAP"
-msgstr "CHAP"
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "Authentication"
+msgstr "é©?è?"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:10
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
+msgid "C_HAP"
+msgstr "C_HAP"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake é©?è?é??è¨?å??å®?"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:11
-msgid "Configure Methods..."
-msgstr "è¨å®?æ?¹æ³?..."
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
+msgid "Compression"
+msgstr "å£?ç¸®"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:12
-#: ../src/connection-editor/page-ppp.c:132
-msgid "EAP"
-msgstr "EAP"
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
+msgid "Configure _Methodsâ?¦"
+msgstr "è¨å®?æ?¹æ³?(_M)â?¦"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
+msgid "Echo"
+msgstr "å??é?¿"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:13
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
 msgid "Extensible Authentication Protocol"
 msgstr "å?¯å»¶ä¼¸ç??é©?è?é??è¨?å??å®?"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:14
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:238
-msgid "MSCHAP"
-msgstr "MSCHAP"
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr "å?¨å¤§å¤?æ?¸æ??æ³?ä¸?ï¼?ç¶²çµ¡ä¾?æ??è??ç?? PPP ä¼ºæ??å?¨æ??æ?¯æ?´æ??æ??ç??é©?è?æ?¹æ³?ã??å¦?æ??é?£ç·?å¤±æ??ï¼?è«?å??è©¦å??ç?¨æ??äº?æ?¹æ³?ç??æ?¯æ?´ã??"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:15
-msgid "MSCHAP v2"
-msgstr "MSCHAP v2"
+#: ../src/connection-editor/ce-page-ppp.ui.h:13
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:16
+#: ../src/connection-editor/ce-page-ppp.ui.h:14
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake é©?è?é??è¨?å??å®?"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:17
+#: ../src/connection-editor/ce-page-ppp.ui.h:15
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake é©?è?é??è¨?å??å®?ç¬¬ 2 ç??"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:18
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:223
-msgid "PAP"
-msgstr "PAP"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:19
+#: ../src/connection-editor/ce-page-ppp.ui.h:16
 msgid "Password Authentication Protocol"
 msgstr "å¯?ç¢¼é©?è?é??è¨?å??å®?"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:20
-msgid "Require 128-bit encryption"
-msgstr "é??è¦? 128-ä½?å??å? å¯?"
+#: ../src/connection-editor/ce-page-ppp.ui.h:17
+msgid "Send PPP _echo packets"
+msgstr "å?³é?? PPP å??é?³å°?å??(_e)"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:21
-msgid "Send PPP echo packets"
-msgstr "å?³é?? PPP å??é?³å°?å??"
+#: ../src/connection-editor/ce-page-ppp.ui.h:18
+msgid "Use TCP _header compression"
+msgstr "ä½¿ç?¨ TCP æ¨?é å£?ç¸®(_h)"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:22
-msgid "Use Point-to-Point Encryption (MPPE)"
-msgstr "ä½¿ç?¨é»?å°?é»?å¼?å? å¯? (MPPE)"
+#: ../src/connection-editor/ce-page-ppp.ui.h:19
+msgid "Use _stateful MPPE"
+msgstr "ä½¿ç?¨æ??ç??æ??ç?? MPPE(_s)"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:23
-msgid "Use Stateful MPPE"
-msgstr "ä½¿ç?¨æ??ç??æ??ç?? MPPE"
+#: ../src/connection-editor/ce-page-ppp.ui.h:20
+msgid "_EAP"
+msgstr "_EAP"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:24
-msgid "Use TCP header compression"
-msgstr "ä½¿ç?¨ TCP æ¨?é å£?ç¸®"
+#: ../src/connection-editor/ce-page-ppp.ui.h:21
+msgid "_MSCHAP"
+msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:1
-msgid "Aut_onegotiate"
-msgstr "è?ªå??å??è°(_O)"
+#: ../src/connection-editor/ce-page-ppp.ui.h:22
+msgid "_PAP"
+msgstr "_PAP"
 
-#: ../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-ppp.ui.h:23
+msgid "_Require 128-bit encryption"
+msgstr "é??è¦? 128-ä½?å??å? å¯?(_R)"
 
-#: ../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-ppp.ui.h:24
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr "ä½¿ç?¨é»?å°?é»?å¼?å? å¯? (MPPE)(_U)"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:1
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../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 "é??å? å?®ä½?ä»?é?¢ (AUI)"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:6
+msgid "Aut_onegotiate"
+msgstr "è?ªå??å??è°(_o)"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:8
+msgid "BNC"
+msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:12
+#: ../src/connection-editor/ce-page-wired.ui.h:9
 msgid "Full duple_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 "MT_U:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:14
-#: ../src/connection-editor/ce-page-wireless.glade.h:13
-msgid "_MAC address:"
-msgstr "_MAC ä½?å??ï¼?"
+#: ../src/connection-editor/ce-page-wired.ui.h:11
+msgid "Media Independent Interface (MII)"
+msgstr "åª?é«?ç?¨ç«?ä»?é?¢ (MII)"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:15
+#: ../src/connection-editor/ce-page-wired.ui.h:12
+#: ../src/connection-editor/ce-page-wireless.ui.h:11
+msgid ""
+"The MAC address entered here will be used as hardware address for the "
+"network device this connection is activated on.  This feature is known as "
+"MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
+msgstr "å?¨é??è£?è¼¸å?¥ç?? MAC ä½?å??æ??æ??ç?ºé??å??é?£ç·?ä½¿ç?¨ç??ç¶²çµ¡è£?ç½®ç??ç¡¬ä»¶ä½?å??ã??é??å??å??è?½ä¹?ç¨±ç?º MAC è¤?è£½æ??å?½è£?ã??ä¾?å¦?ï¼?00:11:22:33:44:55"
+
+#: ../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"
+msgstr "æ¤é?¸é ?æ??å°?æ¤é?£ç·?é??å®?è?³å?¨æ¤æ??è¼¸å?¥ç?? MAC ä½?å??æ??æ??å®?ç??ç¶²çµ¡è£?ç½®ã??ä¾?å¦?ï¼?00:11:22:33:44:55"
+
+#: ../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.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.ui.h:17
 msgid "_Port:"
 msgstr "é?£æ?¥å? (_P)ï¼?"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:16
+#: ../src/connection-editor/ce-page-wired.ui.h:18
 msgid "_Speed:"
 msgstr "é??åº¦(_S)ï¼?"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:17
-#: ../src/connection-editor/ce-page-wireless.glade.h:16
+#: ../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.glade.h:4
+#: ../src/connection-editor/ce-page-wireless.ui.h:2
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../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.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 ""
-"Infrastructure\n"
-"Ad-hoc"
+#: ../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:11
+#: ../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"
+msgstr "æ¤é?¸é ?æ??å°?æ¤é?£ç·?é??å®?è?³å?¨æ¤æ??è¼¸å?¥ç?? BSSID æ??æ??å®?ç??ç?¡é??å?å??é»?ï¼?APï¼?ã??ä¾?å¦?ï¼?00:11:22:33:44:55"
+
+#: ../src/connection-editor/ce-page-wireless.ui.h:14
 msgid "Transmission po_wer:"
 msgstr "å?³è¼¸è??è?½(_W):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:12
+#: ../src/connection-editor/ce-page-wireless.ui.h:15
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:14
+#: ../src/connection-editor/ce-page-wireless.ui.h:18
 msgid "_Rate:"
 msgstr "é??ç??(_R):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:15
+#: ../src/connection-editor/ce-page-wireless.ui.h:19
 msgid "_SSID:"
 msgstr "_SSID:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:17
+#: ../src/connection-editor/ce-page-wireless.ui.h:21
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:2
+#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
+msgid "_Security:"
+msgstr "å®?å?¨æ?§(_S)ï¼?"
+
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
+msgid "Choose a VPN Connection Type"
+msgstr "è«?é?¸æ?? VPN ç??é?£ç·?é¡?å??"
+
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
+msgid "Createâ?¦"
+msgstr "å»ºç«?â?¦"
+
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
 msgid ""
-"<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."
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">é?¸æ?? VPN é?£ç·?é¡?å??</span>\n"
-"é?¸æ??ä½ æ?³è¦?ç?¨å?¨æ?°é?£ç·?ä¸ç?? VPN é¡?å??ã??å¦?æ??ä½ æ?³è¦?å»ºç«?ç?? VPN é?£ç·?é¡?å??æ²?æ??å?ºç?¾å?¨æ¸?å?®ä¸ï¼?å?¯è?½æ?¯æ²?æ??å®?è£?æ£ç¢ºç?? VPN å¤?æ??ç¨?å¼?ã??"
+msgstr "é?¸æ??ä½ æ?³è¦?ç?¨å?¨æ?°é?£ç·?ä¸ç?? VPN é¡?å??ã??å¦?æ??ä½ æ?³è¦?å»ºç«?ç?? VPN é?£ç·?é¡?å??æ²?æ??å?ºç?¾å?¨æ¸?å?®ä¸ï¼?å?¯è?½æ?¯æ²?æ??å®?è£?æ£ç¢ºç?? VPN å¤?æ??ç¨?å¼?ã??"
 
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:5
-msgid "Create..."
-msgstr "å»ºç«?..."
-
-#: ../src/connection-editor/ip4-routes-dialog.c:501
-#: ../src/connection-editor/page-ip4.c:634
+#: ../src/connection-editor/ip4-routes-dialog.c:504
+#: ../src/connection-editor/ip6-routes-dialog.c:462
+#: ../src/connection-editor/page-ip4.c:738
+#: ../src/connection-editor/page-ip6.c:723
 msgid "Address"
 msgstr "ä½?å??"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:517
-#: ../src/connection-editor/page-ip4.c:650
+#: ../src/connection-editor/ip4-routes-dialog.c:520
+#: ../src/connection-editor/page-ip4.c:755
 msgid "Netmask"
 msgstr "ç¶²çµ¡é?®ç½©"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:533
-#: ../src/connection-editor/page-ip4.c:666
+#: ../src/connection-editor/ip4-routes-dialog.c:536
+#: ../src/connection-editor/ip6-routes-dialog.c:494
+#: ../src/connection-editor/page-ip4.c:772
+#: ../src/connection-editor/page-ip6.c:757
 msgid "Gateway"
 msgstr "é??è¨?é??"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:549
+#: ../src/connection-editor/ip4-routes-dialog.c:552
+#: ../src/connection-editor/ip6-routes-dialog.c:510
 msgid "Metric"
 msgstr "å?¬å?¶"
 
-#: ../src/connection-editor/mobile-wizard.c:73
-msgid "Installed GSM device"
-msgstr "å·²å®?è£?ç?? GSM è£?ç½®"
-
-#: ../src/connection-editor/mobile-wizard.c:84
-msgid "Installed CDMA device"
-msgstr "å·²å®?è£?ç?? CDMA è£?ç½®"
+#: ../src/connection-editor/ip6-routes-dialog.c:478
+#: ../src/connection-editor/page-ip6.c:740
+msgid "Prefix"
+msgstr "å??ç¶´"
 
-#: ../src/connection-editor/mobile-wizard.c:150
-msgid "Create a GSM connection"
-msgstr "å»ºç«? GSM é?£ç·?"
-
-#: ../src/connection-editor/mobile-wizard.c:151
-msgid "Create a CDMA connection"
-msgstr "å»ºç«? CDMA é?£ç·?"
+#: ../src/connection-editor/page-dsl.c:136
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-list.c:1420
+msgid "DSL"
+msgstr "DSL"
 
-#: ../src/connection-editor/page-dsl.c:152
-#: ../src/connection-editor/page-dsl.c:159
+#: ../src/connection-editor/page-dsl.c:138
 msgid "Could not load DSL user interface."
 msgstr "ç?¡æ³?è¼?å?¥ DSL ä½¿ç?¨è??ä»?é?¢ã??"
 
-#: ../src/connection-editor/page-dsl.c:165
-#: ../src/connection-editor/nm-connection-editor.glade.h:4
-#: ../src/connection-editor/nm-connection-list.c:1818
-msgid "DSL"
-msgstr "DSL"
+#: ../src/connection-editor/page-dsl.c:228
+#, c-format
+msgid "DSL connection %d"
+msgstr "DSL é?£ç·? %d"
 
-#: ../src/connection-editor/page-ip4.c:116
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:125
 msgid "Automatic (VPN)"
 msgstr "è?ªå?? (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:117
+#: ../src/connection-editor/page-ip4.c:127
+#: ../src/connection-editor/page-ip6.c:126
 msgid "Automatic (VPN) addresses only"
 msgstr "å?ªç?¨è?ªå?? (VPN) ä½?å??"
 
-#: ../src/connection-editor/page-ip4.c:120
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (PPP)"
 msgstr "è?ªå?? (PPP)"
 
-#: ../src/connection-editor/page-ip4.c:121
+#: ../src/connection-editor/page-ip4.c:131
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (PPP) addresses only"
 msgstr "å?ªç?¨è?ªå?? (PPP) ä½?å??"
 
-#: ../src/connection-editor/page-ip4.c:123
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "è?ªå?? (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:124
+#: ../src/connection-editor/page-ip4.c:134
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "å?ªç?¨è?ªå?? (PPPoE) ä½?å??"
 
-#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP)"
 msgstr "è?ªå?? (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:127
+#: ../src/connection-editor/page-ip4.c:137
 msgid "Automatic (DHCP) addresses only"
 msgstr "å?ªç?¨è?ªå?? (DHCP) ä½?å??"
 
-#: ../src/connection-editor/page-ip4.c:152
-msgid "Manual"
-msgstr "æ??å??"
-
-#: ../src/connection-editor/page-ip4.c:164
+#: ../src/connection-editor/page-ip4.c:174
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "å?ªæ??æ?¬æ©?é?£ç·?"
 
-#: ../src/connection-editor/page-ip4.c:170
-msgid "Shared to other computers"
-msgstr "å??äº«çµ¦å?¶ä»?é?»è?¦"
+#: ../src/connection-editor/page-ip4.c:190
+msgid "Disabled"
+msgstr "å·²å??ç?¨"
 
-#: ../src/connection-editor/page-ip4.c:597
+#: ../src/connection-editor/page-ip4.c:700
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "ç·¨è¼¯ %s ç?? IPv4 è·¯ç?±"
 
-#: ../src/connection-editor/page-ip4.c:708
-#: ../src/connection-editor/page-ip4.c:715
+#: ../src/connection-editor/page-ip4.c:815
+msgid "IPv4 Settings"
+msgstr "IPv4 è¨å®?"
+
+#: ../src/connection-editor/page-ip4.c:817
 msgid "Could not load IPv4 user interface."
 msgstr "ç?¡æ³?è¼?å?¥ IPv4 ä½¿ç?¨è??ä»?é?¢ã??"
 
-#: ../src/connection-editor/page-ip4.c:721
-msgid "IPv4 Settings"
-msgstr "IPv4 è¨å®?"
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "è?ªå??ï¼?å??é??ä½?å??"
+
+#: ../src/connection-editor/page-ip6.c:148
+#: ../src/wireless-security/eap-method.c:234
+msgid "Ignore"
+msgstr "å¿½ç?¥"
+
+#: ../src/connection-editor/page-ip6.c:172
+msgid "Automatic, DHCP only"
+msgstr "è?ªå??ï¼?å??ä½¿ç?¨ DHCP"
 
-#: ../src/connection-editor/page-mobile.c:295
-#: ../src/connection-editor/page-mobile.c:302
+#: ../src/connection-editor/page-ip6.c:685
+#, c-format
+msgid "Editing IPv6 routes for %s"
+msgstr "ç?º %s ç·¨è¼¯ IPv6 è·¯ç?±"
+
+#: ../src/connection-editor/page-ip6.c:798
+msgid "IPv6 Settings"
+msgstr "IPv6 è¨å®?"
+
+#: ../src/connection-editor/page-ip6.c:800
+msgid "Could not load IPv6 user interface."
+msgstr "ç?¡æ³?è¼?å?¥ IPv6 ä½¿ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-mobile.c:367
 msgid "Could not load mobile broadband user interface."
 msgstr "ç?¡æ³?è¼?å?¥è¡?å??å¯¬é »ä½¿ç?¨è??ä»?é?¢ã??"
 
-#: ../src/connection-editor/page-mobile.c:320
+#: ../src/connection-editor/page-mobile.c:384
 msgid "Unsupported mobile broadband connection type."
 msgstr "ä¸?æ?¯æ?´ç??è¡?å??å¯¬é »é?£ç·?é¡?å??ã??"
 
+#. Fall back to just asking for GSM vs. CDMA
+#: ../src/connection-editor/page-mobile.c:625
+msgid "Select Mobile Broadband Provider Type"
+msgstr "é?¸æ??è¡?å??å¯¬é »ä¾?æ??å??é¡?å??"
+
+#: ../src/connection-editor/page-mobile.c:652
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
+msgstr "è«?é?¸æ??ä½ ç??ç?¡ç·?å¯¬é »ä¾?æ??å??æ??ä½¿ç?¨ç??æ??è¡?ã??å¦?æ??ä½ ä¸?ç¢ºå®?ï¼?è«?æ´½è©¢ä¾?æ??å??ã??"
+
+#: ../src/connection-editor/page-mobile.c:657
+msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
+msgstr "æ??ç??ä¾?æ??å??ä½¿ç?¨ _GSM ç?ºä¸»ç??æ??è¡?ï¼?ä¾?å¦? GPRSã??EDGEã??UMTSã??HSDPAï¼?"
+
+#: ../src/connection-editor/page-mobile.c:664
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+msgstr "æ??ç??ä¾?æ??å??ä½¿ç?¨ C_DMA ç?ºä¸»ç??æ??è¡?ï¼?ä¾?å¦? 1xRTTã??EVDOï¼?"
+
+#: ../src/connection-editor/page-ppp.c:132
+msgid "EAP"
+msgstr "EAP"
+
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:235
+msgid "PAP"
+msgstr "PAP"
+
+#: ../src/connection-editor/page-ppp.c:134
+#: ../src/wireless-security/eap-method-ttls.c:283
+msgid "CHAP"
+msgstr "CHAP"
+
 #: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-ttls.c:253
+#: ../src/wireless-security/eap-method-peap.c:251
+#: ../src/wireless-security/eap-method-ttls.c:267
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
+#: ../src/connection-editor/page-ppp.c:136
+#: ../src/wireless-security/eap-method-ttls.c:251
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
 #. Translators: "none" refers to authentication methods
 #: ../src/connection-editor/page-ppp.c:139
 msgid "none"
@@ -1341,328 +1672,279 @@ msgstr "ç?¡"
 msgid "Editing PPP authentication methods for %s"
 msgstr "ç·¨è¼¯ %s ç?? PPP é©?è?æ?¹æ³?"
 
-#: ../src/connection-editor/page-ppp.c:280
-#: ../src/connection-editor/page-ppp.c:287
-msgid "Could not load PPP user interface."
-msgstr "ç?¡æ³?è¼?å?¥ PPP ä½¿ç?¨è??ä»?é?¢ã??"
-
-#: ../src/connection-editor/page-ppp.c:293
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP è¨å®?å?¼"
 
+#: ../src/connection-editor/page-ppp.c:281
+msgid "Could not load PPP user interface."
+msgstr "ç?¡æ³?è¼?å?¥ PPP ä½¿ç?¨è??ä»?é?¢ã??"
+
 #: ../src/connection-editor/page-vpn.c:105
-#: ../src/connection-editor/nm-connection-editor.glade.h:8
-#: ../src/connection-editor/nm-connection-list.c:1815
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: ../src/connection-editor/nm-connection-list.c:1416
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/page-vpn.c:116
+#: ../src/connection-editor/page-vpn.c:107
+msgid "Could not load VPN user interface."
+msgstr "ç?¡æ³?è¼?å?¥ VPN ä½¿ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-vpn.c:122
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "æ?¾ä¸?å?°ã??%sã??ç?? VPN å¤?æ??ç¨?å¼?æ??å??ã??"
 
-#: ../src/connection-editor/page-wired.c:204
+#: ../src/connection-editor/page-vpn.c:216
+#: ../src/connection-editor/nm-connection-list.c:995
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN é?£ç·? %d"
+
+#: ../src/connection-editor/page-wired.c:209
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-list.c:1404
+msgid "Wired"
+msgstr "æ??ç·?"
+
 #: ../src/connection-editor/page-wired.c:211
 msgid "Could not load wired user interface."
 msgstr "ç?¡æ³?è¼?å?¥æ??ç·?ç¶²çµ¡ä½¿ç?¨è??ä»?é?¢ã??"
 
-#: ../src/connection-editor/page-wired.c:217
-#: ../src/connection-editor/nm-connection-editor.glade.h:9
-#: ../src/connection-editor/nm-connection-list.c:1805
-msgid "Wired"
-msgstr "æ??ç·?"
+#: ../src/connection-editor/page-wired.c:346
+#, c-format
+msgid "Wired connection %d"
+msgstr "æ??ç·?ç¶²çµ¡é?£ç·? %d"
 
-#: ../src/connection-editor/page-wired-security.c:112
+#: ../src/connection-editor/page-wired-security.c:113
 msgid "802.1x Security"
 msgstr "802.1x é?²è·"
 
-#: ../src/connection-editor/page-wired-security.c:120
+#: ../src/connection-editor/page-wired-security.c:115
+msgid "Could not load Wired Security security user interface."
+msgstr "ç?¡æ³?è¼?å?¥ Wired Security å®?å?¨ä½¿ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-wired-security.c:129
 msgid "Use 802.1X security for this connection"
 msgstr "å?¨é??å??é?£ç·?ä½¿ç?¨ 802.1X é?²è·"
 
-#: ../src/connection-editor/page-wireless.c:144
-#: ../src/connection-editor/page-wireless.c:148
+#: ../src/connection-editor/page-wireless.c:146
+#: ../src/connection-editor/page-wireless.c:150
+#: ../src/connection-editor/page-wireless.c:171
+#, c-format
 msgid "default"
 msgstr "é ?è¨"
 
-#: ../src/connection-editor/page-wireless.c:166
+#: ../src/connection-editor/page-wireless.c:175
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:348
-#: ../src/connection-editor/page-wireless.c:355
+#: ../src/connection-editor/page-wireless.c:395
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-list.c:1408
+msgid "Wireless"
+msgstr "ç?¡ç·?ç¶²çµ¡"
+
+#: ../src/connection-editor/page-wireless.c:397
 msgid "Could not load WiFi user interface."
 msgstr "ç?¡æ³?è¼?å?¥ WiFi ä½¿ç?¨è??ä»?é?¢ã??"
 
-#: ../src/connection-editor/page-wireless.c:361
-#: ../src/connection-editor/nm-connection-editor.glade.h:10
-#: ../src/connection-editor/nm-connection-list.c:1808
-msgid "Wireless"
-msgstr "ç?¡ç·?ç¶²çµ¡"
+#: ../src/connection-editor/page-wireless.c:561
+#, c-format
+msgid "Wireless connection %d"
+msgstr "ç?¡ç·?ç¶²çµ¡é?£ç·? %d"
 
-#: ../src/connection-editor/page-wireless-security.c:255
-#: ../src/wireless-dialog.c:789
-msgid "WEP 40/128-bit Key"
-msgstr "WEP 40/128-ä½?å?? å¯?ç¢¼å??"
+#: ../src/connection-editor/page-wireless-security.c:262
+#: ../src/wireless-dialog.c:943
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr "WEP 40/128-ä½?å?? å¯?ç¢¼å?? (Hex æ?? ASCII)"
 
-#: ../src/connection-editor/page-wireless-security.c:264
-#: ../src/wireless-dialog.c:798
+#: ../src/connection-editor/page-wireless-security.c:271
+#: ../src/wireless-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-ä½?å?? å¯?èª?"
 
-#: ../src/connection-editor/page-wireless-security.c:290
-#: ../src/wireless-dialog.c:828
+#: ../src/connection-editor/page-wireless-security.c:297
+#: ../src/wireless-dialog.c:982
 msgid "Dynamic WEP (802.1x)"
 msgstr "å??æ?? WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:304
-#: ../src/wireless-dialog.c:842
+#: ../src/connection-editor/page-wireless-security.c:311
+#: ../src/wireless-dialog.c:996
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 å??äººç??"
 
-#: ../src/connection-editor/page-wireless-security.c:318
-#: ../src/wireless-dialog.c:856
+#: ../src/connection-editor/page-wireless-security.c:325
+#: ../src/wireless-dialog.c:1010
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ä¼?æ¥ç??"
 
-#: ../src/connection-editor/page-wireless-security.c:356
+#: ../src/connection-editor/page-wireless-security.c:358
 msgid "Could not load WiFi security user interface; missing WiFi setting."
 msgstr "ç?¡æ³?è¼?å?¥ WiFi é?²è·ä½¿ç?¨è??ä»?é?¢ï¼?å¤±å?» WiFi è¨å®?å?¼ã??"
 
-#: ../src/connection-editor/page-wireless-security.c:363
-#: ../src/connection-editor/page-wireless-security.c:370
-msgid "Could not load WiFi security user interface."
-msgstr "ç?¡æ³?è¼?å?¥ WiFi é?²è·ä½¿ç?¨è??ä»?é?¢ã??"
-
-#: ../src/connection-editor/page-wireless-security.c:376
+#: ../src/connection-editor/page-wireless-security.c:367
 msgid "Wireless Security"
 msgstr "ç?¡ç·?ç¶²çµ¡é?²è·"
 
-#: ../src/connection-editor/polkit-helpers.c:52
-msgid "PolicyKit authorization request was invalid."
-msgstr "PolicyKit é©?è?è¦?æ±?æ?¯ç?¡æ??ç??ã??"
-
-#: ../src/connection-editor/polkit-helpers.c:58
-msgid "PolicyKit authorization request was malformed."
-msgstr "PolicyKit é©?è?è¦?æ±?æ ¼å¼?ä¸?è?¯ã??"
-
-#: ../src/connection-editor/polkit-helpers.c:64
-msgid "PolicyKit authorization could not be created."
-msgstr "PolicyKit é©?è?ç?¡æ³?å»ºç«?ã??"
-
-#: ../src/connection-editor/polkit-helpers.c:71
-msgid "PolicyKit authorization could not be created; invalid action ID."
-msgstr "ç?¡æ³?å»ºç«? PolicyKit é©?è?è¦?æ±?ï¼?ç?¡æ??ç??å??ä½? IDã??"
+#: ../src/connection-editor/page-wireless-security.c:369
+msgid "Could not load WiFi security user interface."
+msgstr "ç?¡æ³?è¼?å?¥ WiFi é?²è·ä½¿ç?¨è??ä»?é?¢ã??"
 
-#: ../src/connection-editor/nm-connection-editor.c:104
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "ç·¨è¼¯ %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "ç·¨è¼¯æ?ªå?½å??ç??é?£ç·?"
 
-#: ../src/connection-editor/nm-connection-editor.c:296
+#: ../src/connection-editor/nm-connection-editor.c:293
 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:309
-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 æª?ï¼?"
+msgstr "é?£ç·?ç·¨è¼¯å?¨æ?¾ä¸?å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼?æ?¾ä¸?å?° .ui æª?ï¼?ã??"
 
-#: ../src/connection-editor/nm-connection-editor.c:325
-msgid "Apply..."
-msgstr "å¥?ç?¨..."
+#: ../src/connection-editor/nm-connection-editor.c:391
+msgid "Error creating connection editor dialog."
+msgstr "å»ºç«?é?£ç·?ç·¨è¼¯å?¨å°?è©±ç??æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../src/connection-editor/nm-connection-editor.c:326
-msgid "Authenticate to save this connection for all users of this machine."
-msgstr "é©?è?ä»¥å?²å?é??å??é?£ç·?çµ¦æ¤é?»è?¦ä¸?ç??æ??æ??ä½¿ç?¨è??ã??"
+#: ../src/connection-editor/nm-connection-editor.c:412
+msgid "_Save"
+msgstr "å?²å?(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:327
-msgid "Apply"
-msgstr "å¥?ç?¨"
+#: ../src/connection-editor/nm-connection-editor.c:413
+msgid "Save any changes made to this connection."
+msgstr "å?²å?ä»»ä½?å°?é??å??é?£ç·?é?²è¡?ç??æ?´æ?¹ã??"
 
-#: ../src/connection-editor/nm-connection-editor.c:328
-msgid "Save this connection for all users of this machine."
-msgstr "å?²å?é??å??é?£ç·?çµ¦æ¤é?»è?¦ä¸?ç??æ??æ??ä½¿ç?¨è??ã??"
+#: ../src/connection-editor/nm-connection-editor.c:414
+msgid "_Save..."
+msgstr "å?²å?(_S)â?¦"
 
-#: ../src/connection-editor/nm-connection-editor.c:425
-msgid "Error creating connection editor dialog."
-msgstr "å»ºç«?é?£ç·?ç·¨è¼¯å?¨å°?è©±ç??æ??ç?¼ç??é?¯èª¤ã??"
+#: ../src/connection-editor/nm-connection-editor.c:415
+msgid "Authenticate to save this connection for all users of this machine."
+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:199
+#: ../src/connection-editor/nm-connection-list.c:217
 msgid "never"
 msgstr "æ°¸ä¸?"
 
-#: ../src/connection-editor/nm-connection-list.c:210
-#: ../src/connection-editor/nm-connection-list.c:221
+#: ../src/connection-editor/nm-connection-list.c:228
+#: ../src/connection-editor/nm-connection-list.c:239
 msgid "now"
 msgstr "ç?¾å?¨"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:228
+#: ../src/connection-editor/nm-connection-list.c:246
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d å??é??ä»¥å??"
 
-#: ../src/connection-editor/nm-connection-list.c:232
+#: ../src/connection-editor/nm-connection-list.c:250
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d å°?æ??ä»¥å??"
 
-#: ../src/connection-editor/nm-connection-list.c:244
+#: ../src/connection-editor/nm-connection-list.c:262
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d å¤©ä»¥å??"
 
-#: ../src/connection-editor/nm-connection-list.c:250
+#: ../src/connection-editor/nm-connection-list.c:268
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d å??æ??ä»¥å??"
 
-#: ../src/connection-editor/nm-connection-list.c:254
+#: ../src/connection-editor/nm-connection-list.c:272
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d å¹´ä»¥å??"
 
-#: ../src/connection-editor/nm-connection-list.c:320
-#: ../src/connection-editor/nm-connection-list.c:452
-msgid "Could not obtain required privileges"
-msgstr "ç?¡æ³?å??å¾?é??è¦?ç??æ¬?é??"
-
-#: ../src/connection-editor/nm-connection-list.c:325
-msgid "Could not delete connection"
-msgstr "ç?¡æ³?å?ªé?¤é?£ç·?"
-
-#: ../src/connection-editor/nm-connection-list.c:326
-msgid "The connection could not be deleted due to an unknown error."
-msgstr "ç?±æ?¼æ?ªç?¥ç??é?¯èª¤ï¼?æ??ä»¥ç?¡æ³?å?ªé?¤é?£ç·?ã??"
-
-#: ../src/connection-editor/nm-connection-list.c:362
-#: ../src/connection-editor/nm-connection-list.c:373
-msgid "Could not move connection"
-msgstr "ç?¡æ³?ç§»å??é?£ç·?"
-
-#: ../src/connection-editor/nm-connection-list.c:457
-#: ../src/connection-editor/nm-connection-list.c:506
-#: ../src/connection-editor/nm-connection-list.c:517
-msgid "Could not add connection"
-msgstr "ç?¡æ³?å? å?¥é?£ç·?"
-
-#: ../src/connection-editor/nm-connection-list.c:458
-msgid "The connection could not be added due to an unknown error."
-msgstr "å? ç?ºä¸?æ??ç??é?¯èª¤ä½¿è©²é?£ç·?ç?¡æ³?å? å?¥ã??"
-
-#: ../src/connection-editor/nm-connection-list.c:631
-#: ../src/connection-editor/nm-connection-list.c:636
-#: ../src/connection-editor/nm-connection-list.c:696
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "Could not update connection"
-msgstr "ç?¡æ³?æ?´æ?°é?£ç·?"
-
-#: ../src/connection-editor/nm-connection-list.c:637
-msgid "The connection could not be updated due to an unknown error."
-msgstr "å? ç?ºä¸?æ??ç??é?¯èª¤ä½¿è©²é?£ç·?ç?¡æ³?æ?´æ?°ã??"
-
-#: ../src/connection-editor/nm-connection-list.c:728
-#: ../src/connection-editor/nm-connection-list.c:1056
-msgid "An unknown error ocurred."
-msgstr "ç?¼ç??æ?ªç?¥ç??é?¯èª¤ã??"
-
-#: ../src/connection-editor/nm-connection-list.c:737
-#: ../src/connection-editor/nm-connection-list.c:1063
-msgid "Error initializing editor"
-msgstr "å??å§?å??ç·¨è¼¯å?¨æ??ç?¼ç??é?¯èª¤"
-
-#: ../src/connection-editor/nm-connection-list.c:845
-#, c-format
-msgid "Wired connection %d"
-msgstr "æ??ç·?ç¶²çµ¡é?£ç·? %d"
+#: ../src/connection-editor/nm-connection-list.c:595
+msgid "Connection add failed"
+msgstr "æ?°å¢?é?£ç·?å¤±æ??"
 
-#: ../src/connection-editor/nm-connection-list.c:857
-#, c-format
-msgid "Wireless connection %d"
-msgstr "ç?¡ç·?ç¶²çµ¡é?£ç·? %d"
+#: ../src/connection-editor/nm-connection-list.c:624
+msgid "Error saving connection"
+msgstr "å?²å?é?£ç·?æ??é?¯èª¤"
 
-#: ../src/connection-editor/nm-connection-list.c:876
+#: ../src/connection-editor/nm-connection-list.c:625
 #, c-format
-msgid "GSM connection %d"
-msgstr "GSM é?£ç·? %d"
+msgid "The property '%s' / '%s' is invalid: %d"
+msgstr "å±¬æ?§ã??%sã??/ã??%sã??æ?¯ç?¡æ??ç??ï¼?%d"
 
-#: ../src/connection-editor/nm-connection-list.c:895
-#, c-format
-msgid "CDMA connection %d"
-msgstr "CDMA é?£ç·? %d"
+#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:747
+msgid "An unknown error occurred."
+msgstr "ç?¼ç??ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:922
-#: ../src/connection-editor/nm-connection-list.c:1324
-#, c-format
-msgid "VPN connection %d"
-msgstr "VPN é?£ç·? %d"
-
-#: ../src/connection-editor/nm-connection-list.c:936
-#, c-format
-msgid "DSL connection %d"
-msgstr "DSL é?£ç·? %d"
+#: ../src/connection-editor/nm-connection-list.c:637
+#: ../src/connection-editor/nm-connection-list.c:788
+msgid "Error initializing editor"
+msgstr "å??å§?å??ç·¨è¼¯å?¨æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/connection-editor/nm-connection-list.c:998
-#: ../src/connection-editor/nm-connection-list.c:1098
-#: ../src/connection-editor/nm-connection-list.c:1313
+#: ../src/connection-editor/nm-connection-list.c:653
+#: ../src/connection-editor/nm-connection-list.c:805
+#: ../src/connection-editor/nm-connection-list.c:978
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "ç?±æ?¼ä¸?æ??ç??é?¯èª¤ä½¿é?£ç·?ç·¨è¼¯å?¨å°?è©±ç??ç?¡æ³?å??å§?å??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:1014
+#: ../src/connection-editor/nm-connection-list.c:662
+msgid "Could not create new connection"
+msgstr "ç?¡æ³?å»ºç«?æ?°é?£ç·?"
+
+#: ../src/connection-editor/nm-connection-list.c:673
 msgid "Could not edit new connection"
 msgstr "ç?¡æ³?ç·¨è¼¯æ?°é?£ç·?"
 
-#: ../src/connection-editor/nm-connection-list.c:1118
+#: ../src/connection-editor/nm-connection-list.c:820
 msgid "Could not edit connection"
 msgstr "ç?¡æ³?ç·¨è¼¯é?£ç·?"
 
-#: ../src/connection-editor/nm-connection-list.c:1177
+#: ../src/connection-editor/nm-connection-list.c:845
+msgid "Connection delete failed"
+msgstr "å?ªé?¤é?£ç·?å¤±æ??"
+
+#: ../src/connection-editor/nm-connection-list.c:877
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "ä½ ç¢ºå®?è¦?å?ªé?¤é?£ç·? %s ï¼?"
 
-#: ../src/connection-editor/nm-connection-list.c:1350
-#: ../src/connection-editor/vpn-helpers.c:229
+#: ../src/connection-editor/nm-connection-list.c:1025
+#: ../src/connection-editor/vpn-helpers.c:227
 msgid "Cannot import VPN connection"
 msgstr "ç?¡æ³?å?¯å?¥ VPN ç¶²çµ¡é?£ç·?"
 
-#: ../src/connection-editor/nm-connection-list.c:1352
+#: ../src/connection-editor/nm-connection-list.c:1027
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -1672,43 +1954,55 @@ msgstr ""
 "\n"
 "é?¯èª¤ï¼?æ²?æ?? VPN æ??å??é¡?å??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:1366
+#: ../src/connection-editor/nm-connection-list.c:1040
 msgid "Could not edit imported connection"
 msgstr "ç?¡æ³?ç·¨è¼¯å?¯å?¥ç??é?£ç·?"
 
-#: ../src/connection-editor/nm-connection-list.c:1689
-msgid "Edit..."
-msgstr "ç·¨è¼¯..."
+#: ../src/connection-editor/nm-connection-list.c:1174
+msgid "Name"
+msgstr "å??ç¨±"
+
+#: ../src/connection-editor/nm-connection-list.c:1186
+msgid "Last Used"
+msgstr "æ??å¾?ä½¿ç?¨ç??"
 
-#: ../src/connection-editor/nm-connection-list.c:1690
-msgid "Authenticate to edit the selected connection."
-msgstr "é©?è?ä»¥ç·¨è¼¯é?¸å??ç??é?£ç·?ã??"
+#: ../src/connection-editor/nm-connection-list.c:1282
+msgid "No VPN plugin available. Please install one to enable this button."
+msgstr "æ²?æ?? VPN å¤?æ??ç¨?å¼?å?¯ç?¨ã??è«?å®?è£?å?¶ä¸ä¸?ç¨®ä»¥å??ç?¨é??å??æ??é??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:1691
-msgid "Edit"
-msgstr "ç·¨è¼¯"
+#: ../src/connection-editor/nm-connection-list.c:1293
+msgid "_Edit"
+msgstr "ç·¨è¼¯(_E)"
 
-#: ../src/connection-editor/nm-connection-list.c:1692
-msgid "Edit the selected connection."
-msgstr "ç·¨è¼¯é?¸å??ç??é?£ç·?ã??"
+#: ../src/connection-editor/nm-connection-list.c:1294
+msgid "Edit the selected connection"
+msgstr "ç·¨è¼¯é?¸å??ç??é?£ç·?"
 
-#: ../src/connection-editor/nm-connection-list.c:1709
-msgid "Delete..."
-msgstr "å?ªé?¤..."
+#: ../src/connection-editor/nm-connection-list.c:1295
+msgid "_Edit..."
+msgstr "ç·¨è¼¯(_E)â?¦"
 
-#: ../src/connection-editor/nm-connection-list.c:1710
-msgid "Authenticate to delete the selected connection."
-msgstr "é©?è?ä»¥å?ªé?¤é?¸å??ç??é?£ç·?ã??"
+#: ../src/connection-editor/nm-connection-list.c:1296
+msgid "Authenticate to edit the selected connection"
+msgstr "é©?è?ä»¥ç·¨è¼¯é?¸å??ç??é?£ç·?"
 
-#: ../src/connection-editor/nm-connection-list.c:1711
-msgid "Delete"
-msgstr "å?ªé?¤"
+#: ../src/connection-editor/nm-connection-list.c:1311
+msgid "_Delete"
+msgstr "å?ªé?¤(_D)"
 
-#: ../src/connection-editor/nm-connection-list.c:1712
-msgid "Delete the selected connection."
-msgstr "å?ªé?¤é?¸å??ç??é?£ç·?ã??"
+#: ../src/connection-editor/nm-connection-list.c:1312
+msgid "Delete the selected connection"
+msgstr "å?ªé?¤é?¸å??ç??é?£ç·?"
+
+#: ../src/connection-editor/nm-connection-list.c:1313
+msgid "_Delete..."
+msgstr "å?ªé?¤(_D)â?¦"
 
-#: ../src/connection-editor/vpn-helpers.c:231
+#: ../src/connection-editor/nm-connection-list.c:1314
+msgid "Authenticate to delete the selected connection"
+msgstr "é©?è?ä»¥å?ªé?¤é?¸å??ç??é?£ç·?"
+
+#: ../src/connection-editor/vpn-helpers.c:229
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -1720,29 +2014,29 @@ msgstr ""
 "\n"
 "é?¯èª¤ï¼?%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 "ä½ æ?¯å?¦è¦?ä»¥æº?å??å?²å?ç?? VPN é?£ç·?å??ä»£ %sï¼?"
 
-#: ../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"
@@ -1753,23 +2047,355 @@ msgstr ""
 "\n"
 "é?¯èª¤ï¼?%sã??"
 
-#: ../src/connection-editor/vpn-helpers.c:386
+#: ../src/connection-editor/vpn-helpers.c:385
 msgid "Export VPN connection..."
-msgstr "å?¯å?º VPN é?£ç·?..."
+msgstr "å?¯å?º VPN é?£ç·?â?¦"
+
+#: ../src/gnome-bluetooth/bt-widget.c:212
+#, c-format
+msgid "%s Network"
+msgstr "%s ç¶²çµ¡"
+
+#: ../src/gnome-bluetooth/bt-widget.c:321
+#, c-format
+msgid "Error: %s"
+msgstr "é?¯èª¤ï¼?%s"
+
+#: ../src/gnome-bluetooth/bt-widget.c:440
+msgid "Mobile wizard was canceled"
+msgstr "è¡?å??ç²¾é??å·²ç¶?å??æ¶?"
+
+#: ../src/gnome-bluetooth/bt-widget.c:449
+msgid "Unknown phone device type (not GSM or CDMA)"
+msgstr "ä¸?æ??ç??é?»è©±è£?ç½®é¡?å??ï¼?é?? GSM æ?? CDMAï¼?"
+
+#: ../src/gnome-bluetooth/bt-widget.c:477
+msgid "Your phone is now ready to use!"
+msgstr "ä½ ç??é?»è©±ç?¾å?¨å·²ç¶?å?¯ä»¥ä½¿ç?¨ï¼?"
+
+#: ../src/gnome-bluetooth/bt-widget.c:647
+#: ../src/gnome-bluetooth/bt-widget.c:653
+msgid "failed to connect to the phone."
+msgstr "ç?¡æ³?é?£ç·?è?³é?»è©±ã??"
+
+#: ../src/gnome-bluetooth/bt-widget.c:686
+msgid "unexpectedly disconnected from the phone."
+msgstr "é?»è©±ç?¡é ?æ??é?¢ç·?ã??"
+
+#: ../src/gnome-bluetooth/bt-widget.c:695
+msgid "timed out detecting phone details."
+msgstr "å?¨æ??é??å?§å?µæ¸¬ä¸?å?°é?»è©±ç??è©³ç´°è³?æ??ã??"
+
+#: ../src/gnome-bluetooth/bt-widget.c:710
+msgid "could not connect to the system bus."
+msgstr "ç?¡æ³?é?£ç·?è?³ç³»çµ±å?¯æµ?æ??ã??"
+
+#: ../src/gnome-bluetooth/bt-widget.c:715
+msgid "Detecting phone configuration..."
+msgstr "å?µæ¸¬é?»è©±ç??é??ç½®â?¦"
+
+#: ../src/gnome-bluetooth/bt-widget.c:781
+msgid "could not find the Bluetooth device."
+msgstr "æ?¾ä¸?å?°è??ç??è£?ç½®ã??"
+
+#: ../src/gnome-bluetooth/bt-widget.c:911
+msgid ""
+"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+"Networking connection."
+msgstr "é ?è¨ç??è??ç??é??æ?¥å?¡å¿?é ?å?¨è¨å®?æ?¥è??ç¶²çµ¡é?£ç·?å??å??ç?¨ã??"
+
+#: ../src/gnome-bluetooth/bt-widget.c:943
+#, c-format
+msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+msgstr "ç?¡æ³?é?²è¡?è??ç??ç??é??ç½®ï¼?ç?¡æ³?é?£è?³ D-Busï¼?%sï¼?ã??"
+
+#: ../src/gnome-bluetooth/bt-widget.c:953
+msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+msgstr "ç?¡æ³?é?²è¡?è??ç??ç??é??ç½®ï¼?ç?¡æ³?é?£è?³ D-Bus proxyï¼?ã??"
+
+#: ../src/gnome-bluetooth/bt-widget.c:962
+#, c-format
+msgid ""
+"Bluetooth configuration not possible (error finding NetworkManager: %s)."
+msgstr "ç?¡æ³?é?²è¡?è??ç??ç??é??ç½®ï¼?æ?¾ä¸?å?° NetworkManagerï¼?%sï¼?ã??"
+
+#: ../src/gnome-bluetooth/bt-widget.c:1013
+msgid "Use your mobile phone as a network device (PAN/NAP)"
+msgstr "ä½¿ç?¨æ??æ©?ä½?ç?ºç¶²çµ¡è£?ç½®ï¼?PAN/NAPï¼?"
+
+#: ../src/gnome-bluetooth/bt-widget.c:1022
+msgid "Access the Internet using your mobile phone (DUN)"
+msgstr "ä½¿ç?¨æ??æ©?å?å??äº?è?¯ç¶²ï¼?DUNï¼?"
+
+#: ../src/main.c:70
+msgid "Usage:"
+msgstr "ç?¨æ³?:"
+
+#: ../src/main.c:72
+msgid ""
+"This program is a component of NetworkManager (http://projects.gnome.org/";
+"NetworkManager)."
+msgstr "æ?¬ç¨?å¼?æ?¯ NetworkManagerï¼?http://projects.gnome.org/NetworkManagerï¼?ç??å??ä»¶";
+
+#: ../src/main.c:73
+msgid ""
+"It is not intended for command-line interaction but instead runs in the "
+"GNOME desktop environment."
+msgstr "ç?¨ä¾?å?¨ GNOME æ¡?é?¢ç?°å¢?ä¸?é??è¡?ï¼?è??ä¸?æ?¯ä½¿ç?¨å?½ä»¤å??ã??"
+
+#: ../src/mb-menu-item.c:58
+msgid "EVDO"
+msgstr "EVDO"
+
+#: ../src/mb-menu-item.c:62
+msgid "GPRS"
+msgstr "GPRS"
+
+#: ../src/mb-menu-item.c:64
+msgid "EDGE"
+msgstr "EDGE"
+
+#: ../src/mb-menu-item.c:66
+msgid "UMTS"
+msgstr "UMTS"
 
-#: ../src/vpn-password-dialog.c:137 ../src/vpn-password-dialog.c:253
+#: ../src/mb-menu-item.c:68
+msgid "HSDPA"
+msgstr "HSDPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "HSUPA"
+msgstr "HSUPA"
+
+#: ../src/mb-menu-item.c:72
+msgid "HSPA"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:74
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#: ../src/mb-menu-item.c:109
+msgid "not enabled"
+msgstr "æ?ªå??ç?¨"
+
+#: ../src/mb-menu-item.c:115
+msgid "not registered"
+msgstr "æ?ªè¨»å??"
+
+#: ../src/mb-menu-item.c:133
+#, c-format
+msgid "Home network (%s)"
+msgstr "å®¶ç?¨ç¶²çµ¡ï¼?%sï¼?"
+
+#: ../src/mb-menu-item.c:135
+#, c-format
+msgid "Home network"
+msgstr "å®¶ç?¨ç¶²çµ¡"
+
+#: ../src/mb-menu-item.c:143
+msgid "searching"
+msgstr "æ??å°?ä¸"
+
+#: ../src/mb-menu-item.c:146
+msgid "registration denied"
+msgstr "è¨»å??è¢«æ??"
+
+#: ../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:153 ../src/mb-menu-item.c:159
+#, c-format
+msgid "%s (roaming)"
+msgstr "%sï¼?æ¼«é??ï¼?"
+
+#: ../src/mb-menu-item.c:162
+#, c-format
+msgid "Roaming network (%s)"
+msgstr "æ¼«é??ç¶²çµ¡ï¼?%sï¼?"
+
+#: ../src/mb-menu-item.c:164
+#, c-format
+msgid "Roaming network"
+msgstr "æ¼«é??ç¶²çµ¡"
+
+#: ../src/utils/mobile-wizard.c:195
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "è¡?å??å¯¬é?£ç·?å·²ç¶?é??ç½®äº?ä»¥ä¸?è¨å®?ï¼?"
+
+#. Device
+#: ../src/utils/mobile-wizard.c:202
+msgid "Your Device:"
+msgstr "ä½ ç??è£?ç½®:"
+
+#. Provider
+#: ../src/utils/mobile-wizard.c:213
+msgid "Your Provider:"
+msgstr "ä½ ç??ä¾?æ??å??:"
+
+#. Plan and APN
+#: ../src/utils/mobile-wizard.c:224
+msgid "Your Plan:"
+msgstr "ä½ ç??æ?¹æ¡?:"
+
+#: ../src/utils/mobile-wizard.c:245
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected.  If the connection fails or you cannot access network "
+"resources, double-check your settings.  To modify your mobile broadband "
+"connection settings, choose \"Network Connections\" from the System >> "
+"Preferences menu."
+msgstr "ç?¾å?¨ï¼?æ ¹æ??ä½ æ??é?¸å??ç??è¨å®?ï¼?é?»è?¦å°?é?£ä¸?ä½ ç??è¡?å??å¯¬é »ä¾?æ??å??ã??å¦?æ??é?£ç·?å¤±æ??ï¼?æ??æ?¯ä½ ç?¡æ³?å?å??ç¶²çµ¡è³?æº?ï¼?è«?æª¢æ?¥è¨å®?ã??è¦?ä¿®æ?¹è¡?å??å¯¬é »é?£ç·?ç??è¨å®?ï¼?è«?å¾?ã??ç³»çµ±ã?? >> ã??å??å¥½è¨å®?ã??ä¸ï¼?é?¸æ??ã??ç¶²çµ¡é?£ç·?ã??ã??"
+
+#: ../src/utils/mobile-wizard.c:257
+msgid "Confirm Mobile Broadband Settings"
+msgstr "ç¢ºèª?è¡?å??å¯¬é »è¨å®?"
+
+#: ../src/utils/mobile-wizard.c:318
+msgid "Unlisted"
+msgstr "æ?ªå??å?ºç??"
+
+#: ../src/utils/mobile-wizard.c:436
+msgid "_Select your plan:"
+msgstr "é?¸æ??ä½ ç??æ?¹æ¡?(_S)ï¼?"
+
+#: ../src/utils/mobile-wizard.c:460
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "é?¸æ??æ?¹æ¡?ç?? _APNï¼?Access Point Nameï¼?å?å??é»?å??ç¨±ï¼?ï¼?"
+
+#: ../src/utils/mobile-wizard.c:479
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan's APN."
+msgstr ""
+"è¦å??ï¼?é?¸æ??ä¸?æ£ç¢ºç??æ?¹æ¡?å?¯è?½æ??å¼?èµ·å¯¬é »å¸³è??ç??æ?¶è²»ç?è°ï¼?æ??è®?ä½ ç?¡æ³?é?£ç·?ã??\n"
+"\n"
+"å¦?æ??ä½ ä¸?ç¢ºå®?æ??ä½¿ç?¨ç??æ?¹æ¡?ï¼?è«?æ´½è©¢ä¾?æ??å??ï¼?ä»¥å¾?ç?¥æ?¹æ¡?ç?? APN ç?ºä½?ã??"
+
+#: ../src/utils/mobile-wizard.c:486
+msgid "Choose your Billing Plan"
+msgstr "é?¸æ??ä½ ç??è¨?è²»æ?¹æ¡?"
+
+#: ../src/utils/mobile-wizard.c:534
+msgid "My plan is not listed..."
+msgstr "æ??ç??æ?¹æ¡?æ²?æ??å??å?ºâ?¦"
+
+#: ../src/utils/mobile-wizard.c:687
+msgid "Select your provider from a _list:"
+msgstr "è«?å¾?æ¸?å?®è£?é?¸æ??ä¾?æ??å??(_l):"
+
+#: ../src/utils/mobile-wizard.c:700
+msgid "Provider"
+msgstr "ä¾?æ??å??"
+
+#: ../src/utils/mobile-wizard.c:725
+msgid "I can't find my provider and I wish to enter it _manually:"
+msgstr "æ??æ?¾ä¸?å?°æ??ç??ä¾?æ??å??ï¼?æ??æ?³è¦?æ??å??è¼¸å?¥(_m):"
+
+#: ../src/utils/mobile-wizard.c:736
+msgid "Provider:"
+msgstr "ä¾?æ??å??ï¼?"
+
+#: ../src/utils/mobile-wizard.c:760
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "æ??ç??ä¾?æ??å??ä½¿ç?¨ GSM æ??è¡?ï¼?GPRSã??EDGEã??UMTSã??HSPAï¼?"
+
+#: ../src/utils/mobile-wizard.c:766
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "æ??ç??ä¾?æ??å??ä½¿ç?¨ CDMA æ??è¡?ï¼?1xRTTã??EVDOï¼?"
+
+#: ../src/utils/mobile-wizard.c:777
+msgid "Choose your Provider"
+msgstr "é?¸æ??ä½ ç??ä¾?æ??å??"
+
+#: ../src/utils/mobile-wizard.c:1023
+msgid "Country or Region List:"
+msgstr "å??å®¶æ??å?°å??æ¸?å?®ï¼?"
+
+#: ../src/utils/mobile-wizard.c:1035
+msgid "Country or region"
+msgstr "å??å®¶æ??å?°å??"
+
+#: ../src/utils/mobile-wizard.c:1042
+msgid "My country is not listed"
+msgstr "æ??ç??å??å®¶ä¸¦æ²?æ??å??å?ºä¾?"
+
+#: ../src/utils/mobile-wizard.c:1088
+msgid "Choose your Provider's Country or Region"
+msgstr "é?¸æ??ä½ ç??ä¾?æ??å??ç??å??å®¶æ??å?°å??"
+
+#: ../src/utils/mobile-wizard.c:1137
+msgid "Installed GSM device"
+msgstr "å·²å®?è£?ç?? GSM è£?ç½®"
+
+#: ../src/utils/mobile-wizard.c:1140
+msgid "Installed CDMA device"
+msgstr "å·²å®?è£?ç?? CDMA è£?ç½®"
+
+#: ../src/utils/mobile-wizard.c:1308
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr "é??è?½å¹«å?©ä½ è¼?æ??å?°è¨å®?è¡?å??å¯¬é »é?£ç·?ï¼?é?£è?³æ??æ©?ï¼?3Gï¼?ç¶²çµ¡ã??"
+
+#: ../src/utils/mobile-wizard.c:1313
+msgid "You will need the following information:"
+msgstr "ä½ é??è¦?ä»¥ä¸?è³?è¨?ï¼?"
+
+#: ../src/utils/mobile-wizard.c:1324
+msgid "Your broadband provider's name"
+msgstr "å¯¬é »ä¾?æ??å??ç??å??ç¨±"
+
+#: ../src/utils/mobile-wizard.c:1330
+msgid "Your broadband billing plan name"
+msgstr "å¯¬é »è¨?è²»æ?¹æ¡?ç??å??ç¨±"
+
+#: ../src/utils/mobile-wizard.c:1336
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "ï¼?å?¨æ??äº?æ??æ³?ä¸?ï¼?ä½ ç??å¯¬é »è¨?è²»æ?¹æ¡?ç?? APNï¼?å?å??é»?å??ç¨±ï¼?"
+
+#: ../src/utils/mobile-wizard.c:1363
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "ç?ºé??å??è¡?å??å¯¬é »è£?ç½®å»ºç«?é?£ç·?(_t)"
+
+#: ../src/utils/mobile-wizard.c:1378
+msgid "Any device"
+msgstr "ä»»ä½?è£?ç½®"
+
+#: ../src/utils/mobile-wizard.c:1391
+msgid "Set up a Mobile Broadband Connection"
+msgstr "è¨å®?è¡?å??å¯¬é »é?£ç·?"
+
+#: ../src/utils/mobile-wizard.c:1565
+msgid "New Mobile Broadband Connection"
+msgstr "æ?°ç??è¡?å??å¯¬é »é?£ç·?"
+
+#: ../src/utils/nmn-mobile-providers.c:76
+msgid "United Kingdom"
+msgstr "è?±å??"
+
+#: ../src/utils/nmn-mobile-providers.c:508
+msgid "Default"
+msgstr "é ?è¨"
+
+#: ../src/vpn-password-dialog.c:136 ../src/vpn-password-dialog.c:254
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "ç?¡æ³?å?·è¡? VPN é?£ç·?â??%sâ??"
 
-#: ../src/vpn-password-dialog.c:140
+#: ../src/vpn-password-dialog.c:139
 #, 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:256
+#: ../src/vpn-password-dialog.c:257
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -1780,385 +2406,357 @@ msgstr "å?·è¡? VPN é?£ç·?é¡?å??ã??%sã??ç??é©?è?å°?è©±ç??ç?¼ç??å??é¡?ã??è«?è?¯
 msgid "Wired 802.1X authentication"
 msgstr "æ??ç·?ç¶²çµ¡ 802.1X é©?è?"
 
-#: ../src/wireless-dialog.c:414
+#: ../src/wireless-dialog.c:478
 msgid "New..."
-msgstr "æ?°å¢?..."
+msgstr "æ?°å¢?â?¦"
 
-#: ../src/wireless-dialog.c:916
+#: ../src/wireless-dialog.c:1100
 msgid "C_reate"
 msgstr "å»ºç«?(_R)"
 
-#: ../src/wireless-dialog.c:987
+#: ../src/wireless-dialog.c:1182
 #, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
+"Passwords or encryption keys are required to access the wireless network "
+"'%s'."
 msgstr "é??è¦?å¯?ç¢¼æ??æ?¯å? å¯?å¯?ç¢¼å??ä¾?å?å??ç?¡ç·?ç¶²çµ¡ã??%sã??ã??"
 
-#: ../src/wireless-dialog.c:989
+#: ../src/wireless-dialog.c:1184
 msgid "Wireless Network Authentication Required"
 msgstr "ç?¡ç·?ç¶²çµ¡é©?è?è¦?æ±?"
 
-#: ../src/wireless-dialog.c:991
+#: ../src/wireless-dialog.c:1186
 msgid "Authentication required by wireless network"
 msgstr "ç?¡ç·?ç¶²çµ¡æ??é??è¦?ç??é©?è?"
 
-#: ../src/wireless-dialog.c:996
+#: ../src/wireless-dialog.c:1191
 msgid "Create New Wireless Network"
 msgstr "å»ºç«?æ?°ç??ç?¡ç·?ç¶²çµ¡"
 
-#: ../src/wireless-dialog.c:998
+#: ../src/wireless-dialog.c:1193
 msgid "New wireless network"
 msgstr "æ?°ç??ç?¡ç·?ç¶²çµ¡"
 
-#: ../src/wireless-dialog.c:999
+#: ../src/wireless-dialog.c:1194
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "è¼¸å?¥ä½ è¦?å»ºç«?ç??ç?¡ç·?ç¶²çµ¡ç??å??ç¨±ã??"
 
-#: ../src/wireless-dialog.c:1001
+#: ../src/wireless-dialog.c:1196
 msgid "Connect to Hidden Wireless Network"
 msgstr "é?£æ?¥å?°é?±è??ç??ç?¡ç·?ç¶²çµ¡"
 
-#: ../src/wireless-dialog.c:1003
+#: ../src/wireless-dialog.c:1198
 msgid "Hidden wireless network"
 msgstr "é?±è??ç??ç?¡ç·?ç¶²çµ¡"
 
-#: ../src/wireless-dialog.c:1004
+#: ../src/wireless-dialog.c:1199
 msgid ""
 "Enter the name and security details of the hidden wireless network you wish "
 "to connect to."
 msgstr "è¼¸å?¥ä½ è¦?é?£æ?¥ç??é?±è??ç?¡ç·?ç¶²çµ¡ç??å??ç¨±è??å®?å?¨æ?§è©³ç´°è³?æ??ã??"
 
-#: ../src/wireless-security/eap-method.c:169
+#: ../src/wireless-security/eap-method.c:228
 msgid "No Certificate Authority certificate chosen"
 msgstr "æ?ªé?¸æ??ä»»ä½?è?æ?¸æ??æ¬?å?®ä½?(CA)è?æ?¸"
 
-#: ../src/wireless-security/eap-method.c:170
+#: ../src/wireless-security/eap-method.c:229
 msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections "
 "to insecure, rogue wireless networks.  Would you like to choose a "
 "Certificate Authority certificate?"
 msgstr "ä¸?ä½¿ç?¨è?æ?¸ä¸å¿? (CA) ç??è?æ?¸æ??é? æ??é?£ç·?ä¸?å®?å?¨ã??æµ?æ°?ç?¡ç·?ç¶²çµ¡(å?¯è?½è¢«ç«?å??ã??å?«è?½ä¹?æ??)ã??æ?¯å?¦è¦?é?¸æ??ä¸?å??è?æ?¸ä¸å¿?ç??è?æ?¸ï¼?"
 
-#: ../src/wireless-security/eap-method.c:175
-msgid "Ignore"
-msgstr "å¿½ç?¥"
-
-#: ../src/wireless-security/eap-method.c:179
+#: ../src/wireless-security/eap-method.c:238
 msgid "Choose CA Certificate"
 msgstr "é?¸æ?? CA è?æ?¸"
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:583
 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:443
+#: ../src/wireless-security/eap-method.c:586
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER æ?? PEM è?æ?¸ (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:240
+#: ../src/wireless-security/eap-method-peap.c:267
+#: ../src/wireless-security/wireless-security.c:366
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:311
-#: ../src/wireless-security/eap-method-tls.c:417
-#: ../src/wireless-security/eap-method-ttls.c:343
-msgid "Choose a Certificate Authority certificate..."
-msgstr "é?¸æ??è?æ?¸æ??æ¬?å?®ä½?(CA)è?æ?¸..."
-
-#: ../src/wireless-security/eap-method-tls.c:413
-msgid "Choose your personal certificate..."
-msgstr "é?¸æ??ä½ ç??å??äººè?æ?¸..."
-
-#: ../src/wireless-security/eap-method-tls.c:422
-msgid "Choose your private key..."
-msgstr "é?¸æ??ä½ ç??ç§?å¯?å¯?ç¢¼å??..."
+#: ../src/wireless-security/eap-method-peap.c:283
+msgid "GTC"
+msgstr "GTC"
 
-#: ../src/wireless-security/wireless-security.c:305
-msgid "TLS"
-msgstr "TLS"
-
-#: ../src/wireless-security/wireless-security.c:329
-msgid "Tunneled TLS"
-msgstr "ç©¿é?§å¼? TLS"
+#: ../src/wireless-security/eap-method-peap.c:354
+#: ../src/wireless-security/eap-method-tls.c:437
+#: ../src/wireless-security/eap-method-ttls.c:354
+msgid "Choose a Certificate Authority certificate..."
+msgstr "é?¸æ??è?æ?¸æ??æ¬?å?®ä½?(CA)è?æ?¸â?¦"
 
-#: ../src/wireless-security/wireless-security.c:340
-msgid "Protected EAP (PEAP)"
-msgstr "ä¿?è·å¼? EAP (PEAP)"
+#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
+msgid "Anony_mous identity:"
+msgstr "å?¿å??è?å?¥(_m)ï¼?"
 
-#~ msgid "Auto CDMA network connection"
-#~ msgstr "è?ªå?? CDMA ç¶²è·¯é?£ç·?"
+#: ../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)ï¼?"
 
-#~ msgid "Disconnect..."
-#~ msgstr "æ?·ç·?..."
+#: ../src/wireless-security/eap-method-peap.ui.h:5
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "I_nner authentication:"
+msgstr "å?§é?¨é©?è?(_n):"
 
-#~ msgid "CDMA Connections (%s)"
-#~ msgstr "CDMA é?£ç·? (%s)"
+#: ../src/wireless-security/eap-method-peap.ui.h:6
+msgid "Version 0"
+msgstr "ç??æ?¬ 0"
 
-#~ msgid "CDMA Network (%s)"
-#~ msgstr "CDMA ç¶²è·¯ (%s)"
+#: ../src/wireless-security/eap-method-peap.ui.h:7
+msgid "Version 1"
+msgstr "ç??æ?¬ 1"
 
-#~ msgid "CDMA Connections"
-#~ msgstr "CDMA é?£ç·?"
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+msgid "_PEAP version:"
+msgstr "_PEAP ç??æ?¬ï¼?"
 
-#~ msgid "CDMA Network"
-#~ msgstr "CDMA ç¶²è·¯"
+#: ../src/wireless-security/eap-method-simple.ui.h:1
+msgid "As_k for this password every time"
+msgstr "æ¯?æ¬¡é?½è©¢å??å¯?ç¢¼(_k)"
 
-#~ msgid "Running PPP on device %s..."
-#~ msgstr "æ£å?¨å?·è¡? PPP æ?¼è£?ç½® %s..."
+#: ../src/wireless-security/eap-method-tls.c:261
+msgid "Unencrypted private keys are insecure"
+msgstr "æ?ªå? å¯?ç??ç§?å¯?å¯?ç¢¼å??æ?¯ä¸?å®?å?¨ç??"
 
-#~ msgid "Auto GSM network connection"
-#~ msgstr "è?ªå?? GSM ç¶²è·¯é?£ç·?"
+#: ../src/wireless-security/eap-method-tls.c:264
+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 "
+"a password-protected private key.\n"
+"\n"
+"(You can password-protect your private key with openssl)"
+msgstr ""
+"æ??é?¸æ??ç??ç§?å¯?å¯?ç¢¼å??ä¼¼ä¹?æ²?æ??å¯?ç¢¼ä¿?è·ã?? é??å?¯è?½æ??å°?è?´ä¸?å®?å?¨ç??å¾?æ??ã??è«?é?¸æ??ç?¨å¯?ç¢¼ä¿?è·ç??ç§?å¯?å¯?ç¢¼å??ã??\n"
+"\n"
+"ï¼?ä½ å?¯ä»¥ä½¿ç?¨ openssl ä¾?å? å¯?ä½ ç??ç§?å¯?å¯?ç¢¼å??ï¼?"
 
-#~ msgid "GSM Connections (%s)"
-#~ msgstr "GSM é?£ç·? (%s)"
+#: ../src/wireless-security/eap-method-tls.c:431
+msgid "Choose your personal certificate..."
+msgstr "é?¸æ??ä½ ç??å??äººè?æ?¸â?¦"
 
-#~ msgid "GSM Network (%s)"
-#~ msgstr "GSM ç¶²è·¯ (%s)"
+#: ../src/wireless-security/eap-method-tls.c:443
+msgid "Choose your private key..."
+msgstr "é?¸æ??ä½ ç??ç§?å¯?å¯?ç¢¼å??â?¦"
 
-#~ msgid "GSM Connections"
-#~ msgstr "GSM é?£ç·?"
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "I_dentity:"
+msgstr "è?å?¥(_d)ï¼?"
 
-#~ msgid "Dialing GSM device %s..."
-#~ msgstr "æ£å?¨æ?¥è?? GSM è£?ç½® %s..."
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+msgid "Private _key:"
+msgstr "ç§?å¯?å¯?ç¢¼å??(_k)ï¼?"
 
-#~ msgid "Preparing device %s for the wired network..."
-#~ msgstr "è£?ç½® %s æ£æº?å??é?£æ?¥æ??ç·?ç¶²è·¯..."
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+msgid "_Private key password:"
+msgstr "ç§?å¯?å¯?ç¢¼å??å¯?ç¢¼(_P)ï¼?"
 
-#~ msgid "Configuring device %s for the wired network..."
-#~ msgstr "ç?ºæ??ç·?ç¶²è·¯è¨ç½®è£?ç½® %s ..."
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+msgid "_User certificate:"
+msgstr "ä½¿ç?¨è??è?æ?¸(_U)ï¼?"
 
-#~ msgid "Requesting a network address from the wired network..."
-#~ msgstr "æ£è¦?æ±?æ??ç·?ç¶²è·¯æ??ä¾?ç¶²è·¯ä½?å??..."
+#: ../src/wireless-security/nag-user-dialog.ui.h:1
+msgid "Don't _warn me again"
+msgstr "ä¸?è¦?å??è¦å??æ??(_w)"
 
-#~ msgid "Attempting to join the wireless network '%s'..."
-#~ msgstr "æ£å?¨å??è©¦å? å?¥ç?¡ç·?ç¶²è·¯â??%sâ??..."
+#: ../src/wireless-security/nag-user-dialog.ui.h:2
+msgid "No"
+msgstr "å?¦"
 
-#~ msgid "Waiting for Network Key for the wireless network '%s'..."
-#~ msgstr "æ£å?¨ç?å¾?ç?¡ç·?ç¶²è·¯â??%sâ??ç??ç¶²è·¯é??é?°..."
+#: ../src/wireless-security/nag-user-dialog.ui.h:3
+msgid "Yes"
+msgstr "æ?¯"
 
-#~ msgid "Could not find some required resources (the glade file)!"
-#~ msgstr "ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼?glade æª?ï¼?ï¼?"
+#: ../src/wireless-security/wireless-security.c:378
+msgid "TLS"
+msgstr "TLS"
 
-#~ msgid "_Manual configuration"
-#~ msgstr "æ??å??è¨å®?(_M)"
+#: ../src/wireless-security/wireless-security.c:402
+msgid "Tunneled TLS"
+msgstr "ç©¿é?§å¼? TLS"
 
-#~ msgid "WEP 40/128-bit Hexadecimal"
-#~ msgstr "WEP 40/128-bit å??å?ä½?å??"
+#: ../src/wireless-security/wireless-security.c:413
+msgid "Protected EAP (PEAP)"
+msgstr "ä¿?è·å¼? EAP (PEAP)"
 
-#~ msgid "Connection Editor"
-#~ msgstr "é?£ç·?ç·¨è¼¯å?¨"
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:2
+#: ../src/wireless-security/ws-wep-key.ui.h:9
+#: ../src/wireless-security/ws-wpa-eap.ui.h:2
+msgid "_Authentication:"
+msgstr "é©?è?(_A)ï¼?"
 
-#~ msgid "Doesn't look like a PEM private key file."
-#~ msgstr "ç??èµ·ä¾?ä¸?å??æ?¯ PEM ç§?å¯?é??é?°æª?æ¡?ã??"
+#: ../src/wireless-security/ws-wep-key.ui.h:1
+msgid "1 (Default)"
+msgstr "1 (é ?è¨å?¼)"
 
-#~ msgid "Not enough memory to store PEM file data."
-#~ msgstr "æ²?æ??è¶³å¤ ç??è¨?æ?¶é«?å?²å? PEM æª?è³?æ??ã??"
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
 
-#~ msgid "Failed to decode certificate."
-#~ msgstr "æ??è?è§£ç¢¼å¤±æ??ã??"
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
 
-#~ msgid "Not enough memory to store decrypted private key."
-#~ msgstr "æ²?æ??è¶³å¤ ç??è¨?æ?¶é«?ä¾?å?²å?è§£ç¢¼å¾?ç??ç§?å¯?é??é?°ã??"
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
 
-#~ msgid "Failed to initialize the MD5 engine: %s / %s."
-#~ msgstr "å??å§?å?? MD5 å¼?æ??å¤±æ??ï¼?%s / %sã??"
+#: ../src/wireless-security/ws-wep-key.ui.h:5
+msgid "Open System"
+msgstr "é??æ?¾ç³»çµ±"
 
-#~ msgid "Couldn't decode certificate: %s"
-#~ msgstr "ç?¡æ³?è§£ç¢¼æ??è?ï¼?%s"
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr "å?±äº«å¯?ç¢¼å??"
 
-#~ msgid "Couldn't decode certificate: %d"
-#~ msgstr "ç?¡æ³?è§£é??æ??è?ï¼?%d"
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "Sho_w key"
+msgstr "é¡¯ç¤ºå¯?ç¢¼å??(_w)"
 
-#~ msgid "Delete VPN connection \"%s\"?"
-#~ msgstr "å?ªé?¤ VPN é?£ç·?â??%sâ??ï¼?"
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+msgid "WEP inde_x:"
+msgstr "WEP ç´¢å¼?(_x):"
 
-#~ msgid "Unable to load"
-#~ msgstr "ç?¡æ³?è¼?å?¥"
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+msgid "_Key:"
+msgstr "å¯?ç¢¼å??(_K)ï¼?"
 
-#~ msgid "Cannot find some needed resources (the glade file)!"
-#~ msgstr "ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼? glade æª?ï¼?ï¼?"
+#~ msgid "translator-credits"
+#~ msgstr ""
+#~ "å¦?å°?ç¿»è¯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å?é?µä»¶çµ¦\n"
+#~ "ä»¥ä¸?å?°å??ï¼?GNOME ç¿»è¯å??é??æ??å??å¿«å??è¦?æ?¨ï¼?\n"
+#~ "community linuxhall org\n"
+#~ "\n"
+#~ "Hialan Liu <hialan liu gmail com>, 2008.\n"
+#~ "Woodman Tuen <wmtuen gmail com>, 2005."
 
 #~ msgid ""
-#~ "This assistant will guide you through the creation of a connection to a "
-#~ "Virtual Private Network (VPN)."
-#~ msgstr "æ¤å?©ç??å°?æ??å°?æ?¨å»ºç«?é?£ç·?è?³è??æ?¬ç§?äººç¶²è·¯(VPN)ã??"
+#~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
+#~ msgstr "<span size=\"larger\" weight=\"bold\">ä½¿ç?¨ä¸ç??ç¶²è·¯é?£ç·?</span>"
 
 #~ msgid ""
-#~ "It will require some information, such as IP addresses and secrets.  "
-#~ "Please see your system administrator to obtain this information."
+#~ "Automatic\n"
+#~ "Version 0\n"
+#~ "Version 1"
 #~ msgstr ""
-#~ "ä»?å°?é??è¦?ä¸?äº?è³?è¨?ï¼?å??æ?¯ IP ä½?å??å??æ©?å¯?è³?æ??ã??è«?è©¢å??æ?¨ç??ç³»çµ±ç®¡ç??å?¡ä»¥å??å¾?é??äº?è³?"
-#~ "è¨?ã??"
-
-#~ msgid "Create VPN Connection"
-#~ msgstr "å»ºç«? VPN é?£ç·?"
-
-#~ msgid "1 of 2"
-#~ msgstr "2 ä¹? 1"
-
-#~ msgid "Choose which type of _VPN connection you wish to create:"
-#~ msgstr "é?¸æ??æ?¨æ?³è¦?å»ºç«?ç?? VPN é?£ç·?é¡?å??(_V)ï¼?"
-
-#~ msgid "Choose which type of VPN connection you wish to create:"
-#~ msgstr "é?¸æ??æ?¨æ?³è¦?å»ºç«?ç?? VPN é?£ç·?é¡?å??ï¼?"
-
-#~ msgid "2 of 2"
-#~ msgstr "2 ä¹? 2"
-
-#~ msgid "Finished Create VPN Connection"
-#~ msgstr "å»ºç«? VPN é?£ç·?å®?æ??"
+#~ "è?ªå??\n"
+#~ "ç¬¬ 0 ç??\n"
+#~ "ç¬¬ 1 ç??"
 
-#~ msgid "Edit VPN Connection"
-#~ msgstr "ç·¨è¼¯ VPN é?£ç·?"
-
-#~ msgid "- NetworkManager VPN properties"
-#~ msgstr "- ç¶²è·¯ç®¡ç??å?¡ VPN å±¬æ?§"
-
-#~ msgid "Add a new VPN connection"
-#~ msgstr "å? å?¥æ?°ç?? VPN é?£ç·?"
-
-#~ msgid "Export the VPN settings to a file"
-#~ msgstr "å?¯å?º VPN è¨å®?è?³æª?æ¡?"
-
-#~ msgid "Export the selected VPN connection to a file"
-#~ msgstr "å?¯å?ºæ??é?¸ç?? VPN é?£ç·?è?³æª?æ¡?"
-
-#~ msgid "Existing wireless network"
-#~ msgstr "ç?¾å?ç??ç?¡ç·?ç¶²è·¯"
-
-#~ msgid "Passphrase:"
-#~ msgstr "é??è¡?ç¢¼ï¼?"
-
-#, fuzzy
-#~ msgid "Show passphrase"
-#~ msgstr "é??è¡?ç¢¼ï¼?"
-
-#~ msgid "Connection to the wireless network '%s' failed.\n"
-#~ msgstr "é?£æ?¥ç?¡ç·?ç¶²è·¯â??%sâ??å¤±æ??ã??\n"
-
-#~ msgid "Connection to the wired network failed.\n"
-#~ msgstr "é?£æ?¥æ??ç·?ç¶²è·¯å¤±æ??ã??\n"
-
-#~ msgid "Failed to get information about the interface!"
-#~ msgstr "ç?¡æ³?å??å¾?ç¶²è·¯ä»?é?¢ç??è¨?è³?ï¼?"
-
-#~ msgid "Wireless Ethernet (%s)"
-#~ msgstr "æ??ç·?ä¹?å¤ªç¶²è·¯ (%s)"
-
-#~ msgid "VPN Error"
-#~ msgstr "VPN é?¯èª¤"
+#~ msgid "<b>Addresses</b>"
+#~ msgstr "<b>ä½?å??</b>"
 
 #~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">VPN Login Message</span>\n"
-#~ "\n"
-#~ "VPN connection '%s' said:\n"
-#~ "\n"
-#~ "\"%s\""
+#~ "Automatic\n"
+#~ "Automatic with manual DNS settings\n"
+#~ "Manual\n"
+#~ "Link-Local\n"
+#~ "Shared to other computers"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">VPN ç?»å?¥è¨?æ?¯</span>\n"
-#~ "\n"
-#~ "VPN é?£ç·?â??%sâ??èªªï¼?\n"
-#~ "\n"
-#~ "\"%s\""
-
-#~ msgid "The network device \"%s (%s)\" does not support wireless scanning."
-#~ msgstr "ç¶²è·¯è£?ç½®â??%s (%s)â??ä¸?æ?¯æ?´ç?¡ç·?ç¶²è·¯æ??æ??ã??"
+#~ "è?ªå??\n"
+#~ "è?ªå??ä½?æ??å??è¨å®? DNS è¨å®?å?¼\n"
+#~ "æ?¬å?°ç«¯é?£ç·?\n"
+#~ "å??äº«çµ¦å?¶ä»?é?»è?¦"
 
-#~ msgid "The network device \"%s (%s)\" does not support link detection."
-#~ msgstr "ç¶²è·¯è£?ç½®â??%s (%s)â??ä¸?æ?¯æ?´é?£æ?¥å?µæ¸¬"
+#~ msgid "<b>Basic</b>"
+#~ msgstr "<b>å?ºæ?¬</b>"
 
-#~ msgid "NetworkManager is not running"
-#~ msgstr "NetworkManager æ²?æ??å?·è¡?"
-
-#~ msgid "Connected to an Ad-Hoc wireless network"
-#~ msgstr "é?£æ?¥å?° Ad-Hoc é»?å°?é»?å¼?ç?¡ç·?ç¶²è·¯"
-
-#~ msgid "_Stop All Wireless Devices"
-#~ msgstr "å??æ¢æ??æ??ç?¡ç·?ç¶²è·¯è£?ç½®(_S)"
-
-#~ msgid "_Start All Wireless Devices"
-#~ msgstr "é??å§?å?·è¡?æ??æ??ç?¡ç·?ç¶²è·¯è£?ç½®(_S)"
-
-#, fuzzy
-#~ msgid "_Wireless Network Discovery"
-#~ msgstr "ç?¡ç·?ç¶²è·¯ (%s)"
-
-#~ msgid "Always Search"
-#~ msgstr "ç¸½æ?¯æ??å°?"
-
-#~ msgid "Search Only When Disconnected"
-#~ msgstr "å?¨æ?·ç·?æ??æ??æ??å°?"
-
-#~ msgid "Never Search"
-#~ msgstr "æ°¸ä¸?æ??å°?"
-
-#~ msgid "Stop All Wireless Devices"
-#~ msgstr "å??æ¢æ??æ??ç?¡ç·?ç¶²è·¯è£?ç½®"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "é?¢æ?¿ç??æ?¹å??"
-
-#~ msgid " (invalid Unicode)"
-#~ msgstr "ï¼?ç?¡æ??ç??çµ±ä¸?ç¢¼ï¼?"
+#~ 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)"
 
-#, fuzzy
-#~ msgid "ASCII Key:"
-#~ msgstr "Acii æ ¼å¼?é??é?°ï¼?"
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>é©?è?</b>"
 
-#~ msgid "Passphrase for wireless network %s"
-#~ msgstr "ç?¡ç·?ç¶²è·¯ %s ç??é??è¡?ç¢¼"
+#~ msgid "<b>Echo</b>"
+#~ msgstr "<b>å??é?³</b>"
 
 #~ msgid ""
-#~ "128-bit Passphrase (WEP)\n"
-#~ "Ascii Key (WEP)\n"
-#~ "Hex Key (WEP)"
+#~ "Automatic\n"
+#~ "10 Mb/s\n"
+#~ "100 Mb/s\n"
+#~ "1 Gb/s\n"
+#~ "10 Gb/s"
 #~ msgstr ""
-#~ "128ä½?å??é??è¡?ç¢¼ (WEP)\n"
-#~ "Acii æ ¼å¼?é??é?° (WEP)\n"
-#~ "Hex æ ¼å¼?é??é?° (WEP)"
+#~ "è?ªå??\n"
+#~ "10 Mb/s\n"
+#~ "100 Mb/s\n"
+#~ "1 Gb/s\n"
+#~ "10 Gb/s"
 
 #~ msgid ""
-#~ "128-bit passphrase (WEP)\n"
-#~ "Ascii key (WEP)\n"
-#~ "Hex key (WEP)"
+#~ "Automatic\n"
+#~ "Twisted Pair (TP)\n"
+#~ "Attachment Unit Interface (AUI)\n"
+#~ "BNC\n"
+#~ "Media Independent Interface (MII)"
 #~ msgstr ""
-#~ "128ä½?å??é??è¡?ç¢¼ (WEP)\n"
-#~ "Acii æ ¼å¼?é??é?° (WEP)\n"
-#~ "Hex æ ¼å¼?é??é?° (WEP)"
-
-#~ msgid "Always Trust this Wireless Network"
-#~ msgstr "ç¸½æ?¯ä¿¡ä»»é??ç?¡ç·?ç¶²è·¯"
+#~ "è?ªå??\n"
+#~ "é??çµ?ç·? (TP)\n"
+#~ "æ?¥è§¸å?®å??ä»?é?¢ (AUI)\n"
+#~ "BNC\n"
+#~ "åª?ä»?ç?¡é??ä»?é?¢ (MII)"
 
-#~ msgid "Destination Address:"
-#~ msgstr "ç?®ç??å?°ä½?å??ï¼?"
+#~ msgid ""
+#~ "Automatic\n"
+#~ "A (5 GHz)\n"
+#~ "B/G (2.4 GHz)"
+#~ msgstr ""
+#~ "è?ªå??\n"
+#~ "A (5 GHz)\n"
+#~ "B/G (2.4 GHz)"
 
-#~ msgid "Key type:"
-#~ msgstr "é??é?°é¡?å??ï¼?"
+#~ msgid ""
+#~ "The connection editor could not find some required resources (the "
+#~ "NetworkManager applet glade file was not found)."
+#~ msgstr ""
+#~ "é?£ç·?ç·¨è¼¯å?¨ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼?æ?¾ä¸?å?° NetworkManager é?¢æ?¿ç¨?å¼? glade "
+#~ "æª?ï¼?"
 
-#~ msgid "Wireless _network:"
-#~ msgstr "ç?¡ç·?ç¶²è·¯(_N)ï¼?"
+#~ msgid "Country"
+#~ msgstr "å??å®¶"
 
-#~ msgid "_Login to Network"
-#~ msgstr "ç?»å?¥ç¶²è·¯(_L)"
+#~ msgid "PUK code required"
+#~ msgstr "é??è¦? PUK ç¢¼"
 
-#~ msgid "_OK"
-#~ msgstr "ç¢ºå®?(_O)"
+#~ msgid "PUK code is needed for the mobile broadband device"
+#~ msgstr "é??å??è¡?å??å¯¬é »è£?ç½®é??è¦? PUK ç¢¼"
 
-#~ msgid "Create VPN Connection - 1 of 2"
-#~ msgstr "å»ºç«? VPN é?£ç·? - ç¬¬ä¸?æ¥"
+#~ msgctxt "No wired security used"
+#~ msgid "None"
+#~ msgstr "ç?¡"
 
-#~ msgid "Create VPN Connection - 2 of 2"
-#~ msgstr "å»ºç«? VPN é?£ç·? - ç¬¬äº?æ¥"
+#~ msgctxt "Unknown/unrecognized wired or wifi security"
+#~ msgid "Unknown"
+#~ msgstr "ä¸?æ??"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid "_Routes&#x2026;"
+#~ msgstr "è·¯ç?±&#x2026;(_R)"
 
-#~ msgid "Modify Wireless Networks"
-#~ msgstr "ä¿®æ?¹ç?¡ç·?ç¶²è·¯"
+#~ msgid "Apply"
+#~ msgstr "å¥?ç?¨"
 
-#~ msgid "*"
-#~ msgstr "*"
+#~ msgid "Save this connection for all users of this machine."
+#~ msgstr "å?²å?é??å??é?£ç·?çµ¦æ¤é?»è?¦ä¸?ç??æ??æ??ä½¿ç?¨è??ã??"
 
-#~ msgid "You must log in to access the private network %s"
-#~ msgstr "æ?¨é??è¦?ç?»å?¥ä¾?å?å??ç§?æ??ç¶²è·¯ %s"
+#~ msgid "Apply..."
+#~ msgstr "å¥?ç?¨â?¦"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 135d913..07fc0b3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,25 +1,25 @@
-# translation of zh_TW.po to Traditional Chinese
+# Translation of network-manager-applet to Traditional Chinese.
 # Traditional Chinese translation of Network Manager.
 # Copyright (C) 2005, 2010 Free Software Foundation, Inc.
-#
 # Woodman Tuen <wmtuen gmail com>, 2005.
 # Hialan Liu <hialan liu gmail com>, 2008.
-# Chester Cheng <ccheng æ?¼ redhat>, 2010.
-# Terry Chuang <tchuang at redhat>, 2010.
+# Chester Cheng <ccheng redhat com>, 2010.
 # Terry Chuang <tchuang redhat com>, 2010.
+# Wei-Lun Chao <chaoweilun gmail com>, 2010.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: zh_TW\n"
+"Project-Id-Version: network-manager-applet 0.8.991\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 18:03+0530\n"
-"PO-Revision-Date: 2010-05-19 13:53+1000\n"
-"Last-Translator: Terry Chuang <tchuang redhat com>\n"
-"Language-Team: Traditional Chinese <zh li org>\n"
+"POT-Creation-Date: 2011-01-25 19:29+0800\n"
+"PO-Revision-Date: 2011-01-25 16:57+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
+"Language-Team: Traditional Chinese <zh-l10n lists linux org tw>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: KBabel 1.11.4\n"
 
 #: ../nm-applet.desktop.in.h:1
 msgid "Control your network connections"
@@ -46,7 +46,8 @@ msgid "Set this to TRUE to disable notifications when connecting to a network."
 msgstr "å°?é??è¨ç?ºã??TUREã??ï¼?ä»¥å??ç?¨ç¶²è·¯é?£ç·?æ??ç??é??ç?¥ã??"
 
 #: ../nm-applet.schemas.in.h:5
-msgid "Set this to TRUE to disable notifications when disconnecting from a network."
+msgid ""
+"Set this to TRUE to disable notifications when disconnecting from a network."
 msgstr "å°?é??è¨ç?ºã??TUREã??ï¼?ä»¥å??ç?¨ç¶²è·¯é?¢ç·?æ??ç??é??ç?¥ã??"
 
 #: ../nm-applet.schemas.in.h:6
@@ -56,7 +57,8 @@ msgid ""
 msgstr "å°?é??è¨ç?ºã??TUREã??ï¼?ä»¥å??ç?¨æ??ç?¡ç·?ç¶²è·¯å?¯ç?¨æ??ç??é??ç?¥ã??"
 
 #: ../nm-applet.schemas.in.h:7
-msgid "Set to TRUE to disable creation of adhoc networks when using the applet."
+msgid ""
+"Set to TRUE to disable creation of adhoc networks when using the applet."
 msgstr "å°?é??è¨ç?ºã??TUREã??ï¼?ä»¥å??ç?¨ä½¿ç?¨é?¢æ?¿ç¨?å¼?å»ºç«? adhoc ç¶²è·¯ã??"
 
 #: ../nm-applet.schemas.in.h:8
@@ -76,7 +78,7 @@ 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 "ç¶²è·¯é?£ç·?"
 
@@ -92,19 +94,20 @@ msgstr "ç?¡æ³?å??å¾? %s æ??å??ã??(%d)\n"
 
 #: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:332
 #: ../src/applet-device-gsm.c:375 ../src/applet-device-wired.c:241
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:822 ../src/applet-device-wimax.c:276
 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-wimax.c:420
 #, 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:1214
+#: ../src/applet-device-wifi.c:1265 ../src/applet-device-wimax.c:424
 msgid "Connection Established"
 msgstr "å·²å»ºç«?é?£ç·?"
 
@@ -112,37 +115,38 @@ msgstr "å·²å»ºç«?é?£ç·?"
 msgid "You are now connected to the mobile broadband network."
 msgstr "æ?¨ç?¾å?¨å·²é?£ç·?è?³è¡?å??å¯¬é »ç¶²è·¯ã??"
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:413
-#: ../src/applet-device-gsm.c:456
+#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:414
+#: ../src/applet-device-gsm.c:457 ../src/applet-device-wimax.c:461
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
-msgstr "æ£å?¨æº?å??è¡?å??å¯¬é »é?£ç·?ã??%sã??..."
+msgstr "æ£å?¨æº?å??è¡?å??å¯¬é »é?£ç·?ã??%sã??â?¦"
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:416
-#: ../src/applet-device-gsm.c:459
+#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:417
+#: ../src/applet-device-gsm.c:460 ../src/applet-device-wimax.c:464
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
-msgstr "æ£å?¨è¨å®?è¡?å??å¯¬é »é?£ç·?ã??%sã??..."
+msgstr "æ£å?¨è¨å®?è¡?å??å¯¬é »é?£ç·?ã??%sã??â?¦"
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:419
-#: ../src/applet-device-gsm.c:462
+#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:420
+#: ../src/applet-device-gsm.c:463 ../src/applet-device-wimax.c:467
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "è¡?å??å¯¬é »é?£ç·?ã??%sã??é??è¦?ä½¿ç?¨è??é©?è?..."
+msgstr "è¡?å??å¯¬é »é?£ç·?ã??%sã??é??è¦?ä½¿ç?¨è??é©?è?â?¦"
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:422
-#: ../src/applet-device-gsm.c:465 ../src/applet.c:2266
+#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:423
+#: ../src/applet-device-gsm.c:466 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:2353
 #, c-format
 msgid "Requesting a network address for '%s'..."
-msgstr "æ£å?¨è¦?æ±?ã??%sã??æ??ä¾?ç¶²è·¯ä½?å??..."
+msgstr "æ£å?¨è¦?æ±?ã??%sã??æ??ä¾?ç¶²è·¯ä½?å??â?¦"
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:439
-#: ../src/applet-device-gsm.c:477
+#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:441
+#: ../src/applet-device-gsm.c:484
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "è¡?å??å¯¬é »é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸"
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:621
+#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:674
 #: ../src/mb-menu-item.c:55
 msgid "CDMA"
 msgstr "CDMA"
@@ -153,31 +157,33 @@ msgid "Mobile Broadband (%s)"
 msgstr "è¡?å??å¯¬é » (%s)"
 
 #: ../src/applet-device-cdma.c:283 ../src/applet-device-gsm.c:327
-#: ../src/connection-editor/page-mobile.c:318
-#: ../src/connection-editor/nm-connection-editor.glade.h:6
-#: ../src/connection-editor/nm-connection-list.c:1401
+#: ../src/connection-editor/page-mobile.c:365
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-list.c:1412
 msgid "Mobile Broadband"
 msgstr "è¡?å??å¯¬é »"
 
 #. Default connection item
 #: ../src/applet-device-cdma.c:345
 msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "æ?°ç??è¡?å??å¯¬é » (CDMA) é?£ç·?..."
+msgstr "æ?°ç??è¡?å??å¯¬é » (CDMA) é?£ç·?â?¦"
 
 #: ../src/applet-device-cdma.c:379
 msgid "You are now connected to the CDMA network."
 msgstr "æ?¨ç?¾å?¨å·²é?£ç·?è?³ CDMA ç¶²è·¯ã??"
 
-#: ../src/applet-device-cdma.c:434 ../src/applet-device-gsm.c:472
+#: ../src/applet-device-cdma.c:436 ../src/applet-device-gsm.c:479
+#: ../src/applet-device-wimax.c:479
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "è¡?å??å¯¬é »é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸ï¼?(%d%%%s%s)"
 
-#: ../src/applet-device-cdma.c:437 ../src/applet-device-gsm.c:475
+#: ../src/applet-device-cdma.c:439 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-wimax.c:482
 msgid "roaming"
 msgstr "æ¼«é??"
 
-#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:624
+#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:677
 #: ../src/mb-menu-item.c:60
 msgid "GSM"
 msgstr "GSM"
@@ -185,89 +191,95 @@ msgstr "GSM"
 #. Default connection item
 #: ../src/applet-device-gsm.c:388
 msgid "New Mobile Broadband (GSM) connection..."
-msgstr "æ?°ç??è¡?å??å¯¬é » (GSM) é?£ç·?..."
+msgstr "æ?°ç??è¡?å??å¯¬é » (GSM) é?£ç·?â?¦"
 
 #: ../src/applet-device-gsm.c:422
 msgid "You are now connected to the GSM network."
 msgstr "æ?¨ç?¾å?¨å·²é?£ç·?è?³ GSM ç¶²è·¯ã??"
 
-#: ../src/applet-device-gsm.c:704
+#: ../src/applet-device-gsm.c:707
 msgid "PIN code required"
 msgstr "é??è¦? PIN ç¢¼"
 
-#: ../src/applet-device-gsm.c:706
-msgid "PUK code required"
-msgstr "é??è¦? PUK ç¢¼"
-
 #: ../src/applet-device-gsm.c:715
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "é??å??è¡?å??å¯¬é »è£?ç½®é??è¦? PIN ç¢¼"
 
-#: ../src/applet-device-gsm.c:717
-msgid "PUK code is needed for the mobile broadband device"
-msgstr "é??å??è¡?å??å¯¬é »è£?ç½®é??è¦? PUK ç¢¼"
-
-#: ../src/applet-device-gsm.c:850
+#: ../src/applet-device-gsm.c:847
 msgid "Wrong PIN code; please contact your provider."
 msgstr "PIN ç¢¼é?¯èª¤ï¼?è«?è?¯çµ¡æ?¨ç??ä¾?æ??å??ã??"
 
-#: ../src/applet-device-gsm.c:873
+#: ../src/applet-device-gsm.c:870
 msgid "Wrong PUK code; please contact your provider."
 msgstr "PUK ç¢¼é?¯èª¤ï¼?è«?è?¯çµ¡æ?¨ç??ä¾?æ??å??ã??"
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:900
+#: ../src/applet-device-gsm.c:897
 msgid "Sending unlock code..."
-msgstr "ç?¼é??è§£é??ç?¨ç??å¯?ç¢¼..."
+msgstr "ç?¼é??è§£é??ç?¨ç??å¯?ç¢¼â?¦"
 
-#: ../src/applet-device-gsm.c:959
+#: ../src/applet-device-gsm.c:960
 msgid "SIM PIN unlock required"
 msgstr "é??è¦?è§£é?? SIM PIN ç¢¼"
 
-#: ../src/applet-device-gsm.c:960
+#: ../src/applet-device-gsm.c:961
 msgid "SIM PIN Unlock Required"
 msgstr "é??è¦?è§£é?? SIM PIN ç¢¼"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:962
+#: ../src/applet-device-gsm.c:963
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
 "used."
 msgstr "è¦?ä½¿ç?¨è¡?å??å¯¬é »è£?ç½®ã??%sã??ä¹?å??ï¼?é??è¦? SIM PIN ç¢¼ã??"
 
-#: ../src/applet-device-gsm.c:963
+#. Translators: PIN code entry label
+#: ../src/applet-device-gsm.c:965
 msgid "PIN code:"
 msgstr "PIN ç¢¼ï¼?"
 
-#: ../src/applet-device-gsm.c:968
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-device-gsm.c:969
+msgid "Show PIN code"
+msgstr "é¡¯ç¤º PIN ç¢¼"
+
+#: ../src/applet-device-gsm.c:972
 msgid "SIM PUK unlock required"
 msgstr "é??è¦?è§£é?? SIM PUK ç¢¼"
 
-#: ../src/applet-device-gsm.c:969
+#: ../src/applet-device-gsm.c:973
 msgid "SIM PUK Unlock Required"
 msgstr "é??è¦?è§£é?? SIM PUK ç¢¼"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:971
+#: ../src/applet-device-gsm.c:975
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
 "used."
 msgstr "è¦?ä½¿ç?¨è¡?å??å¯¬é »è£?ç½®ã??%sã??ä¹?å??ï¼?é??è¦? SIM PUK ç¢¼ã??"
 
-#: ../src/applet-device-gsm.c:972
+#. Translators: PUK code entry label
+#: ../src/applet-device-gsm.c:977
 msgid "PUK code:"
 msgstr "PUK ç¢¼ï¼?"
 
-#: ../src/applet-device-gsm.c:974
+#. Translators: New PIN entry label
+#: ../src/applet-device-gsm.c:980
 msgid "New PIN code:"
 msgstr "æ?°ç?? PIN ç¢¼ï¼?"
 
-#: ../src/applet-device-gsm.c:975
+#. Translators: New PIN verification entry label
+#: ../src/applet-device-gsm.c:982
 msgid "Re-enter new PIN code:"
 msgstr "é??æ?°è¼¸å?¥ PIN ç¢¼ï¼?"
 
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-device-gsm.c:987
+msgid "Show PIN/PUK codes"
+msgstr "é¡¯ç¤º PIN/PUK ç¢¼"
+
 #: ../src/applet-device-wired.c:63
 msgid "Auto Ethernet"
 msgstr "è?ªå??ä¹?å¤ªç¶²è·¯"
@@ -291,7 +303,7 @@ msgid "Wired Network"
 msgstr "æ??ç·?ç¶²è·¯"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:233 ../src/applet.c:1305
+#: ../src/applet-device-wired.c:233 ../src/applet.c:1343
 msgid "disconnected"
 msgstr "å·²æ?·ç·?"
 
@@ -302,279 +314,353 @@ msgstr "æ?¨ç?¾å?¨å·²é?£ç·?è?³æ??ç·?ç¶²è·¯ã??"
 #: ../src/applet-device-wired.c:301
 #, c-format
 msgid "Preparing wired network connection '%s'..."
-msgstr "æ£å?¨æº?å??æ??ç·?ç¶²è·¯é?£ç·?ã??%sã??..."
+msgstr "æ£å?¨æº?å??æ??ç·?ç¶²è·¯é?£ç·?ã??%sã??â?¦"
 
 #: ../src/applet-device-wired.c:304
 #, c-format
 msgid "Configuring wired network connection '%s'..."
-msgstr "æ£å?¨è¨å®?æ??ç·?ç¶²è·¯é?£ç·?ã??%sã??..."
+msgstr "æ£å?¨è¨å®?æ??ç·?ç¶²è·¯é?£ç·?ã??%sã??â?¦"
 
 #: ../src/applet-device-wired.c:307
 #, c-format
 msgid "User authentication required for wired network connection '%s'..."
-msgstr "æ??ç·?ç¶²è·¯é?£ç·?ã??%sã??é??è¦?ä½¿ç?¨è??é©?è?..."
+msgstr "æ??ç·?ç¶²è·¯é?£ç·?ã??%sã??é??è¦?ä½¿ç?¨è??é©?è?â?¦"
 
 #: ../src/applet-device-wired.c:310
 #, c-format
 msgid "Requesting a wired network address for '%s'..."
-msgstr "æ£è¦?æ±?æ??ç·?ç¶²è·¯ã??%sã??æ??ä¾?ç¶²è·¯ä½?å??..."
+msgstr "æ£è¦?æ±?æ??ç·?ç¶²è·¯ã??%sã??æ??ä¾?ç¶²è·¯ä½?å??â?¦"
 
 #: ../src/applet-device-wired.c:314
 #, c-format
 msgid "Wired network connection '%s' active"
 msgstr "æ??ç·?ç¶²è·¯é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸"
 
-#: ../src/applet-device-wired.c:565
+#: ../src/applet-device-wired.c:568
 msgid "DSL authentication"
 msgstr "DSL é©?è?"
 
-#: ../src/applet-device-wifi.c:87
+#: ../src/applet-device-wifi.c:88
 msgid "_Connect to Hidden Wireless Network..."
-msgstr "é?£æ?¥å?°é?±è??ç??ç?¡ç·?ç¶²è·¯(_C)..."
+msgstr "é?£æ?¥å?°é?±è??ç??ç?¡ç·?ç¶²è·¯(_C)â?¦"
 
-#: ../src/applet-device-wifi.c:120
+#: ../src/applet-device-wifi.c:121
 msgid "Create _New Wireless Network..."
-msgstr "å»ºç«?æ?°ç??ç?¡ç·?ç¶²è·¯(_N)..."
+msgstr "å»ºç«?æ?°ç??ç?¡ç·?ç¶²è·¯(_N)â?¦"
 
-#: ../src/applet-device-wifi.c:705
+#: ../src/applet-device-wifi.c:750
 #, c-format
 msgid "Wireless Networks (%s)"
 msgstr "ç?¡ç·?ç¶²è·¯ (%s)"
 
-#: ../src/applet-device-wifi.c:707
+#: ../src/applet-device-wifi.c:752
 #, c-format
 msgid "Wireless Network (%s)"
 msgstr "ç?¡ç·?ç¶²è·¯ (%s)"
 
-#: ../src/applet-device-wifi.c:709
+#: ../src/applet-device-wifi.c:754
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "ç?¡ç·?ç¶²è·¯"
 
-#: ../src/applet-device-wifi.c:739
+#: ../src/applet-device-wifi.c:787
 msgid "wireless is disabled"
 msgstr "ç?¡ç·?ç¶²è·¯å·²å??ç?¨"
 
-#: ../src/applet-device-wifi.c:800
+#: ../src/applet-device-wifi.c:788
+msgid "wireless is disabled by hardware switch"
+msgstr "ç?¡ç·?ç¶²è·¯å·²è¢«ç¡¬é«?é??é??å??ç?¨"
+
+#: ../src/applet-device-wifi.c:849
 msgid "More networks"
 msgstr "æ?´å¤?ç¶²è·¯"
 
-#: ../src/applet-device-wifi.c:1004
+#: ../src/applet-device-wifi.c:1053
 msgid "Wireless Networks Available"
 msgstr "å?¯ç?¨ç??ç?¡ç·?ç¶²è·¯"
 
-#: ../src/applet-device-wifi.c:1005
+#: ../src/applet-device-wifi.c:1055
 msgid "Click on this icon to connect to a wireless network"
 msgstr "è«?æ??é??å??å??ç¤ºä¾?é?£ç·?å?°ç?¡ç·?ç¶²è·¯"
 
-#: ../src/applet-device-wifi.c:1008 ../src/applet.c:677
+#: ../src/applet-device-wifi.c:1056
+msgid "Use the network menu to connect to a wireless network"
+msgstr "ä½¿ç?¨ç¶²è·¯é?¸å?®ä¾?é?£ç·?å?°ç?¡ç·?ç¶²è·¯"
+
+#: ../src/applet-device-wifi.c:1059 ../src/applet.c:714
 msgid "Don't show this message again"
 msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯"
 
-#: ../src/applet-device-wifi.c:1212
+#: ../src/applet-device-wifi.c:1263
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "æ?¨ç?¾å?¨å·²é?£ç·?å?°ç?¡ç·?ç¶²è·¯ã??%sã??ã??"
 
-#: ../src/applet-device-wifi.c:1213 ../src/applet-device-wifi.c:1244
+#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wifi.c:1295
 msgid "(none)"
 msgstr "(ç?¡)"
 
-#: ../src/applet-device-wifi.c:1254
+#: ../src/applet-device-wifi.c:1305
 #, c-format
 msgid "Preparing wireless network connection '%s'..."
-msgstr "æ£å?¨æº?å??ç?¡ç·?ç¶²è·¯é?£ç·?ã??%sã??..."
+msgstr "æ£å?¨æº?å??ç?¡ç·?ç¶²è·¯é?£ç·?ã??%sã??â?¦"
 
-#: ../src/applet-device-wifi.c:1257
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "Configuring wireless network connection '%s'..."
-msgstr "æ£å?¨è¨å®?ç?¡ç·?ç¶²è·¯é?£ç·?ã??%sã??..."
+msgstr "æ£å?¨è¨å®?ç?¡ç·?ç¶²è·¯é?£ç·?ã??%sã??â?¦"
 
-#: ../src/applet-device-wifi.c:1260
+#: ../src/applet-device-wifi.c:1311
 #, c-format
 msgid "User authentication required for wireless network '%s'..."
-msgstr "ç?¡ç·?ç¶²è·¯ã??%sã??è¦?æ±?ä½¿ç?¨è??é©?è?..."
+msgstr "ç?¡ç·?ç¶²è·¯ã??%sã??è¦?æ±?ä½¿ç?¨è??é©?è?â?¦"
 
-#: ../src/applet-device-wifi.c:1263
+#: ../src/applet-device-wifi.c:1314
 #, c-format
 msgid "Requesting a wireless network address for '%s'..."
-msgstr "æ£å?¨è¦?æ±?ç?¡ç·?ç¶²è·¯ã??%sã??æ??ä¾?ç¶²è·¯ä½?å??..."
+msgstr "æ£å?¨è¦?æ±?ç?¡ç·?ç¶²è·¯ã??%sã??æ??ä¾?ç¶²è·¯ä½?å??â?¦"
 
-#: ../src/applet-device-wifi.c:1283
+#: ../src/applet-device-wifi.c:1334
 #, c-format
 msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgstr "ç?¡ç·?ç¶²è·¯é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸ï¼? %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1287
+#: ../src/applet-device-wifi.c:1338
 #, c-format
 msgid "Wireless network connection '%s' active"
 msgstr "ç?¡ç·?ç¶²è·¯é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸"
 
+#: ../src/applet-device-wimax.c:228
+#, c-format
+msgid "WiMAX Mobile Broadband (%s)"
+msgstr "WiMAX è¡?å??å¯¬é » (%s)"
+
+#: ../src/applet-device-wimax.c:230
+msgid "WiMAX Mobile Broadband"
+msgstr "WiMAX è¡?å??å¯¬é »"
+
+#: ../src/applet-device-wimax.c:256
+msgid "WiMAX is disabled"
+msgstr "WiMAX å·²å??ç?¨"
+
+#: ../src/applet-device-wimax.c:257
+msgid "WiMAX is disabled by hardware switch"
+msgstr "WiMAX å·²è¢«ç¡¬é«?é??é??å??ç?¨"
+
+#: ../src/applet-device-wimax.c:425
+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/applet-dialogs.c:109
 #: ../src/connection-editor/page-wireless-security.c:284
-#: ../src/wireless-dialog.c:962
-#: ../src/wireless-security/wireless-security.c:341
+#: ../src/wireless-dialog.c:969
+#: ../src/wireless-security/wireless-security.c:390
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:89
+#: ../src/applet-dialogs.c:111
 msgid "Dynamic WEP"
 msgstr "å??æ?? WEP"
 
-#: ../src/applet-dialogs.c:91 ../src/applet-dialogs.c:192
-#: ../src/applet-dialogs.c:194
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:190
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:198
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
 #: ../src/connection-editor/page-wireless-security.c:238
-#: ../src/wireless-dialog.c:919
-msgctxt "No wifi security used"
+#: ../src/wireless-dialog.c:926
+msgctxt "Wifi/wired security"
 msgid "None"
-msgstr "ç?¡"
+msgstr "æ²?æ??"
 
-#: ../src/applet-dialogs.c:207
-msgctxt "No wired security used"
-msgid "None"
-msgstr "ç?¡"
+#: ../src/applet-dialogs.c:334 ../src/applet-dialogs.c:466
+#, c-format
+msgid "%u Mb/s"
+msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:210
-msgctxt "Unknown/unrecognized wired or wifi security"
+#: ../src/applet-dialogs.c:336 ../src/applet-dialogs.c:468
+msgctxt "Speed"
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../src/applet-dialogs.c:280 ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:349
 #, c-format
-msgid "%u Mb/s"
-msgstr "%u Mb/s"
+msgid "%d dB"
+msgstr "%d dB"
 
-#: ../src/applet-dialogs.c:282 ../src/applet-dialogs.c:384
-#: ../src/applet-dialogs.c:421 ../src/applet-dialogs.c:439
-#: ../src/applet-dialogs.c:450
-msgid "Unknown"
+#: ../src/applet-dialogs.c:351
+msgctxt "WiMAX CINR"
+msgid "unknown"
+msgstr "ä¸?æ??"
+
+#: ../src/applet-dialogs.c:363
+msgctxt "WiMAX Base Station ID"
+msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../src/applet-dialogs.c:313
+#: ../src/applet-dialogs.c:398
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ä¹?å¤ªç¶²è·¯ (%s)"
 
-#: ../src/applet-dialogs.c:315
+#: ../src/applet-dialogs.c:401
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:317
+#: ../src/applet-dialogs.c:404
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:319
+#: ../src/applet-dialogs.c:406
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:324
+#: ../src/applet-dialogs.c:408
+#, c-format
+msgid "WiMAX (%s)"
+msgstr "WiMAX (%s)"
+
+#. --- General ---
+#: ../src/applet-dialogs.c:414
+msgid "General"
+msgstr "ä¸?è?¬"
+
+#: ../src/applet-dialogs.c:418
 msgid "Interface:"
 msgstr "ä»?é?¢ï¼?"
 
-#: ../src/applet-dialogs.c:340
+#: ../src/applet-dialogs.c:434
 msgid "Hardware Address:"
 msgstr "ç¡¬é«?ä½?å??ï¼?"
 
-#: ../src/applet-dialogs.c:350
+#. Driver
+#: ../src/applet-dialogs.c:442
 msgid "Driver:"
 msgstr "é©?å??ç¨?å¼?ï¼?"
 
-#: ../src/applet-dialogs.c:388
+#: ../src/applet-dialogs.c:471
 msgid "Speed:"
 msgstr "é??åº¦ï¼?"
 
-#: ../src/applet-dialogs.c:397
+#: ../src/applet-dialogs.c:481
 msgid "Security:"
 msgstr "å®?å?¨æ?§ï¼?"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:494
+msgid "CINR:"
+msgstr "CINRï¼?"
+
+#: ../src/applet-dialogs.c:507
+msgid "BSID:"
+msgstr "BSIDï¼?"
+
+#. --- IPv4 ---
+#: ../src/applet-dialogs.c:524
+msgid "IPv4"
+msgstr "IPv4"
+
+#. Address
+#: ../src/applet-dialogs.c:535 ../src/applet-dialogs.c:642
 msgid "IP Address:"
 msgstr "IP ä½?å??ï¼?"
 
-#: ../src/applet-dialogs.c:437
+#: ../src/applet-dialogs.c:537 ../src/applet-dialogs.c:553
+msgctxt "Address"
+msgid "Unknown"
+msgstr "ä¸?æ??"
+
+#: ../src/applet-dialogs.c:551
 msgid "Broadcast Address:"
 msgstr "å»£æ?ä½?å??ï¼?"
 
-#: ../src/applet-dialogs.c:448
+#. Prefix
+#: ../src/applet-dialogs.c:560
 msgid "Subnet Mask:"
 msgstr "å?ç¶²è·¯é?®ç½©ï¼?"
 
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:562
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "ä¸?æ??"
+
+#: ../src/applet-dialogs.c:570 ../src/applet-dialogs.c:657
 msgid "Default Route:"
 msgstr "é ?è¨è·¯ç?±ï¼?"
 
-#: ../src/applet-dialogs.c:474
+#: ../src/applet-dialogs.c:582
 msgid "Primary DNS:"
 msgstr "ä¸»è¦? DNSï¼?"
 
-#: ../src/applet-dialogs.c:485
+#: ../src/applet-dialogs.c:591
 msgid "Secondary DNS:"
 msgstr "æ¬¡è¦? DNSï¼?"
 
+#: ../src/applet-dialogs.c:601
+msgid "Ternary DNS:"
+msgstr "ç¬¬ä¸? DNSï¼?"
+
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:616
+msgid "IPv6"
+msgstr "IPv6"
+
+#: ../src/applet-dialogs.c:625
+msgid "Ignored"
+msgstr "å·²å¿½ç?¥"
+
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:548
+#: ../src/applet-dialogs.c:733
 msgid "No valid active connections found!"
 msgstr "æ?¾ä¸?å?°æ??æ??ç??ä½¿ç?¨ä¸é?£ç·?ï¼?"
 
-#: ../src/applet-dialogs.c:674
+#: ../src/applet-dialogs.c:786
 msgid ""
-"Copyright Â© 2004-2008 Red Hat, Inc.\n"
-"Copyright Â© 2005-2008 Novell, Inc."
+"Copyright Â© 2004-2010 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-2010 Red Hat, Inc.\n"
+"Copyright Â© 2005-2008 Novell, Inc.è??è¨±å¤?å?¶ä»?ç¤¾ç¾¤è²¢ç?»è??è??ç¿»è¯è??"
 
-#: ../src/applet-dialogs.c:676
-msgid "Notification area applet for managing your network devices and connections."
+#: ../src/applet-dialogs.c:789
+msgid ""
+"Notification area applet for managing your network devices and connections."
 msgstr "ç?¨ä¾?ç®¡ç??æ?¨ç??ç¶²è·¯è£?ç½®è??é?£ç·?ç??é??ç?¥å??é?¢æ?¿ç¨?å¼?ã??"
 
-#: ../src/applet-dialogs.c:678
+#: ../src/applet-dialogs.c:791
 msgid "NetworkManager Website"
 msgstr "NetworkManager ç¶²ç«?"
 
-#: ../src/applet-dialogs.c:681
-msgid "translator-credits"
-msgstr ""
-"å¦?å°?ç¿»è¯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å?é?µä»¶çµ¦\n"
-"ä»¥ä¸?å?°å??ï¼?GNOME ç¿»è¯å??é??æ??å??å¿«å??è¦?æ?¨ï¼?\n"
-"community linuxhall org\n"
-"\n"
-"Hialan Liu <hialan liu gmail com>, 2008.\n"
-"Woodman Tuen <wmtuen gmail com>, 2005."
-
-#: ../src/applet-dialogs.c:697
+#: ../src/applet-dialogs.c:806
 msgid "Missing resources"
 msgstr "é?ºå¤±è³?æº?"
 
-#: ../src/applet-dialogs.c:723
+#: ../src/applet-dialogs.c:833
 msgid "Mobile broadband network password"
 msgstr "è¡?å??å¯¬é »ç¶²è·¯å¯?ç¢¼"
 
-#: ../src/applet-dialogs.c:732
+#: ../src/applet-dialogs.c:842
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "é?£ç·?è?³ã??%sã??é??è¦?å¯?ç¢¼ã??"
 
-#: ../src/applet-dialogs.c:750
+#: ../src/applet-dialogs.c:863
 msgid "Password:"
 msgstr "å¯?ç¢¼ï¼?"
 
-#: ../src/applet.c:790
+#: ../src/applet.c:827
 #, c-format
 msgid ""
 "\n"
@@ -584,7 +670,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?ºç¶²è·¯é?£ç·?è¢«ä¸æ?·äº?ã??"
 
-#: ../src/applet.c:793
+#: ../src/applet.c:830
 #, c-format
 msgid ""
 "\n"
@@ -593,7 +679,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?º VPN æ??å??æ??å¤?ç??å??æ¢äº?ã??"
 
-#: ../src/applet.c:796
+#: ../src/applet.c:833
 #, c-format
 msgid ""
 "\n"
@@ -603,7 +689,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?º VPN æ??å??å?³å??ç?¡æ??ç??çµ?æ??ã??"
 
-#: ../src/applet.c:799
+#: ../src/applet.c:836
 #, c-format
 msgid ""
 "\n"
@@ -612,7 +698,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?ºé?£ç·?ç??å??è©¦å·²é?¾æ??ã??"
 
-#: ../src/applet.c:802
+#: ../src/applet.c:839
 #, c-format
 msgid ""
 "\n"
@@ -621,7 +707,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?º VPN æ??å??æ²?æ??å??æ??å??å??ã??"
 
-#: ../src/applet.c:805
+#: ../src/applet.c:842
 #, c-format
 msgid ""
 "\n"
@@ -630,7 +716,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?º VPN æ??å??å??å??å¤±æ??ã??"
 
-#: ../src/applet.c:808
+#: ../src/applet.c:845
 #, c-format
 msgid ""
 "\n"
@@ -639,7 +725,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?ºæ²?æ??æ??æ??ç?? VPN æ??å??ã??"
 
-#: ../src/applet.c:811
+#: ../src/applet.c:848
 #, c-format
 msgid ""
 "\n"
@@ -648,7 +734,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?ºç?¡æ??ç?? VPN æ©?å¯?ã??"
 
-#: ../src/applet.c:818
+#: ../src/applet.c:855
 #, c-format
 msgid ""
 "\n"
@@ -657,7 +743,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ã??"
 
-#: ../src/applet.c:836
+#: ../src/applet.c:873
 #, c-format
 msgid ""
 "\n"
@@ -667,7 +753,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?ºç¶²è·¯é?£ç·?ä¸æ?·äº?ã??"
 
-#: ../src/applet.c:839
+#: ../src/applet.c:876
 #, c-format
 msgid ""
 "\n"
@@ -676,7 +762,7 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å¤±æ??ï¼?å? ç?º VPN æ??å??å·²å??æ¢ã??"
 
-#: ../src/applet.c:845
+#: ../src/applet.c:882
 #, c-format
 msgid ""
 "\n"
@@ -685,15 +771,15 @@ msgstr ""
 "\n"
 "VPN é?£ç·?ã??%sã??å·²æ?·ç·?ã??"
 
-#: ../src/applet.c:876
+#: ../src/applet.c:917
 msgid "VPN Login Message"
 msgstr "VPN ç?»é??è¨?æ?¯"
 
-#: ../src/applet.c:888 ../src/applet.c:896 ../src/applet.c:943
+#: ../src/applet.c:927 ../src/applet.c:935 ../src/applet.c:982
 msgid "VPN Connection Failed"
 msgstr "VPN é?£ç·?å¤±æ??"
 
-#: ../src/applet.c:950
+#: ../src/applet.c:989
 #, c-format
 msgid ""
 "\n"
@@ -706,7 +792,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:953
+#: ../src/applet.c:992
 #, c-format
 msgid ""
 "\n"
@@ -719,292 +805,193 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1296
+#: ../src/applet.c:1331
+msgid "device not ready (firmware missing)"
+msgstr "è£?ç½®å°?æ?ªå°±ç·? (ç¼ºå°?é??é«?)"
+
+#: ../src/applet.c:1333
 msgid "device not ready"
 msgstr "è£?ç½®å°?æ?ªå°±ç·?"
 
-#: ../src/applet.c:1321
+#: ../src/applet.c:1359
 msgid "Disconnect"
 msgstr "æ?·ç·?"
 
-#: ../src/applet.c:1335
+#: ../src/applet.c:1373
 msgid "device not managed"
 msgstr "è£?ç½®ç?¡æ³?ç®¡ç??"
 
-#: ../src/applet.c:1381
+#: ../src/applet.c:1417
 msgid "No network devices available"
 msgstr "æ²?æ??å?¯ç?¨ç??ç¶²è·¯è£?ç½®"
 
-#: ../src/applet.c:1469
+#: ../src/applet.c:1505
 msgid "_VPN Connections"
 msgstr "_VPN é?£ç·?"
 
-#: ../src/applet.c:1522
+#: ../src/applet.c:1558
 msgid "_Configure VPN..."
-msgstr "è¨ç½® VPN(_C)..."
+msgstr "è¨ç½® VPN(_C)â?¦"
 
-#: ../src/applet.c:1526
+#: ../src/applet.c:1562
 msgid "_Disconnect VPN"
 msgstr "è?? VPN æ?·ç·?(_D)"
 
-#: ../src/applet.c:1613
+#: ../src/applet.c:1664
 msgid "NetworkManager is not running..."
-msgstr "NetworkManager æ²?æ??å?·è¡?...."
+msgstr "NetworkManager æ²?æ??å?·è¡?â?¦."
 
-#: ../src/applet.c:1618 ../src/applet.c:2394
+#: ../src/applet.c:1669 ../src/applet.c:2481
 msgid "Networking disabled"
 msgstr "ç¶²è·¯å·²å??ç?¨"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1835
+#: ../src/applet.c:1891
 msgid "Enable _Networking"
 msgstr "å??ç?¨ç¶²è·¯(_N)"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:1844
+#: ../src/applet.c:1900
 msgid "Enable _Wireless"
 msgstr "å??ç?¨ç?¡ç·?ç¶²è·¯(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1853
+#: ../src/applet.c:1909
 msgid "Enable _Mobile Broadband"
 msgstr "å??ç?¨è¡?å??å¯¬é »(_M)"
 
+#. 'Enable WiMAX Mobile Broadband' item
+#: ../src/applet.c:1918
+msgid "Enable WiMA_X Mobile Broadband"
+msgstr "å??ç?¨ WiMA_X è¡?å??å¯¬é »"
+
 #. Toggle notifications item
-#: ../src/applet.c:1864
+#: ../src/applet.c:1929
 msgid "Enable N_otifications"
 msgstr "å??ç?¨é??ç?¥å??è?½(_o)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1875
+#: ../src/applet.c:1940
 msgid "Connection _Information"
 msgstr "é?£ç·?è³?è¨?(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1885
+#: ../src/applet.c:1950
 msgid "Edit Connections..."
-msgstr "ç·¨è¼¯é?£ç·?..."
+msgstr "ç·¨è¼¯é?£ç·?â?¦"
 
 #. Help item
-#: ../src/applet.c:1899
+#: ../src/applet.c:1964
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
 #. About item
-#: ../src/applet.c:1908
+#: ../src/applet.c:1973
 msgid "_About"
 msgstr "é??æ?¼(_A)"
 
-#: ../src/applet.c:2099
+#: ../src/applet.c:2164
 msgid "Disconnected"
 msgstr "å·²æ?·ç·?"
 
-#: ../src/applet.c:2100
+#: ../src/applet.c:2165
 msgid "The network connection has been disconnected."
 msgstr "ç¶²è·¯é?£ç·?å·²ä¸æ?·ã??"
 
-#: ../src/applet.c:2260
+#: ../src/applet.c:2347
 #, c-format
 msgid "Preparing network connection '%s'..."
-msgstr "æ£å?¨æº?å??ç¶²è·¯é?£ç·?ã??%sã??..."
+msgstr "æ£å?¨æº?å??ç¶²è·¯é?£ç·?ã??%sã??â?¦"
 
-#: ../src/applet.c:2263
+#: ../src/applet.c:2350
 #, c-format
 msgid "User authentication required for network connection '%s'..."
-msgstr "ç¶²è·¯é?£ç·?ã??%sã??é??è¦?ä½¿ç?¨è??é©?è?..."
+msgstr "ç¶²è·¯é?£ç·?ã??%sã??é??è¦?ä½¿ç?¨è??é©?è?â?¦"
 
-#: ../src/applet.c:2269
+#: ../src/applet.c:2356
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "ç¶²è·¯é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸"
 
-#: ../src/applet.c:2350
+#: ../src/applet.c:2437
 #, c-format
 msgid "Starting VPN connection '%s'..."
-msgstr "æ£å?¨å??å?? VPN é?£ç·?ã??%sã??..."
+msgstr "æ£å?¨å??å?? VPN é?£ç·?ã??%sã??â?¦"
 
-#: ../src/applet.c:2353
+#: ../src/applet.c:2440
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
-msgstr "VPN é?£ç·?ã??%sã??é??è¦?ä½¿ç?¨è??é©?è?..."
+msgstr "VPN é?£ç·?ã??%sã??é??è¦?ä½¿ç?¨è??é©?è?â?¦"
 
-#: ../src/applet.c:2356
+#: ../src/applet.c:2443
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
-msgstr "æ£å?¨è¦?æ±? VPN æ??ä¾?ã??%sã??ç??ç¶²è·¯ä½?å??..."
+msgstr "æ£å?¨è¦?æ±? VPN æ??ä¾?ã??%sã??ç??ç¶²è·¯ä½?å??â?¦"
 
-#: ../src/applet.c:2359
+#: ../src/applet.c:2446
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸"
 
-#: ../src/applet.c:2398
+#: ../src/applet.c:2485
 msgid "No network connection"
 msgstr "æ²?æ??ç¶²è·¯é?£æ?¥"
 
-#: ../src/applet.c:2938
+#: ../src/applet.c:3082
 msgid "NetworkManager Applet"
 msgstr "NetworkManager é?¢æ?¿ç¨?å¼?"
 
-#: ../src/applet.c:2944 ../src/wired-dialog.c:128
+#: ../src/applet.c:3088 ../src/wired-dialog.c:132
 msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
+"The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
-msgstr "NetworkManager é?¢æ?¿ç¨?å¼?ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼?æ?¾ä¸?å?° glade æª?ï¼?"
+msgstr "NetworkManager é?¢æ?¿ç¨?å¼?ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼?æ?¾ä¸?å?° .ui æª?ï¼?ã??"
 
-#: ../src/applet.glade.h:1 ../src/connection-editor/ce-vpn-wizard.glade.h:1
+#: ../src/applet.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: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/applet.glade.h:8
-msgid "As_k for this password every time"
-msgstr "æ¯?æ¬¡é?½è©¢å??å¯?ç¢¼(_k)"
+#: ../src/applet.ui.h:2
+msgid "Active Network Connections"
+msgstr "å??ç?¨ç¶²è·¯é?£ç·?"
 
-#: ../src/applet.glade.h:9
-msgid ""
-"Automatic\n"
-"Version 0\n"
-"Version 1"
-msgstr ""
-"è?ªå??\n"
-"ç¬¬ 0 ç??\n"
-"ç¬¬ 1 ç??"
-
-#: ../src/applet.glade.h:12
-msgid "C_A certificate:"
-msgstr "CA æ??è?(_A)ï¼?"
-
-#: ../src/applet.glade.h:13
+#: ../src/applet.ui.h:3
 msgid "C_onnect"
 msgstr "é?£ç·?(_O)"
 
-#: ../src/applet.glade.h:14
+#: ../src/applet.ui.h:4
 msgid "Co_nnection:"
 msgstr "é?£ç·?(_n):"
 
-#: ../src/applet.glade.h:15
+#: ../src/applet.ui.h:5
 msgid "Connection Information"
 msgstr "é?£ç·?è³?è¨?"
 
-#: ../src/applet.glade.h:16
-msgid "Don't _warn me again"
-msgstr "ä¸?è¦?å??è¦å??æ??(_w)"
-
-#: ../src/applet.glade.h:17
-msgid "I_dentity:"
-msgstr "è?å?¥(_d)ï¼?"
-
-#: ../src/applet.glade.h:18
-msgid "I_nner authentication:"
-msgstr "å?§é?¨é©?è?(_n):"
-
-#: ../src/applet.glade.h:19
-msgid "No"
-msgstr "å?¦"
-
-#: ../src/applet.glade.h:20
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
-"é??æ?¾ç³»çµ±\n"
-"å?±ç?¨é??é?°"
-
-#: ../src/applet.glade.h:22
+#: ../src/applet.ui.h:6
 msgid "Other Wireless Network..."
-msgstr "å?¶å®?ç?¡ç·?ç¶²è·¯..."
-
-#: ../src/applet.glade.h:23
-msgid "Private _key:"
-msgstr "ç§?å¯?é??é?°(_k)ï¼?"
-
-#: ../src/applet.glade.h:24
-msgid "Sho_w key"
-msgstr "é¡¯ç¤ºé??é?°(_w)"
-
-#: ../src/applet.glade.h:25 ../src/connection-editor/ce-page-dsl.glade.h:1
-msgid "Sho_w password"
-msgstr "é¡¯ç¤ºå¯?ç¢¼(_w)"
+msgstr "å?¶å®?ç?¡ç·?ç¶²è·¯â?¦"
 
-#: ../src/applet.glade.h:26
-msgid "WEP inde_x:"
-msgstr "WEP ç´¢å¼?(_x):"
-
-#: ../src/applet.glade.h:27
+#: ../src/applet.ui.h:7
 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
+#: ../src/applet.ui.h:8
 msgid "_Network name:"
 msgstr "ç¶²è·¯å??ç¨±(_N)ï¼?"
 
-#: ../src/applet.glade.h:32
-msgid "_PEAP version:"
-msgstr "_PEAP ç??æ?¬ï¼?"
-
-#: ../src/applet.glade.h:33 ../src/connection-editor/ce-page-dsl.glade.h:2
-#: ../src/connection-editor/ce-page-mobile.glade.h:15
-msgid "_Password:"
-msgstr "å¯?ç¢¼(_P)ï¼?"
-
-#: ../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
+#: ../src/applet.ui.h:9
 msgid "_Unlock"
 msgstr "è§£é??(_U)"
 
-#: ../src/applet.glade.h:37
-msgid "_User certificate:"
-msgstr "ä½¿ç?¨è??æ??è?(_U)ï¼?"
-
-#: ../src/applet.glade.h:38 ../src/connection-editor/ce-page-dsl.glade.h:4
-#: ../src/connection-editor/ce-page-mobile.glade.h:17
-msgid "_Username:"
-msgstr "ä½¿ç?¨è??å??ç¨±(_U):"
-
-#: ../src/applet.glade.h:39
+#: ../src/applet.ui.h:10
 msgid "_Wireless security:"
 msgstr "ç?¡ç·?ç¶²è·¯å®?å?¨(_W):"
 
-#: ../src/applet.glade.h:40
+#: ../src/applet.ui.h:11
 msgid "label"
 msgstr "æ¨?ç±¤"
 
@@ -1012,54 +999,80 @@ msgstr "æ¨?ç±¤"
 msgid "automatic"
 msgstr "è?ªå??"
 
-#: ../src/connection-editor/ce-page.c:221
-#: ../src/connection-editor/nm-connection-editor.c:616
+#: ../src/connection-editor/ce-page.c:222
+#: ../src/connection-editor/nm-connection-editor.c:613
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "ç?±æ?¼ä¸?æ??ç??é?¯èª¤ä½¿é?£ç·?æ©?å¯?ç??æ?´æ?°å¤±æ??ã??"
 
-#: ../src/connection-editor/ce-page-dsl.glade.h:3
+#: ../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/connection-editor/ce-page-dsl.ui.h:2
+#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/wireless-security/eap-method-leap.ui.h:2
+#: ../src/wireless-security/eap-method-simple.ui.h:3
+#: ../src/wireless-security/ws-leap.ui.h:2
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Password:"
+msgstr "å¯?ç¢¼(_P)ï¼?"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
 msgid "_Service:"
 msgstr "æ??å??(_S):"
 
-#: ../src/connection-editor/ce-page-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-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/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"
-"å??äº«çµ¦å?¶ä»?é?»è?¦"
+#: ../src/connection-editor/ce-page-ip4.ui.h:1
+#: ../src/connection-editor/ce-page-ip6.ui.h:1
+msgid "Addresses"
+msgstr "ä½?å??"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: ../src/connection-editor/ce-page-wired.ui.h:7
+#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/page-ip6.c:135
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Automatic"
+msgstr "è?ªå??"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:7
+#: ../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-ip4.ui.h:4
 msgid "D_HCP client ID:"
 msgstr "D_HCP å®¢æ?¶ç«¯ ID:"
 
-#: ../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."
 msgstr "ç?¨ä¾?è§£æ??ä¸»æ©?å??ç¨±ç??ç¶²å??ã??è«?ä½¿ç?¨é??è??é??é??ä¸?å??ç??ç¶²å??ã??"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:9
-#: ../src/connection-editor/ce-page-ip6.glade.h:8
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:5
 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."
@@ -1067,23 +1080,42 @@ msgstr ""
 "ç¶²å??å??ç¨±ä¼ºæ??å?¨ç?? IP ä½?å??ï¼?ç?¨ä¾?è§£æ??ä¸»æ©?å??ç¨±ã??è«?ä½¿ç?¨é??è??ä¾?å??é??å¤?å??ç¶²å??ä¼ºæ??å?¨ç??"
 "ä½?å??ã??"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:11
-#: ../src/connection-editor/ce-page-ip6.glade.h:10
+#: ../src/connection-editor/ce-page-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "å¦?æ??å??ç?¨ï¼?é??å??é?£ç·?å°?æ°¸é? ä¸?æ??å??ç?ºé ?è¨ç¶²è·¯é?£ç·?ã??"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:12
-#: ../src/connection-editor/ce-page-ip6.glade.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
 msgid "Ig_nore automatically obtained routes"
 msgstr "å¿½ç?¥è?ªå??ç?²å¾?ç??è·¯ç?±(_n)"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "Link-Local"
+msgstr "æ?¬æ©?é?£ç·?"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/page-ip4.c:162
+#: ../src/connection-editor/page-ip6.c:184
+msgid "Manual"
+msgstr "æ??å??"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
 msgid "Require IPv4 addressing for this connection to complete"
 msgstr "é??è¦? IPv4 addressing æ??å?¯å®?æ??æ¤é?£ç·?"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/page-ip4.c:180
+#: ../src/connection-editor/page-ip6.c:204
+msgid "Shared to other computers"
+msgstr "å??äº«çµ¦å?¶ä»?é?»è?¦"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:14
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1092,12 +1124,12 @@ msgstr ""
 "DHCP ç?¨æ?¶ç«¯è?å?¥è?½è®?ç¶²ç®¡äººå?¡å®¢è£½æ?¨é?»è?¦ä¸?ç??é??ç½®ã??å¦?æ??æ?¨æ?³è¦?ä½¿ç?¨ DHCP ç?¨æ?¶ç«¯è?"
 "å?¥ï¼?è«?å?¨æ¤è¼¸å?¥ã??"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:15
-#: ../src/connection-editor/ce-page-ip6.glade.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.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:16
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1105,31 +1137,31 @@ msgstr ""
 "ç?¶é?£è?³å?¯ä½¿ç?¨ IPv6 ç??ç¶²è·¯æ??ï¼?è?¥ IPv4 é??ç½®å¤±æ??ï¼?ä¸?é?? 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:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 msgid "_DNS servers:"
 msgstr "_DNS ä¼ºæ??å?¨:"
 
-#: ../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:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 msgid "_Method:"
 msgstr "æ?¹æ³?(_M):"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:19
-#: ../src/connection-editor/ce-page-ip6.glade.h:17
-msgid "_Routes&#x2026;"
-msgstr "è·¯ç?±&#x2026;(_R)"
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+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:20
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "_Search domains:"
 msgstr "æ??å°?ç¶²å??(_S):"
 
-#: ../src/connection-editor/ce-page-ip6.glade.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "Require IPv6 addressing for this connection to complete"
 msgstr "é??è¦? IPv6 addressing æ??å?¯å®?æ??æ¤é?£ç·?"
 
-#: ../src/connection-editor/ce-page-ip6.glade.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1137,258 +1169,287 @@ msgstr ""
 "ç?¶é?£è?³å?¯ä½¿ç?¨ IPv4 ç??ç¶²è·¯æ??ï¼?è?¥ IPv6 é??ç½®å¤±æ??ï¼?ä¸?é?? 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 "è®?æ?´..."
+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 "PI_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:"
 
-#: ../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>å??é?³</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 è³?æ??å£?ç¸®"
 
-#: ../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 è³?æ??å£?ç¸®"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:8
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Allowed Authentication Methods"
+msgstr "å??è¨±ç??é©?è?æ?¹å¼?"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
 msgid "Allowed methods:"
 msgstr "å??è¨±ç??æ?¹å¼?:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:9
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "Authentication"
+msgstr "é©?è?"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:10
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake é©?è?é??è¨?å??å®?"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:11
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
+msgid "Compression"
+msgstr "å£?ç¸®"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
 msgid "Configure _Methodsâ?¦"
-msgstr "è¨å®?æ?¹æ³?(_M)..."
+msgstr "è¨å®?æ?¹æ³?(_M)â?¦"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
+msgid "Echo"
+msgstr "å??é?¿"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:12
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
 msgid "Extensible Authentication Protocol"
 msgstr "å?¯å»¶ä¼¸ç??é©?è?é??è¨?å??å®?"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:13
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
+"å?¨å¤§å¤?æ?¸æ??æ³?ä¸?ï¼?ç¶²è·¯ä¾?æ??è??ç?? PPP ä¼ºæ??å?¨æ??æ?¯æ?´æ??æ??ç??é©?è?æ?¹æ³?ã??å¦?æ??é?£ç·?å¤±æ??ï¼?è«?"
+"å??è©¦å??ç?¨æ??äº?æ?¹æ³?ç??æ?¯æ?´ã??"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:13
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:14
+#: ../src/connection-editor/ce-page-ppp.ui.h:14
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake é©?è?é??è¨?å??å®?"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:15
+#: ../src/connection-editor/ce-page-ppp.ui.h:15
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake é©?è?é??è¨?å??å®?ç¬¬ 2 ç??"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:16
+#: ../src/connection-editor/ce-page-ppp.ui.h:16
 msgid "Password Authentication Protocol"
 msgstr "å¯?ç¢¼é©?è?é??è¨?å??å®?"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:17
+#: ../src/connection-editor/ce-page-ppp.ui.h:17
 msgid "Send PPP _echo packets"
 msgstr "å?³é?? PPP å??é?³å°?å??(_e)"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:18
+#: ../src/connection-editor/ce-page-ppp.ui.h:18
 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:19
 msgid "Use _stateful MPPE"
 msgstr "ä½¿ç?¨æ??ç??æ??ç?? MPPE(_s)"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:20
+#: ../src/connection-editor/ce-page-ppp.ui.h:20
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:21
+#: ../src/connection-editor/ce-page-ppp.ui.h:21
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:22
+#: ../src/connection-editor/ce-page-ppp.ui.h:22
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:23
+#: ../src/connection-editor/ce-page-ppp.ui.h:23
 msgid "_Require 128-bit encryption"
 msgstr "é??è¦? 128-ä½?å??å? å¯?(_R)"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:24
+#: ../src/connection-editor/ce-page-ppp.ui.h:24
 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 "é??å? å?®ä½?ä»?é?¢ (AUI)"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:6
 msgid "Aut_onegotiate"
 msgstr "è?ªå??å??è°(_o)"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:2
+#: ../src/connection-editor/ce-page-wired.ui.h:8
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:9
+msgid "Full duple_x"
+msgstr "å?¨é??å·¥(_X)"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:10
+#: ../src/connection-editor/ce-page-wireless.ui.h:8
+msgid "MT_U:"
+msgstr "MT_U:"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:11
+msgid "Media Independent Interface (MII)"
+msgstr "åª?é«?ç?¨ç«?ä»?é?¢ (MII)"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:12
+#: ../src/connection-editor/ce-page-wireless.ui.h:11
 msgid ""
-"Automatic\n"
-"10 Mb/s\n"
-"100 Mb/s\n"
-"1 Gb/s\n"
-"10 Gb/s"
+"The MAC address entered here will be used as hardware address for the "
+"network device this connection is activated on.  This feature is known as "
+"MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
 msgstr ""
-"è?ªå??\n"
-"10 Mb/s\n"
-"100 Mb/s\n"
-"1 Gb/s\n"
-"10 Gb/s"
+"å?¨é??è£¡è¼¸å?¥ç?? MAC ä½?å??æ??æ??ç?ºé??å??é?£ç·?ä½¿ç?¨ç??ç¶²è·¯è£?ç½®ç??ç¡¬é«?ä½?å??ã??é??å??å??è?½ä¹?ç¨±ç?º "
+"MAC è¤?è£½æ??å?½è£?ã??ä¾?å¦?ï¼?00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:7
+#: ../src/connection-editor/ce-page-wired.ui.h:13
+#: ../src/connection-editor/ce-page-wireless.ui.h:12
 msgid ""
-"Automatic\n"
-"Twisted Pair (TP)\n"
-"Attachment Unit Interface (AUI)\n"
-"BNC\n"
-"Media Independent Interface (MII)"
+"This option locks this connection to the network device specified by its "
+"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
 msgstr ""
-"è?ªå??\n"
-"é??çµ?ç·? (TP)\n"
-"æ?¥è§¸å?®å??ä»?é?¢ (AUI)\n"
-"BNC\n"
-"åª?ä»?ç?¡é??ä»?é?¢ (MII)"
+"æ¤é?¸é ?æ??å°?æ¤é?£ç·?é??å®?è?³å?¨æ¤æ??è¼¸å?¥ç?? MAC ä½?å??æ??æ??å®?ç??ç¶²è·¯è£?ç½®ã??ä¾?å¦?ï¼?"
+"00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:12
-msgid "Full duple_x"
-msgstr "å?¨é??å·¥(_X)"
+#: ../src/connection-editor/ce-page-wired.ui.h:14
+msgid "Twisted Pair (TP)"
+msgstr "é??çµ?ç·? (TP)"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:13
-#: ../src/connection-editor/ce-page-wireless.glade.h:8
-msgid "MT_U:"
-msgstr "MT_U:"
+#: ../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:14
-#: ../src/connection-editor/ce-page-wireless.glade.h:15
-msgid "_MAC address:"
-msgstr "_MAC ä½?å??ï¼?"
+#: ../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:15
+#: ../src/connection-editor/ce-page-wired.ui.h:17
 msgid "_Port:"
 msgstr "é?£æ?¥å? (_P)ï¼?"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:16
+#: ../src/connection-editor/ce-page-wired.ui.h:18
 msgid "_Speed:"
 msgstr "é??åº¦(_S)ï¼?"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:17
-#: ../src/connection-editor/ce-page-wireless.glade.h:18
+#: ../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 "Ad-hoc"
+
+#: ../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 ""
-"Infrastructure\n"
-"Ad-hoc"
+#: ../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:11
-msgid ""
-"This option locks this connection to the network device specified by the MAC "
-"address entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-"æ¤é?¸é ?æ??å°?æ¤é?£ç·?é??å®?è?³å?¨æ¤æ??è¼¸å?¥ç?? MAC ä½?å??æ??æ??å®?ç??ç¶²è·¯è£?ç½®ã??ä¾?å¦?ï¼?"
-"00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wireless.glade.h:12
+#: ../src/connection-editor/ce-page-wireless.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"
@@ -1396,87 +1457,87 @@ msgstr ""
 "æ¤é?¸é ?æ??å°?æ¤é?£ç·?é??å®?è?³å?¨æ¤æ??è¼¸å?¥ç?? BSSID æ??æ??å®?ç??ç?¡é??å?å??é»?ï¼?APï¼?ã??ä¾?å¦?ï¼?"
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:13
+#: ../src/connection-editor/ce-page-wireless.ui.h:14
 msgid "Transmission po_wer:"
 msgstr "å?³è¼¸è??è?½(_W):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:14
+#: ../src/connection-editor/ce-page-wireless.ui.h:15
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:16
+#: ../src/connection-editor/ce-page-wireless.ui.h:18
 msgid "_Rate:"
 msgstr "é??ç??(_R):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:17
+#: ../src/connection-editor/ce-page-wireless.ui.h:19
 msgid "_SSID:"
 msgstr "_SSID:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:19
+#: ../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-vpn-wizard.ui.h:2
+msgid "Choose a VPN Connection Type"
+msgstr "è«?é?¸æ?? VPN ç??é?£ç·?é¡?å??"
+
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
+msgid "Createâ?¦"
+msgstr "å»ºç«?â?¦"
+
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
 msgid ""
-"<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."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">é?¸æ?? VPN é?£ç·?é¡?å??</span>\n"
 "é?¸æ??æ?¨æ?³è¦?ç?¨å?¨æ?°é?£ç·?ä¸ç?? VPN é¡?å??ã??å¦?æ??æ?¨æ?³è¦?å»ºç«?ç?? VPN é?£ç·?é¡?å??æ²?æ??å?ºç?¾å?¨æ¸?"
 "å?®ä¸ï¼?å?¯è?½æ?¯æ²?æ??å®?è£?æ£ç¢ºç?? VPN å¤?æ??ç¨?å¼?ã??"
 
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:5
-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:731
-#: ../src/connection-editor/page-ip6.c:716
+#: ../src/connection-editor/ip4-routes-dialog.c:504
+#: ../src/connection-editor/ip6-routes-dialog.c:462
+#: ../src/connection-editor/page-ip4.c:738
+#: ../src/connection-editor/page-ip6.c:723
 msgid "Address"
 msgstr "ä½?å??"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:517
-#: ../src/connection-editor/page-ip4.c:748
+#: ../src/connection-editor/ip4-routes-dialog.c:520
+#: ../src/connection-editor/page-ip4.c:755
 msgid "Netmask"
 msgstr "ç¶²è·¯é?®ç½©"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:533
-#: ../src/connection-editor/ip6-routes-dialog.c:491
-#: ../src/connection-editor/page-ip4.c:765
-#: ../src/connection-editor/page-ip6.c:750
+#: ../src/connection-editor/ip4-routes-dialog.c:536
+#: ../src/connection-editor/ip6-routes-dialog.c:494
+#: ../src/connection-editor/page-ip4.c:772
+#: ../src/connection-editor/page-ip6.c:757
 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:552
+#: ../src/connection-editor/ip6-routes-dialog.c:510
 msgid "Metric"
 msgstr "å?¬å?¶"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:475
-#: ../src/connection-editor/page-ip6.c:733
+#: ../src/connection-editor/ip6-routes-dialog.c:478
+#: ../src/connection-editor/page-ip6.c:740
 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:136
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-list.c:1420
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/page-dsl.c:241
+#: ../src/connection-editor/page-dsl.c:138
+msgid "Could not load DSL user interface."
+msgstr "ç?¡æ³?è¼?å?¥ DSL ä½¿ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-dsl.c:228
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL é?£ç·? %d"
@@ -1519,49 +1580,34 @@ msgstr "è?ªå?? (DHCP)"
 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
 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
 msgid "Disabled"
 msgstr "å·²å??ç?¨"
 
-#: ../src/connection-editor/page-ip4.c:693
+#: ../src/connection-editor/page-ip4.c:700
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "ç·¨è¼¯ %s ç?? IPv4 è·¯ç?±"
 
-#: ../src/connection-editor/page-ip4.c:812
-#: ../src/connection-editor/page-ip4.c:819
-msgid "Could not load IPv4 user interface."
-msgstr "ç?¡æ³?è¼?å?¥ IPv4 ä½¿ç?¨è??ä»?é?¢ã??"
-
-#: ../src/connection-editor/page-ip4.c:825
+#: ../src/connection-editor/page-ip4.c:815
 msgid "IPv4 Settings"
 msgstr "IPv4 è¨å®?"
 
-#: ../src/connection-editor/page-ip6.c:135
-msgid "Automatic"
-msgstr "è?ªå??"
+#: ../src/connection-editor/page-ip4.c:817
+msgid "Could not load IPv4 user interface."
+msgstr "ç?¡æ³?è¼?å?¥ IPv4 ä½¿ç?¨è??ä»?é?¢ã??"
 
 #: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "è?ªå??ï¼?å??é??ä½?å??"
 
 #: ../src/connection-editor/page-ip6.c:148
-#: ../src/wireless-security/eap-method.c:196
+#: ../src/wireless-security/eap-method.c:234
 msgid "Ignore"
 msgstr "å¿½ç?¥"
 
@@ -1569,45 +1615,43 @@ msgstr "å¿½ç?¥"
 msgid "Automatic, DHCP only"
 msgstr "è?ªå??ï¼?å??ä½¿ç?¨ DHCP"
 
-#: ../src/connection-editor/page-ip6.c:678
+#: ../src/connection-editor/page-ip6.c:685
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "ç?º %s ç·¨è¼¯ IPv6 è·¯ç?±"
 
-#: ../src/connection-editor/page-ip6.c:795
-#: ../src/connection-editor/page-ip6.c:802
-msgid "Could not load IPv6 user interface."
-msgstr "ç?¡æ³?è¼?å?¥ IPv6 ä½¿ç?¨è??ä»?é?¢ã??"
-
-#: ../src/connection-editor/page-ip6.c:808
+#: ../src/connection-editor/page-ip6.c:798
 msgid "IPv6 Settings"
 msgstr "IPv6 è¨å®?"
 
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/connection-editor/page-mobile.c:312
+#: ../src/connection-editor/page-ip6.c:800
+msgid "Could not load IPv6 user interface."
+msgstr "ç?¡æ³?è¼?å?¥ IPv6 ä½¿ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-mobile.c:367
 msgid "Could not load mobile broadband user interface."
 msgstr "ç?¡æ³?è¼?å?¥è¡?å??å¯¬é »ä½¿ç?¨è??ä»?é?¢ã??"
 
-#: ../src/connection-editor/page-mobile.c:333
+#: ../src/connection-editor/page-mobile.c:384
 msgid "Unsupported mobile broadband connection type."
 msgstr "ä¸?æ?¯æ?´ç??è¡?å??å¯¬é »é?£ç·?é¡?å??ã??"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:574
+#: ../src/connection-editor/page-mobile.c:625
 msgid "Select Mobile Broadband Provider Type"
 msgstr "é?¸æ??è¡?å??å¯¬é »ä¾?æ??å??é¡?å??"
 
-#: ../src/connection-editor/page-mobile.c:601
+#: ../src/connection-editor/page-mobile.c:652
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr "è«?é?¸æ??æ?¨ç??ç?¡ç·?å¯¬é »ä¾?æ??å??æ??ä½¿ç?¨ç??æ??è¡?ã??å¦?æ??æ?¨ä¸?ç¢ºå®?ï¼?è«?æ´½è©¢ä¾?æ??å??ã??"
 
-#: ../src/connection-editor/page-mobile.c:606
+#: ../src/connection-editor/page-mobile.c:657
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "æ??ç??ä¾?æ??å??ä½¿ç?¨ _GSM ç?ºä¸»ç??æ??è¡?ï¼?ä¾?å¦? GPRSã??EDGEã??UMTSã??HSDPAï¼?"
 
-#: ../src/connection-editor/page-mobile.c:611
+#: ../src/connection-editor/page-mobile.c:664
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "æ??ç??ä¾?æ??å??ä½¿ç?¨ C_DMA ç?ºä¸»ç??æ??è¡?ï¼?ä¾?å¦? 1xRTTã??EVDOï¼?"
 
@@ -1616,23 +1660,23 @@ msgid "EAP"
 msgstr "EAP"
 
 #: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:228
+#: ../src/wireless-security/eap-method-ttls.c:235
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:276
+#: ../src/wireless-security/eap-method-ttls.c:283
 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/wireless-security/eap-method-peap.c:251
+#: ../src/wireless-security/eap-method-ttls.c:267
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:244
+#: ../src/wireless-security/eap-method-ttls.c:251
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -1646,120 +1690,126 @@ msgstr "ç?¡"
 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:279
 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:281
+msgid "Could not load PPP user interface."
+msgstr "ç?¡æ³?è¼?å?¥ PPP ä½¿ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: ../src/connection-editor/nm-connection-list.c:1416
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/page-vpn.c:119
+#: ../src/connection-editor/page-vpn.c:107
+msgid "Could not load VPN user interface."
+msgstr "ç?¡æ³?è¼?å?¥ VPN ä½¿ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-vpn.c:122
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "æ?¾ä¸?å?°ã??%sã??ç?? VPN å¤?æ??ç¨?å¼?æ??å??ã??"
 
-#: ../src/connection-editor/page-vpn.c:213
-#: ../src/connection-editor/nm-connection-list.c:990
+#: ../src/connection-editor/page-vpn.c:216
+#: ../src/connection-editor/nm-connection-list.c:995
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN é?£ç·? %d"
 
-#: ../src/connection-editor/page-wired.c:207
-#: ../src/connection-editor/page-wired.c:214
-msgid "Could not load wired user interface."
-msgstr "ç?¡æ³?è¼?å?¥æ??ç·?ç¶²è·¯ä½¿ç?¨è??ä»?é?¢ã??"
-
-#: ../src/connection-editor/page-wired.c:220
-#: ../src/connection-editor/nm-connection-editor.glade.h:9
-#: ../src/connection-editor/nm-connection-list.c:1393
+#: ../src/connection-editor/page-wired.c:209
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-list.c:1404
 msgid "Wired"
 msgstr "æ??ç·?"
 
-#: ../src/connection-editor/page-wired.c:339
+#: ../src/connection-editor/page-wired.c:211
+msgid "Could not load wired user interface."
+msgstr "ç?¡æ³?è¼?å?¥æ??ç·?ç¶²è·¯ä½¿ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-wired.c:346
 #, c-format
 msgid "Wired connection %d"
 msgstr "æ??ç·?ç¶²è·¯é?£ç·? %d"
 
-#: ../src/connection-editor/page-wired-security.c:115
+#: ../src/connection-editor/page-wired-security.c:113
 msgid "802.1x Security"
 msgstr "802.1x é?²è·"
 
-#: ../src/connection-editor/page-wired-security.c:123
+#: ../src/connection-editor/page-wired-security.c:115
+msgid "Could not load Wired Security security user interface."
+msgstr "ç?¡æ³?è¼?å?¥ Wired Security å®?å?¨ä½¿ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-wired-security.c:129
 msgid "Use 802.1X security for this connection"
 msgstr "å?¨é??å??é?£ç·?ä½¿ç?¨ 802.1X é?²è·"
 
-#: ../src/connection-editor/page-wireless.c:144
-#: ../src/connection-editor/page-wireless.c:148
+#: ../src/connection-editor/page-wireless.c:146
+#: ../src/connection-editor/page-wireless.c:150
+#: ../src/connection-editor/page-wireless.c:171
+#, c-format
 msgid "default"
 msgstr "é ?è¨"
 
-#: ../src/connection-editor/page-wireless.c:166
+#: ../src/connection-editor/page-wireless.c:175
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:351
-#: ../src/connection-editor/page-wireless.c:358
-msgid "Could not load WiFi user interface."
-msgstr "ç?¡æ³?è¼?å?¥ WiFi ä½¿ç?¨è??ä»?é?¢ã??"
-
-#: ../src/connection-editor/page-wireless.c:364
-#: ../src/connection-editor/nm-connection-editor.glade.h:10
-#: ../src/connection-editor/nm-connection-list.c:1397
+#: ../src/connection-editor/page-wireless.c:395
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-list.c:1408
 msgid "Wireless"
 msgstr "ç?¡ç·?ç¶²è·¯"
 
-#: ../src/connection-editor/page-wireless.c:511
+#: ../src/connection-editor/page-wireless.c:397
+msgid "Could not load WiFi user interface."
+msgstr "ç?¡æ³?è¼?å?¥ WiFi ä½¿ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-wireless.c:561
 #, c-format
 msgid "Wireless connection %d"
 msgstr "ç?¡ç·?ç¶²è·¯é?£ç·? %d"
 
 #: ../src/connection-editor/page-wireless-security.c:262
-#: ../src/wireless-dialog.c:936
-msgid "WEP 40/128-bit Key"
-msgstr "WEP 40/128-ä½?å?? é??é?°"
+#: ../src/wireless-dialog.c:943
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr "WEP 40/128-ä½?å?? é??é?° (Hex æ?? ASCII)"
 
 #: ../src/connection-editor/page-wireless-security.c:271
-#: ../src/wireless-dialog.c:945
+#: ../src/wireless-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-ä½?å?? å¯?èª?"
 
 #: ../src/connection-editor/page-wireless-security.c:297
-#: ../src/wireless-dialog.c:975
+#: ../src/wireless-dialog.c:982
 msgid "Dynamic WEP (802.1x)"
 msgstr "å??æ?? WEP (802.1x)"
 
 #: ../src/connection-editor/page-wireless-security.c:311
-#: ../src/wireless-dialog.c:989
+#: ../src/wireless-dialog.c:996
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 å??äººç??"
 
 #: ../src/connection-editor/page-wireless-security.c:325
-#: ../src/wireless-dialog.c:1003
+#: ../src/wireless-dialog.c:1010
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ä¼?æ¥ç??"
 
-#: ../src/connection-editor/page-wireless-security.c:365
+#: ../src/connection-editor/page-wireless-security.c:358
 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:367
 msgid "Wireless Security"
 msgstr "ç?¡ç·?ç¶²è·¯é?²è·"
 
+#: ../src/connection-editor/page-wireless-security.c:369
+msgid "Could not load WiFi security user interface."
+msgstr "ç?¡æ³?è¼?å?¥ WiFi é?²è·ä½¿ç?¨è??ä»?é?¢ã??"
+
 #: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
@@ -1769,106 +1819,104 @@ msgstr "ç·¨è¼¯ %s"
 msgid "Editing un-named connection"
 msgstr "ç·¨è¼¯æ?ªå?½å??ç??é?£ç·?"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
-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
+#: ../src/connection-editor/nm-connection-editor.c:293
 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 æª?ï¼?"
+msgstr "é?£ç·?ç·¨è¼¯å?¨æ?¾ä¸?å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼?æ?¾ä¸?å?° .ui æª?ï¼?ã??"
 
-#: ../src/connection-editor/nm-connection-editor.c:398
+#: ../src/connection-editor/nm-connection-editor.c:391
 msgid "Error creating connection editor dialog."
 msgstr "å»ºç«?é?£ç·?ç·¨è¼¯å?¨å°?è©±ç??æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
-msgid "Apply"
-msgstr "å¥?ç?¨"
+#: ../src/connection-editor/nm-connection-editor.c:412
+msgid "_Save"
+msgstr "å?²å?(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:420
-msgid "Save this connection for all users of this machine."
-msgstr "å?²å?é??å??é?£ç·?çµ¦æ¤é?»è?¦ä¸?ç??æ??æ??ä½¿ç?¨è??ã??"
+#: ../src/connection-editor/nm-connection-editor.c:413
+msgid "Save any changes made to this connection."
+msgstr "å?²å?ä»»ä½?å°?é??å??é?£ç·?é?²è¡?ç??è®?æ?´ã??"
 
-#: ../src/connection-editor/nm-connection-editor.c:421
-msgid "Apply..."
-msgstr "å¥?ç?¨..."
+#: ../src/connection-editor/nm-connection-editor.c:414
+msgid "_Save..."
+msgstr "å?²å?(_S)â?¦"
 
-#: ../src/connection-editor/nm-connection-editor.c:422
+#: ../src/connection-editor/nm-connection-editor.c:415
 msgid "Authenticate to save this connection for all users of this machine."
 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:219
+#: ../src/connection-editor/nm-connection-list.c:217
 msgid "never"
 msgstr "æ°¸ä¸?"
 
-#: ../src/connection-editor/nm-connection-list.c:230
-#: ../src/connection-editor/nm-connection-list.c:241
+#: ../src/connection-editor/nm-connection-list.c:228
+#: ../src/connection-editor/nm-connection-list.c:239
 msgid "now"
 msgstr "ç?¾å?¨"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:248
+#: ../src/connection-editor/nm-connection-list.c:246
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d å??é??ä»¥å??"
 
-#: ../src/connection-editor/nm-connection-list.c:252
+#: ../src/connection-editor/nm-connection-list.c:250
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d å°?æ??ä»¥å??"
 
-#: ../src/connection-editor/nm-connection-list.c:264
+#: ../src/connection-editor/nm-connection-list.c:262
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d å¤©ä»¥å??"
 
-#: ../src/connection-editor/nm-connection-list.c:270
+#: ../src/connection-editor/nm-connection-list.c:268
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d å??æ??ä»¥å??"
 
-#: ../src/connection-editor/nm-connection-list.c:274
+#: ../src/connection-editor/nm-connection-list.c:272
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d å¹´ä»¥å??"
 
-#: ../src/connection-editor/nm-connection-list.c:596
+#: ../src/connection-editor/nm-connection-list.c:595
 msgid "Connection add failed"
 msgstr "æ?°å¢?é?£ç·?å¤±æ??"
 
+#: ../src/connection-editor/nm-connection-list.c:624
+msgid "Error saving connection"
+msgstr "å?²å?é?£ç·?æ??é?¯èª¤"
+
 #: ../src/connection-editor/nm-connection-list.c:625
 #, 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:632
 #: ../src/connection-editor/nm-connection-list.c:747
@@ -1882,7 +1930,7 @@ msgstr "å??å§?å??ç·¨è¼¯å?¨æ??ç?¼ç??é?¯èª¤"
 
 #: ../src/connection-editor/nm-connection-list.c:653
 #: ../src/connection-editor/nm-connection-list.c:805
-#: ../src/connection-editor/nm-connection-list.c:973
+#: ../src/connection-editor/nm-connection-list.c:978
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -1909,12 +1957,12 @@ msgstr "å?ªé?¤é?£ç·?å¤±æ??"
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é?£ç·? %s ï¼?"
 
-#: ../src/connection-editor/nm-connection-list.c:1020
-#: ../src/connection-editor/vpn-helpers.c:228
+#: ../src/connection-editor/nm-connection-list.c:1025
+#: ../src/connection-editor/vpn-helpers.c:227
 msgid "Cannot import VPN connection"
 msgstr "ç?¡æ³?å?¯å?¥ VPN ç¶²è·¯é?£ç·?"
 
-#: ../src/connection-editor/nm-connection-list.c:1022
+#: ../src/connection-editor/nm-connection-list.c:1027
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -1924,51 +1972,55 @@ msgstr ""
 "\n"
 "é?¯èª¤ï¼?æ²?æ?? VPN æ??å??é¡?å??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:1035
+#: ../src/connection-editor/nm-connection-list.c:1040
 msgid "Could not edit imported connection"
 msgstr "ç?¡æ³?ç·¨è¼¯å?¯å?¥ç??é?£ç·?"
 
-#: ../src/connection-editor/nm-connection-list.c:1169
+#: ../src/connection-editor/nm-connection-list.c:1174
 msgid "Name"
 msgstr "å??ç¨±"
 
-#: ../src/connection-editor/nm-connection-list.c:1181
+#: ../src/connection-editor/nm-connection-list.c:1186
 msgid "Last Used"
 msgstr "æ??å¾?ä½¿ç?¨ç??"
 
-#: ../src/connection-editor/nm-connection-list.c:1284
-msgid "Edit"
-msgstr "ç·¨è¼¯"
+#: ../src/connection-editor/nm-connection-list.c:1282
+msgid "No VPN plugin available. Please install one to enable this button."
+msgstr "æ²?æ?? VPN å¤?æ??ç¨?å¼?å?¯ç?¨ã??è«?å®?è£?å?¶ä¸ä¸?ç¨®ä»¥å??ç?¨é??å??æ??é??ã??"
+
+#: ../src/connection-editor/nm-connection-list.c:1293
+msgid "_Edit"
+msgstr "ç·¨è¼¯(_E)"
 
-#: ../src/connection-editor/nm-connection-list.c:1285
+#: ../src/connection-editor/nm-connection-list.c:1294
 msgid "Edit the selected connection"
 msgstr "ç·¨è¼¯é?¸å??ç??é?£ç·?"
 
-#: ../src/connection-editor/nm-connection-list.c:1286
-msgid "Edit..."
-msgstr "ç·¨è¼¯..."
+#: ../src/connection-editor/nm-connection-list.c:1295
+msgid "_Edit..."
+msgstr "ç·¨è¼¯(_E)â?¦"
 
-#: ../src/connection-editor/nm-connection-list.c:1287
+#: ../src/connection-editor/nm-connection-list.c:1296
 msgid "Authenticate to edit the selected connection"
 msgstr "é©?è?ä»¥ç·¨è¼¯é?¸å??ç??é?£ç·?"
 
-#: ../src/connection-editor/nm-connection-list.c:1301
-msgid "Delete"
-msgstr "å?ªé?¤"
+#: ../src/connection-editor/nm-connection-list.c:1311
+msgid "_Delete"
+msgstr "å?ªé?¤(_D)"
 
-#: ../src/connection-editor/nm-connection-list.c:1302
+#: ../src/connection-editor/nm-connection-list.c:1312
 msgid "Delete the selected connection"
 msgstr "å?ªé?¤é?¸å??ç??é?£ç·?"
 
-#: ../src/connection-editor/nm-connection-list.c:1303
-msgid "Delete..."
-msgstr "å?ªé?¤..."
+#: ../src/connection-editor/nm-connection-list.c:1313
+msgid "_Delete..."
+msgstr "å?ªé?¤(_D)â?¦"
 
-#: ../src/connection-editor/nm-connection-list.c:1304
+#: ../src/connection-editor/nm-connection-list.c:1314
 msgid "Authenticate to delete the selected connection"
 msgstr "é©?è?ä»¥å?ªé?¤é?¸å??ç??é?£ç·?"
 
-#: ../src/connection-editor/vpn-helpers.c:230
+#: ../src/connection-editor/vpn-helpers.c:229
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -1980,29 +2032,29 @@ msgstr ""
 "\n"
 "é?¯èª¤ï¼?%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 "æ?¨æ?¯å?¦è¦?ä»¥æº?å??å?²å?ç?? VPN é?£ç·?å??ä»£ %sï¼?"
 
-#: ../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"
@@ -2013,82 +2065,83 @@ msgstr ""
 "\n"
 "é?¯èª¤ï¼?%sã??"
 
-#: ../src/connection-editor/vpn-helpers.c:386
+#: ../src/connection-editor/vpn-helpers.c:385
 msgid "Export VPN connection..."
-msgstr "å?¯å?º VPN é?£ç·?..."
+msgstr "å?¯å?º VPN é?£ç·?â?¦"
 
-#: ../src/gnome-bluetooth/bt-widget.c:213
+#: ../src/gnome-bluetooth/bt-widget.c:212
 #, c-format
 msgid "%s Network"
 msgstr "%s ç¶²è·¯"
 
-#: ../src/gnome-bluetooth/bt-widget.c:322
+#: ../src/gnome-bluetooth/bt-widget.c:321
 #, c-format
 msgid "Error: %s"
 msgstr "é?¯èª¤ï¼?%s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:441
+#: ../src/gnome-bluetooth/bt-widget.c:440
 msgid "Mobile wizard was canceled"
 msgstr "è¡?å??ç²¾é??å·²ç¶?å??æ¶?"
 
-#: ../src/gnome-bluetooth/bt-widget.c:450
+#: ../src/gnome-bluetooth/bt-widget.c:449
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "ä¸?æ??ç??é?»è©±è£?ç½®é¡?å??ï¼?é?? GSM æ?? CDMAï¼?"
 
-#: ../src/gnome-bluetooth/bt-widget.c:478
+#: ../src/gnome-bluetooth/bt-widget.c:477
 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:647
+#: ../src/gnome-bluetooth/bt-widget.c:653
 msgid "failed to connect to the phone."
 msgstr "ç?¡æ³?é?£ç·?è?³é?»è©±ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:687
+#: ../src/gnome-bluetooth/bt-widget.c:686
 msgid "unexpectedly disconnected from the phone."
 msgstr "é?»è©±ç?¡é ?æ??é?¢ç·?ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:696
+#: ../src/gnome-bluetooth/bt-widget.c:695
 msgid "timed out detecting phone details."
 msgstr "å?¨æ??é??å?§å?µæ¸¬ä¸?å?°é?»è©±ç??è©³ç´°è³?æ??ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:711
+#: ../src/gnome-bluetooth/bt-widget.c:710
 msgid "could not connect to the system bus."
 msgstr "ç?¡æ³?é?£ç·?è?³ç³»çµ±å?¯æµ?æ??ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:716
+#: ../src/gnome-bluetooth/bt-widget.c:715
 msgid "Detecting phone configuration..."
-msgstr "å?µæ¸¬é?»è©±ç??é??ç½®..."
+msgstr "å?µæ¸¬é?»è©±ç??é??ç½®â?¦"
 
-#: ../src/gnome-bluetooth/bt-widget.c:782
+#: ../src/gnome-bluetooth/bt-widget.c:781
 msgid "could not find the Bluetooth device."
 msgstr "æ?¾ä¸?å?°è??ç??è£?ç½®ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:912
+#: ../src/gnome-bluetooth/bt-widget.c:911
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 msgstr "é ?è¨ç??è??ç??é??æ?¥å?¡å¿?é ?å?¨è¨å®?æ?¥æ?¥ç¶²è·¯é?£ç·?å??å??ç?¨ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:944
+#: ../src/gnome-bluetooth/bt-widget.c:943
 #, c-format
 msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
 msgstr "ç?¡æ³?é?²è¡?è??ç??ç??é??ç½®ï¼?ç?¡æ³?é?£è?³ D-Busï¼?%sï¼?ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:954
+#: ../src/gnome-bluetooth/bt-widget.c:953
 msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 msgstr "ç?¡æ³?é?²è¡?è??ç??ç??é??ç½®ï¼?ç?¡æ³?é?£è?³ D-Bus proxyï¼?ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:963
+#: ../src/gnome-bluetooth/bt-widget.c:962
 #, c-format
-msgid "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+msgid ""
+"Bluetooth configuration not possible (error finding NetworkManager: %s)."
 msgstr "ç?¡æ³?é?²è¡?è??ç??ç??é??ç½®ï¼?æ?¾ä¸?å?° NetworkManagerï¼?%sï¼?ã??"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1014
+#: ../src/gnome-bluetooth/bt-widget.c:1013
 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:1022
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr "ä½¿ç?¨æ??æ©?å?å??ç¶²é??ç¶²è·¯ï¼?DUNï¼?"
 
@@ -2100,7 +2153,8 @@ msgstr "ç?¨æ³?:"
 msgid ""
 "This program is a component of NetworkManager (http://projects.gnome.org/";
 "NetworkManager)."
-msgstr "æ?¬ç¨?å¼?æ?¯ NetworkManagerï¼?http://projects.gnome.org/NetworkManagerï¼?ç??å??ä»¶";
+msgstr ""
+"æ?¬ç¨?å¼?æ?¯ NetworkManagerï¼?http://projects.gnome.org/NetworkManagerï¼?ç??å??ä»¶";
 
 #: ../src/main.c:73
 msgid ""
@@ -2136,72 +2190,77 @@ msgstr "HSUPA"
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:104
+#: ../src/mb-menu-item.c:74
+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 "æ¼«é??ç¶²è·¯"
 
-#: ../src/utils/mobile-wizard.c:196
-msgid "Your mobile broadband connection is configured with the following settings:"
+#: ../src/utils/mobile-wizard.c:195
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
 msgstr "è¡?å??å¯¬é?£ç·?å·²ç¶?é??ç½®äº?ä»¥ä¸?è¨å®?ï¼?"
 
 #. Device
-#: ../src/utils/mobile-wizard.c:203
+#: ../src/utils/mobile-wizard.c:202
 msgid "Your Device:"
 msgstr "æ?¨ç??è£?ç½®:"
 
 #. Provider
-#: ../src/utils/mobile-wizard.c:214
+#: ../src/utils/mobile-wizard.c:213
 msgid "Your Provider:"
 msgstr "æ?¨ç??ä¾?æ??å??:"
 
 #. Plan and APN
-#: ../src/utils/mobile-wizard.c:225
+#: ../src/utils/mobile-wizard.c:224
 msgid "Your Plan:"
 msgstr "æ?¨ç??æ?¹æ¡?:"
 
-#: ../src/utils/mobile-wizard.c:246
+#: ../src/utils/mobile-wizard.c:245
 msgid ""
 "A connection will now be made to your mobile broadband provider using the "
 "settings you selected.  If the connection fails or you cannot access network "
@@ -2213,23 +2272,23 @@ msgstr ""
 "ç?¡æ³?å?å??ç¶²è·¯è³?æº?ï¼?è«?æª¢æ?¥è¨å®?ã??è¦?ä¿®æ?¹è¡?å??å¯¬é »é?£ç·?ç??è¨å®?ï¼?è«?å¾?ã??ç³»çµ±ã?? >> ã??å??"
 "å¥½è¨å®?ã??ä¸ï¼?é?¸æ??ã??ç¶²è·¯é?£ç·?ã??ã??"
 
-#: ../src/utils/mobile-wizard.c:258
+#: ../src/utils/mobile-wizard.c:257
 msgid "Confirm Mobile Broadband Settings"
 msgstr "ç¢ºèª?è¡?å??å¯¬é »è¨å®?"
 
-#: ../src/utils/mobile-wizard.c:319
+#: ../src/utils/mobile-wizard.c:318
 msgid "Unlisted"
 msgstr "æ?ªå??å?ºç??"
 
-#: ../src/utils/mobile-wizard.c:437
+#: ../src/utils/mobile-wizard.c:436
 msgid "_Select your plan:"
 msgstr "é?¸æ??æ?¨ç??æ?¹æ¡?(_S)ï¼?"
 
-#: ../src/utils/mobile-wizard.c:461
+#: ../src/utils/mobile-wizard.c:460
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "é?¸æ??æ?¹æ¡?ç?? _APNï¼?Access Point Nameï¼?å?å??é»?å??ç¨±ï¼?ï¼?"
 
-#: ../src/utils/mobile-wizard.c:480
+#: ../src/utils/mobile-wizard.c:479
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
@@ -2240,101 +2299,101 @@ msgstr ""
 "\n"
 "å¦?æ??æ?¨ä¸?ç¢ºå®?æ??ä½¿ç?¨ç??æ?¹æ¡?ï¼?è«?æ´½è©¢ä¾?æ??å??ï¼?ä»¥å¾?ç?¥æ?¹æ¡?ç?? APN ç?ºä½?ã??"
 
-#: ../src/utils/mobile-wizard.c:487
+#: ../src/utils/mobile-wizard.c:486
 msgid "Choose your Billing Plan"
 msgstr "é?¸æ??æ?¨ç??è¨?è²»æ?¹æ¡?"
 
-#: ../src/utils/mobile-wizard.c:535
+#: ../src/utils/mobile-wizard.c:534
 msgid "My plan is not listed..."
-msgstr "æ??ç??æ?¹æ¡?æ²?æ??å??å?º..."
+msgstr "æ??ç??æ?¹æ¡?æ²?æ??å??å?ºâ?¦"
 
-#: ../src/utils/mobile-wizard.c:688
+#: ../src/utils/mobile-wizard.c:687
 msgid "Select your provider from a _list:"
 msgstr "è«?å¾?æ¸?å?®è£¡é?¸æ??ä¾?æ??å??(_l):"
 
-#: ../src/utils/mobile-wizard.c:701
+#: ../src/utils/mobile-wizard.c:700
 msgid "Provider"
 msgstr "ä¾?æ??å??"
 
-#: ../src/utils/mobile-wizard.c:726
+#: ../src/utils/mobile-wizard.c:725
 msgid "I can't find my provider and I wish to enter it _manually:"
 msgstr "æ??æ?¾ä¸?å?°æ??ç??ä¾?æ??å??ï¼?æ??æ?³è¦?æ??å??è¼¸å?¥(_m):"
 
-#: ../src/utils/mobile-wizard.c:737
+#: ../src/utils/mobile-wizard.c:736
 msgid "Provider:"
 msgstr "ä¾?æ??å??ï¼?"
 
-#: ../src/utils/mobile-wizard.c:753
+#: ../src/utils/mobile-wizard.c:760
 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:766
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "æ??ç??ä¾?æ??å??ä½¿ç?¨ CDMA æ??è¡?ï¼?1xRTTã??EVDOï¼?"
 
-#: ../src/utils/mobile-wizard.c:766
+#: ../src/utils/mobile-wizard.c:777
 msgid "Choose your Provider"
 msgstr "é?¸æ??æ?¨ç??ä¾?æ??å??"
 
-#: ../src/utils/mobile-wizard.c:1012
-msgid "Country List:"
-msgstr "å??å®¶æ¸?å?®:"
+#: ../src/utils/mobile-wizard.c:1023
+msgid "Country or Region List:"
+msgstr "å??å®¶æ??å?°å??æ¸?å?®ï¼?"
 
-#: ../src/utils/mobile-wizard.c:1024
-msgid "Country"
-msgstr "å??å®¶"
+#: ../src/utils/mobile-wizard.c:1035
+msgid "Country or region"
+msgstr "å??å®¶æ??å?°å??"
 
-#: ../src/utils/mobile-wizard.c:1031
+#: ../src/utils/mobile-wizard.c:1042
 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:1088
+msgid "Choose your Provider's Country or Region"
+msgstr "é?¸æ??æ?¨ç??ä¾?æ??å??ç??å??å®¶æ??å?°å??"
 
-#: ../src/utils/mobile-wizard.c:1126
+#: ../src/utils/mobile-wizard.c:1137
 msgid "Installed GSM device"
 msgstr "å·²å®?è£?ç?? GSM è£?ç½®"
 
-#: ../src/utils/mobile-wizard.c:1129
+#: ../src/utils/mobile-wizard.c:1140
 msgid "Installed CDMA device"
 msgstr "å·²å®?è£?ç?? CDMA è£?ç½®"
 
-#: ../src/utils/mobile-wizard.c:1297
+#: ../src/utils/mobile-wizard.c:1308
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
 msgstr "é??è?½å¹«å?©æ?¨è¼?æ??å?°è¨å®?è¡?å??å¯¬é »é?£ç·?ï¼?é?£è?³æ??æ©?ï¼?3Gï¼?ç¶²è·¯ã??"
 
-#: ../src/utils/mobile-wizard.c:1302
+#: ../src/utils/mobile-wizard.c:1313
 msgid "You will need the following information:"
 msgstr "æ?¨é??è¦?ä»¥ä¸?è³?è¨?ï¼?"
 
-#: ../src/utils/mobile-wizard.c:1313
+#: ../src/utils/mobile-wizard.c:1324
 msgid "Your broadband provider's name"
 msgstr "å¯¬é »ä¾?æ??å??ç??å??ç¨±"
 
-#: ../src/utils/mobile-wizard.c:1319
+#: ../src/utils/mobile-wizard.c:1330
 msgid "Your broadband billing plan name"
 msgstr "å¯¬é »è¨?è²»æ?¹æ¡?ç??å??ç¨±"
 
-#: ../src/utils/mobile-wizard.c:1325
+#: ../src/utils/mobile-wizard.c:1336
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "ï¼?å?¨æ??äº?æ??æ³?ä¸?ï¼?æ?¨ç??å¯¬é »è¨?è²»æ?¹æ¡?ç?? APNï¼?å?å??é»?å??ç¨±ï¼?"
 
-#: ../src/utils/mobile-wizard.c:1352
+#: ../src/utils/mobile-wizard.c:1363
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "ç?ºé??å??è¡?å??å¯¬é »è£?ç½®å»ºç«?é?£ç·?(_t)"
 
-#: ../src/utils/mobile-wizard.c:1367
+#: ../src/utils/mobile-wizard.c:1378
 msgid "Any device"
 msgstr "ä»»ä½?è£?ç½®"
 
-#: ../src/utils/mobile-wizard.c:1380
+#: ../src/utils/mobile-wizard.c:1391
 msgid "Set up a Mobile Broadband Connection"
 msgstr "è¨å®?è¡?å??å¯¬é »é?£ç·?"
 
-#: ../src/utils/mobile-wizard.c:1554
+#: ../src/utils/mobile-wizard.c:1565
 msgid "New Mobile Broadband Connection"
 msgstr "æ?°ç??è¡?å??å¯¬é »é?£ç·?"
 
@@ -2342,23 +2401,23 @@ msgstr "æ?°ç??è¡?å??å¯¬é »é?£ç·?"
 msgid "United Kingdom"
 msgstr "è?±å??"
 
-#: ../src/utils/nmn-mobile-providers.c:523
+#: ../src/utils/nmn-mobile-providers.c:508
 msgid "Default"
 msgstr "é ?è¨"
 
-#: ../src/vpn-password-dialog.c:137 ../src/vpn-password-dialog.c:255
+#: ../src/vpn-password-dialog.c:136 ../src/vpn-password-dialog.c:254
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "ç?¡æ³?å?·è¡? VPN é?£ç·?â??%sâ??"
 
-#: ../src/vpn-password-dialog.c:140
+#: ../src/vpn-password-dialog.c:139
 #, 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
+#: ../src/vpn-password-dialog.c:257
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -2369,60 +2428,60 @@ msgstr "å?·è¡? VPN é?£ç·?é¡?å??ã??%sã??ç??é©?è?å°?è©±ç??ç?¼ç??å??é¡?ã??è«?é?£
 msgid "Wired 802.1X authentication"
 msgstr "æ??ç·?ç¶²è·¯ 802.1X é©?è?"
 
-#: ../src/wireless-dialog.c:474
+#: ../src/wireless-dialog.c:478
 msgid "New..."
-msgstr "æ?°å¢?..."
+msgstr "æ?°å¢?â?¦"
 
-#: ../src/wireless-dialog.c:1094
+#: ../src/wireless-dialog.c:1100
 msgid "C_reate"
 msgstr "å»ºç«?(_R)"
 
-#: ../src/wireless-dialog.c:1175
+#: ../src/wireless-dialog.c:1182
 #, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
+"Passwords or encryption keys are required to access the wireless network "
+"'%s'."
 msgstr "é??è¦?å¯?ç¢¼æ??æ?¯å? å¯?é??é?°ä¾?å?å??ç?¡ç·?ç¶²è·¯ã??%sã??ã??"
 
-#: ../src/wireless-dialog.c:1177
+#: ../src/wireless-dialog.c:1184
 msgid "Wireless Network Authentication Required"
 msgstr "ç?¡ç·?ç¶²è·¯é©?è?è¦?æ±?"
 
-#: ../src/wireless-dialog.c:1179
+#: ../src/wireless-dialog.c:1186
 msgid "Authentication required by wireless network"
 msgstr "ç?¡ç·?ç¶²è·¯æ??é??è¦?ç??é©?è?"
 
-#: ../src/wireless-dialog.c:1184
+#: ../src/wireless-dialog.c:1191
 msgid "Create New Wireless Network"
 msgstr "å»ºç«?æ?°ç??ç?¡ç·?ç¶²è·¯"
 
-#: ../src/wireless-dialog.c:1186
+#: ../src/wireless-dialog.c:1193
 msgid "New wireless network"
 msgstr "æ?°ç??ç?¡ç·?ç¶²è·¯"
 
-#: ../src/wireless-dialog.c:1187
+#: ../src/wireless-dialog.c:1194
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "è¼¸å?¥æ?¨è¦?å»ºç«?ç??ç?¡ç·?ç¶²è·¯ç??å??ç¨±ã??"
 
-#: ../src/wireless-dialog.c:1189
+#: ../src/wireless-dialog.c:1196
 msgid "Connect to Hidden Wireless Network"
 msgstr "é?£æ?¥å?°é?±è??ç??ç?¡ç·?ç¶²è·¯"
 
-#: ../src/wireless-dialog.c:1191
+#: ../src/wireless-dialog.c:1198
 msgid "Hidden wireless network"
 msgstr "é?±è??ç??ç?¡ç·?ç¶²è·¯"
 
-#: ../src/wireless-dialog.c:1192
+#: ../src/wireless-dialog.c:1199
 msgid ""
 "Enter the name and security details of the hidden wireless network you wish "
 "to connect to."
 msgstr "è¼¸å?¥æ?¨è¦?é?£æ?¥ç??é?±è??ç?¡ç·?ç¶²è·¯ç??å??ç¨±è??å®?å?¨æ?§è©³ç´°è³?æ??ã??"
 
-#: ../src/wireless-security/eap-method.c:190
+#: ../src/wireless-security/eap-method.c:228
 msgid "No Certificate Authority certificate chosen"
 msgstr "æ?ªé?¸æ??ä»»ä½?æ??è?æ??æ¬?å?®ä½?(CA)æ??è?"
 
-#: ../src/wireless-security/eap-method.c:191
+#: ../src/wireless-security/eap-method.c:229
 msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections "
 "to insecure, rogue wireless networks.  Would you like to choose a "
@@ -2431,37 +2490,70 @@ msgstr ""
 "ä¸?ä½¿ç?¨æ??è?ä¸å¿? (CA) ç??æ??è?æ??é? æ??é?£ç·?ä¸?å®?å?¨ã??æµ?æ°?ç?¡ç·?ç¶²è·¯(å?¯è?½è¢«ç«?å??ã??å?«è?½ä¹?"
 "æ??)ã??æ?¯å?¦è¦?é?¸æ??ä¸?å??æ??è?ä¸å¿?ç??æ??è?ï¼?"
 
-#: ../src/wireless-security/eap-method.c:200
+#: ../src/wireless-security/eap-method.c:238
 msgid "Choose CA Certificate"
 msgstr "é?¸æ?? CA æ??è?"
 
-#: ../src/wireless-security/eap-method.c:515
+#: ../src/wireless-security/eap-method.c:583
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 msgstr "DER, PEM, æ?? PKCS#12 ç§?å¯?é??é?°(*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:518
+#: ../src/wireless-security/eap-method.c:586
 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:267
+#: ../src/wireless-security/wireless-security.c:366
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:277
+#: ../src/wireless-security/eap-method-peap.c:283
 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:354
+#: ../src/wireless-security/eap-method-tls.c:437
+#: ../src/wireless-security/eap-method-ttls.c:354
 msgid "Choose a Certificate Authority certificate..."
-msgstr "é?¸æ??æ??è?æ??æ¬?å?®ä½?(CA)æ??è?..."
+msgstr "é?¸æ??æ??è?æ??æ¬?å?®ä½?(CA)æ??è?â?¦"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
+msgid "Anony_mous identity:"
+msgstr "å?¿å??è?å?¥(_m)ï¼?"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
+msgid "C_A certificate:"
+msgstr "CA æ??è?(_A)ï¼?"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:5
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "I_nner authentication:"
+msgstr "å?§é?¨é©?è?(_n):"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:6
+msgid "Version 0"
+msgstr "ç??æ?¬ 0"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:7
+msgid "Version 1"
+msgstr "ç??æ?¬ 1"
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+msgid "_PEAP version:"
+msgstr "_PEAP ç??æ?¬ï¼?"
+
+#: ../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:261
 msgid "Unencrypted private keys are insecure"
 msgstr "æ?ªå? å¯?ç??ç§?å¯?é??é?°æ?¯ä¸?å®?å?¨ç??"
 
-#: ../src/wireless-security/eap-method-tls.c:266
+#: ../src/wireless-security/eap-method-tls.c:264
 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 "
@@ -2474,23 +2566,222 @@ msgstr ""
 "\n"
 "ï¼?æ?¨å?¯ä»¥ä½¿ç?¨ openssl ä¾?å? å¯?æ?¨ç??ç§?å¯?é??é?°ï¼?"
 
-#: ../src/wireless-security/eap-method-tls.c:451
+#: ../src/wireless-security/eap-method-tls.c:431
 msgid "Choose your personal certificate..."
-msgstr "é?¸æ??æ?¨ç??å??äººæ??è?..."
+msgstr "é?¸æ??æ?¨ç??å??äººæ??è?â?¦"
 
-#: ../src/wireless-security/eap-method-tls.c:463
+#: ../src/wireless-security/eap-method-tls.c:443
 msgid "Choose your private key..."
-msgstr "é?¸æ??æ?¨ç??ç§?å¯?é??é?°..."
+msgstr "é?¸æ??æ?¨ç??ç§?å¯?é??é?°â?¦"
+
+#: ../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/wireless-security.c:329
+#: ../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:378
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:353
+#: ../src/wireless-security/wireless-security.c:402
 msgid "Tunneled TLS"
 msgstr "ç©¿é?§å¼? TLS"
 
-#: ../src/wireless-security/wireless-security.c:364
+#: ../src/wireless-security/wireless-security.c:413
 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 "translator-credits"
+#~ msgstr ""
+#~ "å¦?å°?ç¿»è¯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å?é?µä»¶çµ¦\n"
+#~ "ä»¥ä¸?å?°å??ï¼?GNOME ç¿»è¯å??é??æ??å??å¿«å??è¦?æ?¨ï¼?\n"
+#~ "community linuxhall org\n"
+#~ "\n"
+#~ "Hialan Liu <hialan liu gmail com>, 2008.\n"
+#~ "Woodman Tuen <wmtuen gmail com>, 2005."
+
+#~ 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 "<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"
+#~ "å??äº«çµ¦å?¶ä»?é?»è?¦"
+
+#~ 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>å??é?³</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 "Country"
+#~ msgstr "å??å®¶"
+
+#~ msgid "PUK code required"
+#~ msgstr "é??è¦? PUK ç¢¼"
+
+#~ msgid "PUK code is needed for the mobile broadband device"
+#~ msgstr "é??å??è¡?å??å¯¬é »è£?ç½®é??è¦? PUK ç¢¼"
+
+#~ msgctxt "No wired security used"
+#~ msgid "None"
+#~ msgstr "ç?¡"
+
+#~ msgctxt "Unknown/unrecognized wired or wifi security"
+#~ msgid "Unknown"
+#~ msgstr "ä¸?æ??"
+
+#~ msgid "_Routes&#x2026;"
+#~ msgstr "è·¯ç?±&#x2026;(_R)"
+
+#~ msgid "Apply"
+#~ msgstr "å¥?ç?¨"
+
+#~ msgid "Save this connection for all users of this machine."
+#~ msgstr "å?²å?é??å??é?£ç·?çµ¦æ¤é?»è?¦ä¸?ç??æ??æ??ä½¿ç?¨è??ã??"
+
+#~ msgid "Apply..."
+#~ msgstr "å¥?ç?¨â?¦"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]