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

[Aron Xu <aronxu src gnome org>]

commit 1688e791df5a9b4ad20bdc81cae7751a199256e8
Author: Aron Xu <aronxu gnome org>
Date:   Sat Sep 5 23:24:12 2009 +0800

    Updated Simplified Chinese translation.

 po/zh_CN.po | 1507 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 899 insertions(+), 608 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 44e25d1..9490c5f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,5 +1,5 @@
 # Simplified Chinese translation to network-manager-applet.
-# Copyright (C) Free Software Foundation, Inc.
+# Copyright (C) 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the network-manager-applet package.
 # Funda Wang <fundawang linux net cn>, 2004.
 # Wei Mingzhi <whistler openoffice org>, 2009.
@@ -9,9 +9,9 @@ msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=NetworkManager&component=nm-applet\n"
-"POT-Creation-Date: 2009-05-10 17:53+0000\n"
-"PO-Revision-Date: 2009-04-16 13:45+0800\n"
-"Last-Translator: Wei Mingzhi <whistler openoffice org>\n"
+"POT-Creation-Date: 2009-09-04 20:00+0000\n"
+"PO-Revision-Date: 2009-09-01 15:41+0800\n"
+"Last-Translator: Wei Mingzhi <whistler_wmz users sourceforge net>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,6 +26,41 @@ msgstr "æ?§å?¶æ?¨ç??ç½?ç»?è¿?æ?¥"
 msgid "Network Manager"
 msgstr "ç½?ç»?管ç??å?¨"
 
+#: ../nm-applet.schemas.in.h:1
+msgid "Disable connected notifications"
+msgstr "ç¦?ç?¨è¿?æ?¥é??å??"
+
+#: ../nm-applet.schemas.in.h:2
+msgid "Disable disconnected notifications"
+msgstr "ç¦?ç?¨æ?­å¼?é??å??"
+
+#: ../nm-applet.schemas.in.h:3
+msgid "Set this to TRUE to disable notifications when connecting to a network."
+msgstr "å°?此项设为 TRUE 以ç¦?ç?¨è¿?æ?¥å?°ä¸?个ç½?ç»?æ?¶æ?¾ç¤ºç??é??å??ã??"
+
+#: ../nm-applet.schemas.in.h:4
+msgid ""
+"Set this to TRUE to disable notifications when disconnecting from a network."
+msgstr "å°?此项设为 TRUE 以ç¦?ç?¨ä»?ä¸?个ç½?ç»?æ?­å¼?æ?¶æ?¾ç¤ºç??é??å??ã??"
+
+#: ../nm-applet.schemas.in.h:5
+msgid ""
+"Set this to TRUE to disable notifications when wireless networks are "
+"available."
+msgstr "å°?此项设å¤? TRUE 以ç¦?ç?¨æ? 线ç½?ç»?å?¯ç?¨æ?¶æ?¾ç¤ºç??é??å??ã??"
+
+#: ../nm-applet.schemas.in.h:6
+msgid "Stamp"
+msgstr "���"
+
+#: ../nm-applet.schemas.in.h:7
+msgid "Suppress networks available notifications"
+msgstr "ç¦?ç?¨ç½?ç»?å?¯ç?¨é??å??"
+
+#: ../nm-applet.schemas.in.h:8
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "ç?¨äº?å?³å®?设置æ?¯å?¦åº?被è¿?移è?³ä¸?个æ?°ç??æ?¬ã??"
+
 #: ../nm-connection-editor.desktop.in.h:1
 msgid "Manage and change your network connection settings"
 msgstr "管ç??æ??æ?´æ?¹æ?¨ç??ç½?ç»?è¿?æ?¥è®¾ç½®"
@@ -35,103 +70,118 @@ msgstr "管ç??æ??æ?´æ?¹æ?¨ç??ç½?ç»?è¿?æ?¥è®¾ç½®"
 msgid "Network Connections"
 msgstr "ç½?ç»?è¿?æ?¥"
 
-#: ../src/applet-device-cdma.c:54
-msgid "Auto Mobile Broadband (CDMA) connection"
-msgstr "��移�宽带 (CDMA) ��"
-
-#: ../src/applet-device-cdma.c:204 ../src/applet-device-gsm.c:205
-msgid "Disconnect"
-msgstr "æ?­å¼?"
-
-#: ../src/applet-device-cdma.c:243 ../src/applet-device-gsm.c:244
-#, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "移�宽带 (%s)"
-
-#: ../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:298 ../src/applet-device-gsm.c:299
-#: ../src/applet-device-wired.c:261
+#: ../src/applet-device-bt.c:187 ../src/applet-device-cdma.c:352
+#: ../src/applet-device-gsm.c:354 ../src/applet-device-wired.c:263
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "æ?¨ç?°å?¨å·²è¿?æ?¥å?°â??%sâ??ã??"
 
-#: ../src/applet-device-cdma.c:302 ../src/applet-device-gsm.c:303
-#: ../src/applet-device-wired.c:265 ../src/applet-device-wifi.c:1184
+#: ../src/applet-device-bt.c:191 ../src/applet-device-cdma.c:356
+#: ../src/applet-device-gsm.c:358 ../src/applet-device-wired.c:267
+#: ../src/applet-device-wifi.c:1192
 msgid "Connection Established"
 msgstr "��已建�"
 
-#: ../src/applet-device-cdma.c:303
-msgid "You are now connected to the CDMA network."
-msgstr "æ?¨ç?°å?¨å·²è¿?æ?¥å?° CDMA ç½?ç»?ã??"
+#: ../src/applet-device-bt.c:192
+msgid "You are now connected to the mobile broadband network."
+msgstr "æ?¨ç?°å?¨å·²è¿?æ?¥å?°ç§»å?¨å®½å¸¦ç½?ç»?ã??"
 
-#: ../src/applet-device-cdma.c:329 ../src/applet-device-gsm.c:330
+#: ../src/applet-device-bt.c:218 ../src/applet-device-cdma.c:383
+#: ../src/applet-device-gsm.c:385
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
-msgstr "æ­£å?¨å??å¤?移å?¨å®½å¸¦è¿?æ?¥ '%s'..."
+msgstr "æ­£å?¨å??å¤?移å?¨å®½å¸¦è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet-device-cdma.c:332 ../src/applet-device-gsm.c:333
+#: ../src/applet-device-bt.c:221 ../src/applet-device-cdma.c:386
+#: ../src/applet-device-gsm.c:388
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
-msgstr "æ­£å?¨é??置移å?¨å®½å¸¦è¿?æ?¥ '%s'..."
+msgstr "æ­£å?¨é??置移å?¨å®½å¸¦è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet-device-cdma.c:335 ../src/applet-device-gsm.c:336
+#: ../src/applet-device-bt.c:224 ../src/applet-device-cdma.c:389
+#: ../src/applet-device-gsm.c:391
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "移å?¨å®½å¸¦è¿?æ?¥ '%s' é??è¦?ç?¨æ?·è®¤è¯?..."
+msgstr "移å?¨å®½å¸¦è¿?æ?¥â??%sâ??é??è¦?ç?¨æ?·è®¤è¯?..."
 
-#: ../src/applet-device-cdma.c:338 ../src/applet-device-gsm.c:339
-#: ../src/applet.c:1831
+#: ../src/applet-device-bt.c:227 ../src/applet-device-cdma.c:392
+#: ../src/applet-device-gsm.c:394 ../src/applet.c:1895
 #, c-format
 msgid "Requesting a network address for '%s'..."
-msgstr "æ­£å?¨ä¸º '%s' 请æ±?ä¸?个ç½?ç»?å?°å??..."
+msgstr "æ­£å?¨ä¸ºâ??%sâ??请æ±?ä¸?个ç½?ç»?å?°å??..."
 
-#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:343
+#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:396
+#: ../src/applet-device-gsm.c:398
 #, c-format
 msgid "Mobile broadband connection '%s' active"
-msgstr "移å?¨å®½å¸¦è¿?æ?¥ '%s' å·²å¤?äº?æ´»å?¨ç?¶æ??"
+msgstr "移å?¨å®½å¸¦è¿?æ?¥â??%sâ??å·²å¤?äº?æ´»å?¨ç?¶æ??"
+
+#: ../src/applet-device-cdma.c:150 ../src/connection-editor/page-mobile.c:679
+msgid "CDMA"
+msgstr "CDMA"
 
-#: ../src/applet-device-cdma.c:458 ../src/applet-device-gsm.c:541
+#: ../src/applet-device-cdma.c:213
+msgid "New Mobile Broadband (CDMA) connection..."
+msgstr "�建移�宽带(CDMA)��..."
+
+#: ../src/applet-device-cdma.c:258 ../src/applet-device-gsm.c:260
+msgid "Disconnect"
+msgstr "æ?­å¼?"
+
+#: ../src/applet-device-cdma.c:297 ../src/applet-device-gsm.c:299
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "移�宽带(%s)"
+
+#: ../src/applet-device-cdma.c:299 ../src/applet-device-gsm.c:301
+#: ../src/connection-editor/page-mobile.c:378
+#: ../src/connection-editor/nm-connection-editor.glade.h:6
+#: ../src/connection-editor/nm-connection-list.c:1358
+msgid "Mobile Broadband"
+msgstr "移�宽带"
+
+#: ../src/applet-device-cdma.c:357
+msgid "You are now connected to the CDMA network."
+msgstr "æ?¨ç?°å?¨å·²è¿?æ?¥å?° CDMA ç½?ç»?ã??"
+
+#: ../src/applet-device-cdma.c:526 ../src/applet-device-gsm.c:610
 msgid "Mobile broadband network password"
 msgstr "移å?¨å®½å¸¦ç½?ç»?å¯?ç ?"
 
-#: ../src/applet-device-cdma.c:467 ../src/applet-device-gsm.c:550
+#: ../src/applet-device-cdma.c:535 ../src/applet-device-gsm.c:619
 #, c-format
 msgid "A password is required to connect to '%s'."
-msgstr "è¿?æ?¥å?° '%s' é??è¦?å¯?ç ?ã??"
+msgstr "è¿?æ?¥å?°â??%sâ??é??è¦?å¯?ç ?ã??"
 
-#: ../src/applet-device-cdma.c:485 ../src/applet-device-gsm.c:568
-#: ../src/applet.glade.h:25 ../src/connection-editor/ce-page-dsl.glade.h:1
-#: ../src/connection-editor/ce-page-mobile.glade.h:14
+#: ../src/applet-device-cdma.c:553 ../src/applet-device-gsm.c:637
 msgid "Password:"
-msgstr "å¯?ç ?:"
+msgstr "å¯?ç ?ï¼?"
 
-#: ../src/applet-device-gsm.c:55
-msgid "Auto Mobile Broadband (GSM) connection"
-msgstr "��移�宽带 (GSM) ��"
+#: ../src/applet-device-gsm.c:152 ../src/connection-editor/page-mobile.c:682
+msgid "GSM"
+msgstr "GSM"
 
-#: ../src/applet-device-gsm.c:304
+#: ../src/applet-device-gsm.c:215
+msgid "New Mobile Broadband (GSM) connection..."
+msgstr "�建移�宽带(GSM)��..."
+
+#: ../src/applet-device-gsm.c:359
 msgid "You are now connected to the GSM network."
 msgstr "æ?¨ç?°å?¨å·²è¿?æ?¥å?° GSM ç½?ç»?ã??"
 
-#: ../src/applet-device-gsm.c:481
+#: ../src/applet-device-gsm.c:550
 msgid "PIN code required"
 msgstr "é??è¦? PIN ç ?"
 
-#: ../src/applet-device-gsm.c:483
+#: ../src/applet-device-gsm.c:552
 msgid "PUK code required"
 msgstr "é??è¦? PUK ç ?"
 
-#: ../src/applet-device-gsm.c:492
+#: ../src/applet-device-gsm.c:561
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "移å?¨å®½å¸¦è®¾å¤?é??è¦? PIN ç ?ã??"
 
-#: ../src/applet-device-gsm.c:494
+#: ../src/applet-device-gsm.c:563
 msgid "PUK code is needed for the mobile broadband device"
 msgstr "移å?¨å®½å¸¦è®¾å¤?é??è¦? PUK ç ?ã??"
 
@@ -139,59 +189,59 @@ msgstr "移å?¨å®½å¸¦è®¾å¤?é??è¦? PUK ç ?ã??"
 msgid "Auto Ethernet"
 msgstr "��以太�"
 
-#: ../src/applet-device-wired.c:197
+#: ../src/applet-device-wired.c:199
 #, c-format
 msgid "Wired Networks (%s)"
-msgstr "æ??线ç½?ç»? (%s)"
+msgstr "æ??线ç½?ç»?(%s)"
 
-#: ../src/applet-device-wired.c:199
+#: ../src/applet-device-wired.c:201
 #, c-format
 msgid "Wired Network (%s)"
-msgstr "æ??线ç½?ç»? (%s)"
+msgstr "æ??线ç½?ç»?(%s)"
 
-#: ../src/applet-device-wired.c:202
+#: ../src/applet-device-wired.c:204
 msgid "Wired Networks"
 msgstr "æ??线ç½?ç»?"
 
