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



commit 697051de0130e58f2569cdfffe7ca3c76b93486b
Author: Anthony Fok <anthony t fok gmail com>
Date:   Sat Jul 20 19:47:20 2013 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1569 +++++++++++++++++++++++++++++++++++------------------------
 po/zh_TW.po | 1415 ++++++++++++++++++++++++++++++++---------------------
 2 files changed, 1793 insertions(+), 1191 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 45e56a7..638bfe3 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,26 +1,30 @@
 # Translation of network-manager-applet to Chinese (Hong Kong).
 # Chinese (Hong Kong) translation of Network Manager.
-# Copyright (C) 2005, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2010, 2013 Free Software Foundation, Inc.
 # Woodman Tuen <wmtuen gmail com>, 2005.
 # Hialan Liu <hialan liu gmail com>, 2008.
 # Chester Cheng <ccheng redhat com>, 2010.
 # Terry Chuang <tchuang redhat com>, 2010.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
+# Roy Chan <roy chan linux org hk>, 2011.
+# Anthony Fok <anthony t fok gmail com>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-applet 0.9.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-01 22:46+0800\n"
-"PO-Revision-Date: 2013-03-01 22:46+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
+"Project-Id-Version: network-manager-applet 0.9.8\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
+"POT-Creation-Date: 2013-07-10 14:46+0000\n"
+"PO-Revision-Date: 2013-06-07 08:12+0800\n"
+"Last-Translator: Anthony Fok <foka debian org>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Launchpad-Export-Date: 2013-06-06 20:16+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
 
 #: ../nm-applet.desktop.in.h:1
 msgid "Network"
@@ -28,7 +32,7 @@ msgstr "網絡"
 
 #: ../nm-applet.desktop.in.h:2
 msgid "Manage your network connections"
-msgstr "管理你的網絡連線"
+msgstr "管理您的網絡連線"
 
 #: ../nm-connection-editor.desktop.in.h:1
 #: ../src/connection-editor/nm-connection-editor.ui.h:1
@@ -37,7 +41,7 @@ msgstr "網絡連線"
 
 #: ../nm-connection-editor.desktop.in.h:2
 msgid "Manage and change your network connection settings"
-msgstr "管理與更改你的連線設定值"
+msgstr "管理與更改您的連線設定值"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
@@ -45,7 +49,7 @@ msgstr "停止已連線的通知"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:2
 msgid "Set this to true to disable notifications when connecting to a network."
-msgstr "將這設為「TURE」,以停用網絡連線時的通知。"
+msgstr "將這設為 True,以停用網絡連線時的通知。"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
@@ -54,7 +58,7 @@ msgstr "停止已離線的通知"
 #: ../org.gnome.nm-applet.gschema.xml.in.h:4
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
-msgstr "將這設為「TURE」,以停用網絡離線時的通知。"
+msgstr "將這設為 True,以停用網絡離線時的通知。"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:5
 msgid "Disable VPN notifications"
@@ -64,7 +68,7 @@ msgstr "停用 VPN 的通知"
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
-msgstr "將這設為「TRUE」,以停用網絡離線時的通知。"
+msgstr "將這設為 True,以停用 VPN 網絡連線或離線時的通知。"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:7
 msgid "Suppress networks available notifications"
@@ -73,7 +77,7 @@ msgstr "停止可用網絡的通知"
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
-msgstr "將這設為「TURE」,以停用有無線網絡可用時的通知。"
+msgstr "將這設為 True,以停用有 Wi-Fi 無線網絡可用時的通知。"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
@@ -85,28 +89,36 @@ msgstr "用來決定設定是不是要轉移到新版本上。"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:11
 msgid "Disable WiFi Create"
-msgstr "禁止建立 WiFi"
+msgstr "禁止建立 Wi-Fi"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:12
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
-msgstr "將這設為「TURE」,以停用使用面板程式建立 adhoc 網絡。"
+msgstr "將這設為 True,以停用使用面板程式建立 Ad hoc 網絡。"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr "在通知區域顯示面板程式"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "設定為 FALSE 來停用在通知區域示顯示面板程式的功能。"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
 msgid "Ignore CA certificate"
 msgstr "忽略 CA 證書"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
-msgstr "將這設為「TURE」,停用在 EAP 認證中 CA 證書"
+msgstr "將這設為 True,以停用在 EAP 認證中關於 CA 證書的警告。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
-msgstr "將這設為「TURE」,停用在第二 EAP 認證中 CA 證書"
+msgstr "將這設為 True,以停用在 EAP 認證第二階段中關於 CA 證書的警告。"
 
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
 msgid "802.1X authentication"
@@ -117,37 +129,37 @@ msgstr "802.1X 驗證"
 msgid "_Network name:"
 msgstr "網絡名稱(_N):"
 
-#: ../src/applet.c:541
+#: ../src/applet.c:563
 msgid "Failed to add/activate connection"
 msgstr "無法加入/使用連線"
 
-#: ../src/applet.c:543 ../src/applet.c:587 ../src/applet.c:613
-#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
+#: ../src/applet.c:565 ../src/applet.c:609 ../src/applet.c:635
+#: ../src/applet-device-wifi.c:1377 ../src/applet-device-wifi.c:1396
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../src/applet.c:546 ../src/applet.c:616 ../src/applet-device-wifi.c:1379
-#: ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:568 ../src/applet.c:638 ../src/applet-device-wifi.c:1380
+#: ../src/applet-device-wifi.c:1399
 msgid "Connection failure"
 msgstr "連線失敗"
 
-#: ../src/applet.c:585
+#: ../src/applet.c:607
 msgid "Device disconnect failed"
 msgstr "裝置斷線失敗"
 
-#: ../src/applet.c:590
+#: ../src/applet.c:612
 msgid "Disconnect failure"
 msgstr "斷線失敗"
 
-#: ../src/applet.c:611
+#: ../src/applet.c:633
 msgid "Connection activation failed"
 msgstr "連線生效失敗"
 
-#: ../src/applet.c:982 ../src/applet-device-wifi.c:1069
+#: ../src/applet.c:946 ../src/applet-device-wifi.c:1065
 msgid "Don't show this message again"
 msgstr "不要再顯示這個訊息"
 
-#: ../src/applet.c:1071
+#: ../src/applet.c:1035
 #, c-format
 msgid ""
 "\n"
@@ -157,7 +169,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為網絡連線被中斷了。"
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:1038
 #, c-format
 msgid ""
 "\n"
@@ -166,7 +178,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為 VPN 服務意外的停止了。"
 
-#: ../src/applet.c:1077
+#: ../src/applet.c:1041
 #, c-format
 msgid ""
 "\n"
@@ -176,7 +188,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為 VPN 服務傳回無效的組態。"
 
-#: ../src/applet.c:1080
+#: ../src/applet.c:1044
 #, c-format
 msgid ""
 "\n"
@@ -185,7 +197,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為連線的嘗試已逾時。"
 
-#: ../src/applet.c:1083
+#: ../src/applet.c:1047
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +206,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為 VPN 服務沒有及時啟動。"
 
-#: ../src/applet.c:1086
+#: ../src/applet.c:1050
 #, c-format
 msgid ""
 "\n"
@@ -203,7 +215,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為 VPN 服務啟動失敗。"
 
-#: ../src/applet.c:1089
+#: ../src/applet.c:1053
 #, c-format
 msgid ""
 "\n"
@@ -212,7 +224,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為沒有有效的 VPN 服務。"
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:1056
 #, c-format
 msgid ""
 "\n"
@@ -221,7 +233,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為無效的 VPN 機密。"
 
-#: ../src/applet.c:1099
+#: ../src/applet.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -230,7 +242,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗。"
 
-#: ../src/applet.c:1117
+#: ../src/applet.c:1081
 #, c-format
 msgid ""
 "\n"
@@ -240,7 +252,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為網絡連線中斷了。"
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:1084
 #, c-format
 msgid ""
 "\n"
@@ -249,7 +261,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為 VPN 服務已停止。"
 
-#: ../src/applet.c:1126
+#: ../src/applet.c:1090
 #, c-format
 msgid ""
 "\n"
@@ -258,7 +270,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」已斷線。"
 
-#: ../src/applet.c:1156
+#: ../src/applet.c:1120
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -268,19 +280,19 @@ msgstr ""
 "VPN 連線已成功的。\n"
 "%s\n"
 
-#: ../src/applet.c:1158
+#: ../src/applet.c:1122
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN 連線已成功的。\n"
 
-#: ../src/applet.c:1160
+#: ../src/applet.c:1124
 msgid "VPN Login Message"
 msgstr "VPN 登錄訊息"
 
-#: ../src/applet.c:1166 ../src/applet.c:1174 ../src/applet.c:1224
+#: ../src/applet.c:1130 ../src/applet.c:1138 ../src/applet.c:1188
 msgid "VPN Connection Failed"
 msgstr "VPN 連線失敗"
 
-#: ../src/applet.c:1231
+#: ../src/applet.c:1195
 #, c-format
 msgid ""
 "\n"
@@ -293,7 +305,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1234
+#: ../src/applet.c:1198
 #, c-format
 msgid ""
 "\n"
@@ -306,332 +318,459 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1549
+#: ../src/applet.c:1522
 msgid "device not ready (firmware missing)"
 msgstr "裝置尚未就緒 (缺少韌體)"
 
-#: ../src/applet.c:1551
+#: ../src/applet.c:1524
 msgid "device not ready"
 msgstr "裝置尚未就緒"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1561 ../src/applet-device-ethernet.c:229
+#: ../src/applet.c:1534 ../src/applet-device-ethernet.c:123
+#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
 msgid "disconnected"
 msgstr "已斷線"
 
-#: ../src/applet.c:1577
+#: ../src/applet.c:1550
 msgid "Disconnect"
 msgstr "斷線"
 
-#: ../src/applet.c:1591
+#: ../src/applet.c:1564
 msgid "device not managed"
 msgstr "裝置無法管理"
 
-#: ../src/applet.c:1635
+#: ../src/applet.c:1722
 msgid "No network devices available"
 msgstr "沒有可用的網絡裝置"
 
-#: ../src/applet.c:1723
+#: ../src/applet.c:1775
 msgid "_VPN Connections"
 msgstr "_VPN 連線"
 
-#: ../src/applet.c:1780
+#: ../src/applet.c:1832
 msgid "_Configure VPN..."
 msgstr "設置 VPN(_C)…"
 
-#: ../src/applet.c:1784
+#: ../src/applet.c:1836
 msgid "_Disconnect VPN"
 msgstr "與 VPN 斷線(_D)"
 
-#: ../src/applet.c:1878
+#: ../src/applet.c:1952
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager 沒有執行…."
 
-#: ../src/applet.c:1883 ../src/applet.c:2735
+#: ../src/applet.c:1957 ../src/applet.c:2927
 msgid "Networking disabled"
 msgstr "網絡已停用"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2104
+#: ../src/applet.c:2177
 msgid "Enable _Networking"
 msgstr "啟用網絡(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2113
+#: ../src/applet.c:2186
 msgid "Enable _Wi-Fi"
 msgstr "啟用 _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2122
+#: ../src/applet.c:2195
 msgid "Enable _Mobile Broadband"
 msgstr "啟用流動寬頻(_M)"
 
 #. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2131
+#: ../src/applet.c:2204
 msgid "Enable WiMA_X Mobile Broadband"
 msgstr "啟用 WiMA_X 流動寬頻"
 
 #. Toggle notifications item
-#: ../src/applet.c:2142
+#: ../src/applet.c:2215
 msgid "Enable N_otifications"
 msgstr "啟用通知功能(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2153
+#: ../src/applet.c:2226
 msgid "Connection _Information"
 msgstr "連線資訊(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2163
+#: ../src/applet.c:2236
 msgid "Edit Connections..."
 msgstr "編輯連線…"
 
 #. Help item
-#: ../src/applet.c:2177
+#: ../src/applet.c:2250
 msgid "_Help"
 msgstr "求助(_H)"
 
 #. About item
-#: ../src/applet.c:2186
+#: ../src/applet.c:2259
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../src/applet.c:2364
+#: ../src/applet.c:2512
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "您現在已連線至「%s」。"
+
+#: ../src/applet.c:2553
 msgid "Disconnected"
 msgstr "已斷線"
 
-#: ../src/applet.c:2365
+#: ../src/applet.c:2554
 msgid "The network connection has been disconnected."
 msgstr "網絡連線已中斷。"
 
-#: ../src/applet.c:2598
+#: ../src/applet.c:2789
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "正在準備網絡連線「%s」…"
 
-#: ../src/applet.c:2601
+#: ../src/applet.c:2792
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "網絡連線「%s」需要使用者驗證…"
 
-#: ../src/applet.c:2604 ../src/applet-device-bt.c:235
-#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:594
+#: ../src/applet.c:2795 ../src/applet-device-bt.c:136
+#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:590
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "正在要求提供「%s」的網絡位址…"
 
-#: ../src/applet.c:2607
+#: ../src/applet.c:2798
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "網絡連線「%s」在使用中"
 
-#: ../src/applet.c:2690
+#: ../src/applet.c:2881
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "正在啟動 VPN 連線「%s」…"
 
-#: ../src/applet.c:2693
+#: ../src/applet.c:2884
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN 連線「%s」需要使用者驗證…"
 
-#: ../src/applet.c:2696
+#: ../src/applet.c:2887
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "正在要求 VPN 提供「%s」的網絡位址…"
 
-#: ../src/applet.c:2699
+#: ../src/applet.c:2890
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN 連線「%s」在使用中"
 
-#: ../src/applet.c:2740
+#: ../src/applet.c:2932
 msgid "No network connection"
 msgstr "沒有網絡連接"
 
-#: ../src/applet.c:3441
+#: ../src/applet.c:3639
 msgid "NetworkManager Applet"
 msgstr "NetworkManager 面板程式"
 
-#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
-#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:772
-#: ../src/applet-device-gsm.c:359 ../src/applet-device-wifi.c:859
-#: ../src/applet-device-wimax.c:275
+#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
+#: ../src/applet-device-broadband.c:769 ../src/applet-device-bt.c:90
+#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
+#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
+#: ../src/applet-device-vlan.c:190 ../src/applet-device-wifi.c:856
+#: ../src/applet-device-wimax.c:276
 msgid "Available"
 msgstr "可用"
 
-#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
-#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:816
-#: ../src/applet-device-gsm.c:401 ../src/applet-device-wimax.c:419
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "你現在已連線至「%s」。"
-
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
-#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:820
-#: ../src/applet-device-gsm.c:405 ../src/applet-device-wifi.c:1261
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
+#: ../src/applet-device-broadband.c:796 ../src/applet-device-bt.c:102
+#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
+#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
+#: ../src/applet-device-vlan.c:203 ../src/applet-device-wifi.c:1262
+#: ../src/applet-device-wimax.c:401
 msgid "Connection Established"
 msgstr "已建立連線"
 
-#: ../src/applet-device-bt.c:200
-msgid "You are now connected to the mobile broadband network."
-msgstr "你現在已連線至流動寬頻網絡。"
+#: ../src/applet-device-bond.c:90
+msgid "You are now connected to the bonded network."
+msgstr "您現在已連線至繫結的網絡。"
 
-#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bond.c:114
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "正在準備流動寬頻連線「%s」…"
+msgid "Preparing bond connection '%s'..."
+msgstr "正在準備繫結的連線「%s」…"
 
-#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bond.c:117
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "正在設定流動寬頻連線「%s」…"
+msgid "Configuring bond connection '%s'..."
+msgstr "正在設定繫結的連線「%s」…"
 
-#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
-#: ../src/mobile-helpers.c:591
+#: ../src/applet-device-bond.c:120
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "流動寬頻連線「%s」需要使用者驗證…"
+msgid "User authentication required for bond connection '%s'..."
+msgstr "繫結的連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:611
+#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
+#: ../src/applet-device-infiniband.c:176 ../src/applet-device-vlan.c:237
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "流動寬頻連線「%s」在使用中"
+msgid "Requesting address for '%s'..."
+msgstr "正在要求「%s」的網絡位址…"
+
+#: ../src/applet-device-bond.c:127
+#, c-format
+msgid "Bond connection '%s' active"
+msgstr "繫結的連線「%s」在使用中"
+
+#: ../src/applet-device-bridge.c:90
+msgid "You are now connected to the bridged network."
+msgstr "您現在已連線至橋接的網絡。"
+
+#: ../src/applet-device-bridge.c:114
+#, c-format
+msgid "Preparing bridge connection '%s'..."
+msgstr "正在準備橋接的網絡連線「%s」…"
+
+#: ../src/applet-device-bridge.c:117
+#, c-format
+msgid "Configuring bridge connection '%s'..."
+msgstr "正在設定橋接的網絡連線「%s」…"
+
+#: ../src/applet-device-bridge.c:120
+#, c-format
+msgid "User authentication required for bridge connection '%s'..."
+msgstr "橋接的連線「%s」需要使用者驗證…"
+
+#: ../src/applet-device-bridge.c:127
+#, c-format
+msgid "Bridge connection '%s' active"
+msgstr "橋接的連線「%s」在使用中"
+
+#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+msgid "Wrong PUK code; please contact your provider."
+msgstr "PUK 碼錯誤,請聯絡您的供應商。"
+
+#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+msgid "Wrong PIN code; please contact your provider."
+msgstr "PIN 碼錯誤,請聯絡您的供應商。"
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:532
+msgid "Sending unlock code..."
+msgstr "發送解鎖用的密碼…"
 
-#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:718
-#: ../src/applet-device-gsm.c:305 ../src/applet-dialogs.c:424
+#: ../src/applet-device-broadband.c:715 ../src/applet-device-cdma.c:247
+#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:425
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "流動寬頻 (%s)"
 
-#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:720
-#: ../src/applet-device-gsm.c:307
+#: ../src/applet-device-broadband.c:717 ../src/applet-device-cdma.c:249
+#: ../src/applet-device-gsm.c:305
 #: ../src/connection-editor/new-connection.c:113
-#: ../src/connection-editor/page-mobile.c:389
+#: ../src/connection-editor/page-mobile.c:391
 #: ../src/libnm-gtk/nm-ui-utils.c:333
 msgid "Mobile Broadband"
 msgstr "流動寬頻"
 
 #. Default connection item
-#: ../src/applet-device-cdma.c:316
+#: ../src/applet-device-broadband.c:782
+msgid "New Mobile Broadband connection..."
+msgstr "新的流動寬頻連線…"
+
+#: ../src/applet-device-broadband.c:797
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "您現在已連線至流動寬頻網絡。"
+
+#: ../src/applet-device-broadband.c:932 ../src/applet-device-broadband.c:938
+msgid "Mobile Broadband network."
+msgstr "流動寬頻網絡。"
+
+#: ../src/applet-device-broadband.c:933 ../src/applet-device-cdma.c:403
+#: ../src/applet-device-gsm.c:663
+msgid "You are now registered on the home network."
+msgstr "您現在已註冊至家用網絡。"
+
+#: ../src/applet-device-broadband.c:939 ../src/applet-device-cdma.c:409
+#: ../src/applet-device-gsm.c:669
+msgid "You are now registered on a roaming network."
+msgstr "您現在已註冊至漫遊網絡。"
+
+#: ../src/applet-device-bt.c:103
+msgid "You are now connected to the mobile broadband network."
+msgstr "您現在已連線至流動寬頻網絡。"
+
+#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
+#: ../src/mobile-helpers.c:581
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "正在準備流動寬頻連線「%s」…"
+
+#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
+#: ../src/mobile-helpers.c:584
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "正在設定流動寬頻連線「%s」…"
+
+#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
+#: ../src/mobile-helpers.c:587
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "流動寬頻連線「%s」需要使用者驗證…"
+
+#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:607
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "流動寬頻連線「%s」在使用中"
+
+#. Default connection item
+#: ../src/applet-device-cdma.c:314
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "新的流動寬頻 (CDMA) 連線…"
 
-#: ../src/applet-device-cdma.c:350
+#: ../src/applet-device-cdma.c:341
 msgid "You are now connected to the CDMA network."
-msgstr "你現在已連線至 CDMA 網絡。"
+msgstr "您現在已連線至 CDMA 網絡。"
 
-#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
+#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
 msgid "CDMA network."
 msgstr "CDMA 網絡。"
 
-#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:958
-#: ../src/applet-device-gsm.c:678
-msgid "You are now registered on the home network."
-msgstr "你現在已註冊至家用網絡。"
-
-#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:964
-#: ../src/applet-device-gsm.c:684
-msgid "You are now registered on a roaming network."
-msgstr "你現在已註冊至漫遊網絡。"
-
-#: ../src/applet-device-ethernet.c:62
+#: ../src/applet-device-ethernet.c:44
 msgid "Auto Ethernet"
 msgstr "自動乙太網絡"
 
-#: ../src/applet-device-ethernet.c:202
+#: ../src/applet-device-ethernet.c:96
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "有線網絡 (%s)"
 
-#: ../src/applet-device-ethernet.c:204
+#: ../src/applet-device-ethernet.c:98
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "有線網絡 (%s)"
 
-#: ../src/applet-device-ethernet.c:207
+#: ../src/applet-device-ethernet.c:101
 msgid "Ethernet Networks"
 msgstr "有線網絡"
 
-#: ../src/applet-device-ethernet.c:209
+#: ../src/applet-device-ethernet.c:103
 msgid "Ethernet Network"
 msgstr "有線網絡"
 
-#: ../src/applet-device-ethernet.c:271
+#: ../src/applet-device-ethernet.c:147
 msgid "You are now connected to the ethernet network."
-msgstr "你現在已連線至有線網絡。"
+msgstr "您現在已連線至有線網絡。"
 
-#: ../src/applet-device-ethernet.c:297
+#: ../src/applet-device-ethernet.c:171
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "正在準備有線網絡連線「%s」…"
 
-#: ../src/applet-device-ethernet.c:300
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "正在設定有線網絡連線「%s」…"
 
-#: ../src/applet-device-ethernet.c:303
+#: ../src/applet-device-ethernet.c:177
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "有線網絡連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-ethernet.c:306
+#: ../src/applet-device-ethernet.c:180
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "正要求有線網絡「%s」提供網絡位址…"
 
-#: ../src/applet-device-ethernet.c:310
+#: ../src/applet-device-ethernet.c:184
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "有線網絡連線「%s」在使用中"
 
-#: ../src/applet-device-ethernet.c:491
+#: ../src/applet-device-ethernet.c:365
 msgid "DSL authentication"
 msgstr "DSL 驗證"
 
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:520
-msgid "Wrong PUK code; please contact your provider."
-msgstr "PUK 碼錯誤,請聯絡你的供應商。"
-
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:497
-msgid "Wrong PIN code; please contact your provider."
-msgstr "PIN 碼錯誤,請聯絡你的供應商。"
-
-#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:547
-msgid "Sending unlock code..."
-msgstr "發送解鎖用的密碼…"
-
 #. Default connection item
-#: ../src/applet-device-broadband.c:785
-msgid "New Mobile Broadband connection..."
-msgstr "新的流動寬頻連線…"
-
-#: ../src/applet-device-broadband.c:821
-msgid "You are now connected to the Mobile Broadband network."
-msgstr "你現在已連線至流動寬頻網絡。"
-
-#: ../src/applet-device-broadband.c:957 ../src/applet-device-broadband.c:963
-msgid "Mobile Broadband network."
-msgstr "流動寬頻網絡。"
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:372
+#: ../src/applet-device-gsm.c:370
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "新的流動寬頻 (GSM) 連線…"
 
