[network-manager-applet] Update Simplified Chinese translation.



commit f326fdd7fedf13b4ce21ed5475bff48c7f117344
Author: Aron Xu <aronxu gnome org>
Date:   Thu Jan 13 14:41:54 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 1793 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 1027 insertions(+), 766 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index aec0694..687de24 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,14 +6,16 @@
 # Funda Wang <fundawang linux net cn>, 2004.
 # Wei Mingzhi <whistler openoffice org>, 2009, 2010.
 # Leah Liu <lliu redhat com>, 2010.
+# Yinghua Wang <wantinghard gmail com>, 2010
 # Aron Xu <aronxu gnome org>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-12 20:48+0800\n"
-"PO-Revision-Date: 2010-07-12 20:51+0800\n"
-"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=NetworkManager&component=nm-applet\n"
+"POT-Creation-Date: 2011-01-06 23:21+0000\n"
+"PO-Revision-Date: 2011-01-13 22:38+0800\n"
+"Last-Translator: Yinghua Wang <wantinghard gmail com>\n"
 "Language-Team: Chinese (simplfied) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,7 +79,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 "ç½?ç»?è¿?æ?¥"
 
@@ -93,19 +95,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:816
+#: ../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:1257
+#: ../src/applet-device-wifi.c:1265 ../src/applet-device-wimax.c:424
 msgid "Connection Established"
 msgstr "��已建�"
 
@@ -114,25 +117,26 @@ msgid "You are now connected to the mobile broadband network."
 msgstr "æ?¨ç?°å?¨å·²è¿?æ?¥å?°ç§»å?¨å®½å¸¦ç½?ç»?ã??"
 
 #: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:414
-#: ../src/applet-device-gsm.c:457
+#: ../src/applet-device-gsm.c:457 ../src/applet-device-wimax.c:461
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "æ­£å?¨å??å¤?移å?¨å®½å¸¦è¿?æ?¥â??%sâ??..."
 
 #: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:417
-#: ../src/applet-device-gsm.c:460
+#: ../src/applet-device-gsm.c:460 ../src/applet-device-wimax.c:464
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "æ­£å?¨é??置移å?¨å®½å¸¦è¿?æ?¥â??%sâ??..."
 
 #: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:420
-#: ../src/applet-device-gsm.c:463
+#: ../src/applet-device-gsm.c:463 ../src/applet-device-wimax.c:467
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "移å?¨å®½å¸¦è¿?æ?¥â??%sâ??é??è¦?ç?¨æ?·è®¤è¯?..."
 
 #: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:423
-#: ../src/applet-device-gsm.c:466 ../src/applet.c:2298
+#: ../src/applet-device-gsm.c:466 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:2347
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "æ­£å?¨ä¸ºâ??%sâ??请æ±?ä¸?个ç½?ç»?å?°å??..."
@@ -143,7 +147,7 @@ msgstr "æ­£å?¨ä¸ºâ??%sâ??请æ±?ä¸?个ç½?ç»?å?°å??..."
 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"
@@ -154,9 +158,9 @@ 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 "移�宽带"
 
@@ -170,15 +174,17 @@ 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:624
+#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:677
 #: ../src/mb-menu-item.c:60
 msgid "GSM"
 msgstr "GSM"
@@ -192,83 +198,89 @@ msgstr "�建移�宽带(GSM)��..."
 msgid "You are now connected to the GSM network."
 msgstr "æ?¨ç?°å?¨å·²è¿?æ?¥å?° GSM ç½?ç»?ã??"
 
-#: ../src/applet-device-gsm.c:711
+#: ../src/applet-device-gsm.c:707
 msgid "PIN code required"
 msgstr "é??è¦? PIN ç ?"
 
-#: ../src/applet-device-gsm.c:713
-msgid "PUK code required"
-msgstr "é??è¦? PUK ç ?"
-
-#: ../src/applet-device-gsm.c:722
+#: ../src/applet-device-gsm.c:715
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "移å?¨å®½å¸¦è®¾å¤?é??è¦? PIN ç ?ã??"
 
-#: ../src/applet-device-gsm.c:724
-msgid "PUK code is needed for the mobile broadband device"
-msgstr "移å?¨å®½å¸¦è®¾å¤?é??è¦? PUK ç ?ã??"
-
-#: ../src/applet-device-gsm.c:857
+#: ../src/applet-device-gsm.c:847
 msgid "Wrong PIN code; please contact your provider."
 msgstr "é??误ç?? PIN 代ç ?ï¼?请è??ç»?æ?¨ç??ä¾?åº?å??ã??"
 