-#: ../src/applet-device-wired.c:204
+#: ../src/applet-device-wired.c:206
 msgid "Wired Network"
 msgstr "æ??线ç½?ç»?"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:227
+#: ../src/applet-device-wired.c:229
 msgid "disconnected"
 msgstr "已��"
 
-#: ../src/applet-device-wired.c:266
+#: ../src/applet-device-wired.c:268
 msgid "You are now connected to the wired network."
 msgstr "æ?¨ç?°å?¨å·²è¿?æ?¥å?°æ??线ç½?ç»?ã??"
 
-#: ../src/applet-device-wired.c:292
+#: ../src/applet-device-wired.c:294
 #, c-format
 msgid "Preparing wired network connection '%s'..."
-msgstr "æ­£å?¨å??å¤?æ??线ç½?ç»?è¿?æ?¥ '%s'..."
+msgstr "æ­£å?¨å??å¤?æ??线ç½?ç»?è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet-device-wired.c:295
+#: ../src/applet-device-wired.c:297
 #, c-format
 msgid "Configuring wired network connection '%s'..."
-msgstr "æ­£å?¨é??ç½®æ??线ç½?ç»?è¿?æ?¥ '%s'..."
+msgstr "æ­£å?¨é??ç½®æ??线ç½?ç»?è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet-device-wired.c:298
+#: ../src/applet-device-wired.c:300
 #, c-format
 msgid "User authentication required for wired network connection '%s'..."
-msgstr "æ??线ç½?ç»?è¿?æ?¥ '%s' é??è¦?ç?¨æ?·è®¤è¯?..."
+msgstr "æ??线ç½?ç»?è¿?æ?¥â??%sâ??é??è¦?ç?¨æ?·è®¤è¯?..."
 
-#: ../src/applet-device-wired.c:301
+#: ../src/applet-device-wired.c:303
 #, c-format
 msgid "Requesting a wired network address for '%s'..."
-msgstr "æ­£å?¨ä¸º '%s' 请æ±?ä¸?个æ??线ç½?ç»?è¿?æ?¥å?°å??..."
+msgstr "æ­£å?¨ä¸ºâ??%sâ??请æ±?ä¸?个æ??线ç½?ç»?è¿?æ?¥å?°å??..."
 
-#: ../src/applet-device-wired.c:305
+#: ../src/applet-device-wired.c:307
 #, c-format
 msgid "Wired network connection '%s' active"
-msgstr "æ??线ç½?ç»?è¿?æ?¥ '%s' å·²å¤?äº?æ´»å?¨ç?¶æ??"
+msgstr "æ??线ç½?ç»?è¿?æ?¥â??%sâ??å·²å¤?äº?æ´»å?¨ç?¶æ??"
 
-#: ../src/applet-device-wired.c:558
+#: ../src/applet-device-wired.c:576
 msgid "DSL authentication"
 msgstr "DSL 认�"
 
@@ -203,75 +253,75 @@ msgstr "è¿?æ?¥å?°é??è??ç??æ? 线è¿?æ?¥(_C)..."
 msgid "Create _New Wireless Network..."
 msgstr "å??建æ?°ç??æ? 线ç½?ç»?(_N)..."
 
-#: ../src/applet-device-wifi.c:693
+#: ../src/applet-device-wifi.c:695
 #, c-format
 msgid "Wireless Networks (%s)"
-msgstr "æ? 线ç½?ç»? (%s)"
+msgstr "æ? 线ç½?ç»?(%s)"
 
-#: ../src/applet-device-wifi.c:695
+#: ../src/applet-device-wifi.c:697
 #, c-format
 msgid "Wireless Network (%s)"
-msgstr "æ? 线ç½?ç»? (%s)"
+msgstr "æ? 线ç½?ç»?(%s)"
 
-#: ../src/applet-device-wifi.c:697
+#: ../src/applet-device-wifi.c:699
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "æ? 线ç½?ç»?"
 
-#: ../src/applet-device-wifi.c:714
+#: ../src/applet-device-wifi.c:716
 msgid "wireless is disabled"
 msgstr "æ? 线ç½?ç»?å·²ç¦?ç?¨"
 
-#: ../src/applet-device-wifi.c:977
+#: ../src/applet-device-wifi.c:982
 msgid "Wireless Networks Available"
 msgstr "æ? 线ç½?ç»?å?¯ç?¨"
 
-#: ../src/applet-device-wifi.c:978
+#: ../src/applet-device-wifi.c:983
 msgid "Click on this icon to connect to a wireless network"
 msgstr "å??å?»æ­¤å?¾æ ?è¿?æ?¥å?°æ? 线ç½?ç»?"
 
-#: ../src/applet-device-wifi.c:981 ../src/applet.c:438
+#: ../src/applet-device-wifi.c:986 ../src/applet.c:481
 msgid "Don't show this message again"
 msgstr "ä¸?å??æ?¾ç¤ºæ­¤ä¿¡æ?¯"
 
-#: ../src/applet-device-wifi.c:1182
+#: ../src/applet-device-wifi.c:1190
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
-msgstr "æ?¨ç?°å?¨å·²è¿?æ?¥å?°æ? 线ç½?ç»?â??%sâ??ã??"
+msgstr "æ?¨ç?°å?¨å·²è¿?æ?¥å?°æ? 线ç½?ç»? '%s'ã??"
 
-#: ../src/applet-device-wifi.c:1183 ../src/applet-device-wifi.c:1214
+#: ../src/applet-device-wifi.c:1191 ../src/applet-device-wifi.c:1222
 msgid "(none)"
 msgstr "(æ? )"
 
-#: ../src/applet-device-wifi.c:1224
+#: ../src/applet-device-wifi.c:1232
 #, c-format
 msgid "Preparing wireless network connection '%s'..."
-msgstr "æ­£å?¨å??å¤?æ? 线ç½?ç»?è¿?æ?¥ '%s'..."
+msgstr "æ­£å?¨å??å¤?æ? 线ç½?ç»?è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1227
+#: ../src/applet-device-wifi.c:1235
 #, c-format
 msgid "Configuring wireless network connection '%s'..."
-msgstr "æ­£å?¨é??ç½®æ? 线ç½?ç»?è¿?æ?¥ '%s'..."
+msgstr "æ­£å?¨é??ç½®æ? 线ç½?ç»?è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1230
+#: ../src/applet-device-wifi.c:1238
 #, c-format
 msgid "User authentication required for wireless network '%s'..."
-msgstr "æ? 线ç½?ç»? '%s' é??è¦?ç?¨æ?·è®¤è¯?..."
+msgstr "æ? 线ç½?ç»?â??%sâ??é??è¦?ç?¨æ?·è®¤è¯?..."
 
-#: ../src/applet-device-wifi.c:1233
+#: ../src/applet-device-wifi.c:1241
 #, c-format
 msgid "Requesting a wireless network address for '%s'..."
-msgstr "æ­£å?¨ä¸º '%s' 请æ±?ä¸?个æ? 线ç½?ç»?å?°å??..."
+msgstr "æ­£å?¨ä¸ºâ??%sâ??请æ±?ä¸?个æ? 线ç½?ç»?å?°å??..."
 
-#: ../src/applet-device-wifi.c:1253
+#: ../src/applet-device-wifi.c:1261
 #, c-format
 msgid "Wireless network connection '%s' active: %s (%d%%)"
-msgstr "æ? 线ç½?ç»?è¿?æ?¥ '%s' å¤?äº?æ´»å?¨ç?¶æ??: %s (%d%%)"
+msgstr "æ? 线ç½?ç»?è¿?æ?¥â??%sâ??å¤?äº?æ´»å?¨ç?¶æ??ï¼?%s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1257
+#: ../src/applet-device-wifi.c:1265
 #, c-format
 msgid "Wireless network connection '%s' active"
-msgstr "æ? 线ç½?ç»?è¿?æ?¥ '%s' å¤?äº?æ´»å?¨ç?¶æ??"
+msgstr "æ? 线ç½?ç»?è¿?æ?¥â??%sâ??å¤?äº?æ´»å?¨ç?¶æ??"
 
 #: ../src/applet-dialogs.c:53
 msgid "Error displaying connection information:"
@@ -279,8 +329,8 @@ msgstr "æ?¾ç¤ºè¿?æ?¥ä¿¡æ?¯å?ºé??ï¼?"
 
 #: ../src/applet-dialogs.c:84
 #: ../src/connection-editor/page-wireless-security.c:284
-#: ../src/wireless-dialog.c:820
-#: ../src/wireless-security/wireless-security.c:317
+#: ../src/wireless-dialog.c:832
+#: ../src/wireless-security/wireless-security.c:327
 msgid "LEAP"
 msgstr "LEAP"
 
@@ -299,7 +349,7 @@ msgstr "WEP"
 
 #: ../src/applet-dialogs.c:195 ../src/applet-dialogs.c:204
 #: ../src/connection-editor/page-wireless-security.c:238
-#: ../src/wireless-dialog.c:777
+#: ../src/wireless-dialog.c:789
 msgid "None"
 msgstr "æ? "
 
@@ -310,7 +360,7 @@ msgstr "��"
 #: ../src/applet-dialogs.c:258
 #, c-format
 msgid "Ethernet (%s)"
-msgstr "以太� (%s)"
+msgstr "以太�(%s)"
 
 #: ../src/applet-dialogs.c:260
 #, c-format
@@ -329,15 +379,15 @@ msgstr "CDMA (%s)"
 
 #: ../src/applet-dialogs.c:269
 msgid "Interface:"
-msgstr "��:"
+msgstr "���"
 
 #: ../src/applet-dialogs.c:285
 msgid "Hardware Address:"
-msgstr "硬件å?°å??:"
+msgstr "硬件å?°å??ï¼?"
 
 #: ../src/applet-dialogs.c:295
 msgid "Driver:"
-msgstr "驱���:"
+msgstr "驱����"
 
 #: ../src/applet-dialogs.c:314
 #, c-format
@@ -346,41 +396,40 @@ msgstr "%u Mb/�"
 
 #: ../src/applet-dialogs.c:319
 msgid "Speed:"
-msgstr "é??度:"
+msgstr "é??度ï¼?"
 
 #: ../src/applet-dialogs.c:329
-#: ../src/connection-editor/ce-page-wireless-security.glade.h:1
 msgid "Security:"
-msgstr "���:"
+msgstr "����"
 
 #: ../src/applet-dialogs.c:349
 msgid "IP Address:"
-msgstr "IP å?°å??:"
+msgstr "IP å?°å??ï¼?"
 
 #: ../src/applet-dialogs.c:365
 msgid "Broadcast Address:"
-msgstr "广æ?­å?°å??:"
+msgstr "广æ?­å?°å??ï¼?"
 
 #: ../src/applet-dialogs.c:376
 msgid "Subnet Mask:"
-msgstr "å­?ç½?æ?©ç ?:"
+msgstr "å­?ç½?æ?©ç ?ï¼?"
 
 #: ../src/applet-dialogs.c:388
 msgid "Default Route:"
-msgstr "�认路�:"
+msgstr "�认路��"
 
 #: ../src/applet-dialogs.c:403
 msgid "Primary DNS:"
-msgstr "主 DNS:"
+msgstr "主 DNS�"
 
 #: ../src/applet-dialogs.c:414
 msgid "Secondary DNS:"
-msgstr "è¾? DNS:"
+msgstr "è¾? DNSï¼?"
 
 #. Shouldn't really happen but ...
 #: ../src/applet-dialogs.c:477
 msgid "No valid active connections found!"
-msgstr "æ?ªæ?¾å?°å??æ³?ç??æ´»å?¨è¿?æ?¥!"
+msgstr "æ?ªæ?¾å?°å??æ³?ç??æ´»å?¨è¿?æ?¥ï¼?"
 
 #: ../src/applet-dialogs.c:603
 msgid ""
@@ -393,7 +442,7 @@ msgstr ""
 #: ../src/applet-dialogs.c:605
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr "管ç??æ?¨ç½?ç»?设å¤?å??è¿?æ?¥ç??é??ç?¥å?ºå??å°?ç¨?åº?"
+msgstr "管ç??æ?¨ç½?ç»?设å¤?å??è¿?æ?¥ç??é??ç?¥å?ºå??å°?ç¨?åº?ã??"
 
 #: ../src/applet-dialogs.c:607
 msgid "NetworkManager Website"
@@ -403,13 +452,13 @@ msgstr "NetworkManager ç½?ç«?"
 msgid "translator-credits"
 msgstr ""
 "Funda Wang <fundawang linux net cn>\n"
-"Wei Mingzhi <whistler_wmz 163 com>"
+"Wei Mingzhi <whistler_wmz users sf net>"
 
 #: ../src/applet-dialogs.c:626
 msgid "Missing resources"
 msgstr "缺���"
 
-#: ../src/applet.c:508
+#: ../src/applet.c:563
 #, c-format
 msgid ""
 "\n"
@@ -417,18 +466,18 @@ msgid ""
 "interrupted."
 msgstr ""
 "\n"