-#: ../src/applet-device-gsm.c:406
+#: ../src/applet-device-gsm.c:397
 msgid "You are now connected to the GSM network."
-msgstr "你現在已連線至 GSM 網絡。"
+msgstr "您現在已連線至 GSM 網絡。"
 
-#: ../src/applet-device-gsm.c:677 ../src/applet-device-gsm.c:683
+#: ../src/applet-device-gsm.c:662 ../src/applet-device-gsm.c:668
 msgid "GSM network."
 msgstr "GSM 網絡。"
 
+#: ../src/applet-device-infiniband.c:40
+msgid "Auto InfiniBand"
+msgstr "自動 InfiniBand"
+
+#: ../src/applet-device-infiniband.c:92
+#, c-format
+msgid "InfiniBand Networks (%s)"
+msgstr "InfiniBand 網絡 (%s)"
+
+#: ../src/applet-device-infiniband.c:94
+#, c-format
+msgid "InfiniBand Network (%s)"
+msgstr "InfiniBand 網絡 (%s)"
+
+#: ../src/applet-device-infiniband.c:97
+msgid "InfiniBand Networks"
+msgstr "InfiniBand 網絡"
+
+#: ../src/applet-device-infiniband.c:99
+msgid "InfiniBand Network"
+msgstr "InfiniBand 網絡"
+
+#: ../src/applet-device-infiniband.c:143
+msgid "You are now connected to the InfiniBand network."
+msgstr "您現在已連線至 InfiniBand 網絡。"
+
+#: ../src/applet-device-infiniband.c:167
+#, c-format
+msgid "Preparing InfiniBand connection '%s'..."
+msgstr "正在準備 InfiniBand 連線「%s」…"
+
+#: ../src/applet-device-infiniband.c:170
+#, c-format
+msgid "Configuring InfiniBand connection '%s'..."
+msgstr "正在設定 InfiniBand 連線「%s」…"
+
+#: ../src/applet-device-infiniband.c:173
+#, c-format
+msgid "User authentication required for InfiniBand connection '%s'..."
+msgstr "InfiniBand 連線「%s」需要使用者驗證…"
+
+#: ../src/applet-device-infiniband.c:180
+#, c-format
+msgid "InfiniBand connection '%s' active"
+msgstr "InfiniBand 連線「%s」在使用中"
+
+#: ../src/applet-device-vlan.c:204
+msgid "You are now connected to the VLAN."
+msgstr "您現在已連線至 VLAN 網絡。"
+
+#: ../src/applet-device-vlan.c:228
+#, c-format
+msgid "Preparing VLAN connection '%s'..."
+msgstr "正在啟動 VLAN 連線「%s」…"
+
+#: ../src/applet-device-vlan.c:231
+#, c-format
+msgid "Configuring VLAN connection '%s'..."
+msgstr "正在啟動 VLAN 連線「%s」…"
+
+#: ../src/applet-device-vlan.c:234
+#, c-format
+msgid "User authentication required for VLAN connection '%s'..."
+msgstr "VLAN 連線「%s」需要使用者驗證…"
+
+#: ../src/applet-device-vlan.c:241
+#, c-format
+msgid "VLAN connection '%s' active"
+msgstr "VLAN 連線「%s」在使用中"
+
 #: ../src/applet-device-wifi.c:98
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "連接到隱藏的 Wi-Fi 網絡(_C)…"
@@ -644,111 +783,111 @@ msgstr "建立新的 Wi-Fi 網絡(_N)…"
 msgid "(none)"
 msgstr "(無)"
 
-#: ../src/applet-device-wifi.c:787
+#: ../src/applet-device-wifi.c:788
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi 網絡 (%s)"
 
-#: ../src/applet-device-wifi.c:789
+#: ../src/applet-device-wifi.c:790
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi 網絡 (%s)"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:792
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi 網絡"
 
-#: ../src/applet-device-wifi.c:824
+#: ../src/applet-device-wifi.c:821
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi 已停用"
 
-#: ../src/applet-device-wifi.c:825
+#: ../src/applet-device-wifi.c:822
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi 已被硬件開關停用"
 
-#: ../src/applet-device-wifi.c:886
+#: ../src/applet-device-wifi.c:883
 msgid "More networks"
 msgstr "更多網絡"
 
-#: ../src/applet-device-wifi.c:1065
+#: ../src/applet-device-wifi.c:1061
 msgid "Wi-Fi Networks Available"
 msgstr "有 Wi-Fi 網絡可用"
 
-#: ../src/applet-device-wifi.c:1066
+#: ../src/applet-device-wifi.c:1062
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "使用網絡選單來連線到 Wi-Fi 網絡"
 
-#: ../src/applet-device-wifi.c:1260
+#: ../src/applet-device-wifi.c:1261
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
-msgstr "你現在已連線至 Wi-Fi 網絡「%s」。"
+msgstr "您現在已連線至 Wi-Fi 網絡「%s」。"
 
-#: ../src/applet-device-wifi.c:1291
+#: ../src/applet-device-wifi.c:1292
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "正在準備 Wi-Fi 網絡連線「%s」…"
 
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-wifi.c:1295
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "正在設定 Wi-Fi 網絡連線「%s」…"
 
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-wifi.c:1298
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Wi-Fi 網絡連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-wifi.c:1301
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "正在要求提供「%s」的 Wi-Fi 網絡位址…"
 
-#: ../src/applet-device-wifi.c:1321
+#: ../src/applet-device-wifi.c:1322
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Wi-Fi 網絡連線「%s」在使用中: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1327
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Wi-Fi 網絡連線「%s」在使用中"
 
-#: ../src/applet-device-wifi.c:1374
+#: ../src/applet-device-wifi.c:1375
 msgid "Failed to activate connection"
 msgstr "無法使用連線"
 
-#: ../src/applet-device-wifi.c:1393
+#: ../src/applet-device-wifi.c:1394
 msgid "Failed to add new connection"
 msgstr "無法加入新連線"
 
-#: ../src/applet-device-wimax.c:227
+#: ../src/applet-device-wimax.c:228
 #, c-format
 msgid "WiMAX Mobile Broadband (%s)"
 msgstr "WiMAX 流動寬頻 (%s)"
 
-#: ../src/applet-device-wimax.c:229
+#: ../src/applet-device-wimax.c:230
 msgid "WiMAX Mobile Broadband"
 msgstr "WiMAX 流動寬頻"
 
-#: ../src/applet-device-wimax.c:255
+#: ../src/applet-device-wimax.c:256
 msgid "WiMAX is disabled"
 msgstr "WiMAX 已停用"
 
-#: ../src/applet-device-wimax.c:256
+#: ../src/applet-device-wimax.c:257
 msgid "WiMAX is disabled by hardware switch"
 msgstr "WiMAX 已被硬件開關停用"
 
-#: ../src/applet-device-wimax.c:424
+#: ../src/applet-device-wimax.c:402
 msgid "You are now connected to the WiMAX network."
-msgstr "你現在已連線至 WiMAX 網絡。"
+msgstr "您現在已連線至 WiMAX 網絡。"
 
-#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:606
+#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "流動寬頻連線「%s」在使用中:(%d%%%s%s)"
 
-#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:609
+#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:605
 msgid "roaming"
 msgstr "漫遊"
 
@@ -759,7 +898,7 @@ msgstr "顯示連線資訊發生錯誤:"
 #: ../src/applet-dialogs.c:109
 #: ../src/connection-editor/page-wifi-security.c:313
 #: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:406
+#: ../src/wireless-security/wireless-security.c:433
 msgid "LEAP"
 msgstr "LEAP"
 
@@ -767,195 +906,195 @@ msgstr "LEAP"
 msgid "Dynamic WEP"
 msgstr "動態 WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
-#: ../src/applet-dialogs.c:247
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:246
+#: ../src/applet-dialogs.c:248
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:243
+#: ../src/applet-dialogs.c:244
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
+#: ../src/applet-dialogs.c:252 ../src/applet-dialogs.c:261
 #: ../src/libnm-gtk/nm-wifi-dialog.c:881
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/applet-dialogs.c:277
+#: ../src/applet-dialogs.c:278
 #, c-format
 msgid "%s (default)"
 msgstr "%s (預設值)"
 
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:485
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:487
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:361
+#: ../src/applet-dialogs.c:362
 #, c-format
 msgid "%d dB"
 msgstr "%d dB"
 
-#: ../src/applet-dialogs.c:363
+#: ../src/applet-dialogs.c:364
 msgctxt "WiMAX CINR"
 msgid "unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:375
+#: ../src/applet-dialogs.c:376
 msgctxt "WiMAX Base Station ID"
 msgid "unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:411
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "乙太網絡 (%s)"
 
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:414
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:421
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:422
+#: ../src/applet-dialogs.c:423
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:426
+#: ../src/applet-dialogs.c:427
 #, c-format
 msgid "WiMAX (%s)"
 msgstr "WiMAX (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
-#: ../src/connection-editor/page-general.c:345
+#: ../src/applet-dialogs.c:433 ../src/applet-dialogs.c:792
+#: ../src/connection-editor/page-general.c:325
 msgid "General"
 msgstr "一般"
 
-#: ../src/applet-dialogs.c:436
+#: ../src/applet-dialogs.c:437
 msgid "Interface:"
 msgstr "介面:"
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:453
 msgid "Hardware Address:"
 msgstr "硬件位址:"
 
 #. Driver
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:461
 msgid "Driver:"
 msgstr "驅動程式:"
 
-#: ../src/applet-dialogs.c:489
+#: ../src/applet-dialogs.c:490
 msgid "Speed:"
 msgstr "速度:"
 
-#: ../src/applet-dialogs.c:499
+#: ../src/applet-dialogs.c:500
 msgid "Security:"
 msgstr "安全性:"
 
-#: ../src/applet-dialogs.c:512
+#: ../src/applet-dialogs.c:513
 msgid "CINR:"
 msgstr "CINR:"
 
-#: ../src/applet-dialogs.c:525
+#: ../src/applet-dialogs.c:526
 msgid "BSID:"
 msgstr "BSID:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:543
 msgid "IPv4"
 msgstr "IPv4"
 
 #. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
+#: ../src/applet-dialogs.c:554 ../src/applet-dialogs.c:661
 msgid "IP Address:"
 msgstr "IP 位址:"
 
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
+#: ../src/applet-dialogs.c:556 ../src/applet-dialogs.c:572
 msgctxt "Address"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:569
+#: ../src/applet-dialogs.c:570
 msgid "Broadcast Address:"
 msgstr "廣播位址:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:578
+#: ../src/applet-dialogs.c:579
 msgid "Subnet Mask:"
 msgstr "子網絡遮罩:"
 
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:581
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:589 ../src/applet-dialogs.c:676
 msgid "Default Route:"
 msgstr "預設路由:"
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:601
 msgid "Primary DNS:"
 msgstr "主要 DNS:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:610
 msgid "Secondary DNS:"
 msgstr "次要 DNS:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:620
 msgid "Ternary DNS:"
 msgstr "第三 DNS:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
+#: ../src/applet-dialogs.c:635
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:643
+#: ../src/applet-dialogs.c:644
 msgid "Ignored"
 msgstr "已忽略"
 
-#: ../src/applet-dialogs.c:796
+#: ../src/applet-dialogs.c:797
 msgid "VPN Type:"
 msgstr "VPN 類型:"
 
-#: ../src/applet-dialogs.c:803
+#: ../src/applet-dialogs.c:804
 msgid "VPN Gateway:"
 msgstr "VPN 閘道器:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:810
 msgid "VPN Username:"
 msgstr "VPN 使用者名稱:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:816
 msgid "VPN Banner:"
 msgstr "VPN 旗幟:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "Base Connection:"
 msgstr "基礎連線:"
 
-#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:345
+#: ../src/applet-dialogs.c:824 ../src/libnm-gtk/nm-ui-utils.c:345
 msgid "Unknown"
 msgstr "不明"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
+#: ../src/applet-dialogs.c:887
 msgid "No valid active connections found!"
 msgstr "找不到有效的使用中連線!"
 
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:915
 msgid ""
 "Copyright © 2004-2011 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -965,42 +1104,42 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "與許多其他社羣貢獻者與翻譯者"
 
-#: ../src/applet-dialogs.c:942
+#: ../src/applet-dialogs.c:918
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr "用來管理你的網絡裝置與連線的通知區面板程式。"
+msgstr "用來管理您的網絡裝置與連線的通知區面板程式。"
 
-#: ../src/applet-dialogs.c:944
+#: ../src/applet-dialogs.c:920
 msgid "NetworkManager Website"
 msgstr "NetworkManager 網站"
 
-#: ../src/applet-dialogs.c:959
+#: ../src/applet-dialogs.c:935
 msgid "Missing resources"
 msgstr "遺失資源"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:960
 msgid "Mobile broadband network password"
 msgstr "流動寬頻網絡密碼"
 
-#: ../src/applet-dialogs.c:993
+#: ../src/applet-dialogs.c:969
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "連線至「%s」需要密碼。"
 
-#: ../src/applet-dialogs.c:1012
+#: ../src/applet-dialogs.c:984
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../src/applet-dialogs.c:1310
+#: ../src/applet-dialogs.c:1282
 msgid "SIM PIN unlock required"
 msgstr "需要解鎖 SIM PIN 碼"
 
-#: ../src/applet-dialogs.c:1311
+#: ../src/applet-dialogs.c:1283
 msgid "SIM PIN Unlock Required"
 msgstr "需要解鎖 SIM PIN 碼"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1313
+#: ../src/applet-dialogs.c:1285
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1008,25 +1147,25 @@ msgid ""
 msgstr "要使用流動寬頻裝置「%s」之前,需要 SIM PIN 碼。"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1315
+#: ../src/applet-dialogs.c:1287
 msgid "PIN code:"
 msgstr "PIN 碼:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1319
+#: ../src/applet-dialogs.c:1291
 msgid "Show PIN code"
 msgstr "顯示 PIN 碼"
 
-#: ../src/applet-dialogs.c:1321
+#: ../src/applet-dialogs.c:1293
 msgid "SIM PUK unlock required"
 msgstr "需要解鎖 SIM PUK 碼"
 
-#: ../src/applet-dialogs.c:1322
+#: ../src/applet-dialogs.c:1294
 msgid "SIM PUK Unlock Required"
 msgstr "需要解鎖 SIM PUK 碼"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1324
+#: ../src/applet-dialogs.c:1296
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1034,22 +1173,22 @@ msgid ""
 msgstr "要使用流動寬頻裝置「%s」之前,需要 SIM PUK 碼。"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1326
+#: ../src/applet-dialogs.c:1298
 msgid "PUK code:"
 msgstr "PUK 碼:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1301
 msgid "New PIN code:"
 msgstr "新的 PIN 碼:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1303
 msgid "Re-enter new PIN code:"
 msgstr "重新輸入 PIN 碼:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1336
+#: ../src/applet-dialogs.c:1308
 msgid "Show PIN/PUK codes"
 msgstr "顯示 PIN/PUK 碼"
 
@@ -1060,7 +1199,7 @@ msgstr "顯示 PIN/PUK 碼"
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
-msgstr "用來在網絡上區別你的電腦的 IP 位址。請按下「新增」按鈕,加入 IP 位址。"
+msgstr "用來在網絡上區別您的電腦的 IP 位址。請按下「新增」按鈕,加入 IP 位址。"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:2
 #: ../src/connection-editor/ce-ip6-routes.ui.h:2
@@ -1090,32 +1229,32 @@ msgid " "
 msgstr " "
 
 #: ../src/connection-editor/ce-new-connection.ui.h:2
+msgid "Create…"
+msgstr "建立…"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Choose a Connection Type"
 msgstr "請選擇連線類型"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
 "If you are creating a VPN, and the VPN connection you wish to create does "
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
-"選擇你想要建立的連線類型。\n"
+"選擇您想要建立的連線類型。\n"
 "\n"
-"如果要建立 VPN,而你想要建立的 VPN 連線類型沒有出現在清單中,可能是沒有安裝正確的 VPN 外掛程式。"
-
-#: ../src/connection-editor/ce-new-connection.ui.h:6
-msgid "Create…"
-msgstr "建立…"
+"如果要建立 VPN,而您想要建立的 VPN 連線類型沒有出現在清單中,可能是沒有安裝正"
+"確的 VPN 外掛程式。"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:1
-#, fuzzy
 msgid "Round-robin"
-msgstr "四捨五入位數"
+msgstr "循環分配 (Round-robin)"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:2
 msgid "Active backup"
-msgstr "啟用備份"
+msgstr "自動備援 (Active-backup)"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:3
 msgid "XOR"
@@ -1147,11 +1286,11 @@ msgstr "ARP"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:10
 msgid "Bonded _connections:"
-msgstr "繫結的連線(_C):"
+msgstr "繫結的連線(_C):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
 msgid "_Mode:"
-msgstr "模式(_M):"
+msgstr "模式(_M):"
 
 #. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:12
@@ -1169,7 +1308,7 @@ msgstr "刪除(_D)"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 msgid "Monitoring _frequency:"
-msgstr "監控頻率(_F):"
+msgstr "監控頻率(_F):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "ms"
@@ -1178,56 +1317,55 @@ msgstr "毫秒"
 #: ../src/connection-editor/ce-page-bond.ui.h:16
 #: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Interface name:"
-msgstr "介面名稱(_I):"
+msgstr "介面名稱(_I):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:17
 msgid "_Link Monitoring:"
-msgstr "連線監控(_L):"
+msgstr "連線監控(_L):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "ARP _targets:"
-msgstr "ARP 目標(_T):"
+msgstr "ARP 目標(_T):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
-msgstr "一個 IP 位址,或以逗號分隔的 IP 位址清單,這是在檢查連線狀態時查詢用的。"
+msgstr ""
+"一個 IP 位址,或以逗號分隔的 IP 位址清單,這是在檢查連線狀態時查詢用的。"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid "Link _up delay:"
-msgstr "連線延遲(_U):"
+msgstr "連線延遲(_U):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _down delay:"
-msgstr "斷線延遲(_D):"
+msgstr "斷線延遲(_D):"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
-msgstr "路徑消費(_C):"
+msgstr "路徑成本(_C):"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 msgid "_Priority:"
-msgstr "優先順序(_P):"
+msgstr "優先順序(_P):"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-#, fuzzy
-#| msgid "_Transport mode:"
 msgid "_Hairpin mode:"
-msgstr "可重新排列模式"
+msgstr "_Hairpin 模式:"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:1
 msgid "Bridged _connections:"
-msgstr "橋接的連線(_C):"
+msgstr "橋接的連線(_C):"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:6
 msgid "_Forward delay:"
-msgstr "轉送延遲(_F):"
+msgstr "轉送延遲(_F):"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Hello time:"
-msgstr "_Hello 時間:"
+msgstr "_Hello 時間:"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "s"
@@ -1239,17 +1377,17 @@ msgstr "啟用 _STP (生成樹協議)"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:10
 msgid "_Max age:"
-msgstr "最大時間(_M):"
+msgstr "最大時間(_M):"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "_Aging time:"
-msgstr "存續時間(_A):"
+msgstr "存續時間(_A):"
 
-#: ../src/connection-editor/ce-page.c:72
+#: ../src/connection-editor/ce-page.c:67
 msgid "automatic"
 msgstr "自動"
 
-#: ../src/connection-editor/ce-page.c:356
+#: ../src/connection-editor/ce-page.c:348
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "由於不明的錯誤使連線機密的更新失敗。"
 
@@ -1259,11 +1397,11 @@ msgstr "由於不明的錯誤使連線機密的更新失敗。"
 #: ../src/wireless-security/eap-method-simple.ui.h:1
 #: ../src/wireless-security/ws-leap.ui.h:1
 msgid "_Username:"
-msgstr "使用者名稱(_U):"
+msgstr "使用者名稱(_U):"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
 msgid "_Service:"
-msgstr "服務(_S):"
+msgstr "服務(_S):"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:3
 #: ../src/wireless-security/eap-method-leap.ui.h:3
@@ -1276,6 +1414,7 @@ msgstr "顯示密碼(_W)"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
 #: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
 #: ../src/wireless-security/eap-method-leap.ui.h:2
 #: ../src/wireless-security/eap-method-simple.ui.h:2
 #: ../src/wireless-security/ws-leap.ui.h:2
@@ -1284,28 +1423,6 @@ msgid "_Password:"
 msgstr "密碼(_P):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:1
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "是"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-#, fuzzy
-#| msgid "Connection activation failed"
-msgid "Only on activation"
-msgstr "連線生效失敗"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "否"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
@@ -1314,94 +1431,90 @@ msgstr "否"
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
 msgid "Twisted Pair (TP)"
 msgstr "雙絞線 (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
 msgid "Attachment Unit Interface (AUI)"
 msgstr "附加單位介面 (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
 msgid "Media Independent Interface (MII)"
 msgstr "媒體獨立介面 (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
 msgid "_Port:"
 msgstr "連接埠(_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
 msgid "_Speed:"
 msgstr "速度(_S):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
 msgid "Full duple_x"
 msgstr "全雙工(_X)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
 msgid "Aut_onegotiate"
 msgstr "自動協議(_O)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: ../src/connection-editor/ce-page-infiniband.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
 #: ../src/connection-editor/ce-page-wimax.ui.h:1
 msgid "_Device MAC address:"
-msgstr "裝置的 MAC 位址(_D):"
+msgstr "裝置的 MAC 位址(_D):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
 #: ../src/connection-editor/ce-page-wifi.ui.h:10
 msgid "C_loned MAC address:"
-msgstr "複製的 MAC 位址(_L):"
+msgstr "複製的 MAC 位址(_L):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
 #: ../src/connection-editor/ce-page-wifi.ui.h:9
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
 "network device this connection is activated on.  This feature is known as "
 "MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
-msgstr "在這裏輸入的 MAC 位址會成為這個連線使用的網絡裝置的硬件位址。這個功能也稱為 MAC 複製或偽裝。例如:00:11:22:33:44:55"
+msgstr ""
+"在這裏輸入的 MAC 位址會成為這個連線使用的網絡裝置的硬件位址。這個功能也稱為 "
+"MAC 複製或偽裝。例如:00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
-#: ../src/connection-editor/ce-page-infiniband.ui.h:7
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
+#: ../src/connection-editor/ce-page-ethernet.ui.h:17
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
 msgid "_MTU:"
-msgstr "_MTU:"
+msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: ../src/connection-editor/ce-page-ethernet.ui.h:18
+#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "bytes"
 msgstr "位元組"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
-msgid "Carrier de_tect:"
-msgstr ""
-
 #: ../src/connection-editor/ce-page-general.ui.h:1
 msgid "Automatically connect to _VPN when using this connection"
 msgstr "當使用這個連線時自動連線至 _VPN"
@@ -1416,26 +1529,26 @@ msgstr "當這個網絡可用時自動連線(_A)"
 
 #: ../src/connection-editor/ce-page-general.ui.h:4
 msgid "Firewall _zone:"