-#: ../src/applet-device-gsm.c:880
+#: ../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:907
+#: ../src/applet-device-gsm.c:897
 msgid "Sending unlock code..."
 msgstr "æ­£å?¨å??é??解é??ç ?..."
 
-#: ../src/applet-device-gsm.c:966
+#: ../src/applet-device-gsm.c:960
 msgid "SIM PIN unlock required"
 msgstr "é??è¦?解é?? SIM PIN"
 
-#: ../src/applet-device-gsm.c:967
+#: ../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:969
+#: ../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:970
+#. Translators: PIN code entry label
+#: ../src/applet-device-gsm.c:965
 msgid "PIN code:"
 msgstr "PIN 代��"
 
-#: ../src/applet-device-gsm.c:975
+#. 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:976
+#: ../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:978
+#: ../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:979
+#. Translators: PUK code entry label
+#: ../src/applet-device-gsm.c:977
 msgid "PUK code:"
 msgstr "PUK ç ?ï¼?"
 
-#: ../src/applet-device-gsm.c:981
+#. 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 "��以太�"
@@ -292,7 +304,7 @@ msgid "Wired Network"
 msgstr "æ??线ç½?ç»?"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:233 ../src/applet.c:1309
+#: ../src/applet-device-wired.c:233 ../src/applet.c:1342
 msgid "disconnected"
 msgstr "已��"
 
@@ -325,256 +337,334 @@ msgstr "æ­£å?¨ä¸ºâ??%sâ??请æ±?ä¸?个æ??线ç½?ç»?è¿?æ?¥å?°å??..."
 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)..."
 
-#: ../src/applet-device-wifi.c:120
+#: ../src/applet-device-wifi.c:121
 msgid "Create _New Wireless Network..."
 msgstr "å??建æ?°ç??æ? çº¿ç½?ç»?(_N)..."
 
-#: ../src/applet-device-wifi.c:748
+#: ../src/applet-device-wifi.c:750
 #, c-format
 msgid "Wireless Networks (%s)"
 msgstr "�线��(%s)"
 
-#: ../src/applet-device-wifi.c:750
+#: ../src/applet-device-wifi.c:752
 #, c-format
 msgid "Wireless Network (%s)"
 msgstr "�线��(%s)"
 
-#: ../src/applet-device-wifi.c:752
+#: ../src/applet-device-wifi.c:754
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "�线��"
 
-#: ../src/applet-device-wifi.c:782
+#: ../src/applet-device-wifi.c:787
 msgid "wireless is disabled"
 msgstr "�线��已��"
 
-#: ../src/applet-device-wifi.c:843
+#: ../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:1047
+#: ../src/applet-device-wifi.c:1053
 msgid "Wireless Networks Available"
 msgstr "�线����"
 
-#: ../src/applet-device-wifi.c:1048
+#: ../src/applet-device-wifi.c:1055
 msgid "Click on this icon to connect to a wireless network"
 msgstr "å??å?»æ­¤å?¾æ ?è¿?æ?¥å?°æ? çº¿ç½?ç»?"
 
-#: ../src/applet-device-wifi.c:1051 ../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:713
 msgid "Don't show this message again"
 msgstr "ä¸?å??æ?¾ç¤ºæ­¤ä¿¡æ?¯"
 
-#: ../src/applet-device-wifi.c:1255
+#: ../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:1256 ../src/applet-device-wifi.c:1287
+#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wifi.c:1295
 msgid "(none)"
 msgstr "(æ? )"
 
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-wifi.c:1305
 #, c-format
 msgid "Preparing wireless network connection '%s'..."
 msgstr "æ­£å?¨å??å¤?æ? çº¿ç½?ç»?è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "Configuring wireless network connection '%s'..."
 msgstr "æ­£å?¨é??ç½®æ? çº¿ç½?ç»?è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1311
 #, c-format
 msgid "User authentication required for wireless network '%s'..."
 msgstr "æ? çº¿ç½?ç»?â??%sâ??é??è¦?ç?¨æ?·è®¤è¯?..."
 
-#: ../src/applet-device-wifi.c:1306
+#: ../src/applet-device-wifi.c:1314
 #, c-format
 msgid "Requesting a wireless network address for '%s'..."
 msgstr "æ­£å?¨ä¸ºâ??%sâ??请æ±?ä¸?个æ? çº¿ç½?ç»?å?°å??..."
 
-#: ../src/applet-device-wifi.c:1326
+#: ../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:1330
+#: ../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 "wireless is disabled by hardware switch"
+msgid "WiMAX is disabled by hardware switch"
+msgstr "WiMAX å·²é??è¿?硬件å¼?å?³ç¦?ç?¨"
+
+#: ../src/applet-device-wimax.c:425
+#| msgid "You are now connected to the CDMA network."
+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 "æ? "
 