-"VPN è¿?æ?¥ '%s' 失败ã??ç½?ç»?è¿?æ?¥è¢«ä¸­æ?­ã??"
+"VPN è¿?æ?¥â??%sâ??失败ã??ç½?ç»?è¿?æ?¥è¢«ä¸­æ?­ã??"
 
-#: ../src/applet.c:511
+#: ../src/applet.c:566
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service stopped unexpectedly."
 msgstr ""
 "\n"
-"VPN è¿?æ?¥ '%s' 失败ã??VPN æ??å?¡å¼?常中æ?­ã??"
+"VPN è¿?æ?¥â??%sâ??失败ã??VPN æ??å?¡å¼?常中æ?­ã??"
 
-#: ../src/applet.c:514
+#: ../src/applet.c:569
 #, c-format
 msgid ""
 "\n"
@@ -436,63 +485,63 @@ msgid ""
 "configuration."
 msgstr ""
 "\n"
-"VPN è¿?æ?¥ '%s' 失败ã??VPN æ??å?¡è¿?å??äº?ä¸?个é??æ³?é??ç½®ã??"
+"VPN è¿?æ?¥â??%sâ??失败ã??VPN æ??å?¡è¿?å??äº?ä¸?个é??æ³?é??ç½®ã??"
 
-#: ../src/applet.c:517
+#: ../src/applet.c:572
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the connection attempt timed out."
 msgstr ""
 "\n"
-"VPN è¿?æ?¥ '%s' 失败ã??è¿?æ?¥è¶?æ?¶ã??"
+"VPN è¿?æ?¥â??%sâ??失败ã??è¿?æ?¥è¶?æ?¶ã??"
 
-#: ../src/applet.c:520
+#: ../src/applet.c:575
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service did not start in time."
 msgstr ""
 "\n"
-"VPN è¿?æ?¥ '%s' 失败ã??VPN æ??å?¡æ?ªå?¨æ??é??æ?¶é?´å??å?¯å?¨ã??"
+"VPN è¿?æ?¥â??%sâ??失败ã??VPN æ??å?¡æ?ªå?¨æ??é??æ?¶é?´å??å?¯å?¨ã??"
 
-#: ../src/applet.c:523
+#: ../src/applet.c:578
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service failed to start."
 msgstr ""
 "\n"
-"VPN è¿?æ?¥ '%s' 失败ã??VPN æ??å?¡å?¯å?¨å¤±è´¥ã??"
+"VPN è¿?æ?¥â??%sâ??失败ã??VPN æ??å?¡å?¯å?¨å¤±è´¥ã??"
 
-#: ../src/applet.c:526
+#: ../src/applet.c:581
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because there were no valid VPN secrets."
 msgstr ""
 "\n"
-"VPN è¿?æ?¥ '%s' 失败ã??没æ??å??æ³?ç?? VPN secretã??"
+"VPN è¿?æ?¥â??%sâ??失败ã??没æ??å??æ³?ç?? VPN secretã??"
 
-#: ../src/applet.c:529
+#: ../src/applet.c:584
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because of invalid VPN secrets."
 msgstr ""
 "\n"
-"VPN è¿?æ?¥ '%s' 失败ã??VPN secret é??æ³?ã??"
+"VPN è¿?æ?¥â??%sâ??失败ã??VPN secret é??æ³?ã??"
 
-#: ../src/applet.c:536
+#: ../src/applet.c:591
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed."
 msgstr ""
 "\n"
-"VPN è¿?æ?¥ '%s' 失败ã??"
+"VPN è¿?æ?¥â??%sâ??失败ã??"
 
-#: ../src/applet.c:554
+#: ../src/applet.c:609
 #, c-format
 msgid ""
 "\n"
@@ -500,35 +549,35 @@ msgid ""
 "interrupted."
 msgstr ""
 "\n"
-"VPN è¿?æ?¥ '%s' å·²æ?­å¼?ã??ç½?ç»?è¿?æ?¥è¢«ä¸­æ?­ã??"
+"VPN è¿?æ?¥â??%sâ??å·²æ?­å¼?ã??ç½?ç»?è¿?æ?¥è¢«ä¸­æ?­ã??"
 
-#: ../src/applet.c:557
+#: ../src/applet.c:612
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected because the VPN service stopped."
 msgstr ""
 "\n"
-"VPN è¿?æ?¥ '%s' å·²æ?­å¼?ã??VPN æ??å?¡å·²å??æ­¢ã??"
+"VPN è¿?æ?¥â??%sâ??å·²æ?­å¼?ã??VPN æ??å?¡å·²å??æ­¢ã??"
 
-#: ../src/applet.c:563
+#: ../src/applet.c:618
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected."
 msgstr ""
 "\n"
-"VPN è¿?æ?¥ '%s' å·²æ?­å¼?ã??"
+"VPN è¿?æ?¥â??%sâ??å·²æ?­å¼?ã??"
 
-#: ../src/applet.c:641
+#: ../src/applet.c:696
 msgid "VPN Login Message"
 msgstr "VPN ����"
 
-#: ../src/applet.c:653 ../src/applet.c:661 ../src/applet.c:705
+#: ../src/applet.c:708 ../src/applet.c:716 ../src/applet.c:760
 msgid "VPN Connection Failed"
 msgstr "VPN ��失败"
 
-#: ../src/applet.c:712
+#: ../src/applet.c:767
 #, c-format
 msgid ""
 "\n"
@@ -537,11 +586,11 @@ msgid ""
 "%s"
 msgstr ""
 "\n"
-"VPN è¿?æ?¥ '%s' 失败ã??VPN æ??å?¡å?¯å?¨å¤±è´¥ã??\n"
+"VPN è¿?æ?¥â??%sâ??失败ã??VPN æ??å?¡å?¯å?¨å¤±è´¥ã??\n"
 "\n"
 "%s"
 
-#: ../src/applet.c:715
+#: ../src/applet.c:770
 #, c-format
 msgid ""
 "\n"
@@ -550,137 +599,136 @@ msgid ""
 "%s"
 msgstr ""
 "\n"
-"VPN è¿?æ?¥ '%s' å?¯å?¨å¤±è´¥ã??\n"
+"VPN è¿?æ?¥â??%sâ??å?¯å?¨å¤±è´¥ã??\n"
 "\n"
 "%s"
 
-#: ../src/applet.c:1006
+#: ../src/applet.c:1072
 msgid "device not ready"
 msgstr "设��就绪"
 
-#: ../src/applet.c:1022
+#: ../src/applet.c:1088
 msgid "device not managed"
 msgstr "设å¤?æ?ªæ??管"
 
-#: ../src/applet.c:1066
+#: ../src/applet.c:1132
 msgid "No network devices available"
 msgstr "没æ??å?¯ç?¨ç??ç½?ç»?设å¤?"
 
-#: ../src/applet.c:1154
+#: ../src/applet.c:1220
 msgid "_VPN Connections"
 msgstr "_VPN è¿?æ?¥"
 
-#: ../src/applet.c:1204
+#: ../src/applet.c:1270
 msgid "_Configure VPN..."
 msgstr "é??ç½® VPN(_C)..."
 
-#: ../src/applet.c:1208
+#: ../src/applet.c:1274
 msgid "_Disconnect VPN..."
 msgstr "æ?­å¼? VPN(_D)..."
 
-#: ../src/applet.c:1261
+#: ../src/applet.c:1327
 msgid "NetworkManager is not running..."
 msgstr "ç½?ç»?管ç??å?¨æ?ªè¿?è¡?..."
 
-#: ../src/applet.c:1266 ../src/applet.c:1959
+#: ../src/applet.c:1332 ../src/applet.c:2023
 msgid "Networking disabled"
 msgstr "��已��"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1450
+#: ../src/applet.c:1516
 msgid "Enable _Networking"
 msgstr "å?¯ç?¨è??ç½?(_N)"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:1459
+#: ../src/applet.c:1525
 msgid "Enable _Wireless"
 msgstr "å?¯ç?¨æ? 线(_W)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1470
+#: ../src/applet.c:1536
 msgid "Connection _Information"
 msgstr "��信�(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1480
+#: ../src/applet.c:1546
 msgid "Edit Connections..."
 msgstr "ç¼?è¾?è¿?æ?¥..."
 
 #. Help item
-#: ../src/applet.c:1494
+#: ../src/applet.c:1560
 msgid "_Help"
 msgstr "帮�(_H)"
 
 #. About item
-#: ../src/applet.c:1503
+#: ../src/applet.c:1569
 msgid "_About"
 msgstr "��(_A)"
 
-#: ../src/applet.c:1676
+#: ../src/applet.c:1740
 msgid "Disconnected"
 msgstr "已����"
 
-#: ../src/applet.c:1677
+#: ../src/applet.c:1741
 msgid "The network connection has been disconnected."
 msgstr "ç½?ç»?è¿?æ?¥ç?°å·²æ?­å¼?ã??"
 
-#: ../src/applet.c:1825
+#: ../src/applet.c:1889
 #, c-format
 msgid "Preparing network connection '%s'..."
-msgstr "æ­£å?¨å??å¤?ç½?ç»?è¿?æ?¥ '%s'..."
+msgstr "æ­£å?¨å??å¤?ç½?ç»?è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet.c:1828
+#: ../src/applet.c:1892
 #, c-format
 msgid "User authentication required for network connection '%s'..."
-msgstr "ç½?ç»?è¿?æ?¥ '%s' é??è¦?ç?¨æ?·è®¤è¯?..."
+msgstr "ç½?ç»?è¿?æ?¥â??%sâ??é??è¦?ç?¨æ?·è®¤è¯?..."
 
-#: ../src/applet.c:1834
+#: ../src/applet.c:1898
 #, c-format
 msgid "Network connection '%s' active"
-msgstr "ç½?ç»?è¿?æ?¥ '%s' å·²å¤?äº?æ´»å?¨ç?¶æ??"
+msgstr "ç½?ç»?è¿?æ?¥â??%sâ??å·²å¤?äº?æ´»å?¨ç?¶æ??"
 
-#: ../src/applet.c:1915
+#: ../src/applet.c:1979
 #, c-format
 msgid "Starting VPN connection '%s'..."
-msgstr "正��� VPN �� '%s'..."
+msgstr "æ­£å?¨å?¯å?¨ VPN è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet.c:1918
+#: ../src/applet.c:1982
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
-msgstr "VPN è¿?æ?¥ '%s' é??è¦?ç?¨æ?·è®¤è¯?..."
+msgstr "VPN è¿?æ?¥â??%sâ??é??è¦?ç?¨æ?·è®¤è¯?..."
 
-#: ../src/applet.c:1921
+#: ../src/applet.c:1985
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
-msgstr "æ­£å?¨ä¸º '%s' 请æ±?ä¸?个 VPN å?°å??..."
+msgstr "æ­£å?¨ä¸ºâ??%sâ??请æ±?ä¸?个 VPN å?°å??..."
 
-#: ../src/applet.c:1924
+#: ../src/applet.c:1988
 #, c-format
 msgid "VPN connection '%s' active"
-msgstr "VPN è¿?æ?¥ '%s' å·²å¤?äº?æ´»å?¨ç?¶æ??"
+msgstr "VPN è¿?æ?¥â??%sâ??å·²å¤?äº?æ´»å?¨ç?¶æ??"
 
-#: ../src/applet.c:1963
+#: ../src/applet.c:2027
 msgid "No network connection"
 msgstr "没æ??ç½?ç»?è¿?æ?¥"
 
-#: ../src/applet.c:2298
+#: ../src/applet.c:2360
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
 msgstr "ç½?ç»?管ç??å?¨å°?ç¨?åº?æ?¾ä¸?å?°æ??é??ç??èµ?æº?ã??æ? æ³?继续ã??\n"
 
-#: ../src/applet.c:2493
+#: ../src/applet.c:2555
 msgid "NetworkManager Applet"
 msgstr "ç½?ç»?管ç??å?¨å°?ç¨?åº?"
 
-#: ../src/applet.c:2499 ../src/wired-dialog.c:128
+#: ../src/applet.c:2561 ../src/wired-dialog.c:128
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
-msgstr "ç½?ç»?管ç??å?¨å°?ç¨?åº?æ?¾ä¸?å?°æ??é??ç??èµ?æº? (glade æ??件æ?ªæ?¾å?°)ã??"
+msgstr "ç½?ç»?管ç??å?¨å°?ç¨?åº?æ?¾ä¸?å?°æ??é??ç??èµ?æº?(glade æ??件æ?ªæ?¾å?°)ã??"
 
-#: ../src/applet.glade.h:1 ../src/connection-editor/ce-mobile-wizard.glade.h:1
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:1
+#: ../src/applet.glade.h:1 ../src/connection-editor/ce-vpn-wizard.glade.h:1
 msgid " "
 msgstr " "
 
@@ -701,14 +749,10 @@ 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:"
-msgstr "å?¿å??身份:"
+msgid "Anony_mous identity:"
+msgstr "å?¿å??身份(_M)ï¼?"
 
 #: ../src/applet.glade.h:8
-msgid "Authentication:"
-msgstr "认�:"
-
-#: ../src/applet.glade.h:9
 msgid ""
 "Automatic\n"
 "Version 0\n"