-msgstr "防火牆地帶(_Z):"
+msgstr "防火牆地帶(_Z):"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-infiniband.ui.h:1
 msgid "_Transport mode:"
-msgstr "傳輸模式(_T):"
+msgstr "傳輸模式(_T):"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:10
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:12
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 msgid "Connected"
 msgstr "成功連線"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
-msgstr "自動使用手動  DNS 設定值"
+msgstr "自動使用手動 DNS 設定值"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
@@ -1459,7 +1572,7 @@ msgstr "分享給其他電腦"
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
 msgid "_Method:"
-msgstr "方法(_M):"
+msgstr "方法(_M):"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
 #: ../src/connection-editor/ce-page-ip6.ui.h:7
@@ -1471,39 +1584,43 @@ 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 用戶端識別,請在此輸入。"
+msgstr ""
+"DHCP 用戶端識別能讓網管人員客製您電腦上的配置。如果您想要使用 DHCP 用戶端識"
+"別,請在此輸入。"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
 #: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
-msgstr "用來解析主機名稱的網域。請使用逗號隔開不同的網域。"
+msgstr "用來解析主機名稱的網域。請使用逗號 \",\" 隔開不同的網域。"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid "D_HCP client ID:"
-msgstr "D_HCP 用戶端 ID:"
+msgstr "D_HCP 用戶端 ID:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
 #: ../src/connection-editor/ce-page-ip6.ui.h:10
 #: ../src/connection-editor/page-ip4.c:308
 #: ../src/connection-editor/page-ip6.c:307
 msgid "S_earch domains:"
-msgstr "搜尋網域(_E):"
+msgstr "搜尋網域(_E):"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
 #: ../src/connection-editor/ce-page-ip6.ui.h:11
 #: ../src/connection-editor/page-ip4.c:299
 #: ../src/connection-editor/page-ip6.c:298
 msgid "DNS ser_vers:"
-msgstr "_DNS 伺服器:"
+msgstr "_DNS 伺服器:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
 #: ../src/connection-editor/ce-page-ip6.ui.h:12
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
-msgstr "網域名稱伺服器的 IP 位址,用來解析主機名稱。請使用逗號來分開多個網域伺服器的位址。"
+msgstr ""
+"網域名稱伺服器的 IP 位址,用來解析主機名稱。請使用逗號 \",\" 來分開多個網域伺"
+"服器的位址。"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 msgid "Require IPv_4 addressing for this connection to complete"
@@ -1513,7 +1630,9 @@ msgstr "需要 IPv_4 addressing 才可完成此連線"
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
-msgstr "當連至可使用 IPv6 的網絡時,若 IPv4 配置失敗,不過 IPv6 配置卻成功的話,請允許連線完成。"
+msgstr ""
+"當連至可使用 IPv6 的網絡時,若 IPv4 配置失敗,不過 IPv6 配置卻成功的話,請允"
+"許連線完成。"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
 #: ../src/connection-editor/ce-page-ip6.ui.h:15
@@ -1528,7 +1647,9 @@ msgstr "需要 IPv_6 addressing 才可完成此連線"
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
-msgstr "當連至可使用 IPv4 的網絡時,若 IPv6 配置失敗,不過 IPv4 配置卻成功的話,請允許連線完成。"
+msgstr ""
+"當連至可使用 IPv4 的網絡時,若 IPv6 配置失敗,不過 IPv4 配置卻成功的話,請允"
+"許連線完成。"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
 msgid "Any"
@@ -1564,7 +1685,7 @@ msgstr "基本"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "Nu_mber:"
-msgstr "數字(_M):"
+msgstr "數字(_M):"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:12
 msgid "Advanced"
@@ -1572,11 +1693,11 @@ msgstr "進階"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:13
 msgid "_APN:"
-msgstr "_APN:"
+msgstr "_APN:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:14
 msgid "N_etwork ID:"
-msgstr "網絡 ID(_E):"
+msgstr "網絡 ID(_E):"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:15
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
@@ -1589,7 +1710,7 @@ msgstr "更改…"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:17
 msgid "P_IN:"
-msgstr "P_IN:"
+msgstr "P_IN:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:18
 msgid "Allow _roaming if home network is not available"
@@ -1605,7 +1726,7 @@ msgstr "驗證"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
 msgid "Allowed methods:"
-msgstr "允許的方式:"
+msgstr "允許的方式:"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:3
 msgid "Configure _Methods…"
@@ -1647,35 +1768,35 @@ msgstr "回響"
 msgid "Send PPP _echo packets"
 msgstr "傳送 PPP 回音封包(_E)"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
-msgstr "父介面(_P):"
+msgstr "父介面(_P):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
 msgid "VLAN interface _name:"
-msgstr "VLAN 介面名稱(_N):"
+msgstr "VLAN 介面名稱(_N):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
 msgid "_Cloned MAC address:"
 msgstr "複製的 MA_C 位址:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
-msgstr "VLAN _id:"
+msgstr "VLAN _id:"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:12
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
 msgid "Device name + number"
 msgstr "裝置名稱 + 編號"
 
 #. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number 
together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:14
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + 編號"
 
 #: ../src/connection-editor/ce-page-wifi-security.ui.h:1
 msgid "S_ecurity:"
-msgstr "安全性(_E):"
+msgstr "安全性(_E):"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
@@ -1691,7 +1812,7 @@ msgstr "基礎架構"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
 msgid "Ad-hoc"
-msgstr "Ad-hoc"
+msgstr "Ad hoc"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "mW"
@@ -1699,7 +1820,7 @@ msgstr "mW"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "Transmission po_wer:"
-msgstr "傳輸耗能(_W):"
+msgstr "傳輸耗能(_W):"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Mb/s"
@@ -1707,11 +1828,11 @@ msgstr "Mb/s"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "_Rate:"
-msgstr "速率(_R):"
+msgstr "速率(_R):"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_BSSID:"
-msgstr "_BSSID:"
+msgstr "_BSSID:"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "C_hannel:"
@@ -1719,7 +1840,7 @@ msgstr "頻道(_H):"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "Ban_d:"
-msgstr "頻寬(_D):"
+msgstr "波段(_D):"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "M_ode:"
@@ -1727,7 +1848,7 @@ msgstr "模式(_O):"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:19
 msgid "SS_ID:"
-msgstr "SS_ID:"
+msgstr "SS_ID:"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
 msgid "Allowed Authentication Methods"
@@ -1777,50 +1898,52 @@ msgstr "Microsoft Challenge Handshake 驗證通訊協定第 2 版"
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
-msgstr "在大多數情況下,網絡供應者的 PPP 伺服器會支援所有的驗證方法。如果連線失敗,請嘗試停用某些方法的支援。"
+msgstr ""
+"在大多數情況下,網絡供應者的 PPP 伺服器會支援所有的驗證方法。如果連線失敗,請"
+"嘗試停用某些方法的支援。"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip4.c:928
-#: ../src/connection-editor/page-ip6.c:894
+#: ../src/connection-editor/ip4-routes-dialog.c:749
+#: ../src/connection-editor/ip6-routes-dialog.c:691
+#: ../src/connection-editor/page-ip4.c:915
+#: ../src/connection-editor/page-ip6.c:881
 msgid "Address"
 msgstr "地址"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/page-ip4.c:945
+#: ../src/connection-editor/ip4-routes-dialog.c:766
+#: ../src/connection-editor/page-ip4.c:932
 msgid "Netmask"
 msgstr "網絡遮罩"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
-#: ../src/connection-editor/page-ip4.c:962
-#: ../src/connection-editor/page-ip6.c:928
+#: ../src/connection-editor/ip4-routes-dialog.c:783
+#: ../src/connection-editor/ip6-routes-dialog.c:725
+#: ../src/connection-editor/page-ip4.c:949
+#: ../src/connection-editor/page-ip6.c:915
 msgid "Gateway"
 msgstr "通訊閘"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:813
-#: ../src/connection-editor/ip6-routes-dialog.c:755
+#: ../src/connection-editor/ip4-routes-dialog.c:800
+#: ../src/connection-editor/ip6-routes-dialog.c:742
 msgid "Metric"
-msgstr "公制"
+msgstr "度量 (Metric)"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip6.c:911
+#: ../src/connection-editor/ip6-routes-dialog.c:708
+#: ../src/connection-editor/page-ip6.c:898
 msgid "Prefix"
 msgstr "前綴"
 
 #: ../src/connection-editor/new-connection.c:101
-#: ../src/connection-editor/page-ethernet.c:272
+#: ../src/connection-editor/page-ethernet.c:242
 #: ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Ethernet"
 msgstr "有線網絡"
 
 #: ../src/connection-editor/new-connection.c:107
-#: ../src/connection-editor/page-wifi.c:471 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: ../src/connection-editor/new-connection.c:119
-#: ../src/connection-editor/page-wimax.c:134
+#: ../src/connection-editor/page-wimax.c:125
 #: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
 msgid "WiMAX"
 msgstr "WiMAX"
@@ -1831,25 +1954,25 @@ msgid "DSL"
 msgstr "DSL"
 
 #: ../src/connection-editor/new-connection.c:131
-#: ../src/connection-editor/page-infiniband.c:189
+#: ../src/connection-editor/page-infiniband.c:159
 #: ../src/libnm-gtk/nm-ui-utils.c:335
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: ../src/connection-editor/new-connection.c:137
-#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/connection-editor/page-bond.c:412 ../src/libnm-gtk/nm-ui-utils.c:337
 #: ../src/libnm-gtk/nm-ui-utils.c:559
 msgid "Bond"
 msgstr "繫結"
 
 #: ../src/connection-editor/new-connection.c:143
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:212
 #: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
 msgid "Bridge"
 msgstr "橋接"
 
 #: ../src/connection-editor/new-connection.c:149
-#: ../src/connection-editor/page-vlan.c:504 ../src/libnm-gtk/nm-ui-utils.c:341
+#: ../src/connection-editor/page-vlan.c:475 ../src/libnm-gtk/nm-ui-utils.c:341
 #: ../src/libnm-gtk/nm-ui-utils.c:563
 msgid "VLAN"
 msgstr "VLAN"
@@ -1890,7 +2013,7 @@ msgstr "刪除連線失敗"
 #: ../src/connection-editor/new-connection.c:562
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
-msgstr "你確定要刪除連線 %s ?"
+msgstr "您確定要刪除連線 %s ?"
 
 #: ../src/connection-editor/nm-connection-editor.c:118
 #, c-format
@@ -1907,51 +2030,51 @@ msgid ""
 "was not found)."
 msgstr "連線編輯器找不到一些需要的資源(找不到 .ui 檔)。"
 
-#: ../src/connection-editor/nm-connection-editor.c:408
+#: ../src/connection-editor/nm-connection-editor.c:413
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:409
+#: ../src/connection-editor/nm-connection-editor.c:414
 msgid "Save any changes made to this connection."
 msgstr "儲存任何對這個連線進行的更改。"
 
-#: ../src/connection-editor/nm-connection-editor.c:410
+#: ../src/connection-editor/nm-connection-editor.c:415
 msgid "_Save..."
 msgstr "儲存(_S)…"
 
-#: ../src/connection-editor/nm-connection-editor.c:411
+#: ../src/connection-editor/nm-connection-editor.c:416
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "驗證以儲存這個連線給此電腦上的所有使用者。"
 
-#: ../src/connection-editor/nm-connection-editor.c:427
+#: ../src/connection-editor/nm-connection-editor.c:432
 msgid "Could not create connection"
 msgstr "無法建立連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:427
+#: ../src/connection-editor/nm-connection-editor.c:432
 msgid "Could not edit connection"
 msgstr "無法編輯連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:429
+#: ../src/connection-editor/nm-connection-editor.c:434
 msgid "Unknown error creating connection editor dialog."
 msgstr "建立連線編輯器對話盒時發生不明錯誤。"
 
-#: ../src/connection-editor/nm-connection-editor.c:536
+#: ../src/connection-editor/nm-connection-editor.c:602
+msgid "Error initializing editor"
+msgstr "初始化編輯器時發生錯誤"
+
+#: ../src/connection-editor/nm-connection-editor.c:923
+msgid "Connection add failed"
+msgstr "新增連線失敗"
+
+#: ../src/connection-editor/nm-connection-editor.c:973
 msgid "Error saving connection"
 msgstr "儲存連線時錯誤"
 
-#: ../src/connection-editor/nm-connection-editor.c:537
+#: ../src/connection-editor/nm-connection-editor.c:974
 #, c-format
 msgid "The property '%s' / '%s' is invalid: %d"
 msgstr "屬性「%s」/「%s」是無效的:%d"
 
-#: ../src/connection-editor/nm-connection-editor.c:631
-msgid "Error initializing editor"
-msgstr "初始化編輯器時發生錯誤"
-
-#: ../src/connection-editor/nm-connection-editor.c:952
-msgid "Connection add failed"
-msgstr "新增連線失敗"
-
 #: ../src/connection-editor/nm-connection-editor.ui.h:2
 msgid "Connection _name:"
 msgstr "連線名稱(_N):"
@@ -2032,20 +2155,24 @@ msgstr "刪除(_D)…"
 msgid "Authenticate to delete the selected connection"
 msgstr "驗證以刪除選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:942
-msgid "Error creating connection"
-msgstr "建立連線時發生錯誤"
+#: ../src/connection-editor/nm-connection-list.c:934
+msgid "No VPN plugins are installed."
+msgstr "尚未安裝任何 VPN 外掛程式。"
 
-#: ../src/connection-editor/nm-connection-list.c:943
+#: ../src/connection-editor/nm-connection-list.c:936
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "不知道如何建立「%s」連線"
 
-#: ../src/connection-editor/nm-connection-list.c:998
+#: ../src/connection-editor/nm-connection-list.c:938
+msgid "Error creating connection"
+msgstr "建立連線時發生錯誤"
+
+#: ../src/connection-editor/nm-connection-list.c:994
 msgid "Error editing connection"
 msgstr "編輯連線時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-list.c:999
+#: ../src/connection-editor/nm-connection-list.c:995
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "找不到 UUID「%s」的連線"
@@ -2058,24 +2185,24 @@ msgstr "802.1x 防護"
 msgid "Could not load 802.1x Security user interface."
 msgstr "無法載入 802.1x 安全性使用者介面。"
 
-#: ../src/connection-editor/page-8021x-security.c:141
+#: ../src/connection-editor/page-8021x-security.c:137
 msgid "Use 802.1_X security for this connection"
 msgstr "在這個連線使用 802.1_X 防護"
 
-#: ../src/connection-editor/page-bond.c:422
+#: ../src/connection-editor/page-bond.c:415
 msgid "Could not load bond user interface."
 msgstr "無法載入繫結的使用者介面。"
 
-#: ../src/connection-editor/page-bond.c:561
+#: ../src/connection-editor/page-bond.c:557
 #, c-format
 msgid "Bond connection %d"
 msgstr "繫結的連線 %d"
 
-#: ../src/connection-editor/page-bridge.c:214
+#: ../src/connection-editor/page-bridge.c:215
 msgid "Could not load bridge user interface."
 msgstr "無法載入橋接的使用者介面。"
 
-#: ../src/connection-editor/page-bridge.c:309
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "橋接的連線 %d"
@@ -2100,50 +2227,54 @@ msgstr "無法載入 DSL 使用者介面。"
 msgid "DSL connection %d"
 msgstr "DSL 連線 %d"
 
-#: ../src/connection-editor/page-ethernet.c:95
-#: ../src/connection-editor/page-infiniband.c:79
-#: ../src/connection-editor/page-wifi.c:113
-#: ../src/connection-editor/page-wimax.c:70
+#: ../src/connection-editor/page-ethernet.c:81
+#: ../src/connection-editor/page-infiniband.c:65
+#: ../src/connection-editor/page-wifi.c:95
+#: ../src/connection-editor/page-wimax.c:61
 msgid ""
 "This option locks this connection to the network device specified by its "
 "permanent MAC address entered here.  Example: 00:11:22:33:44:55"
-msgstr "此選項會將此連線鎖定至在此所輸入的 MAC 位址所指定的網絡裝置。例如:00:11:22:33:44:55"
+msgstr ""
+"此選項會將此連線鎖定至在此所輸入的 MAC 位址所指定的網絡裝置。例如:"
+"00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:274
+#: ../src/connection-editor/page-ethernet.c:244
 msgid "Could not load ethernet user interface."
 msgstr "無法載入有線網絡使用者介面。"
 
-#: ../src/connection-editor/page-ethernet.c:435
+#: ../src/connection-editor/page-ethernet.c:387
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "線網絡連線 %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:59
+#: ../src/connection-editor/page-general.c:55
 #: ../src/libnm-gtk/nm-mobile-providers.c:808
 msgid "Default"
 msgstr "預設"
 
-#: ../src/connection-editor/page-general.c:60
+#: ../src/connection-editor/page-general.c:56
 msgid ""
 "The zone defines the trust level of the connection. Default is not a regular "
 "zone, selecting it results in the use of the default zone set in the "
 "firewall. Only usable if firewalld is active."
-msgstr "定義連線信任等級的地帶。預設值不是正常的地帶,選擇它會直接使用防火牆中預設的地帶設定。只有在 firewalld 啟用時有用。"
+msgstr ""
+"定義連線信任等級的地帶。預設值不是正常的地帶,選擇它會直接使用防火牆中預設的"
+"地帶設定。只有在 firewalld 啟用時有用。"
 
-#: ../src/connection-editor/page-general.c:61
+#: ../src/connection-editor/page-general.c:57
 msgid "FirewallD is not running."
 msgstr "FirewallD 沒有執行。"
 
-#: ../src/connection-editor/page-general.c:348
+#: ../src/connection-editor/page-general.c:328
 msgid "Could not load General user interface."
 msgstr "無法載入一般使用者介面。"
 
-#: ../src/connection-editor/page-infiniband.c:192
+#: ../src/connection-editor/page-infiniband.c:162
 msgid "Could not load InfiniBand user interface."
 msgstr "無法載入 InfiniBand 使用者介面。"
 
-#: ../src/connection-editor/page-infiniband.c:302
+#: ../src/connection-editor/page-infiniband.c:254
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 連線 %d"
@@ -2203,18 +2334,18 @@ msgstr "額外的 _DNS 伺服器:"
 #: ../src/connection-editor/page-ip4.c:306
 #: ../src/connection-editor/page-ip6.c:305
 msgid "Additional s_earch domains:"
-msgstr "額外的搜尋網域: domains:"
+msgstr "額外的搜尋網域(_E):"
 
-#: ../src/connection-editor/page-ip4.c:860
+#: ../src/connection-editor/page-ip4.c:847
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "編輯 %s 的 IPv4 路由"
 
-#: ../src/connection-editor/page-ip4.c:1011
+#: ../src/connection-editor/page-ip4.c:998
 msgid "IPv4 Settings"
 msgstr "IPv4 設定"
 
-#: ../src/connection-editor/page-ip4.c:1013
+#: ../src/connection-editor/page-ip4.c:1000
 msgid "Could not load IPv4 user interface."
 msgstr "無法載入 IPv4 使用者介面。"
 
@@ -2231,110 +2362,110 @@ msgstr "忽略"
 msgid "Automatic, DHCP only"
 msgstr "自動,僅使用 DHCP"
 
-#: ../src/connection-editor/page-ip6.c:826
+#: ../src/connection-editor/page-ip6.c:813
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "為 %s 編輯 IPv6 路由"
 
-#: ../src/connection-editor/page-ip6.c:975
+#: ../src/connection-editor/page-ip6.c:962
 msgid "IPv6 Settings"
 msgstr "IPv6 設定"
 
-#: ../src/connection-editor/page-ip6.c:977
+#: ../src/connection-editor/page-ip6.c:964
 msgid "Could not load IPv6 user interface."
 msgstr "無法載入 IPv6 使用者介面。"
 
 #: ../src/connection-editor/page-master.c:284
 #, c-format
 msgid "%s slave %d"
-msgstr "%s 服務 %d"
+msgstr "%s slave %d"
 
-#: ../src/connection-editor/page-mobile.c:391
+#: ../src/connection-editor/page-mobile.c:393
 msgid "Could not load mobile broadband user interface."
 msgstr "無法載入流動寬頻使用者介面。"
 
-#: ../src/connection-editor/page-mobile.c:408
+#: ../src/connection-editor/page-mobile.c:410
 msgid "Unsupported mobile broadband connection type."
 msgstr "不支援的流動寬頻連線類型。"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:658
+#: ../src/connection-editor/page-mobile.c:660
 msgid "Select Mobile Broadband Provider Type"
 msgstr "選擇流動寬頻供應商類型"
 
-#: ../src/connection-editor/page-mobile.c:693
+#: ../src/connection-editor/page-mobile.c:687
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
-msgstr "請選擇你的無線寬頻供應商所使用的技術。如果你不確定,請洽詢供應商。"
+msgstr "請選擇您的無線寬頻供應商所使用的技術。如果您不確定,請洽詢供應商。"
 
-#: ../src/connection-editor/page-mobile.c:698
+#: ../src/connection-editor/page-mobile.c:692
 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:705
+#: ../src/connection-editor/page-mobile.c:699
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "我的供應商使用 C_DMA 為主的技術(例如 1xRTT、EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:715 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:709 ../src/mb-menu-item.c:54
 #: ../src/mobile-helpers.c:270
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:718 ../src/mb-menu-item.c:58
+#: ../src/connection-editor/page-mobile.c:712 ../src/mb-menu-item.c:58
 #: ../src/mobile-helpers.c:268
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-ppp.c:137
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
+#: ../src/connection-editor/page-ppp.c:138
 #: ../src/wireless-security/eap-method-ttls.c:230
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
+#: ../src/connection-editor/page-ppp.c:139
 #: ../src/wireless-security/eap-method-ttls.c:280
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:140
 #: ../src/wireless-security/eap-method-fast.c:277
 #: ../src/wireless-security/eap-method-peap.c:246
 #: ../src/wireless-security/eap-method-ttls.c:263
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
+#: ../src/connection-editor/page-ppp.c:141
 #: ../src/wireless-security/eap-method-ttls.c:247
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:144
 msgid "none"
 msgstr "沒有"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../src/connection-editor/page-ppp.c:204
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "編輯 %s 的 PPP 驗證方法"
 
-#: ../src/connection-editor/page-ppp.c:284
+#: ../src/connection-editor/page-ppp.c:287
 msgid "PPP Settings"
 msgstr "PPP 設定值"
 
-#: ../src/connection-editor/page-ppp.c:286
+#: ../src/connection-editor/page-ppp.c:289
 msgid "Could not load PPP user interface."
 msgstr "無法載入 PPP 使用者介面。"
 
-#: ../src/connection-editor/page-vlan.c:506
+#: ../src/connection-editor/page-vlan.c:477
 msgid "Could not load vlan user interface."
 msgstr "無法載入 vlan 使用者介面。"
 
-#: ../src/connection-editor/page-vlan.c:719
+#: ../src/connection-editor/page-vlan.c:673
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN 連線 %d"
@@ -2373,31 +2504,35 @@ msgid ""
 "Select the type of VPN you wish to use for the new connection.  If the type "
 "of VPN connection you wish to create does not appear in the list, you may "
 "not have the correct VPN plugin installed."