-#: ../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:313
+#: ../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: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ï¼?"
+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 ""
-"ç??æ??æ??æ?? (C) 2004-2008 Red Hat å?¬å?¸ã??\n"
-"ç??æ??æ??æ?? (C) 2005-2008 Novell å?¬å?¸ã??"
+"ç??æ??æ??æ?? (C) 2004-2008 Red Hat å?¬å?¸\n"
+"ç??æ??æ??æ?? (C) 2005-2008 Novell å?¬å?¸\n"
+"å??å?¶ä»?社å?ºè´¡ç?®è??å??ç¿»è¯?è??"
 
-#: ../src/applet-dialogs.c:676
+#: ../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 ""
-"Funda Wang <fundawang linux net cn>, 2007\n"
-"Wei Mingzhi <whistler_wmz users sf net>, 2009, 2010\n"
-"Leah Liu <lliu redhat com>, 2010\n"
-"Aron Xu <aronxu gnome org>, 2010"
-
-#: ../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:826
 #, c-format
 msgid ""
 "\n"
@@ -584,7 +674,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??ç½?ç»?è¿?æ?¥è¢«ä¸­æ?­ã??"
 
-#: ../src/applet.c:793
+#: ../src/applet.c:829
 #, c-format
 msgid ""
 "\n"
@@ -593,7 +683,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??VPN æ??å?¡å¼?常中æ?­ã??"
 
-#: ../src/applet.c:796
+#: ../src/applet.c:832
 #, c-format
 msgid ""
 "\n"
@@ -603,7 +693,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??VPN æ??å?¡è¿?å??äº?ä¸?个é??æ³?é??ç½®ã??"
 
-#: ../src/applet.c:799
+#: ../src/applet.c:835
 #, c-format
 msgid ""
 "\n"
@@ -612,7 +702,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??è¿?æ?¥è¶?æ?¶ã??"
 
-#: ../src/applet.c:802
+#: ../src/applet.c:838
 #, c-format
 msgid ""
 "\n"
@@ -621,7 +711,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??VPN æ??å?¡æ?ªå?¨æ??é??æ?¶é?´å??å?¯å?¨ã??"
 
-#: ../src/applet.c:805
+#: ../src/applet.c:841
 #, c-format
 msgid ""
 "\n"
@@ -630,7 +720,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??VPN æ??å?¡å?¯å?¨å¤±è´¥ã??"
 
-#: ../src/applet.c:808
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -639,7 +729,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??没æ??å??æ³?ç?? VPN secretã??"
 
-#: ../src/applet.c:811
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -648,7 +738,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??VPN secret é??æ³?ã??"
 
-#: ../src/applet.c:818
+#: ../src/applet.c:854
 #, c-format
 msgid ""
 "\n"
@@ -657,7 +747,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??"
 
-#: ../src/applet.c:836
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -667,7 +757,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??å·²æ?­å¼?ã??ç½?ç»?è¿?æ?¥è¢«ä¸­æ?­ã??"
 
-#: ../src/applet.c:839
+#: ../src/applet.c:875
 #, c-format
 msgid ""
 "\n"
@@ -676,7 +766,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??å·²æ?­å¼?ã??VPN æ??å?¡å·²å??æ­¢ã??"
 
-#: ../src/applet.c:845
+#: ../src/applet.c:881
 #, c-format
 msgid ""
 "\n"
@@ -685,15 +775,15 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??å·²æ?­å¼?ã??"
 
-#: ../src/applet.c:876
+#: ../src/applet.c:916
 msgid "VPN Login Message"
 msgstr "VPN ����"
 
-#: ../src/applet.c:888 ../src/applet.c:896 ../src/applet.c:943
+#: ../src/applet.c:926 ../src/applet.c:934 ../src/applet.c:981
 msgid "VPN Connection Failed"
 msgstr "VPN ��失败"
 
-#: ../src/applet.c:950
+#: ../src/applet.c:988
 #, c-format
 msgid ""
 "\n"
@@ -706,7 +796,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:953
+#: ../src/applet.c:991
 #, c-format
 msgid ""
 "\n"
@@ -719,296 +809,193 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1297
+#: ../src/applet.c:1330
 msgid "device not ready (firmware missing)"
 msgstr "设��就绪(缺��件)"
 
-#: ../src/applet.c:1299
+#: ../src/applet.c:1332
 msgid "device not ready"
 msgstr "设��就绪"
 
-#: ../src/applet.c:1325
+#: ../src/applet.c:1358
 msgid "Disconnect"
 msgstr "æ?­å¼?"
 
