[network-manager-applet] po: update Chinese Simplified translation (rh #589230)



commit 39ab9882a37e3fb44eaf67ea536d8480a6233ccd
Author: Leah Liu <lliu redhat com>
Date:   Thu May 13 22:08:52 2010 -0700

    po: update Chinese Simplified translation (rh #589230)

 po/zh_CN.po | 1278 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 650 insertions(+), 628 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 36a510c..50dd909 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,22 +1,24 @@
+# translation of zh_CN.po to Wei Liu
 # Simplified Chinese translation to network-manager-applet.
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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.
-#
+# Leah Liu <lliu redhat com>, 2010.
 msgid ""
 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-11-12 07:28+0000\n"
-"PO-Revision-Date: 2009-10-26 16:56+0800\n"
-"Last-Translator: Wei Mingzhi <whistler openoffice org>\n"
-"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"Project-Id-Version: zh_CN\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-06 14:35+0530\n"
+"PO-Revision-Date: 2010-05-07 10:29+1000\n"
+"Last-Translator: Leah Liu <lliu redhat com>\n"
+"Language-Team: Wei Liu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../nm-applet.desktop.in.h:1
 msgid "Control your network connections"
@@ -28,7 +30,7 @@ msgstr "ç½?ç»?管ç??å?¨"
 
 #: ../nm-applet.schemas.in.h:1
 msgid "Disable WiFi Create"
-msgstr ""
+msgstr "ç¦?æ­¢ç??æ?? WiFi "
 
 #: ../nm-applet.schemas.in.h:2
 msgid "Disable connected notifications"
@@ -43,8 +45,7 @@ msgid "Set this to TRUE to disable notifications when connecting to a network."
 msgstr "å°?此项设为 TRUE 以ç¦?ç?¨è¿?æ?¥å?°ä¸?个ç½?ç»?æ?¶æ?¾ç¤ºç??é??å??ã??"
 
 #: ../nm-applet.schemas.in.h:5
-msgid ""
-"Set this to TRUE to disable notifications when disconnecting from a network."
+msgid "Set this to TRUE to disable notifications when disconnecting from a network."
 msgstr "å°?此项设为 TRUE 以ç¦?ç?¨ä»?ä¸?个ç½?ç»?æ?­å¼?æ?¶æ?¾ç¤ºç??é??å??ã??"
 
 #: ../nm-applet.schemas.in.h:6
@@ -54,12 +55,8 @@ msgid ""
 msgstr "å°?此项设å¤? TRUE 以ç¦?ç?¨æ? çº¿ç½?ç»?å?¯ç?¨æ?¶æ?¾ç¤ºç??é??å??ã??"
 
 #: ../nm-applet.schemas.in.h:7
-#, fuzzy
-#| msgid ""
-#| "Set this to TRUE to disable notifications when connecting to a network."
-msgid ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
-msgstr "å°?此项设为 TRUE 以ç¦?ç?¨è¿?æ?¥å?°ä¸?个ç½?ç»?æ?¶æ?¾ç¤ºç??é??å??ã??"
+msgid "Set to TRUE to disable creation of adhoc networks when using the applet."
+msgstr "å°?此项设为 TRUE 以ç¦?æ­¢å?¨ä½¿ç?¨å°?ç¨?åº?æ?¶ç??æ?? adhob ç½?ç»?ã??"
 
 #: ../nm-applet.schemas.in.h:8
 msgid "Stamp"
@@ -82,123 +79,194 @@ msgstr "管ç??æ??æ?´æ?¹æ?¨ç??ç½?ç»?è¿?æ?¥è®¾ç½®"
 msgid "Network Connections"
 msgstr "ç½?ç»?è¿?æ?¥"
 
-#: ../src/applet-device-bt.c:171 ../src/applet-device-cdma.c:291
-#: ../src/applet-device-gsm.c:284 ../src/applet-device-wired.c:241
-#: ../src/applet-device-wifi.c:781
+#: ../src/applet-dbus-manager.c:165
+#, c-format
+msgid "An instance of nm-applet is already running.\n"
+msgstr "nm-applet äº?件正å?¨è¿?è¡?中ã??\n"
+
+#: ../src/applet-dbus-manager.c:167
+#, c-format
+msgid "Could not acquire the %s service. (%d)\n"
+msgstr "æ? æ³?请æ±? %s æ??å?¡ã??(%d)\n"
+
+#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:332
+#: ../src/applet-device-gsm.c:375 ../src/applet-device-wired.c:241
+#: ../src/applet-device-wifi.c:773
 msgid "Available"
 msgstr "å?¯ç?¨ç??"
 
-#: ../src/applet-device-bt.c:197 ../src/applet-device-cdma.c:321
-#: ../src/applet-device-gsm.c:314 ../src/applet-device-wired.c:270
+#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:374
+#: ../src/applet-device-gsm.c:417 ../src/applet-device-wired.c:270
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "æ?¨ç?°å?¨å·²è¿?æ?¥å?°â??%sâ??ã??"
 
-#: ../src/applet-device-bt.c:201 ../src/applet-device-cdma.c:325
-#: ../src/applet-device-gsm.c:318 ../src/applet-device-wired.c:274
-#: ../src/applet-device-wifi.c:1285
+#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:378
+#: ../src/applet-device-gsm.c:421 ../src/applet-device-wired.c:274
+#: ../src/applet-device-wifi.c:1214
 msgid "Connection Established"
 msgstr "��已建�"
 
-#: ../src/applet-device-bt.c:202
+#: ../src/applet-device-bt.c:205
 msgid "You are now connected to the mobile broadband network."
 msgstr "æ?¨ç?°å?¨å·²è¿?æ?¥å?°ç§»å?¨å®½å¸¦ç½?ç»?ã??"
 
-#: ../src/applet-device-bt.c:228 ../src/applet-device-cdma.c:352
-#: ../src/applet-device-gsm.c:345
+#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:413
+#: ../src/applet-device-gsm.c:456
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "æ­£å?¨å??å¤?移å?¨å®½å¸¦è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:355
-#: ../src/applet-device-gsm.c:348
+#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:416
+#: ../src/applet-device-gsm.c:459
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "æ­£å?¨é??置移å?¨å®½å¸¦è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:358
-#: ../src/applet-device-gsm.c:351
+#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:419
+#: ../src/applet-device-gsm.c:462
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "移å?¨å®½å¸¦è¿?æ?¥â??%sâ??é??è¦?ç?¨æ?·è®¤è¯?..."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:361
-#: ../src/applet-device-gsm.c:354 ../src/applet.c:2233
+#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:422
+#: ../src/applet-device-gsm.c:465 ../src/applet.c:2266
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "æ­£å?¨ä¸ºâ??%sâ??请æ±?ä¸?个ç½?ç»?å?°å??..."
 
-#: ../src/applet-device-bt.c:241 ../src/applet-device-cdma.c:365
-#: ../src/applet-device-gsm.c:358
+#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:439
+#: ../src/applet-device-gsm.c:477
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "移å?¨å®½å¸¦è¿?æ?¥â??%sâ??å·²å¤?äº?æ´»å?¨ç?¶æ??"
 
-#: ../src/applet-device-cdma.c:150 ../src/connection-editor/page-mobile.c:625
+#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:621
+#: ../src/mb-menu-item.c:55
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/applet-device-cdma.c:222
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "�建移�宽带(CDMA)��..."
-
-#: ../src/applet-device-cdma.c:261 ../src/applet-device-gsm.c:260
+#: ../src/applet-device-cdma.c:281 ../src/applet-device-gsm.c:325
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "移�宽带(%s)"
 
-#: ../src/applet-device-cdma.c:263 ../src/applet-device-gsm.c:262
-#: ../src/connection-editor/page-mobile.c:326
+#: ../src/applet-device-cdma.c:283 ../src/applet-device-gsm.c:327
+#: ../src/connection-editor/page-mobile.c:318
 #: ../src/connection-editor/nm-connection-editor.glade.h:6
-#: ../src/connection-editor/nm-connection-list.c:1360
+#: ../src/connection-editor/nm-connection-list.c:1401
 msgid "Mobile Broadband"
 msgstr "移�宽带"
 
-#: ../src/applet-device-cdma.c:326
+#. Default connection item
+#: ../src/applet-device-cdma.c:345
+msgid "New Mobile Broadband (CDMA) connection..."
+msgstr "�建移�宽带(CDMA)��..."
+
+#: ../src/applet-device-cdma.c:379
 msgid "You are now connected to the CDMA network."
 msgstr "æ?¨ç?°å?¨å·²è¿?æ?¥å?° CDMA ç½?ç»?ã??"
 
-#: ../src/applet-device-cdma.c:495 ../src/applet-device-gsm.c:570
-msgid "Mobile broadband network password"
-msgstr "移�宽带����"
-
-#: ../src/applet-device-cdma.c:504 ../src/applet-device-gsm.c:579
+#: ../src/applet-device-cdma.c:434 ../src/applet-device-gsm.c:472
 #, c-format
-msgid "A password is required to connect to '%s'."
-msgstr "è¿?æ?¥å?°â??%sâ??é??è¦?å¯?ç ?ã??"
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "移å?¨å®½å¸¦è¿?æ?¥â??%sâ??å·²å¤?äº?æ´»å?¨ç?¶æ??ï¼?(%d%%%s%s)"
 
-#: ../src/applet-device-cdma.c:522 ../src/applet-device-gsm.c:597
-msgid "Password:"
-msgstr "���"
+#: ../src/applet-device-cdma.c:437 ../src/applet-device-gsm.c:475
+msgid "roaming"
+msgstr "漫游中"
 
-#: ../src/applet-device-gsm.c:152 ../src/connection-editor/page-mobile.c:628
+#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:624
+#: ../src/mb-menu-item.c:60
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/applet-device-gsm.c:223
+#. Default connection item
+#: ../src/applet-device-gsm.c:388
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "�建移�宽带(GSM)��..."
 
-#: ../src/applet-device-gsm.c:319
+#: ../src/applet-device-gsm.c:422
 msgid "You are now connected to the GSM network."
 msgstr "æ?¨ç?°å?¨å·²è¿?æ?¥å?° GSM ç½?ç»?ã??"
 
-#: ../src/applet-device-gsm.c:510
+#: ../src/applet-device-gsm.c:704
 msgid "PIN code required"
 msgstr "é??è¦? PIN ç ?"
 
-#: ../src/applet-device-gsm.c:512
+#: ../src/applet-device-gsm.c:706
 msgid "PUK code required"
 msgstr "é??è¦? PUK ç ?"
 
-#: ../src/applet-device-gsm.c:521
+#: ../src/applet-device-gsm.c:715
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "移å?¨å®½å¸¦è®¾å¤?é??è¦? PIN ç ?ã??"
 
-#: ../src/applet-device-gsm.c:523
+#: ../src/applet-device-gsm.c:717
 msgid "PUK code is needed for the mobile broadband device"
 msgstr "移å?¨å®½å¸¦è®¾å¤?é??è¦? PUK ç ?ã??"
 
+#: ../src/applet-device-gsm.c:850
+msgid "Wrong PIN code; please contact your provider."
+msgstr "é??误 PIN 代ç ?ï¼?请è??ç»?æ?¨ç??ä¾?åº?å??ã??"
+
+#: ../src/applet-device-gsm.c:873
+msgid "Wrong PUK code; please contact your provider."
+msgstr "é??误 PUK 代ç ?ï¼?请è??ç»?æ?¨ç??ä¾?åº?å??ã??"
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-gsm.c:900
+msgid "Sending unlock code..."
+msgstr "æ­£å?¨å??é??æ?ªé??å®?代ç ?......"
+
+#: ../src/applet-device-gsm.c:959
+msgid "SIM PIN unlock required"
+msgstr "è¦?æ±?解é?? SIM PIN"
+
+#: ../src/applet-device-gsm.c:960
+msgid "SIM PIN Unlock Required"
+msgstr "è¦?æ±?解é?? SIM PIN"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-device-gsm.c:962
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr "å?¨ä½¿ç?¨ç§»å?¨å®½å¸¦è®¾å¤? '%s' å??é??è¦?ä¸?个 SIM PIN 代ç ?ã??"
+
+#: ../src/applet-device-gsm.c:963
+msgid "PIN code:"
+msgstr "PIN 代��"
+
+#: ../src/applet-device-gsm.c:968
+msgid "SIM PUK unlock required"
+msgstr "è¦?æ±?解é?? SIM PUK"
+
+#: ../src/applet-device-gsm.c:969
+msgid "SIM PUK Unlock Required"
+msgstr "è¦?æ±?解é?? SIM PUK"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-device-gsm.c:971
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr "å?¨ä½¿ç?¨ç§»å?¨å®½å¸¦è®¾å¤? '%s' å??é??è¦?ä¸?个 SIM PUK 代ç ?ã??"
+
+#: ../src/applet-device-gsm.c:972
+msgid "PUK code:"
+msgstr "PUK 代��"
+
+#: ../src/applet-device-gsm.c:974
+msgid "New PIN code:"
+msgstr "æ?°ç?? PIN 代ç ?ï¼?"
+
+#: ../src/applet-device-gsm.c:975
+msgid "Re-enter new PIN code:"
+msgstr "é??æ?°è¾?å?¥æ?°ç?? PIN 代ç ?ï¼?"
+
 #: ../src/applet-device-wired.c:63
 msgid "Auto Ethernet"
 msgstr "��以太�"
@@ -222,7 +290,7 @@ msgid "Wired Network"
 msgstr "æ??线ç½?ç»?"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:233 ../src/applet.c:1377
+#: ../src/applet-device-wired.c:233 ../src/applet.c:1305
 msgid "disconnected"
 msgstr "已��"
 
@@ -259,198 +327,199 @@ msgstr "æ??线ç½?ç»?è¿?æ?¥â??%sâ??å·²å¤?äº?æ´»å?¨ç?¶æ??"
 msgid "DSL authentication"
 msgstr "DSL 认�"
 
-#: ../src/applet-device-wifi.c:91
+#: ../src/applet-device-wifi.c:87
 msgid "_Connect to Hidden Wireless Network..."
 msgstr "è¿?æ?¥å?°é??è??ç??æ? çº¿è¿?æ?¥(_C)..."
 
-#: ../src/applet-device-wifi.c:124
+#: ../src/applet-device-wifi.c:120
 msgid "Create _New Wireless Network..."
 msgstr "å??建æ?°ç??æ? çº¿ç½?ç»?(_N)..."
 
-#: ../src/applet-device-wifi.c:715
+#: ../src/applet-device-wifi.c:705
 #, c-format
 msgid "Wireless Networks (%s)"
 msgstr "�线��(%s)"
 
-#: ../src/applet-device-wifi.c:717
+#: ../src/applet-device-wifi.c:707
 #, c-format
 msgid "Wireless Network (%s)"
 msgstr "�线��(%s)"
 
-#: ../src/applet-device-wifi.c:719
+#: ../src/applet-device-wifi.c:709
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "�线��"
 
-#: ../src/applet-device-wifi.c:747
+#: ../src/applet-device-wifi.c:739
 msgid "wireless is disabled"
 msgstr "�线��已��"
 
-#: ../src/applet-device-wifi.c:808
+#: ../src/applet-device-wifi.c:800
 msgid "More networks"
 msgstr "����"
 
-#: ../src/applet-device-wifi.c:1075
+#: ../src/applet-device-wifi.c:1004
 msgid "Wireless Networks Available"
 msgstr "�线����"
 
-#: ../src/applet-device-wifi.c:1076
+#: ../src/applet-device-wifi.c:1005
 msgid "Click on this icon to connect to a wireless network"
 msgstr "å??å?»æ­¤å?¾æ ?è¿?æ?¥å?°æ? çº¿ç½?ç»?"
 
-#: ../src/applet-device-wifi.c:1079 ../src/applet.c:686
+#: ../src/applet-device-wifi.c:1008 ../src/applet.c:677
 msgid "Don't show this message again"
 msgstr "ä¸?å??æ?¾ç¤ºæ­¤ä¿¡æ?¯"
 
-#: ../src/applet-device-wifi.c:1283
+#: ../src/applet-device-wifi.c:1212
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "æ?¨ç?°å?¨å·²è¿?æ?¥å?°æ? çº¿ç½?ç»? '%s'ã??"
 
-#: ../src/applet-device-wifi.c:1284 ../src/applet-device-wifi.c:1315
+#: ../src/applet-device-wifi.c:1213 ../src/applet-device-wifi.c:1244
 msgid "(none)"
 msgstr "(æ? )"
 
-#: ../src/applet-device-wifi.c:1325
+#: ../src/applet-device-wifi.c:1254
 #, c-format
 msgid "Preparing wireless network connection '%s'..."
 msgstr "æ­£å?¨å??å¤?æ? çº¿ç½?ç»?è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1328
+#: ../src/applet-device-wifi.c:1257
 #, c-format
 msgid "Configuring wireless network connection '%s'..."
 msgstr "æ­£å?¨é??ç½®æ? çº¿ç½?ç»?è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1331
+#: ../src/applet-device-wifi.c:1260
 #, c-format
 msgid "User authentication required for wireless network '%s'..."
 msgstr "æ? çº¿ç½?ç»?â??%sâ??é??è¦?ç?¨æ?·è®¤è¯?..."
 
-#: ../src/applet-device-wifi.c:1334
+#: ../src/applet-device-wifi.c:1263
 #, c-format
 msgid "Requesting a wireless network address for '%s'..."
 msgstr "æ­£å?¨ä¸ºâ??%sâ??请æ±?ä¸?个æ? çº¿ç½?ç»?å?°å??..."
 
-#: ../src/applet-device-wifi.c:1354
+#: ../src/applet-device-wifi.c:1283
 #, c-format
 msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgstr "æ? çº¿ç½?ç»?è¿?æ?¥â??%sâ??å¤?äº?æ´»å?¨ç?¶æ??ï¼?%s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1358
+#: ../src/applet-device-wifi.c:1287
 #, c-format
 msgid "Wireless network connection '%s' active"
 msgstr "æ? çº¿ç½?ç»?è¿?æ?¥â??%sâ??å¤?äº?æ´»å?¨ç?¶æ??"
 
-#: ../src/applet-dialogs.c:53
+#: ../src/applet-dialogs.c:56
 msgid "Error displaying connection information:"
 msgstr "æ?¾ç¤ºè¿?æ?¥ä¿¡æ?¯å?ºé??ï¼?"
 
-#: ../src/applet-dialogs.c:84
+#: ../src/applet-dialogs.c:87
 #: ../src/connection-editor/page-wireless-security.c:284
-#: ../src/wireless-dialog.c:923
-#: ../src/wireless-security/wireless-security.c:340
+#: ../src/wireless-dialog.c:962
+#: ../src/wireless-security/wireless-security.c:341
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:86
+#: ../src/applet-dialogs.c:89
 msgid "Dynamic WEP"
 msgstr "å?¨æ?? WEP"
 
-#: ../src/applet-dialogs.c:88 ../src/applet-dialogs.c:189
-#: ../src/applet-dialogs.c:191
+#: ../src/applet-dialogs.c:91 ../src/applet-dialogs.c:192
+#: ../src/applet-dialogs.c:194
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:187
+#: ../src/applet-dialogs.c:190
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:195 ../src/applet-dialogs.c:204
+#: ../src/applet-dialogs.c:198 ../src/applet-dialogs.c:207
 #: ../src/connection-editor/page-wireless-security.c:238
-#: ../src/wireless-dialog.c:880
+#: ../src/wireless-dialog.c:919
 msgid "None"
 msgstr "æ? "
 
-#: ../src/applet-dialogs.c:207 ../src/applet-dialogs.c:279
-#: ../src/applet-dialogs.c:380
+#: ../src/applet-dialogs.c:210 ../src/applet-dialogs.c:282
+#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:421
+#: ../src/applet-dialogs.c:439 ../src/applet-dialogs.c:450
 msgid "Unknown"
 msgstr "��"
 
-#: ../src/applet-dialogs.c:277 ../src/applet-dialogs.c:378
+#: ../src/applet-dialogs.c:280 ../src/applet-dialogs.c:382
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/�"
 
-#: ../src/applet-dialogs.c:309
+#: ../src/applet-dialogs.c:313
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "以太�(%s)"
 
-#: ../src/applet-dialogs.c:311
+#: ../src/applet-dialogs.c:315
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:313
+#: ../src/applet-dialogs.c:317
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:315
+#: ../src/applet-dialogs.c:319
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:320
+#: ../src/applet-dialogs.c:324
 msgid "Interface:"
 msgstr "���"
 
-#: ../src/applet-dialogs.c:336
+#: ../src/applet-dialogs.c:340
 msgid "Hardware Address:"
 msgstr "硬件å?°å??ï¼?"
 
-#: ../src/applet-dialogs.c:346
+#: ../src/applet-dialogs.c:350
 msgid "Driver:"
 msgstr "驱����"
 
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:388
 msgid "Speed:"
 msgstr "é??度ï¼?"
 
-#: ../src/applet-dialogs.c:393
+#: ../src/applet-dialogs.c:397
 msgid "Security:"
 msgstr "����"
 
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:419
 msgid "IP Address:"
 msgstr "IP å?°å??ï¼?"
 
-#: ../src/applet-dialogs.c:429
+#: ../src/applet-dialogs.c:437
 msgid "Broadcast Address:"
 msgstr "广æ?­å?°å??ï¼?"
 
-#: ../src/applet-dialogs.c:440
+#: ../src/applet-dialogs.c:448
 msgid "Subnet Mask:"
 msgstr "å­?ç½?æ?©ç ?ï¼?"
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:460
 msgid "Default Route:"
 msgstr "�认路��"
 
-#: ../src/applet-dialogs.c:467
+#: ../src/applet-dialogs.c:474
 msgid "Primary DNS:"
 msgstr "主 DNS�"
 
-#: ../src/applet-dialogs.c:478
+#: ../src/applet-dialogs.c:485
 msgid "Secondary DNS:"
 msgstr "è¾? DNSï¼?"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:541
+#: ../src/applet-dialogs.c:548
 msgid "No valid active connections found!"
 msgstr "æ?ªæ?¾å?°å??æ³?ç??æ´»å?¨è¿?æ?¥ï¼?"
 
-#: ../src/applet-dialogs.c:667
+#: ../src/applet-dialogs.c:674
 msgid ""
 "Copyright © 2004-2008 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc."
@@ -458,26 +527,38 @@ msgstr ""
 "ç??æ??æ??æ?? (C) 2004-2008 Red Hat å?¬å?¸.\n"
 "ç??æ??æ??æ?? (C) 2005-2008 Novell å?¬å?¸."
 
-#: ../src/applet-dialogs.c:669
-msgid ""
-"Notification area applet for managing your network devices and connections."
+#: ../src/applet-dialogs.c:676
+msgid "Notification area applet for managing your network devices and connections."
 msgstr "管ç??æ?¨ç½?ç»?设å¤?å??è¿?æ?¥ç??é??ç?¥å?ºå??å°?ç¨?åº?ã??"
 
-#: ../src/applet-dialogs.c:671
+#: ../src/applet-dialogs.c:678
 msgid "NetworkManager Website"
 msgstr "NetworkManager ç½?ç«?"
 
-#: ../src/applet-dialogs.c:674
+#: ../src/applet-dialogs.c:681
 msgid "translator-credits"
 msgstr ""
 "Funda Wang <fundawang linux net cn>\n"
 "Wei Mingzhi <whistler_wmz users sf net>"
 
-#: ../src/applet-dialogs.c:690
+#: ../src/applet-dialogs.c:697
 msgid "Missing resources"
 msgstr "缺���"
 
-#: ../src/applet.c:810
+#: ../src/applet-dialogs.c:723
+msgid "Mobile broadband network password"
+msgstr "移�宽带����"
+
+#: ../src/applet-dialogs.c:732
+#, c-format
+msgid "A password is required to connect to '%s'."
+msgstr "è¿?æ?¥å?°â??%sâ??é??è¦?å¯?ç ?ã??"
+
+#: ../src/applet-dialogs.c:750
+msgid "Password:"
+msgstr "���"
+
+#: ../src/applet.c:790
 #, c-format
 msgid ""
 "\n"
@@ -487,7 +568,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??ç½?ç»?è¿?æ?¥è¢«ä¸­æ?­ã??"
 
-#: ../src/applet.c:813
+#: ../src/applet.c:793
 #, c-format
 msgid ""
 "\n"
@@ -496,7 +577,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??VPN æ??å?¡å¼?常中æ?­ã??"
 
-#: ../src/applet.c:816
+#: ../src/applet.c:796
 #, c-format
 msgid ""
 "\n"
@@ -506,7 +587,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??VPN æ??å?¡è¿?å??äº?ä¸?个é??æ³?é??ç½®ã??"
 
-#: ../src/applet.c:819
+#: ../src/applet.c:799
 #, c-format
 msgid ""
 "\n"
@@ -515,7 +596,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??è¿?æ?¥è¶?æ?¶ã??"
 
-#: ../src/applet.c:822
+#: ../src/applet.c:802
 #, c-format
 msgid ""
 "\n"
@@ -524,7 +605,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??VPN æ??å?¡æ?ªå?¨æ??é??æ?¶é?´å??å?¯å?¨ã??"
 
-#: ../src/applet.c:825
+#: ../src/applet.c:805
 #, c-format
 msgid ""
 "\n"
@@ -533,7 +614,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??VPN æ??å?¡å?¯å?¨å¤±è´¥ã??"
 
-#: ../src/applet.c:828
+#: ../src/applet.c:808
 #, c-format
 msgid ""
 "\n"
@@ -542,7 +623,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??没æ??å??æ³?ç?? VPN secretã??"
 
-#: ../src/applet.c:831
+#: ../src/applet.c:811
 #, c-format
 msgid ""
 "\n"
@@ -551,7 +632,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??VPN secret é??æ³?ã??"
 
-#: ../src/applet.c:838
+#: ../src/applet.c:818
 #, c-format
 msgid ""
 "\n"
@@ -560,7 +641,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??失败ã??"
 
-#: ../src/applet.c:856
+#: ../src/applet.c:836
 #, c-format
 msgid ""
 "\n"
@@ -570,7 +651,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??å·²æ?­å¼?ã??ç½?ç»?è¿?æ?¥è¢«ä¸­æ?­ã??"
 
-#: ../src/applet.c:859
+#: ../src/applet.c:839
 #, c-format
 msgid ""
 "\n"
@@ -579,7 +660,7 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??å·²æ?­å¼?ã??VPN æ??å?¡å·²å??æ­¢ã??"
 
-#: ../src/applet.c:865
+#: ../src/applet.c:845
 #, c-format
 msgid ""
 "\n"
@@ -588,15 +669,15 @@ msgstr ""
 "\n"
 "VPN è¿?æ?¥â??%sâ??å·²æ?­å¼?ã??"
 
-#: ../src/applet.c:948
+#: ../src/applet.c:876
 msgid "VPN Login Message"
 msgstr "VPN ����"
 
-#: ../src/applet.c:960 ../src/applet.c:968 ../src/applet.c:1015
+#: ../src/applet.c:888 ../src/applet.c:896 ../src/applet.c:943
 msgid "VPN Connection Failed"
 msgstr "VPN ��失败"
 
-#: ../src/applet.c:1022
+#: ../src/applet.c:950
 #, c-format
 msgid ""
 "\n"
@@ -609,7 +690,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1025
+#: ../src/applet.c:953
 #, c-format
 msgid ""
 "\n"
@@ -622,130 +703,134 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1368
+#: ../src/applet.c:1296
 msgid "device not ready"
 msgstr "设��就绪"
 
-#: ../src/applet.c:1393
+#: ../src/applet.c:1321
 msgid "Disconnect"
 msgstr "æ?­å¼?"
 
-#: ../src/applet.c:1407
+#: ../src/applet.c:1335
 msgid "device not managed"
 msgstr "设å¤?æ?ªæ??管"
 
-#: ../src/applet.c:1453
+#: ../src/applet.c:1381
 msgid "No network devices available"
 msgstr "没æ??å?¯ç?¨ç??ç½?ç»?设å¤?"
 
-#: ../src/applet.c:1541
+#: ../src/applet.c:1469
 msgid "_VPN Connections"
 msgstr "_VPN è¿?æ?¥"
 
-#: ../src/applet.c:1594
+#: ../src/applet.c:1522
 msgid "_Configure VPN..."
 msgstr "é??ç½® VPN(_C)..."
 
-#: ../src/applet.c:1598
-msgid "_Disconnect VPN..."
-msgstr "æ?­å¼? VPN(_D)..."
+#: ../src/applet.c:1526
+msgid "_Disconnect VPN"
+msgstr "æ?­å¼? VPNï¼?_Dï¼?"
 
-#: ../src/applet.c:1651
+#: ../src/applet.c:1613
 msgid "NetworkManager is not running..."
-msgstr "ç½?ç»?管ç??å?¨æ?ªè¿?è¡?..."
+msgstr "ç½?ç»?管ç??å?¨æ­£å?¨è¿?è¡?中......"
 
-#: ../src/applet.c:1656 ../src/applet.c:2361
+#: ../src/applet.c:1618 ../src/applet.c:2394
 msgid "Networking disabled"
 msgstr "��已��"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1840
+#: ../src/applet.c:1835
 msgid "Enable _Networking"
 msgstr "å?¯ç?¨è??ç½?(_N)"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:1849
+#: ../src/applet.c:1844
 msgid "Enable _Wireless"
 msgstr "���线(_W)"
 
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1853
+msgid "Enable _Mobile Broadband"
+msgstr "��移�宽带�_M�"
+
+#. Toggle notifications item
+#: ../src/applet.c:1864
+msgid "Enable N_otifications"
+msgstr "å?¯ç?¨é??ç?¥ï¼?_oï¼?"
+
 #. 'Connection Information' item
-#: ../src/applet.c:1860
+#: ../src/applet.c:1875
 msgid "Connection _Information"
 msgstr "��信�(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1870
+#: ../src/applet.c:1885
 msgid "Edit Connections..."
 msgstr "ç¼?è¾?è¿?æ?¥..."
 
 #. Help item
-#: ../src/applet.c:1884
+#: ../src/applet.c:1899
 msgid "_Help"
 msgstr "帮�(_H)"
 
 #. About item
-#: ../src/applet.c:1893
+#: ../src/applet.c:1908
 msgid "_About"
 msgstr "��(_A)"
 
-#: ../src/applet.c:2078
+#: ../src/applet.c:2099
 msgid "Disconnected"
 msgstr "已����"
 
-#: ../src/applet.c:2079
+#: ../src/applet.c:2100
 msgid "The network connection has been disconnected."
 msgstr "ç½?ç»?è¿?æ?¥ç?°å·²æ?­å¼?ã??"
 
-#: ../src/applet.c:2227
+#: ../src/applet.c:2260
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "æ­£å?¨å??å¤?ç½?ç»?è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet.c:2230
+#: ../src/applet.c:2263
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "ç½?ç»?è¿?æ?¥â??%sâ??é??è¦?ç?¨æ?·è®¤è¯?..."
 
-#: ../src/applet.c:2236
+#: ../src/applet.c:2269
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "ç½?ç»?è¿?æ?¥â??%sâ??å·²å¤?äº?æ´»å?¨ç?¶æ??"
 
-#: ../src/applet.c:2317
+#: ../src/applet.c:2350
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "æ­£å?¨å?¯å?¨ VPN è¿?æ?¥â??%sâ??..."
 
-#: ../src/applet.c:2320
+#: ../src/applet.c:2353
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN è¿?æ?¥â??%sâ??é??è¦?ç?¨æ?·è®¤è¯?..."
 
-#: ../src/applet.c:2323
+#: ../src/applet.c:2356
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "æ­£å?¨ä¸ºâ??%sâ??请æ±?ä¸?个 VPN å?°å??..."
 
-#: ../src/applet.c:2326
+#: ../src/applet.c:2359
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN è¿?æ?¥â??%sâ??å·²å¤?äº?æ´»å?¨ç?¶æ??"
 
-#: ../src/applet.c:2365
+#: ../src/applet.c:2398
 msgid "No network connection"
 msgstr "没æ??ç½?ç»?è¿?æ?¥"
 
-#: ../src/applet.c:2701
-msgid ""
-"The NetworkManager applet could not find some required resources.  It cannot "
-"continue.\n"
-msgstr "ç½?ç»?管ç??å?¨å°?ç¨?åº?æ?¾ä¸?å?°æ??é??ç??èµ?æº?ã??æ? æ³?继续ã??\n"
-
-#: ../src/applet.c:2896
+#: ../src/applet.c:2938
 msgid "NetworkManager Applet"
 msgstr "ç½?ç»?管ç??å?¨å°?ç¨?åº?"
 
-#: ../src/applet.c:2902 ../src/wired-dialog.c:128
+#: ../src/applet.c:2944 ../src/wired-dialog.c:128
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -776,6 +861,10 @@ msgid "Anony_mous identity:"
 msgstr "å?¿å??身份(_M)ï¼?"
 
 #: ../src/applet.glade.h:8
+msgid "As_k for this password every time"
+msgstr "�次�询��个���_k�"
+
+#: ../src/applet.glade.h:9
 msgid ""
 "Automatic\n"
 "Version 0\n"
@@ -785,39 +874,39 @@ msgstr ""
 "ç??æ?¬ 0\n"
 "ç??æ?¬ 1"
 
-#: ../src/applet.glade.h:11
+#: ../src/applet.glade.h:12
 msgid "C_A certificate:"
 msgstr "C_A �书�"
 
-#: ../src/applet.glade.h:12
+#: ../src/applet.glade.h:13
 msgid "C_onnect"
 msgstr "è¿?æ?¥(_O)"
 
-#: ../src/applet.glade.h:13
+#: ../src/applet.glade.h:14
 msgid "Co_nnection:"
 msgstr "è¿?æ?¥(_N)ï¼?"
 
-#: ../src/applet.glade.h:14
+#: ../src/applet.glade.h:15
 msgid "Connection Information"
 msgstr "��信�"
 
-#: ../src/applet.glade.h:15
+#: ../src/applet.glade.h:16
 msgid "Don't _warn me again"
 msgstr "以å??ä¸?å??è­¦å??(_W)"
 
-#: ../src/applet.glade.h:16
+#: ../src/applet.glade.h:17
 msgid "I_dentity:"
 msgstr "身份(_D)�"
 
-#: ../src/applet.glade.h:17
+#: ../src/applet.glade.h:18
 msgid "I_nner authentication:"
 msgstr "å??é?¨è®¤è¯?(_N)ï¼?"
 
-#: ../src/applet.glade.h:18
+#: ../src/applet.glade.h:19
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/applet.glade.h:19
+#: ../src/applet.glade.h:20
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -825,18 +914,14 @@ msgstr ""
 "���系�\n"
 "�享��"
 
-#: ../src/applet.glade.h:21
+#: ../src/applet.glade.h:22
 msgid "Other Wireless Network..."
 msgstr "���线��..."
 
-#: ../src/applet.glade.h:22
+#: ../src/applet.glade.h:23
 msgid "Private _key:"
 msgstr "��(_K)�"
 
-#: ../src/applet.glade.h:23
-msgid "Select A File"
-msgstr "é??æ?©ä¸?个æ??件"
-
 #: ../src/applet.glade.h:24
 msgid "Sho_w key"
 msgstr "�示��(_W)"
@@ -887,24 +972,32 @@ msgid "_Type:"
 msgstr "ç±»å??(_T)ï¼?"
 
 #: ../src/applet.glade.h:36
+msgid "_Unlock"
+msgstr "解é??ï¼?_Uï¼?"
+
+#: ../src/applet.glade.h:37
 msgid "_User certificate:"
 msgstr "���书(_U)�"
 
-#: ../src/applet.glade.h:37 ../src/connection-editor/ce-page-dsl.glade.h:4
+#: ../src/applet.glade.h:38 ../src/connection-editor/ce-page-dsl.glade.h:4
 #: ../src/connection-editor/ce-page-mobile.glade.h:17
 msgid "_Username:"
 msgstr "ç?¨æ?·å??(_U)ï¼?"
 
-#: ../src/applet.glade.h:38
+#: ../src/applet.glade.h:39
 msgid "_Wireless security:"
 msgstr "�线�����(_W)�"
 
+#: ../src/applet.glade.h:40
+msgid "label"
+msgstr "æ ?ç­¾"
+
 #: ../src/connection-editor/ce-page.c:69
 msgid "automatic"
 msgstr "��"
 
 #: ../src/connection-editor/ce-page.c:221
-#: ../src/connection-editor/nm-connection-editor.c:596
+#: ../src/connection-editor/nm-connection-editor.c:616
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "ç?±äº?ä¸?个æ?ªç?¥é??误ï¼?æ?´æ?°è¿?æ?¥ secret æ?¶å¤±è´¥ã??"
 
@@ -941,7 +1034,7 @@ msgstr "D_HCP 客�端 ID�"
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
-msgstr ""
+msgstr "解æ??主æ?ºå??æ?¶ä½¿ç?¨ç??å??ã??使ç?¨é??å?·å??å¼?å¤?个å??ã??"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:9
 #: ../src/connection-editor/ce-page-ip6.glade.h:8
@@ -955,7 +1048,7 @@ msgstr "IP å?°å??å?¯å?¨ç½?ç»?ä¸?æ ?è¯?æ?¨ç??计ç®?æ?ºã??å??å?»â??æ·»å? â??æ??é?®
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
-msgstr ""
+msgstr "ç?¨æ?¥è§£æ??主æ?ºå??ç??å??å??æ??å?¡å?¨ç?? IP å?°å??ã??使ç?¨é??å?·å??å¼?å¤?个å??å??æ??å?¡å?¨å?°å??ã??"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:11
 #: ../src/connection-editor/ce-page-ip6.glade.h:10
@@ -970,39 +1063,58 @@ msgid "Ig_nore automatically obtained routes"
 msgstr "忽ç?¥è?ªå?¨è?·å??ç??è·¯ç?±(_N)"
 
 #: ../src/connection-editor/ce-page-ip4.glade.h:13
+msgid "Require IPv4 addressing for this connection to complete"
+msgstr "é??è¦? IPv4 å?°å??å®?æ??è¿?个è¿?æ?¥"
+
+#: ../src/connection-editor/ce-page-ip4.glade.h:14
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
 "enter it here."
 msgstr ""
+"DHCP 客æ?·ç«¯è¯?å?«ç¨?åº?å??许ç½?ç»?管ç??å??è?ªå®?ä¹?æ?¨ç??计ç®?æ?ºé??ç½®ã??å¦?æ??æ?¨è¦?使ç?¨ DHCP 客æ?·"
+"端è¯?å?«ç¨?åº?ï¼?请å?¨æ­¤è¾?å?¥ã??"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:14
-#: ../src/connection-editor/ce-page-ip6.glade.h:12
+#: ../src/connection-editor/ce-page-ip4.glade.h:15
+#: ../src/connection-editor/ce-page-ip6.glade.h:13
 msgid "Use this c_onnection only for resources on its network"
 msgstr "ä»?å°?æ­¤è¿?æ?¥ç?¨äº?ç?¸å¯¹åº?ç??ç½?ç»?ä¸?ç??èµ?æº?(_O)"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:15
-#: ../src/connection-editor/ce-page-ip6.glade.h:13
+#: ../src/connection-editor/ce-page-ip4.glade.h:16
+msgid ""
+"When connecting to IPv6-capable networks, allows the connection to complete "
+"if IPv4 configuration fails but IPv6 configuration succeeds."
+msgstr "å½?è¿?æ?¥å?°å?¼å®¹ IPv6 ç??ç½?ç»?æ?¶ï¼?å¦?æ?? IPv4 é??置失败è?? IPv6 é??ç½®æ??å??ï¼?å??å??许è¿?æ?¥å®?æ??ã??"
+
+#: ../src/connection-editor/ce-page-ip4.glade.h:17
+#: ../src/connection-editor/ce-page-ip6.glade.h:15
 msgid "_DNS servers:"
 msgstr "_DNS æ??å?¡å?¨ï¼?"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:16
-#: ../src/connection-editor/ce-page-ip6.glade.h:14
+#: ../src/connection-editor/ce-page-ip4.glade.h:18
+#: ../src/connection-editor/ce-page-ip6.glade.h:16
 msgid "_Method:"
 msgstr "��(_M)�"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:17
-msgid "_Routesâ?¦"
-msgstr "路�(_R)..."
+#: ../src/connection-editor/ce-page-ip4.glade.h:19
+#: ../src/connection-editor/ce-page-ip6.glade.h:17
+msgid "_Routes&#x2026;"
+msgstr "路�&#x2026;(_R)"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:18
-#: ../src/connection-editor/ce-page-ip6.glade.h:16
+#: ../src/connection-editor/ce-page-ip4.glade.h:20
+#: ../src/connection-editor/ce-page-ip6.glade.h:18
 msgid "_Search domains:"
 msgstr "æ??ç´¢å??(_S)ï¼?"
 
-#: ../src/connection-editor/ce-page-ip6.glade.h:15
-msgid "_Routes&#x2026;"
-msgstr "路�&#x2026;(_R)"
+#: ../src/connection-editor/ce-page-ip6.glade.h:12
+msgid "Require IPv6 addressing for this connection to complete"
+msgstr "é??è¦? IPv6 å?°å??å®?æ??è¿?个è¿?æ?¥"
+
+#: ../src/connection-editor/ce-page-ip6.glade.h:14
+msgid ""
+"When connecting to IPv4-capable networks, allows the connection to complete "
+"if IPv6 configuration fails but IPv4 configuration succeeds."
+msgstr "å½?è¿?æ?¥å?°å?¼å®¹ IPv4 ç??ç½?ç»?æ?¶ï¼?å¦?æ?? IPv6 é??置失败è?? IPv4 é??ç½®æ??å??ï¼?å??å??许è¿?æ?¥å®?æ??ã??"
 
 #: ../src/connection-editor/ce-page-mobile.glade.h:1
 msgid "<b>Advanced</b>"
@@ -1013,6 +1125,10 @@ msgid "<b>Basic</b>"
 msgstr "<b>��</b>"
 
 #: ../src/connection-editor/ce-page-mobile.glade.h:3
+msgid "Allow roaming if home network is not available"
+msgstr "å¦?æ??主ç½?ç»?ä¸?å?¯ç?¨å??å??许漫游"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:4
 msgid ""
 "Any\n"
 "3G (UMTS/HSPA)\n"
@@ -1026,34 +1142,30 @@ msgstr ""
 "ä¼?å??使ç?¨ 3G (UMTS/HSPA)\n"
 "ä¼?å??使ç?¨ 2G (GPRS/EDGE)"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:8
+#: ../src/connection-editor/ce-page-mobile.glade.h:9
 msgid "Change..."
 msgstr "æ?´æ?¹..."
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:9
-msgid "N_etwork:"
-msgstr "ç½?ç»?(_E)ï¼?"
-
 #: ../src/connection-editor/ce-page-mobile.glade.h:10
+msgid "N_etwork ID:"
+msgstr "ç½?ç»? ID (_e)ï¼?"
+
+#: ../src/connection-editor/ce-page-mobile.glade.h:11
 msgid "Nu_mber:"
 msgstr "ç¼?å?·(_M)ï¼?"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:11
+#: ../src/connection-editor/ce-page-mobile.glade.h:12
 msgid "PI_N:"
 msgstr "PI_Nï¼?"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:12
+#: ../src/connection-editor/ce-page-mobile.glade.h:13
 msgid "Sho_w passwords"
 msgstr "�示��(_W)"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:13
+#: ../src/connection-editor/ce-page-mobile.glade.h:14
 msgid "_APN:"
 msgstr "_APNï¼?"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:14
-msgid "_Band:"
-msgstr "波段(_B)�"
-
 #: ../src/connection-editor/ce-page-ppp.glade.h:1
 msgid "<b>Allowed Authentication Methods</b>"
 msgstr "<b>å??许ç??认è¯?æ?¹æ³?</b>"
@@ -1196,7 +1308,7 @@ msgid "MT_U:"
 msgstr "MT_Uï¼?"
 
 #: ../src/connection-editor/ce-page-wired.glade.h:14
-#: ../src/connection-editor/ce-page-wireless.glade.h:13
+#: ../src/connection-editor/ce-page-wireless.glade.h:15
 msgid "_MAC address:"
 msgstr "MAC å?°å??(_M)ï¼?"
 
@@ -1209,7 +1321,7 @@ msgid "_Speed:"
 msgstr "é??度(_S)ï¼?"
 
 #: ../src/connection-editor/ce-page-wired.glade.h:17
-#: ../src/connection-editor/ce-page-wireless.glade.h:16
+#: ../src/connection-editor/ce-page-wireless.glade.h:18
 msgid "bytes"
 msgstr "å­?è??"
 
@@ -1248,22 +1360,34 @@ msgid "Mb/s"
 msgstr "Mb/�"
 
 #: ../src/connection-editor/ce-page-wireless.glade.h:11
+msgid ""
+"This option locks this connection to the network device specified by the MAC "
+"address entered here.  Example: 00:11:22:33:44:55"
+msgstr "è¿?个é??项å°?è¿?个è¿?æ?¥é??å®?å?°è¿?é??è¾?å?¥ç?? MAC å?°å??æ??å®?ç??ç½?ç»?设å¤?ã??ä¾?å¦?ï¼?00:11:22:33:44:55"
+
+#: ../src/connection-editor/ce-page-wireless.glade.h:12
+msgid ""
+"This option locks this connection to the wireless access point (AP) "
+"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
+msgstr "è¿?个é??项å°?è¿?个è¿?æ?¥é??å®?å?°è¿?é??è¾?å?¥ç?? BSSID æ??å®?ç??æ? çº¿è®¿é?®ç?¹ï¼?APï¼?ã??ä¾?å¦?ï¼?00:11:22:33:44:55"
+
+#: ../src/connection-editor/ce-page-wireless.glade.h:13
 msgid "Transmission po_wer:"
 msgstr "ä¼ è¾?è?½é??(_W)ï¼?"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:12
+#: ../src/connection-editor/ce-page-wireless.glade.h:14
 msgid "_BSSID:"
 msgstr "_BSSIDï¼?"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:14
+#: ../src/connection-editor/ce-page-wireless.glade.h:16
 msgid "_Rate:"
 msgstr "é??ç??(_R)ï¼?"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:15
+#: ../src/connection-editor/ce-page-wireless.glade.h:17
 msgid "_SSID:"
 msgstr "_SSIDï¼?"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:17
+#: ../src/connection-editor/ce-page-wireless.glade.h:19
 msgid "mW"
 msgstr "mW"
 
@@ -1290,19 +1414,20 @@ 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
+#: ../src/connection-editor/page-ip4.c:731
+#: ../src/connection-editor/page-ip6.c:716
 msgid "Address"
 msgstr "å?°å??"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:517
-#: ../src/connection-editor/page-ip4.c:650
+#: ../src/connection-editor/page-ip4.c:748
 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
+#: ../src/connection-editor/page-ip4.c:765
+#: ../src/connection-editor/page-ip6.c:750
 msgid "Gateway"
 msgstr "ç½?å?³"
 
@@ -1312,7 +1437,7 @@ msgid "Metric"
 msgstr "��"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:475
-#: ../src/connection-editor/page-ip6.c:627
+#: ../src/connection-editor/page-ip6.c:733
 msgid "Prefix"
 msgstr "å??ç¼?"
 
@@ -1323,7 +1448,7 @@ msgstr "æ? æ³?å? è½½ DSL ç?¨æ?·ç??é?¢ã??"
 
 #: ../src/connection-editor/page-dsl.c:153
 #: ../src/connection-editor/nm-connection-editor.glade.h:4
-#: ../src/connection-editor/nm-connection-list.c:1368
+#: ../src/connection-editor/nm-connection-list.c:1409
 msgid "DSL"
 msgstr "DSL"
 
@@ -1332,125 +1457,133 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "DSL è¿?æ?¥ %d"
 
-#: ../src/connection-editor/page-ip4.c:116
-#: ../src/connection-editor/page-ip6.c:114
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:125
 msgid "Automatic (VPN)"
 msgstr "��(VPN)"
 
-#: ../src/connection-editor/page-ip4.c:117
-#: ../src/connection-editor/page-ip6.c:115
+#: ../src/connection-editor/page-ip4.c:127
+#: ../src/connection-editor/page-ip6.c:126
 msgid "Automatic (VPN) addresses only"
 msgstr "è?ªå?¨(VPN)ä»?å?°å??"
 
-#: ../src/connection-editor/page-ip4.c:120
-#: ../src/connection-editor/page-ip6.c:118
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (PPP)"
 msgstr "��(PPP)"
 
-#: ../src/connection-editor/page-ip4.c:121
-#: ../src/connection-editor/page-ip6.c:119
+#: ../src/connection-editor/page-ip4.c:131
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (PPP) addresses only"
 msgstr "è?ªå?¨(PPP)ä»?å?°å??"
 
-#: ../src/connection-editor/page-ip4.c:123
-#: ../src/connection-editor/page-ip6.c:121
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "��(PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:124
-#: ../src/connection-editor/page-ip6.c:122
+#: ../src/connection-editor/page-ip4.c:134
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "è?ªå?¨(PPPoE)ä»?å?°å??"
 
-#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP)"
 msgstr "��(DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:127
+#: ../src/connection-editor/page-ip4.c:137
 msgid "Automatic (DHCP) addresses only"
 msgstr "è?ªå?¨(DHCP)ä»?å?°å??"
 
-#: ../src/connection-editor/page-ip4.c:152
-#: ../src/connection-editor/page-ip6.c:162
+#: ../src/connection-editor/page-ip4.c:162
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "æ??å?¨"
 
-#: ../src/connection-editor/page-ip4.c:164
-#: ../src/connection-editor/page-ip6.c:175
+#: ../src/connection-editor/page-ip4.c:174
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "�����"
 
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:182
+#: ../src/connection-editor/page-ip4.c:180
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "���计���享"
 
-#: ../src/connection-editor/page-ip4.c:597
+#: ../src/connection-editor/page-ip4.c:190
+msgid "Disabled"
+msgstr "ç¦?ç?¨ç??"
+
+#: ../src/connection-editor/page-ip4.c:693
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "æ­£å?¨ç¼?è¾? %s ç?? IPv4 è·¯ç?±"
 
-#: ../src/connection-editor/page-ip4.c:711
-#: ../src/connection-editor/page-ip4.c:718
+#: ../src/connection-editor/page-ip4.c:812
+#: ../src/connection-editor/page-ip4.c:819
 msgid "Could not load IPv4 user interface."
 msgstr "æ? æ³?å? è½½ IPv4 ç?¨æ?·ç??é?¢ã??"
 
-#: ../src/connection-editor/page-ip4.c:724
+#: ../src/connection-editor/page-ip4.c:825
 msgid "IPv4 Settings"
 msgstr "IPv4 设置"
 
-#: ../src/connection-editor/page-ip6.c:124
+#: ../src/connection-editor/page-ip6.c:135
 msgid "Automatic"
 msgstr "��"
 
-#: ../src/connection-editor/page-ip6.c:125
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "è?ªå?¨ï¼?ä»?å?°å??"
 
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:148
 #: ../src/wireless-security/eap-method.c:196
 msgid "Ignore"
 msgstr "忽�"
 
-#: ../src/connection-editor/page-ip6.c:574
+#: ../src/connection-editor/page-ip6.c:172
+msgid "Automatic, DHCP only"
+msgstr "è?ªå?¨ï¼?è¿?é??äº? DHCP"
+
+#: ../src/connection-editor/page-ip6.c:678
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "æ­£å?¨ç¼?è¾? %s ç?? IPv6 è·¯ç?±"
 
-#: ../src/connection-editor/page-ip6.c:670
-#: ../src/connection-editor/page-ip6.c:677
+#: ../src/connection-editor/page-ip6.c:795
+#: ../src/connection-editor/page-ip6.c:802
 msgid "Could not load IPv6 user interface."
 msgstr "æ? æ³?å? è½½ IPv6 ç?¨æ?·ç??é?¢ã??"
 
-#: ../src/connection-editor/page-ip6.c:683
+#: ../src/connection-editor/page-ip6.c:808
 msgid "IPv6 Settings"
 msgstr "IPv6 设置"
 
-#: ../src/connection-editor/page-mobile.c:313
-#: ../src/connection-editor/page-mobile.c:320
+#: ../src/connection-editor/page-mobile.c:305
+#: ../src/connection-editor/page-mobile.c:312
 msgid "Could not load mobile broadband user interface."
 msgstr "æ? æ³?å? è½½ç§»å?¨å®½å¸¦ç?¨æ?·ç??é?¢ã??"
 
-#: ../src/connection-editor/page-mobile.c:341
+#: ../src/connection-editor/page-mobile.c:333
 msgid "Unsupported mobile broadband connection type."
 msgstr "ä¸?æ?¯æ??ç??移å?¨å®½å¸¦è¿?æ?¥ç±»å??ã??"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:578
+#: ../src/connection-editor/page-mobile.c:574
 msgid "Select Mobile Broadband Provider Type"
 msgstr "é??æ?©ç§»å?¨å®½å¸¦æ??ä¾?å??ç±»å??"
 
-#: ../src/connection-editor/page-mobile.c:605
+#: ../src/connection-editor/page-mobile.c:601
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr "é??æ?©æ?¨ç??移å?¨å®½å¸¦æ??ä¾?å??使ç?¨ç??æ??æ?¯ã??å¦?ä¸?ç¡®å®?ï¼?请询é?®æ?¨ç??æ??ä¾?å??ã??"
 
-#: ../src/connection-editor/page-mobile.c:610
+#: ../src/connection-editor/page-mobile.c:606
 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:615
+#: ../src/connection-editor/page-mobile.c:611
 msgid "My provider uses _CDMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "æ??ç??æ??ä¾?å??使ç?¨å?ºäº? _CDMA ç??æ??æ?¯(å?³ï¼?1xRTT, EVDO)"
 
@@ -1459,23 +1592,23 @@ msgid "EAP"
 msgstr "EAP"
 
 #: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:227
+#: ../src/wireless-security/eap-method-ttls.c:228
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:272
+#: ../src/wireless-security/eap-method-ttls.c:276
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-peap.c:244
-#: ../src/wireless-security/eap-method-ttls.c:257
+#: ../src/wireless-security/eap-method-peap.c:245
+#: ../src/wireless-security/eap-method-ttls.c:260
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:242
+#: ../src/wireless-security/eap-method-ttls.c:244
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -1500,7 +1633,7 @@ msgstr "PPP 设置"
 
 #: ../src/connection-editor/page-vpn.c:108
 #: ../src/connection-editor/nm-connection-editor.glade.h:8
-#: ../src/connection-editor/nm-connection-list.c:1364
+#: ../src/connection-editor/nm-connection-list.c:1405
 msgid "VPN"
 msgstr "VPN"
 
@@ -1510,7 +1643,7 @@ msgid "Could not find VPN plugin service for '%s'."
 msgstr "æ? æ³?æ?¾å?°å?¯ç?¨äº?â??%sâ??ç?? VPN æ??件æ??å?¡ã??"
 
 #: ../src/connection-editor/page-vpn.c:213
-#: ../src/connection-editor/nm-connection-list.c:949
+#: ../src/connection-editor/nm-connection-list.c:990
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN è¿?æ?¥ %d"
@@ -1522,7 +1655,7 @@ msgstr "æ? æ³?å? è½½æ??线ç½?ç»?ç?¨æ?·ç??é?¢ã??"
 
 #: ../src/connection-editor/page-wired.c:220
 #: ../src/connection-editor/nm-connection-editor.glade.h:9
-#: ../src/connection-editor/nm-connection-list.c:1352
+#: ../src/connection-editor/nm-connection-list.c:1393
 msgid "Wired"
 msgstr "æ??线"
 
@@ -1556,7 +1689,7 @@ msgstr "æ? æ³?å? è½½ WiFi ç?¨æ?·ç??é?¢ã??"
 
 #: ../src/connection-editor/page-wireless.c:364
 #: ../src/connection-editor/nm-connection-editor.glade.h:10
-#: ../src/connection-editor/nm-connection-list.c:1356
+#: ../src/connection-editor/nm-connection-list.c:1397
 msgid "Wireless"
 msgstr "�线"
 
@@ -1566,27 +1699,27 @@ msgid "Wireless connection %d"
 msgstr "�线�� %d"
 
 #: ../src/connection-editor/page-wireless-security.c:262
-#: ../src/wireless-dialog.c:897
+#: ../src/wireless-dialog.c:936
 msgid "WEP 40/128-bit Key"
 msgstr "WEP 40/128 ���"
 
 #: ../src/connection-editor/page-wireless-security.c:271
-#: ../src/wireless-dialog.c:906
+#: ../src/wireless-dialog.c:945
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 ����"
 
 #: ../src/connection-editor/page-wireless-security.c:297
-#: ../src/wireless-dialog.c:936
+#: ../src/wireless-dialog.c:975
 msgid "Dynamic WEP (802.1x)"
 msgstr "å?¨æ?? WEP (802.1x)"
 
 #: ../src/connection-editor/page-wireless-security.c:311
-#: ../src/wireless-dialog.c:950
+#: ../src/wireless-dialog.c:989
 msgid "WPA & WPA2 Personal"
 msgstr "WPA å?? WPA2 个人"
 
 #: ../src/connection-editor/page-wireless-security.c:325
-#: ../src/wireless-dialog.c:964
+#: ../src/wireless-dialog.c:1003
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA å?? WPA2 ä¼?ä¸?"
 
@@ -1612,36 +1745,35 @@ msgstr "正��� %s"
 msgid "Editing un-named connection"
 msgstr "ç¼?è¾?æ?ªå?½å??è¿?æ?¥"
 
-#: ../src/connection-editor/nm-connection-editor.c:280
+#: ../src/connection-editor/nm-connection-editor.c:287
 msgid ""
 "The connection editor could not find some required resources (the "
 "NetworkManager applet glade file was not found)."
-msgstr ""
-"è¿?æ?¥ç¼?è¾?å?¨æ?¾ä¸?å?°æ??é??ç??èµ?æº? (æ?ªæ?¾å?° NetworkManager å°?ç¨?åº?ç?? glade æ??件)ã??"
+msgstr "è¿?æ?¥ç¼?è¾?å?¨æ?¾ä¸?å?°æ??é??ç??èµ?æº? (æ?ªæ?¾å?° NetworkManager å°?ç¨?åº?ç?? glade æ??件)ã??"
 
-#: ../src/connection-editor/nm-connection-editor.c:293
+#: ../src/connection-editor/nm-connection-editor.c:300
 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:366
+#: ../src/connection-editor/nm-connection-editor.c:398
 msgid "Error creating connection editor dialog."
 msgstr "å??建è¿?æ?¥ç¼?è¾?å?¨å¯¹è¯?æ¡?å?ºé??ã??"
 
-#: ../src/connection-editor/nm-connection-editor.c:387
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "Apply"
 msgstr "��"
 
-#: ../src/connection-editor/nm-connection-editor.c:388
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save this connection for all users of this machine."
 msgstr "为æ?¬æ?ºå?¨é?¨ç?¨æ?·ä¿?å­?æ­¤è¿?æ?¥ã??"
 
-#: ../src/connection-editor/nm-connection-editor.c:389
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Apply..."
 msgstr "��..."
 
-#: ../src/connection-editor/nm-connection-editor.c:390
+#: ../src/connection-editor/nm-connection-editor.c:422
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "为æ?¬æ?ºæ??æ??ç?¨æ?·ä¿?å­?æ­¤è¿?æ?¥é??è¦?认è¯?ã??"
 
@@ -1705,60 +1837,60 @@ msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年以å??"
 
-#: ../src/connection-editor/nm-connection-list.c:575
+#: ../src/connection-editor/nm-connection-list.c:596
 msgid "Connection add failed"
 msgstr "添���失败"
 
-#: ../src/connection-editor/nm-connection-list.c:598
+#: ../src/connection-editor/nm-connection-list.c:625
 #, c-format
 msgid "Error editing connection: property '%s' / '%s' invalid: %d"
 msgstr "ç¼?è¾?è¿?æ?¥æ?¶å?ºé??: å±?æ?§ '%s' / '%s' é??æ³?: %d"
 
-#: ../src/connection-editor/nm-connection-list.c:605
-#: ../src/connection-editor/nm-connection-list.c:720
-msgid "An unknown error ocurred."
-msgstr "å??ç??äº?ä¸?个æ?ªç?¥é??误ã??"
+#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:747
+msgid "An unknown error occurred."
+msgstr "å?ºç?°ä¸?个æ?ªç?¥é??误ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:610
-#: ../src/connection-editor/nm-connection-list.c:755
+#: ../src/connection-editor/nm-connection-list.c:637
+#: ../src/connection-editor/nm-connection-list.c:788
 msgid "Error initializing editor"
 msgstr "å??å§?å??ç¼?è¾?å?¨é??误"
 
-#: ../src/connection-editor/nm-connection-list.c:626
-#: ../src/connection-editor/nm-connection-list.c:772
-#: ../src/connection-editor/nm-connection-list.c:932
+#: ../src/connection-editor/nm-connection-list.c:653
+#: ../src/connection-editor/nm-connection-list.c:805
+#: ../src/connection-editor/nm-connection-list.c:973
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "ç?±äº?ä¸?个æ?ªç?¥é??误ï¼?è¿?æ?¥ç¼?è¾?å?¨å¯¹è¯?æ¡?æ? æ³?å??å§?å??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:635
+#: ../src/connection-editor/nm-connection-list.c:662
 msgid "Could not create new connection"
 msgstr "��建����"
 
-#: ../src/connection-editor/nm-connection-list.c:646
+#: ../src/connection-editor/nm-connection-list.c:673
 msgid "Could not edit new connection"
 msgstr "æ? æ³?ç¼?è¾?æ?°è¿?æ?¥"
 
-#: ../src/connection-editor/nm-connection-list.c:787
+#: ../src/connection-editor/nm-connection-list.c:820
 msgid "Could not edit connection"
 msgstr "æ? æ³?ç¼?è¾?è¿?æ?¥"
 
-#: ../src/connection-editor/nm-connection-list.c:812
+#: ../src/connection-editor/nm-connection-list.c:845
 msgid "Connection delete failed"
 msgstr "����失败"
 
-#: ../src/connection-editor/nm-connection-list.c:836
+#: ../src/connection-editor/nm-connection-list.c:877
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "��确认���� %s�"
 
-#: ../src/connection-editor/nm-connection-list.c:979
+#: ../src/connection-editor/nm-connection-list.c:1020
 #: ../src/connection-editor/vpn-helpers.c:228
 msgid "Cannot import VPN connection"
 msgstr "��导� VPN ��"
 
-#: ../src/connection-editor/nm-connection-list.c:981
+#: ../src/connection-editor/nm-connection-list.c:1022
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -1768,47 +1900,47 @@ msgstr ""
 "\n"
 "é??误: 没æ?? VPN æ??å?¡ç±»å??ã??"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:1035
 msgid "Could not edit imported connection"
 msgstr "æ? æ³?ç¼?è¾?导å?¥ç??è¿?æ?¥"
 
-#: ../src/connection-editor/nm-connection-list.c:1128
+#: ../src/connection-editor/nm-connection-list.c:1169
 msgid "Name"
 msgstr "å??称"
 
-#: ../src/connection-editor/nm-connection-list.c:1140
+#: ../src/connection-editor/nm-connection-list.c:1181
 msgid "Last Used"
 msgstr "æ??å??使ç?¨ç??"
 
-#: ../src/connection-editor/nm-connection-list.c:1243
+#: ../src/connection-editor/nm-connection-list.c:1284
 msgid "Edit"
 msgstr "ç¼?è¾?"
 
-#: ../src/connection-editor/nm-connection-list.c:1244
+#: ../src/connection-editor/nm-connection-list.c:1285
 msgid "Edit the selected connection"
 msgstr "ç¼?è¾?é??中ç??è¿?æ?¥"
 
-#: ../src/connection-editor/nm-connection-list.c:1245
+#: ../src/connection-editor/nm-connection-list.c:1286
 msgid "Edit..."
 msgstr "ç¼?è¾?..."
 
-#: ../src/connection-editor/nm-connection-list.c:1246
+#: ../src/connection-editor/nm-connection-list.c:1287
 msgid "Authenticate to edit the selected connection"
 msgstr "è¿?è¡?认è¯?以ç¼?è¾?é??中ç??è¿?æ?¥"
 
-#: ../src/connection-editor/nm-connection-list.c:1260
+#: ../src/connection-editor/nm-connection-list.c:1301
 msgid "Delete"
 msgstr "å? é?¤"
 
-#: ../src/connection-editor/nm-connection-list.c:1261
+#: ../src/connection-editor/nm-connection-list.c:1302
 msgid "Delete the selected connection"
 msgstr "å? é?¤é??中ç??è¿?æ?¥"
 
-#: ../src/connection-editor/nm-connection-list.c:1262
+#: ../src/connection-editor/nm-connection-list.c:1303
 msgid "Delete..."
 msgstr "å? é?¤..."
 
-#: ../src/connection-editor/nm-connection-list.c:1263
+#: ../src/connection-editor/nm-connection-list.c:1304
 msgid "Authenticate to delete the selected connection"
 msgstr "è¿?è¡?认è¯?以å? é?¤é??中ç??è¿?æ?¥"
 
@@ -1861,13 +1993,161 @@ msgstr ""
 msgid "Export VPN connection..."
 msgstr "导� VPN ��"
 
-#: ../src/gnome-bluetooth/network-manager-applet.c:197
-msgid "Access the Internet using your mobile phone"
-msgstr "使ç?¨æ?¨ç??æ??æ?ºè®¿é?® Internet"
+#: ../src/gnome-bluetooth/network-manager-applet.c:214
+#, c-format
+msgid "%s Network"
+msgstr "%s ç½?ç»?"
 
-#: ../src/utils/mobile-wizard.c:196
+#: ../src/gnome-bluetooth/network-manager-applet.c:323
+#, c-format
+msgid "Error: %s"
+msgstr "é??误ï¼?%s"
+
+#: ../src/gnome-bluetooth/network-manager-applet.c:442
+msgid "Mobile wizard was canceled"
+msgstr "å??æ¶?移å?¨å??导"
+
+#: ../src/gnome-bluetooth/network-manager-applet.c:451
+msgid "Unknown phone device type (not GSM or CDMA)"
+msgstr "æ?ªç?¥ç?µè¯?设å¤?ç±»å??ï¼?ä¸?æ?¯ GSM æ??è?? CDMAï¼?"
+
+#: ../src/gnome-bluetooth/network-manager-applet.c:479
+msgid "Your phone is now ready to use!"
+msgstr "æ?¨ç??ç?µè¯?å·²ç»?å?¯ä»¥ä½¿ç?¨ï¼?"
+
+#: ../src/gnome-bluetooth/network-manager-applet.c:649
+#: ../src/gnome-bluetooth/network-manager-applet.c:655
+msgid "failed to connect to the phone."
+msgstr "è¿?æ?¥å?°ç?µè¯?失败ã??"
+
+#: ../src/gnome-bluetooth/network-manager-applet.c:688
+msgid "unexpectedly disconnected from the phone."
+msgstr "æ??å¤?æ?­å¼?ä¸?ç?µè¯?ç??è¿?æ?¥ã??"
+
+#: ../src/gnome-bluetooth/network-manager-applet.c:697
+msgid "timed out detecting phone details."
+msgstr "侦æµ?ç?µè¯?详æ??è¶?æ?¶ã??"
+
+#: ../src/gnome-bluetooth/network-manager-applet.c:712
+msgid "could not connect to the system bus."
+msgstr "æ? æ³?è¿?æ?¥å?°ç³»ç»?æ?»çº¿ã??"
+
+#: ../src/gnome-bluetooth/network-manager-applet.c:717
+msgid "Detecting phone configuration..."
+msgstr "侦æµ?ç?µè¯?é??ç½®......"
+
+#: ../src/gnome-bluetooth/network-manager-applet.c:783
+msgid "could not find the Bluetooth device."
+msgstr "æ? æ³?æ?¾å?°è??ç??设å¤?ã??"
+
+#: ../src/gnome-bluetooth/network-manager-applet.c:913
+msgid ""
+"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+"Networking connection."
+msgstr "å?¨è®¾ç½®æ?¨å?·ç½?ç»?è¿?æ?¥å??å¿?é¡»å?¯ç?¨é»?认è??ç??é??é??å?¨ã??"
+
+#: ../src/gnome-bluetooth/network-manager-applet.c:966
+msgid "Use your mobile phone as a network device (PAN/NAP)"
+msgstr "使ç?¨æ?¨ç??移å?¨ç?µè¯?ä½?为ç½?ç»?设å¤?ï¼?PAN/NAPï¼?"
+
+#: ../src/gnome-bluetooth/network-manager-applet.c:975
+msgid "Access the Internet using your mobile phone (DUN)"
+msgstr "使ç?¨æ?¨ç??æ??æ?ºè®¿é?®äº?è??ç½?ï¼?DUNï¼?"
+
+#: ../src/main.c:70
+msgid "Usage:"
+msgstr "���"
+
+#: ../src/main.c:72
+msgid ""
+"This program is a component of NetworkManager (http://projects.gnome.org/";
+"NetworkManager)."
+msgstr ""
+"è¿?个ç¨?åº?æ?¯ NetworkManager ç??ä¸?个ç»?件ï¼?http://projects.gnome.org/";
+"NetworkManagerï¼?ã??"
+
+#: ../src/main.c:73
 msgid ""
-"Your mobile broadband connection is configured with the following settings:"
+"It is not intended for command-line interaction but instead runs in the "
+"GNOME desktop environment."
+msgstr "ä¸?å?¾å??使ç?¨å?½ä»¤è¡?äº?å?¨ï¼?è??åº?该使ç?¨ GNOME æ¡?é?¢ç?¯å¢?ã??"
+
+#: ../src/mb-menu-item.c:58
+msgid "EVDO"
+msgstr "EVDO"
+
+#: ../src/mb-menu-item.c:62
+msgid "GPRS"
+msgstr "GPRS"
+
+#: ../src/mb-menu-item.c:64
+msgid "EDGE"
+msgstr "EDGE"
+
+#: ../src/mb-menu-item.c:66
+msgid "UMTS"
+msgstr "UMTS"
+
+#: ../src/mb-menu-item.c:68
+msgid "HSDPA"
+msgstr "HSDPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "HSUPA"
+msgstr "HSUPA"
+
+#: ../src/mb-menu-item.c:72
+msgid "HSPA"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:104
+msgid "not enabled"
+msgstr "æ?ªå?¯ç?¨ç??"
+
+#: ../src/mb-menu-item.c:110
+msgid "not registered"
+msgstr "æ?ªæ³¨å??"
+
+#: ../src/mb-menu-item.c:128
+#, c-format
+msgid "Home network (%s)"
+msgstr "主�� (%s)"
+
+#: ../src/mb-menu-item.c:130
+#, c-format
+msgid "Home network"
+msgstr "主��"
+
+#: ../src/mb-menu-item.c:138
+msgid "searching"
+msgstr "æ??索中......"
+
+#: ../src/mb-menu-item.c:141
+msgid "registration denied"
+msgstr "注å??被æ??ç»?"
+
+#: ../src/mb-menu-item.c:146 ../src/mb-menu-item.c:152
+#, c-format
+msgid "%s (%s roaming)"
+msgstr "%s (%s 漫游中)"
+
+#: ../src/mb-menu-item.c:148 ../src/mb-menu-item.c:154
+#, c-format
+msgid "%s (roaming)"
+msgstr "%s (漫游中)"
+
+#: ../src/mb-menu-item.c:157
+#, c-format
+msgid "Roaming network (%s)"
+msgstr "漫游�� (%s)"
+
+#: ../src/mb-menu-item.c:159
+#, c-format
+msgid "Roaming network"
+msgstr "漫游��"
+
+#: ../src/utils/mobile-wizard.c:196
+msgid "Your mobile broadband connection is configured with the following settings:"
 msgstr "æ?¨ç??移å?¨å®½å¸¦è¿?æ?¥å·²æ??以ä¸?设å®?é??ç½®ï¼?"
 
 #. Device
@@ -1969,10 +2249,8 @@ msgid "Country"
 msgstr "�家"
 
 #: ../src/utils/mobile-wizard.c:1031
-#, fuzzy
-#| msgid "My plan is not listed..."
 msgid "My country is not listed"
-msgstr "æ??ç??计å??没æ??被å??å?º..."
+msgstr "æ??æ??å?¨å?½å®¶æ²¡æ??被å??å?º......"
 
 #: ../src/utils/mobile-wizard.c:1077
 msgid "Choose your Provider's Country"
@@ -2024,7 +2302,11 @@ msgstr "设置�个移�宽带��"
 msgid "New Mobile Broadband Connection"
 msgstr "�移�宽带��"
 
-#: ../src/utils/nmn-mobile-providers.c:515
+#: ../src/utils/nmn-mobile-providers.c:76
+msgid "United Kingdom"
+msgstr "��"
+
+#: ../src/utils/nmn-mobile-providers.c:523
 msgid "Default"
 msgstr "�认"
 
@@ -2051,50 +2333,50 @@ msgstr "è°?ç?¨ VPN è¿?æ?¥ç±»å??â??%sâ??ç??身份éª?è¯?对è¯?æ??é?®é¢?ã??请è??
 msgid "Wired 802.1X authentication"
 msgstr "æ??线 802.1X 认è¯?"
 
-#: ../src/wireless-dialog.c:444
+#: ../src/wireless-dialog.c:474
 msgid "New..."
 msgstr "�建..."
 
-#: ../src/wireless-dialog.c:1047
+#: ../src/wireless-dialog.c:1094
 msgid "C_reate"
 msgstr "建�(_R)"
 
-#: ../src/wireless-dialog.c:1128
+#: ../src/wireless-dialog.c:1175
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network '%"
 "s'."
 msgstr "é??è¦?å¯?ç ?æ??å¯?é?¥æ?¥è®¿é?®æ? çº¿ç½?ç»?â??%sâ??ã??"
 
-#: ../src/wireless-dialog.c:1130
+#: ../src/wireless-dialog.c:1177
 msgid "Wireless Network Authentication Required"
 msgstr "é??è¦?æ? çº¿ç½?ç»?认è¯?"
 
-#: ../src/wireless-dialog.c:1132
+#: ../src/wireless-dialog.c:1179
 msgid "Authentication required by wireless network"
 msgstr "æ? çº¿ç½?ç»?é??è¦?认è¯?"
 
-#: ../src/wireless-dialog.c:1137
+#: ../src/wireless-dialog.c:1184
 msgid "Create New Wireless Network"
 msgstr "å??建æ?°ç??æ? çº¿ç½?ç»?"
 
-#: ../src/wireless-dialog.c:1139
+#: ../src/wireless-dialog.c:1186
 msgid "New wireless network"
 msgstr "��线��"
 
-#: ../src/wireless-dialog.c:1140
+#: ../src/wireless-dialog.c:1187
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "请为æ?¨å¸?æ??建ç«?ç??æ? çº¿ç½?ç»?è¾?å?¥ä¸?个å??称ã??"
 
-#: ../src/wireless-dialog.c:1142
+#: ../src/wireless-dialog.c:1189
 msgid "Connect to Hidden Wireless Network"
 msgstr "è¿?æ?¥å?°é??è??ç??æ? çº¿ç½?ç»?"
 
-#: ../src/wireless-dialog.c:1144
+#: ../src/wireless-dialog.c:1191
 msgid "Hidden wireless network"
 msgstr "é??è??ç??æ? çº¿ç½?ç»?"
 
-#: ../src/wireless-dialog.c:1145
+#: ../src/wireless-dialog.c:1192
 msgid ""
 "Enter the name and security details of the hidden wireless network you wish "
 "to connect to."
@@ -2117,322 +2399,62 @@ msgstr ""
 msgid "Choose CA Certificate"
 msgstr "é??æ?© CA è¯?书æ??件"
 
-#: ../src/wireless-security/eap-method.c:497
+#: ../src/wireless-security/eap-method.c:515
 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:500
+#: ../src/wireless-security/eap-method.c:518
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER æ?? PEM è¯?书 (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:259
+#: ../src/wireless-security/eap-method-peap.c:261
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:274
+#: ../src/wireless-security/eap-method-peap.c:277
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-peap.c:361
-#: ../src/wireless-security/eap-method-tls.c:430
-#: ../src/wireless-security/eap-method-ttls.c:359
+#: ../src/wireless-security/eap-method-peap.c:366
+#: ../src/wireless-security/eap-method-tls.c:457
+#: ../src/wireless-security/eap-method-ttls.c:365
 msgid "Choose a Certificate Authority certificate..."
 msgstr "é??æ?©ä¸?个认è¯?中å¿?è¯?书..."
 
-#: ../src/wireless-security/eap-method-tls.c:424
+#: ../src/wireless-security/eap-method-tls.c:263
+msgid "Unencrypted private keys are insecure"
+msgstr "æ?ªå? å¯?ç??ä¸?ç?¨å¯?é?¥ä¸?å®?å?¨"
+
+#: ../src/wireless-security/eap-method-tls.c:266
+msgid ""
+"The selected private key does not appear to be protected by a password.  "
+"This could allow your security credentials to be compromised.  Please select "
+"a password-protected private key.\n"
+"\n"
+"(You can password-protect your private key with openssl)"
+msgstr ""
+"é??æ?©ç??ä¸?ç?¨å¯?é?¥æ²¡æ??å¯?ç ?ä¿?æ?¤ã??è¿?å?¯ä»¥æ??害å?°æ?¨ç??å®?å?¨ä¿¡èª?ã??请é??æ?©å¯?ç ?ä¿?æ?¤ç??ä¸?ç?¨å¯?"
+"é?¥ã??\n"
+"\n"
+"ï¼?æ?¨å?¯ä»¥ä½¿ç?¨ openssl å¯?ç ?ä¿?æ?¤æ?¨ç??ä¸?ç?¨å¯?é?¥ï¼?"
+
+#: ../src/wireless-security/eap-method-tls.c:451
 msgid "Choose your personal certificate..."
 msgstr "é??æ?©æ?¨ç??个人è¯?书..."
 
-#: ../src/wireless-security/eap-method-tls.c:436
+#: ../src/wireless-security/eap-method-tls.c:463
 msgid "Choose your private key..."
 msgstr "é??æ?©æ?¨ç??ç§?é?¥..."
 
-#: ../src/wireless-security/wireless-security.c:328
+#: ../src/wireless-security/wireless-security.c:329
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:352
+#: ../src/wireless-security/wireless-security.c:353
 msgid "Tunneled TLS"
 msgstr "é?§é?? TLS"
 
-#: ../src/wireless-security/wireless-security.c:363
+#: ../src/wireless-security/wireless-security.c:364
 msgid "Protected EAP (PEAP)"
 msgstr "å??ä¿?æ?¤ç?? EAP (PEAP)"
 
-#~ msgid "PU_K:"
-#~ msgstr "PU_Kï¼?"
-
-#~ 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"
-
-#~ msgid "gtk-ok"
-#~ msgstr "gtk-ok"
-
-#~ msgid "Removing connection failed: %s."
-#~ msgstr "å? é?¤è¿?æ?¥å¤±è´¥: %sã??"
-
-#~ msgid "Could not add system connection: permission denied."
-#~ msgstr "æ? æ³?æ·»å? ç³»ç»?è¿?æ?¥: æ??ç»?许å?¯æ??é??ã??"
-
-#~ msgid "Adding connection failed: %s."
-#~ msgstr "æ·»å? è¿?æ?¥å¤±è´¥: %sã??"
-
-#~ msgid "Updating connection failed: %s."
-#~ msgstr "æ?´æ?°è¿?æ?¥å¤±è´¥: %sã??"
-
-#~ msgid "Wireless Ethernet (%s)"
-#~ msgstr "�线以太�(%s)"
-
-#~ msgid "Waiting for Network Key for the wireless network '%s'..."
-#~ msgstr "æ­£å?¨ç­?å¾?æ? çº¿ç½?ç»?â??%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 ""
-#~ "<span weight=\"bold\" size=\"larger\">Password Required by Wireless "
-#~ "Network</span>\n"
-#~ "\n"
-#~ "A passphrase or encryption key is required to access the wireless network "
-#~ "'%s'."
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">æ? çº¿ç½?ç»?é??è¦?å¯?ç ?</span>\n"
-#~ "\n"
-#~ "è¦?访é?®æ? çº¿ç½?ç»?â??%sâ??ï¼?é??è¦?æ??ä¾?å¯?ç ?å?¥æ??å? å¯?å¯?é?¥ã??"
-
-#~ msgid "Client Certificate File:"
-#~ msgstr "客æ?·ç«¯è¯?书æ??件ï¼?"
-
-#~ msgid "Destination Address:"
-#~ msgstr "ç?®ç??å?°å??ï¼?"
-
-#~ msgid "Key Type:"
-#~ msgstr "å¯?é?¥ç±»å??ï¼?"
-
-#~ msgid "Key management:"
-#~ msgstr "å¯?é?¥ç®¡ç??ï¼?"
-
-#~ msgid ""
-#~ "None\n"
-#~ "WEP 128-bit Passphrase\n"
-#~ "WEP 64/128-bit Hex\n"
-#~ "WEP 64/128-bit ASCII\n"
-#~ msgstr ""
-#~ "æ? \n"
-#~ "WEP 128 ����\n"
-#~ "WEP 64/128 ä½?å??å?­è¿?å?¶\n"
-#~ "WEP 64/128 ä½? ASCII\n"
-
-#~ msgid "Select the Client Certificate File"
-#~ msgstr "é??æ?©å®¢æ?·ç«¯è¯?书æ??件"
-
-#~ msgid "Select the Private Key File"
-#~ msgstr "é??æ?©ç§?é?¥æ??件"
-
-#~ msgid "Show passphrase"
-#~ msgstr "�示���"
-
-#~ msgid "_Fallback on this Network"
-#~ msgstr "�认�此��(_F)"
-
-#~ msgid "_Show password"
-#~ msgstr "�示��(_S)"
-
-#~ msgid ""
-#~ "A\n"
-#~ "BG"
-#~ msgstr ""
-#~ "A\n"
-#~ "BG"
-
-#~ msgid "Autoconnect"
-#~ msgstr "����"
-
-#~ msgid "IP"
-#~ msgstr "IP"
-
-#~ msgid "IP addresses"
-#~ msgstr "IP å?°å??"
-
-#~ msgid "Speed"
-#~ msgstr "é??度"
-
-#~ msgid "Wireless security"
-#~ msgstr "�线���"
-
-#~ msgid ""
-#~ "tp\n"
-#~ "aui\n"
-#~ "bnc\n"
-#~ "mii"
-#~ msgstr ""
-#~ "tp\n"
-#~ "aui\n"
-#~ "bnc\n"
-#~ "mii"
-
-#~ msgid "Orientation"
-#~ msgstr "æ?¹å??"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "æ??ç??æ?¹å??ã??"
-
-#~ msgid " (invalid Unicode)"
-#~ msgstr " (æ? æ??ç?? Unicode)"
-
-#~ msgid ""
-#~ "Cannot find suitable software for VPN connection type '%s' to import the "
-#~ "file '%s'. Contact your system administrator."
-#~ msgstr ""
-#~ "æ?¾ä¸?å?°å??é??ç??软件æ?¥å¯¼å?¥ VPN è¿?æ?¥ç±»å??â??%sâ??ç??æ??件â??%sâ??ã??请è??ç³»æ?¨ç??ç³»ç»?管ç??å??ã??"
-
-#~ 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 ""
-#~ "å?³äº? VPN è¿?æ?¥â??%sâ??ç??å?¨é?¨ä¿¡æ?¯é?½å°?丢失ã??è¦?å??建æ?°è¿?æ?¥ç??è¯?ï¼?æ?¨å°±å¿?须请æ±?æ?¨ç??ç³»"
-#~ "ç»?管ç??å??æ??ä¾?ç?¸åº?ä¿¡æ?¯ã??"
-
-#~ msgid "Unable to load"
-#~ msgstr "����"
-
-#~ msgid "Cannot find some needed resources (the glade file)!"
-#~ msgstr "æ?¾ä¸?å?°æ??é??ç??èµ?æº?(glade æ??件)ï¼?"
-
-#~ msgid ""
-#~ "No suitable VPN software was found on your system. Contact your system "
-#~ "administrator."
-#~ msgstr "æ?¨ç??ç³»ç»?ä¸?æ?ªæ?¾å?°å??é??ç?? VPN 软件ã??请è??ç³»æ?¨ç??ç³»ç»?管ç??å??ã??"
-
-#~ 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 "第�步��两步"
-
-#~ msgid "Choose which type of VPN connection you wish to create:"
-#~ msgstr "é??æ?©æ?¨æ?³è¦?å??建ç?? VPN è¿?æ?¥ç±»å??ï¼?"
-
-#~ msgid "2 of 2"
-#~ msgstr "第�步��两步"
-
-#~ msgid "Finished Create VPN Connection"
-#~ msgstr "å??建 VPN è¿?æ?¥å®?æ??"
-
-#~ msgid "VPN Service for importing"
-#~ 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 "Manage Virtual Private Network Connections"
-#~ msgstr "管ç??è??æ??ç§?ç½?è¿?æ?¥"



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