@@ -718,43 +762,39 @@ msgstr ""
 "ç??æ?¬ 0\n"
 "ç??æ?¬ 1"
 
-#: ../src/applet.glade.h:12
-msgid "CA Certificate:"
-msgstr "CA �书:"
+#: ../src/applet.glade.h:11
+msgid "C_A certificate:"
+msgstr "C_A �书�"
 
-#: ../src/applet.glade.h:13
+#: ../src/applet.glade.h:12
 msgid "C_onnect"
 msgstr "è¿?æ?¥(_O)"
 
+#: ../src/applet.glade.h:13
+msgid "Co_nnection:"
+msgstr "è¿?æ?¥(_N)ï¼?"
+
 #: ../src/applet.glade.h:14
 msgid "Connection Information"
 msgstr "��信�"
 
 #: ../src/applet.glade.h:15
-msgid "Connection:"
-msgstr "è¿?æ?¥:"
+msgid "Don't _warn me again"
+msgstr "以å??ä¸?å??è­¦å??(_W)"
 
 #: ../src/applet.glade.h:16
-msgid "Don't warn me again"
-msgstr "以å??ä¸?å??è­¦å??"
+msgid "I_dentity:"
+msgstr "身份(_D)�"
 
 #: ../src/applet.glade.h:17
-msgid "Identity:"
-msgstr "身份:"
+msgid "I_nner authentication:"
+msgstr "å??é?¨è®¤è¯?(_N)ï¼?"
 
 #: ../src/applet.glade.h:18
-msgid "Inner Authentication:"
-msgstr "å??é?¨è®¤è¯?:"
-
-#: ../src/applet.glade.h:19
-msgid "Key:"
-msgstr "��:"
-
-#: ../src/applet.glade.h:20
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/applet.glade.h:21
+#: ../src/applet.glade.h:19
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -762,124 +802,99 @@ msgstr ""
 "���系�\n"
 "�享��"
 
-#: ../src/applet.glade.h:23
+#: ../src/applet.glade.h:21
 msgid "Other Wireless Network..."
 msgstr "å?¶å®?æ? 线ç½?ç»?..."
 
+#: ../src/applet.glade.h:22
+msgid "Private _key:"
+msgstr "��(_K)�"
+
+#: ../src/applet.glade.h:23
+msgid "Select A File"
+msgstr "é??æ?©ä¸?个æ??件"
+
 #: ../src/applet.glade.h:24
-msgid "PEAP Version:"
-msgstr "PEAP ç??æ?¬:"
+msgid "Sho_w key"
+msgstr "�示��(_W)"
+
+#: ../src/applet.glade.h:25 ../src/connection-editor/ce-page-dsl.glade.h:1
+msgid "Sho_w password"
+msgstr "æ?¾ç¤ºå¯?ç ?(_W)"
 
 #: ../src/applet.glade.h:26
-msgid "Private Key Password:"
-msgstr "ç§?é?¥å¯?ç ?:"
+msgid "WEP inde_x:"
+msgstr "WEP 索�(_X)�"
 
 #: ../src/applet.glade.h:27
-msgid "Private Key:"
-msgstr "��:"
+msgid "Wireless _adapter:"
+msgstr "æ? 线é??é??å?¨(_A)ï¼?"
 
 #: ../src/applet.glade.h:28
-msgid "Select A File"
-msgstr "é??æ?©ä¸?个æ??件"
+msgid "Yes"
+msgstr "æ?¯"
 
 #: ../src/applet.glade.h:29
-msgid "Show key"
-msgstr "�示��"
+msgid "_Authentication:"
+msgstr "认�(_A)�"
 
-#: ../src/applet.glade.h:30 ../src/connection-editor/ce-page-dsl.glade.h:3
-msgid "Show password"
-msgstr "æ?¾ç¤ºå¯?ç ?"
+#: ../src/applet.glade.h:30
+msgid "_Key:"
+msgstr "��(_K)�"
 
-#: ../src/applet.glade.h:31 ../src/connection-editor/ce-page-mobile.glade.h:16
-msgid "Type:"
-msgstr "ç±»å??ï¼?"
+#: ../src/applet.glade.h:31
+msgid "_Network name:"
+msgstr "ç½?ç»?å??称(_N)ï¼?"
 
 #: ../src/applet.glade.h:32
-msgid "User Certificate:"
-msgstr "���书:"
+msgid "_PEAP version:"
+msgstr "_PEAP ç??æ?¬ï¼?"
 
-#: ../src/applet.glade.h:33
-msgid "User Name:"
-msgstr "ç?¨æ?·å??ï¼?"
+#: ../src/applet.glade.h:33 ../src/connection-editor/ce-page-dsl.glade.h:2
+#: ../src/connection-editor/ce-page-mobile.glade.h:16
+msgid "_Password:"
+msgstr "å¯?ç ?(_P)ï¼?"
 
 #: ../src/applet.glade.h:34
-msgid "WEP Index:"
-msgstr "WEP 索�:"
+msgid "_Private key password:"
+msgstr "ç§?é?¥å¯?ç ?(_P)ï¼?"
 
-#: ../src/applet.glade.h:35
-msgid "Wireless _adapter:"
-msgstr "æ? 线é??é??å?¨(_A)ï¼?"
+#: ../src/applet.glade.h:35 ../src/connection-editor/ce-page-mobile.glade.h:17
+msgid "_Type:"
+msgstr "ç±»å??(_T)ï¼?"
 
 #: ../src/applet.glade.h:36
-msgid "Yes"
-msgstr "æ?¯"
+msgid "_User certificate:"
+msgstr "���书(_U)�"
 
-#: ../src/applet.glade.h:37
-msgid "_Network Name:"
-msgstr "ç½?ç»?å??称(_N):"
+#: ../src/applet.glade.h:37 ../src/connection-editor/ce-page-dsl.glade.h:4
+#: ../src/connection-editor/ce-page-mobile.glade.h:18
+msgid "_Username:"
+msgstr "ç?¨æ?·å??(_U)ï¼?"
 
 #: ../src/applet.glade.h:38
-msgid "_Wireless Security:"
-msgstr "æ? 线å®?å?¨æ?§(_W):"
-
-#: ../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"
-"é??æ?©æ??è¿?æ?¥æ?¨è¦?为æ?°ç§»å?¨å®½å¸¦è¿?æ?¥ä½¿ç?¨ç??移å?¨å®½å¸¦è®¾å¤?ã??å¦?设å¤?ä¸?å?¯ç?¨ï¼?æ?¨å?¯ä»¥é??æ?©ä¸?"
-"个é??ç?¨ç??è¿?æ?¥ç±»å??ã??"
+msgid "_Wireless security:"
+msgstr "æ? 线ç½?ç»?å®?å?¨æ?§(_W)ï¼?"
 
-#: ../src/connection-editor/ce-page.c:70
+#: ../src/connection-editor/ce-page.c:69
 msgid "automatic"
 msgstr "��"
 
-#: ../src/connection-editor/ce-page.c:201
-msgid ""
-"Insufficient privileges or unknown error retrieving system connection "
-"secrets."
-msgstr "è?·å??ç³»ç»?è¿?æ?¥ secret æ?¶æ??é??ä¸?å¤?æ??å??ç??äº?æ?ªç?¥é??误ã??"
-
-#: ../src/connection-editor/ce-page.c:236
+#: ../src/connection-editor/ce-page.c:215
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "ç?±äº?ä¸?个æ?ªç?¥é??误ï¼?æ?´æ?°è¿?æ?¥ secret æ?¶å¤±è´¥ã??"
 
-#: ../src/connection-editor/ce-page.c:269
-msgid "Could not request secrets from the system settings service."
-msgstr "æ? æ³?ä»?ç³»ç»?设å®?æ??å?¡è¯·æ±? secretã??"
-
-#: ../src/connection-editor/ce-page.c:299
-msgid "Could not connect to D-Bus to request connection secrets."
-msgstr "æ? æ³?è¿?æ?¥å?° D-Bus 以请æ±?è¿?æ?¥ secretã??"
-
-#: ../src/connection-editor/ce-page.c:312
-msgid "Could not create D-Bus proxy for connection secrets."
-msgstr "æ? æ³?为è¿?æ?¥ secret 建ç«? 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-dsl.glade.h:3
+msgid "_Service:"
+msgstr "æ??å?¡(_S)ï¼?"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:1
+#: ../src/connection-editor/ce-page-ip6.glade.h:1
 msgid "<b>Addresses</b>"
 msgstr "<b>å?°å??</b>"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:2
+#: ../src/connection-editor/ce-page-ip6.glade.h:2
 msgid ""
 "Automatic\n"
 "Automatic with manual DNS settings\n"
@@ -888,44 +903,61 @@ msgid ""
 "Shared to other computers"
 msgstr ""
 "��\n"
-"è?ªå?¨ (æ??å?¨è®¾ç½® DNS)\n"
+"è?ªå?¨(æ??å?¨è®¾ç½® DNS)\n"
 "æ??å?¨\n"
 "����\n"
 "���计���享"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:7
-msgid "DHCP Client ID:"
-msgstr "DHCP 客�端 ID:"
+msgid "D_HCP client ID:"
+msgstr "D_HCP 客�端 ID�"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:8
-msgid "DNS Servers:"
-msgstr "DNS æ??å?¡å?¨:"
+#: ../src/connection-editor/ce-page-ip6.glade.h:7
+msgid ""
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
+msgstr "IP å?°å??å?¯å?¨ç½?ç»?ä¸?æ ?è¯?æ?¨ç??计ç®?æ?ºã??å??å?»â??æ·»å? â??æ??é?®æ·»å? ä¸?个 IP å?°å??ã??"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:9
+#: ../src/connection-editor/ce-page-ip6.glade.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "å¦?å?¯ç?¨ï¼?æ­¤è¿?æ?¥å°?ä¸?ä¼?被ç?¨äº?é»?认ç½?ç»?è¿?æ?¥ã??"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:10
-msgid "Ignore automatically obtained routes"
-msgstr "忽ç?¥è?ªå?¨è?·å??ç??è·¯ç?±"
+#: ../src/connection-editor/ce-page-ip6.glade.h:9
+msgid "Ig_nore automatically obtained routes"
+msgstr "忽ç?¥è?ªå?¨è?·å??ç??è·¯ç?±(_N)"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:11
-msgid "Method:"
-msgstr "��:"
+#: ../src/connection-editor/ce-page-ip6.glade.h:10
+msgid "Use this c_onnection only for resources on its network"
+msgstr "ä»?å°?æ­¤è¿?æ?¥ç?¨äº?ç?¸å¯¹åº?ç??ç½?ç»?ä¸?ç??èµ?æº?(_O)"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:12
-msgid "Routes..."
-msgstr "路�..."
+#: ../src/connection-editor/ce-page-ip6.glade.h:11
+msgid "_DNS servers:"
+msgstr "_DNS æ??å?¡å?¨ï¼?"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:13
-msgid "Search Domains:"
-msgstr "æ??ç´¢å??:"
+#: ../src/connection-editor/ce-page-ip6.glade.h:12
+msgid "_Method:"
+msgstr "��(_M)�"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:14
-msgid "Use this connection only for resources on its network"
-msgstr "ä»?å°?æ­¤è¿?æ?¥ç?¨äº?ç?¸å¯¹åº?ç??ç½?ç»?ä¸?ç??èµ?æº?"
+msgid "_Routesâ?¦"
+msgstr "路�(_R)..."
+
+#: ../src/connection-editor/ce-page-ip4.glade.h:15
+#: ../src/connection-editor/ce-page-ip6.glade.h:14
+msgid "_Search domains:"
+msgstr "æ??ç´¢å??(_S)ï¼?"
+
+#: ../src/connection-editor/ce-page-ip6.glade.h:13
+msgid "_Routes&#x2026;"
+msgstr "路�&#x2026;(_R)"
 
 #: ../src/connection-editor/ce-page-mobile.glade.h:1
 msgid "<b>Advanced</b>"
@@ -936,10 +968,6 @@ 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"
@@ -953,29 +981,37 @@ msgstr ""
 "ä¼?å??使ç?¨ 3G (UMTS/HSPA)\n"
 "ä¼?å??使ç?¨ 2G (GPRS/EDGE)"
 
+#: ../src/connection-editor/ce-page-mobile.glade.h:8
+msgid "Change..."
+msgstr "æ?´æ?¹..."
+
 #: ../src/connection-editor/ce-page-mobile.glade.h:9
-msgid "Band:"
-msgstr "波段:"
+msgid "N_etwork:"
+msgstr "ç½?ç»?(_E)ï¼?"
 
 #: ../src/connection-editor/ce-page-mobile.glade.h:10
-msgid "Network:"
-msgstr "ç½?ç»?:"
+msgid "Nu_mber:"
+msgstr "ç¼?å?·(_M)ï¼?"
 
 #: ../src/connection-editor/ce-page-mobile.glade.h:11
-msgid "Number:"
-msgstr "ç¼?å?·:"
+msgid "PI_N:"
+msgstr "PI_Nï¼?"
 
 #: ../src/connection-editor/ce-page-mobile.glade.h:12