-msgstr "選擇你想要用在新連線中的 VPN 類型。如果你想要建立的 VPN 連線類型沒有出現在清單中,可能是沒有安裝正確的 VPN 外掛程式。"
+msgstr ""
+"選擇您想要用在新連線中的 VPN 類型。如果您想要建立的 VPN 連線類型沒有出現在清"
+"單中,可能是沒有安裝正確的 VPN 外掛程式。"
 
-#: ../src/connection-editor/page-wifi.c:98
+#: ../src/connection-editor/page-wifi.c:85
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
 "by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr "此選項會將此連線鎖定至在此所輸入的 BSSID 所指定的 Wi-Fi 存取點(AP)。例如:00:11:22:33:44:55"
+msgstr ""
+"此選項會將此連線鎖定至在此所輸入的 BSSID 所指定的 Wi-Fi 存取點(AP)。例如:"
+"00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:190
-#: ../src/connection-editor/page-wifi.c:194
-#: ../src/connection-editor/page-wifi.c:215
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:176
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "default"
 msgstr "預設"
 
-#: ../src/connection-editor/page-wifi.c:219
+#: ../src/connection-editor/page-wifi.c:201
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:473
+#: ../src/connection-editor/page-wifi.c:467
 msgid "Could not load Wi-Fi user interface."
 msgstr "無法載入 Wi-Fi 使用者介面。"
 
-#: ../src/connection-editor/page-wifi.c:650
+#: ../src/connection-editor/page-wifi.c:645
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 連線 %d"
@@ -2444,11 +2579,11 @@ msgstr "Wi-Fi 安全性"
 msgid "Could not load Wi-Fi security user interface."
 msgstr "無法載入 Wi-Fi 安全性使用者介面。"
 
-#: ../src/connection-editor/page-wimax.c:137
+#: ../src/connection-editor/page-wimax.c:128
 msgid "Could not load WiMAX user interface."
 msgstr "無法載入 WiMAX 使用者介面。"
 
-#: ../src/connection-editor/page-wimax.c:233
+#: ../src/connection-editor/page-wimax.c:224
 #, c-format
 msgid "WiMAX connection %d"
 msgstr "WiMAX 連線 %d"
@@ -2485,7 +2620,7 @@ msgstr "取代(_R)"
 #: ../src/connection-editor/vpn-helpers.c:296
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
-msgstr "你是否要以準備儲存的 VPN 連線取代 %s?"
+msgstr "您是否要以準備儲存的 VPN 連線取代 %s?"
 
 #: ../src/connection-editor/vpn-helpers.c:332
 msgid "Cannot export VPN connection"
@@ -2524,86 +2659,86 @@ msgid ""
 "Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
 msgstr "無法進行藍牙的配置(找不到 NetworkManager:(%s) %s)。"
 
-#: ../src/gnome-bluetooth/bt-widget.c:445
+#: ../src/gnome-bluetooth/bt-widget.c:441
 msgid "Use your mobile phone as a network device (PAN/NAP)"
 msgstr "使用手機作為網絡裝置(PAN/NAP)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:454
+#: ../src/gnome-bluetooth/bt-widget.c:450
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr "使用手機存取互聯網(DUN)"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:336
+#: ../src/gnome-bluetooth/nma-bt-device.c:324
 #, c-format
 msgid "Error: %s"
 msgstr "錯誤:%s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:443
+#: ../src/gnome-bluetooth/nma-bt-device.c:431
 #, c-format
 msgid "Failed to create DUN connection: %s"
 msgstr "無法建立 DUN 連線:%s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:445
-#: ../src/gnome-bluetooth/nma-bt-device.c:959
+#: ../src/gnome-bluetooth/nma-bt-device.c:433
+#: ../src/gnome-bluetooth/nma-bt-device.c:947
 msgid "Your phone is now ready to use!"
-msgstr "你的電話現在已經可以使用!"
+msgstr "您的電話現在已經可以使用!"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:468
+#: ../src/gnome-bluetooth/nma-bt-device.c:456
 msgid "Mobile wizard was canceled"
-msgstr "行動精靈已經取消"
+msgstr "流動精靈已經取消"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:477
+#: ../src/gnome-bluetooth/nma-bt-device.c:465
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "不明的電話裝置類型(非 GSM 或 CDMA)"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:513
+#: ../src/gnome-bluetooth/nma-bt-device.c:501
 msgid "unknown modem type."
 msgstr "不明的數據機類型。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:733
-#: ../src/gnome-bluetooth/nma-bt-device.c:739
+#: ../src/gnome-bluetooth/nma-bt-device.c:721
+#: ../src/gnome-bluetooth/nma-bt-device.c:727
 msgid "failed to connect to the phone."
 msgstr "無法連線至電話。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:770
+#: ../src/gnome-bluetooth/nma-bt-device.c:758
 msgid "unexpectedly disconnected from the phone."
 msgstr "電話無預期離線。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:780
+#: ../src/gnome-bluetooth/nma-bt-device.c:768
 msgid "timed out detecting phone details."
 msgstr "在時間內偵測不到電話的詳細資料。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:791
+#: ../src/gnome-bluetooth/nma-bt-device.c:779
 msgid "Detecting phone configuration..."
 msgstr "偵測電話的配置…"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:823
+#: ../src/gnome-bluetooth/nma-bt-device.c:811
 msgid "error getting bus connection"
 msgstr "取得匯流排連線時發生錯誤"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:920
+#: ../src/gnome-bluetooth/nma-bt-device.c:908
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 msgstr "預設的藍牙配接卡必須在設定撥號網絡連線前啟用。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
+#: ../src/gnome-bluetooth/nma-bt-device.c:945
 #, c-format
 msgid "Failed to create PAN connection: %s"
 msgstr "無法建立 PAN 連線:%s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:978
+#: ../src/gnome-bluetooth/nma-bt-device.c:966
 #, c-format
 msgid "%s Network"
 msgstr "%s 網絡"
 
 #: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "自動解鎖這個裝置"
-
-#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "解鎖(_U)"
 
+#: ../src/gsm-unlock.ui.h:2
+msgid "Automatically unlock this device"
+msgstr "自動解鎖這個裝置"
+
 #: ../src/info.ui.h:1
 msgid "Connection Information"
 msgstr "連線資訊"
@@ -2612,157 +2747,160 @@ msgstr "連線資訊"
 msgid "Active Network Connections"
 msgstr "啟用網絡連線"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:208
+#: ../src/libnm-gtk/nm-mobile-wizard.c:204
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
-msgstr "行動寬連線已經配置了以下設定:"
+msgstr "流動寬連線已經配置了以下設定:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:215
+#: ../src/libnm-gtk/nm-mobile-wizard.c:211
 msgid "Your Device:"
-msgstr "你的裝置:"
+msgstr "您的裝置:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:226
+#: ../src/libnm-gtk/nm-mobile-wizard.c:222
 msgid "Your Provider:"
-msgstr "你的供應商:"
+msgstr "您的供應商:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:237
+#: ../src/libnm-gtk/nm-mobile-wizard.c:233
 msgid "Your Plan:"
-msgstr "你的計劃:"
+msgstr "您的計劃:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: ../src/libnm-gtk/nm-mobile-wizard.c:254
 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 "現在,根據你所選取的設定,電腦將連上你的流動寬頻供應商。如果連線失敗,或是你無法存取網絡資源,請檢查設定。要修改流動寬頻連線的設定,請從「系統」 >> 「偏好設定」中,選擇「網絡連線」。"
+msgstr ""
+"現在,根據您所選取的設定,電腦將連上您的流動寬頻供應商。如果連線失敗,或是您"
+"無法存取網絡資源,請檢查設定。要修改流動寬頻連線的設定,請從「系統」 >> 「偏"
+"好設定」中,選擇「網絡連線」。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:274
+#: ../src/libnm-gtk/nm-mobile-wizard.c:266
 msgid "Confirm Mobile Broadband Settings"
 msgstr "確認流動寬頻設定"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:338
+#: ../src/libnm-gtk/nm-mobile-wizard.c:330
 msgid "Unlisted"
 msgstr "未列出的"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:493
+#: ../src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "_Select your plan:"
-msgstr "選擇你的計劃(_S):"
+msgstr "選擇您的計劃(_S):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:517
+#: ../src/libnm-gtk/nm-mobile-wizard.c:505
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "選擇計劃的 _APN(Access Point Name,存取點名稱):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:541
+#: ../src/libnm-gtk/nm-mobile-wizard.c:525
 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"
 "\n"
-"如果你不確定所使用的計劃,請洽詢供應商,以得知計劃的 APN 為何。"
+"如果您不確定所使用的計劃,請洽詢供應商,以得知計劃的 APN 為何。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:548
+#: ../src/libnm-gtk/nm-mobile-wizard.c:532
 msgid "Choose your Billing Plan"
-msgstr "選擇你的計費計劃"
+msgstr "選擇您的計費計劃"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:597
+#: ../src/libnm-gtk/nm-mobile-wizard.c:581
 msgid "My plan is not listed..."
 msgstr "我的計劃沒有列出…"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../src/libnm-gtk/nm-mobile-wizard.c:734
 msgid "Select your provider from a _list:"
-msgstr "請從清單裏選擇供應商(_L):"
+msgstr "請從清單裏選擇供應商(_L):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnm-gtk/nm-mobile-wizard.c:747
 msgid "Provider"
 msgstr "供應商"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: ../src/libnm-gtk/nm-mobile-wizard.c:772
 msgid "I can't find my provider and I wish to enter it _manually:"
-msgstr "我找不到我的供應商,我想要手動輸入(_M):"
+msgstr "我找不到我的供應商,我想要手動輸入(_M):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:803
+#: ../src/libnm-gtk/nm-mobile-wizard.c:785
 msgid "Provider:"
 msgstr "供應商:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:827
+#: ../src/libnm-gtk/nm-mobile-wizard.c:802
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "我的供應商使用 GSM 技術(GPRS、EDGE、UMTS、HSPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:833
+#: ../src/libnm-gtk/nm-mobile-wizard.c:804
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "我的供應商使用 CDMA 技術(1xRTT、EVDO)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:844
+#: ../src/libnm-gtk/nm-mobile-wizard.c:815
 msgid "Choose your Provider"
-msgstr "選擇你的供應商"
+msgstr "選擇您的供應商"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or Region List:"
 msgstr "國家或地區清單:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1080
 msgid "Country or region"
 msgstr "國家或地區"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1090
 msgid "My country is not listed"
 msgstr "我的國家並沒有列出來"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1140
 msgid "Choose your Provider's Country or Region"
-msgstr "選擇你的供應商的國家或地區"
+msgstr "選擇您的供應商的國家或地區"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1194
 msgid "Installed GSM device"
 msgstr "已安裝的 GSM 裝置"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1197
 msgid "Installed CDMA device"
 msgstr "已安裝的 CDMA 裝置"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1365
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
-msgstr "這能幫助你輕易地設定流動寬頻連線,連至手機(3G)網絡。"
+msgstr "這能幫助您輕易地設定流動寬頻連線,連至手機 (3G) 網絡。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1370
 msgid "You will need the following information:"
-msgstr "你需要以下資訊:"
+msgstr "您需要以下資訊:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1381
 msgid "Your broadband provider's name"
 msgstr "寬頻供應商的名稱"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1387
 msgid "Your broadband billing plan name"
 msgstr "寬頻計費計劃的名稱"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1393
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-msgstr "(在有些情況下)你的寬頻計費計劃的 APN(存取點名稱)"
+msgstr "(在某些情況下) 您的寬頻計費計劃的 APN (存取點名稱)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1420
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "為這個流動寬頻裝置建立連線(_T)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1435
 msgid "Any device"
 msgstr "任何裝置"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1448
 msgid "Set up a Mobile Broadband Connection"
 msgstr "設定流動寬頻連線"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1621
 msgid "New Mobile Broadband Connection"
 msgstr "新的流動寬頻連線"
 
@@ -2793,7 +2931,7 @@ msgstr "USB"
 #. Translators: the first %s is a bus name (eg, "USB") or
 #. * product name, the second is a device type (eg,
 #. * "Ethernet"). You can change this to something like
-#. * "%$2s (%$1s)" if there's no grammatical way to combine
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
 #: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
@@ -2818,11 +2956,11 @@ msgstr "需要密碼或是加密密碼匙來存取 Wi-Fi 網絡「%s」。"
 
 #: ../src/libnm-gtk/nm-wifi-dialog.c:1138
 msgid "Wi-Fi Network Authentication Required"
-msgstr "Wi-Fi 網絡連線「%s」需要驗證"
+msgstr "Wi-Fi 網絡連線需要驗證"
 
 #: ../src/libnm-gtk/nm-wifi-dialog.c:1140
 msgid "Authentication required by Wi-Fi network"
-msgstr "Wi-Fi 網絡連線「%s」需要驗證"
+msgstr "Wi-Fi 網絡連線需要驗證"
 
 #: ../src/libnm-gtk/nm-wifi-dialog.c:1145
 msgid "Create New Wi-Fi Network"
@@ -2834,7 +2972,7 @@ msgstr "新的 Wi-Fi 網絡"
 
 #: ../src/libnm-gtk/nm-wifi-dialog.c:1148
 msgid "Enter a name for the Wi-Fi network you wish to create."
-msgstr "輸入你要建立的 Wi-Fi 網絡的名稱。"
+msgstr "輸入您要建立的 Wi-Fi 網絡的名稱。"
 
 #: ../src/libnm-gtk/nm-wifi-dialog.c:1150
 msgid "Connect to Hidden Wi-Fi Network"
@@ -2848,29 +2986,38 @@ msgstr "隱藏的 Wi-Fi 網絡"
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
-msgstr "輸入你要連接的隱藏 Wi-Fi 網絡的名稱與安全性詳細資料。"
+msgstr "輸入您要連接的隱藏 Wi-Fi 網絡的名稱與安全性詳細資料。"
+
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Secondary Password:"
+msgstr "第二密碼(_S):"
+
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
+msgid "Sh_ow passwords"
+msgstr "顯示密碼(_O)"
 
 #: ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
-msgstr "Wi-Fi 安全性(_S):"
+msgstr "Wi-Fi 安全性(_S):"
 
 #: ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
-msgstr "連線(_N):"
+msgstr "連線(_N):"
 
 #: ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
-msgstr "Wi-Fi 介面卡(_A):"
+msgstr "Wi-Fi 介面卡(_A):"
 
 #: ../src/main.c:73
 msgid "Usage:"
-msgstr "用法:"
+msgstr "用法:"
 
 #: ../src/main.c:75
 msgid ""
 "This program is a component of NetworkManager (http://projects.gnome.org/";
 "NetworkManager)."
-msgstr "本程式是 NetworkManager(http://projects.gnome.org/NetworkManager)的元件";
+msgstr ""
+"本程式是 NetworkManager(http://projects.gnome.org/NetworkManager)的元件";
 
 #: ../src/main.c:76
 msgid ""
@@ -2925,7 +3072,7 @@ msgstr "未註冊"
 #: ../src/mb-menu-item.c:136
 #, c-format
 msgid "Home network (%s)"
-msgstr "家用網絡(%s)"
+msgstr "家用網絡 (%s)"
 
 #: ../src/mb-menu-item.c:138
 #, c-format
@@ -2948,12 +3095,12 @@ msgstr "%s (%s 漫遊)"
 #: ../src/mb-menu-item.c:156 ../src/mb-menu-item.c:162
 #, c-format
 msgid "%s (roaming)"
-msgstr "%s(漫遊)"
+msgstr "%s (漫遊)"
 
 #: ../src/mb-menu-item.c:165
 #, c-format
 msgid "Roaming network (%s)"
-msgstr "漫遊網絡(%s)"
+msgstr "漫遊網絡 (%s)"
 
 #: ../src/mb-menu-item.c:167
 #, c-format
@@ -2981,22 +3128,24 @@ msgstr "%s 連線"
 
 #: ../src/wireless-security/eap-method.c:275
 msgid "No Certificate Authority certificate chosen"
-msgstr "未選擇任何證書授權單位(CA)證書"
+msgstr "未選擇任何證書授權單位 (CA) 證書"
 
 #: ../src/wireless-security/eap-method.c:276
 msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections "
 "to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
 "Authority certificate?"
-msgstr "不使用證書中心 (CA) 的證書會造成連線不安全、流氓 Wi-Fi 網絡 (可能被竊取、劫聽之意)。是否要選擇一個證書中心的證書?"
+msgstr ""
+"不使用證書中心 (CA) 的證書會造成連線不安全、流氓 Wi-Fi 網絡 (可能被竊取、劫聽"
+"之意)。是否要選擇一個證書中心的證書?"
 
 #: ../src/wireless-security/eap-method.c:285
 msgid "Choose CA Certificate"
 msgstr "選擇 CA 證書"
 
 #: ../src/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER, PEM, 或 PKCS#12 私密密碼匙(*.der, *.pem, *.p12)"
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER、PEM 或是 PKCS#12 私人金鑰 (*.der, *.pem, *.p12, *.key)"
 
 #: ../src/wireless-security/eap-method.c:648
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
@@ -3039,20 +3188,20 @@ msgstr "匿名識別(_M):"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:6
 msgid "PAC _file:"
-msgstr "PAC 檔案(_F):"
+msgstr "PAC 檔案(_F):"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
 #: ../src/wireless-security/eap-method-peap.ui.h:7
 #: ../src/wireless-security/eap-method-ttls.ui.h:4
 msgid "_Inner authentication:"
-msgstr "內部驗證(_I):"
+msgstr "內部驗證(_I):"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:8
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允許自動供應 PAC (_V)"
 
 #: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/wireless-security.c:409
 msgid "MD5"
 msgstr "MD5"
 
@@ -3060,7 +3209,7 @@ msgstr "MD5"
 #: ../src/wireless-security/eap-method-tls.c:434
 #: ../src/wireless-security/eap-method-ttls.c:350
 msgid "Choose a Certificate Authority certificate..."
-msgstr "選擇證書授權單位(CA)證書…"
+msgstr "選擇證書授權單位 (CA) 證書…"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
@@ -3074,11 +3223,11 @@ msgstr "版本 1"
 #: ../src/wireless-security/eap-method-tls.ui.h:3
 #: ../src/wireless-security/eap-method-ttls.ui.h:3
 msgid "C_A certificate:"
-msgstr "CA 證書(_A):"
+msgstr "C_A 證書:"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:8
 msgid "PEAP _version:"
-msgstr "PEAP 版本(_V):"
+msgstr "PEAP 版本(_V):"
 
 #: ../src/wireless-security/eap-method-simple.ui.h:3
 msgid "As_k for this password every time"
@@ -3096,17 +3245,18 @@ msgid ""
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"所選擇的私密密碼匙似乎沒有密碼保護。 這可能會導致不安全的後果。請選擇用密碼保護的私密密碼匙。\n"
+"所選擇的私密密碼匙似乎沒有密碼保護。這可能會導致不安全的後果。請選擇用密碼保"
+"護的私密密碼匙。\n"
 "\n"
-"(你可以使用 openssl 來加密你的私密密碼匙)"
+"(您可以使用 openssl 來加密您的私密密碼匙)"
 
 #: ../src/wireless-security/eap-method-tls.c:428
 msgid "Choose your personal certificate..."
-msgstr "選擇你的個人證書…"
+msgstr "選擇您的個人證書…"
 
 #: ../src/wireless-security/eap-method-tls.c:440
 msgid "Choose your private key..."
-msgstr "選擇你的私密密碼匙…"
+msgstr "選擇您的私密密碼匙…"
 
 #: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
@@ -3128,19 +3278,19 @@ msgstr "私密密碼匙密碼(_P):"
 msgid "Don't _warn me again"
 msgstr "不要再警告我(_W)"
 
-#: ../src/wireless-security/wireless-security.c:394
+#: ../src/wireless-security/wireless-security.c:421
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:445
 msgid "FAST"
 msgstr "快"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:456
 msgid "Tunneled TLS"
 msgstr "穿隧式 TLS"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:467
 msgid "Protected EAP (PEAP)"
 msgstr "保護式 EAP (PEAP)"
 
@@ -3148,32 +3298,32 @@ msgstr "保護式 EAP (PEAP)"
 #: ../src/wireless-security/ws-wep-key.ui.h:9
 #: ../src/wireless-security/ws-wpa-eap.ui.h:2
 msgid "Au_thentication:"
-msgstr "驗證(_E):"
+msgstr "驗證(_E):"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "Open System"
-msgstr "開放系統"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Shared Key"
-msgstr "共享密碼匙"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:3
 msgid "1 (Default)"
 msgstr "1 (預設值)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "2"
 msgstr "2"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: ../src/wireless-security/ws-wep-key.ui.h:3
 msgid "3"
 msgstr "3"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:6
+#: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "4"
 msgstr "4"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:5
+msgid "Open System"
+msgstr "開放系統"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr "共享密碼匙"
+
 #: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "_Key:"
 msgstr "密碼匙(_K):"
@@ -3184,11 +3334,19 @@ msgstr "顯示密碼匙(_W)"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x:"
-msgstr "WEP 索引(_X):"
+msgstr "WEP 索引(_X):"
+
+#~ msgid "Yes"
+#~ msgstr "是"
+
+#~ msgid "Only on activation"
+#~ msgstr "只在生效時"
+
+#~ msgid "No"
+#~ msgstr "否"
 
-#~| msgid "NetworkManager is not running..."
 #~ msgid "ModemManager is not running"
-#~ msgstr "ModemManager 沒有執行"
+#~ msgstr "ModemManager 未有運行"
 
 #~ msgid "Connect _automatically"
 #~ msgstr "自動連線(_A)"
@@ -3203,41 +3361,41 @@ msgstr "WEP 索引(_X):"
 #~ msgstr "無法編輯新連線"
 
 #~ msgid "Wireless Networks (%s)"
-#~ msgstr "無線網路 (%s)"
+#~ msgstr "無線網絡 (%s)"
 
 #~ msgid "Wireless Network (%s)"
-#~ msgstr "無線網路 (%s)"
+#~ msgstr "無線網絡 (%s)"
 
 #~ msgid "Wireless Network"
 #~ msgid_plural "Wireless Networks"
-#~ msgstr[0] "無線網路"
+#~ msgstr[0] "無線網絡"
 
 #~ msgid "wireless is disabled"
-#~ msgstr "無線網路已停用"
+#~ msgstr "無線網絡已停用"
 
 #~ msgid "wireless is disabled by hardware switch"
-#~ msgstr "無線網路已被硬體開關停用"
+#~ msgstr "無線網絡已被硬體開關停用"
 
 #~ msgid "Preparing wireless network connection '%s'..."
-#~ msgstr "正在準備無線網路連線「%s」…"
+#~ msgstr "正在準備無線網絡連線「%s」…"
 
 #~ msgid "Configuring wireless network connection '%s'..."
-#~ msgstr "正在設定無線網路連線「%s」…"
+#~ msgstr "正在設定無線網絡連線「%s」…"
 
 #~ msgid "Requesting a wireless network address for '%s'..."
-#~ msgstr "正在要求無線網路「%s」提供網路位址…"
+#~ msgstr "正在要求無線網絡「%s」提供網絡位址…"
 
 #~ msgid "Wireless network connection '%s' active"
-#~ msgstr "無線網路連線「%s」在使用中"
+#~ msgstr "無線網絡連線「%s」在使用中"
 
 #~ msgid "Could not load Wired Security security user interface."
 #~ msgstr "無法載入 Wired Security 安全使用者介面。"
 
 #~ msgid "Wireless"