-#: ../src/applet.c:1339
+#: ../src/applet.c:1372
 msgid "device not managed"
 msgstr "设å¤?æ?ªæ??管"
 
-#: ../src/applet.c:1385
+#: ../src/applet.c:1416
 msgid "No network devices available"
 msgstr "没æ??å?¯ç?¨ç??ç½?ç»?设å¤?"
 
-#: ../src/applet.c:1473
+#: ../src/applet.c:1504
 msgid "_VPN Connections"
 msgstr "_VPN è¿?æ?¥"
 
-#: ../src/applet.c:1526
+#: ../src/applet.c:1557
 msgid "_Configure VPN..."
 msgstr "é??ç½® VPN(_C)..."
 
-#: ../src/applet.c:1530
+#: ../src/applet.c:1561
 msgid "_Disconnect VPN"
 msgstr "æ?­å¼? VPN(_D)"
 
-#: ../src/applet.c:1617
+#: ../src/applet.c:1659
 msgid "NetworkManager is not running..."
 msgstr "ç½?ç»?管ç??å?¨æ?ªè¿?è¡?..."
 
-#: ../src/applet.c:1622 ../src/applet.c:2426
+#: ../src/applet.c:1664 ../src/applet.c:2475
 msgid "Networking disabled"
 msgstr "��已��"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1851
+#: ../src/applet.c:1885
 msgid "Enable _Networking"
 msgstr "å?¯ç?¨è??ç½?(_N)"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:1860
+#: ../src/applet.c:1894
 msgid "Enable _Wireless"
 msgstr "���线(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1869
+#: ../src/applet.c:1903
 msgid "Enable _Mobile Broadband"
 msgstr "��移�宽带(_M)"
 
+#. 'Enable WiMAX Mobile Broadband' item
+#: ../src/applet.c:1912
+msgid "Enable WiMA_X Mobile Broadband"
+msgstr "�� WiMA_X 移�宽带"
+
 #. Toggle notifications item
-#: ../src/applet.c:1880
+#: ../src/applet.c:1923
 msgid "Enable N_otifications"
 msgstr "å?¯ç?¨é??ç?¥(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1891
+#: ../src/applet.c:1934
 msgid "Connection _Information"
 msgstr "��信�(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1901
+#: ../src/applet.c:1944
 msgid "Edit Connections..."
 msgstr "ç¼?è¾?è¿?æ?¥..."
 
 #. Help item
-#: ../src/applet.c:1915
+#: ../src/applet.c:1958
 msgid "_Help"
 msgstr "帮�(_H)"
 
 #. About item
-#: ../src/applet.c:1924
+#: ../src/applet.c:1967
 msgid "_About"
 msgstr "��(_A)"
 
-#: ../src/applet.c:2115
+#: ../src/applet.c:2158
 msgid "Disconnected"
 msgstr "已����"
 
-#: ../src/applet.c:2116
+#: ../src/applet.c:2159
 msgid "The network connection has been disconnected."
 msgstr "ç½?ç»?è¿?æ?¥ç?°å·²æ?­å¼?ã??"
 
-#: ../src/applet.c:2292
+#: ../src/applet.c:2341
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "æ­£å?¨å??å¤?ç½?ç»?è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet.c:2295
+#: ../src/applet.c:2344
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "ç½?ç»?è¿?æ?¥â??%sâ??é??è¦?ç?¨æ?·è®¤è¯?..."
 
-#: ../src/applet.c:2301
+#: ../src/applet.c:2350
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "ç½?ç»?è¿?æ?¥â??%sâ??å·²å¤?äº?æ´»å?¨ç?¶æ??"
 
-#: ../src/applet.c:2382
+#: ../src/applet.c:2431
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "æ­£å?¨å?¯å?¨ VPN è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet.c:2385
+#: ../src/applet.c:2434
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN è¿?æ?¥â??%sâ??é??è¦?ç?¨æ?·è®¤è¯?..."
 
-#: ../src/applet.c:2388
+#: ../src/applet.c:2437
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "æ­£å?¨ä¸ºâ??%sâ??请æ±?ä¸?个 VPN å?°å??..."
 
-#: ../src/applet.c:2391
+#: ../src/applet.c:2440
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN è¿?æ?¥â??%sâ??å·²å¤?äº?æ´»å?¨ç?¶æ??"
 
-#: ../src/applet.c:2430
+#: ../src/applet.c:2479
 msgid "No network connection"
 msgstr "没æ??ç½?ç»?è¿?æ?¥"
 
-#: ../src/applet.c:2979
+#: ../src/applet.c:3076
 msgid "NetworkManager Applet"
 msgstr "ç½?ç»?管ç??å?¨å°?ç¨?åº?"
 