-msgid "PIN:"
-msgstr "PIN:"
+msgid "PU_K:"
+msgstr "PU_Kï¼?"
 
 #: ../src/connection-editor/ce-page-mobile.glade.h:13
-msgid "PUK:"
-msgstr "PUK:"
+msgid "Sho_w passwords"
+msgstr "æ?¾ç¤ºå¯?ç ?(_W)"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:14
+msgid "_APN:"
+msgstr "_APNï¼?"
 
 #: ../src/connection-editor/ce-page-mobile.glade.h:15
-msgid "Show passwords"
-msgstr "æ?¾ç¤ºå¯?ç ?"
+msgid "_Band:"
+msgstr "波段(_B)�"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:1
 msgid "<b>Allowed Authentication Methods</b>"
@@ -1002,87 +1038,80 @@ msgstr ""
 "ç?¨ä¸?äº?æ?¹æ³?ç??æ?¯æ??ã??</i>"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:6
-msgid "Allow BSD data compression"
-msgstr "å??许 BSD æ?°æ?®å??缩"
+msgid "Allow _BSD data compression"
+msgstr "å??许 _BSD æ?°æ?®å??缩"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:7
-msgid "Allow Deflate data compression"
-msgstr "å??许 Deflate æ?°æ?®å??缩"
+msgid "Allow _Deflate data compression"
+msgstr "å??许 _Deflate æ?°æ?®å??缩"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:8
 msgid "Allowed methods:"
-msgstr "å??许ç??æ?¹æ³?:"
+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"
+msgid "C_HAP"
+msgstr "C_HAP"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:10
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "æ??æ??æ?¡æ??认è¯?å??è®®"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:11
-msgid "Configure Methods..."
-msgstr "é??ç½®æ?¹æ³?..."
+msgid "Configure _Methodsâ?¦"
+msgstr "é??ç½®æ?¹æ³?(_M)..."
 
 #: ../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:13
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
+
 #: ../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"
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "微软æ??æ??æ?¡æ??认è¯?å??è®®"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:15
-msgid "MSCHAP v2"
-msgstr "MSCHAP v2"
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "微软æ??æ??æ?¡æ??认è¯?å??议第äº?ç??"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:16
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "微软æ??æ??æ?¡æ??认è¯?å??è®®"
+msgid "Password Authentication Protocol"
+msgstr "å¯?ç ?认è¯?å??è®®"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:17
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "微软æ??æ??æ?¡æ??认è¯?å??议第äº?ç??"
+msgid "Send PPP _echo packets"
+msgstr "å??é?? PPP å??å??å??(_E)"
 
 #: ../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"
+msgid "Use TCP _header compression"
+msgstr "使ç?¨ TCP 头å??缩(_H)"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:19
-msgid "Password Authentication Protocol"
-msgstr "å¯?ç ?认è¯?å??è®®"
+msgid "Use _stateful MPPE"
+msgstr "使ç?¨å¸¦æ??ç?¶æ??ç?? MPPE(_S)"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:20
-msgid "Require 128-bit encryption"
-msgstr "é??è¦? 128 ä½?å? å¯?"
+msgid "_EAP"
+msgstr "_EAP"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:21
-msgid "Send PPP echo packets"
-msgstr "å??é?? PPP å??å??å??"
+msgid "_MSCHAP"
+msgstr "_MSCHAP"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:22
-msgid "Use Point-to-Point Encryption (MPPE)"
-msgstr "使ç?¨ç?¹å?°ç?¹å? å¯? (MPPE)"
+msgid "_PAP"
+msgstr "_PAP"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:23
-msgid "Use Stateful MPPE"
-msgstr "使ç?¨å¸¦æ??ç?¶æ??ç?? MPPE"
+msgid "_Require 128-bit encryption"
+msgstr "é??è¦? 128 ä½?å? å¯?(_R)"
 
 #: ../src/connection-editor/ce-page-ppp.glade.h:24
-msgid "Use TCP header compression"
-msgstr "使ç?¨ TCP 头å??缩"
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr "使ç?¨ç?¹å?°ç?¹å? å¯? (MPPE)(_U)"
 
 #: ../src/connection-editor/ce-page-wired.glade.h:1
 msgid "Aut_onegotiate"
@@ -1111,10 +1140,10 @@ msgid ""
 "Media Independent Interface (MII)"
 msgstr ""
 "��\n"
-"å??ç»?线 (TP)\n"
-"é??件æ?¥å?£ (AUI)\n"
+"å??ç»?线(TP)\n"
+"é??件æ?¥å?£(AUI)\n"
 "BNC\n"
-"ä»?è´¨æ? å?³æ?¥å?£ (MII)"
+"ä»?è´¨æ? å?³æ?¥å?£(MII)"
 
 #: ../src/connection-editor/ce-page-wired.glade.h:12
 msgid "Full duple_x"
@@ -1123,20 +1152,20 @@ 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:"
+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 å?°å??(_M):"
+msgstr "MAC å?°å??(_M)ï¼?"
 
 #: ../src/connection-editor/ce-page-wired.glade.h:15
 msgid "_Port:"
-msgstr "端�(_P):"
+msgstr "端�(_P)�"
 
 #: ../src/connection-editor/ce-page-wired.glade.h:16
 msgid "_Speed:"
-msgstr "é??度(_S):"
+msgstr "é??度(_S)ï¼?"
 
 #: ../src/connection-editor/ce-page-wired.glade.h:17
 #: ../src/connection-editor/ce-page-wireless.glade.h:16
@@ -1155,11 +1184,11 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:4
 msgid "Ban_d:"
-msgstr "波段(_D):"
+msgstr "波段(_D)�"
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:5
 msgid "C_hannel:"
-msgstr "é¢?é??(_H):"
+msgstr "é¢?é??(_H)ï¼?"
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:6
 msgid ""
@@ -1171,7 +1200,7 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:9
 msgid "M_ode:"
-msgstr "模�(_O):"
+msgstr "模�(_O)�"
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:10
 msgid "Mb/s"
@@ -1179,24 +1208,28 @@ msgstr "Mb/�"
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:11
 msgid "Transmission po_wer:"
-msgstr "ä¼ è¾?è?½é??(_W):"
+msgstr "ä¼ è¾?è?½é??(_W)ï¼?"
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:12
 msgid "_BSSID:"
-msgstr "_BSSID:"
+msgstr "_BSSIDï¼?"
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:14
 msgid "_Rate:"
-msgstr "é??ç??(_R):"
+msgstr "é??ç??(_R)ï¼?"
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:15
 msgid "_SSID:"
-msgstr "_SSID:"
+msgstr "_SSIDï¼?"
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:17
 msgid "mW"
 msgstr "mW"
 
+#: ../src/connection-editor/ce-page-wireless-security.glade.h:1
+msgid "_Security:"
+msgstr "���(_S)�"
+
 #: ../src/connection-editor/ce-vpn-wizard.glade.h:2
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Choose a VPN Connection Type</span>\n"
@@ -1211,13 +1244,15 @@ msgstr ""
 "æ?¨å?¯è?½æ²¡æ??å®?è£?正确ç?? VPN æ??件ã??"
 
 #: ../src/connection-editor/ce-vpn-wizard.glade.h:5
-msgid "Create..."
-msgstr "建�..."
+msgid "Createâ?¦"
+msgstr "�建..."
 
 #: ../src/connection-editor/ip4-routes-dialog.c:501
+#: ../src/connection-editor/ip6-routes-dialog.c:459
 #: ../src/connection-editor/page-ip4.c:634
+#: ../src/connection-editor/page-ip6.c:611
 msgid "Address"
-msgstr "å?°å??:"
+msgstr "å?°å??"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:517
 #: ../src/connection-editor/page-ip4.c:650
@@ -1225,82 +1260,87 @@ msgid "Netmask"
 msgstr "å­?ç½?æ?©ç ?"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:533
+#: ../src/connection-editor/ip6-routes-dialog.c:491
 #: ../src/connection-editor/page-ip4.c:666
 msgid "Gateway"
 msgstr "ç½?å?³"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:549
+#: ../src/connection-editor/ip6-routes-dialog.c:507
 msgid "Metric"
 msgstr "��"
 
-#: ../src/connection-editor/mobile-wizard.c:73
-msgid "Installed GSM device"
-msgstr "å·²å®?è£?ç?? GSM 设å¤?"
+#: ../src/connection-editor/ip6-routes-dialog.c:475
+#: ../src/connection-editor/page-ip6.c:627
+msgid "Prefix"
+msgstr "å??ç¼?"
 
-#: ../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
+#: ../src/connection-editor/page-dsl.c:153
+#: ../src/connection-editor/page-dsl.c:160
 msgid "Could not load DSL user interface."
 msgstr "æ? æ³?å? è½½ DSL ç?¨æ?·ç??é?¢ã??"
 
-#: ../src/connection-editor/page-dsl.c:165
+#: ../src/connection-editor/page-dsl.c:166
 #: ../src/connection-editor/nm-connection-editor.glade.h:4
-#: ../src/connection-editor/nm-connection-list.c:1818
+#: ../src/connection-editor/nm-connection-list.c:1366
 msgid "DSL"
 msgstr "DSL"
 
+#: ../src/connection-editor/page-dsl.c:256
+#, c-format
+msgid "DSL connection %d"
+msgstr "DSL è¿?æ?¥ %d"
+
 #: ../src/connection-editor/page-ip4.c:116
+#: ../src/connection-editor/page-ip6.c:114
 msgid "Automatic (VPN)"
-msgstr "�� (VPN)"
+msgstr "��(VPN)"
 
 #: ../src/connection-editor/page-ip4.c:117
+#: ../src/connection-editor/page-ip6.c:115
 msgid "Automatic (VPN) addresses only"
-msgstr "è?ªå?¨ (VPN) ä»?å?°å??"
+msgstr "è?ªå?¨(VPN)ä»?å?°å??"
 
 #: ../src/connection-editor/page-ip4.c:120
+#: ../src/connection-editor/page-ip6.c:118
 msgid "Automatic (PPP)"
-msgstr "�� (PPP)"
+msgstr "��(PPP)"
 
 #: ../src/connection-editor/page-ip4.c:121
+#: ../src/connection-editor/page-ip6.c:119
 msgid "Automatic (PPP) addresses only"
-msgstr "è?ªå?¨ (PPP) ä»?å?°å??"
+msgstr "è?ªå?¨(PPP)ä»?å?°å??"
 
 #: ../src/connection-editor/page-ip4.c:123
+#: ../src/connection-editor/page-ip6.c:121
 msgid "Automatic (PPPoE)"
-msgstr "�� (PPPoE)"
+msgstr "��(PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:124
+#: ../src/connection-editor/page-ip6.c:122
 msgid "Automatic (PPPoE) addresses only"
-msgstr "è?ªå?¨ (PPPoE) ä»?å?°å??"
+msgstr "è?ªå?¨(PPPoE)ä»?å?°å??"
 
 #: ../src/connection-editor/page-ip4.c:126
 msgid "Automatic (DHCP)"
-msgstr "�� (DHCP)"
+msgstr "��(DHCP)"
 
 #: ../src/connection-editor/page-ip4.c:127
 msgid "Automatic (DHCP) addresses only"
-msgstr "è?ªå?¨ (DHCP) ä»?å?°å??"
+msgstr "è?ªå?¨(DHCP)ä»?å?°å??"
 
 #: ../src/connection-editor/page-ip4.c:152
+#: ../src/connection-editor/page-ip6.c:162
 msgid "Manual"
 msgstr "æ??å?¨"
 
 #: ../src/connection-editor/page-ip4.c:164
+#: ../src/connection-editor/page-ip6.c:175
 msgid "Link-Local Only"
 msgstr "�����"
 
 #: ../src/connection-editor/page-ip4.c:170
+#: ../src/connection-editor/page-ip6.c:182
 msgid "Shared to other computers"
 msgstr "���计���享"
 
@@ -1318,21 +1358,86 @@ msgstr "æ? æ³?å? è½½ IPv4 ç?¨æ?·ç??é?¢ã??"
 msgid "IPv4 Settings"
 msgstr "IPv4 设置"
 
-#: ../src/connection-editor/page-mobile.c:295
-#: ../src/connection-editor/page-mobile.c:302
+#: ../src/connection-editor/page-ip6.c:124
+msgid "Automatic"
+msgstr "��"
+
+#: ../src/connection-editor/page-ip6.c:125
+msgid "Automatic, addresses only"
+msgstr "è?ªå?¨ï¼?ä»?å?°å??"
+
+#: ../src/connection-editor/page-ip6.c:137
+#: ../src/wireless-security/eap-method.c:175
+msgid "Ignore"
+msgstr "忽�"
+
+#: ../src/connection-editor/page-ip6.c:574
+#, c-format
+msgid "Editing IPv6 routes for %s"
+msgstr "æ­£å?¨ç¼?è¾? %s ç?? IPv6 è·¯ç?±"
+
+#: ../src/connection-editor/page-ip6.c:667
+#: ../src/connection-editor/page-ip6.c:674
+msgid "Could not load IPv6 user interface."
+msgstr "æ? æ³?å? è½½ IPv6 ç?¨æ?·ç??é?¢ã??"
+
+#: ../src/connection-editor/page-ip6.c:680
+msgid "IPv6 Settings"
+msgstr "IPv6 设置"
+
+#: ../src/connection-editor/page-mobile.c:365
+#: ../src/connection-editor/page-mobile.c:372
 msgid "Could not load mobile broadband user interface."
 msgstr "æ? æ³?å? 载移å?¨å®½å¸¦ç?¨æ?·ç??é?¢ã??"
 