-#~ msgstr "無線網路"
+#~ msgstr "無線網絡"
 
 #~ msgid "Wireless connection %d"
-#~ msgstr "無線網路連線 %d"
+#~ msgstr "無線網絡連線 %d"
 
 #~ msgid "_Import"
 #~ msgstr "匯入(_I)"
@@ -3255,7 +3413,166 @@ msgstr "WEP 索引(_X):"
 #~ msgstr "找不到藍牙裝置。"
 
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-#~ msgstr "無法進行藍牙的配置(無法連至 D-Bus proxy)。"
+#~ msgstr "無法進行藍牙的配置(無法建立 D-Bus proxy)。"
 
 #~ msgid "_Security:"
 #~ msgstr "安全性(_S):"
+
+#~ msgid "Disconnected - you are now offline"
+#~ msgstr "未連線 - 您現在是離線"
+
+#~ msgid "Wireless network"
+#~ msgstr "無線網絡"
+
+#~ msgid "Ethernet network"
+#~ msgstr "乙太網絡"
+
+#~ msgid "Modem network"
+#~ msgstr "調制解調器網絡"
+
+#~ msgid "Mobile Broadband network"
+#~ msgstr "流動寬頻網絡"
+
+#~ msgid "CDMA network"
+#~ msgstr "CDMA 網絡"
+
+#~ msgid "Wired network"
+#~ msgstr "有線網絡"
+
+#~ msgid "ad-hoc"
+#~ msgstr "ad-hoc"
+
+#~ msgid "secure."
+#~ msgstr "安全。"
+
+#~ msgid "WiMAX network"
+#~ msgstr "WiMAX 網絡"
+
+#~ msgid "New wireless network"
+#~ msgstr "新的無線網絡"
+
+#~ msgid "E_xport"
+#~ msgstr "匯出(_X)"
+
+#~ msgid "Wired Network"
+#~ msgstr "有線網絡"
+
+#~ msgid "Wired Networks"
+#~ msgstr "有線網絡"
+
+#~ msgid "Wireless _adapter:"
+#~ msgstr "無線網絡卡(_A):"
+
+#~ msgid "Enable _Wireless"
+#~ msgstr "啟用無線網絡(_W)"
+
+#~ msgid "Create New Wireless Network"
+#~ msgstr "建立新的無線網絡"
+
+#~ msgid "Wired network connection '%s' active"
+#~ msgstr "有線網絡連線「%s」在使用中"
+
+#~ msgid "Wireless Networks Available"
+#~ msgstr "可用的無線網絡"
+
+#~ msgid "Wireless network connection '%s' active: %s (%d%%)"
+#~ msgstr "無線網絡連線「%s」在使用中: %s (%d%%)"
+
+#~ msgid "Could not load wired user interface."
+#~ msgstr "無法載入有線網絡使用者介面。"
+
+#~ msgid "Could not load WiFi user interface."
+#~ msgstr "無法載入 WiFi 使用者介面。"
+
+#~ msgid "Could not load WiFi security user interface; missing WiFi setting."
+#~ msgstr "無法載入 WiFi 防護使用者介面;失去 WiFi 設定值。"
+
+#~ msgid "Could not load WiFi security user interface."
+#~ msgstr "無法載入 WiFi 防護使用者介面。"
+
+#~ msgid "Wireless Security"
+#~ msgstr "無線網絡防護"
+
+#~ msgid "Error creating connection editor dialog."
+#~ msgstr "建立連線編輯器對話盒時發生錯誤。"
+
+#~ msgid "Wired connection %d"
+#~ msgstr "有線網絡連線 %d"
+
+#~ msgid "Wired 802.1X authentication"
+#~ msgstr "有線網絡 802.1X 驗證"
+
+#~ msgid ""
+#~ "Passwords or encryption keys are required to access the wireless network "
+#~ "'%s'."
+#~ msgstr "需要密碼或是加密密碼匙來存取無線網絡「%s」。"
+
+#~ msgid "Wireless Network Authentication Required"
+#~ msgstr "無線網絡驗證要求"
+
+#~ msgid "Authentication required by wireless network"
+#~ msgstr "無線網絡所需要的驗證"
+
+#~ msgid "Connect to Hidden Wireless Network"
+#~ msgstr "連接到隱藏的無線網絡"
+
+#~ msgid "Hidden wireless network"
+#~ msgstr "隱藏的無線網絡"
+
+#~ msgid "Enter a name for the wireless network you wish to create."
+#~ msgstr "輸入您要建立的無線網絡的名稱。"
+
+#~ msgid ""
+#~ "Enter the name and security details of the hidden wireless network you "
+#~ "wish to connect to."
+#~ msgstr "輸入您要連接的隱藏無線網絡的名稱與安全性詳細資料。"
+
+#~ 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"
+
+#~ msgid "_DNS servers:"
+#~ msgstr "_DNS 伺服器:"
+
+#~ msgid "Preparing wired network connection '%s'..."
+#~ msgstr "正在準備有線網絡連線「%s」…"
+
+#~ msgid "User authentication required for wired network connection '%s'..."
+#~ msgstr "有線網絡連線「%s」需要使用者驗證…"
+
+#~ msgid "Requesting a wired network address for '%s'..."
+#~ msgstr "正要求有線網絡「%s」提供網絡位址…"
+
+#~ msgid "_Connect to Hidden Wireless Network..."
+#~ msgstr "連接到隱藏的無線網絡(_C)…"
+
+#~ msgid "Create _New Wireless Network..."
+#~ msgstr "建立新的無線網絡(_N)…"
+
+#~ msgid "Use the network menu to connect to a wireless network"
+#~ msgstr "使用網絡選單來連線到無線網絡"
+
+#~ msgid "User authentication required for wireless network '%s'..."
+#~ msgstr "無線網絡「%s」要求使用者驗證…"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "不使用證書中心 (CA) 的證書會造成連線不安全、流氓無線網絡 (可能被竊取、劫聽"
+#~ "之意) 。是否要選擇一個證書中心的證書?"
+
+#~ msgid ""
+#~ "Set this to true to disable notifications when wireless networks are "
+#~ "available."
+#~ msgstr "將這設為「TURE」,以停用有無線網絡可用。"
+
+#~ msgid "Additional _DNS servers:"
+#~ msgstr "額外的 _DNS 伺服器:"
+
+#~ msgid "Wireless _security:"
+#~ msgstr "無線網絡安全(_W):"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3e5c4c9..a5babc7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,26 +1,27 @@
 # Translation of network-manager-applet to Traditional Chinese.
 # Traditional Chinese translation of Network Manager.
-# Copyright (C) 2005, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2010, 2013 Free Software Foundation, Inc.
 # Woodman Tuen <wmtuen gmail com>, 2005.
 # Hialan Liu <hialan liu gmail com>, 2008.
 # Chester Cheng <ccheng redhat com>, 2010.
 # Terry Chuang <tchuang redhat com>, 2010.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
+# Roy Chan <roy chan linux org hk>, 2011.
+# Anthony Fok <anthony t fok gmail com>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-applet 0.9.3\n"
+"Project-Id-Version: network-manager-applet 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-01 22:46+0800\n"
-"PO-Revision-Date: 2013-02-28 09:50+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
+"POT-Creation-Date: 2013-07-20 19:47+0800\n"
+"PO-Revision-Date: 2013-06-07 08:12+0800\n"
+"Last-Translator: Anthony Fok <foka debian org>\n"
 "Language-Team: Traditional Chinese <zh-l10n lists linux org tw>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
 
 #: ../nm-applet.desktop.in.h:1
 msgid "Network"
@@ -45,7 +46,7 @@ msgstr "停止已連線的通知"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:2
 msgid "Set this to true to disable notifications when connecting to a network."
-msgstr "將這設為「TURE」,以停用網路連線時的通知。"
+msgstr "將這設為 True,以停用網路連線時的通知。"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
@@ -54,7 +55,7 @@ msgstr "停止已離線的通知"
 #: ../org.gnome.nm-applet.gschema.xml.in.h:4
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
-msgstr "將這設為「TURE」,以停用網路離線時的通知。"
+msgstr "將這設為 True,以停用網路離線時的通知。"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:5
 msgid "Disable VPN notifications"
@@ -64,7 +65,7 @@ msgstr "停用 VPN 的通知"
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
-msgstr "將這設為「TRUE」,以停用網路離線時的通知。"
+msgstr "將這設為 True,以停用 VPN 線或離線時的通知。"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:7
 msgid "Suppress networks available notifications"
@@ -73,7 +74,7 @@ msgstr "停止可用網路的通知"
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
-msgstr "將這設為「TURE」,以停用有無線網路可用時的通知。"
+msgstr "將這設為 True,以停用有 Wi-Fi 無線網路可用時的通知。"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
@@ -85,28 +86,36 @@ msgstr "用來決定設定是不是要轉移到新版本上。"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:11
 msgid "Disable WiFi Create"
-msgstr "禁止建立 WiFi"
+msgstr "禁止建立 Wi-Fi"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:12
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
-msgstr "將這設為「TURE」,以停用使用面板程式建立 adhoc 網路。"
+msgstr "將這設為 True,以停用使用面板程式建立 Ad hoc 網路。"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr "在通知區域顯示面板程式"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "設定為 FALSE 來停用在通知區域示顯示面板程式的功能。"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
 msgid "Ignore CA certificate"
 msgstr "忽略 CA 憑證"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
-msgstr "將這設為「TURE」,停用在 EAP 認證中 CA 憑證"
+msgstr "將這設為 True,以停用在 EAP 認證中關於 CA 證書的警告。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
-msgstr "將這設為「TURE」,停用在第二 EAP 認證中 CA 憑證"
+msgstr "將這設為 True,以停用在 EAP 認證第二階段中關於 CA 證書的警告。"
 
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
 msgid "802.1X authentication"
@@ -117,37 +126,37 @@ msgstr "802.1X 驗證"
 msgid "_Network name:"
 msgstr "網路名稱(_N):"
 
-#: ../src/applet.c:541
+#: ../src/applet.c:563
 msgid "Failed to add/activate connection"
 msgstr "無法加入/使用連線"
 
-#: ../src/applet.c:543 ../src/applet.c:587 ../src/applet.c:613
-#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
+#: ../src/applet.c:565 ../src/applet.c:609 ../src/applet.c:635
+#: ../src/applet-device-wifi.c:1377 ../src/applet-device-wifi.c:1396
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../src/applet.c:546 ../src/applet.c:616 ../src/applet-device-wifi.c:1379
-#: ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:568 ../src/applet.c:638 ../src/applet-device-wifi.c:1380
+#: ../src/applet-device-wifi.c:1399
 msgid "Connection failure"
 msgstr "連線失敗"
 
-#: ../src/applet.c:585
+#: ../src/applet.c:607
 msgid "Device disconnect failed"
 msgstr "裝置斷線失敗"
 
-#: ../src/applet.c:590
+#: ../src/applet.c:612
 msgid "Disconnect failure"
 msgstr "斷線失敗"
 
-#: ../src/applet.c:611
+#: ../src/applet.c:633
 msgid "Connection activation failed"
 msgstr "連線生效失敗"
 
-#: ../src/applet.c:982 ../src/applet-device-wifi.c:1069
+#: ../src/applet.c:946 ../src/applet-device-wifi.c:1065
 msgid "Don't show this message again"
 msgstr "不要再顯示這個訊息"
 
-#: ../src/applet.c:1071
+#: ../src/applet.c:1035
 #, c-format
 msgid ""
 "\n"
@@ -157,7 +166,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為網路連線被中斷了。"
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:1038
 #, c-format
 msgid ""
 "\n"
@@ -166,7 +175,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為 VPN 服務意外的停止了。"
 
-#: ../src/applet.c:1077
+#: ../src/applet.c:1041
 #, c-format
 msgid ""
 "\n"
@@ -176,7 +185,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為 VPN 服務傳回無效的組態。"
 
-#: ../src/applet.c:1080
+#: ../src/applet.c:1044
 #, c-format
 msgid ""
 "\n"
@@ -185,7 +194,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為連線的嘗試已逾時。"
 
-#: ../src/applet.c:1083
+#: ../src/applet.c:1047
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +203,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為 VPN 服務沒有及時啟動。"
 
-#: ../src/applet.c:1086
+#: ../src/applet.c:1050
 #, c-format
 msgid ""
 "\n"
@@ -203,7 +212,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為 VPN 服務啟動失敗。"
 
-#: ../src/applet.c:1089
+#: ../src/applet.c:1053
 #, c-format
 msgid ""
 "\n"
@@ -212,7 +221,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為沒有有效的 VPN 服務。"
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:1056
 #, c-format
 msgid ""
 "\n"
@@ -221,7 +230,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為無效的 VPN 機密。"
 
-#: ../src/applet.c:1099
+#: ../src/applet.c:1063
 #, c-format
 msgid ""
 "\n"
@@ -230,7 +239,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗。"
 
-#: ../src/applet.c:1117
+#: ../src/applet.c:1081
 #, c-format
 msgid ""
 "\n"
@@ -240,7 +249,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為網路連線中斷了。"
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:1084
 #, c-format
 msgid ""
 "\n"
@@ -249,7 +258,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗,因為 VPN 服務已停止。"
 
-#: ../src/applet.c:1126
+#: ../src/applet.c:1090
 #, c-format
 msgid ""
 "\n"
@@ -258,7 +267,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」已斷線。"
 
-#: ../src/applet.c:1156
+#: ../src/applet.c:1120
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -268,19 +277,19 @@ msgstr ""
 "VPN 連線已成功的。\n"
 "%s\n"
 
-#: ../src/applet.c:1158
+#: ../src/applet.c:1122
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN 連線已成功的。\n"
 
-#: ../src/applet.c:1160
+#: ../src/applet.c:1124
 msgid "VPN Login Message"
 msgstr "VPN 登錄訊息"
 
-#: ../src/applet.c:1166 ../src/applet.c:1174 ../src/applet.c:1224
+#: ../src/applet.c:1130 ../src/applet.c:1138 ../src/applet.c:1188
 msgid "VPN Connection Failed"
 msgstr "VPN 連線失敗"
 
-#: ../src/applet.c:1231
+#: ../src/applet.c:1195
 #, c-format
 msgid ""
 "\n"
@@ -293,7 +302,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1234
+#: ../src/applet.c:1198
 #, c-format
 msgid ""
 "\n"
@@ -306,332 +315,459 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1549
+#: ../src/applet.c:1522
 msgid "device not ready (firmware missing)"
 msgstr "裝置尚未就緒 (缺少韌體)"
 
-#: ../src/applet.c:1551
+#: ../src/applet.c:1524
 msgid "device not ready"
 msgstr "裝置尚未就緒"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1561 ../src/applet-device-ethernet.c:229
+#: ../src/applet.c:1534 ../src/applet-device-ethernet.c:123
+#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
 msgid "disconnected"
 msgstr "已斷線"
 
-#: ../src/applet.c:1577
+#: ../src/applet.c:1550
 msgid "Disconnect"
 msgstr "斷線"
 
-#: ../src/applet.c:1591
+#: ../src/applet.c:1564
 msgid "device not managed"
 msgstr "裝置無法管理"
 
-#: ../src/applet.c:1635
+#: ../src/applet.c:1722
 msgid "No network devices available"
 msgstr "沒有可用的網路裝置"
 
-#: ../src/applet.c:1723
+#: ../src/applet.c:1775
 msgid "_VPN Connections"
 msgstr "_VPN 連線"
 
-#: ../src/applet.c:1780
+#: ../src/applet.c:1832
 msgid "_Configure VPN..."
 msgstr "設置 VPN(_C)…"
 
-#: ../src/applet.c:1784
+#: ../src/applet.c:1836
 msgid "_Disconnect VPN"
 msgstr "與 VPN 斷線(_D)"
 
-#: ../src/applet.c:1878
+#: ../src/applet.c:1952
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager 沒有執行…."
 
-#: ../src/applet.c:1883 ../src/applet.c:2735
+#: ../src/applet.c:1957 ../src/applet.c:2927
 msgid "Networking disabled"
 msgstr "網路已停用"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2104
+#: ../src/applet.c:2177
 msgid "Enable _Networking"
 msgstr "啟用網路(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2113
+#: ../src/applet.c:2186
 msgid "Enable _Wi-Fi"
 msgstr "啟用 _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2122
+#: ../src/applet.c:2195
 msgid "Enable _Mobile Broadband"
 msgstr "啟用行動寬頻(_M)"
 
 #. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2131
+#: ../src/applet.c:2204
 msgid "Enable WiMA_X Mobile Broadband"
 msgstr "啟用 WiMA_X 行動寬頻"
 
 #. Toggle notifications item
-#: ../src/applet.c:2142
+#: ../src/applet.c:2215
 msgid "Enable N_otifications"
 msgstr "啟用通知功能(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2153
+#: ../src/applet.c:2226
 msgid "Connection _Information"
 msgstr "連線資訊(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2163
+#: ../src/applet.c:2236
 msgid "Edit Connections..."
 msgstr "編輯連線…"
 
 #. Help item
-#: ../src/applet.c:2177
+#: ../src/applet.c:2250
 msgid "_Help"
 msgstr "求助(_H)"
 
 #. About item
-#: ../src/applet.c:2186
+#: ../src/applet.c:2259
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../src/applet.c:2364
+#: ../src/applet.c:2512
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "您現在已連線至「%s」。"
+
+#: ../src/applet.c:2553
 msgid "Disconnected"
 msgstr "已斷線"
 
-#: ../src/applet.c:2365
+#: ../src/applet.c:2554
 msgid "The network connection has been disconnected."
 msgstr "網路連線已中斷。"
 
-#: ../src/applet.c:2598
+#: ../src/applet.c:2789
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "正在準備網路連線「%s」…"
 
-#: ../src/applet.c:2601
+#: ../src/applet.c:2792
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "網路連線「%s」需要使用者驗證…"
 
-#: ../src/applet.c:2604 ../src/applet-device-bt.c:235
-#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:594
+#: ../src/applet.c:2795 ../src/applet-device-bt.c:136
+#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:590
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "正在要求提供「%s」的網路位址…"
 
-#: ../src/applet.c:2607
+#: ../src/applet.c:2798
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "網路連線「%s」在使用中"
 
-#: ../src/applet.c:2690
+#: ../src/applet.c:2881
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "正在啟動 VPN 連線「%s」…"
 
-#: ../src/applet.c:2693
+#: ../src/applet.c:2884
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN 連線「%s」需要使用者驗證…"
 
-#: ../src/applet.c:2696
+#: ../src/applet.c:2887
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "正在要求 VPN 提供「%s」的網路位址…"
 
-#: ../src/applet.c:2699
+#: ../src/applet.c:2890
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN 連線「%s」在使用中"
 
-#: ../src/applet.c:2740
+#: ../src/applet.c:2932
 msgid "No network connection"
 msgstr "沒有網路連接"
 
-#: ../src/applet.c:3441
+#: ../src/applet.c:3639
 msgid "NetworkManager Applet"
 msgstr "NetworkManager 面板程式"
 
-#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
-#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:772
-#: ../src/applet-device-gsm.c:359 ../src/applet-device-wifi.c:859
-#: ../src/applet-device-wimax.c:275
+#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
+#: ../src/applet-device-broadband.c:769 ../src/applet-device-bt.c:90
+#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
+#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
+#: ../src/applet-device-vlan.c:190 ../src/applet-device-wifi.c:856
+#: ../src/applet-device-wimax.c:276
 msgid "Available"
 msgstr "可用"
 
-#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
-#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:816
-#: ../src/applet-device-gsm.c:401 ../src/applet-device-wimax.c:419
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "您現在已連線至「%s」。"
-
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
-#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:820
-#: ../src/applet-device-gsm.c:405 ../src/applet-device-wifi.c:1261
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
+#: ../src/applet-device-broadband.c:796 ../src/applet-device-bt.c:102
+#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
+#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
+#: ../src/applet-device-vlan.c:203 ../src/applet-device-wifi.c:1262
+#: ../src/applet-device-wimax.c:401
 msgid "Connection Established"
 msgstr "已建立連線"
 
-#: ../src/applet-device-bt.c:200
+#: ../src/applet-device-bond.c:90
+msgid "You are now connected to the bonded network."
+msgstr "您現在已連線至繫結的網路。"
+
+#: ../src/applet-device-bond.c:114
+#, c-format
+msgid "Preparing bond connection '%s'..."
+msgstr "正在準備繫結的連線「%s」…"
+
+#: ../src/applet-device-bond.c:117
+#, c-format
+msgid "Configuring bond connection '%s'..."
+msgstr "正在設定繫結的連線「%s」…"
+
+#: ../src/applet-device-bond.c:120
+#, c-format
+msgid "User authentication required for bond connection '%s'..."
+msgstr "繫結的連線「%s」需要使用者驗證…"
+
+#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
+#: ../src/applet-device-infiniband.c:176 ../src/applet-device-vlan.c:237
+#, c-format
+msgid "Requesting address for '%s'..."
+msgstr "正在要求「%s」的網路位址…"
+
+#: ../src/applet-device-bond.c:127
+#, c-format
+msgid "Bond connection '%s' active"
+msgstr "繫結的連線「%s」在使用中"
+
+#: ../src/applet-device-bridge.c:90
+msgid "You are now connected to the bridged network."
+msgstr "您現在已連線至橋接的網路。"
+
+#: ../src/applet-device-bridge.c:114
+#, c-format
+msgid "Preparing bridge connection '%s'..."
+msgstr "正在準備橋接的網路連線「%s」…"
+
+#: ../src/applet-device-bridge.c:117
+#, c-format
+msgid "Configuring bridge connection '%s'..."
+msgstr "正在設定橋接的網路連線「%s」…"
+
+#: ../src/applet-device-bridge.c:120
+#, c-format
+msgid "User authentication required for bridge connection '%s'..."
+msgstr "橋接的連線「%s」需要使用者驗證…"
+
+#: ../src/applet-device-bridge.c:127
+#, c-format
+msgid "Bridge connection '%s' active"
+msgstr "橋接的連線「%s」在使用中"
+
+#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+msgid "Wrong PUK code; please contact your provider."
+msgstr "PUK 碼錯誤,請聯絡您的供應商。"
+
+#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+msgid "Wrong PIN code; please contact your provider."
+msgstr "PIN 碼錯誤,請聯絡您的供應商。"
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:532
+msgid "Sending unlock code..."
+msgstr "發送解鎖用的密碼…"
+
+#: ../src/applet-device-broadband.c:715 ../src/applet-device-cdma.c:247
+#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:425
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "行動寬頻 (%s)"
+
+#: ../src/applet-device-broadband.c:717 ../src/applet-device-cdma.c:249
+#: ../src/applet-device-gsm.c:305
+#: ../src/connection-editor/new-connection.c:113
+#: ../src/connection-editor/page-mobile.c:391
+#: ../src/libnm-gtk/nm-ui-utils.c:333
+msgid "Mobile Broadband"
+msgstr "行動寬頻"
+
+#. Default connection item
+#: ../src/applet-device-broadband.c:782
+msgid "New Mobile Broadband connection..."
+msgstr "新的行動寬頻連線…"
+
+#: ../src/applet-device-broadband.c:797
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "您現在已連線至行動寬頻網路。"
+
+#: ../src/applet-device-broadband.c:932 ../src/applet-device-broadband.c:938
+msgid "Mobile Broadband network."
+msgstr "行動寬頻網路。"
+
+#: ../src/applet-device-broadband.c:933 ../src/applet-device-cdma.c:403
+#: ../src/applet-device-gsm.c:663
+msgid "You are now registered on the home network."
+msgstr "您現在已註冊至家用網路。"
+
+#: ../src/applet-device-broadband.c:939 ../src/applet-device-cdma.c:409
+#: ../src/applet-device-gsm.c:669
+msgid "You are now registered on a roaming network."
+msgstr "您現在已註冊至漫遊網路。"
+
+#: ../src/applet-device-bt.c:103
 msgid "You are now connected to the mobile broadband network."
 msgstr "您現在已連線至行動寬頻網路。"
 