-#: ../src/applet.c:2985 ../src/wired-dialog.c:128
+#: ../src/applet.c:3082 ../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 "ç½?ç»?管ç??å?¨å°?ç¨?åº?æ?¾ä¸?å?°æ??é??ç??èµ?æº?(glade æ??件æ?ªæ?¾å?°)ã??"
+msgstr "ç½?ç»?管ç??å?¨å°?ç¨?åº?æ?¾ä¸?å?°æ??é??ç??èµ?æº?(.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.ui.h:2
+msgid "Active Network Connections"
+msgstr "æ´»å?¨ç??ç½?ç»?è¿?æ?¥"
 
-#: ../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.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 "C_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)"
-
-#: ../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 "æ ?ç­¾"
 
@@ -1016,77 +1003,121 @@ 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 "ç?±äº?ä¸?个æ?ªç?¥é??误ï¼?æ?´æ?°è¿?æ?¥ secret æ?¶å¤±è´¥ã??"
 
-#: ../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"
-"����\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.glade.h:7
+#: ../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.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."
 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 å?°å??å®?æ??è¿?个è¿?æ?¥"
 
-#: ../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, "
@@ -1095,12 +1126,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."
@@ -1108,31 +1139,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 å?°å??å®?æ??è¿?个è¿?æ?¥"
 
-#: ../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."
@@ -1140,209 +1171,220 @@ 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.glade.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "Basic"
+msgstr "��"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "Change..."
 msgstr "æ?´æ?¹..."
 
-#: ../src/connection-editor/ce-page-mobile.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 "æ??æ??æ?¡æ??认è¯?å??è®®"
 
-#: ../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)..."
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:12
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
+msgid "Echo"
+msgstr "å??声"
+
+#: ../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 "微软æ??æ??æ?¡æ??认è¯?å??è®®"
 
-#: ../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 "微软æ??æ??æ?¡æ??认è¯?å??议第äº?ç??"
 
-#: ../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/�"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:2
+msgid "10 Gb/s"
+msgstr "10 Gb/�"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:3
+msgid "10 Mb/s"
+msgstr "10 Mb/�"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:4
+msgid "100 Mb/s"
+msgstr "100 Mb/�"
+
+#: ../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
-msgid ""
-"Automatic\n"
-"10 Mb/s\n"
-"100 Mb/s\n"
-"1 Gb/s\n"
-"10 Gb/s"
-msgstr ""
-"��\n"
-"10 Mb/s\n"
-"100 Mb/s\n"
-"1 Gb/s\n"
-"10 Gb/s"
+#: ../src/connection-editor/ce-page-wired.ui.h:8
+msgid "BNC"
+msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:7
-msgid ""
-"Automatic\n"
-"Twisted Pair (TP)\n"
-"Attachment Unit Interface (AUI)\n"
-"BNC\n"
-"Media Independent Interface (MII)"
-msgstr ""
-"��\n"
-"å??ç»?线(TP)\n"
-"é??件æ?¥å?£(AUI)\n"
-"BNC\n"
-"�质����(MII)"
-
-#: ../src/connection-editor/ce-page-wired.glade.h:12
+#: ../src/connection-editor/ce-page-wired.ui.h:9
 msgid "Full duple_x"
 msgstr "å?¨å??å·¥(_X)"
 
-#: ../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:11
+#: ../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 ""
 "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"
+"æ­¤å¤?è¾?å?¥ç?? MAC å?°å??å°?å?¨è®¾å¤?å?¯å?¨æ?¶è¢«æ ?记为ç½?ç»?设å¤?硬件å?°å??ï¼?该ç?¹æ?§è¢«ç§°ä½?MAC å??"
+"é??ã??ä¾?å¦?ï¼?00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:15
-#: ../src/connection-editor/ce-page-wireless.glade.h:12
+#: ../src/connection-editor/ce-page-wired.ui.h:13
+#: ../src/connection-editor/ce-page-wireless.ui.h:12
 msgid ""
 "This option locks this connection to the network device specified by its "
 "permanent MAC address entered here.  Example: 00:11:22:33:44:55"
@@ -1350,64 +1392,66 @@ msgstr ""
 "æ­¤é??项å?¯å°?æ­¤è¿?æ?¥é??å®?è?³ä»¥å?¨æ­¤è¾?å?¥ç?? MAC å?°å??æ??å®?ç??ç½?ç»?设å¤?ã??ä¾?å¦?ï¼?"
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:16
-#: ../src/connection-editor/ce-page-wireless.glade.h:16
+#: ../src/connection-editor/ce-page-wired.ui.h:14
+msgid "Twisted Pair (TP)"
+msgstr "å??ç»?线(TP)"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:15
+#: ../src/connection-editor/ce-page-wireless.ui.h:16
 msgid "_Cloned MAC address:"
 msgstr "å??é?? MAC å?°å??(_C)ï¼?"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:17