-#: ../src/connection-editor/page-mobile.c:320
+#: ../src/connection-editor/page-mobile.c:390
 msgid "Unsupported mobile broadband connection type."
 msgstr "ä¸?æ?¯æ??ç??移å?¨å®½å¸¦è¿?æ?¥ç±»å??ã??"
 
+#. Fall back to just asking for GSM vs. CDMA
+#: ../src/connection-editor/page-mobile.c:632
+msgid "Select Mobile Broadband Provider Type"
+msgstr "é??æ?©ç§»å?¨å®½å¸¦æ??ä¾?å??ç±»å??"
+
+#: ../src/connection-editor/page-mobile.c:659
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
+msgstr "é??æ?©æ?¨ç??移å?¨å®½å¸¦æ??ä¾?å??使ç?¨ç??æ??æ?¯ã??å¦?ä¸?ç¡®å®?ï¼?请询é?®æ?¨ç??æ??ä¾?å??ã??"
+
+#: ../src/connection-editor/page-mobile.c:664
+msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
+msgstr "æ??ç??æ??ä¾?å??使ç?¨å?ºäº? _GSM ç??æ??æ?¯(å?³: GPRS, EDGE, UMTS, HSDPA)"
+
+#: ../src/connection-editor/page-mobile.c:669
+msgid "My provider uses _CDMA-based technology (i.e. 1xRTT, EVDO)"
+msgstr "æ??ç??æ??ä¾?å??使ç?¨å?ºäº? _CDMA ç??æ??æ?¯(å?³ï¼?1xRTT, EVDO)"
+
+#: ../src/connection-editor/page-ppp.c:132
+msgid "EAP"
+msgstr "EAP"
+
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:223
+msgid "PAP"
+msgstr "PAP"
+
+#: ../src/connection-editor/page-ppp.c:134
+#: ../src/wireless-security/eap-method-ttls.c:268
+msgid "CHAP"
+msgstr "CHAP"
+
 #: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-peap.c:229
+#: ../src/wireless-security/eap-method-peap.c:240
 #: ../src/wireless-security/eap-method-ttls.c:253
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
+#: ../src/connection-editor/page-ppp.c:136
+#: ../src/wireless-security/eap-method-ttls.c:238
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
 #. Translators: "none" refers to authentication methods
 #: ../src/connection-editor/page-ppp.c:139
 msgid "none"
@@ -1354,14 +1459,20 @@ msgstr "PPP 设置"
 
 #: ../src/connection-editor/page-vpn.c:105
 #: ../src/connection-editor/nm-connection-editor.glade.h:8
-#: ../src/connection-editor/nm-connection-list.c:1815
+#: ../src/connection-editor/nm-connection-list.c:1362
 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 æ??件æ??å?¡ã??"
+msgstr "æ? æ³?æ?¾å?°å?¯ç?¨äº?â??%sâ??ç?? VPN æ??件æ??å?¡ã??"
+
+#: ../src/connection-editor/page-vpn.c:212
+#: ../src/connection-editor/nm-connection-list.c:948
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN è¿?æ?¥ %d"
 
 #: ../src/connection-editor/page-wired.c:204
 #: ../src/connection-editor/page-wired.c:211
@@ -1370,10 +1481,15 @@ 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
+#: ../src/connection-editor/nm-connection-list.c:1350
 msgid "Wired"
 msgstr "æ??线"
 
+#: ../src/connection-editor/page-wired.c:340
+#, c-format
+msgid "Wired connection %d"
+msgstr "æ??线è¿?æ?¥ %d"
+
 #: ../src/connection-editor/page-wired-security.c:112
 msgid "802.1x Security"
 msgstr "802.1x ���"
@@ -1399,32 +1515,37 @@ 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
+#: ../src/connection-editor/nm-connection-list.c:1354
 msgid "Wireless"
 msgstr "æ? 线"
 
+#: ../src/connection-editor/page-wireless.c:512
+#, c-format
+msgid "Wireless connection %d"
+msgstr "æ? 线è¿?æ?¥ %d"
+
 #: ../src/connection-editor/page-wireless-security.c:262
-#: ../src/wireless-dialog.c:794
+#: ../src/wireless-dialog.c:806
 msgid "WEP 40/128-bit Key"
 msgstr "WEP 40/128 ���"
 
 #: ../src/connection-editor/page-wireless-security.c:271
-#: ../src/wireless-dialog.c:803
+#: ../src/wireless-dialog.c:815
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 ä½?å¯?ç ?å?¥"
 
 #: ../src/connection-editor/page-wireless-security.c:297
-#: ../src/wireless-dialog.c:833
+#: ../src/wireless-dialog.c:845
 msgid "Dynamic WEP (802.1x)"
 msgstr "å?¨æ?? WEP (802.1x)"
 
 #: ../src/connection-editor/page-wireless-security.c:311
-#: ../src/wireless-dialog.c:847
+#: ../src/wireless-dialog.c:859
 msgid "WPA & WPA2 Personal"
 msgstr "WPA å?? WPA2 个人"
 
 #: ../src/connection-editor/page-wireless-security.c:325
-#: ../src/wireless-dialog.c:861
+#: ../src/wireless-dialog.c:873
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA å?? WPA2 ä¼?ä¸?"
 
@@ -1441,63 +1562,47 @@ msgstr "æ? æ³?å? è½½ WiFi å®?å?¨æ?§ç?¨æ?·ç??é?¢ã??"
 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
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "正��� %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "ç¼?è¾?æ?ªå?½å??è¿?æ?¥"
 
-#: ../src/connection-editor/nm-connection-editor.c:296
+#: ../src/connection-editor/nm-connection-editor.c:276
 msgid ""
 "The connection editor could not find some required resources (the "
 "NetworkManager applet glade file was not found)."
 msgstr ""
 "è¿?æ?¥ç¼?è¾?å?¨æ?¾ä¸?å?°æ??é??ç??èµ?æº? (æ?ªæ?¾å?° NetworkManager å°?ç¨?åº?ç?? glade æ??件)ã??"
 
-#: ../src/connection-editor/nm-connection-editor.c:309
+#: ../src/connection-editor/nm-connection-editor.c:289
 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 "��..."
+msgstr "è¿?æ?¥ç¼?è¾?å?¨æ?¾ä¸?å?°æ??é??ç??èµ?æº?(æ?ªæ?¾å?° glade æ??件)ã??"
 
-#: ../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:358
+msgid "Error creating connection editor dialog."
+msgstr "å??建è¿?æ?¥ç¼?è¾?å?¨å¯¹è¯?æ¡?å?ºé??ã??"
 
-#: ../src/connection-editor/nm-connection-editor.c:327
+#: ../src/connection-editor/nm-connection-editor.c:379
 msgid "Apply"
 msgstr "��"
 
-#: ../src/connection-editor/nm-connection-editor.c:328
+#: ../src/connection-editor/nm-connection-editor.c:380
 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.c:381
+msgid "Apply..."
+msgstr "��..."
+
+#: ../src/connection-editor/nm-connection-editor.c:382
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr "为æ?¬æ?ºæ??æ??ç?¨æ?·ä¿?å­?æ­¤è¿?æ?¥é??è¦?认è¯?ã??"
 
 #: ../src/connection-editor/nm-connection-editor.glade.h:1
 msgid "Available to all users"
@@ -1519,153 +1624,95 @@ msgstr "导�(_X)"
 msgid "_Import"
 msgstr "导�(_I)"
 
-#: ../src/connection-editor/nm-connection-list.c:199
+#: ../src/connection-editor/nm-connection-list.c:219
 msgid "never"
 msgstr "��"
 
-#: ../src/connection-editor/nm-connection-list.c:210
-#: ../src/connection-editor/nm-connection-list.c:221
+#: ../src/connection-editor/nm-connection-list.c:230
+#: ../src/connection-editor/nm-connection-list.c:241
 msgid "now"
 msgstr "ç?°å?¨"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:228
+#: ../src/connection-editor/nm-connection-list.c:248
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d å??é??以å??"
 
-#: ../src/connection-editor/nm-connection-list.c:232
+#: ../src/connection-editor/nm-connection-list.c:252
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d å°?æ?¶ä»¥å??"
 
-#: ../src/connection-editor/nm-connection-list.c:244
+#: ../src/connection-editor/nm-connection-list.c:264
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以å??"
 
-#: ../src/connection-editor/nm-connection-list.c:250
+#: ../src/connection-editor/nm-connection-list.c:270
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 个æ??以å??"
 
-#: ../src/connection-editor/nm-connection-list.c:254
+#: ../src/connection-editor/nm-connection-list.c:274
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年以å??"
 
-#: ../src/connection-editor/nm-connection-list.c:320
-#: ../src/connection-editor/nm-connection-list.c:452
-msgid "Could not obtain required privileges"
-msgstr "æ? æ³?è?·å??æ??é??ç?¹æ??"
-
-#: ../src/connection-editor/nm-connection-list.c:325
-msgid "Could not delete connection"
-msgstr "æ? æ³?å? é?¤è¿?æ?¥"
-
-#: ../src/connection-editor/nm-connection-list.c:326
-msgid "The connection could not be deleted due to an unknown error."
-msgstr "ç?±äº?ä¸?个æ?ªç?¥é??误ï¼?è¿?æ?¥æ? æ³?被å? é?¤ã??"
-
-#: ../src/connection-editor/nm-connection-list.c:362
-#: ../src/connection-editor/nm-connection-list.c:373
-msgid "Could not move connection"
-msgstr "æ? æ³?移å?¨è¿?æ?¥"
-
-#: ../src/connection-editor/nm-connection-list.c:457
-#: ../src/connection-editor/nm-connection-list.c:506
-#: ../src/connection-editor/nm-connection-list.c:517
-msgid "Could not add connection"
-msgstr "æ? æ³?æ·»å? è¿?æ?¥"
-
-#: ../src/connection-editor/nm-connection-list.c:458
-msgid "The connection could not be added due to an unknown error."
-msgstr "ç?±äº?ä¸?个æ?ªç?¥é??误ï¼?è¿?æ?¥æ? æ³?被添å? ã??"
-
-#: ../src/connection-editor/nm-connection-list.c:631
-#: ../src/connection-editor/nm-connection-list.c:636
-#: ../src/connection-editor/nm-connection-list.c:696
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "Could not update connection"
-msgstr "æ? æ³?æ?´æ?°è¿?æ?¥"
-
-#: ../src/connection-editor/nm-connection-list.c:637
-msgid "The connection could not be updated due to an unknown error."
-msgstr "ç?±äº?ä¸?个æ?ªç?¥é??误ï¼?è¿?æ?¥æ? æ³?被æ?´æ?°ã??"
-
-#: ../src/connection-editor/nm-connection-list.c:728
-#: ../src/connection-editor/nm-connection-list.c:1056
+#: ../src/connection-editor/nm-connection-list.c:583
+msgid "Connection add failed"
+msgstr "æ·»å? è¿?æ?¥å¤±è´¥"
+
+#: ../src/connection-editor/nm-connection-list.c:594
+#: ../src/connection-editor/nm-connection-list.c:713
 msgid "An unknown error ocurred."
 msgstr "å??ç??äº?ä¸?个æ?ªç?¥é??误ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:737
-#: ../src/connection-editor/nm-connection-list.c:1063
+#: ../src/connection-editor/nm-connection-list.c:603
+#: ../src/connection-editor/nm-connection-list.c:756
 msgid "Error initializing editor"
 msgstr "å??å§?å??ç¼?è¾?å?¨é??误"
 
-#: ../src/connection-editor/nm-connection-list.c:845
-#, c-format
-msgid "Wired connection %d"
-msgstr "æ??线è¿?æ?¥ %d"
-
-#: ../src/connection-editor/nm-connection-list.c:857
-#, c-format
-msgid "Wireless connection %d"
-msgstr "æ? 线è¿?æ?¥ %d"
-
-#: ../src/connection-editor/nm-connection-list.c:876
-#, c-format
-msgid "GSM connection %d"
-msgstr "GSM è¿?æ?¥ %d"
-
-#: ../src/connection-editor/nm-connection-list.c:895
-#, c-format
-msgid "CDMA connection %d"
-msgstr "CDMA è¿?æ?¥ %d"
-
-#: ../src/connection-editor/nm-connection-list.c:922
-#: ../src/connection-editor/nm-connection-list.c:1324
-#, c-format
-msgid "VPN connection %d"
-msgstr "VPN è¿?æ?¥ %d"
-
-#: ../src/connection-editor/nm-connection-list.c:936
-#, c-format
-msgid "DSL connection %d"
-msgstr "DSL è¿?æ?¥ %d"
-
-#: ../src/connection-editor/nm-connection-list.c:998
-#: ../src/connection-editor/nm-connection-list.c:1098
-#: ../src/connection-editor/nm-connection-list.c:1313
+#: ../src/connection-editor/nm-connection-list.c:619
+#: ../src/connection-editor/nm-connection-list.c:771
+#: ../src/connection-editor/nm-connection-list.c:931
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "ç?±äº?ä¸?个æ?ªç?¥é??误ï¼?è¿?æ?¥ç¼?è¾?å?¨å¯¹è¯?æ¡?æ? æ³?å??å§?å??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:1014
+#: ../src/connection-editor/nm-connection-list.c:628
+msgid "Could not create new connection"
+msgstr "æ? æ³?建ç«?æ?°è¿?æ?¥"
+
+#: ../src/connection-editor/nm-connection-list.c:639
 msgid "Could not edit new connection"
 msgstr "æ? æ³?ç¼?è¾?æ?°è¿?æ?¥"
 