-#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
+#: ../src/mobile-helpers.c:581
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "正在準備行動寬頻連線「%s」…"
 
-#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
+#: ../src/mobile-helpers.c:584
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "正在設定行動寬頻連線「%s」…"
 
-#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
-#: ../src/mobile-helpers.c:591
+#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
+#: ../src/mobile-helpers.c:587
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "行動寬頻連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:611
+#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:607
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "行動寬頻連線「%s」在使用中"
 
-#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:718
-#: ../src/applet-device-gsm.c:305 ../src/applet-dialogs.c:424
-#, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "行動寬頻 (%s)"
-
-#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:720
-#: ../src/applet-device-gsm.c:307
-#: ../src/connection-editor/new-connection.c:113
-#: ../src/connection-editor/page-mobile.c:389
-#: ../src/libnm-gtk/nm-ui-utils.c:333
-msgid "Mobile Broadband"
-msgstr "行動寬頻"
-
 #. Default connection item
-#: ../src/applet-device-cdma.c:316
+#: ../src/applet-device-cdma.c:314
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "新的行動寬頻 (CDMA) 連線…"
 
-#: ../src/applet-device-cdma.c:350
+#: ../src/applet-device-cdma.c:341
 msgid "You are now connected to the CDMA network."
 msgstr "您現在已連線至 CDMA 網路。"
 
-#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
+#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
 msgid "CDMA network."
 msgstr "CDMA 網路。"
 
-#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:958
-#: ../src/applet-device-gsm.c:678
-msgid "You are now registered on the home network."
-msgstr "您現在已註冊至家用網路。"
-
-#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:964
-#: ../src/applet-device-gsm.c:684
-msgid "You are now registered on a roaming network."
-msgstr "您現在已註冊至漫遊網路。"
-
-#: ../src/applet-device-ethernet.c:62
+#: ../src/applet-device-ethernet.c:44
 msgid "Auto Ethernet"
 msgstr "自動乙太網路"
 
-#: ../src/applet-device-ethernet.c:202
+#: ../src/applet-device-ethernet.c:96
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "有線網路 (%s)"
 
-#: ../src/applet-device-ethernet.c:204
+#: ../src/applet-device-ethernet.c:98
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "有線網路 (%s)"
 
-#: ../src/applet-device-ethernet.c:207
+#: ../src/applet-device-ethernet.c:101
 msgid "Ethernet Networks"
 msgstr "有線網路"
 
-#: ../src/applet-device-ethernet.c:209
+#: ../src/applet-device-ethernet.c:103
 msgid "Ethernet Network"
 msgstr "有線網路"
 
-#: ../src/applet-device-ethernet.c:271
+#: ../src/applet-device-ethernet.c:147
 msgid "You are now connected to the ethernet network."
 msgstr "您現在已連線至有線網路。"
 
-#: ../src/applet-device-ethernet.c:297
+#: ../src/applet-device-ethernet.c:171
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "正在準備有線網路連線「%s」…"
 
-#: ../src/applet-device-ethernet.c:300
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "正在設定有線網路連線「%s」…"
 
-#: ../src/applet-device-ethernet.c:303
+#: ../src/applet-device-ethernet.c:177
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "有線網路連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-ethernet.c:306
+#: ../src/applet-device-ethernet.c:180
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "正要求有線網路「%s」提供網路位址…"
 
-#: ../src/applet-device-ethernet.c:310
+#: ../src/applet-device-ethernet.c:184
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "有線網路連線「%s」在使用中"
 
-#: ../src/applet-device-ethernet.c:491
+#: ../src/applet-device-ethernet.c:365
 msgid "DSL authentication"
 msgstr "DSL 驗證"
 
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:520
-msgid "Wrong PUK code; please contact your provider."
-msgstr "PUK 碼錯誤,請聯絡您的供應商。"
-
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:497
-msgid "Wrong PIN code; please contact your provider."
-msgstr "PIN 碼錯誤,請聯絡您的供應商。"
-
-#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:547
-msgid "Sending unlock code..."
-msgstr "發送解鎖用的密碼…"
-
 #. Default connection item
-#: ../src/applet-device-broadband.c:785
-msgid "New Mobile Broadband connection..."
-msgstr "新的行動寬頻連線…"
-
-#: ../src/applet-device-broadband.c:821
-msgid "You are now connected to the Mobile Broadband network."
-msgstr "您現在已連線至行動寬頻網路。"
-
-#: ../src/applet-device-broadband.c:957 ../src/applet-device-broadband.c:963
-msgid "Mobile Broadband network."
-msgstr "行動寬頻網路。"
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:372
+#: ../src/applet-device-gsm.c:370
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "新的行動寬頻 (GSM) 連線…"
 
-#: ../src/applet-device-gsm.c:406
+#: ../src/applet-device-gsm.c:397
 msgid "You are now connected to the GSM network."
 msgstr "您現在已連線至 GSM 網路。"
 
-#: ../src/applet-device-gsm.c:677 ../src/applet-device-gsm.c:683
+#: ../src/applet-device-gsm.c:662 ../src/applet-device-gsm.c:668
 msgid "GSM network."
 msgstr "GSM 網路。"
 
+#: ../src/applet-device-infiniband.c:40
+msgid "Auto InfiniBand"
+msgstr "自動 InfiniBand"
+
+#: ../src/applet-device-infiniband.c:92
+#, c-format
+msgid "InfiniBand Networks (%s)"
+msgstr "InfiniBand 網路 (%s)"
+
+#: ../src/applet-device-infiniband.c:94
+#, c-format
+msgid "InfiniBand Network (%s)"
+msgstr "InfiniBand 網路 (%s)"
+
+#: ../src/applet-device-infiniband.c:97
+msgid "InfiniBand Networks"
+msgstr "InfiniBand 網路"
+
+#: ../src/applet-device-infiniband.c:99
+msgid "InfiniBand Network"
+msgstr "InfiniBand 網路"
+
+#: ../src/applet-device-infiniband.c:143
+msgid "You are now connected to the InfiniBand network."
+msgstr "您現在已連線至 InfiniBand 網路。"
+
+#: ../src/applet-device-infiniband.c:167
+#, c-format
+msgid "Preparing InfiniBand connection '%s'..."
+msgstr "正在準備 InfiniBand 連線「%s」…"
+
+#: ../src/applet-device-infiniband.c:170
+#, c-format
+msgid "Configuring InfiniBand connection '%s'..."
+msgstr "正在設定 InfiniBand 連線「%s」…"
+
+#: ../src/applet-device-infiniband.c:173
+#, c-format
+msgid "User authentication required for InfiniBand connection '%s'..."
+msgstr "InfiniBand 連線「%s」需要使用者驗證…"
+
+#: ../src/applet-device-infiniband.c:180
+#, c-format
+msgid "InfiniBand connection '%s' active"
+msgstr "InfiniBand 連線「%s」在使用中"
+
+#: ../src/applet-device-vlan.c:204
+msgid "You are now connected to the VLAN."
+msgstr "您現在已連線至 VLAN 網路。"
+
+#: ../src/applet-device-vlan.c:228
+#, c-format
+msgid "Preparing VLAN connection '%s'..."
+msgstr "正在啟動 VLAN 連線「%s」…"
+
+#: ../src/applet-device-vlan.c:231
+#, c-format
+msgid "Configuring VLAN connection '%s'..."
+msgstr "正在啟動 VLAN 連線「%s」…"
+
+#: ../src/applet-device-vlan.c:234
+#, c-format
+msgid "User authentication required for VLAN connection '%s'..."
+msgstr "VLAN 連線「%s」需要使用者驗證…"
+
+#: ../src/applet-device-vlan.c:241
+#, c-format
+msgid "VLAN connection '%s' active"
+msgstr "VLAN 連線「%s」在使用中"
+
 #: ../src/applet-device-wifi.c:98
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "連接到隱藏的 Wi-Fi 網路(_C)…"
@@ -644,111 +780,111 @@ msgstr "建立新的 Wi-Fi 網路(_N)…"
 msgid "(none)"
 msgstr "(無)"
 
-#: ../src/applet-device-wifi.c:787
+#: ../src/applet-device-wifi.c:788
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi 網路 (%s)"
 
-#: ../src/applet-device-wifi.c:789
+#: ../src/applet-device-wifi.c:790
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi 網路 (%s)"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:792
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi 網路"
 
-#: ../src/applet-device-wifi.c:824
+#: ../src/applet-device-wifi.c:821
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi 已停用"
 
-#: ../src/applet-device-wifi.c:825
+#: ../src/applet-device-wifi.c:822
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi 已被硬體開關停用"
 
-#: ../src/applet-device-wifi.c:886
+#: ../src/applet-device-wifi.c:883
 msgid "More networks"
 msgstr "更多網路"
 
-#: ../src/applet-device-wifi.c:1065
+#: ../src/applet-device-wifi.c:1061
 msgid "Wi-Fi Networks Available"
 msgstr "有 Wi-Fi 網路可用"
 
-#: ../src/applet-device-wifi.c:1066
+#: ../src/applet-device-wifi.c:1062
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "使用網路選單來連線到 Wi-Fi 網路"
 
-#: ../src/applet-device-wifi.c:1260
+#: ../src/applet-device-wifi.c:1261
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "您現在已連線至 Wi-Fi 網路「%s」。"
 
-#: ../src/applet-device-wifi.c:1291
+#: ../src/applet-device-wifi.c:1292
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "正在準備 Wi-Fi 網路連線「%s」…"
 
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-wifi.c:1295
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "正在設定 Wi-Fi 網路連線「%s」…"
 
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-wifi.c:1298
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Wi-Fi 網路連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-wifi.c:1301
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "正在要求提供「%s」的 Wi-Fi 網路位址…"
 
-#: ../src/applet-device-wifi.c:1321
+#: ../src/applet-device-wifi.c:1322
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Wi-Fi 網路連線「%s」在使用中: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1327
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Wi-Fi 網路連線「%s」在使用中"
 
-#: ../src/applet-device-wifi.c:1374
+#: ../src/applet-device-wifi.c:1375
 msgid "Failed to activate connection"
 msgstr "無法使用連線"
 
-#: ../src/applet-device-wifi.c:1393
+#: ../src/applet-device-wifi.c:1394
 msgid "Failed to add new connection"
 msgstr "無法加入新連線"
 
-#: ../src/applet-device-wimax.c:227
+#: ../src/applet-device-wimax.c:228
 #, c-format
 msgid "WiMAX Mobile Broadband (%s)"
 msgstr "WiMAX 行動寬頻 (%s)"
 
-#: ../src/applet-device-wimax.c:229
+#: ../src/applet-device-wimax.c:230
 msgid "WiMAX Mobile Broadband"
 msgstr "WiMAX 行動寬頻"
 
-#: ../src/applet-device-wimax.c:255
+#: ../src/applet-device-wimax.c:256
 msgid "WiMAX is disabled"
 msgstr "WiMAX 已停用"
 
-#: ../src/applet-device-wimax.c:256
+#: ../src/applet-device-wimax.c:257
 msgid "WiMAX is disabled by hardware switch"
 msgstr "WiMAX 已被硬體開關停用"
 
-#: ../src/applet-device-wimax.c:424
+#: ../src/applet-device-wimax.c:402
 msgid "You are now connected to the WiMAX network."
 msgstr "您現在已連線至 WiMAX 網路。"
 
-#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:606
+#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "行動寬頻連線「%s」在使用中:(%d%%%s%s)"
 
-#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:609
+#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:605
 msgid "roaming"
 msgstr "漫遊"
 
@@ -759,7 +895,7 @@ msgstr "顯示連線資訊發生錯誤:"
 #: ../src/applet-dialogs.c:109
 #: ../src/connection-editor/page-wifi-security.c:313
 #: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:406
+#: ../src/wireless-security/wireless-security.c:433
 msgid "LEAP"
 msgstr "LEAP"
 
@@ -767,195 +903,195 @@ msgstr "LEAP"
 msgid "Dynamic WEP"
 msgstr "動態 WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
-#: ../src/applet-dialogs.c:247
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:246
+#: ../src/applet-dialogs.c:248
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:243
+#: ../src/applet-dialogs.c:244
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
+#: ../src/applet-dialogs.c:252 ../src/applet-dialogs.c:261
 #: ../src/libnm-gtk/nm-wifi-dialog.c:881
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/applet-dialogs.c:277
+#: ../src/applet-dialogs.c:278
 #, c-format
 msgid "%s (default)"
 msgstr "%s (預設值)"
 
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:485
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:487
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:361
+#: ../src/applet-dialogs.c:362
 #, c-format
 msgid "%d dB"
 msgstr "%d dB"
 
-#: ../src/applet-dialogs.c:363
+#: ../src/applet-dialogs.c:364
 msgctxt "WiMAX CINR"
 msgid "unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:375
+#: ../src/applet-dialogs.c:376
 msgctxt "WiMAX Base Station ID"
 msgid "unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:411
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "乙太網路 (%s)"
 
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:414
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:421
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:422
+#: ../src/applet-dialogs.c:423
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:426
+#: ../src/applet-dialogs.c:427
 #, c-format
 msgid "WiMAX (%s)"
 msgstr "WiMAX (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
-#: ../src/connection-editor/page-general.c:345
+#: ../src/applet-dialogs.c:433 ../src/applet-dialogs.c:792
+#: ../src/connection-editor/page-general.c:325
 msgid "General"
 msgstr "一般"
 
-#: ../src/applet-dialogs.c:436
+#: ../src/applet-dialogs.c:437
 msgid "Interface:"
 msgstr "介面:"
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:453
 msgid "Hardware Address:"
 msgstr "硬體位址:"
 
 #. Driver
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:461
 msgid "Driver:"
 msgstr "驅動程式:"
 
-#: ../src/applet-dialogs.c:489
+#: ../src/applet-dialogs.c:490
 msgid "Speed:"
 msgstr "速度:"
 
-#: ../src/applet-dialogs.c:499
+#: ../src/applet-dialogs.c:500
 msgid "Security:"
 msgstr "安全性:"
 
-#: ../src/applet-dialogs.c:512
+#: ../src/applet-dialogs.c:513
 msgid "CINR:"
 msgstr "CINR:"
 
-#: ../src/applet-dialogs.c:525
+#: ../src/applet-dialogs.c:526
 msgid "BSID:"
 msgstr "BSID:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:543
 msgid "IPv4"
 msgstr "IPv4"
 
 #. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
+#: ../src/applet-dialogs.c:554 ../src/applet-dialogs.c:661
 msgid "IP Address:"
 msgstr "IP 位址:"
 
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
+#: ../src/applet-dialogs.c:556 ../src/applet-dialogs.c:572
 msgctxt "Address"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:569
+#: ../src/applet-dialogs.c:570
 msgid "Broadcast Address:"
 msgstr "廣播位址:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:578
+#: ../src/applet-dialogs.c:579
 msgid "Subnet Mask:"
 msgstr "子網路遮罩:"
 
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:581
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:589 ../src/applet-dialogs.c:676
 msgid "Default Route:"
 msgstr "預設路由:"
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:601
 msgid "Primary DNS:"
 msgstr "主要 DNS:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:610
 msgid "Secondary DNS:"
 msgstr "次要 DNS:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:620
 msgid "Ternary DNS:"
 msgstr "第三 DNS:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
+#: ../src/applet-dialogs.c:635
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:643
+#: ../src/applet-dialogs.c:644
 msgid "Ignored"
 msgstr "已忽略"
 
-#: ../src/applet-dialogs.c:796
+#: ../src/applet-dialogs.c:797
 msgid "VPN Type:"
 msgstr "VPN 類型:"
 
-#: ../src/applet-dialogs.c:803
+#: ../src/applet-dialogs.c:804
 msgid "VPN Gateway:"
 msgstr "VPN 閘道器:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:810
 msgid "VPN Username:"
 msgstr "VPN 使用者名稱:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:816
 msgid "VPN Banner:"
 msgstr "VPN 旗幟:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "Base Connection:"
 msgstr "基礎連線:"
 
-#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:345
+#: ../src/applet-dialogs.c:824 ../src/libnm-gtk/nm-ui-utils.c:345
 msgid "Unknown"
 msgstr "不明"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
+#: ../src/applet-dialogs.c:887
 msgid "No valid active connections found!"
 msgstr "找不到有效的使用中連線!"
 
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:915
 msgid ""
 "Copyright © 2004-2011 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -965,42 +1101,42 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "與許多其他社群貢獻者與翻譯者"
 
-#: ../src/applet-dialogs.c:942
+#: ../src/applet-dialogs.c:918
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "用來管理您的網路裝置與連線的通知區面板程式。"
 
-#: ../src/applet-dialogs.c:944
+#: ../src/applet-dialogs.c:920
 msgid "NetworkManager Website"
 msgstr "NetworkManager 網站"
 
-#: ../src/applet-dialogs.c:959
+#: ../src/applet-dialogs.c:935
 msgid "Missing resources"
 msgstr "遺失資源"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:960
 msgid "Mobile broadband network password"
 msgstr "行動寬頻網路密碼"
 
-#: ../src/applet-dialogs.c:993
+#: ../src/applet-dialogs.c:969
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "連線至「%s」需要密碼。"
 
-#: ../src/applet-dialogs.c:1012
+#: ../src/applet-dialogs.c:984
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../src/applet-dialogs.c:1310
+#: ../src/applet-dialogs.c:1282
 msgid "SIM PIN unlock required"
 msgstr "需要解鎖 SIM PIN 碼"
 
-#: ../src/applet-dialogs.c:1311
+#: ../src/applet-dialogs.c:1283
 msgid "SIM PIN Unlock Required"
 msgstr "需要解鎖 SIM PIN 碼"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1313
+#: ../src/applet-dialogs.c:1285
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1008,25 +1144,25 @@ msgid ""
 msgstr "要使用行動寬頻裝置「%s」之前,需要 SIM PIN 碼。"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1315
+#: ../src/applet-dialogs.c:1287
 msgid "PIN code:"
 msgstr "PIN 碼:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1319
+#: ../src/applet-dialogs.c:1291
 msgid "Show PIN code"
 msgstr "顯示 PIN 碼"
 
-#: ../src/applet-dialogs.c:1321
+#: ../src/applet-dialogs.c:1293
 msgid "SIM PUK unlock required"
 msgstr "需要解鎖 SIM PUK 碼"
 
-#: ../src/applet-dialogs.c:1322
+#: ../src/applet-dialogs.c:1294
 msgid "SIM PUK Unlock Required"
 msgstr "需要解鎖 SIM PUK 碼"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1324
+#: ../src/applet-dialogs.c:1296
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1034,22 +1170,22 @@ msgid ""
 msgstr "要使用行動寬頻裝置「%s」之前,需要 SIM PUK 碼。"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1326
+#: ../src/applet-dialogs.c:1298
 msgid "PUK code:"
 msgstr "PUK 碼:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1301
 msgid "New PIN code:"
 msgstr "新的 PIN 碼:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1303
 msgid "Re-enter new PIN code:"
 msgstr "重新輸入 PIN 碼:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1336
+#: ../src/applet-dialogs.c:1308
 msgid "Show PIN/PUK codes"
 msgstr "顯示 PIN/PUK 碼"
 
@@ -1090,10 +1226,14 @@ msgid " "
 msgstr " "
 
 #: ../src/connection-editor/ce-new-connection.ui.h:2
+msgid "Create…"
+msgstr "建立…"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Choose a Connection Type"
 msgstr "請選擇連線類型"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1105,18 +1245,13 @@ msgstr ""
 "如果要建立 VPN,而您想要建立的 VPN 連線類型沒有出現在清單中,可能是沒有安裝正"
 "確的 VPN 外掛程式。"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:6
-msgid "Create…"
-msgstr "建立…"
-
 #: ../src/connection-editor/ce-page-bond.ui.h:1
-#, fuzzy
 msgid "Round-robin"
-msgstr "四捨五入位數"
+msgstr "循環分配 (Round-robin)"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:2
 msgid "Active backup"
-msgstr "啟用備份"
+msgstr "自動備援 (Active-backup)"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:3
 msgid "XOR"
@@ -1148,11 +1283,11 @@ msgstr "ARP"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:10
 msgid "Bonded _connections:"
-msgstr "繫結的連線(_C):"
+msgstr "繫結的連線(_C):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
 msgid "_Mode:"
-msgstr "模式(_M):"
+msgstr "模式(_M):"
 
 #. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:12
@@ -1170,7 +1305,7 @@ msgstr "刪除(_D)"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 msgid "Monitoring _frequency:"
-msgstr "監控頻率(_F):"
+msgstr "監控頻率(_F):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "ms"
@@ -1179,15 +1314,15 @@ msgstr "毫秒"
 #: ../src/connection-editor/ce-page-bond.ui.h:16
 #: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Interface name:"
-msgstr "介面名稱(_I):"
+msgstr "介面名稱(_I):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:17
 msgid "_Link Monitoring:"
-msgstr "連線監控(_L):"
+msgstr "連線監控(_L):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "ARP _targets:"
-msgstr "ARP 目標(_T):"
+msgstr "ARP 目標(_T):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid ""
@@ -1198,38 +1333,36 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid "Link _up delay:"
-msgstr "連線延遲(_U):"
+msgstr "連線延遲(_U):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _down delay:"
-msgstr "斷線延遲(_D):"
+msgstr "斷線延遲(_D):"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
-msgstr "路徑消費(_C):"
+msgstr "路徑成本(_C):"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 msgid "_Priority:"
-msgstr "優先順序(_P):"
+msgstr "優先順序(_P):"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-#, fuzzy
-#| msgid "_Transport mode:"
 msgid "_Hairpin mode:"
-msgstr "可重新排列模式"
+msgstr "_Hairpin 模式:"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:1
 msgid "Bridged _connections:"
-msgstr "橋接的連線(_C):"
+msgstr "橋接的連線(_C):"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:6
 msgid "_Forward delay:"
-msgstr "轉送延遲(_F):"
+msgstr "轉送延遲(_F):"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Hello time:"
-msgstr "_Hello 時間:"
+msgstr "_Hello 時間:"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "s"
@@ -1241,17 +1374,17 @@ msgstr "啟用 _STP (生成樹協議)"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:10
 msgid "_Max age:"
-msgstr "最大時間(_M):"
+msgstr "最大時間(_M):"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "_Aging time:"
-msgstr "存續時間(_A):"
+msgstr "存續時間(_A):"
 