-#: ../src/connection-editor/ce-page-wireless.glade.h:17
+#: ../src/connection-editor/ce-page-wired.ui.h:16
+#: ../src/connection-editor/ce-page-wireless.ui.h:17
 msgid "_Device MAC address:"
 msgstr "设å¤? MAC å?°å??(_D)ï¼?"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:18
+#: ../src/connection-editor/ce-page-wired.ui.h:17
 msgid "_Port:"
 msgstr "端�(_P)�"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:19
+#: ../src/connection-editor/ce-page-wired.ui.h:18
 msgid "_Speed:"
 msgstr "é??度(_S)ï¼?"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:20
-#: ../src/connection-editor/ce-page-wireless.glade.h:20
+#: ../src/connection-editor/ce-page-wired.ui.h:19
+#: ../src/connection-editor/ce-page-wireless.ui.h:20
 msgid "bytes"
 msgstr "å­?è??"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:1
-msgid ""
-"Automatic\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
-msgstr ""
-"��\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
+#: ../src/connection-editor/ce-page-wireless.ui.h:1
+msgid "A (5 GHz)"
+msgstr "A (5 GHz)"
+
+#: ../src/connection-editor/ce-page-wireless.ui.h:2
+msgid "Ad-hoc"
+msgstr "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 ""
-"æ?¶æ??\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:13
+#: ../src/connection-editor/ce-page-wireless.ui.h:13
 msgid ""
 "This option locks this connection to the wireless access point (AP) "
 "specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
@@ -1415,119 +1459,118 @@ msgstr ""
 "æ­¤é??项å?¯å°?æ­¤è¿?æ?¥é??å®?è?³ä»¥å?¨æ­¤è¾?å?¥ç?? BSSID æ??å®?ç??æ? çº¿è®¿é?®ç?¹(AP)ã??ä¾?å¦?ï¼?"
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:14
+#: ../src/connection-editor/ce-page-wireless.ui.h:14
 msgid "Transmission po_wer:"
 msgstr "ä¼ è¾?å??ç??(_W)ï¼?"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:15
+#: ../src/connection-editor/ce-page-wireless.ui.h:15
 msgid "_BSSID:"
 msgstr "_BSSIDï¼?"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:18
+#: ../src/connection-editor/ce-page-wireless.ui.h:18
 msgid "_Rate:"
 msgstr "é??ç??(_R)ï¼?"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:19
+#: ../src/connection-editor/ce-page-wireless.ui.h:19
 msgid "_SSID:"
 msgstr "_SSIDï¼?"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:21
+#: ../src/connection-editor/ce-page-wireless.ui.h:21
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless-security.glade.h:1
+#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
 msgid "_Security:"
 msgstr "���(_S)�"
 
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:2
+#: ../src/connection-editor/ce-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"
-"\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:696
+#: ../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:730
+#: ../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:713
+#: ../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"
 
 #: ../src/connection-editor/page-ip4.c:126
-#: ../src/connection-editor/page-ip6.c:122
+#: ../src/connection-editor/page-ip6.c:125
 msgid "Automatic (VPN)"
 msgstr "��(VPN)"
 
 #: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:123
+#: ../src/connection-editor/page-ip6.c:126
 msgid "Automatic (VPN) addresses only"
 msgstr "è?ªå?¨(VPN)ä»?å?°å??"
 
 #: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:126
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (PPP)"
 msgstr "��(PPP)"
 
 #: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:127
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (PPP) addresses only"
 msgstr "è?ªå?¨(PPP)ä»?å?°å??"
 
 #: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:129
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "��(PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "è?ªå?¨(PPPoE)ä»?å?°å??"
 
@@ -1539,91 +1582,78 @@ msgstr "��(DHCP)"
 msgid "Automatic (DHCP) addresses only"
 msgstr "è?ªå?¨(DHCP)ä»?å?°å??"
 
-#: ../src/connection-editor/page-ip4.c:162
-#: ../src/connection-editor/page-ip6.c:170
-msgid "Manual"
-msgstr "æ??å?¨"
-
 #: ../src/connection-editor/page-ip4.c:174
-#: ../src/connection-editor/page-ip6.c:183
+#: ../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:190
-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:132
-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:133
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "è?ªå?¨ï¼?ä»?å?°å??"
 
-#: ../src/connection-editor/page-ip6.c:145
-#: ../src/wireless-security/eap-method.c:212
+#: ../src/connection-editor/page-ip6.c:148
+#: ../src/wireless-security/eap-method.c:234
 msgid "Ignore"
 msgstr "忽�"
 