-#: ../src/connection-editor/nm-connection-list.c:1118
+#: ../src/connection-editor/nm-connection-list.c:786
 msgid "Could not edit connection"
 msgstr "æ? æ³?ç¼?è¾?è¿?æ?¥"
 
-#: ../src/connection-editor/nm-connection-list.c:1177
+#: ../src/connection-editor/nm-connection-list.c:811
+msgid "Connection delete failed"
+msgstr "å? é?¤è¿?æ?¥å¤±è´¥"
+
+#: ../src/connection-editor/nm-connection-list.c:835
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
-msgstr "æ?¯å?¦ç¡®è®¤å? é?¤è¿?æ?¥ %s?"
+msgstr "æ?¯å?¦ç¡®è®¤å? é?¤è¿?æ?¥ %sï¼?"
 
-#: ../src/connection-editor/nm-connection-list.c:1350
+#: ../src/connection-editor/nm-connection-list.c:978
 #: ../src/connection-editor/vpn-helpers.c:228
 msgid "Cannot import VPN connection"
 msgstr "æ? æ³?导å?¥ VPN è¿?æ?¥"
 
-#: ../src/connection-editor/nm-connection-list.c:1352
+#: ../src/connection-editor/nm-connection-list.c:980
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -1675,41 +1722,49 @@ msgstr ""
 "\n"
 "é??误: 没æ?? VPN æ??å?¡ç±»å??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:1366
+#: ../src/connection-editor/nm-connection-list.c:993
 msgid "Could not edit imported connection"
 msgstr "æ? æ³?ç¼?è¾?导å?¥ç??è¿?æ?¥"
 
-#: ../src/connection-editor/nm-connection-list.c:1689
-msgid "Edit..."
-msgstr "ç¼?è¾?..."
+#: ../src/connection-editor/nm-connection-list.c:1129
+msgid "Name"
+msgstr "å??称"
 
-#: ../src/connection-editor/nm-connection-list.c:1690
-msgid "Authenticate to edit the selected connection."
-msgstr "è¿?è¡?认è¯?以ç¼?è¾?é??中ç??è¿?æ?¥ã??"
+#: ../src/connection-editor/nm-connection-list.c:1141
+msgid "Last Used"
+msgstr "æ??å??使ç?¨ç??"
 
-#: ../src/connection-editor/nm-connection-list.c:1691
+#: ../src/connection-editor/nm-connection-list.c:1244
 msgid "Edit"
 msgstr "ç¼?è¾?"
 
-#: ../src/connection-editor/nm-connection-list.c:1692
-msgid "Edit the selected connection."
-msgstr "ç¼?è¾?é??中ç??è¿?æ?¥ã??"
+#: ../src/connection-editor/nm-connection-list.c:1245
+msgid "Edit the selected connection"
+msgstr "ç¼?è¾?é??中ç??è¿?æ?¥"
 
-#: ../src/connection-editor/nm-connection-list.c:1709
-msgid "Delete..."
-msgstr "å? é?¤..."
+#: ../src/connection-editor/nm-connection-list.c:1246
+msgid "Edit..."
+msgstr "ç¼?è¾?..."
 
-#: ../src/connection-editor/nm-connection-list.c:1710
-msgid "Authenticate to delete the selected connection."
-msgstr "è¿?è¡?认è¯?以å? é?¤é??中ç??è¿?æ?¥ã??"
+#: ../src/connection-editor/nm-connection-list.c:1247
+msgid "Authenticate to edit the selected connection"
+msgstr "è¿?è¡?认è¯?以ç¼?è¾?é??中ç??è¿?æ?¥"
 
-#: ../src/connection-editor/nm-connection-list.c:1711
+#: ../src/connection-editor/nm-connection-list.c:1261
 msgid "Delete"
 msgstr "å? é?¤"
 
-#: ../src/connection-editor/nm-connection-list.c:1712
-msgid "Delete the selected connection."
-msgstr "å? é?¤é??中ç??è¿?æ?¥ã??"
+#: ../src/connection-editor/nm-connection-list.c:1262
+msgid "Delete the selected connection"
+msgstr "å? é?¤é??中ç??è¿?æ?¥"
+
+#: ../src/connection-editor/nm-connection-list.c:1263
+msgid "Delete..."
+msgstr "å? é?¤..."
+
+#: ../src/connection-editor/nm-connection-list.c:1264
+msgid "Authenticate to delete the selected connection"
+msgstr "è¿?è¡?认è¯?以å? é?¤é??中ç??è¿?æ?¥"
 
 #: ../src/connection-editor/vpn-helpers.c:230
 #, c-format
@@ -1719,9 +1774,9 @@ msgid ""
 "\n"
 "Error: %s."
 msgstr ""
-"æ??件 '%s' ä¸?è?½è¢«è¯»å??ï¼?æ??ä¸?å??å?«å?¯è¯?å?«ç?? VPN è¿?æ?¥ä¿¡æ?¯\n"
+"æ??件â??%sâ??ä¸?è?½è¢«è¯»å??ï¼?æ??ä¸?å??å?«å?¯è¯?å?«ç?? VPN è¿?æ?¥ä¿¡æ?¯\n"
 "\n"
-"é??误: %sã??"
+"é??误ï¼?%sã??"
 
 #: ../src/connection-editor/vpn-helpers.c:262
 msgid "Select file to import"
@@ -1730,7 +1785,7 @@ msgstr "é??æ?©è¦?导å?¥ç??æ??件"
 #: ../src/connection-editor/vpn-helpers.c:310
 #, c-format
 msgid "A file named \"%s\" already exists."
-msgstr "å??为 \"%s\" ç??æ??件已å­?å?¨ã??"
+msgstr "å??为â??%sâ??ç??æ??件已å­?å?¨ã??"
 
 #: ../src/connection-editor/vpn-helpers.c:312
 msgid "_Replace"
@@ -1752,7 +1807,7 @@ msgid ""
 "\n"
 "Error: %s."
 msgstr ""
-"VPN è¿?æ?¥ '%s' æ? æ³?被导å?ºè?³ %sã??\n"
+"VPN è¿?æ?¥â??%sâ??æ? æ³?被导å?ºè?³ %sã??\n"
 "\n"
 "é??误: %sã??"
 
@@ -1760,7 +1815,168 @@ msgstr ""
 msgid "Export VPN connection..."
 msgstr "导� VPN ��"
 
-#: ../src/vpn-password-dialog.c:137 ../src/vpn-password-dialog.c:253
+#: ../src/gnome-bluetooth/network-manager-applet.c:197
+msgid "Access the Internet using your mobile phone"
+msgstr "使ç?¨æ?¨ç??æ??æ?ºè®¿é?® Internet"
+
+#: ../src/utils/mobile-wizard.c:196
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "æ?¨ç??移å?¨å®½å¸¦è¿?æ?¥å·²æ??以ä¸?设å®?é??ç½®ï¼?"
+
+#. Device
+#: ../src/utils/mobile-wizard.c:203
+msgid "Your Device:"
+msgstr "æ?¨ç??设å¤?ï¼?"
+
+#. Provider
+#: ../src/utils/mobile-wizard.c:214
+msgid "Your Provider:"
+msgstr "æ?¨ç??æ??ä¾?å??ï¼?"
+
+#. Plan and APN
+#: ../src/utils/mobile-wizard.c:225
+msgid "Your Plan:"
+msgstr "ä½ ç??计å??ï¼?"
+
+#: ../src/utils/mobile-wizard.c:246
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected.  If the connection fails or you cannot access network "
+"resources, double-check your settings.  To modify your mobile broadband "
+"connection settings, choose \"Network Connections\" from the System >> "
+"Preferences menu."
+msgstr ""
+"ç?°å°?æ??ç?§æ?¨æ??é??æ?©ç??设å®?建ç«?ä¸?个å?°æ?¨ç??移å?¨å®½å¸¦æ??ä¾?å??ç??è¿?æ?¥ã??å¦?æ??è¿?æ?¥å¤±è´¥æ??æ? æ³?"
+"访é?®ç½?ç»?èµ?æº?ï¼?请æ£?æ?¥æ?¨ç??设å®?ã??è¦?ä¿®æ?¹æ?¨ç??移å?¨å®½å¸¦è®¾å®?ï¼?å?¨ç³»ç»? >> é¦?é??项è??å??中"
+"é??æ?©â??ç½?ç»?è¿?æ?¥â??ã??"
+
+#: ../src/utils/mobile-wizard.c:258
+msgid "Confirm Mobile Broadband Settings"
+msgstr "确认移�宽带设�"
+
+#: ../src/utils/mobile-wizard.c:319
+msgid "Unlisted"
+msgstr "æ?ªå??å?º"
+
+#: ../src/utils/mobile-wizard.c:437
+msgid "_Select your plan:"
+msgstr "é??æ?©æ?¨ç??计å??(_S)ï¼?"
+
+#: ../src/utils/mobile-wizard.c:461
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "é??中ç??计å?? _APN (访é?®ç?¹å??称)ï¼?"
+
+#: ../src/utils/mobile-wizard.c:480
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan's APN."
+msgstr ""
+"è­¦å??: é??æ?©ä¸?个ä¸?正确ç??计å??å?¯è?½å¯¼è?´å®½å¸¦è´¦æ?·è´¹ç?¨é?®é¢?æ??æ? æ³?è¿?æ?¥ã??\n"
+"\n"
+"å¦?æ??æ?¨ä¸?ç¡®å®?æ?¨ç??计å??ï¼?请询é?®æ?¨ç??æ??ä¾?å??以è?·å??计å??ç?? APNã??"
+
+#: ../src/utils/mobile-wizard.c:487
+msgid "Choose your Billing Plan"
+msgstr "é??æ?©æ?¨ç??ä»?费计å??"
+
+#: ../src/utils/mobile-wizard.c:535
+msgid "My plan is not listed..."
+msgstr "æ??ç??计å??没æ??被å??å?º..."
+
+#: ../src/utils/mobile-wizard.c:688
+msgid "Select your provider from a _list:"
+msgstr "ä»?ä¸?个å??表中é??æ?©æ?¨ç??æ??ä¾?å??(_L)ï¼?"
+
+#: ../src/utils/mobile-wizard.c:701
+msgid "Provider"
+msgstr "æ??ä¾?å??"
+
+#: ../src/utils/mobile-wizard.c:726
+msgid "I can't find my provider and I wish to enter it _manually:"
+msgstr "æ?¾ä¸?å?°æ??ç??æ??ä¾?å??ï¼?å¸?æ??æ??å?¨è¾?å?¥(_M)ï¼?"
+
+#: ../src/utils/mobile-wizard.c:737
+msgid "Provider:"
+msgstr "æ??ä¾?å??ï¼?"
+
+#: ../src/utils/mobile-wizard.c:753
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "æ??ç??æ??ä¾?å??使ç?¨ GSM æ??æ?¯(GPRS, EDGE, UMTS, HSPA)"
+
+#: ../src/utils/mobile-wizard.c:755
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "æ??ç??æ??ä¾?å??使ç?¨ CDMA æ??æ?¯(1xRTT, EVDO)"
+
+#: ../src/utils/mobile-wizard.c:766
+msgid "Choose your Provider"
+msgstr "é??æ?©æ?¨ç??æ??ä¾?å??"
+
+#: ../src/utils/mobile-wizard.c:958
+msgid "Country List:"
+msgstr "å?½å®¶å??表ï¼?"
+
+#: ../src/utils/mobile-wizard.c:970
+msgid "Country"
+msgstr "�家"
+
+#: ../src/utils/mobile-wizard.c:1010
+msgid "Choose your Provider's Country"
+msgstr "é??æ?©æ?¨ç??æ??ä¾?å??ç??å?½å®¶"
+
+#: ../src/utils/mobile-wizard.c:1059
+msgid "Installed GSM device"
+msgstr "å·²å®?è£?ç?? GSM 设å¤?"
+
+#: ../src/utils/mobile-wizard.c:1062
+msgid "Installed CDMA device"
+msgstr "å·²å®?è£?ç?? CDMA 设å¤?"
+
+#: ../src/utils/mobile-wizard.c:1230
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr "æ­¤å?©æ??ç¨?åº?å?¯å¸®å?©æ?¨ç®?å??å?°è®¾ç½®ä¸?个å?°è??çª?(3G)ç½?ç»?ç??移å?¨å®½å¸¦è¿?æ?¥ã??"
+
+#: ../src/utils/mobile-wizard.c:1235
+msgid "You will need the following information:"
+msgstr "æ?¨å°?é??è¦?以ä¸?ä¿¡æ?¯ï¼?"
+
+#: ../src/utils/mobile-wizard.c:1246
+msgid "Your broadband provider's name"
+msgstr "æ?¨ç??宽带æ??ä¾?å??å??称"
+
+#: ../src/utils/mobile-wizard.c:1252
+msgid "Your broadband billing plan name"
+msgstr "æ?¨ç??宽带ä»?费计å??å??称"
+
+#: ../src/utils/mobile-wizard.c:1258
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(å?¨æ??äº?æ??å?µä¸?) æ?¨ç??宽带ä»?费计å?? APN(访é?®ç?¹å??称)"
+
+#: ../src/utils/mobile-wizard.c:1285
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "为此移å?¨å®½å¸¦è®¾å¤?å??建ä¸?个è¿?æ?¥(_T)ï¼?"
+
+#: ../src/utils/mobile-wizard.c:1300
+msgid "Any device"
+msgstr "任�设�"
+
+#: ../src/utils/mobile-wizard.c:1313
+msgid "Set up a Mobile Broadband Connection"
+msgstr "设置�个移�宽带��"
+
+#: ../src/utils/mobile-wizard.c:1487
+msgid "New Mobile Broadband Connection"
+msgstr "�移�宽带��"
+
+#: ../src/utils/nmn-mobile-providers.c:515
+msgid "Default"
+msgstr "�认"
+
+#: ../src/vpn-password-dialog.c:137 ../src/vpn-password-dialog.c:255
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "æ? æ³?å?¯å?¨ VPN è¿?æ?¥â??%sâ??"
@@ -1772,7 +1988,7 @@ msgid ""
 "Contact your system administrator."
 msgstr "æ?¾ä¸?å?° VPN è¿?æ?¥ç±»å??â??%sâ??ç??身份éª?è¯?对è¯?ã??请è??ç³»æ?¨ç??ç³»ç»?管ç??å??ã??"
 