-#: ../src/connection-editor/ce-page.c:72
+#: ../src/connection-editor/ce-page.c:67
 msgid "automatic"
 msgstr "自動"
 
-#: ../src/connection-editor/ce-page.c:356
+#: ../src/connection-editor/ce-page.c:348
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "由於不明的錯誤使連線機密的更新失敗。"
 
@@ -1261,11 +1394,11 @@ msgstr "由於不明的錯誤使連線機密的更新失敗。"
 #: ../src/wireless-security/eap-method-simple.ui.h:1
 #: ../src/wireless-security/ws-leap.ui.h:1
 msgid "_Username:"
-msgstr "使用者名稱(_U):"
+msgstr "使用者名稱(_U):"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
 msgid "_Service:"
-msgstr "服務(_S):"
+msgstr "服務(_S):"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:3
 #: ../src/wireless-security/eap-method-leap.ui.h:3
@@ -1278,6 +1411,7 @@ msgstr "顯示密碼(_W)"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
 #: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
 #: ../src/wireless-security/eap-method-leap.ui.h:2
 #: ../src/wireless-security/eap-method-simple.ui.h:2
 #: ../src/wireless-security/ws-leap.ui.h:2
@@ -1286,28 +1420,6 @@ msgid "_Password:"
 msgstr "密碼(_P):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:1
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "是"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-#, fuzzy
-#| msgid "Connection activation failed"
-msgid "Only on activation"
-msgstr "連線生效失敗"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "否"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
@@ -1316,67 +1428,67 @@ msgstr "否"
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
 msgid "Twisted Pair (TP)"
 msgstr "雙絞線 (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
 msgid "Attachment Unit Interface (AUI)"
 msgstr "附加單位介面 (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
 msgid "Media Independent Interface (MII)"
 msgstr "媒體獨立介面 (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
 msgid "_Port:"
 msgstr "連接埠(_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
 msgid "_Speed:"
 msgstr "速度(_S):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
 msgid "Full duple_x"
 msgstr "全雙工(_X)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
 msgid "Aut_onegotiate"
 msgstr "自動協議(_O)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: ../src/connection-editor/ce-page-infiniband.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
 #: ../src/connection-editor/ce-page-wimax.ui.h:1
 msgid "_Device MAC address:"
-msgstr "裝置的 MAC 位址(_D):"
+msgstr "裝置的 MAC 位址(_D):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
 #: ../src/connection-editor/ce-page-wifi.ui.h:10
 msgid "C_loned MAC address:"
-msgstr "複製的 MAC 位址(_L):"
+msgstr "複製的 MAC 位址(_L):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
 #: ../src/connection-editor/ce-page-wifi.ui.h:9
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1386,26 +1498,20 @@ msgstr ""
 "在這裡輸入的 MAC 位址會成為這個連線使用的網路裝置的硬體位址。這個功能也稱為 "
 "MAC 複製或偽裝。例如:00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
-#: ../src/connection-editor/ce-page-infiniband.ui.h:7
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
+#: ../src/connection-editor/ce-page-ethernet.ui.h:17
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
 msgid "_MTU:"
-msgstr "_MTU:"
+msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: ../src/connection-editor/ce-page-ethernet.ui.h:18
+#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "bytes"
 msgstr "位元組"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
-msgid "Carrier de_tect:"
-msgstr ""
-
 #: ../src/connection-editor/ce-page-general.ui.h:1
 msgid "Automatically connect to _VPN when using this connection"
 msgstr "當使用這個連線時自動連線至 _VPN"
@@ -1420,26 +1526,26 @@ msgstr "當這個網路可用時自動連線(_A)"
 
 #: ../src/connection-editor/ce-page-general.ui.h:4
 msgid "Firewall _zone:"
-msgstr "防火牆地帶(_Z):"
+msgstr "防火牆地帶(_Z):"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-infiniband.ui.h:1
 msgid "_Transport mode:"
-msgstr "傳輸模式(_T):"
+msgstr "傳輸模式(_T):"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:10
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:12
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 msgid "Connected"
 msgstr "成功連線"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
-msgstr "自動使用手動  DNS 設定值"
+msgstr "自動使用手動 DNS 設定值"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
@@ -1463,7 +1569,7 @@ msgstr "分享給其他電腦"
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
 msgid "_Method:"
-msgstr "方法(_M):"
+msgstr "方法(_M):"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
 #: ../src/connection-editor/ce-page-ip6.ui.h:7
@@ -1488,21 +1594,21 @@ msgstr "用來解析主機名稱的網域。請使用逗號隔開不同的網域
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid "D_HCP client ID:"
-msgstr "D_HCP 用戶端 ID:"
+msgstr "D_HCP 用戶端 ID:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
 #: ../src/connection-editor/ce-page-ip6.ui.h:10
 #: ../src/connection-editor/page-ip4.c:308
 #: ../src/connection-editor/page-ip6.c:307
 msgid "S_earch domains:"
-msgstr "搜尋網域(_E):"
+msgstr "搜尋網域(_E):"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
 #: ../src/connection-editor/ce-page-ip6.ui.h:11
 #: ../src/connection-editor/page-ip4.c:299
 #: ../src/connection-editor/page-ip6.c:298
 msgid "DNS ser_vers:"
-msgstr "_DNS 伺服器:"
+msgstr "_DNS 伺服器:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
 #: ../src/connection-editor/ce-page-ip6.ui.h:12
@@ -1576,7 +1682,7 @@ msgstr "基本"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "Nu_mber:"
-msgstr "數字(_M):"
+msgstr "數字(_M):"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:12
 msgid "Advanced"
@@ -1584,11 +1690,11 @@ msgstr "進階"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:13
 msgid "_APN:"
-msgstr "_APN:"
+msgstr "_APN:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:14
 msgid "N_etwork ID:"
-msgstr "網路 ID(_E):"
+msgstr "網路 ID(_E):"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:15
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
@@ -1601,7 +1707,7 @@ msgstr "變更…"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:17
 msgid "P_IN:"
-msgstr "P_IN:"
+msgstr "P_IN:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:18
 msgid "Allow _roaming if home network is not available"
@@ -1617,7 +1723,7 @@ msgstr "驗證"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
 msgid "Allowed methods:"
-msgstr "允許的方式:"
+msgstr "允許的方式:"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:3
 msgid "Configure _Methods…"
@@ -1657,37 +1763,37 @@ msgstr "回響"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:12
 msgid "Send PPP _echo packets"
-msgstr "傳送 PPP 回音封包(_E)"
+msgstr "傳送 PPP _echo 封包"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
-msgstr "父介面(_P):"
+msgstr "父介面(_P):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
 msgid "VLAN interface _name:"
-msgstr "VLAN 介面名稱(_N):"
+msgstr "VLAN 介面名稱(_N):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
 msgid "_Cloned MAC address:"
 msgstr "複製的 MA_C 位址:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
-msgstr "VLAN _id:"
+msgstr "VLAN _id:"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:12
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
 msgid "Device name + number"
 msgstr "裝置名稱 + 編號"
 
 #. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number 
together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:14
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + 編號"
 
 #: ../src/connection-editor/ce-page-wifi-security.ui.h:1
 msgid "S_ecurity:"
-msgstr "安全性(_E):"
+msgstr "安全性(_E):"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
@@ -1703,7 +1809,7 @@ msgstr "基礎架構"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
 msgid "Ad-hoc"
-msgstr "Ad-hoc"
+msgstr "Ad hoc"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "mW"
@@ -1711,7 +1817,7 @@ msgstr "mW"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "Transmission po_wer:"
-msgstr "傳輸耗能(_W):"
+msgstr "傳輸耗能(_W):"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Mb/s"
@@ -1719,11 +1825,11 @@ msgstr "Mb/s"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "_Rate:"
-msgstr "速率(_R):"
+msgstr "速率(_R):"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_BSSID:"
-msgstr "_BSSID:"
+msgstr "_BSSID:"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "C_hannel:"
@@ -1731,7 +1837,7 @@ msgstr "頻道(_H):"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "Ban_d:"
-msgstr "頻寬(_D):"
+msgstr "波段(_D):"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "M_ode:"
@@ -1739,7 +1845,7 @@ msgstr "模式(_O):"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:19
 msgid "SS_ID:"
-msgstr "SS_ID:"
+msgstr "SS_ID:"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
 msgid "Allowed Authentication Methods"
@@ -1793,48 +1899,48 @@ msgstr ""
 "在大多數情況下,網路供應者的 PPP 伺服器會支援所有的驗證方法。如果連線失敗,請"
 "嘗試停用某些方法的支援。"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip4.c:928
-#: ../src/connection-editor/page-ip6.c:894
+#: ../src/connection-editor/ip4-routes-dialog.c:749
+#: ../src/connection-editor/ip6-routes-dialog.c:691
+#: ../src/connection-editor/page-ip4.c:915
+#: ../src/connection-editor/page-ip6.c:881
 msgid "Address"
 msgstr "地址"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/page-ip4.c:945
+#: ../src/connection-editor/ip4-routes-dialog.c:766
+#: ../src/connection-editor/page-ip4.c:932
 msgid "Netmask"
 msgstr "網路遮罩"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
-#: ../src/connection-editor/page-ip4.c:962
-#: ../src/connection-editor/page-ip6.c:928
+#: ../src/connection-editor/ip4-routes-dialog.c:783
+#: ../src/connection-editor/ip6-routes-dialog.c:725
+#: ../src/connection-editor/page-ip4.c:949
+#: ../src/connection-editor/page-ip6.c:915
 msgid "Gateway"
 msgstr "通訊閘"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:813
-#: ../src/connection-editor/ip6-routes-dialog.c:755
+#: ../src/connection-editor/ip4-routes-dialog.c:800
+#: ../src/connection-editor/ip6-routes-dialog.c:742
 msgid "Metric"
-msgstr "公制"
+msgstr "度量 (Metric)"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip6.c:911
+#: ../src/connection-editor/ip6-routes-dialog.c:708
+#: ../src/connection-editor/page-ip6.c:898
 msgid "Prefix"
 msgstr "前綴"
 
 #: ../src/connection-editor/new-connection.c:101
-#: ../src/connection-editor/page-ethernet.c:272
+#: ../src/connection-editor/page-ethernet.c:242
 #: ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Ethernet"
 msgstr "有線網路"
 
 #: ../src/connection-editor/new-connection.c:107
-#: ../src/connection-editor/page-wifi.c:471 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: ../src/connection-editor/new-connection.c:119
-#: ../src/connection-editor/page-wimax.c:134
+#: ../src/connection-editor/page-wimax.c:125
 #: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
 msgid "WiMAX"
 msgstr "WiMAX"
@@ -1845,25 +1951,25 @@ msgid "DSL"
 msgstr "DSL"
 
 #: ../src/connection-editor/new-connection.c:131
-#: ../src/connection-editor/page-infiniband.c:189
+#: ../src/connection-editor/page-infiniband.c:159
 #: ../src/libnm-gtk/nm-ui-utils.c:335
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: ../src/connection-editor/new-connection.c:137
-#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/connection-editor/page-bond.c:412 ../src/libnm-gtk/nm-ui-utils.c:337
 #: ../src/libnm-gtk/nm-ui-utils.c:559
 msgid "Bond"
 msgstr "繫結"
 
 #: ../src/connection-editor/new-connection.c:143
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:212
 #: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
 msgid "Bridge"
 msgstr "橋接"
 
 #: ../src/connection-editor/new-connection.c:149
-#: ../src/connection-editor/page-vlan.c:504 ../src/libnm-gtk/nm-ui-utils.c:341
+#: ../src/connection-editor/page-vlan.c:475 ../src/libnm-gtk/nm-ui-utils.c:341
 #: ../src/libnm-gtk/nm-ui-utils.c:563
 msgid "VLAN"
 msgstr "VLAN"
@@ -1921,51 +2027,51 @@ msgid ""
 "was not found)."
 msgstr "連線編輯器找不到一些需要的資源(找不到 .ui 檔)。"
 
-#: ../src/connection-editor/nm-connection-editor.c:408
+#: ../src/connection-editor/nm-connection-editor.c:413
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:409
+#: ../src/connection-editor/nm-connection-editor.c:414
 msgid "Save any changes made to this connection."
 msgstr "儲存任何對這個連線進行的變更。"
 
-#: ../src/connection-editor/nm-connection-editor.c:410
+#: ../src/connection-editor/nm-connection-editor.c:415
 msgid "_Save..."
 msgstr "儲存(_S)…"
 
-#: ../src/connection-editor/nm-connection-editor.c:411
+#: ../src/connection-editor/nm-connection-editor.c:416
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "驗證以儲存這個連線給此電腦上的所有使用者。"
 
-#: ../src/connection-editor/nm-connection-editor.c:427
+#: ../src/connection-editor/nm-connection-editor.c:432
 msgid "Could not create connection"
 msgstr "無法建立連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:427
+#: ../src/connection-editor/nm-connection-editor.c:432
 msgid "Could not edit connection"
 msgstr "無法編輯連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:429
+#: ../src/connection-editor/nm-connection-editor.c:434
 msgid "Unknown error creating connection editor dialog."
 msgstr "建立連線編輯器對話盒時發生不明錯誤。"
 
-#: ../src/connection-editor/nm-connection-editor.c:536
+#: ../src/connection-editor/nm-connection-editor.c:602
+msgid "Error initializing editor"
+msgstr "初始化編輯器時發生錯誤"
+
+#: ../src/connection-editor/nm-connection-editor.c:923
+msgid "Connection add failed"
+msgstr "新增連線失敗"
+
+#: ../src/connection-editor/nm-connection-editor.c:973
 msgid "Error saving connection"
 msgstr "儲存連線時錯誤"
 
-#: ../src/connection-editor/nm-connection-editor.c:537
+#: ../src/connection-editor/nm-connection-editor.c:974
 #, c-format
 msgid "The property '%s' / '%s' is invalid: %d"
 msgstr "屬性「%s」/「%s」是無效的:%d"
 
-#: ../src/connection-editor/nm-connection-editor.c:631
-msgid "Error initializing editor"
-msgstr "初始化編輯器時發生錯誤"
-
-#: ../src/connection-editor/nm-connection-editor.c:952
-msgid "Connection add failed"
-msgstr "新增連線失敗"
-
 #: ../src/connection-editor/nm-connection-editor.ui.h:2
 msgid "Connection _name:"
 msgstr "連線名稱(_N):"
@@ -2046,20 +2152,24 @@ msgstr "刪除(_D)…"
 msgid "Authenticate to delete the selected connection"
 msgstr "驗證以刪除選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:942
-msgid "Error creating connection"
-msgstr "建立連線時發生錯誤"
+#: ../src/connection-editor/nm-connection-list.c:934
+msgid "No VPN plugins are installed."
+msgstr "尚未安裝任何 VPN 外掛程式。"
 
-#: ../src/connection-editor/nm-connection-list.c:943
+#: ../src/connection-editor/nm-connection-list.c:936
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "不知道如何建立「%s」連線"
 
-#: ../src/connection-editor/nm-connection-list.c:998
+#: ../src/connection-editor/nm-connection-list.c:938
+msgid "Error creating connection"
+msgstr "建立連線時發生錯誤"
+
+#: ../src/connection-editor/nm-connection-list.c:994
 msgid "Error editing connection"
 msgstr "編輯連線時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-list.c:999
+#: ../src/connection-editor/nm-connection-list.c:995
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "找不到 UUID「%s」的連線"
@@ -2072,24 +2182,24 @@ msgstr "802.1x 防護"
 msgid "Could not load 802.1x Security user interface."
 msgstr "無法載入 802.1x 安全性使用者介面。"
 
-#: ../src/connection-editor/page-8021x-security.c:141
+#: ../src/connection-editor/page-8021x-security.c:137
 msgid "Use 802.1_X security for this connection"
 msgstr "在這個連線使用 802.1_X 防護"
 
-#: ../src/connection-editor/page-bond.c:422
+#: ../src/connection-editor/page-bond.c:415
 msgid "Could not load bond user interface."
 msgstr "無法載入繫結的使用者介面。"
 
-#: ../src/connection-editor/page-bond.c:561
+#: ../src/connection-editor/page-bond.c:557
 #, c-format
 msgid "Bond connection %d"
 msgstr "繫結的連線 %d"
 
-#: ../src/connection-editor/page-bridge.c:214
+#: ../src/connection-editor/page-bridge.c:215
 msgid "Could not load bridge user interface."
 msgstr "無法載入橋接的使用者介面。"
 
-#: ../src/connection-editor/page-bridge.c:309
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "橋接的連線 %d"
@@ -2114,10 +2224,10 @@ msgstr "無法載入 DSL 使用者介面。"
 msgid "DSL connection %d"
 msgstr "DSL 連線 %d"
 
-#: ../src/connection-editor/page-ethernet.c:95
-#: ../src/connection-editor/page-infiniband.c:79
-#: ../src/connection-editor/page-wifi.c:113
-#: ../src/connection-editor/page-wimax.c:70
+#: ../src/connection-editor/page-ethernet.c:81
+#: ../src/connection-editor/page-infiniband.c:65
+#: ../src/connection-editor/page-wifi.c:95
+#: ../src/connection-editor/page-wimax.c:61
 msgid ""
 "This option locks this connection to the network device specified by its "
 "permanent MAC address entered here.  Example: 00:11:22:33:44:55"
@@ -2125,22 +2235,22 @@ msgstr ""
 "此選項會將此連線鎖定至在此所輸入的 MAC 位址所指定的網路裝置。例如:"
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:274
+#: ../src/connection-editor/page-ethernet.c:244
 msgid "Could not load ethernet user interface."
 msgstr "無法載入有線網路使用者介面。"
 
-#: ../src/connection-editor/page-ethernet.c:435
+#: ../src/connection-editor/page-ethernet.c:387
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "線網路連線 %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:59
+#: ../src/connection-editor/page-general.c:55
 #: ../src/libnm-gtk/nm-mobile-providers.c:808
 msgid "Default"
 msgstr "預設"
 
-#: ../src/connection-editor/page-general.c:60
+#: ../src/connection-editor/page-general.c:56
 msgid ""
 "The zone defines the trust level of the connection. Default is not a regular "
 "zone, selecting it results in the use of the default zone set in the "
@@ -2149,19 +2259,19 @@ msgstr ""
 "定義連線信任等級的地帶。預設值不是正常的地帶,選擇它會直接使用防火牆中預設的"
 "地帶設定。只有在 firewalld 啟用時有用。"
 
-#: ../src/connection-editor/page-general.c:61
+#: ../src/connection-editor/page-general.c:57
 msgid "FirewallD is not running."
 msgstr "FirewallD 沒有執行。"
 
-#: ../src/connection-editor/page-general.c:348
+#: ../src/connection-editor/page-general.c:328
 msgid "Could not load General user interface."
 msgstr "無法載入一般使用者介面。"
 
-#: ../src/connection-editor/page-infiniband.c:192
+#: ../src/connection-editor/page-infiniband.c:162
 msgid "Could not load InfiniBand user interface."
 msgstr "無法載入 InfiniBand 使用者介面。"
 
-#: ../src/connection-editor/page-infiniband.c:302
+#: ../src/connection-editor/page-infiniband.c:254
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 連線 %d"
@@ -2221,18 +2331,18 @@ msgstr "額外的 _DNS 伺服器:"
 #: ../src/connection-editor/page-ip4.c:306
 #: ../src/connection-editor/page-ip6.c:305
 msgid "Additional s_earch domains:"
-msgstr "額外的搜尋網域: domains:"
+msgstr "額外的搜尋網域(_E):"
 
-#: ../src/connection-editor/page-ip4.c:860
+#: ../src/connection-editor/page-ip4.c:847
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "編輯 %s 的 IPv4 路由"
 
-#: ../src/connection-editor/page-ip4.c:1011
+#: ../src/connection-editor/page-ip4.c:998
 msgid "IPv4 Settings"
 msgstr "IPv4 設定"
 
-#: ../src/connection-editor/page-ip4.c:1013
+#: ../src/connection-editor/page-ip4.c:1000
 msgid "Could not load IPv4 user interface."
 msgstr "無法載入 IPv4 使用者介面。"
 
@@ -2249,110 +2359,110 @@ msgstr "忽略"
 msgid "Automatic, DHCP only"
 msgstr "自動,僅使用 DHCP"
 
-#: ../src/connection-editor/page-ip6.c:826
+#: ../src/connection-editor/page-ip6.c:813
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "為 %s 編輯 IPv6 路由"
 
-#: ../src/connection-editor/page-ip6.c:975
+#: ../src/connection-editor/page-ip6.c:962
 msgid "IPv6 Settings"
 msgstr "IPv6 設定"
 
-#: ../src/connection-editor/page-ip6.c:977
+#: ../src/connection-editor/page-ip6.c:964
 msgid "Could not load IPv6 user interface."
 msgstr "無法載入 IPv6 使用者介面。"
 
 #: ../src/connection-editor/page-master.c:284
 #, c-format
 msgid "%s slave %d"
-msgstr "%s 服務 %d"
+msgstr "%s slave %d"
 
-#: ../src/connection-editor/page-mobile.c:391
+#: ../src/connection-editor/page-mobile.c:393
 msgid "Could not load mobile broadband user interface."
 msgstr "無法載入行動寬頻使用者介面。"
 
-#: ../src/connection-editor/page-mobile.c:408
+#: ../src/connection-editor/page-mobile.c:410
 msgid "Unsupported mobile broadband connection type."
 msgstr "不支援的行動寬頻連線類型。"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:658
+#: ../src/connection-editor/page-mobile.c:660
 msgid "Select Mobile Broadband Provider Type"
 msgstr "選擇行動寬頻供應商類型"
 
-#: ../src/connection-editor/page-mobile.c:693
+#: ../src/connection-editor/page-mobile.c:687
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr "請選擇您的無線寬頻供應商所使用的技術。如果您不確定,請洽詢供應商。"
 
-#: ../src/connection-editor/page-mobile.c:698
+#: ../src/connection-editor/page-mobile.c:692
 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:705
+#: ../src/connection-editor/page-mobile.c:699
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "我的供應商使用 C_DMA 為主的技術(例如 1xRTT、EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:715 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:709 ../src/mb-menu-item.c:54
 #: ../src/mobile-helpers.c:270
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:718 ../src/mb-menu-item.c:58
+#: ../src/connection-editor/page-mobile.c:712 ../src/mb-menu-item.c:58
 #: ../src/mobile-helpers.c:268
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-ppp.c:137
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
+#: ../src/connection-editor/page-ppp.c:138
 #: ../src/wireless-security/eap-method-ttls.c:230
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
+#: ../src/connection-editor/page-ppp.c:139
 #: ../src/wireless-security/eap-method-ttls.c:280
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:140
 #: ../src/wireless-security/eap-method-fast.c:277
 #: ../src/wireless-security/eap-method-peap.c:246
 #: ../src/wireless-security/eap-method-ttls.c:263
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
+#: ../src/connection-editor/page-ppp.c:141
 #: ../src/wireless-security/eap-method-ttls.c:247
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:144
 msgid "none"
 msgstr "沒有"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../src/connection-editor/page-ppp.c:204
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "編輯 %s 的 PPP 驗證方法"
 