-#: ../src/connection-editor/page-ip6.c:658
+#: ../src/connection-editor/page-ip6.c:172
+msgid "Automatic, DHCP only"
+msgstr "���� DHCP"
+
+#: ../src/connection-editor/page-ip6.c:685
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "æ­£å?¨ç¼?è¾? %s ç?? IPv6 è·¯ç?±"
 
-#: ../src/connection-editor/page-ip6.c:775
-#: ../src/connection-editor/page-ip6.c:782
-msgid "Could not load IPv6 user interface."
-msgstr "æ? æ³?å? è½½ IPv6 ç?¨æ?·ç??é?¢ã??"
-
-#: ../src/connection-editor/page-ip6.c:788
+#: ../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)"
 
@@ -1632,23 +1662,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"
 
@@ -1662,53 +1692,59 @@ 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:213
-#: ../src/connection-editor/page-wired.c:220
-msgid "Could not load wired user interface."
-msgstr "æ? æ³?å? è½½æ??线ç½?ç»?ç?¨æ?·ç??é?¢ã??"
-
-#: ../src/connection-editor/page-wired.c:226
-#: ../src/connection-editor/nm-connection-editor.glade.h:9
-#: ../src/connection-editor/nm-connection-list.c:1393
+#: ../src/connection-editor/page-wired.c: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:359
+#: ../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 "æ? æ³?å? è½½â??æ??线ç½?ç»?å®?å?¨æ?§â??å®?å?¨æ?§ç?¨æ?·ç??é?¢ã??"
+
+#: ../src/connection-editor/page-wired-security.c:129
 msgid "Use 802.1X security for this connection"
 msgstr "对此��使� 802.1x ���"
 
@@ -1724,60 +1760,58 @@ msgstr "�认"
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:399
-#: ../src/connection-editor/page-wireless.c:406
-msgid "Could not load WiFi user interface."
-msgstr "æ? æ³?å? è½½ WiFi ç?¨æ?·ç??é?¢ã??"
-
-#: ../src/connection-editor/page-wireless.c:412
-#: ../src/connection-editor/nm-connection-editor.glade.h:10
-#: ../src/connection-editor/nm-connection-list.c:1397
+#: ../src/connection-editor/page-wireless.c: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:574
+#: ../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
+#: ../src/wireless-dialog.c:943
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 ä½?å¯?é?¥(å??å?­è¿?å?¶æ?? 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"
@@ -1787,107 +1821,104 @@ msgstr "正��� %s"
 msgid "Editing un-named connection"
 msgstr "ç¼?è¾?æ?ªå?½å??è¿?æ?¥"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../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:300
-msgid ""
-"The connection editor could not find some required resources (the glade file "
+"The connection editor could not find some required resources (the .ui file "
 "was not found)."
-msgstr "è¿?æ?¥ç¼?è¾?å?¨æ?¾ä¸?å?°æ??é??ç??èµ?æº?(æ?ªæ?¾å?° glade æ??件)ã??"
+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
+#: ../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 "è¿?æ?¥å??称(_I)"
 
-#: ../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
@@ -1901,7 +1932,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."
@@ -1928,12 +1959,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"
@@ -1943,51 +1974,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 "
@@ -1999,29 +2034,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 "æ?¯å?¦è¦?å°? %s æ?¿æ?¢ä¸ºæ?¨æ­£å?¨ä¿?å­?ç?? VPN è¿?æ?¥?"
 
-#: ../src/connection-editor/vpn-helpers.c:350
+#: ../src/connection-editor/vpn-helpers.c:349
 msgid "Cannot export VPN connection"
 msgstr "��导� VPN ��"
 
-#: ../src/connection-editor/vpn-helpers.c:352
+#: ../src/connection-editor/vpn-helpers.c:351
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2032,83 +2067,83 @@ msgstr ""
 "\n"
 "é??误: %sã??"
 
-#: ../src/connection-editor/vpn-helpers.c:386
+#: ../src/connection-editor/vpn-helpers.c:385
 msgid "Export VPN connection..."
 msgstr "导� VPN ��"
 
-#: ../src/gnome-bluetooth/bt-widget.c:213
+#: ../src/gnome-bluetooth/bt-widget.c: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 "æ­£å?¨æ£?æµ?ç?µè¯?é??ç½®..."
 
-#: ../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 代ç??æ??å?¡å?¨å¤±è´¥)ã??"
 
-#: ../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)."
 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)"
 
@@ -2158,73 +2193,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
+#: ../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 "
@@ -2236,23 +2275,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 (访é?®ç?¹å??称)ï¼?"
 
