[network-manager-applet] Updated Traditional Chinese translation(both Hongkong and Taiwan)

[Chao-Hsiung Liao <chliao src gnome org>]

commit d1005a3cb1fdebc57f1e8bfd6d9aff78aa25abea
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Tue Apr 21 20:02:12 2009 +0800

    Updated Traditional Chinese translation(both Hongkong and Taiwan)
---
 po/ChangeLog |    5 +
 po/zh_HK.po  | 2075 +++++++++++++++++++++++++++++++++++++--------------------
 po/zh_TW.po  | 2079 ++++++++++++++++++++++++++++++++++++++--------------------
 3 files changed, 2701 insertions(+), 1458 deletions(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index 99e79d8..e68a6cd 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-21  Chao-Hsiung Liao  <j_h_liau yahoo com tw>
+
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+
 2009-04-13  ReÅ?at SABIQ <tilde birlik gmail com>
 
 	* LINGUAS: crh
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 8476ba5..dfc15d5 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,275 +7,381 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Network Manager 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-01 21:01+0800\n"
-"PO-Revision-Date: 2008-04-01 21:01+0800\n"
-"Last-Translator: Hialan Liu <hialan liu gmail com>\n"
+"POT-Creation-Date: 2009-04-21 19:48+0800\n"
+"PO-Revision-Date: 2009-04-21 19:51+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.2.1\n"
 
-#: ../src/applet-device-cdma.c:55
-msgid "Auto CDMA network connection"
-msgstr "è?ªå?? CDMA 網絡é?£ç·?"
+#: ../nm-applet.desktop.in.h:1
+msgid "Control your network connections"
+msgstr "æ?§å?¶ä½ ç??網絡é?£ç·?"
 
-#: ../src/applet-device-cdma.c:195 ../src/applet-device-gsm.c:195
-msgid "Disconnect..."
-msgstr "æ?·ç·?..."
+#: ../nm-applet.desktop.in.h:2
+msgid "Network Manager"
+msgstr "網絡管ç??å?¡"
 
-#: ../src/applet-device-cdma.c:235
-#, c-format
-msgid "CDMA Connections (%s)"
-msgstr "CDMA �� (%s)"
+#: ../nm-connection-editor.desktop.in.h:1
+msgid "Manage and change your network connection settings"
+msgstr "管ç??è??æ?´æ?¹ä½ ç??é?£ç·?設å®?å?¼"
+
+#: ../nm-connection-editor.desktop.in.h:2
+#: ../src/connection-editor/nm-connection-editor.glade.h:7
+msgid "Network Connections"
+msgstr "網絡��"
 
-#: ../src/applet-device-cdma.c:237
+#: ../src/applet-device-cdma.c:54
+msgid "Auto Mobile Broadband (CDMA) connection"
+msgstr "è?ªå??è¡?å??å¯¬é » (CDMA) é?£ç·?"
+
+#: ../src/applet-device-cdma.c:204 ../src/applet-device-gsm.c:205
+msgid "Disconnect"
+msgstr "æ?·ç·?"
+
+#: ../src/applet-device-cdma.c:243 ../src/applet-device-gsm.c:244
 #, c-format
-msgid "CDMA Network (%s)"
-msgstr "CDMA 網絡 (%s)"
+msgid "Mobile Broadband (%s)"
+msgstr "è¡?å??å¯¬é » (%s)"
 
-#: ../src/applet-device-cdma.c:240
-msgid "CDMA Connections"
-msgstr "CDMA ��"
+#: ../src/applet-device-cdma.c:245 ../src/applet-device-gsm.c:246
+#: ../src/connection-editor/page-mobile.c:308
+#: ../src/connection-editor/nm-connection-editor.glade.h:6
+#: ../src/connection-editor/nm-connection-list.c:1812
+msgid "Mobile Broadband"
+msgstr "è¡?å??å¯¬é »"
 
-#: ../src/applet-device-cdma.c:242
-msgid "CDMA Network"
-msgstr "CDMA 網絡"
+#: ../src/applet-device-cdma.c:298 ../src/applet-device-gsm.c:299
+#: ../src/applet-device-wired.c:261
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "ä½ ç?¾å?¨å·²é?£ç·?è?³ã??%sã??ã??"
 
-#: ../src/applet-device-cdma.c:275 ../src/applet-device-gsm.c:275
-#: ../src/applet-device-wired.c:235 ../src/applet-device-wireless.c:969
+#: ../src/applet-device-cdma.c:302 ../src/applet-device-gsm.c:303
+#: ../src/applet-device-wired.c:265 ../src/applet-device-wifi.c:1184
 msgid "Connection Established"
 msgstr "已建���"
 
-#: ../src/applet-device-cdma.c:276
+#: ../src/applet-device-cdma.c:303
 msgid "You are now connected to the CDMA network."
 msgstr "ä½ ç?¾å?¨å·²é?£ç·?è?³ CDMA 網絡ã??"
 
-#: ../src/applet-device-cdma.c:294
+#: ../src/applet-device-cdma.c:329 ../src/applet-device-gsm.c:330
 #, c-format
-msgid "Dialing CDMA device %s..."
-msgstr "æ­£å?¨æ?¥è?? CDMA è£?ç½® %s..."
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "æ­£å?¨æº?å??è¡?å??å¯¬é »é?£ç·?ã??%sã??..."
 
-#: ../src/applet-device-cdma.c:297 ../src/applet-device-gsm.c:297
+#: ../src/applet-device-cdma.c:332 ../src/applet-device-gsm.c:333
 #, c-format
-msgid "Running PPP on device %s..."
-msgstr "正��� PPP ��置 %s..."
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "æ­£å?¨è¨­å®?è¡?å??å¯¬é »é?£ç·?ã??%sã??..."
 
-#: ../src/applet-device-cdma.c:300
-msgid "CDMA connection"
-msgstr "CDMA ��"
+#: ../src/applet-device-cdma.c:335 ../src/applet-device-gsm.c:336
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "è¡?å??å¯¬é »é?£ç·?ã??%sã??é??è¦?使ç?¨è??é©?è­?..."
 
-#: ../src/applet-device-gsm.c:55
-msgid "Auto GSM network connection"
-msgstr "è?ªå?? GSM 網絡é?£ç·?"
+#: ../src/applet-device-cdma.c:338 ../src/applet-device-gsm.c:339
+#: ../src/applet.c:1831
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "æ­£å?¨è¦?æ±?ã??%sã??æ??ä¾?網絡ä½?å??..."
 
-#: ../src/applet-device-gsm.c:235
+#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:343
 #, c-format
-msgid "GSM Connections (%s)"
-msgstr "GSM �� (%s)"
+msgid "Mobile broadband connection '%s' active"
+msgstr "è¡?å??å¯¬é »é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸­"
 
-#: ../src/applet-device-gsm.c:237
+#: ../src/applet-device-cdma.c:458 ../src/applet-device-gsm.c:541
+msgid "Mobile broadband network password"
+msgstr "è¡?å??å¯¬é »ç¶²çµ¡å¯?碼"
+
+#: ../src/applet-device-cdma.c:467 ../src/applet-device-gsm.c:550
 #, c-format
-msgid "GSM Network (%s)"
-msgstr "GSM 網絡 (%s)"
+msgid "A password is required to connect to '%s'."
+msgstr "é?£ç·?è?³ã??%sã??é??è¦?å¯?碼ã??"
 
-#: ../src/applet-device-gsm.c:240
-msgid "GSM Connections"
-msgstr "GSM ��"
+#: ../src/applet-device-cdma.c:485 ../src/applet-device-gsm.c:568
+#: ../src/applet.glade.h:25 ../src/connection-editor/ce-page-dsl.glade.h:1
+#: ../src/connection-editor/ce-page-mobile.glade.h:14
+msgid "Password:"
+msgstr "�碼�"
 
-#: ../src/applet-device-gsm.c:242
-msgid "GSM Network"
-msgstr "GSM 網絡"
+#: ../src/applet-device-gsm.c:55
+msgid "Auto Mobile Broadband (GSM) connection"
+msgstr "è?ªå??è¡?å??å¯¬é » (GSM) é?£ç·?"
 
-#: ../src/applet-device-gsm.c:276
+#: ../src/applet-device-gsm.c:304
 msgid "You are now connected to the GSM network."
 msgstr "ä½ ç?¾å?¨å·²é?£ç·?è?³ GSM 網絡ã??"
 
-#: ../src/applet-device-gsm.c:294
-#, c-format
-msgid "Dialing GSM device %s..."
-msgstr "æ­£å?¨æ?¥è?? GSM è£?ç½® %s..."
+#: ../src/applet-device-gsm.c:481
+msgid "PIN code required"
+msgstr "é??è¦? PIN 碼"
+
+#: ../src/applet-device-gsm.c:483
+msgid "PUK code required"
+msgstr "é??è¦? PUK 碼"
 
-#: ../src/applet-device-gsm.c:300
-msgid "GSM connection"
-msgstr "GSM ��"
+#: ../src/applet-device-gsm.c:492
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "é??å??è¡?å??å¯¬é »è£?ç½®é??è¦? PIN 碼"
 
-#: ../src/applet-device-wired.c:64
+#: ../src/applet-device-gsm.c:494
+msgid "PUK code is needed for the mobile broadband device"
+msgstr "é??å??è¡?å??å¯¬é »è£?ç½®é??è¦? PUK 碼"
+
+#: ../src/applet-device-wired.c:63
 msgid "Auto Ethernet"
 msgstr "è?ªå??ä¹?太網絡"
 
-#: ../src/applet-device-wired.c:191
+#: ../src/applet-device-wired.c:197
 #, c-format
 msgid "Wired Networks (%s)"
 msgstr "æ??ç·?網絡 (%s)"
 
-#: ../src/applet-device-wired.c:193
+#: ../src/applet-device-wired.c:199
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "æ??ç·?網絡 (%s)"
 
-#: ../src/applet-device-wired.c:196
+#: ../src/applet-device-wired.c:202
 msgid "Wired Networks"
 msgstr "æ??ç·?網絡"
 
-#: ../src/applet-device-wired.c:198
+#: ../src/applet-device-wired.c:204
 msgid "Wired Network"
 msgstr "æ??ç·?網絡"
 
-#: ../src/applet-device-wired.c:236
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet-device-wired.c:227
+msgid "disconnected"
+msgstr "已��"
+
+#: ../src/applet-device-wired.c:266
 msgid "You are now connected to the wired network."
 msgstr "ä½ ç?¾å?¨å·²é?£ç·?è?³æ??ç·?網絡ã??"
 
-#: ../src/applet-device-wired.c:254
+#: ../src/applet-device-wired.c:292
 #, c-format
-msgid "Preparing device %s for the wired network..."
-msgstr "è£?ç½® %s æ­£æº?å??é?£æ?¥æ??ç·?網絡..."
+msgid "Preparing wired network connection '%s'..."
+msgstr "æ­£å?¨æº?å??æ??ç·?網絡é?£ç·?ã??%sã??..."
 
-#: ../src/applet-device-wired.c:257
+#: ../src/applet-device-wired.c:295
 #, c-format
-msgid "Configuring device %s for the wired network..."
-msgstr "ç?ºæ??ç·?網絡設置è£?ç½® %s ..."
+msgid "Configuring wired network connection '%s'..."
+msgstr "æ­£å?¨è¨­å®?æ??ç·?網絡é?£ç·?ã??%sã??..."
 
-#: ../src/applet-device-wired.c:260
+#: ../src/applet-device-wired.c:298
 #, c-format
-msgid "Requesting a network address from the wired network..."
-msgstr "æ­£è¦?æ±?æ??ç·?網絡æ??ä¾?網絡ä½?å??..."
+msgid "User authentication required for wired network connection '%s'..."
+msgstr "æ??ç·?網絡é?£ç·?ã??%sã??é??è¦?使ç?¨è??é©?è­?..."
 
-#: ../src/applet-device-wired.c:264
-msgid "Wired network connection"
-msgstr "æ??ç·?網絡é?£æ?¥"
+#: ../src/applet-device-wired.c:301
+#, c-format
+msgid "Requesting a wired network address for '%s'..."
+msgstr "æ­£è¦?æ±?æ??ç·?網絡ã??%sã??æ??ä¾?網絡ä½?å??..."
 
-#: ../src/applet-device-wired.c:459
-#, fuzzy
+#: ../src/applet-device-wired.c:305
+#, c-format
+msgid "Wired network connection '%s' active"
+msgstr "æ??ç·?網絡é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸­"
+
+#: ../src/applet-device-wired.c:558
 msgid "DSL authentication"
-msgstr "é©?è­?ï¼?"
+msgstr "DSL é©?è­?"
 
-#: ../src/applet-device-wireless.c:86
-msgid "_Connect to Other Wireless Network..."
-msgstr "é?£æ?¥å?°å?¶å®?ç??ç?¡ç·?網絡(_C)..."
+#: ../src/applet-device-wifi.c:91
+msgid "_Connect to Hidden Wireless Network..."
+msgstr "é?£æ?¥å?°é?±è??ç??ç?¡ç·?網絡(_C)..."
 
-#: ../src/applet-device-wireless.c:124
+#: ../src/applet-device-wifi.c:122
 msgid "Create _New Wireless Network..."
 msgstr "建ç«?æ?°ç??ç?¡ç·?網絡(_N)..."
 
-#: ../src/applet-device-wireless.c:661
+#: ../src/applet-device-wifi.c:693
 #, c-format
 msgid "Wireless Networks (%s)"
 msgstr "��網絡 (%s)"
 
-#: ../src/applet-device-wireless.c:663
+#: ../src/applet-device-wifi.c:695
 #, c-format
 msgid "Wireless Network (%s)"
 msgstr "��網絡 (%s)"
 
-#: ../src/applet-device-wireless.c:665
+#: ../src/applet-device-wifi.c:697
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "��網絡"
 
-#: ../src/applet-device-wireless.c:967
+#: ../src/applet-device-wifi.c:714
+msgid "wireless is disabled"
+msgstr "ç?¡ç·?網絡已å??ç?¨"
+
+#: ../src/applet-device-wifi.c:977
+msgid "Wireless Networks Available"
+msgstr "å?¯ç?¨ç??ç?¡ç·?網絡"
+
+#: ../src/applet-device-wifi.c:978
+msgid "Click on this icon to connect to a wireless network"
+msgstr "è«?æ??é??å??å??示ä¾?é?£ç·?å?°ç?¡ç·?網絡"
+
+#: ../src/applet-device-wifi.c:981 ../src/applet.c:438
+msgid "Don't show this message again"
+msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯"
+
+#: ../src/applet-device-wifi.c:1182
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "ä½ ç?¾å?¨å·²é?£ç·?å?°ç?¡ç·?網絡ã??%sã??ã??"
 
-#: ../src/applet-device-wireless.c:968 ../src/applet-device-wireless.c:996
+#: ../src/applet-device-wifi.c:1183 ../src/applet-device-wifi.c:1214
 msgid "(none)"
 msgstr "(ç?¡)"
 
-#: ../src/applet-device-wireless.c:1000
+#: ../src/applet-device-wifi.c:1224
 #, c-format
-msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "è£?ç½® %s æ­£æº?å??é?£æ?¥ç?¡ç·?網絡â??%sâ??..."
+msgid "Preparing wireless network connection '%s'..."
+msgstr "æ­£å?¨æº?å??ç?¡ç·?網絡é?£ç·?ã??%sã??..."
 
-#: ../src/applet-device-wireless.c:1003
+#: ../src/applet-device-wifi.c:1227
 #, c-format
-msgid "Attempting to join the wireless network '%s'..."
-msgstr "æ­£å?¨å??試å? å?¥ç?¡ç·?網絡â??%sâ??..."
+msgid "Configuring wireless network connection '%s'..."
+msgstr "æ­£å?¨è¨­å®?ç?¡ç·?網絡é?£ç·?ã??%sã??..."
 
-#: ../src/applet-device-wireless.c:1006
+#: ../src/applet-device-wifi.c:1230
 #, c-format
-msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "æ­£è¦?æ±?ç?¡ç·?網絡â??%sâ??æ??ä¾?網絡ä½?å??..."
+msgid "User authentication required for wireless network '%s'..."
+msgstr "ç?¡ç·?網絡ã??%sã??è¦?æ±?使ç?¨è??é©?è­?..."
 
-#: ../src/applet-device-wireless.c:1009
+#: ../src/applet-device-wifi.c:1233
 #, c-format
-msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "æ­£å?¨ç­?å¾?ç?¡ç·?網絡â??%sâ??ç??網絡å¯?碼å??..."
+msgid "Requesting a wireless network address for '%s'..."
+msgstr "æ­£å?¨è¦?æ±?ç?¡ç·?網絡ã??%sã??æ??ä¾?網絡ä½?å??..."
 
-#: ../src/applet-device-wireless.c:1029
+#: ../src/applet-device-wifi.c:1253
 #, c-format
-msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "ç?¡ç·?網絡é?£æ?¥å?°â??%sâ?? (%d%%)"
+msgid "Wireless network connection '%s' active: %s (%d%%)"
+msgstr "ç?¡ç·?網絡é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸­ï¼? %s (%d%%)"
 
-#: ../src/applet-device-wireless.c:1033
+#: ../src/applet-device-wifi.c:1257
 #, c-format
-msgid "Wireless network connection to '%s'"
-msgstr "ç?¡ç·?網絡é?£æ?¥å?°ã??%sã??"
+msgid "Wireless network connection '%s' active"
+msgstr "ç?¡ç·?網絡é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸­"
 
-#: ../src/applet-dialogs.c:50
+#: ../src/applet-dialogs.c:53
 msgid "Error displaying connection information:"
 msgstr "顯示é?£ç·?è³?è¨?ç?¼ç??é?¯èª¤ï¼?"
 
-#: ../src/applet-dialogs.c:77
-#: ../src/connection-editor/page-wireless-security.c:288
-#: ../src/wireless-dialog.c:512
-#: ../src/wireless-security/wireless-security.c:320
+#: ../src/applet-dialogs.c:84
+#: ../src/connection-editor/page-wireless-security.c:277
+#: ../src/wireless-dialog.c:815
+#: ../src/wireless-security/wireless-security.c:317
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:79
+#: ../src/applet-dialogs.c:86
 msgid "Dynamic WEP"
 msgstr "å??æ?? WEP"
 
-#: ../src/applet-dialogs.c:81 ../src/applet-dialogs.c:193
-#: ../src/applet-dialogs.c:195
+#: ../src/applet-dialogs.c:88 ../src/applet-dialogs.c:189
+#: ../src/applet-dialogs.c:191
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:83 ../src/applet-dialogs.c:216
+#: ../src/applet-dialogs.c:187
+msgid "WEP"
+msgstr "WEP"
+
+#: ../src/applet-dialogs.c:195 ../src/applet-dialogs.c:204
+#: ../src/connection-editor/page-wireless-security.c:238
+#: ../src/wireless-dialog.c:768
+msgid "None"
+msgstr "ç?¡"
+
+#: ../src/applet-dialogs.c:207 ../src/applet-dialogs.c:322
 msgid "Unknown"
 msgstr "��"
 
-#: ../src/applet-dialogs.c:132
-msgid "Could not find some required resources (the glade file)!"
-msgstr "ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼?glade æª?ï¼?ï¼?"
-
-#: ../src/applet-dialogs.c:150
+#: ../src/applet-dialogs.c:258
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "�太網絡 (%s)"
 
-#: ../src/applet-dialogs.c:152
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:154
+#: ../src/applet-dialogs.c:262
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:156
+#: ../src/applet-dialogs.c:264
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:191
-msgid "WEP"
-msgstr "WEP"
+#: ../src/applet-dialogs.c:269
+msgid "Interface:"
+msgstr "���"
 
-#: ../src/applet-dialogs.c:200
-#: ../src/connection-editor/page-wireless-security.c:240
-#: ../src/wireless-dialog.c:460
-msgid "None"
-msgstr "ç?¡"
+#: ../src/applet-dialogs.c:285
+msgid "Hardware Address:"
+msgstr "硬件ä½?å??ï¼?"
 
-#: ../src/applet-dialogs.c:212
+#: ../src/applet-dialogs.c:295
+msgid "Driver:"
+msgstr "é©?å??ç¨?å¼?ï¼?"
+
+#: ../src/applet-dialogs.c:314
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:319
+msgid "Speed:"
+msgstr "é??度ï¼?"
+
+#: ../src/applet-dialogs.c:329
+#: ../src/connection-editor/ce-page-wireless-security.glade.h:1
+msgid "Security:"
+msgstr "����"
+
+#: ../src/applet-dialogs.c:349
+msgid "IP Address:"
+msgstr "IP ä½?å??ï¼?"
+
+#: ../src/applet-dialogs.c:365
+msgid "Broadcast Address:"
+msgstr "廣æ?­ä½?å??ï¼?"
+
+#: ../src/applet-dialogs.c:376
+msgid "Subnet Mask:"
+msgstr "�網絡�罩�"
+
+#: ../src/applet-dialogs.c:388
+msgid "Default Route:"
+msgstr "é ?設路ç?±ï¼?"
+
+#: ../src/applet-dialogs.c:403
+msgid "Primary DNS:"
+msgstr "主� DNS�"
+
+#: ../src/applet-dialogs.c:414
+msgid "Secondary DNS:"
+msgstr "次� DNS�"
+
+#. Shouldn't really happen but ...
+#: ../src/applet-dialogs.c:477
+msgid "No valid active connections found!"
+msgstr "æ?¾ä¸?å?°æ??æ??ç??使ç?¨ä¸­é?£ç·?ï¼?"
+
+#: ../src/applet-dialogs.c:603
 msgid ""
 "Copyright © 2004-2008 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc."
@@ -283,16 +389,16 @@ msgstr ""
 "Copyright © 2004-2008 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc."
 
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:605
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr ""
+msgstr "ç?¨ä¾?管ç??ä½ ç??網絡è£?ç½®è??é?£ç·?ç??é??ç?¥å??é?¢æ?¿ç¨?å¼?ã??"
 
-#: ../src/applet-dialogs.c:386
+#: ../src/applet-dialogs.c:607
 msgid "NetworkManager Website"
 msgstr "NetworkManager 網�"
 
-#: ../src/applet-dialogs.c:389
+#: ../src/applet-dialogs.c:610
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?翻譯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å­?é?µä»¶çµ¦\n"
@@ -302,96 +408,130 @@ msgstr ""
 "Hialan Liu <hialan liu gmail com>, 2008.\n"
 "Woodman Tuen <wmtuen gmail com>, 2005."
 
-#: ../src/applet.c:370
+#: ../src/applet-dialogs.c:626
+msgid "Missing resources"
+msgstr "�失��"
+
+#: ../src/applet.c:508
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the network connection was "
 "interrupted."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?ºç¶²çµ¡é?£ç·?被中æ?·äº?ã??"
 
-#: ../src/applet.c:372
+#: ../src/applet.c:511
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service stopped unexpectedly."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?º VPN æ??å??æ??å¤?ç??å??æ­¢äº?ã??"
 
-#: ../src/applet.c:374
+#: ../src/applet.c:514
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service returned invalid "
 "configuration."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?º VPN æ??å??å?³å??ç?¡æ??ç??çµ?æ??ã??"
 
-#: ../src/applet.c:376
+#: ../src/applet.c:517
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the connection attempt timed out."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?ºé?£ç·?ç??å??試已é?¾æ??ã??"
 
-#: ../src/applet.c:378
+#: ../src/applet.c:520
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service did not start in time."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?º VPN æ??å??æ²?æ??å??æ??å??å??ã??"
 
-#: ../src/applet.c:380
+#: ../src/applet.c:523
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service failed to start."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?º VPN æ??å??å??å??失æ??ã??"
 
-#: ../src/applet.c:382
+#: ../src/applet.c:526
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because there were no valid VPN secrets."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?ºæ²?æ??æ??æ??ç?? VPN æ??å??ã??"
 
-#: ../src/applet.c:387
-#, fuzzy, c-format
+#: ../src/applet.c:529
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?ºç?¡æ??ç?? VPN æ©?å¯?ã??"
+
+#: ../src/applet.c:536
+#, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed."
-msgstr "VPN é?£ç·?é?£æ?¥å?°â??%sâ??"
+msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ã??"
 
-#: ../src/applet.c:405
+#: ../src/applet.c:554
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected because the network connection was "
 "interrupted."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?ºç¶²çµ¡é?£ç·?中æ?·äº?ã??"
 
-#: ../src/applet.c:407
+#: ../src/applet.c:557
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected because the VPN service stopped."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?º VPN æ??å??å·²å??æ­¢ã??"
 
-#: ../src/applet.c:412
-#, fuzzy, c-format
+#: ../src/applet.c:563
+#, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected."
-msgstr "網絡é?£ç·?已中æ?·ã??"
+msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??å·²æ?·ç·?ã??"
 
-#: ../src/applet.c:438
+#: ../src/applet.c:641
 msgid "VPN Login Message"
 msgstr "VPN ç?»é??è¨?æ?¯"
 
-#: ../src/applet.c:449 ../src/applet.c:456 ../src/applet.c:497
-#, fuzzy
+#: ../src/applet.c:653 ../src/applet.c:661 ../src/applet.c:705
 msgid "VPN Connection Failed"
-msgstr "VPN ��"
+msgstr "VPN é?£ç·?失æ??"
 
-#: ../src/applet.c:504
+#: ../src/applet.c:712
 #, c-format
 msgid ""
 "\n"
@@ -399,8 +539,12 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?º VPN æ??å??å??å??失æ??ã??\n"
+"\n"
+"%s"
 
-#: ../src/applet.c:507
+#: ../src/applet.c:715
 #, c-format
 msgid ""
 "\n"
@@ -408,90 +552,138 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??å??å??失æ??ã??\n"
+"\n"
+"%s"
+
+#: ../src/applet.c:1006
+msgid "device not ready"
+msgstr "�置��就�"
 
-#: ../src/applet.c:814
-msgid "No network devices have been found"
-msgstr "���任�網絡�置"
+#: ../src/applet.c:1022
+msgid "device not managed"
+msgstr "è£?ç½®ç?¡æ³?管ç??"
 
-#: ../src/applet.c:894
+#: ../src/applet.c:1066
+msgid "No network devices available"
+msgstr "æ²?æ??å?¯ç?¨ç??網絡è£?ç½®"
+
+#: ../src/applet.c:1154
 msgid "_VPN Connections"
 msgstr "_VPN ��"
 
-#: ../src/applet.c:944
+#: ../src/applet.c:1204
 msgid "_Configure VPN..."
 msgstr "設置 VPN(_C)..."
 
-#: ../src/applet.c:948
+#: ../src/applet.c:1208
 msgid "_Disconnect VPN..."
 msgstr "è?? VPN æ?·ç·?(_D)..."
 
-#: ../src/applet.c:997
+#: ../src/applet.c:1261
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager æ²?æ??å?·è¡?...."
 
-#: ../src/applet.c:1002 ../src/applet.c:1576
+#: ../src/applet.c:1266 ../src/applet.c:1959
 msgid "Networking disabled"
 msgstr "網絡已å??ç?¨"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1179
+#: ../src/applet.c:1450
 msgid "Enable _Networking"
 msgstr "å??ç?¨ç¶²çµ¡(_N)"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:1187
+#: ../src/applet.c:1459
 msgid "Enable _Wireless"
 msgstr "å??ç?¨ç?¡ç·?網絡(_W)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1197
+#: ../src/applet.c:1470
 msgid "Connection _Information"
 msgstr "����(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1207
+#: ../src/applet.c:1480
 msgid "Edit Connections..."
 msgstr "編輯��..."
 
 #. Help item
-#: ../src/applet.c:1221
+#: ../src/applet.c:1494
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
 #. About item
-#: ../src/applet.c:1230
+#: ../src/applet.c:1503
 msgid "_About"
 msgstr "é??æ?¼(_A)"
 
-#: ../src/applet.c:1395
+#: ../src/applet.c:1676
 msgid "Disconnected"
 msgstr "已��"
 
-#: ../src/applet.c:1396
+#: ../src/applet.c:1677
 msgid "The network connection has been disconnected."
 msgstr "網絡é?£ç·?已中æ?·ã??"
 
-#: ../src/applet.c:1580
+#: ../src/applet.c:1825
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "æ­£å?¨æº?å??網絡é?£ç·?ã??%sã??..."
+
+#: ../src/applet.c:1828
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "網絡é?£ç·?ã??%sã??é??è¦?使ç?¨è??é©?è­?..."
+
+#: ../src/applet.c:1834
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "網絡é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸­"
+
+#: ../src/applet.c:1915
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "æ­£å?¨å??å?? VPN é?£ç·?ã??%sã??..."
+
+#: ../src/applet.c:1918
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "VPN é?£ç·?ã??%sã??é??è¦?使ç?¨è??é©?è­?..."
+
+#: ../src/applet.c:1921
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "æ­£å?¨è¦?æ±? VPN æ??ä¾?ã??%sã??ç??網絡ä½?å??..."
+
+#: ../src/applet.c:1924
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "VPN é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸­"
+
+#: ../src/applet.c:1963
 msgid "No network connection"
 msgstr "æ²?æ??網絡é?£æ?¥"
 
-#: ../src/applet.c:1832
+#: ../src/applet.c:2298
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
 msgstr "NetworkManager é?¢æ?¿ç¨?å¼?ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ã??å®?ç?¡æ³?ç¹¼çº?ã??\n"
 
-#: ../src/applet.c:1979
+#: ../src/applet.c:2485
 msgid "NetworkManager Applet"
 msgstr "NetworkManager ����"
 
-#: ../src/applet.c:1984 ../src/wireless-dialog.c:791
+#: ../src/applet.c:2491 ../src/wired-dialog.c:128
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 msgstr "NetworkManager é?¢æ?¿ç¨?å¼?ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼?æ?¾ä¸?å?° glade æª?ï¼?"
 
-#: ../src/applet.glade.h:1
+#: ../src/applet.glade.h:1 ../src/connection-editor/ce-mobile-wizard.glade.h:1
+#: ../src/connection-editor/ce-vpn-wizard.glade.h:1
 msgid " "
 msgstr " "
 
@@ -502,11 +694,14 @@ msgid ""
 "3\n"
 "4"
 msgstr ""
+"1 (é ?設å?¼)\n"
+"2\n"
+"3\n"
+"4"
 
 #: ../src/applet.glade.h:6
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr "<span weight=\"bold\">使ç?¨ä¸­ç??é?£ç·?è³?è¨?ï¼?</span>"
+msgid "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
+msgstr "<span size=\"larger\" weight=\"bold\">使ç?¨ä¸­ç??網絡é?£ç·?</span>"
 
 #: ../src/applet.glade.h:7
 msgid "Anonymous Identity:"
@@ -517,62 +712,52 @@ msgid "Authentication:"
 msgstr "é©?è­?ï¼?"
 
 #: ../src/applet.glade.h:9
-msgid "Broadcast Address:"
-msgstr "廣æ?­ä½?å??ï¼?"
+msgid ""
+"Automatic\n"
+"Version 0\n"
+"Version 1"
+msgstr ""
+"è?ªå??\n"
+"第 0 ç??\n"
+"第 1 ç??"
 
-#: ../src/applet.glade.h:10
+#: ../src/applet.glade.h:12
 msgid "CA Certificate:"
 msgstr "CA ���"
 
-#: ../src/applet.glade.h:11
+#: ../src/applet.glade.h:13
 msgid "C_onnect"
 msgstr "��(_O)"
 
-#: ../src/applet.glade.h:12
+#: ../src/applet.glade.h:14
 msgid "Connection Information"
 msgstr "����"
 
-#: ../src/applet.glade.h:13
-msgid "Default Route:"
-msgstr "é ?設路ç?±ï¼?"
-
-#: ../src/applet.glade.h:14
-msgid "Don't warn me again"
-msgstr "ä¸?è¦?å??æ??é??æ??"
-
 #: ../src/applet.glade.h:15
-msgid "Driver:"
-msgstr "é©?å??ç¨?å¼?ï¼?"
+msgid "Connection:"
+msgstr "��:"
 
 #: ../src/applet.glade.h:16
-msgid "Hardware Address:"
-msgstr "硬件ä½?å??ï¼?"
+msgid "Don't warn me again"
+msgstr "ä¸?è¦?å??æ??é??æ??"
 
 #: ../src/applet.glade.h:17
-msgid "IP Address:"
-msgstr "IP ä½?å??ï¼?"
-
-#: ../src/applet.glade.h:18
 msgid "Identity:"
 msgstr "���"
 
-#: ../src/applet.glade.h:19
+#: ../src/applet.glade.h:18
 msgid "Inner Authentication:"
-msgstr ""
+msgstr "����:"
 
-#: ../src/applet.glade.h:20
-msgid "Interface:"
-msgstr "���"
-
-#: ../src/applet.glade.h:21
+#: ../src/applet.glade.h:19
 msgid "Key:"
 msgstr "å¯?碼å??ï¼?"
 
-#: ../src/applet.glade.h:22
+#: ../src/applet.glade.h:20
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/applet.glade.h:23
+#: ../src/applet.glade.h:21
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -580,692 +765,999 @@ msgstr ""
 "é??æ?¾ç³»çµ±\n"
 "å?±ç?¨å¯?碼å??"
 
-#: ../src/applet.glade.h:25
+#: ../src/applet.glade.h:23
 msgid "Other Wireless Network..."
 msgstr "����網絡..."
 
-#: ../src/applet.glade.h:26
+#: ../src/applet.glade.h:24
 msgid "PEAP Version:"
 msgstr "PEAP ç??æ?¬ï¼?"
 
-#: ../src/applet.glade.h:27
-msgid "Password:"
-msgstr "�碼�"
-
-#: ../src/applet.glade.h:28
-msgid "Primary DNS:"
-msgstr "主� DNS�"
-
-#: ../src/applet.glade.h:29
+#: ../src/applet.glade.h:26
 msgid "Private Key Password:"
 msgstr "ç§?å¯?å¯?碼å??å¯?碼ï¼?"
 
-#: ../src/applet.glade.h:30
+#: ../src/applet.glade.h:27
 msgid "Private Key:"
 msgstr "ç§?å¯?å¯?碼å??ï¼?"
 
-#: ../src/applet.glade.h:31
-msgid "Secondary DNS:"
-msgstr "次� DNS�"
-
-#: ../src/applet.glade.h:32
-#: ../src/connection-editor/ce-page-wireless-security.glade.h:1
-msgid "Security:"
-msgstr "����"
-
-#: ../src/applet.glade.h:33
+#: ../src/applet.glade.h:28
 msgid "Select A File"
 msgstr "é?¸æ??æª?æ¡?"
 
-#: ../src/applet.glade.h:34
+#: ../src/applet.glade.h:29
 msgid "Show key"
 msgstr "顯示å¯?碼å??"
 
-#: ../src/applet.glade.h:35
+#: ../src/applet.glade.h:30 ../src/connection-editor/ce-page-dsl.glade.h:3
 msgid "Show password"
 msgstr "顯示�碼"
 
-#: ../src/applet.glade.h:36
-msgid "Speed:"
-msgstr "é??度ï¼?"
-
-#: ../src/applet.glade.h:37
-msgid "Subnet Mask:"
-msgstr "�網絡�罩�"
-
-#: ../src/applet.glade.h:38
+#: ../src/applet.glade.h:31 ../src/connection-editor/ce-page-mobile.glade.h:16
 msgid "Type:"
 msgstr "é¡?å??ï¼?"
 
-#: ../src/applet.glade.h:39
+#: ../src/applet.glade.h:32
 msgid "User Certificate:"
 msgstr "使ç?¨è??è­?æ?¸ï¼?"
 
-#: ../src/applet.glade.h:40
+#: ../src/applet.glade.h:33
 msgid "User Name:"
 msgstr "使ç?¨è??å??稱ï¼?"
 
-#: ../src/applet.glade.h:41
-msgid ""
-"Version 0\n"
-"Version 1"
-msgstr ""
-"ç??æ?¬ 0\n"
-"ç??æ?¬ 1"
-
-#: ../src/applet.glade.h:43
+#: ../src/applet.glade.h:34
 msgid "WEP Index:"
-msgstr ""
+msgstr "WEP 索�:"
 
-#: ../src/applet.glade.h:44
+#: ../src/applet.glade.h:35
 msgid "Wireless _adapter:"
 msgstr "��網絡�(_A)�"
 
-#: ../src/applet.glade.h:45
+#: ../src/applet.glade.h:36
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/applet.glade.h:46
+#: ../src/applet.glade.h:37
 msgid "_Network Name:"
 msgstr "網絡å??稱(_N)ï¼?"
 
-#: ../src/applet.glade.h:47
-#, fuzzy
+#: ../src/applet.glade.h:38
 msgid "_Wireless Security:"
-msgstr "��網絡�(_A)�"
+msgstr "��網絡�護(_W):"
 
-#: ../src/applet.glade.h:48
+#: ../src/applet.glade.h:39
 msgid "alert text"
+msgstr "警示æ??å­?"
+
+#: ../src/connection-editor/ce-mobile-wizard.glade.h:2
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Choose a Mobile Broadband Connection</"
+"span>\n"
+"\n"
+"Select or connect the mobile broadband device you wish to use for the new "
+"connection.  If the device is not available, you may select a generic "
+"connection type."
 msgstr ""
+"<span weight=\"bold\" size=\"larger\">é?¸æ??ä¸?å??è¡?å??å¯¬é »é?£ç·?</span>\n"
+"\n"
+"é?¸æ??æ??é?£ç·?è?³ä½ å¸?æ??使ç?¨ç??è¡?å??å¯¬é »è£?ç½®å??ç?ºæ?°ç??é?£ç·?ã??å¦?æ??該è£?ç½®ç?¡æ³?使ç?¨ï¼?ä½ å?¯ä»¥ä½¿ç?¨ä¸?è?¬é?£ç·?é¡?å??ã??"
+
+#: ../src/connection-editor/ce-page.c:70
+msgid "automatic"
+msgstr "è?ªå??"
+
+#: ../src/connection-editor/ce-page.c:201
+msgid ""
+"Insufficient privileges or unknown error retrieving system connection "
+"secrets."
+msgstr "å??å¾?系統æ©?å¯?æ??æ¬?é??ä¸?足æ??ä¸?æ??ç??é?¯èª¤ã??"
+
+#: ../src/connection-editor/ce-page.c:236
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "ç?±æ?¼ä¸?æ??ç??é?¯èª¤ä½¿é?£ç·?æ©?å¯?ç??æ?´æ?°å¤±æ??ã??"
+
+#: ../src/connection-editor/ce-page.c:269
+msgid "Could not request secrets from the system settings service."
+msgstr "ç?¡æ³?è¦?æ±?ä¾?è?ªç³»çµ±è¨­å®?æ??å??ç??æ©?å¯?ã??"
+
+#: ../src/connection-editor/ce-page.c:299
+msgid "Could not connect to D-Bus to request connection secrets."
+msgstr "ç?¡æ³?é?£ç·?è?³ D-Bus 以è¦?æ±?é?£ç·?æ©?å¯?ã??"
+
+#: ../src/connection-editor/ce-page.c:312
+msgid "Could not create D-Bus proxy for connection secrets."
+msgstr "ç?¡æ³?ç?ºé?£ç·?æ©?å¯?建ç«? D-Bus 代ç??ã??"
+
+#: ../src/connection-editor/ce-page-dsl.glade.h:2
+msgid "Service:"
+msgstr "æ??å??:"
+
+#: ../src/connection-editor/ce-page-dsl.glade.h:4
+#: ../src/connection-editor/ce-page-mobile.glade.h:17
+msgid "Username:"
+msgstr "使ç?¨è??å??稱:"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:1
-msgid "<b>DNS Servers</b>"
-msgstr "<b>DNS 伺æ??å?¨</b>"
+msgid "<b>Addresses</b>"
+msgstr "<b>ä½?å??</b>"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:2
-msgid "<b>Search Domains</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"
+"å??享給å?¶ä»?é?»è?¦"
+
+#: ../src/connection-editor/ce-page-ip4.glade.h:7
+msgid "DHCP Client ID:"
+msgstr "DHCP 客�端 ID:"
+
+#: ../src/connection-editor/ce-page-ip4.glade.h:8
+msgid "DNS Servers:"
+msgstr "DNS 伺æ??å?¨:"
+
+#: ../src/connection-editor/ce-page-ip4.glade.h:9
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr "å¦?æ??å??ç?¨ï¼?é??å??é?£ç·?å°?æ°¸é? ä¸?æ??å??ç?ºé ?設網絡é?£ç·?ã??"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:3
-msgid "_Manual configuration"
-msgstr "æ??å??設å®?(_M)"
+#: ../src/connection-editor/ce-page-ip4.glade.h:10
+msgid "Ignore automatically obtained routes"
+msgstr "忽ç?¥è?ªå??ç?²å¾?ç??è·¯ç?±"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:1
-msgid "Aut_onegotiate"
-msgstr ""
+#: ../src/connection-editor/ce-page-ip4.glade.h:11
+msgid "Method:"
+msgstr "��:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:2
-msgid "Full duple_x"
-msgstr ""
+#: ../src/connection-editor/ce-page-ip4.glade.h:12
+msgid "Routes..."
+msgstr "路�..."
 
-#: ../src/connection-editor/ce-page-wired.glade.h:3
-#: ../src/connection-editor/ce-page-wireless.glade.h:5
-msgid "MT_U:"
-msgstr "MT_U:"
+#: ../src/connection-editor/ce-page-ip4.glade.h:13
+msgid "Search Domains:"
+msgstr "æ??å°?網å??:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:4
-#: ../src/connection-editor/ce-page-wireless.glade.h:9
-msgid "_MAC address:"
-msgstr "_MAC ä½?å??ï¼?"
+#: ../src/connection-editor/ce-page-ip4.glade.h:14
+msgid "Use this connection only for resources on its network"
+msgstr "å?ªå?¨ä½¿ç?¨é??å??é?£ç·?ç??網絡è³?æº?æ??æ??使ç?¨å®?"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:5
-msgid "_Port:"
-msgstr "é?£æ?¥å? (_P)ï¼?"
+#: ../src/connection-editor/ce-page-mobile.glade.h:1
+msgid "<b>Advanced</b>"
+msgstr "<b>é?²é??</b>"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:6
-msgid "_Speed:"
-msgstr "é??度(_S)ï¼?"
+#: ../src/connection-editor/ce-page-mobile.glade.h:2
+msgid "<b>Basic</b>"
+msgstr "<b>��</b>"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:7
+#: ../src/connection-editor/ce-page-mobile.glade.h:3
+msgid "APN:"
+msgstr "APN:"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:4
+msgid ""
+"Any\n"
+"3G (UMTS/HSPA)\n"
+"2G (GPRS/EDGE)\n"
+"Prefer 3G (UMTS/HSPA)\n"
+"Prefer 2G (GPRS/EDGE)"
+msgstr ""
+"任�\n"
+"3G (UMTS/HSPA)\n"
+"2G (GPRS/EDGE)\n"
+"å??好 3G (UMTS/HSPA)\n"
+"å??好 2G (GPRS/EDGE)"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:9
+msgid "Band:"
+msgstr "é »å¯¬:"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:10
+msgid "Network:"
+msgstr "網絡:"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:11
+#, fuzzy
+msgid "Number:"
+msgstr "äº?å­?è??"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:12
+msgid "PIN:"
+msgstr "PIN:"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:13
+msgid "PUK:"
+msgstr "PUK:"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:15
+msgid "Show passwords"
+msgstr "顯示�碼"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:1
+msgid "<b>Allowed Authentication Methods</b>"
+msgstr "<b>å??許ç??é©?è­?æ?¹å¼?</b>"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>é©?è­?</b>"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:3
+msgid "<b>Compression</b>"
+msgstr "<b>�縮</b>"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:4
+msgid "<b>Echo</b>"
+msgstr "<b>å??é?³</b>"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:5
 msgid ""
-"default\n"
+"<i>In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods.</i>"
+msgstr "<i>å?¨å¤§å¤?æ?¸æ??æ³?ä¸?ï¼?網絡ä¾?æ??è??ç?? PPP 伺æ??å?¨æ??æ?¯æ?´æ??æ??ç??é©?è­?æ?¹æ³?ã??å¦?æ??é?£ç·?失æ??ï¼?è«?å??試å??ç?¨æ??äº?æ?¹æ³?ç??æ?¯æ?´ã??</i>"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:6
+msgid "Allow BSD data compression"
+msgstr "å??許 BSD è³?æ??å£?縮"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:7
+msgid "Allow Deflate data compression"
+msgstr "å??許 Deflate è³?æ??å£?縮"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:8
+msgid "Allowed methods:"
+msgstr "å??許ç??æ?¹å¼?:"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:9
+#: ../src/connection-editor/page-ppp.c:134
+#: ../src/wireless-security/eap-method-ttls.c:268
+msgid "CHAP"
+msgstr "CHAP"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:10
+msgid "Challenge Handshake Authentication Protocol"
+msgstr "Challenge Handshake é©?è­?é??è¨?å??å®?"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:11
+msgid "Configure Methods..."
+msgstr "設���..."
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:12
+#: ../src/connection-editor/page-ppp.c:132
+msgid "EAP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:13
+msgid "Extensible Authentication Protocol"
+msgstr "å?¯å»¶ä¼¸ç??é©?è­?é??è¨?å??å®?"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:14
+#: ../src/connection-editor/page-ppp.c:136
+#: ../src/wireless-security/eap-method-ttls.c:238
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:15
+msgid "MSCHAP v2"
+msgstr "MSCHAP v2"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:16
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "Microsoft Challenge Handshake é©?è­?é??è¨?å??å®?"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:17
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "Microsoft Challenge Handshake é©?è­?é??è¨?å??å®?第 2 ç??"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:18
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:223
+msgid "PAP"
+msgstr "PAP"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:19
+msgid "Password Authentication Protocol"
+msgstr "å¯?碼é©?è­?é??è¨?å??å®?"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:20
+msgid "Require 128-bit encryption"
+msgstr "é??è¦? 128-ä½?å??å? å¯?"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:21
+msgid "Send PPP echo packets"
+msgstr "å?³é?? PPP å??é?³å°?å??"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:22
+msgid "Use Point-to-Point Encryption (MPPE)"
+msgstr "使ç?¨é»?å°?é»?å¼?å? å¯? (MPPE)"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:23
+msgid "Use Stateful MPPE"
+msgstr "使ç?¨æ??ç??æ??ç?? MPPE"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:24
+msgid "Use TCP header compression"
+msgstr "使ç?¨ TCP æ¨?é ­å£?縮"
+
+#: ../src/connection-editor/ce-page-wired.glade.h:1
+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"
+"è?ªå??\n"
 "10 Mb/s\n"
 "100 Mb/s\n"
 "1 Gb/s\n"
 "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:12
+#: ../src/connection-editor/ce-page-wired.glade.h:7
 msgid ""
-"default\n"
+"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
+msgid "Full duple_x"
+msgstr "å?¨é??å·¥(_X)"
+
+#: ../src/connection-editor/ce-page-wired.glade.h:13
+#: ../src/connection-editor/ce-page-wireless.glade.h:8
+msgid "MT_U:"
+msgstr "MT_U:"
+
+#: ../src/connection-editor/ce-page-wired.glade.h:14
+#: ../src/connection-editor/ce-page-wireless.glade.h:13
+msgid "_MAC address:"
+msgstr "_MAC ä½?å??ï¼?"
+
+#: ../src/connection-editor/ce-page-wired.glade.h:15
+msgid "_Port:"
+msgstr "é?£æ?¥å? (_P)ï¼?"
+
+#: ../src/connection-editor/ce-page-wired.glade.h:16
+msgid "_Speed:"
+msgstr "é??度(_S)ï¼?"
+
+#: ../src/connection-editor/ce-page-wired.glade.h:17
+#: ../src/connection-editor/ce-page-wireless.glade.h:16
+msgid "bytes"
+msgstr "ä½?å??çµ?"
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:1
-msgid "Ban_d:"
+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.glade.h:4
+msgid "Ban_d:"
+msgstr "é »å¯¬(_D):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:2
+#: ../src/connection-editor/ce-page-wireless.glade.h:5
 msgid "C_hannel:"
 msgstr "é »é??(_H)ï¼?"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:3
+#: ../src/connection-editor/ce-page-wireless.glade.h:6
 msgid ""
 "Infrastructure\n"
-"Adhoc"
+"Ad-hoc"
 msgstr ""
+"Infrastructure\n"
+"Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:6
+#: ../src/connection-editor/ce-page-wireless.glade.h:9
 msgid "M_ode:"
 msgstr "模�(_O)�"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:7
+#: ../src/connection-editor/ce-page-wireless.glade.h:10
+msgid "Mb/s"
+msgstr "Mb/s"
+
+#: ../src/connection-editor/ce-page-wireless.glade.h:11
 msgid "Transmission po_wer:"
-msgstr ""
+msgstr "å?³è¼¸è??è?½(_W):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:8
+#: ../src/connection-editor/ce-page-wireless.glade.h:12
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:10
+#: ../src/connection-editor/ce-page-wireless.glade.h:14
 msgid "_Rate:"
-msgstr ""
+msgstr "é??ç??(_R):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:11
+#: ../src/connection-editor/ce-page-wireless.glade.h:15
 msgid "_SSID:"
 msgstr "_SSID:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:12
+#: ../src/connection-editor/ce-page-wireless.glade.h:17
+msgid "mW"
+msgstr "mW"
+
+#: ../src/connection-editor/ce-vpn-wizard.glade.h:2
 msgid ""
-"default\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
-msgstr ""
-"é ?設\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
+"<span weight=\"bold\" size=\"larger\">Choose a VPN Connection Type</span>\n"
+"\n"
+"Select the type of VPN you wish to use for the new connection.  If the type "
+"of VPN connection you wish to create does not appear in the list, you may "
+"not have the correct VPN plugin installed."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">é?¸æ?? VPN é?£ç·?é¡?å??</span>\n"
+"é?¸æ??ä½ æ?³è¦?ç?¨å?¨æ?°é?£ç·?中ç?? VPN é¡?å??ã??å¦?æ??ä½ æ?³è¦?建ç«?ç?? VPN é?£ç·?é¡?å??æ²?æ??å?ºç?¾å?¨æ¸?å?®ä¸­ï¼?å?¯è?½æ?¯æ²?æ??å®?è£?正確ç?? VPN å¤?æ??ç¨?å¼?ã??"
+
+#: ../src/connection-editor/ce-vpn-wizard.glade.h:5
+msgid "Create..."
+msgstr "建�..."
+
+#: ../src/connection-editor/ip4-routes-dialog.c:501
+#: ../src/connection-editor/page-ip4.c:634
+msgid "Address"
+msgstr "ä½?å??"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:517
+#: ../src/connection-editor/page-ip4.c:650
+msgid "Netmask"
+msgstr "網絡�罩"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:533
+#: ../src/connection-editor/page-ip4.c:666
+msgid "Gateway"
+msgstr "é??è¨?é??"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:549
+msgid "Metric"
+msgstr "��"
+
+#: ../src/connection-editor/mobile-wizard.c:73
+msgid "Installed GSM device"
+msgstr "å·²å®?è£?ç?? GSM è£?ç½®"
+
+#: ../src/connection-editor/mobile-wizard.c:84
+msgid "Installed CDMA device"
+msgstr "å·²å®?è£?ç?? CDMA è£?ç½®"
+
+#: ../src/connection-editor/mobile-wizard.c:150
+msgid "Create a GSM connection"
+msgstr "建� GSM ��"
+
+#: ../src/connection-editor/mobile-wizard.c:151
+msgid "Create a CDMA connection"
+msgstr "建� CDMA ��"
+
+#: ../src/connection-editor/page-dsl.c:152
+#: ../src/connection-editor/page-dsl.c:159
+msgid "Could not load DSL user interface."
+msgstr "ç?¡æ³?è¼?å?¥ DSL 使ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-dsl.c:165
+#: ../src/connection-editor/nm-connection-editor.glade.h:4
+#: ../src/connection-editor/nm-connection-list.c:1818
+msgid "DSL"
+msgstr "DSL"
+
+#: ../src/connection-editor/page-ip4.c:116
+msgid "Automatic (VPN)"
+msgstr "è?ªå?? (VPN)"
+
+#: ../src/connection-editor/page-ip4.c:117
+msgid "Automatic (VPN) addresses only"
+msgstr "å?ªç?¨è?ªå?? (VPN) ä½?å??"
+
+#: ../src/connection-editor/page-ip4.c:120
+msgid "Automatic (PPP)"
+msgstr "è?ªå?? (PPP)"
+
+#: ../src/connection-editor/page-ip4.c:121
+msgid "Automatic (PPP) addresses only"
+msgstr "å?ªç?¨è?ªå?? (PPP) ä½?å??"
+
+#: ../src/connection-editor/page-ip4.c:123
+msgid "Automatic (PPPoE)"
+msgstr "è?ªå?? (PPPoE)"
+
+#: ../src/connection-editor/page-ip4.c:124
+msgid "Automatic (PPPoE) addresses only"
+msgstr "å?ªç?¨è?ªå?? (PPPoE) ä½?å??"
+
+#: ../src/connection-editor/page-ip4.c:126
+msgid "Automatic (DHCP)"
+msgstr "è?ªå?? (DHCP)"
 
-#: ../src/connection-editor/page-ip4-address.c:60
-msgid "IPv4 Addresses"
-msgstr "IPv4 ä½?å??"
+#: ../src/connection-editor/page-ip4.c:127
+msgid "Automatic (DHCP) addresses only"
+msgstr "å?ªç?¨è?ªå?? (DHCP) ä½?å??"
 
-#: ../src/connection-editor/page-ip4.c:60
+#: ../src/connection-editor/page-ip4.c:152
+msgid "Manual"
+msgstr "æ??å??"
+
+#: ../src/connection-editor/page-ip4.c:164
+msgid "Link-Local Only"
+msgstr "å?ªæ??æ?¬æ©?é?£ç·?"
+
+#: ../src/connection-editor/page-ip4.c:170
+msgid "Shared to other computers"
+msgstr "å??享給å?¶ä»?é?»è?¦"
+
+#: ../src/connection-editor/page-ip4.c:597
+#, c-format
+msgid "Editing IPv4 routes for %s"
+msgstr "編輯 %s ç?? IPv4 è·¯ç?±"
+
+#: ../src/connection-editor/page-ip4.c:708
+#: ../src/connection-editor/page-ip4.c:715
+msgid "Could not load IPv4 user interface."
+msgstr "ç?¡æ³?è¼?å?¥ IPv4 使ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-ip4.c:721
 msgid "IPv4 Settings"
 msgstr "IPv4 設�"
 
-#: ../src/connection-editor/page-wired.c:76
+#: ../src/connection-editor/page-mobile.c:295
+#: ../src/connection-editor/page-mobile.c:302
+msgid "Could not load mobile broadband user interface."
+msgstr "ç?¡æ³?è¼?å?¥è¡?å??å¯¬é »ä½¿ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-mobile.c:320
+msgid "Unsupported mobile broadband connection type."
+msgstr "ä¸?æ?¯æ?´ç??è¡?å??å¯¬é »é?£ç·?é¡?å??ã??"
+
+#: ../src/connection-editor/page-ppp.c:135
+#: ../src/wireless-security/eap-method-peap.c:229
+#: ../src/wireless-security/eap-method-ttls.c:253
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:139
+msgid "none"
+msgstr "ç?¡"
+
+#: ../src/connection-editor/page-ppp.c:199
+#, c-format
+msgid "Editing PPP authentication methods for %s"
+msgstr "編輯 %s ç?? PPP é©?è­?æ?¹æ³?"
+
+#: ../src/connection-editor/page-ppp.c:280
+#: ../src/connection-editor/page-ppp.c:287
+msgid "Could not load PPP user interface."
+msgstr "ç?¡æ³?è¼?å?¥ PPP 使ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-ppp.c:293
+msgid "PPP Settings"
+msgstr "PPP 設��"
+
+#: ../src/connection-editor/page-vpn.c:105
 #: ../src/connection-editor/nm-connection-editor.glade.h:8
-#: ../src/connection-editor/nm-connection-list.c:477
+#: ../src/connection-editor/nm-connection-list.c:1815
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/page-vpn.c:116
+#, c-format
+msgid "Could not find VPN plugin service for '%s'."
+msgstr "æ?¾ä¸?å?°ã??%sã??ç?? VPN å¤?æ??ç¨?å¼?æ??å??ã??"
+
+#: ../src/connection-editor/page-wired.c:204
+#: ../src/connection-editor/page-wired.c:211
+msgid "Could not load wired user interface."
+msgstr "ç?¡æ³?è¼?å?¥æ??ç·?網絡使ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-wired.c:217
+#: ../src/connection-editor/nm-connection-editor.glade.h:9
+#: ../src/connection-editor/nm-connection-list.c:1805
 msgid "Wired"
 msgstr "æ??ç·?"
 
-#: ../src/connection-editor/page-wireless.c:94
-#: ../src/connection-editor/page-wireless.c:98
-#: ../src/connection-editor/nm-connection-editor.c:228
+#: ../src/connection-editor/page-wired-security.c:112
+msgid "802.1x Security"
+msgstr "802.1x �護"
+
+#: ../src/connection-editor/page-wired-security.c:120
+msgid "Use 802.1X security for this connection"
+msgstr "å?¨é??å??é?£ç·?使ç?¨ 802.1X é?²è­·"
+
+#: ../src/connection-editor/page-wireless.c:144
+#: ../src/connection-editor/page-wireless.c:148
 msgid "default"
 msgstr "é ?設"
 
-#: ../src/connection-editor/page-wireless.c:116
+#: ../src/connection-editor/page-wireless.c:166
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:195
-#: ../src/connection-editor/nm-connection-editor.glade.h:9
-#: ../src/connection-editor/nm-connection-list.c:481
+#: ../src/connection-editor/page-wireless.c:348
+#: ../src/connection-editor/page-wireless.c:355
+msgid "Could not load WiFi user interface."
+msgstr "ç?¡æ³?è¼?å?¥ WiFi 使ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-wireless.c:361
+#: ../src/connection-editor/nm-connection-editor.glade.h:10
+#: ../src/connection-editor/nm-connection-list.c:1808
 msgid "Wireless"
 msgstr "��網絡"
 
-#: ../src/connection-editor/page-wireless-security.c:210
-#, fuzzy
-msgid "Wireless Security"
-msgstr "��網絡"
+#: ../src/connection-editor/page-wireless-security.c:255
+#: ../src/wireless-dialog.c:789
+msgid "WEP 40/128-bit Key"
+msgstr "WEP 40/128-ä½?å?? å¯?碼å??"
 
-#: ../src/connection-editor/page-wireless-security.c:257
-#: ../src/wireless-dialog.c:477
-#, fuzzy
+#: ../src/connection-editor/page-wireless-security.c:264
+#: ../src/wireless-dialog.c:798
 msgid "WEP 128-bit Passphrase"
-msgstr "é??è¡?碼ï¼?"
-
-#: ../src/connection-editor/page-wireless-security.c:266
-#: ../src/wireless-dialog.c:486
-msgid "WEP 40/128-bit Hexadecimal"
-msgstr "WEP 40/128-bit å??å?­ä½?å??"
+msgstr "WEP 128-ä½?å?? å¯?èª?"
 
-#: ../src/connection-editor/page-wireless-security.c:275
-#: ../src/wireless-dialog.c:495
-msgid "WEP 40/128-bit ASCII"
-msgstr "WEP 40/128-bit ASCII"
-
-#: ../src/connection-editor/page-wireless-security.c:301
-#: ../src/wireless-dialog.c:525
+#: ../src/connection-editor/page-wireless-security.c:290
+#: ../src/wireless-dialog.c:828
 msgid "Dynamic WEP (802.1x)"
 msgstr "å??æ?? WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:315
-#: ../src/wireless-dialog.c:539
+#: ../src/connection-editor/page-wireless-security.c:304
+#: ../src/wireless-dialog.c:842
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 å??人ç??"
 
-#: ../src/connection-editor/page-wireless-security.c:329
-#: ../src/wireless-dialog.c:553
+#: ../src/connection-editor/page-wireless-security.c:318
+#: ../src/wireless-dialog.c:856
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ä¼?業ç??"
 
-#: ../src/connection-editor/nm-connection-editor.c:107
+#: ../src/connection-editor/page-wireless-security.c:356
+msgid "Could not load WiFi security user interface; missing WiFi setting."
+msgstr "ç?¡æ³?è¼?å?¥ WiFi é?²è­·ä½¿ç?¨è??ä»?é?¢ï¼?失å?» WiFi 設å®?å?¼ã??"
+
+#: ../src/connection-editor/page-wireless-security.c:363
+#: ../src/connection-editor/page-wireless-security.c:370
+msgid "Could not load WiFi security user interface."
+msgstr "ç?¡æ³?è¼?å?¥ WiFi é?²è­·ä½¿ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-wireless-security.c:376
+msgid "Wireless Security"
+msgstr "��網絡�護"
+
+#: ../src/connection-editor/polkit-helpers.c:52
+msgid "PolicyKit authorization request was invalid."
+msgstr "PolicyKit é©?è­?è¦?æ±?æ?¯ç?¡æ??ç??ã??"
+
+#: ../src/connection-editor/polkit-helpers.c:58
+msgid "PolicyKit authorization request was malformed."
+msgstr "PolicyKit é©?è­?è¦?æ±?æ ¼å¼?ä¸?è?¯ã??"
+
+#: ../src/connection-editor/polkit-helpers.c:64
+msgid "PolicyKit authorization could not be created."
+msgstr "PolicyKit é©?è­?ç?¡æ³?建ç«?ã??"
+
+#: ../src/connection-editor/polkit-helpers.c:71
+msgid "PolicyKit authorization could not be created; invalid action ID."
+msgstr "ç?¡æ³?建ç«? PolicyKit é©?è­?è¦?æ±?ï¼?ç?¡æ??ç??å??ä½? IDã??"
+
+#: ../src/connection-editor/nm-connection-editor.c:104
 #, c-format
 msgid "Editing %s"
 msgstr "編輯 %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:111
-msgid "Editing unamed connection"
+#: ../src/connection-editor/nm-connection-editor.c:108
+msgid "Editing un-named connection"
 msgstr "編輯æ?ªå?½å??ç??é?£ç·?"
 
-#: ../src/connection-editor/nm-connection-editor.c:139
+#: ../src/connection-editor/nm-connection-editor.c:296
 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:152
+#: ../src/connection-editor/nm-connection-editor.c:309
 msgid ""
 "The connection editor could not find some required resources (the glade file "
 "was not found)."
 msgstr "é?£ç·?編輯å?¨ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼?æ?¾ä¸?å?° glade æª?ï¼?"
 
+#: ../src/connection-editor/nm-connection-editor.c:325
+msgid "Apply..."
+msgstr "��..."
+
+#: ../src/connection-editor/nm-connection-editor.c:326
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr "é©?è­?以å?²å­?é??å??é?£ç·?給此é?»è?¦ä¸?ç??æ??æ??使ç?¨è??ã??"
+
+#: ../src/connection-editor/nm-connection-editor.c:327
+msgid "Apply"
+msgstr "��"
+
+#: ../src/connection-editor/nm-connection-editor.c:328
+msgid "Save this connection for all users of this machine."
+msgstr "å?²å­?é??å??é?£ç·?給此é?»è?¦ä¸?ç??æ??æ??使ç?¨è??ã??"
+
+#: ../src/connection-editor/nm-connection-editor.c:425
+msgid "Error creating connection editor dialog."
+msgstr "建ç«?é?£ç·?編輯å?¨å°?話ç??æ??ç?¼ç??é?¯èª¤ã??"
+
 #: ../src/connection-editor/nm-connection-editor.glade.h:1
-msgid "Connect _automatically"
-msgstr "è?ªå??é?£ç·?(_A)"
+msgid "Available to all users"
+msgstr "æ??æ??使ç?¨è??ç??å?¯ç?¨"
 
 #: ../src/connection-editor/nm-connection-editor.glade.h:2
-msgid "Connection Editor"
-msgstr "��編輯�"
+msgid "Connect _automatically"
+msgstr "è?ªå??é?£ç·?(_A)"
 
 #: ../src/connection-editor/nm-connection-editor.glade.h:3
 msgid "Connection _name:"
 msgstr "é?£ç·?å??稱(_N)ï¼?"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:4
-#: ../src/connection-editor/nm-connection-list.c:494
-msgid "DSL"
-msgstr "DSL"
-
 #: ../src/connection-editor/nm-connection-editor.glade.h:5
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Mobile Broadband"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.glade.h:6
-msgid "Network Connections"
-msgstr "網絡��"
-
-#: ../src/connection-editor/nm-connection-editor.glade.h:7
-#: ../src/connection-editor/nm-connection-list.c:490
-msgid "VPN"
-msgstr "VPN"
+msgid "E_xport"
+msgstr "��(_X)"
 
-#: ../src/connection-editor/nm-connection-list.c:156
-#, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "ä½ ç¢ºå®?è¦?å?ªé?¤é?£ç·? %s ï¼?"
+#: ../src/connection-editor/nm-connection-editor.glade.h:11
+msgid "_Import"
+msgstr "��(_I)"
 
-#: ../src/connection-editor/nm-connection-list.c:265
+#: ../src/connection-editor/nm-connection-list.c:199
 msgid "never"
 msgstr "永�"
 
-#: ../src/connection-editor/nm-connection-list.c:276
-#: ../src/connection-editor/nm-connection-list.c:287
+#: ../src/connection-editor/nm-connection-list.c:210
+#: ../src/connection-editor/nm-connection-list.c:221
 msgid "now"
 msgstr "��"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:294
+#: ../src/connection-editor/nm-connection-list.c:228
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d å??é??以å??"
 
-#: ../src/connection-editor/nm-connection-list.c:298
+#: ../src/connection-editor/nm-connection-list.c:232
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d å°?æ??以å??"
 
-#: ../src/connection-editor/nm-connection-list.c:310
+#: ../src/connection-editor/nm-connection-list.c:244
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以å??"
 
-#: ../src/connection-editor/nm-connection-list.c:316
+#: ../src/connection-editor/nm-connection-list.c:250
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d å??æ??以å??"
 
-#: ../src/connection-editor/nm-connection-list.c:320
+#: ../src/connection-editor/nm-connection-list.c:254
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年以å??"
 
-#: ../src/utils/crypto.c:123
-#, c-format
-msgid "PEM key file had no end tag '%s'."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:320
+#: ../src/connection-editor/nm-connection-list.c:452
+msgid "Could not obtain required privileges"
+msgstr "ç?¡æ³?å??å¾?é??è¦?ç??æ¬?é??"
 
-#: ../src/utils/crypto.c:133
-#, c-format
-msgid "Doesn't look like a PEM private key file."
-msgstr "ç??èµ·ä¾?ä¸?å??æ?¯ PEM ç§?å¯?å¯?碼å??æª?æ¡?ã??"
+#: ../src/connection-editor/nm-connection-list.c:325
+msgid "Could not delete connection"
+msgstr "������"
 
-#: ../src/utils/crypto.c:141
-#, c-format
-msgid "Not enough memory to store PEM file data."
-msgstr "æ²?æ??è¶³å¤ ç??è¨?æ?¶é«?å?²å­? PEM æª?è³?æ??ã??"
+#: ../src/connection-editor/nm-connection-list.c:326
+msgid "The connection could not be deleted due to an unknown error."
+msgstr "ç?±æ?¼æ?ªç?¥ç??é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤é?£ç·?ã??"
 
-#: ../src/utils/crypto.c:157
-#, c-format
-msgid "Malformed PEM file: Proc-Type was not first tag."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:362
+#: ../src/connection-editor/nm-connection-list.c:373
+msgid "Could not move connection"
+msgstr "ç?¡æ³?移å??é?£ç·?"
 
-#: ../src/utils/crypto.c:165
-#, c-format
-msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:457
+#: ../src/connection-editor/nm-connection-list.c:506
+#: ../src/connection-editor/nm-connection-list.c:517
+msgid "Could not add connection"
+msgstr "ç?¡æ³?å? å?¥é?£ç·?"
 
-#: ../src/utils/crypto.c:175
-#, c-format
-msgid "Malformed PEM file: DEK-Info was not the second tag."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:458
+msgid "The connection could not be added due to an unknown error."
+msgstr "å? ç?ºä¸?æ??ç??é?¯èª¤ä½¿è©²é?£ç·?ç?¡æ³?å? å?¥ã??"
 
-#: ../src/utils/crypto.c:186
-#, c-format
-msgid "Malformed PEM file: no IV found in DEK-Info tag."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:631
+#: ../src/connection-editor/nm-connection-list.c:636
+#: ../src/connection-editor/nm-connection-list.c:696
+#: ../src/connection-editor/nm-connection-list.c:702
+msgid "Could not update connection"
+msgstr "������"
 
-#: ../src/utils/crypto.c:193
-#, c-format
-msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:637
+msgid "The connection could not be updated due to an unknown error."
+msgstr "å? ç?ºä¸?æ??ç??é?¯èª¤ä½¿è©²é?£ç·?ç?¡æ³?æ?´æ?°ã??"
 
-#: ../src/utils/crypto.c:206
-#, c-format
-msgid "Malformed PEM file: unknown private key cipher '%s'."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:728
+#: ../src/connection-editor/nm-connection-list.c:1056
+msgid "An unknown error ocurred."
+msgstr "ç?¼ç??æ?ªç?¥ç??é?¯èª¤ã??"
 
-#: ../src/utils/crypto.c:225
-#, c-format
-msgid "Could not decode private key."
-msgstr "ç?¡æ³?解é??ç§?å¯?å¯?碼å??ã??"
+#: ../src/connection-editor/nm-connection-list.c:737
+#: ../src/connection-editor/nm-connection-list.c:1063
+msgid "Error initializing editor"
+msgstr "å??å§?å??編輯å?¨æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/utils/crypto.c:269
+#: ../src/connection-editor/nm-connection-list.c:845
 #, c-format
-msgid "PEM certificate '%s' had no end tag '%s'."
-msgstr ""
+msgid "Wired connection %d"
+msgstr "æ??ç·?網絡é?£ç·? %d"
 
-#: ../src/utils/crypto.c:279
+#: ../src/connection-editor/nm-connection-list.c:857
 #, c-format
-msgid "Failed to decode certificate."
-msgstr "è­?æ?¸è§£ç¢¼å¤±æ??ã??"
+msgid "Wireless connection %d"
+msgstr "��網絡�� %d"
 
-#: ../src/utils/crypto.c:288 ../src/utils/crypto.c:296
+#: ../src/connection-editor/nm-connection-list.c:876
 #, c-format
-msgid "Not enough memory to store certificate data."
-msgstr ""
+msgid "GSM connection %d"
+msgstr "GSM �� %d"
 
-#: ../src/utils/crypto.c:326
+#: ../src/connection-editor/nm-connection-list.c:895
 #, c-format
-msgid "IV must be an even number of bytes in length."
-msgstr ""
+msgid "CDMA connection %d"
+msgstr "CDMA �� %d"
 
-#: ../src/utils/crypto.c:335
+#: ../src/connection-editor/nm-connection-list.c:922
+#: ../src/connection-editor/nm-connection-list.c:1324
 #, c-format
-msgid "Not enough memory to store the IV."
-msgstr ""
+msgid "VPN connection %d"
+msgstr "VPN �� %d"
 
-#: ../src/utils/crypto.c:346
+#: ../src/connection-editor/nm-connection-list.c:936
 #, c-format
-msgid "IV contains non-hexadecimal digits."
-msgstr ""
+msgid "DSL connection %d"
+msgstr "DSL �� %d"
 
-#: ../src/utils/crypto.c:384 ../src/utils/crypto_gnutls.c:125
-#: ../src/utils/crypto_nss.c:134
-#, c-format
-msgid "Private key cipher '%s' was unknown."
-msgstr ""
-
-#: ../src/utils/crypto.c:393
-#, c-format
-msgid "Not enough memory to create private key decryption key."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:998
+#: ../src/connection-editor/nm-connection-list.c:1098
+#: ../src/connection-editor/nm-connection-list.c:1313
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr "ç?±æ?¼ä¸?æ??ç??é?¯èª¤ä½¿é?£ç·?編輯å?¨å°?話ç??ç?¡æ³?å??å§?å??ã??"
 
-#: ../src/utils/crypto.c:511
-#, c-format
-msgid "Not enough memory to store decrypted private key."
-msgstr "æ²?æ??è¶³å¤ ç??è¨?æ?¶é«?ä¾?å?²å­?解碼å¾?ç??ç§?å¯?å¯?碼å??ã??"
+#: ../src/connection-editor/nm-connection-list.c:1014
+msgid "Could not edit new connection"
+msgstr "��編輯���"
 
-#: ../src/utils/crypto_gnutls.c:72
-#, c-format
-msgid "Failed to initialize the MD5 engine: %s / %s."
-msgstr "å??å§?å?? MD5 å¼?æ??失æ??ï¼?%s / %sã??"
+#: ../src/connection-editor/nm-connection-list.c:1118
+msgid "Could not edit connection"
+msgstr "��編輯��"
 
-#: ../src/utils/crypto_gnutls.c:134 ../src/utils/crypto_nss.c:143
+#: ../src/connection-editor/nm-connection-list.c:1177
 #, c-format
-msgid "Not enough memory for decrypted key buffer."
-msgstr ""
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr "ä½ ç¢ºå®?è¦?å?ªé?¤é?£ç·? %s ï¼?"
 
-#: ../src/utils/crypto_gnutls.c:142
-#, c-format
-msgid "Failed to initialize the decryption cipher context: %s / %s."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:1350
+#: ../src/connection-editor/vpn-helpers.c:229
+msgid "Cannot import VPN connection"
+msgstr "���� VPN 網絡��"
 
-#: ../src/utils/crypto_gnutls.c:151
-#, c-format
-msgid "Failed to set symmetric key for decryption: %s / %s."
+#: ../src/connection-editor/nm-connection-list.c:1352
+msgid ""
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
 msgstr ""
+"VPN å¤?æ??ç¨?å¼?ç?¡æ³?正確ç??å?¯å?¥ VPN é?£ç·?\n"
+"\n"
+"é?¯èª¤ï¼?æ²?æ?? VPN æ??å??é¡?å??ã??"
 
-#: ../src/utils/crypto_gnutls.c:160
-#, c-format
-msgid "Failed to set IV for decryption: %s / %s."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:1366
+msgid "Could not edit imported connection"
+msgstr "ç?¡æ³?編輯å?¯å?¥ç??é?£ç·?"
 
-#: ../src/utils/crypto_gnutls.c:169
-#, c-format
-msgid "Failed to decrypt the private key: %s / %s."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:1689
+msgid "Edit..."
+msgstr "編輯..."
 
-#: ../src/utils/crypto_gnutls.c:207
-#, c-format
-msgid "Error initializing certificate data: %s"
-msgstr "å??å§?å??è­?æ?¸è³?æ??æ??é?¯èª¤ï¼?%s"
+#: ../src/connection-editor/nm-connection-list.c:1690
+msgid "Authenticate to edit the selected connection."
+msgstr "é©?è­?以編輯é?¸å??ç??é?£ç·?ã??"
 
-#: ../src/utils/crypto_gnutls.c:219
-#, c-format
-msgid "Couldn't decode certificate: %s"
-msgstr "��解碼���%s"
+#: ../src/connection-editor/nm-connection-list.c:1691
+msgid "Edit"
+msgstr "編輯"
 
-#: ../src/utils/crypto_nss.c:76
-#, c-format
-msgid "Failed to initialize the MD5 context: %d."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:1692
+msgid "Edit the selected connection."
+msgstr "編輯é?¸å??ç??é?£ç·?ã??"
 
-#: ../src/utils/crypto_nss.c:151
-#, c-format
-msgid "Failed to initialize the decryption cipher slot."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:1709
+msgid "Delete..."
+msgstr "��..."
 
-#: ../src/utils/crypto_nss.c:161
-#, c-format
-msgid "Failed to set symmetric key for decryption."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:1710
+msgid "Authenticate to delete the selected connection."
+msgstr "é©?è­?以å?ªé?¤é?¸å??ç??é?£ç·?ã??"
 
-#: ../src/utils/crypto_nss.c:171
-#, c-format
-msgid "Failed to set IV for decryption."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:1711
+msgid "Delete"
+msgstr "��"
 
-#: ../src/utils/crypto_nss.c:179
-#, c-format
-msgid "Failed to initialize the decryption context."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:1712
+msgid "Delete the selected connection."
+msgstr "å?ªé?¤é?¸å??ç??é?£ç·?ã??"
 
-#: ../src/utils/crypto_nss.c:192
+#: ../src/connection-editor/vpn-helpers.c:231
 #, c-format
-msgid "Failed to decrypt the private key: %d."
+msgid ""
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
+"\n"
+"Error: %s."
 msgstr ""
+"æª?æ¡?ã??%sã??ç?¡æ³?è®?å??æ??æ?ªå??å?«å?¯è¾¨è­?ç?? VPN é?£ç·?è³?è¨?\n"
+"\n"
+"é?¯èª¤ï¼?%sã??"
 
-#: ../src/utils/crypto_nss.c:204
-#, c-format
-msgid "Failed to finalize decryption of the private key: %d."
-msgstr ""
+#: ../src/connection-editor/vpn-helpers.c:262
+msgid "Select file to import"
+msgstr "é?¸æ??è¦?å?¯å?¥ç??æª?æ¡?"
 
-#: ../src/utils/crypto_nss.c:248
+#: ../src/connection-editor/vpn-helpers.c:310
 #, c-format
-msgid "Couldn't decode certificate: %d"
-msgstr "ç?¡æ³?解é??è­?æ?¸ï¼?%d"
+msgid "A file named \"%s\" already exists."
+msgstr "å??ç?ºã??%sã??ç??æª?æ¡?å·²ç¶?å­?å?¨ã??"
 
-#: ../src/vpn-properties/nm-vpn-properties.c:564
-msgid "Cannot import VPN connection"
-msgstr "���� VPN 網絡��"
+#: ../src/connection-editor/vpn-helpers.c:312
+msgid "_Replace"
+msgstr "å??代(_R)"
 
-#: ../src/vpn-properties/nm-vpn-properties.c:566
+#: ../src/connection-editor/vpn-helpers.c:314
 #, c-format
-msgid ""
-"Cannot find suitable software for VPN connection type '%s' to import the "
-"file '%s'. Contact your system administrator."
-msgstr ""
+msgid "Do you want to replace %s with the VPN connection you are saving?"
+msgstr "ä½ æ?¯å?¦è¦?以æº?å??å?²å­?ç?? VPN é?£ç·?å??代 %sï¼?"
 
-#: ../src/vpn-properties/nm-vpn-properties.c:718
-#, c-format
-msgid "Delete VPN connection \"%s\"?"
-msgstr "å?ªé?¤ VPN é?£ç·?â??%sâ??ï¼?"
+#: ../src/connection-editor/vpn-helpers.c:350
+msgid "Cannot export VPN connection"
+msgstr "���� VPN ��"
 
-#: ../src/vpn-properties/nm-vpn-properties.c:721
+#: ../src/connection-editor/vpn-helpers.c:352
 #, c-format
 msgid ""
-"All information about the VPN connection \"%s\" will be lost and you may "
-"need your system administrator to provide information to create a new "
-"connection."
-msgstr ""
-
-#: ../src/vpn-properties/nm-vpn-properties.c:992
-msgid "Unable to load"
-msgstr "ç?¡æ³?è¼?å?¥"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:994
-msgid "Cannot find some needed resources (the glade file)!"
-msgstr "ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼? glade æª?ï¼?ï¼?"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:1010
-msgid "Cannot add VPN connection"
-msgstr "ç?¡æ³?å? å?¥ VPN é?£ç·?"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:1012
-msgid ""
-"No suitable VPN software was found on your system. Contact your system "
-"administrator."
-msgstr ""
-
-#. Druid Page 1 - Create VPN Connection
-#: ../src/vpn-properties/nm-vpn-properties.c:1091
-msgid ""
-"This assistant will guide you through the creation of a connection to a "
-"Virtual Private Network (VPN)."
-msgstr "æ­¤å?©ç??å°?æ??å°?ä½ å»ºç«?é?£ç·?è?³è??æ?¬ç§?人網絡(VPN)ã??"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:1092
-msgid ""
-"It will require some information, such as IP addresses and secrets.  Please "
-"see your system administrator to obtain this information."
-msgstr "ä»?å°?é??è¦?ä¸?äº?è³?è¨?ï¼?å??æ?¯ IP ä½?å??å??æ©?å¯?è³?æ??ã??è«?è©¢å??ä½ ç??系統管ç??å?¡ä»¥å??å¾?é??äº?è³?è¨?ã??"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:1097
-#: ../src/vpn-properties/nm-vpn-properties.c:1112
-msgid "Create VPN connection"
-msgstr "建� VPN ��"
-
-#. Druid Page 2 - Select Connection Type
-#. Translators: this will be "Create VPN Connection - [1|2] of 2"
-#: ../src/vpn-properties/nm-vpn-properties.c:1121
-#: ../src/vpn-properties/nm-vpn-properties.c:1134
-#: ../src/vpn-properties/nm-vpn-properties.c:1232
-msgid "Create VPN Connection"
-msgstr "建� VPN ��"
-
-#. Translators: this will be "Create VPN Connection - 1 of 2"
-#: ../src/vpn-properties/nm-vpn-properties.c:1136
-msgid "1 of 2"
-msgstr "2 ä¹? 1"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:1143
-msgid "Choose which type of _VPN connection you wish to create:"
-msgstr "é?¸æ??ä½ æ?³è¦?建ç«?ç?? VPN é?£ç·?é¡?å??(_V)ï¼?"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:1162
-msgid "Choose which type of VPN connection you wish to create:"
-msgstr "é?¸æ??ä½ æ?³è¦?建ç«?ç?? VPN é?£ç·?é¡?å??ï¼?"
-
-#. Druid Page 3 - Connection Details
-#. Translators: this will be "Create VPN Connection - [1|2] of 2"
-#: ../src/vpn-properties/nm-vpn-properties.c:1171
-msgid "2 of 2"
-msgstr "2 ä¹? 2"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:1209
-#: ../src/vpn-properties/nm-vpn-properties.c:1216
-msgid "Finished Create VPN Connection"
-msgstr "建ç«? VPN é?£ç·?å®?æ??"
-
-#. Edit dialog
-#: ../src/vpn-properties/nm-vpn-properties.c:1241
-msgid "Edit VPN Connection"
-msgstr "編輯 VPN ��"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:1269
-msgid "VPN Service for importing"
+"The VPN connection '%s' could not be exported to %s.\n"
+"\n"
+"Error: %s."
 msgstr ""
+"VPN é?£ç·?ã??%sã??ä¸?è?½å?¯å?ºè?³ %sã??\n"
+"\n"
+"é?¯èª¤ï¼?%sã??"
 
-#: ../src/vpn-properties/nm-vpn-properties.c:1270
-msgid "File to import"
-msgstr "è¦?å?¯å?¥ç??æª?æ¡?"
-
-#. Translators: this is the description seen when running nm-vpn-properties --help
-#: ../src/vpn-properties/nm-vpn-properties.c:1279
-msgid "- NetworkManager VPN properties"
-msgstr "- 網絡管ç??å?¡ VPN 屬æ?§"
-
-#: ../src/vpn-properties/nm-vpn-properties.glade.h:1
-msgid "Add a new VPN connection"
-msgstr "å? å?¥æ?°ç?? VPN é?£ç·?"
-
-#: ../src/vpn-properties/nm-vpn-properties.glade.h:2
-msgid "Delete the selected VPN connection"
-msgstr "å?ªé?¤æ??é?¸ç?? VPN é?£ç·?"
-
-#: ../src/vpn-properties/nm-vpn-properties.glade.h:3
-msgid "E_xport"
-msgstr "��(_X)"
-
-#: ../src/vpn-properties/nm-vpn-properties.glade.h:4
-msgid "Edit the selected VPN connection"
-msgstr "編輯已é?¸ç?? VPN é?£ç·?"
-
-#: ../src/vpn-properties/nm-vpn-properties.glade.h:5
-msgid "Export the VPN settings to a file"
-msgstr "�� VPN 設����"
-
-#: ../src/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Export the selected VPN connection to a file"
-msgstr "å?¯å?ºæ??é?¸ç?? VPN é?£ç·?è?³æª?æ¡?"
-
-#: ../src/vpn-properties/nm-vpn-properties.glade.h:7
-msgid "Manage Virtual Private Network Connections"
-msgstr "管ç??è??æ?¬ç§?æ??網絡(VPN)é?£ç·?"
-
-#: ../src/vpn-properties/nm-vpn-properties.glade.h:8
-msgid "VPN Connections"
-msgstr "VPN ��"
+#: ../src/connection-editor/vpn-helpers.c:386
+msgid "Export VPN connection..."
+msgstr "�� VPN ��..."
 
-#: ../src/vpn-password-dialog.c:137 ../src/vpn-password-dialog.c:231
+#: ../src/vpn-password-dialog.c:137 ../src/vpn-password-dialog.c:253
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "ç?¡æ³?å?·è¡? VPN é?£ç·?â??%sâ??"
@@ -1275,140 +1767,265 @@ msgstr "ç?¡æ³?å?·è¡? VPN é?£ç·?â??%sâ??"
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
 "Contact your system administrator."
-msgstr ""
+msgstr "æ?¾ä¸?å?° VPN é?£ç·?é¡?å??ã??%sã??ç??é©?è­?å°?話ç??ã??è«?è?¯çµ¡ä½ ç??系統管ç??å?¡ã??"
 
-#: ../src/vpn-password-dialog.c:234
+#: ../src/vpn-password-dialog.c:256
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
 "type '%s'. Contact your system administrator."
-msgstr ""
+msgstr "å?·è¡? VPN é?£ç·?é¡?å??ã??%sã??ç??é©?è­?å°?話ç??ç?¼ç??å??é¡?ã??è«?è?¯çµ¡ä½ ç??系統管ç??å?¡ã??"
+
+#: ../src/wired-dialog.c:99
+msgid "Wired 802.1X authentication"
+msgstr "æ??ç·?網絡 802.1X é©?è­?"
+
+#: ../src/wireless-dialog.c:414
+msgid "New..."
+msgstr "��..."
 
-#: ../src/wireless-dialog.c:660
-#, fuzzy, c-format
+#: ../src/wireless-dialog.c:916
+msgid "C_reate"
+msgstr "建�(_R)"
+
+#: ../src/wireless-dialog.c:987
+#, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network '%"
 "s'."
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">ç?¡ç·?網絡é??è¡?碼è«?æ±?</span>\n"
-"\n"
-"é??è¦?ä¸?å??é??è¡?碼æ??æ?¯å¯?碼å??ä¾?å­?å??ç?¡ç·?網絡â??%sâ??"
+msgstr "é??è¦?å¯?碼æ??æ?¯å? å¯?å¯?碼å??ä¾?å­?å??ç?¡ç·?網絡ã??%sã??ã??"
 
-#: ../src/wireless-dialog.c:662
-#, fuzzy
-msgid "Wireless Network Secrets Required"
-msgstr "é??è¦?ç?¡ç·?網絡å¯?碼å??"
+#: ../src/wireless-dialog.c:989
+msgid "Wireless Network Authentication Required"
+msgstr "��網絡����"
 
-#: ../src/wireless-dialog.c:664
-#, fuzzy
-msgid "Secrets required by wireless network"
-msgstr "建ç«?æ?°ç??ç?¡ç·?網絡"
+#: ../src/wireless-dialog.c:991
+msgid "Authentication required by wireless network"
+msgstr "ç?¡ç·?網絡æ??é??è¦?ç??é©?è­?"
 
-#: ../src/wireless-dialog.c:669
+#: ../src/wireless-dialog.c:996
 msgid "Create New Wireless Network"
 msgstr "建ç«?æ?°ç??ç?¡ç·?網絡"
 
-#: ../src/wireless-dialog.c:671
+#: ../src/wireless-dialog.c:998
 msgid "New wireless network"
 msgstr "æ?°ç??ç?¡ç·?網絡"
 
-#: ../src/wireless-dialog.c:672
+#: ../src/wireless-dialog.c:999
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "輸å?¥ä½ è¦?建ç«?ç??ç?¡ç·?網絡ç??å??稱ã??"
 
-#: ../src/wireless-dialog.c:674
-msgid "Connect to Other Wireless Network"
-msgstr "é?£æ?¥å?°å?¶å®?ç??ç?¡ç·?網絡"
+#: ../src/wireless-dialog.c:1001
+msgid "Connect to Hidden Wireless Network"
+msgstr "é?£æ?¥å?°é?±è??ç??ç?¡ç·?網絡"
 
-#: ../src/wireless-dialog.c:676
-msgid "Existing wireless network"
-msgstr "ç?¾å­?ç??ç?¡ç·?網絡"
+#: ../src/wireless-dialog.c:1003
+msgid "Hidden wireless network"
+msgstr "é?±è??ç??ç?¡ç·?網絡"
 
-#: ../src/wireless-dialog.c:677
-#, fuzzy
-msgid "Enter the name of the wireless network to which you wish to connect."
-msgstr "輸å?¥ä½ è¦?é?£æ?¥ç??ç?¡ç·?網絡ç?? ESSIDã??"
-
-#: ../src/wireless-security/eap-method.c:302
-msgid "DER or PEM certificates (*.der, *.pem)"
-msgstr "DER æ?? PEM è­?æ?¸ (*.der, *.pem)"
+#: ../src/wireless-dialog.c:1004
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr "輸å?¥ä½ è¦?é?£æ?¥ç??é?±è??ç?¡ç·?網絡ç??å??稱è??å®?å?¨æ?§è©³ç´°è³?æ??ã??"
 
-#: ../src/wireless-security/eap-method-peap.c:234
-#: ../src/wireless-security/eap-method-tls.c:290
-#: ../src/wireless-security/eap-method-ttls.c:221
+#: ../src/wireless-security/eap-method.c:169
 msgid "No Certificate Authority certificate chosen"
 msgstr "æ?ªé?¸æ??ä»»ä½?è­?æ?¸æ??æ¬?å?®ä½?(CA)è­?æ?¸"
 
-#: ../src/wireless-security/eap-method-peap.c:235
-#: ../src/wireless-security/eap-method-tls.c:291
-#: ../src/wireless-security/eap-method-ttls.c:222
+#: ../src/wireless-security/eap-method.c:170
 msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections "
 "to insecure, rogue wireless networks.  Would you like to choose a "
 "Certificate Authority certificate?"
-msgstr ""
+msgstr "ä¸?使ç?¨è­?æ?¸ä¸­å¿? (CA) ç??è­?æ?¸æ??é? æ??é?£ç·?ä¸?å®?å?¨ã??æµ?æ°?ç?¡ç·?網絡(å?¯è?½è¢«ç«?å??ã??å?«è?½ä¹?æ??)ã??æ?¯å?¦è¦?é?¸æ??ä¸?å??è­?æ?¸ä¸­å¿?ç??è­?æ?¸ï¼?"
 
-#: ../src/wireless-security/eap-method-peap.c:240
-#: ../src/wireless-security/eap-method-tls.c:296
-#: ../src/wireless-security/eap-method-ttls.c:227
+#: ../src/wireless-security/eap-method.c:175
 msgid "Ignore"
 msgstr "忽�"
 
-#: ../src/wireless-security/eap-method-peap.c:244
-#: ../src/wireless-security/eap-method-tls.c:300
-#: ../src/wireless-security/eap-method-ttls.c:231
+#: ../src/wireless-security/eap-method.c:179
 msgid "Choose CA Certificate"
 msgstr "é?¸æ?? CA è­?æ?¸"
 
-#: ../src/wireless-security/eap-method-peap.c:309
-#: ../src/wireless-security/eap-method-ttls.c:320
-msgid "MSCHAPv2"
-msgstr "MSCHAPv2"
+#: ../src/wireless-security/eap-method.c:440
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+msgstr "DER, PEM, æ?? PKCS#12 ç§?å¯?å¯?碼å??(*.der, *.pem, *.p12)"
+
+#: ../src/wireless-security/eap-method.c:443
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr "DER æ?? PEM è­?æ?¸ (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:320
+#: ../src/wireless-security/eap-method-peap.c:240
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:399
-#: ../src/wireless-security/eap-method-tls.c:427
-#: ../src/wireless-security/eap-method-ttls.c:410
+#: ../src/wireless-security/eap-method-peap.c:311
+#: ../src/wireless-security/eap-method-tls.c:417
+#: ../src/wireless-security/eap-method-ttls.c:343
 msgid "Choose a Certificate Authority certificate..."
 msgstr "é?¸æ??è­?æ?¸æ??æ¬?å?®ä½?(CA)è­?æ?¸..."
 
-#: ../src/wireless-security/eap-method-tls.c:423
+#: ../src/wireless-security/eap-method-tls.c:413
 msgid "Choose your personal certificate..."
 msgstr "é?¸æ??ä½ ç??å??人è­?æ?¸..."
 
-#: ../src/wireless-security/eap-method-tls.c:432
+#: ../src/wireless-security/eap-method-tls.c:422
 msgid "Choose your private key..."
 msgstr "é?¸æ??ä½ ç??ç§?å¯?å¯?碼å??..."
 
-#: ../src/wireless-security/eap-method-ttls.c:298
-msgid "PAP"
-msgstr "PAP"
-
-#: ../src/wireless-security/eap-method-ttls.c:309
-msgid "MSCHAP"
-msgstr "MSCHAP"
-
-#: ../src/wireless-security/eap-method-ttls.c:331
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../src/wireless-security/wireless-security.c:310
+#: ../src/wireless-security/wireless-security.c:305
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:330
+#: ../src/wireless-security/wireless-security.c:329
 msgid "Tunneled TLS"
-msgstr ""
+msgstr "穿�� TLS"
 
 #: ../src/wireless-security/wireless-security.c:340
 msgid "Protected EAP (PEAP)"
-msgstr ""
+msgstr "ä¿?è­·å¼? EAP (PEAP)"
+
+#~ msgid "Auto CDMA network connection"
+#~ msgstr "è?ªå?? CDMA 網路é?£ç·?"
+
+#~ msgid "Disconnect..."
+#~ msgstr "æ?·ç·?..."
+
+#~ msgid "CDMA Connections (%s)"
+#~ msgstr "CDMA �� (%s)"
+
+#~ msgid "CDMA Network (%s)"
+#~ msgstr "CDMA 網路 (%s)"
+
+#~ msgid "CDMA Connections"
+#~ msgstr "CDMA ��"
+
+#~ msgid "CDMA Network"
+#~ msgstr "CDMA 網路"
+
+#~ msgid "Running PPP on device %s..."
+#~ msgstr "正��� PPP ��置 %s..."
+
+#~ msgid "Auto GSM network connection"
+#~ msgstr "è?ªå?? GSM 網路é?£ç·?"
+
+#~ msgid "GSM Connections (%s)"
+#~ msgstr "GSM �� (%s)"
+
+#~ msgid "GSM Network (%s)"
+#~ msgstr "GSM 網路 (%s)"
+
+#~ msgid "GSM Connections"
+#~ msgstr "GSM ��"
+
+#~ msgid "Dialing GSM device %s..."
+#~ msgstr "æ­£å?¨æ?¥è?? GSM è£?ç½® %s..."
+
+#~ msgid "Preparing device %s for the wired network..."
+#~ msgstr "è£?ç½® %s æ­£æº?å??é?£æ?¥æ??ç·?網路..."
+
+#~ msgid "Configuring device %s for the wired network..."
+#~ msgstr "ç?ºæ??ç·?網路設置è£?ç½® %s ..."
+
+#~ msgid "Requesting a network address from the wired network..."
+#~ msgstr "æ­£è¦?æ±?æ??ç·?網路æ??ä¾?網路ä½?å??..."
+
+#~ msgid "Attempting to join the wireless network '%s'..."
+#~ msgstr "æ­£å?¨å??試å? å?¥ç?¡ç·?網路â??%sâ??..."
+
+#~ msgid "Waiting for Network Key for the wireless network '%s'..."
+#~ msgstr "æ­£å?¨ç­?å¾?ç?¡ç·?網路â??%sâ??ç??網路é??é?°..."
+
+#~ msgid "Could not find some required resources (the glade file)!"
+#~ msgstr "ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼?glade æª?ï¼?ï¼?"
+
+#~ msgid "_Manual configuration"
+#~ msgstr "æ??å??設å®?(_M)"
+
+#~ msgid "WEP 40/128-bit Hexadecimal"
+#~ msgstr "WEP 40/128-bit å??å?­ä½?å??"
+
+#~ msgid "Connection Editor"
+#~ msgstr "��編輯�"
+
+#~ msgid "Doesn't look like a PEM private key file."
+#~ msgstr "ç??èµ·ä¾?ä¸?å??æ?¯ PEM ç§?å¯?é??é?°æª?æ¡?ã??"
+
+#~ msgid "Not enough memory to store PEM file data."
+#~ msgstr "æ²?æ??è¶³å¤ ç??è¨?æ?¶é«?å?²å­? PEM æª?è³?æ??ã??"
+
+#~ msgid "Failed to decode certificate."
+#~ msgstr "æ??è­?解碼失æ??ã??"
+
+#~ msgid "Not enough memory to store decrypted private key."
+#~ msgstr "æ²?æ??è¶³å¤ ç??è¨?æ?¶é«?ä¾?å?²å­?解碼å¾?ç??ç§?å¯?é??é?°ã??"
+
+#~ msgid "Failed to initialize the MD5 engine: %s / %s."
+#~ msgstr "å??å§?å?? MD5 å¼?æ??失æ??ï¼?%s / %sã??"
+
+#~ msgid "Couldn't decode certificate: %s"
+#~ msgstr "ç?¡æ³?解碼æ??è­?ï¼?%s"
+
+#~ msgid "Couldn't decode certificate: %d"
+#~ msgstr "ç?¡æ³?解é??æ??è­?ï¼?%d"
+
+#~ msgid "Delete VPN connection \"%s\"?"
+#~ msgstr "å?ªé?¤ VPN é?£ç·?â??%sâ??ï¼?"
+
+#~ msgid "Unable to load"
+#~ msgstr "ç?¡æ³?è¼?å?¥"
+
+#~ msgid "Cannot find some needed resources (the glade file)!"
+#~ msgstr "ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼? glade æª?ï¼?ï¼?"
+
+#~ msgid ""
+#~ "This assistant will guide you through the creation of a connection to a "
+#~ "Virtual Private Network (VPN)."
+#~ msgstr "æ­¤å?©ç??å°?æ??å°?æ?¨å»ºç«?é?£ç·?è?³è??æ?¬ç§?人網路(VPN)ã??"
+
+#~ msgid ""
+#~ "It will require some information, such as IP addresses and secrets.  "
+#~ "Please see your system administrator to obtain this information."
+#~ msgstr ""
+#~ "ä»?å°?é??è¦?ä¸?äº?è³?è¨?ï¼?å??æ?¯ IP ä½?å??å??æ©?å¯?è³?æ??ã??è«?è©¢å??æ?¨ç??系統管ç??å?¡ä»¥å??å¾?é??äº?è³?"
+#~ "è¨?ã??"
+
+#~ msgid "Create VPN Connection"
+#~ msgstr "建� VPN ��"
+
+#~ msgid "1 of 2"
+#~ msgstr "2 ä¹? 1"
+
+#~ msgid "Choose which type of _VPN connection you wish to create:"
+#~ msgstr "é?¸æ??æ?¨æ?³è¦?建ç«?ç?? VPN é?£ç·?é¡?å??(_V)ï¼?"
+
+#~ msgid "Choose which type of VPN connection you wish to create:"
+#~ msgstr "é?¸æ??æ?¨æ?³è¦?建ç«?ç?? VPN é?£ç·?é¡?å??ï¼?"
+
+#~ msgid "2 of 2"
+#~ msgstr "2 ä¹? 2"
+
+#~ msgid "Finished Create VPN Connection"
+#~ msgstr "建ç«? VPN é?£ç·?å®?æ??"
+
+#~ msgid "Edit VPN Connection"
+#~ msgstr "編輯 VPN ��"
+
+#~ msgid "- NetworkManager VPN properties"
+#~ msgstr "- 網路管ç??å?¡ VPN 屬æ?§"
+
+#~ msgid "Add a new VPN connection"
+#~ msgstr "å? å?¥æ?°ç?? VPN é?£ç·?"
+
+#~ msgid "Export the VPN settings to a file"
+#~ msgstr "�� VPN 設����"
+
+#~ msgid "Export the selected VPN connection to a file"
+#~ msgstr "å?¯å?ºæ??é?¸ç?? VPN é?£ç·?è?³æª?æ¡?"
 
-#~ msgid "No active connections!"
-#~ msgstr "æ²?æ??使ç?¨ä¸­ç??é?£ç·?"
+#~ msgid "Existing wireless network"
+#~ msgstr "ç?¾å­?ç??ç?¡ç·?網路"
 
 #~ msgid "Passphrase:"
 #~ msgstr "é??è¡?碼ï¼?"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1205bd8..b662318 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,275 +7,381 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Network Manager 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-01 21:01+0800\n"
-"PO-Revision-Date: 2008-03-13 02:53+0800\n"
-"Last-Translator: Hialan Liu <hialan liu gmail com>\n"
+"POT-Creation-Date: 2009-04-21 19:48+0800\n"
+"PO-Revision-Date: 2009-04-21 19:47+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese/Traditional <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.2.1\n"
 
-#: ../src/applet-device-cdma.c:55
-msgid "Auto CDMA network connection"
-msgstr "è?ªå?? CDMA 網路é?£ç·?"
+#: ../nm-applet.desktop.in.h:1
+msgid "Control your network connections"
+msgstr "æ?§å?¶æ?¨ç??網路é?£ç·?"
 
-#: ../src/applet-device-cdma.c:195 ../src/applet-device-gsm.c:195
-msgid "Disconnect..."
-msgstr "æ?·ç·?..."
+#: ../nm-applet.desktop.in.h:2
+msgid "Network Manager"
+msgstr "網路管ç??å?¡"
 
-#: ../src/applet-device-cdma.c:235
-#, c-format
-msgid "CDMA Connections (%s)"
-msgstr "CDMA �� (%s)"
+#: ../nm-connection-editor.desktop.in.h:1
+msgid "Manage and change your network connection settings"
+msgstr "管ç??è??è®?æ?´æ?¨ç??é?£ç·?設å®?å?¼"
+
+#: ../nm-connection-editor.desktop.in.h:2
+#: ../src/connection-editor/nm-connection-editor.glade.h:7
+msgid "Network Connections"
+msgstr "網路��"
 
-#: ../src/applet-device-cdma.c:237
+#: ../src/applet-device-cdma.c:54
+msgid "Auto Mobile Broadband (CDMA) connection"
+msgstr "è?ªå??è¡?å??å¯¬é » (CDMA) é?£ç·?"
+
+#: ../src/applet-device-cdma.c:204 ../src/applet-device-gsm.c:205
+msgid "Disconnect"
+msgstr "æ?·ç·?"
+
+#: ../src/applet-device-cdma.c:243 ../src/applet-device-gsm.c:244
 #, c-format
-msgid "CDMA Network (%s)"
-msgstr "CDMA 網路 (%s)"
+msgid "Mobile Broadband (%s)"
+msgstr "è¡?å??å¯¬é » (%s)"
 
-#: ../src/applet-device-cdma.c:240
-msgid "CDMA Connections"
-msgstr "CDMA ��"
+#: ../src/applet-device-cdma.c:245 ../src/applet-device-gsm.c:246
+#: ../src/connection-editor/page-mobile.c:308
+#: ../src/connection-editor/nm-connection-editor.glade.h:6
+#: ../src/connection-editor/nm-connection-list.c:1812
+msgid "Mobile Broadband"
+msgstr "è¡?å??å¯¬é »"
 
-#: ../src/applet-device-cdma.c:242
-msgid "CDMA Network"
-msgstr "CDMA 網路"
+#: ../src/applet-device-cdma.c:298 ../src/applet-device-gsm.c:299
+#: ../src/applet-device-wired.c:261
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "æ?¨ç?¾å?¨å·²é?£ç·?è?³ã??%sã??ã??"
 
-#: ../src/applet-device-cdma.c:275 ../src/applet-device-gsm.c:275
-#: ../src/applet-device-wired.c:235 ../src/applet-device-wireless.c:969
+#: ../src/applet-device-cdma.c:302 ../src/applet-device-gsm.c:303
+#: ../src/applet-device-wired.c:265 ../src/applet-device-wifi.c:1184
 msgid "Connection Established"
 msgstr "已建���"
 
-#: ../src/applet-device-cdma.c:276
+#: ../src/applet-device-cdma.c:303
 msgid "You are now connected to the CDMA network."
 msgstr "æ?¨ç?¾å?¨å·²é?£ç·?è?³ CDMA 網路ã??"
 
-#: ../src/applet-device-cdma.c:294
+#: ../src/applet-device-cdma.c:329 ../src/applet-device-gsm.c:330
 #, c-format
-msgid "Dialing CDMA device %s..."
-msgstr "æ­£å?¨æ?¥è?? CDMA è£?ç½® %s..."
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "æ­£å?¨æº?å??è¡?å??å¯¬é »é?£ç·?ã??%sã??..."
 
-#: ../src/applet-device-cdma.c:297 ../src/applet-device-gsm.c:297
+#: ../src/applet-device-cdma.c:332 ../src/applet-device-gsm.c:333
 #, c-format
-msgid "Running PPP on device %s..."
-msgstr "正��� PPP ��置 %s..."
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "æ­£å?¨è¨­å®?è¡?å??å¯¬é »é?£ç·?ã??%sã??..."
 
-#: ../src/applet-device-cdma.c:300
-msgid "CDMA connection"
-msgstr "CDMA ��"
+#: ../src/applet-device-cdma.c:335 ../src/applet-device-gsm.c:336
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "è¡?å??å¯¬é »é?£ç·?ã??%sã??é??è¦?使ç?¨è??é©?è­?..."
 
-#: ../src/applet-device-gsm.c:55
-msgid "Auto GSM network connection"
-msgstr "è?ªå?? GSM 網路é?£ç·?"
+#: ../src/applet-device-cdma.c:338 ../src/applet-device-gsm.c:339
+#: ../src/applet.c:1831
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "æ­£å?¨è¦?æ±?ã??%sã??æ??ä¾?網路ä½?å??..."
 
-#: ../src/applet-device-gsm.c:235
+#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:343
 #, c-format
-msgid "GSM Connections (%s)"
-msgstr "GSM �� (%s)"
+msgid "Mobile broadband connection '%s' active"
+msgstr "è¡?å??å¯¬é »é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸­"
 
-#: ../src/applet-device-gsm.c:237
+#: ../src/applet-device-cdma.c:458 ../src/applet-device-gsm.c:541
+msgid "Mobile broadband network password"
+msgstr "è¡?å??å¯¬é »ç¶²è·¯å¯?碼"
+
+#: ../src/applet-device-cdma.c:467 ../src/applet-device-gsm.c:550
 #, c-format
-msgid "GSM Network (%s)"
-msgstr "GSM 網路 (%s)"
+msgid "A password is required to connect to '%s'."
+msgstr "é?£ç·?è?³ã??%sã??é??è¦?å¯?碼ã??"
 
-#: ../src/applet-device-gsm.c:240
-msgid "GSM Connections"
-msgstr "GSM ��"
+#: ../src/applet-device-cdma.c:485 ../src/applet-device-gsm.c:568
+#: ../src/applet.glade.h:25 ../src/connection-editor/ce-page-dsl.glade.h:1
+#: ../src/connection-editor/ce-page-mobile.glade.h:14
+msgid "Password:"
+msgstr "�碼�"
 
-#: ../src/applet-device-gsm.c:242
-msgid "GSM Network"
-msgstr "GSM 網路"
+#: ../src/applet-device-gsm.c:55
+msgid "Auto Mobile Broadband (GSM) connection"
+msgstr "è?ªå??è¡?å??å¯¬é » (GSM) é?£ç·?"
 
-#: ../src/applet-device-gsm.c:276
+#: ../src/applet-device-gsm.c:304
 msgid "You are now connected to the GSM network."
 msgstr "æ?¨ç?¾å?¨å·²é?£ç·?è?³ GSM 網路ã??"
 
-#: ../src/applet-device-gsm.c:294
-#, c-format
-msgid "Dialing GSM device %s..."
-msgstr "æ­£å?¨æ?¥è?? GSM è£?ç½® %s..."
+#: ../src/applet-device-gsm.c:481
+msgid "PIN code required"
+msgstr "é??è¦? PIN 碼"
+
+#: ../src/applet-device-gsm.c:483
+msgid "PUK code required"
+msgstr "é??è¦? PUK 碼"
 
-#: ../src/applet-device-gsm.c:300
-msgid "GSM connection"
-msgstr "GSM ��"
+#: ../src/applet-device-gsm.c:492
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "é??å??è¡?å??å¯¬é »è£?ç½®é??è¦? PIN 碼"
 
-#: ../src/applet-device-wired.c:64
+#: ../src/applet-device-gsm.c:494
+msgid "PUK code is needed for the mobile broadband device"
+msgstr "é??å??è¡?å??å¯¬é »è£?ç½®é??è¦? PUK 碼"
+
+#: ../src/applet-device-wired.c:63
 msgid "Auto Ethernet"
 msgstr "è?ªå??ä¹?太網路"
 
-#: ../src/applet-device-wired.c:191
+#: ../src/applet-device-wired.c:197
 #, c-format
 msgid "Wired Networks (%s)"
 msgstr "æ??ç·?網路 (%s)"
 
-#: ../src/applet-device-wired.c:193
+#: ../src/applet-device-wired.c:199
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "æ??ç·?網路 (%s)"
 
-#: ../src/applet-device-wired.c:196
+#: ../src/applet-device-wired.c:202
 msgid "Wired Networks"
 msgstr "æ??ç·?網路"
 
-#: ../src/applet-device-wired.c:198
+#: ../src/applet-device-wired.c:204
 msgid "Wired Network"
 msgstr "æ??ç·?網路"
 
-#: ../src/applet-device-wired.c:236
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet-device-wired.c:227
+msgid "disconnected"
+msgstr "已��"
+
+#: ../src/applet-device-wired.c:266
 msgid "You are now connected to the wired network."
 msgstr "æ?¨ç?¾å?¨å·²é?£ç·?è?³æ??ç·?網路ã??"
 
-#: ../src/applet-device-wired.c:254
+#: ../src/applet-device-wired.c:292
 #, c-format
-msgid "Preparing device %s for the wired network..."
-msgstr "è£?ç½® %s æ­£æº?å??é?£æ?¥æ??ç·?網路..."
+msgid "Preparing wired network connection '%s'..."
+msgstr "æ­£å?¨æº?å??æ??ç·?網路é?£ç·?ã??%sã??..."
 
-#: ../src/applet-device-wired.c:257
+#: ../src/applet-device-wired.c:295
 #, c-format
-msgid "Configuring device %s for the wired network..."
-msgstr "ç?ºæ??ç·?網路設置è£?ç½® %s ..."
+msgid "Configuring wired network connection '%s'..."
+msgstr "æ­£å?¨è¨­å®?æ??ç·?網路é?£ç·?ã??%sã??..."
 
-#: ../src/applet-device-wired.c:260
+#: ../src/applet-device-wired.c:298
 #, c-format
-msgid "Requesting a network address from the wired network..."
-msgstr "æ­£è¦?æ±?æ??ç·?網路æ??ä¾?網路ä½?å??..."
+msgid "User authentication required for wired network connection '%s'..."
+msgstr "æ??ç·?網路é?£ç·?ã??%sã??é??è¦?使ç?¨è??é©?è­?..."
 
-#: ../src/applet-device-wired.c:264
-msgid "Wired network connection"
-msgstr "æ??ç·?網路é?£æ?¥"
+#: ../src/applet-device-wired.c:301
+#, c-format
+msgid "Requesting a wired network address for '%s'..."
+msgstr "æ­£è¦?æ±?æ??ç·?網路ã??%sã??æ??ä¾?網路ä½?å??..."
 
-#: ../src/applet-device-wired.c:459
-#, fuzzy
+#: ../src/applet-device-wired.c:305
+#, c-format
+msgid "Wired network connection '%s' active"
+msgstr "æ??ç·?網路é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸­"
+
+#: ../src/applet-device-wired.c:558
 msgid "DSL authentication"
-msgstr "é©?è­?ï¼?"
+msgstr "DSL é©?è­?"
 
-#: ../src/applet-device-wireless.c:86
-msgid "_Connect to Other Wireless Network..."
-msgstr "é?£æ?¥å?°å?¶å®?ç??ç?¡ç·?網路(_C)..."
+#: ../src/applet-device-wifi.c:91
+msgid "_Connect to Hidden Wireless Network..."
+msgstr "é?£æ?¥å?°é?±è??ç??ç?¡ç·?網路(_C)..."
 
-#: ../src/applet-device-wireless.c:124
+#: ../src/applet-device-wifi.c:122
 msgid "Create _New Wireless Network..."
 msgstr "建ç«?æ?°ç??ç?¡ç·?網路(_N)..."
 
-#: ../src/applet-device-wireless.c:661
+#: ../src/applet-device-wifi.c:693
 #, c-format
 msgid "Wireless Networks (%s)"
 msgstr "��網路 (%s)"
 
-#: ../src/applet-device-wireless.c:663
+#: ../src/applet-device-wifi.c:695
 #, c-format
 msgid "Wireless Network (%s)"
 msgstr "��網路 (%s)"
 
-#: ../src/applet-device-wireless.c:665
+#: ../src/applet-device-wifi.c:697
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "��網路"
 
-#: ../src/applet-device-wireless.c:967
+#: ../src/applet-device-wifi.c:714
+msgid "wireless is disabled"
+msgstr "ç?¡ç·?網路已å??ç?¨"
+
+#: ../src/applet-device-wifi.c:977
+msgid "Wireless Networks Available"
+msgstr "å?¯ç?¨ç??ç?¡ç·?網路"
+
+#: ../src/applet-device-wifi.c:978
+msgid "Click on this icon to connect to a wireless network"
+msgstr "è«?æ??é??å??å??示ä¾?é?£ç·?å?°ç?¡ç·?網路"
+
+#: ../src/applet-device-wifi.c:981 ../src/applet.c:438
+msgid "Don't show this message again"
+msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯"
+
+#: ../src/applet-device-wifi.c:1182
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "æ?¨ç?¾å?¨å·²é?£ç·?å?°ç?¡ç·?網路ã??%sã??ã??"
 
-#: ../src/applet-device-wireless.c:968 ../src/applet-device-wireless.c:996
+#: ../src/applet-device-wifi.c:1183 ../src/applet-device-wifi.c:1214
 msgid "(none)"
 msgstr "(ç?¡)"
 
-#: ../src/applet-device-wireless.c:1000
+#: ../src/applet-device-wifi.c:1224
 #, c-format
-msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "è£?ç½® %s æ­£æº?å??é?£æ?¥ç?¡ç·?網路â??%sâ??..."
+msgid "Preparing wireless network connection '%s'..."
+msgstr "æ­£å?¨æº?å??ç?¡ç·?網路é?£ç·?ã??%sã??..."
 
-#: ../src/applet-device-wireless.c:1003
+#: ../src/applet-device-wifi.c:1227
 #, c-format
-msgid "Attempting to join the wireless network '%s'..."
-msgstr "æ­£å?¨å??試å? å?¥ç?¡ç·?網路â??%sâ??..."
+msgid "Configuring wireless network connection '%s'..."
+msgstr "æ­£å?¨è¨­å®?ç?¡ç·?網路é?£ç·?ã??%sã??..."
 
-#: ../src/applet-device-wireless.c:1006
+#: ../src/applet-device-wifi.c:1230
 #, c-format
-msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "æ­£è¦?æ±?ç?¡ç·?網路â??%sâ??æ??ä¾?網路ä½?å??..."
+msgid "User authentication required for wireless network '%s'..."
+msgstr "ç?¡ç·?網路ã??%sã??è¦?æ±?使ç?¨è??é©?è­?..."
 
-#: ../src/applet-device-wireless.c:1009
+#: ../src/applet-device-wifi.c:1233
 #, c-format
-msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "æ­£å?¨ç­?å¾?ç?¡ç·?網路â??%sâ??ç??網路é??é?°..."
+msgid "Requesting a wireless network address for '%s'..."
+msgstr "æ­£å?¨è¦?æ±?ç?¡ç·?網路ã??%sã??æ??ä¾?網路ä½?å??..."
 
-#: ../src/applet-device-wireless.c:1029
+#: ../src/applet-device-wifi.c:1253
 #, c-format
-msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "ç?¡ç·?網路é?£æ?¥å?°â??%sâ?? (%d%%)"
+msgid "Wireless network connection '%s' active: %s (%d%%)"
+msgstr "ç?¡ç·?網路é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸­ï¼? %s (%d%%)"
 
-#: ../src/applet-device-wireless.c:1033
+#: ../src/applet-device-wifi.c:1257
 #, c-format
-msgid "Wireless network connection to '%s'"
-msgstr "ç?¡ç·?網路é?£æ?¥å?°ã??%sã??"
+msgid "Wireless network connection '%s' active"
+msgstr "ç?¡ç·?網路é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸­"
 
-#: ../src/applet-dialogs.c:50
+#: ../src/applet-dialogs.c:53
 msgid "Error displaying connection information:"
 msgstr "顯示é?£ç·?è³?è¨?ç?¼ç??é?¯èª¤ï¼?"
 
-#: ../src/applet-dialogs.c:77
-#: ../src/connection-editor/page-wireless-security.c:288
-#: ../src/wireless-dialog.c:512
-#: ../src/wireless-security/wireless-security.c:320
+#: ../src/applet-dialogs.c:84
+#: ../src/connection-editor/page-wireless-security.c:277
+#: ../src/wireless-dialog.c:815
+#: ../src/wireless-security/wireless-security.c:317
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:79
+#: ../src/applet-dialogs.c:86
 msgid "Dynamic WEP"
 msgstr "å??æ?? WEP"
 
-#: ../src/applet-dialogs.c:81 ../src/applet-dialogs.c:193
-#: ../src/applet-dialogs.c:195
+#: ../src/applet-dialogs.c:88 ../src/applet-dialogs.c:189
+#: ../src/applet-dialogs.c:191
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:83 ../src/applet-dialogs.c:216
+#: ../src/applet-dialogs.c:187
+msgid "WEP"
+msgstr "WEP"
+
+#: ../src/applet-dialogs.c:195 ../src/applet-dialogs.c:204
+#: ../src/connection-editor/page-wireless-security.c:238
+#: ../src/wireless-dialog.c:768
+msgid "None"
+msgstr "ç?¡"
+
+#: ../src/applet-dialogs.c:207 ../src/applet-dialogs.c:322
 msgid "Unknown"
 msgstr "��"
 
-#: ../src/applet-dialogs.c:132
-msgid "Could not find some required resources (the glade file)!"
-msgstr "ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼?glade æª?ï¼?ï¼?"
-
-#: ../src/applet-dialogs.c:150
+#: ../src/applet-dialogs.c:258
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "�太網路 (%s)"
 
-#: ../src/applet-dialogs.c:152
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:154
+#: ../src/applet-dialogs.c:262
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:156
+#: ../src/applet-dialogs.c:264
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:191
-msgid "WEP"
-msgstr "WEP"
+#: ../src/applet-dialogs.c:269
+msgid "Interface:"
+msgstr "���"
 
-#: ../src/applet-dialogs.c:200
-#: ../src/connection-editor/page-wireless-security.c:240
-#: ../src/wireless-dialog.c:460
-msgid "None"
-msgstr "ç?¡"
+#: ../src/applet-dialogs.c:285
+msgid "Hardware Address:"
+msgstr "硬é«?ä½?å??ï¼?"
 
-#: ../src/applet-dialogs.c:212
+#: ../src/applet-dialogs.c:295
+msgid "Driver:"
+msgstr "é©?å??ç¨?å¼?ï¼?"
+
+#: ../src/applet-dialogs.c:314
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:319
+msgid "Speed:"
+msgstr "é??度ï¼?"
+
+#: ../src/applet-dialogs.c:329
+#: ../src/connection-editor/ce-page-wireless-security.glade.h:1
+msgid "Security:"
+msgstr "����"
+
+#: ../src/applet-dialogs.c:349
+msgid "IP Address:"
+msgstr "IP ä½?å??ï¼?"
+
+#: ../src/applet-dialogs.c:365
+msgid "Broadcast Address:"
+msgstr "廣æ?­ä½?å??ï¼?"
+
+#: ../src/applet-dialogs.c:376
+msgid "Subnet Mask:"
+msgstr "�網路�罩�"
+
+#: ../src/applet-dialogs.c:388
+msgid "Default Route:"
+msgstr "é ?設路ç?±ï¼?"
+
+#: ../src/applet-dialogs.c:403
+msgid "Primary DNS:"
+msgstr "主� DNS�"
+
+#: ../src/applet-dialogs.c:414
+msgid "Secondary DNS:"
+msgstr "次� DNS�"
+
+#. Shouldn't really happen but ...
+#: ../src/applet-dialogs.c:477
+msgid "No valid active connections found!"
+msgstr "æ?¾ä¸?å?°æ??æ??ç??使ç?¨ä¸­é?£ç·?ï¼?"
+
+#: ../src/applet-dialogs.c:603
 msgid ""
 "Copyright © 2004-2008 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc."
@@ -283,16 +389,16 @@ msgstr ""
 "Copyright © 2004-2008 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc."
 
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:605
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr ""
+msgstr "ç?¨ä¾?管ç??æ?¨ç??網路è£?ç½®è??é?£ç·?ç??é??ç?¥å??é?¢æ?¿ç¨?å¼?ã??"
 
-#: ../src/applet-dialogs.c:386
+#: ../src/applet-dialogs.c:607
 msgid "NetworkManager Website"
 msgstr "NetworkManager 網�"
 
-#: ../src/applet-dialogs.c:389
+#: ../src/applet-dialogs.c:610
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?翻譯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å­?é?µä»¶çµ¦\n"
@@ -302,96 +408,130 @@ msgstr ""
 "Hialan Liu <hialan liu gmail com>, 2008.\n"
 "Woodman Tuen <wmtuen gmail com>, 2005."
 
-#: ../src/applet.c:370
+#: ../src/applet-dialogs.c:626
+msgid "Missing resources"
+msgstr "�失��"
+
+#: ../src/applet.c:508
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the network connection was "
 "interrupted."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?ºç¶²è·¯é?£ç·?被中æ?·äº?ã??"
 
-#: ../src/applet.c:372
+#: ../src/applet.c:511
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service stopped unexpectedly."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?º VPN æ??å??æ??å¤?ç??å??æ­¢äº?ã??"
 
-#: ../src/applet.c:374
+#: ../src/applet.c:514
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service returned invalid "
 "configuration."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?º VPN æ??å??å?³å??ç?¡æ??ç??çµ?æ??ã??"
 
-#: ../src/applet.c:376
+#: ../src/applet.c:517
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the connection attempt timed out."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?ºé?£ç·?ç??å??試已é?¾æ??ã??"
 
-#: ../src/applet.c:378
+#: ../src/applet.c:520
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service did not start in time."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?º VPN æ??å??æ²?æ??å??æ??å??å??ã??"
 
-#: ../src/applet.c:380
+#: ../src/applet.c:523
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service failed to start."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?º VPN æ??å??å??å??失æ??ã??"
 
-#: ../src/applet.c:382
+#: ../src/applet.c:526
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because there were no valid VPN secrets."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?ºæ²?æ??æ??æ??ç?? VPN æ??å??ã??"
 
-#: ../src/applet.c:387
-#, fuzzy, c-format
+#: ../src/applet.c:529
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?ºç?¡æ??ç?? VPN æ©?å¯?ã??"
+
+#: ../src/applet.c:536
+#, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed."
-msgstr "VPN é?£ç·?é?£æ?¥å?°â??%sâ??"
+msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ã??"
 
-#: ../src/applet.c:405
+#: ../src/applet.c:554
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected because the network connection was "
 "interrupted."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?ºç¶²è·¯é?£ç·?中æ?·äº?ã??"
 
-#: ../src/applet.c:407
+#: ../src/applet.c:557
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected because the VPN service stopped."
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?º VPN æ??å??å·²å??æ­¢ã??"
 
-#: ../src/applet.c:412
-#, fuzzy, c-format
+#: ../src/applet.c:563
+#, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected."
-msgstr "網路é?£ç·?已中æ?·ã??"
+msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??å·²æ?·ç·?ã??"
 
-#: ../src/applet.c:438
+#: ../src/applet.c:641
 msgid "VPN Login Message"
 msgstr "VPN ç?»é??è¨?æ?¯"
 
-#: ../src/applet.c:449 ../src/applet.c:456 ../src/applet.c:497
-#, fuzzy
+#: ../src/applet.c:653 ../src/applet.c:661 ../src/applet.c:705
 msgid "VPN Connection Failed"
-msgstr "VPN ��"
+msgstr "VPN é?£ç·?失æ??"
 
-#: ../src/applet.c:504
+#: ../src/applet.c:712
 #, c-format
 msgid ""
 "\n"
@@ -399,8 +539,12 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??失æ??ï¼?å? ç?º VPN æ??å??å??å??失æ??ã??\n"
+"\n"
+"%s"
 
-#: ../src/applet.c:507
+#: ../src/applet.c:715
 #, c-format
 msgid ""
 "\n"
@@ -408,90 +552,138 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"\n"
+"VPN é?£ç·?ã??%sã??å??å??失æ??ã??\n"
+"\n"
+"%s"
+
+#: ../src/applet.c:1006
+msgid "device not ready"
+msgstr "�置��就�"
 
-#: ../src/applet.c:814
-msgid "No network devices have been found"
-msgstr "���任�網路�置"
+#: ../src/applet.c:1022
+msgid "device not managed"
+msgstr "è£?ç½®ç?¡æ³?管ç??"
 
-#: ../src/applet.c:894
+#: ../src/applet.c:1066
+msgid "No network devices available"
+msgstr "æ²?æ??å?¯ç?¨ç??網路è£?ç½®"
+
+#: ../src/applet.c:1154
 msgid "_VPN Connections"
 msgstr "_VPN ��"
 
-#: ../src/applet.c:944
+#: ../src/applet.c:1204
 msgid "_Configure VPN..."
 msgstr "設置 VPN(_C)..."
 
-#: ../src/applet.c:948
+#: ../src/applet.c:1208
 msgid "_Disconnect VPN..."
 msgstr "è?? VPN æ?·ç·?(_D)..."
 
-#: ../src/applet.c:997
+#: ../src/applet.c:1261
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager æ²?æ??å?·è¡?...."
 
-#: ../src/applet.c:1002 ../src/applet.c:1576
+#: ../src/applet.c:1266 ../src/applet.c:1959
 msgid "Networking disabled"
 msgstr "網路已å??ç?¨"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1179
+#: ../src/applet.c:1450
 msgid "Enable _Networking"
 msgstr "å??ç?¨ç¶²è·¯(_N)"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:1187
+#: ../src/applet.c:1459
 msgid "Enable _Wireless"
 msgstr "å??ç?¨ç?¡ç·?網路(_W)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1197
+#: ../src/applet.c:1470
 msgid "Connection _Information"
 msgstr "����(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1207
+#: ../src/applet.c:1480
 msgid "Edit Connections..."
 msgstr "編輯��..."
 
 #. Help item
-#: ../src/applet.c:1221
+#: ../src/applet.c:1494
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
 #. About item
-#: ../src/applet.c:1230
+#: ../src/applet.c:1503
 msgid "_About"
 msgstr "é??æ?¼(_A)"
 
-#: ../src/applet.c:1395
+#: ../src/applet.c:1676
 msgid "Disconnected"
 msgstr "已��"
 
-#: ../src/applet.c:1396
+#: ../src/applet.c:1677
 msgid "The network connection has been disconnected."
 msgstr "網路é?£ç·?已中æ?·ã??"
 
-#: ../src/applet.c:1580
+#: ../src/applet.c:1825
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "æ­£å?¨æº?å??網路é?£ç·?ã??%sã??..."
+
+#: ../src/applet.c:1828
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "網路é?£ç·?ã??%sã??é??è¦?使ç?¨è??é©?è­?..."
+
+#: ../src/applet.c:1834
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "網路é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸­"
+
+#: ../src/applet.c:1915
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "æ­£å?¨å??å?? VPN é?£ç·?ã??%sã??..."
+
+#: ../src/applet.c:1918
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "VPN é?£ç·?ã??%sã??é??è¦?使ç?¨è??é©?è­?..."
+
+#: ../src/applet.c:1921
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "æ­£å?¨è¦?æ±? VPN æ??ä¾?ã??%sã??ç??網路ä½?å??..."
+
+#: ../src/applet.c:1924
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "VPN é?£ç·?ã??%sã??å?¨ä½¿ç?¨ä¸­"
+
+#: ../src/applet.c:1963
 msgid "No network connection"
 msgstr "æ²?æ??網路é?£æ?¥"
 
-#: ../src/applet.c:1832
+#: ../src/applet.c:2298
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
 msgstr "NetworkManager é?¢æ?¿ç¨?å¼?ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ã??å®?ç?¡æ³?ç¹¼çº?ã??\n"
 
-#: ../src/applet.c:1979
+#: ../src/applet.c:2485
 msgid "NetworkManager Applet"
 msgstr "NetworkManager ����"
 
-#: ../src/applet.c:1984 ../src/wireless-dialog.c:791
+#: ../src/applet.c:2491 ../src/wired-dialog.c:128
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 msgstr "NetworkManager é?¢æ?¿ç¨?å¼?ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼?æ?¾ä¸?å?° glade æª?ï¼?"
 
-#: ../src/applet.glade.h:1
+#: ../src/applet.glade.h:1 ../src/connection-editor/ce-mobile-wizard.glade.h:1
+#: ../src/connection-editor/ce-vpn-wizard.glade.h:1
 msgid " "
 msgstr " "
 
@@ -502,11 +694,14 @@ msgid ""
 "3\n"
 "4"
 msgstr ""
+"1 (é ?設å?¼)\n"
+"2\n"
+"3\n"
+"4"
 
 #: ../src/applet.glade.h:6
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr "<span weight=\"bold\">使ç?¨ä¸­ç??é?£ç·?è³?è¨?ï¼?</span>"
+msgid "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
+msgstr "<span size=\"larger\" weight=\"bold\">使ç?¨ä¸­ç??網路é?£ç·?</span>"
 
 #: ../src/applet.glade.h:7
 msgid "Anonymous Identity:"
@@ -517,62 +712,52 @@ msgid "Authentication:"
 msgstr "é©?è­?ï¼?"
 
 #: ../src/applet.glade.h:9
-msgid "Broadcast Address:"
-msgstr "廣æ?­ä½?å??ï¼?"
+msgid ""
+"Automatic\n"
+"Version 0\n"
+"Version 1"
+msgstr ""
+"è?ªå??\n"
+"第 0 ç??\n"
+"第 1 ç??"
 
-#: ../src/applet.glade.h:10
+#: ../src/applet.glade.h:12
 msgid "CA Certificate:"
 msgstr "CA æ??è­?ï¼?"
 
-#: ../src/applet.glade.h:11
+#: ../src/applet.glade.h:13
 msgid "C_onnect"
 msgstr "��(_O)"
 
-#: ../src/applet.glade.h:12
+#: ../src/applet.glade.h:14
 msgid "Connection Information"
 msgstr "����"
 
-#: ../src/applet.glade.h:13
-msgid "Default Route:"
-msgstr "é ?設路ç?±ï¼?"
-
-#: ../src/applet.glade.h:14
-msgid "Don't warn me again"
-msgstr "ä¸?è¦?å??æ??é??æ??"
-
 #: ../src/applet.glade.h:15
-msgid "Driver:"
-msgstr "é©?å??ç¨?å¼?ï¼?"
+msgid "Connection:"
+msgstr "��:"
 
 #: ../src/applet.glade.h:16
-msgid "Hardware Address:"
-msgstr "硬é«?ä½?å??ï¼?"
+msgid "Don't warn me again"
+msgstr "ä¸?è¦?å??æ??é??æ??"
 
 #: ../src/applet.glade.h:17
-msgid "IP Address:"
-msgstr "IP ä½?å??ï¼?"
-
-#: ../src/applet.glade.h:18
 msgid "Identity:"
 msgstr "���"
 
-#: ../src/applet.glade.h:19
+#: ../src/applet.glade.h:18
 msgid "Inner Authentication:"
-msgstr ""
+msgstr "����:"
 
-#: ../src/applet.glade.h:20
-msgid "Interface:"
-msgstr "���"
-
-#: ../src/applet.glade.h:21
+#: ../src/applet.glade.h:19
 msgid "Key:"
 msgstr "é??é?°ï¼?"
 
-#: ../src/applet.glade.h:22
+#: ../src/applet.glade.h:20
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/applet.glade.h:23
+#: ../src/applet.glade.h:21
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -580,695 +765,1004 @@ msgstr ""
 "é??æ?¾ç³»çµ±\n"
 "å?±ç?¨é??é?°"
 
-#: ../src/applet.glade.h:25
+#: ../src/applet.glade.h:23
 msgid "Other Wireless Network..."
 msgstr "����網路..."
 
-#: ../src/applet.glade.h:26
+#: ../src/applet.glade.h:24
 msgid "PEAP Version:"
 msgstr "PEAP ç??æ?¬ï¼?"
 
-#: ../src/applet.glade.h:27
-msgid "Password:"
-msgstr "�碼�"
-
-#: ../src/applet.glade.h:28
-msgid "Primary DNS:"
-msgstr "主� DNS�"
-
-#: ../src/applet.glade.h:29
+#: ../src/applet.glade.h:26
 msgid "Private Key Password:"
 msgstr "ç§?å¯?é??é?°å¯?碼ï¼?"
 
-#: ../src/applet.glade.h:30
+#: ../src/applet.glade.h:27
 msgid "Private Key:"
 msgstr "ç§?å¯?é??é?°ï¼?"
 
-#: ../src/applet.glade.h:31
-msgid "Secondary DNS:"
-msgstr "次� DNS�"
-
-#: ../src/applet.glade.h:32
-#: ../src/connection-editor/ce-page-wireless-security.glade.h:1
-msgid "Security:"
-msgstr "����"
-
-#: ../src/applet.glade.h:33
+#: ../src/applet.glade.h:28
 msgid "Select A File"
 msgstr "é?¸æ??æª?æ¡?"
 
-#: ../src/applet.glade.h:34
+#: ../src/applet.glade.h:29
 msgid "Show key"
 msgstr "顯示é??é?°"
 
-#: ../src/applet.glade.h:35
+#: ../src/applet.glade.h:30 ../src/connection-editor/ce-page-dsl.glade.h:3
 msgid "Show password"
 msgstr "顯示�碼"
 
-#: ../src/applet.glade.h:36
-msgid "Speed:"
-msgstr "é??度ï¼?"
-
-#: ../src/applet.glade.h:37
-msgid "Subnet Mask:"
-msgstr "�網路�罩�"
-
-#: ../src/applet.glade.h:38
+#: ../src/applet.glade.h:31 ../src/connection-editor/ce-page-mobile.glade.h:16
 msgid "Type:"
 msgstr "é¡?å??ï¼?"
 
-#: ../src/applet.glade.h:39
+#: ../src/applet.glade.h:32
 msgid "User Certificate:"
 msgstr "使ç?¨è??æ??è­?ï¼?"
 
-#: ../src/applet.glade.h:40
+#: ../src/applet.glade.h:33
 msgid "User Name:"
 msgstr "使ç?¨è??å??稱ï¼?"
 
-#: ../src/applet.glade.h:41
-msgid ""
-"Version 0\n"
-"Version 1"
-msgstr ""
-"ç??æ?¬ 0\n"
-"ç??æ?¬ 1"
-
-#: ../src/applet.glade.h:43
+#: ../src/applet.glade.h:34
 msgid "WEP Index:"
-msgstr ""
+msgstr "WEP 索�:"
 
-#: ../src/applet.glade.h:44
+#: ../src/applet.glade.h:35
 msgid "Wireless _adapter:"
 msgstr "��網絡�(_A)�"
 
-#: ../src/applet.glade.h:45
+#: ../src/applet.glade.h:36
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/applet.glade.h:46
+#: ../src/applet.glade.h:37
 msgid "_Network Name:"
 msgstr "網路å??稱(_N)ï¼?"
 
-#: ../src/applet.glade.h:47
-#, fuzzy
+#: ../src/applet.glade.h:38
 msgid "_Wireless Security:"
-msgstr "��網絡�(_A)�"
+msgstr "��網路�護(_W):"
 
-#: ../src/applet.glade.h:48
+#: ../src/applet.glade.h:39
 msgid "alert text"
+msgstr "警示æ??å­?"
+
+#: ../src/connection-editor/ce-mobile-wizard.glade.h:2
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Choose a Mobile Broadband Connection</"
+"span>\n"
+"\n"
+"Select or connect the mobile broadband device you wish to use for the new "
+"connection.  If the device is not available, you may select a generic "
+"connection type."
 msgstr ""
+"<span weight=\"bold\" size=\"larger\">é?¸æ??ä¸?å??è¡?å??å¯¬é »é?£ç·?</span>\n"
+"\n"
+"é?¸æ??æ??é?£ç·?è?³æ?¨å¸?æ??使ç?¨ç??è¡?å??å¯¬é »è£?ç½®å??ç?ºæ?°ç??é?£ç·?ã??å¦?æ??該è£?ç½®ç?¡æ³?使ç?¨ï¼?æ?¨å?¯ä»¥"
+"使ç?¨ä¸?è?¬é?£ç·?é¡?å??ã??"
+
+#: ../src/connection-editor/ce-page.c:70
+msgid "automatic"
+msgstr "è?ªå??"
+
+#: ../src/connection-editor/ce-page.c:201
+msgid ""
+"Insufficient privileges or unknown error retrieving system connection "
+"secrets."
+msgstr "å??å¾?系統æ©?å¯?æ??æ¬?é??ä¸?足æ??ä¸?æ??ç??é?¯èª¤ã??"
+
+#: ../src/connection-editor/ce-page.c:236
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "ç?±æ?¼ä¸?æ??ç??é?¯èª¤ä½¿é?£ç·?æ©?å¯?ç??æ?´æ?°å¤±æ??ã??"
+
+#: ../src/connection-editor/ce-page.c:269
+msgid "Could not request secrets from the system settings service."
+msgstr "ç?¡æ³?è¦?æ±?ä¾?è?ªç³»çµ±è¨­å®?æ??å??ç??æ©?å¯?ã??"
+
+#: ../src/connection-editor/ce-page.c:299
+msgid "Could not connect to D-Bus to request connection secrets."
+msgstr "ç?¡æ³?é?£ç·?è?³ D-Bus 以è¦?æ±?é?£ç·?æ©?å¯?ã??"
+
+#: ../src/connection-editor/ce-page.c:312
+msgid "Could not create D-Bus proxy for connection secrets."
+msgstr "ç?¡æ³?ç?ºé?£ç·?æ©?å¯?建ç«? D-Bus 代ç??ã??"
+
+#: ../src/connection-editor/ce-page-dsl.glade.h:2
+msgid "Service:"
+msgstr "æ??å??:"
+
+#: ../src/connection-editor/ce-page-dsl.glade.h:4
+#: ../src/connection-editor/ce-page-mobile.glade.h:17
+msgid "Username:"
+msgstr "使ç?¨è??å??稱:"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:1
-msgid "<b>DNS Servers</b>"
-msgstr "<b>DNS 伺æ??å?¨</b>"
+msgid "<b>Addresses</b>"
+msgstr "<b>ä½?å??</b>"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:2
-msgid "<b>Search Domains</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"
+"å??享給å?¶ä»?é?»è?¦"
+
+#: ../src/connection-editor/ce-page-ip4.glade.h:7
+msgid "DHCP Client ID:"
+msgstr "DHCP 客�端 ID:"
+
+#: ../src/connection-editor/ce-page-ip4.glade.h:8
+msgid "DNS Servers:"
+msgstr "DNS 伺æ??å?¨:"
+
+#: ../src/connection-editor/ce-page-ip4.glade.h:9
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr "å¦?æ??å??ç?¨ï¼?é??å??é?£ç·?å°?æ°¸é? ä¸?æ??å??ç?ºé ?設網路é?£ç·?ã??"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:3
-msgid "_Manual configuration"
-msgstr "æ??å??設å®?(_M)"
+#: ../src/connection-editor/ce-page-ip4.glade.h:10
+msgid "Ignore automatically obtained routes"
+msgstr "忽ç?¥è?ªå??ç?²å¾?ç??è·¯ç?±"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:1
-msgid "Aut_onegotiate"
-msgstr ""
+#: ../src/connection-editor/ce-page-ip4.glade.h:11
+msgid "Method:"
+msgstr "��:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:2
-msgid "Full duple_x"
+#: ../src/connection-editor/ce-page-ip4.glade.h:12
+msgid "Routes..."
+msgstr "路�..."
+
+#: ../src/connection-editor/ce-page-ip4.glade.h:13
+msgid "Search Domains:"
+msgstr "æ??å°?網å??:"
+
+#: ../src/connection-editor/ce-page-ip4.glade.h:14
+msgid "Use this connection only for resources on its network"
+msgstr "å?ªå?¨ä½¿ç?¨é??å??é?£ç·?ç??網路è³?æº?æ??æ??使ç?¨å®?"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:1
+msgid "<b>Advanced</b>"
+msgstr "<b>é?²é??</b>"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:2
+msgid "<b>Basic</b>"
+msgstr "<b>��</b>"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:3
+msgid "APN:"
+msgstr "APN:"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:4
+msgid ""
+"Any\n"
+"3G (UMTS/HSPA)\n"
+"2G (GPRS/EDGE)\n"
+"Prefer 3G (UMTS/HSPA)\n"
+"Prefer 2G (GPRS/EDGE)"
+msgstr ""
+"任�\n"
+"3G (UMTS/HSPA)\n"
+"2G (GPRS/EDGE)\n"
+"å??好 3G (UMTS/HSPA)\n"
+"å??好 2G (GPRS/EDGE)"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:9
+msgid "Band:"
+msgstr "é »å¯¬:"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:10
+msgid "Network:"
+msgstr "網路:"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:11
+#, fuzzy
+msgid "Number:"
+msgstr "äº?å­?è??"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:12
+msgid "PIN:"
+msgstr "PIN:"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:13
+msgid "PUK:"
+msgstr "PUK:"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:15
+msgid "Show passwords"
+msgstr "顯示�碼"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:1
+msgid "<b>Allowed Authentication Methods</b>"
+msgstr "<b>å??許ç??é©?è­?æ?¹å¼?</b>"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr "<b>é©?è­?</b>"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:3
+msgid "<b>Compression</b>"
+msgstr "<b>�縮</b>"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:4
+msgid "<b>Echo</b>"
+msgstr "<b>å??é?³</b>"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:5
+msgid ""
+"<i>In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods.</i>"
 msgstr ""
+"<i>å?¨å¤§å¤?æ?¸æ??æ³?ä¸?ï¼?網路ä¾?æ??è??ç?? PPP 伺æ??å?¨æ??æ?¯æ?´æ??æ??ç??é©?è­?æ?¹æ³?ã??å¦?æ??é?£ç·?失"
+"æ??ï¼?è«?å??試å??ç?¨æ??äº?æ?¹æ³?ç??æ?¯æ?´ã??</i>"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:3
-#: ../src/connection-editor/ce-page-wireless.glade.h:5
-msgid "MT_U:"
-msgstr "MT_U:"
+#: ../src/connection-editor/ce-page-ppp.glade.h:6
+msgid "Allow BSD data compression"
+msgstr "å??許 BSD è³?æ??å£?縮"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:4
-#: ../src/connection-editor/ce-page-wireless.glade.h:9
-msgid "_MAC address:"
-msgstr "_MAC ä½?å??ï¼?"
+#: ../src/connection-editor/ce-page-ppp.glade.h:7
+msgid "Allow Deflate data compression"
+msgstr "å??許 Deflate è³?æ??å£?縮"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:5
-msgid "_Port:"
-msgstr "é?£æ?¥å? (_P)ï¼?"
+#: ../src/connection-editor/ce-page-ppp.glade.h:8
+msgid "Allowed methods:"
+msgstr "å??許ç??æ?¹å¼?:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:6
-msgid "_Speed:"
-msgstr "é??度(_S)ï¼?"
+#: ../src/connection-editor/ce-page-ppp.glade.h:9
+#: ../src/connection-editor/page-ppp.c:134
+#: ../src/wireless-security/eap-method-ttls.c:268
+msgid "CHAP"
+msgstr "CHAP"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:7
+#: ../src/connection-editor/ce-page-ppp.glade.h:10
+msgid "Challenge Handshake Authentication Protocol"
+msgstr "Challenge Handshake é©?è­?é??è¨?å??å®?"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:11
+msgid "Configure Methods..."
+msgstr "設���..."
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:12
+#: ../src/connection-editor/page-ppp.c:132
+msgid "EAP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:13
+msgid "Extensible Authentication Protocol"
+msgstr "å?¯å»¶ä¼¸ç??é©?è­?é??è¨?å??å®?"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:14
+#: ../src/connection-editor/page-ppp.c:136
+#: ../src/wireless-security/eap-method-ttls.c:238
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:15
+msgid "MSCHAP v2"
+msgstr "MSCHAP v2"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:16
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "Microsoft Challenge Handshake é©?è­?é??è¨?å??å®?"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:17
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "Microsoft Challenge Handshake é©?è­?é??è¨?å??å®?第 2 ç??"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:18
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:223
+msgid "PAP"
+msgstr "PAP"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:19
+msgid "Password Authentication Protocol"
+msgstr "å¯?碼é©?è­?é??è¨?å??å®?"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:20
+msgid "Require 128-bit encryption"
+msgstr "é??è¦? 128-ä½?å??å? å¯?"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:21
+msgid "Send PPP echo packets"
+msgstr "å?³é?? PPP å??é?³å°?å??"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:22
+msgid "Use Point-to-Point Encryption (MPPE)"
+msgstr "使ç?¨é»?å°?é»?å¼?å? å¯? (MPPE)"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:23
+msgid "Use Stateful MPPE"
+msgstr "使ç?¨æ??ç??æ??ç?? MPPE"
+
+#: ../src/connection-editor/ce-page-ppp.glade.h:24
+msgid "Use TCP header compression"
+msgstr "使ç?¨ TCP æ¨?é ­å£?縮"
+
+#: ../src/connection-editor/ce-page-wired.glade.h:1
+msgid "Aut_onegotiate"
+msgstr "è?ªå??å??è­°(_O)"
+
+#: ../src/connection-editor/ce-page-wired.glade.h:2
 msgid ""
-"default\n"
+"Automatic\n"
 "10 Mb/s\n"
 "100 Mb/s\n"
 "1 Gb/s\n"
 "10 Gb/s"
 msgstr ""
-"é ?設\n"
+"è?ªå??\n"
 "10 Mb/s\n"
 "100 Mb/s\n"
 "1 Gb/s\n"
 "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:12
+#: ../src/connection-editor/ce-page-wired.glade.h:7
 msgid ""
-"default\n"
+"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
+msgid "Full duple_x"
+msgstr "å?¨é??å·¥(_X)"
+
+#: ../src/connection-editor/ce-page-wired.glade.h:13
+#: ../src/connection-editor/ce-page-wireless.glade.h:8
+msgid "MT_U:"
+msgstr "MT_U:"
+
+#: ../src/connection-editor/ce-page-wired.glade.h:14
+#: ../src/connection-editor/ce-page-wireless.glade.h:13
+msgid "_MAC address:"
+msgstr "_MAC ä½?å??ï¼?"
+
+#: ../src/connection-editor/ce-page-wired.glade.h:15
+msgid "_Port:"
+msgstr "é?£æ?¥å? (_P)ï¼?"
+
+#: ../src/connection-editor/ce-page-wired.glade.h:16
+msgid "_Speed:"
+msgstr "é??度(_S)ï¼?"
+
+#: ../src/connection-editor/ce-page-wired.glade.h:17
+#: ../src/connection-editor/ce-page-wireless.glade.h:16
+msgid "bytes"
+msgstr "ä½?å??çµ?"
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:1
-msgid "Ban_d:"
+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.glade.h:4
+msgid "Ban_d:"
+msgstr "é »å¯¬(_D):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:2
+#: ../src/connection-editor/ce-page-wireless.glade.h:5
 msgid "C_hannel:"
 msgstr "é »é??(_H)ï¼?"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:3
+#: ../src/connection-editor/ce-page-wireless.glade.h:6
 msgid ""
 "Infrastructure\n"
-"Adhoc"
+"Ad-hoc"
 msgstr ""
+"Infrastructure\n"
+"Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:6
+#: ../src/connection-editor/ce-page-wireless.glade.h:9
 msgid "M_ode:"
 msgstr "模�(_O)�"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:7
+#: ../src/connection-editor/ce-page-wireless.glade.h:10
+msgid "Mb/s"
+msgstr "Mb/s"
+
+#: ../src/connection-editor/ce-page-wireless.glade.h:11
 msgid "Transmission po_wer:"
-msgstr ""
+msgstr "å?³è¼¸è??è?½(_W):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:8
+#: ../src/connection-editor/ce-page-wireless.glade.h:12
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:10
+#: ../src/connection-editor/ce-page-wireless.glade.h:14
 msgid "_Rate:"
-msgstr ""
+msgstr "é??ç??(_R):"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:11
+#: ../src/connection-editor/ce-page-wireless.glade.h:15
 msgid "_SSID:"
 msgstr "_SSID:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:12
+#: ../src/connection-editor/ce-page-wireless.glade.h:17
+msgid "mW"
+msgstr "mW"
+
+#: ../src/connection-editor/ce-vpn-wizard.glade.h:2
 msgid ""
-"default\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
-msgstr ""
-"é ?設\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
+"<span weight=\"bold\" size=\"larger\">Choose a VPN Connection Type</span>\n"
+"\n"
+"Select the type of VPN you wish to use for the new connection.  If the type "
+"of VPN connection you wish to create does not appear in the list, you may "
+"not have the correct VPN plugin installed."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">é?¸æ?? VPN é?£ç·?é¡?å??</span>\n"
+"é?¸æ??æ?¨æ?³è¦?ç?¨å?¨æ?°é?£ç·?中ç?? VPN é¡?å??ã??å¦?æ??æ?¨æ?³è¦?建ç«?ç?? VPN é?£ç·?é¡?å??æ²?æ??å?ºç?¾å?¨æ¸?"
+"å?®ä¸­ï¼?å?¯è?½æ?¯æ²?æ??å®?è£?正確ç?? VPN å¤?æ??ç¨?å¼?ã??"
+
+#: ../src/connection-editor/ce-vpn-wizard.glade.h:5
+msgid "Create..."
+msgstr "建�..."
+
+#: ../src/connection-editor/ip4-routes-dialog.c:501
+#: ../src/connection-editor/page-ip4.c:634
+msgid "Address"
+msgstr "ä½?å??"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:517
+#: ../src/connection-editor/page-ip4.c:650
+msgid "Netmask"
+msgstr "網路�罩"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:533
+#: ../src/connection-editor/page-ip4.c:666
+msgid "Gateway"
+msgstr "é??è¨?é??"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:549
+msgid "Metric"
+msgstr "��"
+
+#: ../src/connection-editor/mobile-wizard.c:73
+msgid "Installed GSM device"
+msgstr "å·²å®?è£?ç?? GSM è£?ç½®"
+
+#: ../src/connection-editor/mobile-wizard.c:84
+msgid "Installed CDMA device"
+msgstr "å·²å®?è£?ç?? CDMA è£?ç½®"
+
+#: ../src/connection-editor/mobile-wizard.c:150
+msgid "Create a GSM connection"
+msgstr "建� GSM ��"
+
+#: ../src/connection-editor/mobile-wizard.c:151
+msgid "Create a CDMA connection"
+msgstr "建� CDMA ��"
+
+#: ../src/connection-editor/page-dsl.c:152
+#: ../src/connection-editor/page-dsl.c:159
+msgid "Could not load DSL user interface."
+msgstr "ç?¡æ³?è¼?å?¥ DSL 使ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-dsl.c:165
+#: ../src/connection-editor/nm-connection-editor.glade.h:4
+#: ../src/connection-editor/nm-connection-list.c:1818
+msgid "DSL"
+msgstr "DSL"
+
+#: ../src/connection-editor/page-ip4.c:116
+msgid "Automatic (VPN)"
+msgstr "è?ªå?? (VPN)"
+
+#: ../src/connection-editor/page-ip4.c:117
+msgid "Automatic (VPN) addresses only"
+msgstr "å?ªç?¨è?ªå?? (VPN) ä½?å??"
+
+#: ../src/connection-editor/page-ip4.c:120
+msgid "Automatic (PPP)"
+msgstr "è?ªå?? (PPP)"
+
+#: ../src/connection-editor/page-ip4.c:121
+msgid "Automatic (PPP) addresses only"
+msgstr "å?ªç?¨è?ªå?? (PPP) ä½?å??"
+
+#: ../src/connection-editor/page-ip4.c:123
+msgid "Automatic (PPPoE)"
+msgstr "è?ªå?? (PPPoE)"
+
+#: ../src/connection-editor/page-ip4.c:124
+msgid "Automatic (PPPoE) addresses only"
+msgstr "å?ªç?¨è?ªå?? (PPPoE) ä½?å??"
+
+#: ../src/connection-editor/page-ip4.c:126
+msgid "Automatic (DHCP)"
+msgstr "è?ªå?? (DHCP)"
+
+#: ../src/connection-editor/page-ip4.c:127
+msgid "Automatic (DHCP) addresses only"
+msgstr "å?ªç?¨è?ªå?? (DHCP) ä½?å??"
 
-#: ../src/connection-editor/page-ip4-address.c:60
-msgid "IPv4 Addresses"
-msgstr "IPv4 ä½?å??"
+#: ../src/connection-editor/page-ip4.c:152
+msgid "Manual"
+msgstr "æ??å??"
 
-#: ../src/connection-editor/page-ip4.c:60
+#: ../src/connection-editor/page-ip4.c:164
+msgid "Link-Local Only"
+msgstr "å?ªæ??æ?¬æ©?é?£ç·?"
+
+#: ../src/connection-editor/page-ip4.c:170
+msgid "Shared to other computers"
+msgstr "å??享給å?¶ä»?é?»è?¦"
+
+#: ../src/connection-editor/page-ip4.c:597
+#, c-format
+msgid "Editing IPv4 routes for %s"
+msgstr "編輯 %s ç?? IPv4 è·¯ç?±"
+
+#: ../src/connection-editor/page-ip4.c:708
+#: ../src/connection-editor/page-ip4.c:715
+msgid "Could not load IPv4 user interface."
+msgstr "ç?¡æ³?è¼?å?¥ IPv4 使ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-ip4.c:721
 msgid "IPv4 Settings"
 msgstr "IPv4 設�"
 
-#: ../src/connection-editor/page-wired.c:76
+#: ../src/connection-editor/page-mobile.c:295
+#: ../src/connection-editor/page-mobile.c:302
+msgid "Could not load mobile broadband user interface."
+msgstr "ç?¡æ³?è¼?å?¥è¡?å??å¯¬é »ä½¿ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-mobile.c:320
+msgid "Unsupported mobile broadband connection type."
+msgstr "ä¸?æ?¯æ?´ç??è¡?å??å¯¬é »é?£ç·?é¡?å??ã??"
+
+#: ../src/connection-editor/page-ppp.c:135
+#: ../src/wireless-security/eap-method-peap.c:229
+#: ../src/wireless-security/eap-method-ttls.c:253
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:139
+msgid "none"
+msgstr "ç?¡"
+
+#: ../src/connection-editor/page-ppp.c:199
+#, c-format
+msgid "Editing PPP authentication methods for %s"
+msgstr "編輯 %s ç?? PPP é©?è­?æ?¹æ³?"
+
+#: ../src/connection-editor/page-ppp.c:280
+#: ../src/connection-editor/page-ppp.c:287
+msgid "Could not load PPP user interface."
+msgstr "ç?¡æ³?è¼?å?¥ PPP 使ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-ppp.c:293
+msgid "PPP Settings"
+msgstr "PPP 設��"
+
+#: ../src/connection-editor/page-vpn.c:105
 #: ../src/connection-editor/nm-connection-editor.glade.h:8
-#: ../src/connection-editor/nm-connection-list.c:477
+#: ../src/connection-editor/nm-connection-list.c:1815
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/page-vpn.c:116
+#, c-format
+msgid "Could not find VPN plugin service for '%s'."
+msgstr "æ?¾ä¸?å?°ã??%sã??ç?? VPN å¤?æ??ç¨?å¼?æ??å??ã??"
+
+#: ../src/connection-editor/page-wired.c:204
+#: ../src/connection-editor/page-wired.c:211
+msgid "Could not load wired user interface."
+msgstr "ç?¡æ³?è¼?å?¥æ??ç·?網路使ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-wired.c:217
+#: ../src/connection-editor/nm-connection-editor.glade.h:9
+#: ../src/connection-editor/nm-connection-list.c:1805
 msgid "Wired"
 msgstr "æ??ç·?"
 
-#: ../src/connection-editor/page-wireless.c:94
-#: ../src/connection-editor/page-wireless.c:98
-#: ../src/connection-editor/nm-connection-editor.c:228
+#: ../src/connection-editor/page-wired-security.c:112
+msgid "802.1x Security"
+msgstr "802.1x �護"
+
+#: ../src/connection-editor/page-wired-security.c:120
+msgid "Use 802.1X security for this connection"
+msgstr "å?¨é??å??é?£ç·?使ç?¨ 802.1X é?²è­·"
+
+#: ../src/connection-editor/page-wireless.c:144
+#: ../src/connection-editor/page-wireless.c:148
 msgid "default"
 msgstr "é ?設"
 
-#: ../src/connection-editor/page-wireless.c:116
+#: ../src/connection-editor/page-wireless.c:166
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:195
-#: ../src/connection-editor/nm-connection-editor.glade.h:9
-#: ../src/connection-editor/nm-connection-list.c:481
+#: ../src/connection-editor/page-wireless.c:348
+#: ../src/connection-editor/page-wireless.c:355
+msgid "Could not load WiFi user interface."
+msgstr "ç?¡æ³?è¼?å?¥ WiFi 使ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-wireless.c:361
+#: ../src/connection-editor/nm-connection-editor.glade.h:10
+#: ../src/connection-editor/nm-connection-list.c:1808
 msgid "Wireless"
 msgstr "��網路"
 
-#: ../src/connection-editor/page-wireless-security.c:210
-#, fuzzy
-msgid "Wireless Security"
-msgstr "��網路"
+#: ../src/connection-editor/page-wireless-security.c:255
+#: ../src/wireless-dialog.c:789
+msgid "WEP 40/128-bit Key"
+msgstr "WEP 40/128-ä½?å?? é??é?°"
 
-#: ../src/connection-editor/page-wireless-security.c:257
-#: ../src/wireless-dialog.c:477
-#, fuzzy
+#: ../src/connection-editor/page-wireless-security.c:264
+#: ../src/wireless-dialog.c:798
 msgid "WEP 128-bit Passphrase"
-msgstr "é??è¡?碼ï¼?"
-
-#: ../src/connection-editor/page-wireless-security.c:266
-#: ../src/wireless-dialog.c:486
-msgid "WEP 40/128-bit Hexadecimal"
-msgstr "WEP 40/128-bit å??å?­ä½?å??"
-
-#: ../src/connection-editor/page-wireless-security.c:275
-#: ../src/wireless-dialog.c:495
-msgid "WEP 40/128-bit ASCII"
-msgstr "WEP 40/128-bit ASCII"
+msgstr "WEP 128-ä½?å?? å¯?èª?"
 
-#: ../src/connection-editor/page-wireless-security.c:301
-#: ../src/wireless-dialog.c:525
+#: ../src/connection-editor/page-wireless-security.c:290
+#: ../src/wireless-dialog.c:828
 msgid "Dynamic WEP (802.1x)"
 msgstr "å??æ?? WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:315
-#: ../src/wireless-dialog.c:539
+#: ../src/connection-editor/page-wireless-security.c:304
+#: ../src/wireless-dialog.c:842
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 å??人ç??"
 
-#: ../src/connection-editor/page-wireless-security.c:329
-#: ../src/wireless-dialog.c:553
+#: ../src/connection-editor/page-wireless-security.c:318
+#: ../src/wireless-dialog.c:856
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ä¼?業ç??"
 
-#: ../src/connection-editor/nm-connection-editor.c:107
+#: ../src/connection-editor/page-wireless-security.c:356
+msgid "Could not load WiFi security user interface; missing WiFi setting."
+msgstr "ç?¡æ³?è¼?å?¥ WiFi é?²è­·ä½¿ç?¨è??ä»?é?¢ï¼?失å?» WiFi 設å®?å?¼ã??"
+
+#: ../src/connection-editor/page-wireless-security.c:363
+#: ../src/connection-editor/page-wireless-security.c:370
+msgid "Could not load WiFi security user interface."
+msgstr "ç?¡æ³?è¼?å?¥ WiFi é?²è­·ä½¿ç?¨è??ä»?é?¢ã??"
+
+#: ../src/connection-editor/page-wireless-security.c:376
+msgid "Wireless Security"
+msgstr "��網路�護"
+
+#: ../src/connection-editor/polkit-helpers.c:52
+msgid "PolicyKit authorization request was invalid."
+msgstr "PolicyKit é©?è­?è¦?æ±?æ?¯ç?¡æ??ç??ã??"
+
+#: ../src/connection-editor/polkit-helpers.c:58
+msgid "PolicyKit authorization request was malformed."
+msgstr "PolicyKit é©?è­?è¦?æ±?æ ¼å¼?ä¸?è?¯ã??"
+
+#: ../src/connection-editor/polkit-helpers.c:64
+msgid "PolicyKit authorization could not be created."
+msgstr "PolicyKit é©?è­?ç?¡æ³?建ç«?ã??"
+
+#: ../src/connection-editor/polkit-helpers.c:71
+msgid "PolicyKit authorization could not be created; invalid action ID."
+msgstr "ç?¡æ³?建ç«? PolicyKit é©?è­?è¦?æ±?ï¼?ç?¡æ??ç??å??ä½? IDã??"
+
+#: ../src/connection-editor/nm-connection-editor.c:104
 #, c-format
 msgid "Editing %s"
 msgstr "編輯 %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:111
-msgid "Editing unamed connection"
+#: ../src/connection-editor/nm-connection-editor.c:108
+msgid "Editing un-named connection"
 msgstr "編輯æ?ªå?½å??ç??é?£ç·?"
 
-#: ../src/connection-editor/nm-connection-editor.c:139
+#: ../src/connection-editor/nm-connection-editor.c:296
 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:152
+#: ../src/connection-editor/nm-connection-editor.c:309
 msgid ""
 "The connection editor could not find some required resources (the glade file "
 "was not found)."
 msgstr "é?£ç·?編輯å?¨ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼?æ?¾ä¸?å?° glade æª?ï¼?"
 
+#: ../src/connection-editor/nm-connection-editor.c:325
+msgid "Apply..."
+msgstr "��..."
+
+#: ../src/connection-editor/nm-connection-editor.c:326
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr "é©?è­?以å?²å­?é??å??é?£ç·?給此é?»è?¦ä¸?ç??æ??æ??使ç?¨è??ã??"
+
+#: ../src/connection-editor/nm-connection-editor.c:327
+msgid "Apply"
+msgstr "��"
+
+#: ../src/connection-editor/nm-connection-editor.c:328
+msgid "Save this connection for all users of this machine."
+msgstr "å?²å­?é??å??é?£ç·?給此é?»è?¦ä¸?ç??æ??æ??使ç?¨è??ã??"
+
+#: ../src/connection-editor/nm-connection-editor.c:425
+msgid "Error creating connection editor dialog."
+msgstr "建ç«?é?£ç·?編輯å?¨å°?話ç??æ??ç?¼ç??é?¯èª¤ã??"
+
 #: ../src/connection-editor/nm-connection-editor.glade.h:1
-msgid "Connect _automatically"
-msgstr "è?ªå??é?£ç·?(_A)"
+msgid "Available to all users"
+msgstr "æ??æ??使ç?¨è??ç??å?¯ç?¨"
 
 #: ../src/connection-editor/nm-connection-editor.glade.h:2
-msgid "Connection Editor"
-msgstr "��編輯�"
+msgid "Connect _automatically"
+msgstr "è?ªå??é?£ç·?(_A)"
 
 #: ../src/connection-editor/nm-connection-editor.glade.h:3
 msgid "Connection _name:"
 msgstr "é?£ç·?å??稱(_N)ï¼?"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:4
-#: ../src/connection-editor/nm-connection-list.c:494
-msgid "DSL"
-msgstr "DSL"
-
 #: ../src/connection-editor/nm-connection-editor.glade.h:5
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Mobile Broadband"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.glade.h:6
-msgid "Network Connections"
-msgstr "網路��"
-
-#: ../src/connection-editor/nm-connection-editor.glade.h:7
-#: ../src/connection-editor/nm-connection-list.c:490
-msgid "VPN"
-msgstr "VPN"
+msgid "E_xport"
+msgstr "��(_X)"
 
-#: ../src/connection-editor/nm-connection-list.c:156
-#, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "�確������ %s �"
+#: ../src/connection-editor/nm-connection-editor.glade.h:11
+msgid "_Import"
+msgstr "��(_I)"
 
-#: ../src/connection-editor/nm-connection-list.c:265
+#: ../src/connection-editor/nm-connection-list.c:199
 msgid "never"
 msgstr "永�"
 
-#: ../src/connection-editor/nm-connection-list.c:276
-#: ../src/connection-editor/nm-connection-list.c:287
+#: ../src/connection-editor/nm-connection-list.c:210
+#: ../src/connection-editor/nm-connection-list.c:221
 msgid "now"
 msgstr "��"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:294
+#: ../src/connection-editor/nm-connection-list.c:228
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d å??é??以å??"
 
-#: ../src/connection-editor/nm-connection-list.c:298
+#: ../src/connection-editor/nm-connection-list.c:232
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d å°?æ??以å??"
 
-#: ../src/connection-editor/nm-connection-list.c:310
+#: ../src/connection-editor/nm-connection-list.c:244
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以å??"
 
-#: ../src/connection-editor/nm-connection-list.c:316
+#: ../src/connection-editor/nm-connection-list.c:250
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d å??æ??以å??"
 
-#: ../src/connection-editor/nm-connection-list.c:320
+#: ../src/connection-editor/nm-connection-list.c:254
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年以å??"
 
-#: ../src/utils/crypto.c:123
-#, c-format
-msgid "PEM key file had no end tag '%s'."
-msgstr ""
-
-#: ../src/utils/crypto.c:133
-#, c-format
-msgid "Doesn't look like a PEM private key file."
-msgstr "ç??èµ·ä¾?ä¸?å??æ?¯ PEM ç§?å¯?é??é?°æª?æ¡?ã??"
+#: ../src/connection-editor/nm-connection-list.c:320
+#: ../src/connection-editor/nm-connection-list.c:452
+msgid "Could not obtain required privileges"
+msgstr "ç?¡æ³?å??å¾?é??è¦?ç??æ¬?é??"
 
-#: ../src/utils/crypto.c:141
-#, c-format
-msgid "Not enough memory to store PEM file data."
-msgstr "æ²?æ??è¶³å¤ ç??è¨?æ?¶é«?å?²å­? PEM æª?è³?æ??ã??"
+#: ../src/connection-editor/nm-connection-list.c:325
+msgid "Could not delete connection"
+msgstr "������"
 
-#: ../src/utils/crypto.c:157
-#, c-format
-msgid "Malformed PEM file: Proc-Type was not first tag."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:326
+msgid "The connection could not be deleted due to an unknown error."
+msgstr "ç?±æ?¼æ?ªç?¥ç??é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤é?£ç·?ã??"
 
-#: ../src/utils/crypto.c:165
-#, c-format
-msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:362
+#: ../src/connection-editor/nm-connection-list.c:373
+msgid "Could not move connection"
+msgstr "ç?¡æ³?移å??é?£ç·?"
 
-#: ../src/utils/crypto.c:175
-#, c-format
-msgid "Malformed PEM file: DEK-Info was not the second tag."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:457
+#: ../src/connection-editor/nm-connection-list.c:506
+#: ../src/connection-editor/nm-connection-list.c:517
+msgid "Could not add connection"
+msgstr "ç?¡æ³?å? å?¥é?£ç·?"
 
-#: ../src/utils/crypto.c:186
-#, c-format
-msgid "Malformed PEM file: no IV found in DEK-Info tag."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:458
+msgid "The connection could not be added due to an unknown error."
+msgstr "å? ç?ºä¸?æ??ç??é?¯èª¤ä½¿è©²é?£ç·?ç?¡æ³?å? å?¥ã??"
 
-#: ../src/utils/crypto.c:193
-#, c-format
-msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:631
+#: ../src/connection-editor/nm-connection-list.c:636
+#: ../src/connection-editor/nm-connection-list.c:696
+#: ../src/connection-editor/nm-connection-list.c:702
+msgid "Could not update connection"
+msgstr "������"
 
-#: ../src/utils/crypto.c:206
-#, c-format
-msgid "Malformed PEM file: unknown private key cipher '%s'."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:637
+msgid "The connection could not be updated due to an unknown error."
+msgstr "å? ç?ºä¸?æ??ç??é?¯èª¤ä½¿è©²é?£ç·?ç?¡æ³?æ?´æ?°ã??"
 
-#: ../src/utils/crypto.c:225
-#, c-format
-msgid "Could not decode private key."
-msgstr "ç?¡æ³?解é??ç§?å¯?é??é?°ã??"
+#: ../src/connection-editor/nm-connection-list.c:728
+#: ../src/connection-editor/nm-connection-list.c:1056
+msgid "An unknown error ocurred."
+msgstr "ç?¼ç??æ?ªç?¥ç??é?¯èª¤ã??"
 
-#: ../src/utils/crypto.c:269
-#, c-format
-msgid "PEM certificate '%s' had no end tag '%s'."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:737
+#: ../src/connection-editor/nm-connection-list.c:1063
+msgid "Error initializing editor"
+msgstr "å??å§?å??編輯å?¨æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/utils/crypto.c:279
+#: ../src/connection-editor/nm-connection-list.c:845
 #, c-format
-msgid "Failed to decode certificate."
-msgstr "æ??è­?解碼失æ??ã??"
+msgid "Wired connection %d"
+msgstr "æ??ç·?網路é?£ç·? %d"
 
-#: ../src/utils/crypto.c:288 ../src/utils/crypto.c:296
+#: ../src/connection-editor/nm-connection-list.c:857
 #, c-format
-msgid "Not enough memory to store certificate data."
-msgstr ""
+msgid "Wireless connection %d"
+msgstr "��網路�� %d"
 
-#: ../src/utils/crypto.c:326
+#: ../src/connection-editor/nm-connection-list.c:876
 #, c-format
-msgid "IV must be an even number of bytes in length."
-msgstr ""
+msgid "GSM connection %d"
+msgstr "GSM �� %d"
 
-#: ../src/utils/crypto.c:335
+#: ../src/connection-editor/nm-connection-list.c:895
 #, c-format
-msgid "Not enough memory to store the IV."
-msgstr ""
+msgid "CDMA connection %d"
+msgstr "CDMA �� %d"
 
-#: ../src/utils/crypto.c:346
+#: ../src/connection-editor/nm-connection-list.c:922
+#: ../src/connection-editor/nm-connection-list.c:1324
 #, c-format
-msgid "IV contains non-hexadecimal digits."
-msgstr ""
+msgid "VPN connection %d"
+msgstr "VPN �� %d"
 
-#: ../src/utils/crypto.c:384 ../src/utils/crypto_gnutls.c:125
-#: ../src/utils/crypto_nss.c:134
+#: ../src/connection-editor/nm-connection-list.c:936
 #, c-format
-msgid "Private key cipher '%s' was unknown."
-msgstr ""
+msgid "DSL connection %d"
+msgstr "DSL �� %d"
 
-#: ../src/utils/crypto.c:393
-#, c-format
-msgid "Not enough memory to create private key decryption key."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:998
+#: ../src/connection-editor/nm-connection-list.c:1098
+#: ../src/connection-editor/nm-connection-list.c:1313
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr "ç?±æ?¼ä¸?æ??ç??é?¯èª¤ä½¿é?£ç·?編輯å?¨å°?話ç??ç?¡æ³?å??å§?å??ã??"
 
-#: ../src/utils/crypto.c:511
-#, c-format
-msgid "Not enough memory to store decrypted private key."
-msgstr "æ²?æ??è¶³å¤ ç??è¨?æ?¶é«?ä¾?å?²å­?解碼å¾?ç??ç§?å¯?é??é?°ã??"
+#: ../src/connection-editor/nm-connection-list.c:1014
+msgid "Could not edit new connection"
+msgstr "��編輯���"
 
-#: ../src/utils/crypto_gnutls.c:72
-#, c-format
-msgid "Failed to initialize the MD5 engine: %s / %s."
-msgstr "å??å§?å?? MD5 å¼?æ??失æ??ï¼?%s / %sã??"
+#: ../src/connection-editor/nm-connection-list.c:1118
+msgid "Could not edit connection"
+msgstr "��編輯��"
 
-#: ../src/utils/crypto_gnutls.c:134 ../src/utils/crypto_nss.c:143
+#: ../src/connection-editor/nm-connection-list.c:1177
 #, c-format
-msgid "Not enough memory for decrypted key buffer."
-msgstr ""
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr "�確������ %s �"
 
-#: ../src/utils/crypto_gnutls.c:142
-#, c-format
-msgid "Failed to initialize the decryption cipher context: %s / %s."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:1350
+#: ../src/connection-editor/vpn-helpers.c:229
+msgid "Cannot import VPN connection"
+msgstr "���� VPN 網路��"
 
-#: ../src/utils/crypto_gnutls.c:151
-#, c-format
-msgid "Failed to set symmetric key for decryption: %s / %s."
+#: ../src/connection-editor/nm-connection-list.c:1352
+msgid ""
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
 msgstr ""
+"VPN å¤?æ??ç¨?å¼?ç?¡æ³?正確ç??å?¯å?¥ VPN é?£ç·?\n"
+"\n"
+"é?¯èª¤ï¼?æ²?æ?? VPN æ??å??é¡?å??ã??"
 
-#: ../src/utils/crypto_gnutls.c:160
-#, c-format
-msgid "Failed to set IV for decryption: %s / %s."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:1366
+msgid "Could not edit imported connection"
+msgstr "ç?¡æ³?編輯å?¯å?¥ç??é?£ç·?"
 
-#: ../src/utils/crypto_gnutls.c:169
-#, c-format
-msgid "Failed to decrypt the private key: %s / %s."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:1689
+msgid "Edit..."
+msgstr "編輯..."
 
-#: ../src/utils/crypto_gnutls.c:207
-#, c-format
-msgid "Error initializing certificate data: %s"
-msgstr "å??å§?å??æ??è­?è³?æ??æ??é?¯èª¤ï¼?%s"
+#: ../src/connection-editor/nm-connection-list.c:1690
+msgid "Authenticate to edit the selected connection."
+msgstr "é©?è­?以編輯é?¸å??ç??é?£ç·?ã??"
 
-#: ../src/utils/crypto_gnutls.c:219
-#, c-format
-msgid "Couldn't decode certificate: %s"
-msgstr "ç?¡æ³?解碼æ??è­?ï¼?%s"
+#: ../src/connection-editor/nm-connection-list.c:1691
+msgid "Edit"
+msgstr "編輯"
 
-#: ../src/utils/crypto_nss.c:76
-#, c-format
-msgid "Failed to initialize the MD5 context: %d."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:1692
+msgid "Edit the selected connection."
+msgstr "編輯é?¸å??ç??é?£ç·?ã??"
 
-#: ../src/utils/crypto_nss.c:151
-#, c-format
-msgid "Failed to initialize the decryption cipher slot."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:1709
+msgid "Delete..."
+msgstr "��..."
 
-#: ../src/utils/crypto_nss.c:161
-#, c-format
-msgid "Failed to set symmetric key for decryption."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:1710
+msgid "Authenticate to delete the selected connection."
+msgstr "é©?è­?以å?ªé?¤é?¸å??ç??é?£ç·?ã??"
 
-#: ../src/utils/crypto_nss.c:171
-#, c-format
-msgid "Failed to set IV for decryption."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:1711
+msgid "Delete"
+msgstr "��"
 
-#: ../src/utils/crypto_nss.c:179
-#, c-format
-msgid "Failed to initialize the decryption context."
-msgstr ""
+#: ../src/connection-editor/nm-connection-list.c:1712
+msgid "Delete the selected connection."
+msgstr "å?ªé?¤é?¸å??ç??é?£ç·?ã??"
 
-#: ../src/utils/crypto_nss.c:192
+#: ../src/connection-editor/vpn-helpers.c:231
 #, c-format
-msgid "Failed to decrypt the private key: %d."
+msgid ""
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
+"\n"
+"Error: %s."
 msgstr ""
+"æª?æ¡?ã??%sã??ç?¡æ³?è®?å??æ??æ?ªå??å?«å?¯è¾¨è­?ç?? VPN é?£ç·?è³?è¨?\n"
+"\n"
+"é?¯èª¤ï¼?%sã??"
 
-#: ../src/utils/crypto_nss.c:204
-#, c-format
-msgid "Failed to finalize decryption of the private key: %d."
-msgstr ""
+#: ../src/connection-editor/vpn-helpers.c:262
+msgid "Select file to import"
+msgstr "é?¸æ??è¦?å?¯å?¥ç??æª?æ¡?"
 
-#: ../src/utils/crypto_nss.c:248
+#: ../src/connection-editor/vpn-helpers.c:310
 #, c-format
-msgid "Couldn't decode certificate: %d"
-msgstr "ç?¡æ³?解é??æ??è­?ï¼?%d"
+msgid "A file named \"%s\" already exists."
+msgstr "å??ç?ºã??%sã??ç??æª?æ¡?å·²ç¶?å­?å?¨ã??"
 
-#: ../src/vpn-properties/nm-vpn-properties.c:564
-msgid "Cannot import VPN connection"
-msgstr "���� VPN 網路��"
+#: ../src/connection-editor/vpn-helpers.c:312
+msgid "_Replace"
+msgstr "å??代(_R)"
 
-#: ../src/vpn-properties/nm-vpn-properties.c:566
+#: ../src/connection-editor/vpn-helpers.c:314
 #, c-format
-msgid ""
-"Cannot find suitable software for VPN connection type '%s' to import the "
-"file '%s'. Contact your system administrator."
-msgstr ""
+msgid "Do you want to replace %s with the VPN connection you are saving?"
+msgstr "æ?¨æ?¯å?¦è¦?以æº?å??å?²å­?ç?? VPN é?£ç·?å??代 %sï¼?"
 
-#: ../src/vpn-properties/nm-vpn-properties.c:718
-#, c-format
-msgid "Delete VPN connection \"%s\"?"
-msgstr "å?ªé?¤ VPN é?£ç·?â??%sâ??ï¼?"
+#: ../src/connection-editor/vpn-helpers.c:350
+msgid "Cannot export VPN connection"
+msgstr "���� VPN ��"
 
-#: ../src/vpn-properties/nm-vpn-properties.c:721
+#: ../src/connection-editor/vpn-helpers.c:352
 #, c-format
 msgid ""
-"All information about the VPN connection \"%s\" will be lost and you may "
-"need your system administrator to provide information to create a new "
-"connection."
-msgstr ""
-
-#: ../src/vpn-properties/nm-vpn-properties.c:992
-msgid "Unable to load"
-msgstr "ç?¡æ³?è¼?å?¥"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:994
-msgid "Cannot find some needed resources (the glade file)!"
-msgstr "ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼? glade æª?ï¼?ï¼?"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:1010
-msgid "Cannot add VPN connection"
-msgstr "ç?¡æ³?å? å?¥ VPN é?£ç·?"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:1012
-msgid ""
-"No suitable VPN software was found on your system. Contact your system "
-"administrator."
-msgstr ""
-
-#. Druid Page 1 - Create VPN Connection
-#: ../src/vpn-properties/nm-vpn-properties.c:1091
-msgid ""
-"This assistant will guide you through the creation of a connection to a "
-"Virtual Private Network (VPN)."
-msgstr "æ­¤å?©ç??å°?æ??å°?æ?¨å»ºç«?é?£ç·?è?³è??æ?¬ç§?人網路(VPN)ã??"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:1092
-msgid ""
-"It will require some information, such as IP addresses and secrets.  Please "
-"see your system administrator to obtain this information."
-msgstr ""
-"ä»?å°?é??è¦?ä¸?äº?è³?è¨?ï¼?å??æ?¯ IP ä½?å??å??æ©?å¯?è³?æ??ã??è«?è©¢å??æ?¨ç??系統管ç??å?¡ä»¥å??å¾?é??äº?è³?"
-"è¨?ã??"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:1097
-#: ../src/vpn-properties/nm-vpn-properties.c:1112
-msgid "Create VPN connection"
-msgstr "建� VPN ��"
-
-#. Druid Page 2 - Select Connection Type
-#. Translators: this will be "Create VPN Connection - [1|2] of 2"
-#: ../src/vpn-properties/nm-vpn-properties.c:1121
-#: ../src/vpn-properties/nm-vpn-properties.c:1134
-#: ../src/vpn-properties/nm-vpn-properties.c:1232
-msgid "Create VPN Connection"
-msgstr "建� VPN ��"
-
-#. Translators: this will be "Create VPN Connection - 1 of 2"
-#: ../src/vpn-properties/nm-vpn-properties.c:1136
-msgid "1 of 2"
-msgstr "2 ä¹? 1"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:1143
-msgid "Choose which type of _VPN connection you wish to create:"
-msgstr "é?¸æ??æ?¨æ?³è¦?建ç«?ç?? VPN é?£ç·?é¡?å??(_V)ï¼?"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:1162
-msgid "Choose which type of VPN connection you wish to create:"
-msgstr "é?¸æ??æ?¨æ?³è¦?建ç«?ç?? VPN é?£ç·?é¡?å??ï¼?"
-
-#. Druid Page 3 - Connection Details
-#. Translators: this will be "Create VPN Connection - [1|2] of 2"
-#: ../src/vpn-properties/nm-vpn-properties.c:1171
-msgid "2 of 2"
-msgstr "2 ä¹? 2"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:1209
-#: ../src/vpn-properties/nm-vpn-properties.c:1216
-msgid "Finished Create VPN Connection"
-msgstr "建ç«? VPN é?£ç·?å®?æ??"
-
-#. Edit dialog
-#: ../src/vpn-properties/nm-vpn-properties.c:1241
-msgid "Edit VPN Connection"
-msgstr "編輯 VPN ��"
-
-#: ../src/vpn-properties/nm-vpn-properties.c:1269
-msgid "VPN Service for importing"
+"The VPN connection '%s' could not be exported to %s.\n"
+"\n"
+"Error: %s."
 msgstr ""
+"VPN é?£ç·?ã??%sã??ä¸?è?½å?¯å?ºè?³ %sã??\n"
+"\n"
+"é?¯èª¤ï¼?%sã??"
 
-#: ../src/vpn-properties/nm-vpn-properties.c:1270
-msgid "File to import"
-msgstr "è¦?å?¯å?¥ç??æª?æ¡?"
-
-#. Translators: this is the description seen when running nm-vpn-properties --help
-#: ../src/vpn-properties/nm-vpn-properties.c:1279
-msgid "- NetworkManager VPN properties"
-msgstr "- 網路管ç??å?¡ VPN 屬æ?§"
-
-#: ../src/vpn-properties/nm-vpn-properties.glade.h:1
-msgid "Add a new VPN connection"
-msgstr "å? å?¥æ?°ç?? VPN é?£ç·?"
-
-#: ../src/vpn-properties/nm-vpn-properties.glade.h:2
-msgid "Delete the selected VPN connection"
-msgstr "å?ªé?¤æ??é?¸ç?? VPN é?£ç·?"
-
-#: ../src/vpn-properties/nm-vpn-properties.glade.h:3
-msgid "E_xport"
-msgstr "��(_X)"
-
-#: ../src/vpn-properties/nm-vpn-properties.glade.h:4
-msgid "Edit the selected VPN connection"
-msgstr "編輯已é?¸ç?? VPN é?£ç·?"
-
-#: ../src/vpn-properties/nm-vpn-properties.glade.h:5
-msgid "Export the VPN settings to a file"
-msgstr "�� VPN 設����"
-
-#: ../src/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Export the selected VPN connection to a file"
-msgstr "å?¯å?ºæ??é?¸ç?? VPN é?£ç·?è?³æª?æ¡?"
-
-#: ../src/vpn-properties/nm-vpn-properties.glade.h:7
-msgid "Manage Virtual Private Network Connections"
-msgstr "管ç??è??æ?¬ç§?æ??網路(VPN)é?£ç·?"
-
-#: ../src/vpn-properties/nm-vpn-properties.glade.h:8
-msgid "VPN Connections"
-msgstr "VPN ��"
+#: ../src/connection-editor/vpn-helpers.c:386
+msgid "Export VPN connection..."
+msgstr "�� VPN ��..."
 
-#: ../src/vpn-password-dialog.c:137 ../src/vpn-password-dialog.c:231
+#: ../src/vpn-password-dialog.c:137 ../src/vpn-password-dialog.c:253
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "ç?¡æ³?å?·è¡? VPN é?£ç·?â??%sâ??"
@@ -1278,140 +1772,267 @@ msgstr "ç?¡æ³?å?·è¡? VPN é?£ç·?â??%sâ??"
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
 "Contact your system administrator."
-msgstr ""
+msgstr "æ?¾ä¸?å?° VPN é?£ç·?é¡?å??ã??%sã??ç??é©?è­?å°?話ç??ã??è«?é?£çµ¡æ?¨ç??系統管ç??å?¡ã??"
 
-#: ../src/vpn-password-dialog.c:234
+#: ../src/vpn-password-dialog.c:256
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
 "type '%s'. Contact your system administrator."
-msgstr ""
+msgstr "å?·è¡? VPN é?£ç·?é¡?å??ã??%sã??ç??é©?è­?å°?話ç??ç?¼ç??å??é¡?ã??è«?é?£çµ¡æ?¨ç??系統管ç??å?¡ã??"
+
+#: ../src/wired-dialog.c:99
+msgid "Wired 802.1X authentication"
+msgstr "æ??ç·?網路 802.1X é©?è­?"
 
-#: ../src/wireless-dialog.c:660
-#, fuzzy, c-format
+#: ../src/wireless-dialog.c:414
+msgid "New..."
+msgstr "��..."
+
+#: ../src/wireless-dialog.c:916
+msgid "C_reate"
+msgstr "建�(_R)"
+
+#: ../src/wireless-dialog.c:987
+#, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network '%"
 "s'."
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">ç?¡ç·?網路é??è¡?碼è«?æ±?</span>\n"
-"\n"
-"é??è¦?ä¸?å??é??è¡?碼æ??æ?¯å¯?é?°ä¾?å­?å??ç?¡ç·?網路â??%sâ??"
+msgstr "é??è¦?å¯?碼æ??æ?¯å? å¯?é??é?°ä¾?å­?å??ç?¡ç·?網路ã??%sã??ã??"
 
-#: ../src/wireless-dialog.c:662
-#, fuzzy
-msgid "Wireless Network Secrets Required"
-msgstr "é??è¦?ç?¡ç·?網路é??é?°"
+#: ../src/wireless-dialog.c:989
+msgid "Wireless Network Authentication Required"
+msgstr "��網路����"
 
-#: ../src/wireless-dialog.c:664
-#, fuzzy
-msgid "Secrets required by wireless network"
-msgstr "建ç«?æ?°ç??ç?¡ç·?網路"
+#: ../src/wireless-dialog.c:991
+msgid "Authentication required by wireless network"
+msgstr "ç?¡ç·?網路æ??é??è¦?ç??é©?è­?"
 
-#: ../src/wireless-dialog.c:669
+#: ../src/wireless-dialog.c:996
 msgid "Create New Wireless Network"
 msgstr "建ç«?æ?°ç??ç?¡ç·?網路"
 
-#: ../src/wireless-dialog.c:671
+#: ../src/wireless-dialog.c:998
 msgid "New wireless network"
 msgstr "æ?°ç??ç?¡ç·?網路"
 
-#: ../src/wireless-dialog.c:672
+#: ../src/wireless-dialog.c:999
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "輸å?¥æ?¨è¦?建ç«?ç??ç?¡ç·?網路ç??å??稱ã??"
 
-#: ../src/wireless-dialog.c:674
-msgid "Connect to Other Wireless Network"
-msgstr "é?£æ?¥å?°å?¶å®?ç??ç?¡ç·?網路"
+#: ../src/wireless-dialog.c:1001
+msgid "Connect to Hidden Wireless Network"
+msgstr "é?£æ?¥å?°é?±è??ç??ç?¡ç·?網路"
 
-#: ../src/wireless-dialog.c:676
-msgid "Existing wireless network"
-msgstr "ç?¾å­?ç??ç?¡ç·?網路"
-
-#: ../src/wireless-dialog.c:677
-#, fuzzy
-msgid "Enter the name of the wireless network to which you wish to connect."
-msgstr "輸å?¥æ?¨è¦?é?£æ?¥ç??ç?¡ç·?網路ç?? ESSIDã??"
+#: ../src/wireless-dialog.c:1003
+msgid "Hidden wireless network"
+msgstr "é?±è??ç??ç?¡ç·?網路"
 
-#: ../src/wireless-security/eap-method.c:302
-msgid "DER or PEM certificates (*.der, *.pem)"
-msgstr "DER æ?? PEM æ??è­? (*.der, *.pem)"
+#: ../src/wireless-dialog.c:1004
+msgid ""
+"Enter the name and security details of the hidden wireless network you wish "
+"to connect to."
+msgstr "輸å?¥æ?¨è¦?é?£æ?¥ç??é?±è??ç?¡ç·?網路ç??å??稱è??å®?å?¨æ?§è©³ç´°è³?æ??ã??"
 
-#: ../src/wireless-security/eap-method-peap.c:234
-#: ../src/wireless-security/eap-method-tls.c:290
-#: ../src/wireless-security/eap-method-ttls.c:221
+#: ../src/wireless-security/eap-method.c:169
 msgid "No Certificate Authority certificate chosen"
 msgstr "æ?ªé?¸æ??ä»»ä½?æ??è­?æ??æ¬?å?®ä½?(CA)æ??è­?"
 
-#: ../src/wireless-security/eap-method-peap.c:235
-#: ../src/wireless-security/eap-method-tls.c:291
-#: ../src/wireless-security/eap-method-ttls.c:222
+#: ../src/wireless-security/eap-method.c:170
 msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections "
 "to insecure, rogue wireless networks.  Would you like to choose a "
 "Certificate Authority certificate?"
 msgstr ""
+"ä¸?使ç?¨æ??è­?中å¿? (CA) ç??æ??è­?æ??é? æ??é?£ç·?ä¸?å®?å?¨ã??æµ?æ°?ç?¡ç·?網路(å?¯è?½è¢«ç«?å??ã??å?«è?½ä¹?"
+"æ??)ã??æ?¯å?¦è¦?é?¸æ??ä¸?å??æ??è­?中å¿?ç??æ??è­?ï¼?"
 
-#: ../src/wireless-security/eap-method-peap.c:240
-#: ../src/wireless-security/eap-method-tls.c:296
-#: ../src/wireless-security/eap-method-ttls.c:227
+#: ../src/wireless-security/eap-method.c:175
 msgid "Ignore"
 msgstr "忽�"
 
-#: ../src/wireless-security/eap-method-peap.c:244
-#: ../src/wireless-security/eap-method-tls.c:300
-#: ../src/wireless-security/eap-method-ttls.c:231
+#: ../src/wireless-security/eap-method.c:179
 msgid "Choose CA Certificate"
 msgstr "é?¸æ?? CA æ??è­?"
 
-#: ../src/wireless-security/eap-method-peap.c:309
-#: ../src/wireless-security/eap-method-ttls.c:320
-msgid "MSCHAPv2"
-msgstr "MSCHAPv2"
+#: ../src/wireless-security/eap-method.c:440
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+msgstr "DER, PEM, æ?? PKCS#12 ç§?å¯?é??é?°(*.der, *.pem, *.p12)"
+
+#: ../src/wireless-security/eap-method.c:443
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr "DER æ?? PEM æ??è­? (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:320
+#: ../src/wireless-security/eap-method-peap.c:240
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:399
-#: ../src/wireless-security/eap-method-tls.c:427
-#: ../src/wireless-security/eap-method-ttls.c:410
+#: ../src/wireless-security/eap-method-peap.c:311
+#: ../src/wireless-security/eap-method-tls.c:417
+#: ../src/wireless-security/eap-method-ttls.c:343
 msgid "Choose a Certificate Authority certificate..."
 msgstr "é?¸æ??æ??è­?æ??æ¬?å?®ä½?(CA)æ??è­?..."
 
-#: ../src/wireless-security/eap-method-tls.c:423
+#: ../src/wireless-security/eap-method-tls.c:413
 msgid "Choose your personal certificate..."
 msgstr "é?¸æ??æ?¨ç??å??人æ??è­?..."
 
-#: ../src/wireless-security/eap-method-tls.c:432
+#: ../src/wireless-security/eap-method-tls.c:422
 msgid "Choose your private key..."
 msgstr "é?¸æ??æ?¨ç??ç§?å¯?é??é?°..."
 
-#: ../src/wireless-security/eap-method-ttls.c:298
-msgid "PAP"
-msgstr "PAP"
-
-#: ../src/wireless-security/eap-method-ttls.c:309
-msgid "MSCHAP"
-msgstr "MSCHAP"
-
-#: ../src/wireless-security/eap-method-ttls.c:331
-msgid "CHAP"
-msgstr "CHAP"
-
-#: ../src/wireless-security/wireless-security.c:310
+#: ../src/wireless-security/wireless-security.c:305
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:330
+#: ../src/wireless-security/wireless-security.c:329
 msgid "Tunneled TLS"
-msgstr ""
+msgstr "穿�� TLS"
 
 #: ../src/wireless-security/wireless-security.c:340
 msgid "Protected EAP (PEAP)"
-msgstr ""
+msgstr "ä¿?è­·å¼? EAP (PEAP)"
+
+#~ msgid "Auto CDMA network connection"
+#~ msgstr "è?ªå?? CDMA 網路é?£ç·?"
+
+#~ msgid "Disconnect..."
+#~ msgstr "æ?·ç·?..."
+
+#~ msgid "CDMA Connections (%s)"
+#~ msgstr "CDMA �� (%s)"
+
+#~ msgid "CDMA Network (%s)"
+#~ msgstr "CDMA 網路 (%s)"
+
+#~ msgid "CDMA Connections"
+#~ msgstr "CDMA ��"
+
+#~ msgid "CDMA Network"
+#~ msgstr "CDMA 網路"
+
+#~ msgid "Running PPP on device %s..."
+#~ msgstr "正��� PPP ��置 %s..."
+
+#~ msgid "Auto GSM network connection"
+#~ msgstr "è?ªå?? GSM 網路é?£ç·?"
+
+#~ msgid "GSM Connections (%s)"
+#~ msgstr "GSM �� (%s)"
+
+#~ msgid "GSM Network (%s)"
+#~ msgstr "GSM 網路 (%s)"
+
+#~ msgid "GSM Connections"
+#~ msgstr "GSM ��"
+
+#~ msgid "Dialing GSM device %s..."
+#~ msgstr "æ­£å?¨æ?¥è?? GSM è£?ç½® %s..."
+
+#~ msgid "Preparing device %s for the wired network..."
+#~ msgstr "è£?ç½® %s æ­£æº?å??é?£æ?¥æ??ç·?網路..."
+
+#~ msgid "Configuring device %s for the wired network..."
+#~ msgstr "ç?ºæ??ç·?網路設置è£?ç½® %s ..."
+
+#~ msgid "Requesting a network address from the wired network..."
+#~ msgstr "æ­£è¦?æ±?æ??ç·?網路æ??ä¾?網路ä½?å??..."
+
+#~ msgid "Attempting to join the wireless network '%s'..."
+#~ msgstr "æ­£å?¨å??試å? å?¥ç?¡ç·?網路â??%sâ??..."
+
+#~ msgid "Waiting for Network Key for the wireless network '%s'..."
+#~ msgstr "æ­£å?¨ç­?å¾?ç?¡ç·?網路â??%sâ??ç??網路é??é?°..."
+
+#~ msgid "Could not find some required resources (the glade file)!"
+#~ msgstr "ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼?glade æª?ï¼?ï¼?"
+
+#~ msgid "_Manual configuration"
+#~ msgstr "æ??å??設å®?(_M)"
+
+#~ msgid "WEP 40/128-bit Hexadecimal"
+#~ msgstr "WEP 40/128-bit å??å?­ä½?å??"
+
+#~ msgid "Connection Editor"
+#~ msgstr "��編輯�"
+
+#~ msgid "Doesn't look like a PEM private key file."
+#~ msgstr "ç??èµ·ä¾?ä¸?å??æ?¯ PEM ç§?å¯?é??é?°æª?æ¡?ã??"
+
+#~ msgid "Not enough memory to store PEM file data."
+#~ msgstr "æ²?æ??è¶³å¤ ç??è¨?æ?¶é«?å?²å­? PEM æª?è³?æ??ã??"
+
+#~ msgid "Failed to decode certificate."
+#~ msgstr "æ??è­?解碼失æ??ã??"
+
+#~ msgid "Not enough memory to store decrypted private key."
+#~ msgstr "æ²?æ??è¶³å¤ ç??è¨?æ?¶é«?ä¾?å?²å­?解碼å¾?ç??ç§?å¯?é??é?°ã??"
+
+#~ msgid "Failed to initialize the MD5 engine: %s / %s."
+#~ msgstr "å??å§?å?? MD5 å¼?æ??失æ??ï¼?%s / %sã??"
+
+#~ msgid "Couldn't decode certificate: %s"
+#~ msgstr "ç?¡æ³?解碼æ??è­?ï¼?%s"
+
+#~ msgid "Couldn't decode certificate: %d"
+#~ msgstr "ç?¡æ³?解é??æ??è­?ï¼?%d"
+
+#~ msgid "Delete VPN connection \"%s\"?"
+#~ msgstr "å?ªé?¤ VPN é?£ç·?â??%sâ??ï¼?"
+
+#~ msgid "Unable to load"
+#~ msgstr "ç?¡æ³?è¼?å?¥"
+
+#~ msgid "Cannot find some needed resources (the glade file)!"
+#~ msgstr "ç?¡æ³?æ?¾å?°ä¸?äº?é??è¦?ç??è³?æº?ï¼? glade æª?ï¼?ï¼?"
+
+#~ msgid ""
+#~ "This assistant will guide you through the creation of a connection to a "
+#~ "Virtual Private Network (VPN)."
+#~ msgstr "æ­¤å?©ç??å°?æ??å°?æ?¨å»ºç«?é?£ç·?è?³è??æ?¬ç§?人網路(VPN)ã??"
+
+#~ msgid ""
+#~ "It will require some information, such as IP addresses and secrets.  "
+#~ "Please see your system administrator to obtain this information."
+#~ msgstr ""
+#~ "ä»?å°?é??è¦?ä¸?äº?è³?è¨?ï¼?å??æ?¯ IP ä½?å??å??æ©?å¯?è³?æ??ã??è«?è©¢å??æ?¨ç??系統管ç??å?¡ä»¥å??å¾?é??äº?è³?"
+#~ "è¨?ã??"
+
+#~ msgid "Create VPN Connection"
+#~ msgstr "建� VPN ��"
+
+#~ msgid "1 of 2"
+#~ msgstr "2 ä¹? 1"
+
+#~ msgid "Choose which type of _VPN connection you wish to create:"
+#~ msgstr "é?¸æ??æ?¨æ?³è¦?建ç«?ç?? VPN é?£ç·?é¡?å??(_V)ï¼?"
+
+#~ msgid "Choose which type of VPN connection you wish to create:"
+#~ msgstr "é?¸æ??æ?¨æ?³è¦?建ç«?ç?? VPN é?£ç·?é¡?å??ï¼?"
+
+#~ msgid "2 of 2"
+#~ msgstr "2 ä¹? 2"
+
+#~ msgid "Finished Create VPN Connection"
+#~ msgstr "建ç«? VPN é?£ç·?å®?æ??"
+
+#~ msgid "Edit VPN Connection"
+#~ msgstr "編輯 VPN ��"
+
+#~ msgid "- NetworkManager VPN properties"
+#~ msgstr "- 網路管ç??å?¡ VPN 屬æ?§"
+
+#~ msgid "Add a new VPN connection"
+#~ msgstr "å? å?¥æ?°ç?? VPN é?£ç·?"
+
+#~ msgid "Export the VPN settings to a file"
+#~ msgstr "�� VPN 設����"
+
+#~ msgid "Export the selected VPN connection to a file"
+#~ msgstr "å?¯å?ºæ??é?¸ç?? VPN é?£ç·?è?³æª?æ¡?"
 
-#~ msgid "No active connections!"
-#~ msgstr "æ²?æ??使ç?¨ä¸­ç??é?£ç·?"
+#~ msgid "Existing wireless network"
+#~ msgstr "ç?¾å­?ç??ç?¡ç·?網路"
 
 #~ msgid "Passphrase:"
 #~ msgstr "é??è¡?碼ï¼?"