-#: ../src/connection-editor/page-ppp.c:284
+#: ../src/connection-editor/page-ppp.c:287
 msgid "PPP Settings"
 msgstr "PPP 設定值"
 
-#: ../src/connection-editor/page-ppp.c:286
+#: ../src/connection-editor/page-ppp.c:289
 msgid "Could not load PPP user interface."
 msgstr "無法載入 PPP 使用者介面。"
 
-#: ../src/connection-editor/page-vlan.c:506
+#: ../src/connection-editor/page-vlan.c:477
 msgid "Could not load vlan user interface."
 msgstr "無法載入 vlan 使用者介面。"
 
-#: ../src/connection-editor/page-vlan.c:719
+#: ../src/connection-editor/page-vlan.c:673
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN 連線 %d"
@@ -2395,7 +2505,7 @@ msgstr ""
 "選擇您想要用在新連線中的 VPN 類型。如果您想要建立的 VPN 連線類型沒有出現在清"
 "單中,可能是沒有安裝正確的 VPN 外掛程式。"
 
-#: ../src/connection-editor/page-wifi.c:98
+#: ../src/connection-editor/page-wifi.c:85
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
 "by the BSSID entered here.  Example: 00:11:22:33:44:55"
@@ -2403,23 +2513,23 @@ msgstr ""
 "此選項會將此連線鎖定至在此所輸入的 BSSID 所指定的 Wi-Fi 存取點(AP)。例如:"
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:190
-#: ../src/connection-editor/page-wifi.c:194
-#: ../src/connection-editor/page-wifi.c:215
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:176
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "default"
 msgstr "預設"
 
-#: ../src/connection-editor/page-wifi.c:219
+#: ../src/connection-editor/page-wifi.c:201
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:473
+#: ../src/connection-editor/page-wifi.c:467
 msgid "Could not load Wi-Fi user interface."
 msgstr "無法載入 Wi-Fi 使用者介面。"
 
-#: ../src/connection-editor/page-wifi.c:650
+#: ../src/connection-editor/page-wifi.c:645
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 連線 %d"
@@ -2466,11 +2576,11 @@ msgstr "Wi-Fi 安全性"
 msgid "Could not load Wi-Fi security user interface."
 msgstr "無法載入 Wi-Fi 安全性使用者介面。"
 
-#: ../src/connection-editor/page-wimax.c:137
+#: ../src/connection-editor/page-wimax.c:128
 msgid "Could not load WiMAX user interface."
 msgstr "無法載入 WiMAX 使用者介面。"
 
-#: ../src/connection-editor/page-wimax.c:233
+#: ../src/connection-editor/page-wimax.c:224
 #, c-format
 msgid "WiMAX connection %d"
 msgstr "WiMAX 連線 %d"
@@ -2546,86 +2656,86 @@ msgid ""
 "Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
 msgstr "無法進行藍牙的配置(找不到 NetworkManager:(%s) %s)。"
 
-#: ../src/gnome-bluetooth/bt-widget.c:445
+#: ../src/gnome-bluetooth/bt-widget.c:441
 msgid "Use your mobile phone as a network device (PAN/NAP)"
 msgstr "使用手機作為網路裝置(PAN/NAP)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:454
+#: ../src/gnome-bluetooth/bt-widget.c:450
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr "使用手機存取網際網路(DUN)"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:336
+#: ../src/gnome-bluetooth/nma-bt-device.c:324
 #, c-format
 msgid "Error: %s"
 msgstr "錯誤:%s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:443
+#: ../src/gnome-bluetooth/nma-bt-device.c:431
 #, c-format
 msgid "Failed to create DUN connection: %s"
 msgstr "無法建立 DUN 連線:%s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:445
-#: ../src/gnome-bluetooth/nma-bt-device.c:959
+#: ../src/gnome-bluetooth/nma-bt-device.c:433
+#: ../src/gnome-bluetooth/nma-bt-device.c:947
 msgid "Your phone is now ready to use!"
 msgstr "您的電話現在已經可以使用!"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:468
+#: ../src/gnome-bluetooth/nma-bt-device.c:456
 msgid "Mobile wizard was canceled"
 msgstr "行動精靈已經取消"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:477
+#: ../src/gnome-bluetooth/nma-bt-device.c:465
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "不明的電話裝置類型(非 GSM 或 CDMA)"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:513
+#: ../src/gnome-bluetooth/nma-bt-device.c:501
 msgid "unknown modem type."
 msgstr "不明的數據機類型。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:733
-#: ../src/gnome-bluetooth/nma-bt-device.c:739
+#: ../src/gnome-bluetooth/nma-bt-device.c:721
+#: ../src/gnome-bluetooth/nma-bt-device.c:727
 msgid "failed to connect to the phone."
 msgstr "無法連線至電話。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:770
+#: ../src/gnome-bluetooth/nma-bt-device.c:758
 msgid "unexpectedly disconnected from the phone."
 msgstr "電話無預期離線。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:780
+#: ../src/gnome-bluetooth/nma-bt-device.c:768
 msgid "timed out detecting phone details."
 msgstr "在時間內偵測不到電話的詳細資料。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:791
+#: ../src/gnome-bluetooth/nma-bt-device.c:779
 msgid "Detecting phone configuration..."
 msgstr "偵測電話的配置…"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:823
+#: ../src/gnome-bluetooth/nma-bt-device.c:811
 msgid "error getting bus connection"
 msgstr "取得匯流排連線時發生錯誤"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:920
+#: ../src/gnome-bluetooth/nma-bt-device.c:908
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
 msgstr "預設的藍牙配接卡必須在設定撥接網路連線前啟用。"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
+#: ../src/gnome-bluetooth/nma-bt-device.c:945
 #, c-format
 msgid "Failed to create PAN connection: %s"
 msgstr "無法建立 PAN 連線:%s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:978
+#: ../src/gnome-bluetooth/nma-bt-device.c:966
 #, c-format
 msgid "%s Network"
 msgstr "%s 網路"
 
 #: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "自動解鎖這個裝置"
-
-#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "解鎖(_U)"
 
+#: ../src/gsm-unlock.ui.h:2
+msgid "Automatically unlock this device"
+msgstr "自動解鎖這個裝置"
+
 #: ../src/info.ui.h:1
 msgid "Connection Information"
 msgstr "連線資訊"
@@ -2634,27 +2744,27 @@ msgstr "連線資訊"
 msgid "Active Network Connections"
 msgstr "啟用網路連線"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:208
+#: ../src/libnm-gtk/nm-mobile-wizard.c:204
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr "行動寬連線已經配置了以下設定:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:215
+#: ../src/libnm-gtk/nm-mobile-wizard.c:211
 msgid "Your Device:"
-msgstr "您的裝置:"
+msgstr "您的裝置:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:226
+#: ../src/libnm-gtk/nm-mobile-wizard.c:222
 msgid "Your Provider:"
-msgstr "您的供應商:"
+msgstr "您的供應商:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:237
+#: ../src/libnm-gtk/nm-mobile-wizard.c:233
 msgid "Your Plan:"
-msgstr "您的方案:"
+msgstr "您的方案:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: ../src/libnm-gtk/nm-mobile-wizard.c:254
 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 "
@@ -2666,23 +2776,23 @@ msgstr ""
 "無法存取網路資源,請檢查設定。要修改行動寬頻連線的設定,請從「系統」 >> 「偏"
 "好設定」中,選擇「網路連線」。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:274
+#: ../src/libnm-gtk/nm-mobile-wizard.c:266
 msgid "Confirm Mobile Broadband Settings"
 msgstr "確認行動寬頻設定"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:338
+#: ../src/libnm-gtk/nm-mobile-wizard.c:330
 msgid "Unlisted"
 msgstr "未列出的"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:493
+#: ../src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "_Select your plan:"
 msgstr "選擇您的方案(_S):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:517
+#: ../src/libnm-gtk/nm-mobile-wizard.c:505
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "選擇方案的 _APN(Access Point Name,存取點名稱):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:541
+#: ../src/libnm-gtk/nm-mobile-wizard.c:525
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
@@ -2693,101 +2803,101 @@ msgstr ""
 "\n"
 "如果您不確定所使用的方案,請洽詢供應商,以得知方案的 APN 為何。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:548
+#: ../src/libnm-gtk/nm-mobile-wizard.c:532
 msgid "Choose your Billing Plan"
 msgstr "選擇您的計費方案"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:597
+#: ../src/libnm-gtk/nm-mobile-wizard.c:581
 msgid "My plan is not listed..."
 msgstr "我的方案沒有列出…"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../src/libnm-gtk/nm-mobile-wizard.c:734
 msgid "Select your provider from a _list:"
-msgstr "請從清單裡選擇供應商(_L):"
+msgstr "請從清單裡選擇供應商(_L):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnm-gtk/nm-mobile-wizard.c:747
 msgid "Provider"
 msgstr "供應商"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: ../src/libnm-gtk/nm-mobile-wizard.c:772
 msgid "I can't find my provider and I wish to enter it _manually:"
-msgstr "我找不到我的供應商,我想要手動輸入(_M):"
+msgstr "我找不到我的供應商,我想要手動輸入(_M):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:803
+#: ../src/libnm-gtk/nm-mobile-wizard.c:785
 msgid "Provider:"
 msgstr "供應商:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:827
+#: ../src/libnm-gtk/nm-mobile-wizard.c:802
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "我的供應商使用 GSM 技術(GPRS、EDGE、UMTS、HSPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:833
+#: ../src/libnm-gtk/nm-mobile-wizard.c:804
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "我的供應商使用 CDMA 技術(1xRTT、EVDO)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:844
+#: ../src/libnm-gtk/nm-mobile-wizard.c:815
 msgid "Choose your Provider"
 msgstr "選擇您的供應商"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or Region List:"
 msgstr "國家或地區清單:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1080
 msgid "Country or region"
 msgstr "國家或地區"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1090
 msgid "My country is not listed"
 msgstr "我的國家並沒有列出來"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1140
 msgid "Choose your Provider's Country or Region"
 msgstr "選擇您的供應商的國家或地區"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1194
 msgid "Installed GSM device"
 msgstr "已安裝的 GSM 裝置"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1197
 msgid "Installed CDMA device"
 msgstr "已安裝的 CDMA 裝置"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1365
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
-msgstr "這能幫助您輕易地設定行動寬頻連線,連至手機(3G)網路。"
+msgstr "這能幫助您輕易地設定行動寬頻連線,連至手機 (3G) 網路。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1370
 msgid "You will need the following information:"
 msgstr "您需要以下資訊:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1381
 msgid "Your broadband provider's name"
 msgstr "寬頻供應商的名稱"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1387
 msgid "Your broadband billing plan name"
 msgstr "寬頻計費方案的名稱"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1393
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(在有些情況下)您的寬頻計費方案的 APN(存取點名稱)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1420
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "為這個行動寬頻裝置建立連線(_T)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1435
 msgid "Any device"
 msgstr "任何裝置"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1448
 msgid "Set up a Mobile Broadband Connection"
 msgstr "設定行動寬頻連線"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1621
 msgid "New Mobile Broadband Connection"
 msgstr "新的行動寬頻連線"
 
@@ -2818,7 +2928,7 @@ msgstr "USB"
 #. Translators: the first %s is a bus name (eg, "USB") or
 #. * product name, the second is a device type (eg,
 #. * "Ethernet"). You can change this to something like
-#. * "%$2s (%$1s)" if there's no grammatical way to combine
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
 #: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
@@ -2843,11 +2953,11 @@ msgstr "需要密碼或是加密金鑰來存取 Wi-Fi 網路「%s」。"
 
 #: ../src/libnm-gtk/nm-wifi-dialog.c:1138
 msgid "Wi-Fi Network Authentication Required"
-msgstr "Wi-Fi 網路連線「%s」需要驗證"
+msgstr "Wi-Fi 網路連線需要驗證"
 
 #: ../src/libnm-gtk/nm-wifi-dialog.c:1140
 msgid "Authentication required by Wi-Fi network"
-msgstr "Wi-Fi 網路連線「%s」需要驗證"
+msgstr "Wi-Fi 網路連線需要驗證"
 
 #: ../src/libnm-gtk/nm-wifi-dialog.c:1145
 msgid "Create New Wi-Fi Network"
@@ -2875,21 +2985,29 @@ msgid ""
 "connect to."
 msgstr "輸入您要連接的隱藏 Wi-Fi 網路的名稱與安全性詳細資料。"
 
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Secondary Password:"
+msgstr "第二密碼(_S):"
+
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
+msgid "Sh_ow passwords"
+msgstr "顯示密碼(_O)"
+
 #: ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
-msgstr "Wi-Fi 安全性(_S):"
+msgstr "Wi-Fi 安全性(_S):"
 
 #: ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
-msgstr "連線(_N):"
+msgstr "連線(_N):"
 
 #: ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
-msgstr "Wi-Fi 介面卡(_A):"
+msgstr "Wi-Fi 介面卡(_A):"
 
 #: ../src/main.c:73
 msgid "Usage:"
-msgstr "用法:"
+msgstr "用法:"
 
 #: ../src/main.c:75
 msgid ""
@@ -3007,7 +3125,7 @@ msgstr "%s 連線"
 
 #: ../src/wireless-security/eap-method.c:275
 msgid "No Certificate Authority certificate chosen"
-msgstr "未選擇任何憑證授權單位(CA)憑證"
+msgstr "未選擇任何憑證授權單位 (CA) 憑證"
 
 #: ../src/wireless-security/eap-method.c:276
 msgid ""
@@ -3023,8 +3141,8 @@ msgid "Choose CA Certificate"
 msgstr "選擇 CA 憑證"
 
 #: ../src/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER, PEM, 或 PKCS#12 私密金鑰(*.der, *.pem, *.p12)"
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER、PEM 或是 PKCS#12 私人金鑰 (*.der, *.pem, *.p12, *.key)"
 
 #: ../src/wireless-security/eap-method.c:648
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
@@ -3067,20 +3185,20 @@ msgstr "匿名識別(_M):"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:6
 msgid "PAC _file:"
-msgstr "PAC 檔案(_F):"
+msgstr "PAC 檔案(_F):"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
 #: ../src/wireless-security/eap-method-peap.ui.h:7
 #: ../src/wireless-security/eap-method-ttls.ui.h:4
 msgid "_Inner authentication:"
-msgstr "內部驗證(_I):"
+msgstr "內部驗證(_I):"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:8
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允許自動供應 PAC (_V)"
 
 #: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/wireless-security.c:409
 msgid "MD5"
 msgstr "MD5"
 
@@ -3088,7 +3206,7 @@ msgstr "MD5"
 #: ../src/wireless-security/eap-method-tls.c:434
 #: ../src/wireless-security/eap-method-ttls.c:350
 msgid "Choose a Certificate Authority certificate..."
-msgstr "選擇憑證授權單位(CA)憑證…"
+msgstr "選擇憑證授權單位 (CA) 憑證…"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
@@ -3102,11 +3220,11 @@ msgstr "版本 1"
 #: ../src/wireless-security/eap-method-tls.ui.h:3
 #: ../src/wireless-security/eap-method-ttls.ui.h:3
 msgid "C_A certificate:"
-msgstr "CA 憑證(_A):"
+msgstr "C_A 憑證:"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:8
 msgid "PEAP _version:"
-msgstr "PEAP 版本(_V):"
+msgstr "PEAP 版本(_V):"
 
 #: ../src/wireless-security/eap-method-simple.ui.h:3
 msgid "As_k for this password every time"
@@ -3157,19 +3275,19 @@ msgstr "私密金鑰密碼(_P):"
 msgid "Don't _warn me again"
 msgstr "不要再警告我(_W)"
 
-#: ../src/wireless-security/wireless-security.c:394
+#: ../src/wireless-security/wireless-security.c:421
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:445
 msgid "FAST"
 msgstr "快"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:456
 msgid "Tunneled TLS"
 msgstr "穿隧式 TLS"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:467
 msgid "Protected EAP (PEAP)"
 msgstr "保護式 EAP (PEAP)"
 
@@ -3177,32 +3295,32 @@ msgstr "保護式 EAP (PEAP)"
 #: ../src/wireless-security/ws-wep-key.ui.h:9
 #: ../src/wireless-security/ws-wpa-eap.ui.h:2
 msgid "Au_thentication:"
-msgstr "驗證(_E):"
+msgstr "驗證(_E):"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "Open System"
-msgstr "開放系統"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Shared Key"
-msgstr "共享金鑰"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:3
 msgid "1 (Default)"
 msgstr "1 (預設值)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "2"
 msgstr "2"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: ../src/wireless-security/ws-wep-key.ui.h:3
 msgid "3"
 msgstr "3"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:6
+#: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "4"
 msgstr "4"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:5
+msgid "Open System"
+msgstr "開放系統"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr "共享金鑰"
+
 #: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "_Key:"
 msgstr "金鑰(_K):"
@@ -3213,11 +3331,19 @@ msgstr "顯示金鑰(_W)"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x:"
-msgstr "WEP 索引(_X):"
+msgstr "WEP 索引(_X):"
+
+#~ msgid "Yes"
+#~ msgstr "是"
+
+#~ msgid "Only on activation"
+#~ msgstr "只在生效時"
+
+#~ msgid "No"
+#~ msgstr "否"
 
-#~| msgid "NetworkManager is not running..."
 #~ msgid "ModemManager is not running"
-#~ msgstr "ModemManager 沒有執行"
+#~ msgstr "ModemManager 未有運行"
 
 #~ msgid "Connect _automatically"
 #~ msgstr "自動連線(_A)"
@@ -3284,7 +3410,166 @@ msgstr "WEP 索引(_X):"
 #~ msgstr "找不到藍牙裝置。"
 
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-#~ msgstr "無法進行藍牙的配置(無法連至 D-Bus proxy)。"
+#~ msgstr "無法進行藍牙的配置(無法建立 D-Bus proxy)。"
 
 #~ msgid "_Security:"
 #~ msgstr "安全性(_S):"
+
+#~ msgid "Disconnected - you are now offline"
+#~ msgstr "未連線 - 您現在是離線"
+
+#~ msgid "Wireless network"
+#~ msgstr "無線網路"
+
+#~ msgid "Ethernet network"
+#~ msgstr "乙太網路"
+
+#~ msgid "Modem network"
+#~ msgstr "數據機網路"
+
+#~ msgid "Mobile Broadband network"
+#~ msgstr "行動寬頻網路"
+
+#~ msgid "CDMA network"
+#~ msgstr "CDMA 網路"
+
+#~ msgid "Wired network"
+#~ msgstr "有線網路"
+
+#~ msgid "ad-hoc"
+#~ msgstr "ad-hoc"
+
+#~ msgid "secure."
+#~ msgstr "安全。"
+
+#~ msgid "WiMAX network"
+#~ msgstr "WiMAX 網路"
+
+#~ msgid "Enter a name for the wireless network you wish to create."
+#~ msgstr "輸入您要建立的無線網路的名稱。"
+
+#~ msgid "New wireless network"
+#~ msgstr "新的無線網路"
+
+#~ msgid "E_xport"
+#~ msgstr "匯出(_X)"
+
+#~ msgid "Wired Network"
+#~ msgstr "有線網路"
+
+#~ msgid "Wired Networks"
+#~ msgstr "有線網路"
+
+#~ msgid "Enable _Wireless"
+#~ msgstr "啟用無線網路(_W)"
+
+#~ msgid "Create New Wireless Network"
+#~ msgstr "建立新的無線網路"
+
+#~ msgid "Wired network connection '%s' active"
+#~ msgstr "有線網路連線「%s」在使用中"
+
+#~ msgid "Wireless Networks Available"
+#~ msgstr "可用的無線網路"
+
+#~ msgid "Wireless network connection '%s' active: %s (%d%%)"
+#~ msgstr "無線網路連線「%s」在使用中: %s (%d%%)"
+
+#~ msgid "Could not load wired user interface."
+#~ msgstr "無法載入有線網路使用者介面。"
+
+#~ msgid "Could not load WiFi user interface."
+#~ msgstr "無法載入 WiFi 使用者介面。"
+
+#~ msgid "Could not load WiFi security user interface; missing WiFi setting."
+#~ msgstr "無法載入 WiFi 防護使用者介面;失去 WiFi 設定值。"
+
+#~ msgid "Could not load WiFi security user interface."
+#~ msgstr "無法載入 WiFi 防護使用者介面。"
+
+#~ msgid "Wireless Security"
+#~ msgstr "無線網路防護"
+
+#~ msgid "Error creating connection editor dialog."
+#~ msgstr "建立連線編輯器對話盒時發生錯誤。"
+
+#~ msgid "Wired connection %d"
+#~ msgstr "有線網路連線 %d"
+
+#~ msgid "Wired 802.1X authentication"
+#~ msgstr "有線網路 802.1X 驗證"
+
+#~ msgid ""
+#~ "Passwords or encryption keys are required to access the wireless network "
+#~ "'%s'."
+#~ msgstr "需要密碼或是加密金鑰來存取無線網路「%s」。"
+
+#~ msgid "Wireless Network Authentication Required"
+#~ msgstr "無線網路驗證要求"
+
+#~ msgid "Authentication required by wireless network"
+#~ msgstr "無線網路所需要的驗證"
+
+#~ msgid "Connect to Hidden Wireless Network"
+#~ msgstr "連接到隱藏的無線網路"
+
+#~ msgid "Hidden wireless network"
+#~ msgstr "隱藏的無線網路"
+
+#~ msgid ""
+#~ "Enter the name and security details of the hidden wireless network you "
+#~ "wish to connect to."
+#~ msgstr "輸入您要連接的隱藏無線網路的名稱與安全性詳細資料。"
+
+#~ msgid "Wireless _adapter:"
+#~ msgstr "無線網路卡(_A):"
+
+#~ 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"
+
+#~ msgid "_DNS servers:"
+#~ msgstr "_DNS 伺服器:"
+
+#~ msgid "Preparing wired network connection '%s'..."
+#~ msgstr "正在準備有線網路連線「%s」…"
+
+#~ msgid "User authentication required for wired network connection '%s'..."
+#~ msgstr "有線網路連線「%s」需要使用者驗證…"
+
+#~ msgid "Requesting a wired network address for '%s'..."
+#~ msgstr "正要求有線網路「%s」提供網路位址…"
+
+#~ msgid "_Connect to Hidden Wireless Network..."
+#~ msgstr "連接到隱藏的無線網路(_C)…"
+
+#~ msgid "Create _New Wireless Network..."
+#~ msgstr "建立新的無線網路(_N)…"
+
+#~ msgid "Use the network menu to connect to a wireless network"
+#~ msgstr "使用網路選單來連線到無線網路"
+
+#~ msgid "User authentication required for wireless network '%s'..."
+#~ msgstr "無線網路「%s」要求使用者驗證…"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "不使用憑證中心 (CA) 的憑證會造成連線不安全、流氓無線網路 (可能被竊取、劫聽"
+#~ "之意) 。是否要選擇一個憑證中心的憑證?"
+
+#~ msgid ""
+#~ "Set this to true to disable notifications when wireless networks are "
+#~ "available."
+#~ msgstr "將這設為 True,以停用有無線網路可用。"
+
+#~ msgid "Additional _DNS servers:"
+#~ msgstr "額外的 _DNS 伺服器:"
+
+#~ msgid "Wireless _security:"
+#~ msgstr "無線網路安全(_W):"


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