-#: ../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"
@@ -2263,101 +2302,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 "æ??ç??计å??没æ??被å??å?º..."
 
-#: ../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
+#: ../src/utils/mobile-wizard.c:1023
 msgid "Country List:"
 msgstr "å?½å®¶/å?°å?ºå??表ï¼?"
 
-#: ../src/utils/mobile-wizard.c:1024
+#: ../src/utils/mobile-wizard.c:1035
 msgid "Country"
 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
+#: ../src/utils/mobile-wizard.c:1088
 msgid "Choose your Provider's Country"
 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 "�移�宽带��"
 
@@ -2365,23 +2404,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 "
@@ -2392,60 +2431,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 "�建..."
 
-#: ../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'."
 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:206
+#: ../src/wireless-security/eap-method.c:228
 msgid "No Certificate Authority certificate chosen"
 msgstr "æ?ªé??å®?认è¯?中å¿?è¯?书"
 
-#: ../src/wireless-security/eap-method.c:207
+#: ../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 "
@@ -2454,37 +2493,70 @@ msgstr ""
 "ä¸?使ç?¨è®¤è¯?中å¿?(CA)è¯?书å?¯è?½å¯¼è?´è¿?æ?¥å?°ä¸?å®?å?¨ç??ã??模ç³?ç??æ? çº¿ç½?ç»?ã??è¦?é??æ?©ä¸?个认è¯?"
 "中å¿?è¯?书å??ï¼?"
 
-#: ../src/wireless-security/eap-method.c:216
+#: ../src/wireless-security/eap-method.c:238
 msgid "Choose CA Certificate"
 msgstr "é??æ?© CA è¯?书æ??件"
 
-#: ../src/wireless-security/eap-method.c:531
+#: ../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:534
+#: ../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 "é??æ?©ä¸?个认è¯?中å¿?è¯?书..."
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
+msgid "Anony_mous identity:"
+msgstr "å?¿å??身份(_M)ï¼?"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
+msgid "C_A certificate:"
+msgstr "C_A �书�"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:5
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "I_nner authentication:"
+msgstr "å??é?¨è®¤è¯?(_N)ï¼?"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:6
+msgid "Version 0"
+msgstr "ç??æ?¬ 0"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:7
+msgid "Version 1"
+msgstr "ç??æ?¬ 1"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+msgid "_PEAP version:"
+msgstr "_PEAP ç??æ?¬ï¼?"
+
+#: ../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 "
@@ -2497,28 +2569,217 @@ 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 "é??æ?©æ?¨ç??个人è¯?书..."
 
-#: ../src/wireless-security/eap-method-tls.c:463
+#: ../src/wireless-security/eap-method-tls.c:443
 msgid "Choose your private key..."
 msgstr "é??æ?©æ?¨ç??ç§?é?¥..."
 
-#: ../src/wireless-security/wireless-security.c:329
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "I_dentity:"
+msgstr "身份(_D)�"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+msgid "Private _key:"
+msgstr "��(_K)�"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+msgid "_Private key password:"
+msgstr "����(_P)�"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+msgid "_User certificate:"
+msgstr "���书(_U)�"
+
+#: ../src/wireless-security/nag-user-dialog.ui.h:1
+msgid "Don't _warn me again"
+msgstr "以å??ä¸?å??è­¦å??(_W)"
+
+#: ../src/wireless-security/nag-user-dialog.ui.h:2
+msgid "No"
+msgstr "å?¦"
+
+#: ../src/wireless-security/nag-user-dialog.ui.h:3
+msgid "Yes"
+msgstr "æ?¯"
+
+#: ../src/wireless-security/wireless-security.c: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)"
 
-#~ msgid "Automatic, DHCP only"
-#~ msgstr "���� DHCP"
+#: ../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 "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 "translator-credits"
+#~ msgstr ""
+#~ "Funda Wang <fundawang linux net cn>, 2007\n"
+#~ "Wei Mingzhi <whistler_wmz users sf net>, 2009, 2010\n"
+#~ "Leah Liu <lliu redhat com>, 2010\n"
+#~ "Aron Xu <aronxu gnome org>, 2010"
+
+#~ 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"
+#~ "����\n"
+#~ "���计���享"
+
+#~ msgid "_Routes&#x2026;"
+#~ msgstr "路�&#x2026;(_R)"
+
+#~ 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 "Apply"
+#~ msgstr "��"
+
+#~ msgid "Apply..."
+#~ msgstr "��..."
 
 #~ msgid "Save this connection for all users of this machine."
 #~ msgstr "为æ?¬æ?ºå?¨é?¨ç?¨æ?·ä¿?å­?æ­¤è¿?æ?¥ã??"



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