-#: ../src/vpn-password-dialog.c:256
+#: ../src/vpn-password-dialog.c:258
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -1783,50 +1999,50 @@ msgstr "è°?ç?¨ VPN è¿?æ?¥ç±»å??â??%sâ??ç??身份éª?è¯?对è¯?æ??é?®é¢?ã??请è??
 msgid "Wired 802.1X authentication"
 msgstr "æ??线 802.1X 认è¯?"
 
-#: ../src/wireless-dialog.c:414
+#: ../src/wireless-dialog.c:426
 msgid "New..."
 msgstr "�建..."
 
-#: ../src/wireless-dialog.c:921
+#: ../src/wireless-dialog.c:934
 msgid "C_reate"
 msgstr "建�(_R)"
 
-#: ../src/wireless-dialog.c:992
+#: ../src/wireless-dialog.c:1011
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network '%"
 "s'."
-msgstr "é??è¦?å¯?ç ?æ??å¯?é?¥æ?¥è®¿é?®æ? 线ç½?ç»? '%s'ã??"
+msgstr "é??è¦?å¯?ç ?æ??å¯?é?¥æ?¥è®¿é?®æ? 线ç½?ç»?â??%sâ??ã??"
 
-#: ../src/wireless-dialog.c:994
+#: ../src/wireless-dialog.c:1013
 msgid "Wireless Network Authentication Required"
 msgstr "é??è¦?æ? 线ç½?ç»?认è¯?"
 
-#: ../src/wireless-dialog.c:996
+#: ../src/wireless-dialog.c:1015
 msgid "Authentication required by wireless network"
 msgstr "æ? 线ç½?ç»?é??è¦?认è¯?"
 
-#: ../src/wireless-dialog.c:1001
+#: ../src/wireless-dialog.c:1020
 msgid "Create New Wireless Network"
 msgstr "å??建æ?°ç??æ? 线ç½?ç»?"
 
-#: ../src/wireless-dialog.c:1003
+#: ../src/wireless-dialog.c:1022
 msgid "New wireless network"
 msgstr "æ?°æ? 线ç½?ç»?"
 
-#: ../src/wireless-dialog.c:1004
+#: ../src/wireless-dialog.c:1023
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "请为æ?¨å¸?æ??建ç«?ç??æ? 线ç½?ç»?è¾?å?¥ä¸?个å??称ã??"
 
-#: ../src/wireless-dialog.c:1006
+#: ../src/wireless-dialog.c:1025
 msgid "Connect to Hidden Wireless Network"
 msgstr "è¿?æ?¥å?°é??è??ç??æ? 线ç½?ç»?"
 
-#: ../src/wireless-dialog.c:1008
+#: ../src/wireless-dialog.c:1027
 msgid "Hidden wireless network"
 msgstr "é??è??ç??æ? 线ç½?ç»?"
 
-#: ../src/wireless-dialog.c:1009
+#: ../src/wireless-dialog.c:1028
 msgid ""
 "Enter the name and security details of the hidden wireless network you wish "
 "to connect to."
@@ -1842,55 +2058,136 @@ msgid ""
 "to insecure, rogue wireless networks.  Would you like to choose a "
 "Certificate Authority certificate?"
 msgstr ""
-"ä¸?使ç?¨è®¤è¯?中å¿? (CA) è¯?书å?¯è?½å¯¼è?´è¿?æ?¥å?°ä¸?å®?å?¨ç??ã??模ç³?ç??æ? 线ç½?ç»?ã??è¦?é??æ?©ä¸?个认"
-"è¯?中å¿?è¯?书å???"
-
-#: ../src/wireless-security/eap-method.c:175
-msgid "Ignore"
-msgstr "忽�"
+"ä¸?使ç?¨è®¤è¯?中å¿?(CA)è¯?书å?¯è?½å¯¼è?´è¿?æ?¥å?°ä¸?å®?å?¨ç??ã??模ç³?ç??æ? 线ç½?ç»?ã??è¦?é??æ?©ä¸?个认"
+"è¯?中å¿?è¯?书å??ï¼?"
 
 #: ../src/wireless-security/eap-method.c:179
 msgid "Choose CA Certificate"
 msgstr "é??æ?© CA è¯?书æ??件"
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:442
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER, PEM, æ?? PKCS#12 ç§?é?¥ (*.der, *.pem, *.p12)"
+msgstr "DERï¼?PEM æ?? PKCS#12 ç§?é?¥ (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:443
+#: ../src/wireless-security/eap-method.c:445
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER æ?? PEM è¯?书 (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:240
+#: ../src/wireless-security/eap-method-peap.c:255
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:311
-#: ../src/wireless-security/eap-method-tls.c:417
-#: ../src/wireless-security/eap-method-ttls.c:343
+#: ../src/wireless-security/eap-method-peap.c:270
+msgid "GTC"
+msgstr "GTC"
+
+#: ../src/wireless-security/eap-method-peap.c:346
+#: ../src/wireless-security/eap-method-tls.c:418
+#: ../src/wireless-security/eap-method-ttls.c:344
 msgid "Choose a Certificate Authority certificate..."
 msgstr "é??æ?©ä¸?个认è¯?中å¿?è¯?书..."
 
-#: ../src/wireless-security/eap-method-tls.c:413
+#: ../src/wireless-security/eap-method-tls.c:414
 msgid "Choose your personal certificate..."
 msgstr "é??æ?©æ?¨ç??个人è¯?书..."
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:423
 msgid "Choose your private key..."
 msgstr "é??æ?©æ?¨ç??ç§?é?¥..."
 
-#: ../src/wireless-security/wireless-security.c:305
+#: ../src/wireless-security/wireless-security.c:315
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:329
+#: ../src/wireless-security/wireless-security.c:339
 msgid "Tunneled TLS"
 msgstr "é?§é?? TLS"
 
-#: ../src/wireless-security/wireless-security.c:340
+#: ../src/wireless-security/wireless-security.c:350
 msgid "Protected EAP (PEAP)"
 msgstr "å??ä¿?æ?¤ç?? EAP (PEAP)"
 
+#~ msgid ""
+#~ "Insufficient privileges or unknown error retrieving system connection "
+#~ "secrets."
+#~ msgstr "è?·å??ç³»ç»?è¿?æ?¥ secret æ?¶æ??é??ä¸?å¤?æ??å??ç??äº?æ?ªç?¥é??误ã??"
+
+#~ msgid "Could not request secrets from the system settings service."
+#~ msgstr "æ? æ³?ä»?ç³»ç»?设å®?æ??å?¡è¯·æ±? secretã??"
+
+#~ msgid "Could not connect to D-Bus to request connection secrets."
+#~ msgstr "æ? æ³?è¿?æ?¥å?° D-Bus 以请æ±?è¿?æ?¥ secretã??"
+
+#~ msgid "Could not create D-Bus proxy for connection secrets."
+#~ msgstr "æ? æ³?为è¿?æ?¥ secret 建ç«? D-Bus 代ç??ã??"
+
+#~ msgid "PolicyKit authorization request was invalid."
+#~ msgstr "PolicyKit 认è¯?请æ±?ä¸?å??æ³?ã??"
+
+#~ msgid "PolicyKit authorization request was malformed."
+#~ msgstr "PolicyKit 认è¯?请æ±?为æ?¶æ??请æ±?ã??"
+
+#~ msgid "PolicyKit authorization could not be created."
+#~ msgstr "PolicyKit 认è¯?æ? æ³?建ç«?ã??"
+
+#~ msgid "PolicyKit authorization could not be created; invalid action ID."
+#~ msgstr "PolicyKit 认è¯?æ? æ³?建ç«?; é??æ³?å?¨ä½? IDã??"
+
+#~ msgid "Could not obtain required privileges"
+#~ msgstr "æ? æ³?è?·å??æ??é??ç?¹æ??"
+
+#~ msgid "Could not delete connection"
+#~ msgstr "æ? æ³?å? é?¤è¿?æ?¥"
+
+#~ msgid "The connection could not be deleted due to an unknown error."
+#~ msgstr "ç?±äº?ä¸?个æ?ªç?¥é??误ï¼?è¿?æ?¥æ? æ³?被å? é?¤ã??"
+
+#~ msgid "Could not move connection"
+#~ msgstr "æ? æ³?移å?¨è¿?æ?¥"
+
+#~ msgid "Could not add connection"
+#~ msgstr "æ? æ³?æ·»å? è¿?æ?¥"
+
+#~ msgid "The connection could not be added due to an unknown error."
+#~ msgstr "ç?±äº?ä¸?个æ?ªç?¥é??误ï¼?è¿?æ?¥æ? æ³?被添å? ã??"
+
+#~ msgid "Could not update connection"
+#~ msgstr "æ? æ³?æ?´æ?°è¿?æ?¥"
+
+#~ msgid "The connection could not be updated due to an unknown error."
+#~ msgstr "ç?±äº?ä¸?个æ?ªç?¥é??误ï¼?è¿?æ?¥æ? æ³?被æ?´æ?°ã??"
+
+#~ msgid "User Name:"
+#~ msgstr "ç?¨æ?·å??ï¼?"
+
+#~ msgid "alert text"
+#~ msgstr "è­¦å??æ??æ?¬"
+
+#~ 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"
+#~ "é??æ?©æ??è¿?æ?¥æ?¨è¦?为æ?°ç§»å?¨å®½å¸¦è¿?æ?¥ä½¿ç?¨ç??移å?¨å®½å¸¦è®¾å¤?ã??å¦?设å¤?ä¸?å?¯ç?¨ï¼?æ?¨å?¯ä»¥é??æ?©"
+#~ "ä¸?个é??ç?¨ç??è¿?æ?¥ç±»å??ã??"
+
+#~ msgid "Create a GSM connection"
+#~ msgstr "å??建 GSM è¿?æ?¥"
+
+#~ msgid "Create a CDMA connection"
+#~ msgstr "å??建 CDMA è¿?æ?¥"
+
+#~ msgid "GSM connection %d"
+#~ msgstr "GSM è¿?æ?¥ %d"
+
+#~ msgid "CDMA connection %d"
+#~ msgstr "CDMA è¿?æ?¥ %d"
+
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
 
@@ -1970,9 +2267,6 @@ msgstr "å??ä¿?æ?¤ç?? EAP (PEAP)"
 #~ msgid "_Fallback on this Network"
 #~ msgstr "�认�此��(_F)"
 
-#~ msgid "_Password:"
-#~ msgstr "å¯?ç ?(_P)ï¼?"
-
 #~ msgid "_Show password"
 #~ msgstr "æ?¾ç¤ºå¯?ç ?(_S)"
 
@@ -1992,9 +2286,6 @@ msgstr "å??ä¿?æ?¤ç?? EAP (PEAP)"
 #~ msgid "IP addresses"
 #~ msgstr "IP å?°å??"
 
-#~ msgid "Name"
-#~ msgstr "å??称"
-
 #~ msgid "Speed"
 #~ msgstr "é??度"