[network-manager-applet] Updated Traditional Chinese translation(Hong Kong and Taiwan)
- From: Chao-Hsiung Liao <chliao src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] Updated Traditional Chinese translation(Hong Kong and Taiwan)
- Date: Fri, 31 Jan 2014 23:37:03 +0000 (UTC)
commit 7e6db98cbbac167b975e46965d1b213af0a7aaac
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date: Sat Feb 1 07:36:54 2014 +0800
Updated Traditional Chinese translation(Hong Kong and Taiwan)
po/zh_HK.po | 1184 ++++++++++++++++++++++++++++++++---------------------------
po/zh_TW.po | 927 +++++++++++++++++++++++++++-------------------
2 files changed, 1190 insertions(+), 921 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 1f946b2..3d122e0 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -14,17 +14,15 @@ msgstr ""
"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"
+"POT-Creation-Date: 2013-12-28 11:26+0000\n"
+"PO-Revision-Date: 2014-02-01 07:36+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\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-Launchpad-Export-Date: 2013-06-06 20:16+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Generator: Poedit 1.5.3\n"
#: ../nm-applet.desktop.in.h:1
msgid "Network"
@@ -32,7 +30,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
@@ -41,7 +39,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"
@@ -68,7 +66,7 @@ msgstr "停用 VPN 的通知"
msgid ""
"Set this to true to disable notifications when connecting to or "
"disconnecting from a VPN."
-msgstr "將這設為 True，以停用 VPN 網絡連線或離線時的通知。"
+msgstr "將這設為 True，以停用 VPN 線或離線時的通知。"
#: ../org.gnome.nm-applet.gschema.xml.in.h:7
msgid "Suppress networks available notifications"
@@ -120,7 +118,7 @@ msgid ""
"authentication."
msgstr "將這設為 True，以停用在 EAP 認證第二階段中關於 CA 證書的警告。"
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
msgid "802.1X authentication"
msgstr "802.1X 驗證"
@@ -129,37 +127,37 @@ msgstr "802.1X 驗證"
msgid "_Network name:"
msgstr "網絡名稱(_N)："
-#: ../src/applet.c:563
+#: ../src/applet.c:574
msgid "Failed to add/activate connection"
msgstr "無法加入/使用連線"
-#: ../src/applet.c:565 ../src/applet.c:609 ../src/applet.c:635
-#: ../src/applet-device-wifi.c:1377 ../src/applet-device-wifi.c:1396
+#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
+#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
msgid "Unknown error"
msgstr "不明的錯誤"
-#: ../src/applet.c:568 ../src/applet.c:638 ../src/applet-device-wifi.c:1380
-#: ../src/applet-device-wifi.c:1399
+#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
+#: ../src/applet-device-wifi.c:1350
msgid "Connection failure"
msgstr "連線失敗"
-#: ../src/applet.c:607
+#: ../src/applet.c:618
msgid "Device disconnect failed"
msgstr "裝置斷線失敗"
-#: ../src/applet.c:612
+#: ../src/applet.c:623
msgid "Disconnect failure"
msgstr "斷線失敗"
-#: ../src/applet.c:633
+#: ../src/applet.c:644
msgid "Connection activation failed"
msgstr "連線生效失敗"
-#: ../src/applet.c:946 ../src/applet-device-wifi.c:1065
+#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
msgid "Don't show this message again"
msgstr "不要再顯示這個訊息"
-#: ../src/applet.c:1035
+#: ../src/applet.c:1046
#, c-format
msgid ""
"\n"
@@ -169,7 +167,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為網絡連線被中斷了。"
-#: ../src/applet.c:1038
+#: ../src/applet.c:1049
#, c-format
msgid ""
"\n"
@@ -178,7 +176,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為 VPN 服務意外的停止了。"
-#: ../src/applet.c:1041
+#: ../src/applet.c:1052
#, c-format
msgid ""
"\n"
@@ -188,7 +186,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為 VPN 服務傳回無效的組態。"
-#: ../src/applet.c:1044
+#: ../src/applet.c:1055
#, c-format
msgid ""
"\n"
@@ -197,7 +195,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為連線的嘗試已逾時。"
-#: ../src/applet.c:1047
+#: ../src/applet.c:1058
#, c-format
msgid ""
"\n"
@@ -206,7 +204,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為 VPN 服務沒有及時啟動。"
-#: ../src/applet.c:1050
+#: ../src/applet.c:1061
#, c-format
msgid ""
"\n"
@@ -215,7 +213,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為 VPN 服務啟動失敗。"
-#: ../src/applet.c:1053
+#: ../src/applet.c:1064
#, c-format
msgid ""
"\n"
@@ -224,7 +222,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為沒有有效的 VPN 服務。"
-#: ../src/applet.c:1056
+#: ../src/applet.c:1067
#, c-format
msgid ""
"\n"
@@ -233,7 +231,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為無效的 VPN 機密。"
-#: ../src/applet.c:1063
+#: ../src/applet.c:1074
#, c-format
msgid ""
"\n"
@@ -242,7 +240,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗。"
-#: ../src/applet.c:1081
+#: ../src/applet.c:1092
#, c-format
msgid ""
"\n"
@@ -252,7 +250,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為網絡連線中斷了。"
-#: ../src/applet.c:1084
+#: ../src/applet.c:1095
#, c-format
msgid ""
"\n"
@@ -261,7 +259,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為 VPN 服務已停止。"
-#: ../src/applet.c:1090
+#: ../src/applet.c:1101
#, c-format
msgid ""
"\n"
@@ -270,7 +268,7 @@ msgstr ""
"\n"
"VPN 連線「%s」已斷線。"
-#: ../src/applet.c:1120
+#: ../src/applet.c:1131
#, c-format
msgid ""
"VPN connection has been successfully established.\n"
@@ -280,19 +278,19 @@ msgstr ""
"VPN 連線已成功的。\n"
"%s\n"
-#: ../src/applet.c:1122
+#: ../src/applet.c:1133
msgid "VPN connection has been successfully established.\n"
msgstr "VPN 連線已成功的。\n"
-#: ../src/applet.c:1124
+#: ../src/applet.c:1135
msgid "VPN Login Message"
msgstr "VPN 登錄訊息"
-#: ../src/applet.c:1130 ../src/applet.c:1138 ../src/applet.c:1188
+#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
msgid "VPN Connection Failed"
msgstr "VPN 連線失敗"
-#: ../src/applet.c:1195
+#: ../src/applet.c:1206
#, c-format
msgid ""
"\n"
@@ -305,7 +303,7 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1198
+#: ../src/applet.c:1209
#, c-format
msgid ""
"\n"
@@ -318,156 +316,156 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1522
+#: ../src/applet.c:1533
msgid "device not ready (firmware missing)"
msgstr "裝置尚未就緒 (缺少韌體)"
-#: ../src/applet.c:1524
+#: ../src/applet.c:1535
msgid "device not ready"
msgstr "裝置尚未就緒"
#. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1534 ../src/applet-device-ethernet.c:123
+#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
msgid "disconnected"
msgstr "已斷線"
-#: ../src/applet.c:1550
+#: ../src/applet.c:1561
msgid "Disconnect"
msgstr "斷線"
-#: ../src/applet.c:1564
+#: ../src/applet.c:1575
msgid "device not managed"
msgstr "裝置無法管理"
-#: ../src/applet.c:1722
+#: ../src/applet.c:1735
msgid "No network devices available"
msgstr "沒有可用的網絡裝置"
-#: ../src/applet.c:1775
+#: ../src/applet.c:1788
msgid "_VPN Connections"
msgstr "_VPN 連線"
-#: ../src/applet.c:1832
+#: ../src/applet.c:1845
msgid "_Configure VPN..."
msgstr "設置 VPN(_C)…"
-#: ../src/applet.c:1836
+#: ../src/applet.c:1849
msgid "_Disconnect VPN"
msgstr "與 VPN 斷線(_D)"
-#: ../src/applet.c:1952
+#: ../src/applet.c:1965
msgid "NetworkManager is not running..."
msgstr "NetworkManager 沒有執行…."
-#: ../src/applet.c:1957 ../src/applet.c:2927
+#: ../src/applet.c:1970 ../src/applet.c:2940
msgid "Networking disabled"
msgstr "網絡已停用"
#. 'Enable Networking' item
-#: ../src/applet.c:2177
+#: ../src/applet.c:2190
msgid "Enable _Networking"
msgstr "啟用網絡(_N)"
#. 'Enable Wi-Fi' item
-#: ../src/applet.c:2186
+#: ../src/applet.c:2199
msgid "Enable _Wi-Fi"
msgstr "啟用 _Wi-Fi"
#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2195
+#: ../src/applet.c:2208
msgid "Enable _Mobile Broadband"
msgstr "啟用流動寬頻(_M)"
#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2204
+#: ../src/applet.c:2217
msgid "Enable WiMA_X Mobile Broadband"
msgstr "啟用 WiMA_X 流動寬頻"
#. Toggle notifications item
-#: ../src/applet.c:2215
+#: ../src/applet.c:2228
msgid "Enable N_otifications"
msgstr "啟用通知功能(_O)"
#. 'Connection Information' item
-#: ../src/applet.c:2226
+#: ../src/applet.c:2239
msgid "Connection _Information"
msgstr "連線資訊(_I)"
#. 'Edit Connections...' item
-#: ../src/applet.c:2236
+#: ../src/applet.c:2249
msgid "Edit Connections..."
msgstr "編輯連線…"
#. Help item
-#: ../src/applet.c:2250
+#: ../src/applet.c:2263
msgid "_Help"
msgstr "求助(_H)"
#. About item
-#: ../src/applet.c:2259
+#: ../src/applet.c:2272
msgid "_About"
msgstr "關於(_A)"
-#: ../src/applet.c:2512
+#: ../src/applet.c:2525
#, c-format
msgid "You are now connected to '%s'."
-msgstr "您現在已連線至「%s」。"
+msgstr "你現在已連線至「%s」。"
-#: ../src/applet.c:2553
+#: ../src/applet.c:2566
msgid "Disconnected"
msgstr "已斷線"
-#: ../src/applet.c:2554
+#: ../src/applet.c:2567
msgid "The network connection has been disconnected."
msgstr "網絡連線已中斷。"
-#: ../src/applet.c:2789
+#: ../src/applet.c:2802
#, c-format
msgid "Preparing network connection '%s'..."
msgstr "正在準備網絡連線「%s」…"
-#: ../src/applet.c:2792
+#: ../src/applet.c:2805
#, c-format
msgid "User authentication required for network connection '%s'..."
msgstr "網絡連線「%s」需要使用者驗證…"
-#: ../src/applet.c:2795 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:590
+#: ../src/applet.c:2808 ../src/applet-device-bt.c:136
+#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
#, c-format
msgid "Requesting a network address for '%s'..."
msgstr "正在要求提供「%s」的網絡位址…"
-#: ../src/applet.c:2798
+#: ../src/applet.c:2811
#, c-format
msgid "Network connection '%s' active"
msgstr "網絡連線「%s」在使用中"
-#: ../src/applet.c:2881
+#: ../src/applet.c:2894
#, c-format
msgid "Starting VPN connection '%s'..."
msgstr "正在啟動 VPN 連線「%s」…"
-#: ../src/applet.c:2884
+#: ../src/applet.c:2897
#, c-format
msgid "User authentication required for VPN connection '%s'..."
msgstr "VPN 連線「%s」需要使用者驗證…"
-#: ../src/applet.c:2887
+#: ../src/applet.c:2900
#, c-format
msgid "Requesting a VPN address for '%s'..."
msgstr "正在要求 VPN 提供「%s」的網絡位址…"
-#: ../src/applet.c:2890
+#: ../src/applet.c:2903
#, c-format
msgid "VPN connection '%s' active"
msgstr "VPN 連線「%s」在使用中"
-#: ../src/applet.c:2932
+#: ../src/applet.c:2945
msgid "No network connection"
msgstr "沒有網絡連接"
-#: ../src/applet.c:3639
+#: ../src/applet.c:3615
msgid "NetworkManager Applet"
msgstr "NetworkManager 面板程式"
@@ -475,8 +473,8 @@ msgstr "NetworkManager 面板程式"
#: ../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
+#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
+#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
msgid "Available"
msgstr "可用"
@@ -484,14 +482,14 @@ msgstr "可用"
#: ../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
+#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
+#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
msgid "Connection Established"
msgstr "已建立連線"
#: ../src/applet-device-bond.c:90
msgid "You are now connected to the bonded network."
-msgstr "您現在已連線至繫結的網絡。"
+msgstr "你現在已連線至繫結的網絡。"
#: ../src/applet-device-bond.c:114
#, c-format
@@ -509,7 +507,8 @@ 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
+#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
+#: ../src/applet-device-vlan.c:237
#, c-format
msgid "Requesting address for '%s'..."
msgstr "正在要求「%s」的網絡位址…"
@@ -521,7 +520,7 @@ msgstr "繫結的連線「%s」在使用中"
#: ../src/applet-device-bridge.c:90
msgid "You are now connected to the bridged network."
-msgstr "您現在已連線至橋接的網絡。"
+msgstr "你現在已連線至橋接的網絡。"
#: ../src/applet-device-bridge.c:114
#, c-format
@@ -545,11 +544,11 @@ msgstr "橋接的連線「%s」在使用中"
#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
msgid "Wrong PUK code; please contact your provider."
-msgstr "PUK 碼錯誤，請聯絡您的供應商。"
+msgstr "PUK 碼錯誤，請聯絡你的供應商。"
#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
msgid "Wrong PIN code; please contact your provider."
-msgstr "PIN 碼錯誤，請聯絡您的供應商。"
+msgstr "PIN 碼錯誤，請聯絡你的供應商。"
#. Start the spinner to show the progress of the unlock
#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:532
@@ -557,15 +556,15 @@ 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
+#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:421
#, 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/connection-editor/new-connection.c:114
+#: ../src/connection-editor/page-mobile.c:351
#: ../src/libnm-gtk/nm-ui-utils.c:333
msgid "Mobile Broadband"
msgstr "流動寬頻"
@@ -577,45 +576,45 @@ msgstr "新的流動寬頻連線…"
#: ../src/applet-device-broadband.c:797
msgid "You are now connected to the Mobile Broadband network."
-msgstr "您現在已連線至流動寬頻網絡。"
+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
+#: ../src/applet-device-gsm.c:662
msgid "You are now registered on the home network."
-msgstr "您現在已註冊至家用網絡。"
+msgstr "你現在已註冊至家用網絡。"
#: ../src/applet-device-broadband.c:939 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:669
+#: ../src/applet-device-gsm.c:668
msgid "You are now registered on a roaming network."
-msgstr "您現在已註冊至漫遊網絡。"
+msgstr "你現在已註冊至漫遊網絡。"
#: ../src/applet-device-bt.c:103
msgid "You are now connected to the mobile broadband network."
-msgstr "您現在已連線至流動寬頻網絡。"
+msgstr "你現在已連線至流動寬頻網絡。"
#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:581
+#: ../src/mobile-helpers.c:582
#, 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
+#: ../src/mobile-helpers.c:585
#, 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
+#: ../src/mobile-helpers.c:588
#, c-format
msgid "User authentication required for mobile broadband connection '%s'..."
msgstr "流動寬頻連線「%s」需要使用者驗證…"
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:607
+#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
#, c-format
msgid "Mobile broadband connection '%s' active"
msgstr "流動寬頻連線「%s」在使用中"
@@ -627,7 +626,7 @@ msgstr "新的流動寬頻 (CDMA) 連線…"
#: ../src/applet-device-cdma.c:341
msgid "You are now connected to the CDMA network."
-msgstr "您現在已連線至 CDMA 網絡。"
+msgstr "你現在已連線至 CDMA 網絡。"
#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
msgid "CDMA network."
@@ -657,7 +656,7 @@ msgstr "有線網絡"
#: ../src/applet-device-ethernet.c:147
msgid "You are now connected to the ethernet network."
-msgstr "您現在已連線至有線網絡。"
+msgstr "你現在已連線至有線網絡。"
#: ../src/applet-device-ethernet.c:171
#, c-format
@@ -695,9 +694,9 @@ msgstr "新的流動寬頻 (GSM) 連線…"
#: ../src/applet-device-gsm.c:397
msgid "You are now connected to the GSM network."
-msgstr "您現在已連線至 GSM 網絡。"
+msgstr "你現在已連線至 GSM 網絡。"
-#: ../src/applet-device-gsm.c:662 ../src/applet-device-gsm.c:668
+#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
msgid "GSM network."
msgstr "GSM 網絡。"
@@ -725,7 +724,7 @@ msgstr "InfiniBand 網絡"
#: ../src/applet-device-infiniband.c:143
msgid "You are now connected to the InfiniBand network."
-msgstr "您現在已連線至 InfiniBand 網絡。"
+msgstr "你現在已連線至 InfiniBand 網絡。"
#: ../src/applet-device-infiniband.c:167
#, c-format
@@ -747,9 +746,38 @@ msgstr "InfiniBand 連線「%s」需要使用者驗證…"
msgid "InfiniBand connection '%s' active"
msgstr "InfiniBand 連線「%s」在使用中"
+#: ../src/applet-device-team.c:86
+#| msgid "You are now connected to the ethernet network."
+msgid "You are now connected to the teamed network."
+msgstr "你現在已連線至隊伍網絡。"
+
+#: ../src/applet-device-team.c:110
+#, c-format
+#| msgid "Preparing bridge connection '%s'..."
+msgid "Preparing team connection '%s'..."
+msgstr "正在準備隊伍的網絡連線「%s」…"
+
+#: ../src/applet-device-team.c:113
+#, c-format
+#| msgid "Configuring bridge connection '%s'..."
+msgid "Configuring team connection '%s'..."
+msgstr "正在設定隊伍的網絡連線「%s」…"
+
+#: ../src/applet-device-team.c:116
+#, c-format
+#| msgid "User authentication required for VPN connection '%s'..."
+msgid "User authentication required for team connection '%s'..."
+msgstr "隊伍連線「%s」需要使用者驗證…"
+
+#: ../src/applet-device-team.c:123
+#, c-format
+#| msgid "VPN connection '%s' active"
+msgid "Team connection '%s' active"
+msgstr "隊伍連線「%s」在使用中"
+
#: ../src/applet-device-vlan.c:204
msgid "You are now connected to the VLAN."
-msgstr "您現在已連線至 VLAN 網絡。"
+msgstr "你現在已連線至 VLAN 網絡。"
#: ../src/applet-device-vlan.c:228
#, c-format
@@ -771,93 +799,93 @@ msgstr "VLAN 連線「%s」需要使用者驗證…"
msgid "VLAN connection '%s' active"
msgstr "VLAN 連線「%s」在使用中"
-#: ../src/applet-device-wifi.c:98
+#: ../src/applet-device-wifi.c:96
msgid "_Connect to Hidden Wi-Fi Network..."
msgstr "連接到隱藏的 Wi-Fi 網絡(_C)…"
-#: ../src/applet-device-wifi.c:149
+#: ../src/applet-device-wifi.c:147
msgid "Create _New Wi-Fi Network..."
msgstr "建立新的 Wi-Fi 網絡(_N)…"
-#: ../src/applet-device-wifi.c:293
+#: ../src/applet-device-wifi.c:291
msgid "(none)"
msgstr "(無)"
-#: ../src/applet-device-wifi.c:788
+#: ../src/applet-device-wifi.c:769
#, c-format
msgid "Wi-Fi Networks (%s)"
msgstr "Wi-Fi 網絡 (%s)"
-#: ../src/applet-device-wifi.c:790
+#: ../src/applet-device-wifi.c:771
#, c-format
msgid "Wi-Fi Network (%s)"
msgstr "Wi-Fi 網絡 (%s)"
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:773
msgid "Wi-Fi Network"
msgid_plural "Wi-Fi Networks"
msgstr[0] "Wi-Fi 網絡"
-#: ../src/applet-device-wifi.c:821
+#: ../src/applet-device-wifi.c:802
msgid "Wi-Fi is disabled"
msgstr "Wi-Fi 已停用"
-#: ../src/applet-device-wifi.c:822
+#: ../src/applet-device-wifi.c:803
msgid "Wi-Fi is disabled by hardware switch"
msgstr "Wi-Fi 已被硬件開關停用"
-#: ../src/applet-device-wifi.c:883
+#: ../src/applet-device-wifi.c:864
msgid "More networks"
msgstr "更多網絡"
-#: ../src/applet-device-wifi.c:1061
+#: ../src/applet-device-wifi.c:1042
msgid "Wi-Fi Networks Available"
msgstr "有 Wi-Fi 網絡可用"
-#: ../src/applet-device-wifi.c:1062
+#: ../src/applet-device-wifi.c:1043
msgid "Use the network menu to connect to a Wi-Fi network"
msgstr "使用網絡選單來連線到 Wi-Fi 網絡"
-#: ../src/applet-device-wifi.c:1261
+#: ../src/applet-device-wifi.c:1242
#, 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:1292
+#: ../src/applet-device-wifi.c:1273
#, c-format
msgid "Preparing Wi-Fi network connection '%s'..."
msgstr "正在準備 Wi-Fi 網絡連線「%s」…"
-#: ../src/applet-device-wifi.c:1295
+#: ../src/applet-device-wifi.c:1276
#, c-format
msgid "Configuring Wi-Fi network connection '%s'..."
msgstr "正在設定 Wi-Fi 網絡連線「%s」…"
-#: ../src/applet-device-wifi.c:1298
+#: ../src/applet-device-wifi.c:1279
#, c-format
msgid "User authentication required for Wi-Fi network '%s'..."
msgstr "Wi-Fi 網絡連線「%s」需要使用者驗證…"
-#: ../src/applet-device-wifi.c:1301
+#: ../src/applet-device-wifi.c:1282
#, c-format
msgid "Requesting a Wi-Fi network address for '%s'..."
msgstr "正在要求提供「%s」的 Wi-Fi 網絡位址…"
-#: ../src/applet-device-wifi.c:1322
+#: ../src/applet-device-wifi.c:1303
#, c-format
msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
msgstr "Wi-Fi 網絡連線「%s」在使用中： %s (%d%%)"
-#: ../src/applet-device-wifi.c:1327
+#: ../src/applet-device-wifi.c:1308
#, c-format
msgid "Wi-Fi network connection '%s' active"
msgstr "Wi-Fi 網絡連線「%s」在使用中"
-#: ../src/applet-device-wifi.c:1375
+#: ../src/applet-device-wifi.c:1326
msgid "Failed to activate connection"
msgstr "無法使用連線"
-#: ../src/applet-device-wifi.c:1394
+#: ../src/applet-device-wifi.c:1345
msgid "Failed to add new connection"
msgstr "無法加入新連線"
@@ -880,14 +908,14 @@ msgstr "WiMAX 已被硬件開關停用"
#: ../src/applet-device-wimax.c:402
msgid "You are now connected to the WiMAX network."
-msgstr "您現在已連線至 WiMAX 網絡。"
+msgstr "你現在已連線至 WiMAX 網絡。"
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:602
+#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
#, c-format
msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
msgstr "流動寬頻連線「%s」在使用中：(%d%%%s%s)"
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:605
+#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
msgid "roaming"
msgstr "漫遊"
@@ -896,9 +924,9 @@ msgid "Error displaying connection information:"
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:433
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnm-gtk/nm-wifi-dialog.c:918
+#: ../src/wireless-security/wireless-security.c:441
msgid "LEAP"
msgstr "LEAP"
@@ -906,195 +934,195 @@ msgstr "LEAP"
msgid "Dynamic WEP"
msgstr "動態 WEP"
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:246
-#: ../src/applet-dialogs.c:248
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
+#: ../src/applet-dialogs.c:244
msgid "WPA/WPA2"
msgstr "WPA/WPA2"
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:240
msgid "WEP"
msgstr "WEP"
-#: ../src/applet-dialogs.c:252 ../src/applet-dialogs.c:261
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
+#: ../src/connection-editor/page-wifi-security.c:261
+msgctxt "Wi-Fi/Ethernet security"
msgid "None"
msgstr "沒有"
-#: ../src/applet-dialogs.c:278
+#: ../src/applet-dialogs.c:274
#, c-format
msgid "%s (default)"
msgstr "%s (預設值)"
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:485
+#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:481
#, c-format
msgid "%u Mb/s"
msgstr "%u Mb/s"
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:487
+#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:483
msgctxt "Speed"
msgid "Unknown"
msgstr "不明"
-#: ../src/applet-dialogs.c:362
+#: ../src/applet-dialogs.c:358
#, c-format
msgid "%d dB"
msgstr "%d dB"
-#: ../src/applet-dialogs.c:364
+#: ../src/applet-dialogs.c:360
msgctxt "WiMAX CINR"
msgid "unknown"
msgstr "不明"
-#: ../src/applet-dialogs.c:376
+#: ../src/applet-dialogs.c:372
msgctxt "WiMAX Base Station ID"
msgid "unknown"
msgstr "不明"
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:407
#, c-format
msgid "Ethernet (%s)"
msgstr "乙太網絡 (%s)"
-#: ../src/applet-dialogs.c:414
+#: ../src/applet-dialogs.c:410
#, c-format
msgid "802.11 WiFi (%s)"
msgstr "802.11 WiFi (%s)"
-#: ../src/applet-dialogs.c:421
+#: ../src/applet-dialogs.c:417
#, c-format
msgid "GSM (%s)"
msgstr "GSM (%s)"
-#: ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:419
#, c-format
msgid "CDMA (%s)"
msgstr "CDMA (%s)"
-#: ../src/applet-dialogs.c:427
+#: ../src/applet-dialogs.c:423
#, c-format
msgid "WiMAX (%s)"
msgstr "WiMAX (%s)"
#. --- General ---
-#: ../src/applet-dialogs.c:433 ../src/applet-dialogs.c:792
-#: ../src/connection-editor/page-general.c:325
+#: ../src/applet-dialogs.c:429 ../src/applet-dialogs.c:788
+#: ../src/connection-editor/page-general.c:327
msgid "General"
msgstr "一般"
-#: ../src/applet-dialogs.c:437
+#: ../src/applet-dialogs.c:433
msgid "Interface:"
msgstr "介面："
-#: ../src/applet-dialogs.c:453
+#: ../src/applet-dialogs.c:449
msgid "Hardware Address:"
msgstr "硬件位址："
#. Driver
-#: ../src/applet-dialogs.c:461
+#: ../src/applet-dialogs.c:457
msgid "Driver:"
msgstr "驅動程式："
-#: ../src/applet-dialogs.c:490
+#: ../src/applet-dialogs.c:486
msgid "Speed:"
msgstr "速度："
-#: ../src/applet-dialogs.c:500
+#: ../src/applet-dialogs.c:496
msgid "Security:"
msgstr "安全性："
-#: ../src/applet-dialogs.c:513
+#: ../src/applet-dialogs.c:509
msgid "CINR:"
msgstr "CINR："
-#: ../src/applet-dialogs.c:526
+#: ../src/applet-dialogs.c:522
msgid "BSID:"
msgstr "BSID："
#. --- IPv4 ---
-#: ../src/applet-dialogs.c:543
+#: ../src/applet-dialogs.c:539
msgid "IPv4"
msgstr "IPv4"
#. Address
-#: ../src/applet-dialogs.c:554 ../src/applet-dialogs.c:661
+#: ../src/applet-dialogs.c:550 ../src/applet-dialogs.c:657
msgid "IP Address:"
msgstr "IP 位址："
-#: ../src/applet-dialogs.c:556 ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:568
msgctxt "Address"
msgid "Unknown"
msgstr "不明"
-#: ../src/applet-dialogs.c:570
+#: ../src/applet-dialogs.c:566
msgid "Broadcast Address:"
msgstr "廣播位址："
#. Prefix
-#: ../src/applet-dialogs.c:579
+#: ../src/applet-dialogs.c:575
msgid "Subnet Mask:"
msgstr "子網絡遮罩："
-#: ../src/applet-dialogs.c:581
+#: ../src/applet-dialogs.c:577
msgctxt "Subnet Mask"
msgid "Unknown"
msgstr "不明"
-#: ../src/applet-dialogs.c:589 ../src/applet-dialogs.c:676
+#: ../src/applet-dialogs.c:585 ../src/applet-dialogs.c:672
msgid "Default Route:"
msgstr "預設路由："
-#: ../src/applet-dialogs.c:601
+#: ../src/applet-dialogs.c:597
msgid "Primary DNS:"
msgstr "主要 DNS："
-#: ../src/applet-dialogs.c:610
+#: ../src/applet-dialogs.c:606
msgid "Secondary DNS:"
msgstr "次要 DNS："
-#: ../src/applet-dialogs.c:620
+#: ../src/applet-dialogs.c:616
msgid "Ternary DNS:"
msgstr "第三 DNS："
#. --- IPv6 ---
-#: ../src/applet-dialogs.c:635
+#: ../src/applet-dialogs.c:631
msgid "IPv6"
msgstr "IPv6"
-#: ../src/applet-dialogs.c:644
+#: ../src/applet-dialogs.c:640
msgid "Ignored"
msgstr "已忽略"
-#: ../src/applet-dialogs.c:797
+#: ../src/applet-dialogs.c:793
msgid "VPN Type:"
msgstr "VPN 類型："
-#: ../src/applet-dialogs.c:804
+#: ../src/applet-dialogs.c:800
msgid "VPN Gateway:"
msgstr "VPN 閘道器："
-#: ../src/applet-dialogs.c:810
+#: ../src/applet-dialogs.c:806
msgid "VPN Username:"
msgstr "VPN 使用者名稱："
-#: ../src/applet-dialogs.c:816
+#: ../src/applet-dialogs.c:812
msgid "VPN Banner:"
msgstr "VPN 旗幟："
-#: ../src/applet-dialogs.c:822
+#: ../src/applet-dialogs.c:818
msgid "Base Connection:"
msgstr "基礎連線："
-#: ../src/applet-dialogs.c:824 ../src/libnm-gtk/nm-ui-utils.c:345
+#: ../src/applet-dialogs.c:820 ../src/libnm-gtk/nm-ui-utils.c:347
msgid "Unknown"
msgstr "不明"
#. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:887
+#: ../src/applet-dialogs.c:883
msgid "No valid active connections found!"
msgstr "找不到有效的使用中連線！"
-#: ../src/applet-dialogs.c:915
+#: ../src/applet-dialogs.c:911
msgid ""
"Copyright © 2004-2011 Red Hat, Inc.\n"
"Copyright © 2005-2008 Novell, Inc.\n"
@@ -1104,42 +1132,42 @@ msgstr ""
"Copyright © 2005-2008 Novell, Inc.\n"
"與許多其他社羣貢獻者與翻譯者"
-#: ../src/applet-dialogs.c:918
+#: ../src/applet-dialogs.c:914
msgid ""
"Notification area applet for managing your network devices and connections."
-msgstr "用來管理您的網絡裝置與連線的通知區面板程式。"
+msgstr "用來管理你的網絡裝置與連線的通知區面板程式。"
-#: ../src/applet-dialogs.c:920
+#: ../src/applet-dialogs.c:916
msgid "NetworkManager Website"
msgstr "NetworkManager 網站"
-#: ../src/applet-dialogs.c:935
+#: ../src/applet-dialogs.c:931
msgid "Missing resources"
msgstr "遺失資源"
-#: ../src/applet-dialogs.c:960
+#: ../src/applet-dialogs.c:956
msgid "Mobile broadband network password"
msgstr "流動寬頻網絡密碼"
-#: ../src/applet-dialogs.c:969
+#: ../src/applet-dialogs.c:965
#, c-format
msgid "A password is required to connect to '%s'."
msgstr "連線至「%s」需要密碼。"
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:980
msgid "Password:"
msgstr "密碼："
-#: ../src/applet-dialogs.c:1282
+#: ../src/applet-dialogs.c:1261
msgid "SIM PIN unlock required"
msgstr "需要解鎖 SIM PIN 碼"
-#: ../src/applet-dialogs.c:1283
+#: ../src/applet-dialogs.c:1262
msgid "SIM PIN Unlock Required"
msgstr "需要解鎖 SIM PIN 碼"
#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1285
+#: ../src/applet-dialogs.c:1264
#, c-format
msgid ""
"The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1147,25 +1175,25 @@ msgid ""
msgstr "要使用流動寬頻裝置「%s」之前，需要 SIM PIN 碼。"
#. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1287
+#: ../src/applet-dialogs.c:1266
msgid "PIN code:"
msgstr "PIN 碼："
#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1291
+#: ../src/applet-dialogs.c:1270
msgid "Show PIN code"
msgstr "顯示 PIN 碼"
-#: ../src/applet-dialogs.c:1293
+#: ../src/applet-dialogs.c:1272
msgid "SIM PUK unlock required"
msgstr "需要解鎖 SIM PUK 碼"
-#: ../src/applet-dialogs.c:1294
+#: ../src/applet-dialogs.c:1273
msgid "SIM PUK Unlock Required"
msgstr "需要解鎖 SIM PUK 碼"
#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1296
+#: ../src/applet-dialogs.c:1275
#, c-format
msgid ""
"The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1173,22 +1201,22 @@ msgid ""
msgstr "要使用流動寬頻裝置「%s」之前，需要 SIM PUK 碼。"
#. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1298
+#: ../src/applet-dialogs.c:1277
msgid "PUK code:"
msgstr "PUK 碼："
#. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1301
+#: ../src/applet-dialogs.c:1280
msgid "New PIN code:"
msgstr "新的 PIN 碼："
#. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1303
+#: ../src/applet-dialogs.c:1282
msgid "Re-enter new PIN code:"
msgstr "重新輸入 PIN 碼："
#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1308
+#: ../src/applet-dialogs.c:1287
msgid "Show PIN/PUK codes"
msgstr "顯示 PIN/PUK 碼"
@@ -1199,7 +1227,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
@@ -1243,10 +1271,9 @@ msgid ""
"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 外掛程式。"
+"如果要建立 VPN，而你想要建立的 VPN 連線類型沒有出現在清單中，可能是沒有安裝正確的 VPN 外掛程式。"
#: ../src/connection-editor/ce-page-bond.ui.h:1
msgid "Round-robin"
@@ -1295,14 +1322,16 @@ msgstr "模式(_M)："
#. Edit
#: ../src/connection-editor/ce-page-bond.ui.h:12
#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:685
+#: ../src/connection-editor/ce-page-team.ui.h:4
+#: ../src/connection-editor/nm-connection-list.c:686
msgid "_Edit"
msgstr "編輯(_E)"
#. Delete
#: ../src/connection-editor/ce-page-bond.ui.h:13
#: ../src/connection-editor/ce-page-bridge.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:702
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#: ../src/connection-editor/nm-connection-list.c:703
msgid "_Delete"
msgstr "刪除(_D)"
@@ -1316,6 +1345,7 @@ msgstr "毫秒"
#: ../src/connection-editor/ce-page-bond.ui.h:16
#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: ../src/connection-editor/ce-page-team.ui.h:6
msgid "_Interface name:"
msgstr "介面名稱(_I)："
@@ -1331,8 +1361,7 @@ msgstr "ARP 目標(_T)："
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:"
@@ -1342,6 +1371,17 @@ msgstr "連線延遲(_U)："
msgid "Link _down delay:"
msgstr "斷線延遲(_D)："
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+#| msgid "Primary DNS:"
+msgid "_Primary:"
+msgstr "主要(_P):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+msgid ""
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
+msgstr "主要介面的介面名稱。如果設定，這個裝置在可用時會永遠成為使用中的從屬。"
+
#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
msgid "Path _cost:"
msgstr "路徑成本(_C)："
@@ -1387,7 +1427,7 @@ msgstr "存續時間(_A)："
msgid "automatic"
msgstr "自動"
-#: ../src/connection-editor/ce-page.c:348
+#: ../src/connection-editor/ce-page.c:342
msgid "Failed to update connection secrets due to an unknown error."
msgstr "由於不明的錯誤使連線機密的更新失敗。"
@@ -1406,7 +1446,7 @@ msgstr "服務(_S)："
#: ../src/connection-editor/ce-page-dsl.ui.h:3
#: ../src/wireless-security/eap-method-leap.ui.h:3
#: ../src/wireless-security/eap-method-simple.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../src/wireless-security/eap-method-tls.ui.h:7
#: ../src/wireless-security/ws-leap.ui.h:3
#: ../src/wireless-security/ws-wpa-psk.ui.h:3
msgid "Sho_w password"
@@ -1497,9 +1537,7 @@ 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:17
#: ../src/connection-editor/ce-page-infiniband.ui.h:4
@@ -1584,16 +1622,14 @@ msgid ""
"The DHCP client identifier allows the network administrator to customize "
"your computer's configuration. If you wish to use a DHCP client identifier, "
"enter it here."
-msgstr ""
-"DHCP 用戶端識別能讓網管人員客製您電腦上的配置。如果您想要使用 DHCP 用戶端識"
-"別，請在此輸入。"
+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:"
@@ -1614,13 +1650,10 @@ msgid "DNS ser_vers:"
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"
@@ -1630,15 +1663,23 @@ 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
msgid "_Routes…"
msgstr "路由(_R)…"
+#: ../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."
+msgid ""
+"IP addresses of domain name servers used to resolve host names. Use commas "
+"to separate multiple domain name server addresses. Link-local addresses will "
+"be automatically scoped to the connecting interface."
+msgstr "網域名稱伺服器的 IP 位址，用來解析主機名稱。請使用逗號來分開多個網域伺服器的位址。Link-local 位址會自動設定到連線中的介面。"
+
#: ../src/connection-editor/ce-page-ip6.ui.h:13
msgid "Require IPv_6 addressing for this connection to complete"
msgstr "需要 IPv_6 addressing 才可完成此連線"
@@ -1647,9 +1688,7 @@ 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"
@@ -1766,7 +1805,27 @@ 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-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr "_JSON 設定:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#| msgid "Import a saved VPN configuration..."
+msgid "_Import team configuration from a file..."
+msgstr "從檔案匯入隊伍組態(_I)…"
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#| msgid "Bonded _connections:"
+msgid "_Teamed connections:"
+msgstr "隊伍連線(_T):"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#| msgid "Import a saved VPN configuration..."
+msgid "I_mport team configuration from a file..."
+msgstr "從檔案匯入隊伍組態(_M)…"
#: ../src/connection-editor/ce-page-vlan.ui.h:1
msgid "_Parent interface:"
@@ -1898,179 +1957,183 @@ 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:749
-#: ../src/connection-editor/ip6-routes-dialog.c:691
-#: ../src/connection-editor/page-ip4.c:915
-#: ../src/connection-editor/page-ip6.c:881
+#: ../src/connection-editor/ip4-routes-dialog.c:724
+#: ../src/connection-editor/ip6-routes-dialog.c:666
+#: ../src/connection-editor/page-ip4.c:924
+#: ../src/connection-editor/page-ip6.c:887
msgid "Address"
msgstr "地址"
-#: ../src/connection-editor/ip4-routes-dialog.c:766
-#: ../src/connection-editor/page-ip4.c:932
+#: ../src/connection-editor/ip4-routes-dialog.c:741
+#: ../src/connection-editor/page-ip4.c:941
msgid "Netmask"
msgstr "網絡遮罩"
-#: ../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
+#: ../src/connection-editor/ip4-routes-dialog.c:758
+#: ../src/connection-editor/ip6-routes-dialog.c:700
+#: ../src/connection-editor/page-ip4.c:958
+#: ../src/connection-editor/page-ip6.c:921
msgid "Gateway"
msgstr "通訊閘"
-#: ../src/connection-editor/ip4-routes-dialog.c:800
-#: ../src/connection-editor/ip6-routes-dialog.c:742
+#: ../src/connection-editor/ip4-routes-dialog.c:775
+#: ../src/connection-editor/ip6-routes-dialog.c:717
msgid "Metric"
msgstr "度量 (Metric)"
-#: ../src/connection-editor/ip6-routes-dialog.c:708
-#: ../src/connection-editor/page-ip6.c:898
+#: ../src/connection-editor/ip6-routes-dialog.c:683
+#: ../src/connection-editor/page-ip6.c:904
msgid "Prefix"
msgstr "前綴"
-#: ../src/connection-editor/new-connection.c:101
+#: ../src/connection-editor/new-connection.c:102
#: ../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/new-connection.c:108
#: ../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/new-connection.c:120
#: ../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"
-#: ../src/connection-editor/new-connection.c:125
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/new-connection.c:126
+#: ../src/connection-editor/page-dsl.c:137
msgid "DSL"
msgstr "DSL"
-#: ../src/connection-editor/new-connection.c:131
+#: ../src/connection-editor/new-connection.c:132
#: ../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:412 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:559
+#: ../src/connection-editor/new-connection.c:138
+#: ../src/connection-editor/page-bond.c:430 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/libnm-gtk/nm-ui-utils.c:562
msgid "Bond"
msgstr "繫結"
-#: ../src/connection-editor/new-connection.c:143
+#: ../src/connection-editor/new-connection.c:144
+#: ../src/connection-editor/page-team.c:255 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:564
+msgid "Team"
+msgstr "隊伍"
+
+#: ../src/connection-editor/new-connection.c:150
#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
msgid "Bridge"
msgstr "橋接"
-#: ../src/connection-editor/new-connection.c:149
-#: ../src/connection-editor/page-vlan.c:475 ../src/libnm-gtk/nm-ui-utils.c:341
-#: ../src/libnm-gtk/nm-ui-utils.c:563
+#: ../src/connection-editor/new-connection.c:156
+#: ../src/connection-editor/page-vlan.c:482 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/libnm-gtk/nm-ui-utils.c:568
msgid "VLAN"
msgstr "VLAN"
-#: ../src/connection-editor/new-connection.c:162
-#: ../src/connection-editor/new-connection.c:302
+#: ../src/connection-editor/new-connection.c:169
+#: ../src/connection-editor/new-connection.c:309
#: ../src/connection-editor/page-vpn.c:113
msgid "VPN"
msgstr "VPN"
-#: ../src/connection-editor/new-connection.c:252
+#: ../src/connection-editor/new-connection.c:259
msgid "Hardware"
msgstr "硬件"
-#: ../src/connection-editor/new-connection.c:272
+#: ../src/connection-editor/new-connection.c:279
msgid "Virtual"
msgstr "虛擬"
-#: ../src/connection-editor/new-connection.c:340
-#: ../src/connection-editor/new-connection.c:342
+#: ../src/connection-editor/new-connection.c:347
+#: ../src/connection-editor/new-connection.c:349
msgid "Import a saved VPN configuration..."
msgstr "匯入已儲存的 VPN 組態…"
-#: ../src/connection-editor/new-connection.c:371
+#: ../src/connection-editor/new-connection.c:378
msgid ""
"The connection editor dialog could not be initialized due to an unknown "
"error."
msgstr "由於不明的錯誤使連線編輯器對話盒無法初始化。"
-#: ../src/connection-editor/new-connection.c:380
+#: ../src/connection-editor/new-connection.c:387
msgid "Could not create new connection"
msgstr "無法建立新連線"
-#: ../src/connection-editor/new-connection.c:515
+#: ../src/connection-editor/new-connection.c:522
msgid "Connection delete failed"
msgstr "刪除連線失敗"
-#: ../src/connection-editor/new-connection.c:562
+#: ../src/connection-editor/new-connection.c:569
#, 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
+#: ../src/connection-editor/nm-connection-editor.c:122
#, c-format
msgid "Editing %s"
msgstr "編輯 %s"
-#: ../src/connection-editor/nm-connection-editor.c:122
+#: ../src/connection-editor/nm-connection-editor.c:126
msgid "Editing un-named connection"
msgstr "編輯未命名的連線"
-#: ../src/connection-editor/nm-connection-editor.c:282
+#: ../src/connection-editor/nm-connection-editor.c:286
msgid ""
"The connection editor could not find some required resources (the .ui file "
"was not found)."
msgstr "連線編輯器找不到一些需要的資源（找不到 .ui 檔）。"
-#: ../src/connection-editor/nm-connection-editor.c:413
+#: ../src/connection-editor/nm-connection-editor.c:417
msgid "_Save"
msgstr "儲存(_S)"
-#: ../src/connection-editor/nm-connection-editor.c:414
+#: ../src/connection-editor/nm-connection-editor.c:418
msgid "Save any changes made to this connection."
msgstr "儲存任何對這個連線進行的更改。"
-#: ../src/connection-editor/nm-connection-editor.c:415
+#: ../src/connection-editor/nm-connection-editor.c:419
msgid "_Save..."
msgstr "儲存(_S)…"
-#: ../src/connection-editor/nm-connection-editor.c:416
+#: ../src/connection-editor/nm-connection-editor.c:420
msgid "Authenticate to save this connection for all users of this machine."
msgstr "驗證以儲存這個連線給此電腦上的所有使用者。"
-#: ../src/connection-editor/nm-connection-editor.c:432
+#: ../src/connection-editor/nm-connection-editor.c:436
msgid "Could not create connection"
msgstr "無法建立連線"
-#: ../src/connection-editor/nm-connection-editor.c:432
+#: ../src/connection-editor/nm-connection-editor.c:436
msgid "Could not edit connection"
msgstr "無法編輯連線"
-#: ../src/connection-editor/nm-connection-editor.c:434
+#: ../src/connection-editor/nm-connection-editor.c:438
msgid "Unknown error creating connection editor dialog."
msgstr "建立連線編輯器對話盒時發生不明錯誤。"
-#: ../src/connection-editor/nm-connection-editor.c:602
+#: ../src/connection-editor/nm-connection-editor.c:572
msgid "Error initializing editor"
msgstr "初始化編輯器時發生錯誤"
-#: ../src/connection-editor/nm-connection-editor.c:923
+#: ../src/connection-editor/nm-connection-editor.c:903
msgid "Connection add failed"
msgstr "新增連線失敗"
-#: ../src/connection-editor/nm-connection-editor.c:973
+#: ../src/connection-editor/nm-connection-editor.c:943
msgid "Error saving connection"
msgstr "儲存連線時錯誤"
-#: ../src/connection-editor/nm-connection-editor.c:974
+#: ../src/connection-editor/nm-connection-editor.c:944
#, c-format
msgid "The property '%s' / '%s' is invalid: %d"
msgstr "屬性「%s」/「%s」是無效的：%d"
@@ -2123,56 +2186,56 @@ msgid "%d year ago"
msgid_plural "%d years ago"
msgstr[0] "%d 年以前"
-#: ../src/connection-editor/nm-connection-list.c:631
+#: ../src/connection-editor/nm-connection-list.c:632
msgid "Name"
msgstr "名稱"
-#: ../src/connection-editor/nm-connection-list.c:644
+#: ../src/connection-editor/nm-connection-list.c:645
msgid "Last Used"
msgstr "最後使用的"
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:687
msgid "Edit the selected connection"
msgstr "編輯選取的連線"
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:688
msgid "_Edit..."
msgstr "編輯(_E)…"
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:689
msgid "Authenticate to edit the selected connection"
msgstr "驗證以編輯選取的連線"
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:704
msgid "Delete the selected connection"
msgstr "刪除選取的連線"
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:705
msgid "_Delete..."
msgstr "刪除(_D)…"
-#: ../src/connection-editor/nm-connection-list.c:705
+#: ../src/connection-editor/nm-connection-list.c:706
msgid "Authenticate to delete the selected connection"
msgstr "驗證以刪除選取的連線"
-#: ../src/connection-editor/nm-connection-list.c:934
+#: ../src/connection-editor/nm-connection-list.c:935
msgid "No VPN plugins are installed."
msgstr "尚未安裝任何 VPN 外掛程式。"
-#: ../src/connection-editor/nm-connection-list.c:936
+#: ../src/connection-editor/nm-connection-list.c:937
#, c-format
msgid "Don't know how to create '%s' connections"
msgstr "不知道如何建立「%s」連線"
-#: ../src/connection-editor/nm-connection-list.c:938
+#: ../src/connection-editor/nm-connection-list.c:939
msgid "Error creating connection"
msgstr "建立連線時發生錯誤"
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:995
msgid "Error editing connection"
msgstr "編輯連線時發生錯誤"
-#: ../src/connection-editor/nm-connection-list.c:995
+#: ../src/connection-editor/nm-connection-list.c:996
#, c-format
msgid "Did not find a connection with UUID '%s'"
msgstr "找不到 UUID「%s」的連線"
@@ -2189,11 +2252,11 @@ msgstr "無法載入 802.1x 安全性使用者介面。"
msgid "Use 802.1_X security for this connection"
msgstr "在這個連線使用 802.1_X 防護"
-#: ../src/connection-editor/page-bond.c:415
+#: ../src/connection-editor/page-bond.c:433
msgid "Could not load bond user interface."
msgstr "無法載入繫結的使用者介面。"
-#: ../src/connection-editor/page-bond.c:557
+#: ../src/connection-editor/page-bond.c:587
#, c-format
msgid "Bond connection %d"
msgstr "繫結的連線 %d"
@@ -2218,11 +2281,11 @@ msgstr "橋接連接埠"
msgid "Could not load bridge port user interface."
msgstr "無法載入橋接連接埠使用者介面。"
-#: ../src/connection-editor/page-dsl.c:143
+#: ../src/connection-editor/page-dsl.c:139
msgid "Could not load DSL user interface."
msgstr "無法載入 DSL 使用者介面。"
-#: ../src/connection-editor/page-dsl.c:235
+#: ../src/connection-editor/page-dsl.c:231
#, c-format
msgid "DSL connection %d"
msgstr "DSL 連線 %d"
@@ -2234,9 +2297,7 @@ msgstr "DSL 連線 %d"
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:244
msgid "Could not load ethernet user interface."
@@ -2258,15 +2319,13 @@ 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:57
msgid "FirewallD is not running."
msgstr "FirewallD 沒有執行。"
-#: ../src/connection-editor/page-general.c:328
+#: ../src/connection-editor/page-general.c:330
msgid "Could not load General user interface."
msgstr "無法載入一般使用者介面。"
@@ -2336,16 +2395,16 @@ msgstr "額外的 _DNS 伺服器："
msgid "Additional s_earch domains:"
msgstr "額外的搜尋網域(_E)："
-#: ../src/connection-editor/page-ip4.c:847
+#: ../src/connection-editor/page-ip4.c:856
#, c-format
msgid "Editing IPv4 routes for %s"
msgstr "編輯 %s 的 IPv4 路由"
-#: ../src/connection-editor/page-ip4.c:998
+#: ../src/connection-editor/page-ip4.c:1008
msgid "IPv4 Settings"
msgstr "IPv4 設定"
-#: ../src/connection-editor/page-ip4.c:1000
+#: ../src/connection-editor/page-ip4.c:1010
msgid "Could not load IPv4 user interface."
msgstr "無法載入 IPv4 使用者介面。"
@@ -2354,7 +2413,6 @@ msgid "Automatic, addresses only"
msgstr "自動，僅限位址"
#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:281
msgid "Ignore"
msgstr "忽略"
@@ -2362,57 +2420,74 @@ msgstr "忽略"
msgid "Automatic, DHCP only"
msgstr "自動，僅使用 DHCP"
-#: ../src/connection-editor/page-ip6.c:813
+#: ../src/connection-editor/page-ip6.c:819
#, c-format
msgid "Editing IPv6 routes for %s"
msgstr "為 %s 編輯 IPv6 路由"
-#: ../src/connection-editor/page-ip6.c:962
+#: ../src/connection-editor/page-ip6.c:969
msgid "IPv6 Settings"
msgstr "IPv6 設定"
-#: ../src/connection-editor/page-ip6.c:964
+#: ../src/connection-editor/page-ip6.c:971
msgid "Could not load IPv6 user interface."
msgstr "無法載入 IPv6 使用者介面。"
-#: ../src/connection-editor/page-master.c:284
+#: ../src/connection-editor/page-master.c:244
+#: ../src/connection-editor/page-master.c:255
+msgid "Duplicate slaves"
+msgstr "重製從屬"
+
+#: ../src/connection-editor/page-master.c:245
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr "從屬「%s」與「%s」都套用到裝置「%s」"
+
+#: ../src/connection-editor/page-master.c:256
+#, c-format
+msgid ""
+"Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
+"same physical device."
+msgstr "從屬「%s」與「%s」套用到同個實體裝置不同的虛擬連接埠(「%s」與「%s」)。"
+
+#: ../src/connection-editor/page-master.c:373
#, c-format
msgid "%s slave %d"
msgstr "%s slave %d"
-#: ../src/connection-editor/page-mobile.c:393
+#: ../src/connection-editor/page-mobile.c:353
msgid "Could not load mobile broadband user interface."
msgstr "無法載入流動寬頻使用者介面。"
-#: ../src/connection-editor/page-mobile.c:410
+#: ../src/connection-editor/page-mobile.c:370
msgid "Unsupported mobile broadband connection type."
msgstr "不支援的流動寬頻連線類型。"
#. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:660
+#: ../src/connection-editor/page-mobile.c:620
msgid "Select Mobile Broadband Provider Type"
msgstr "選擇流動寬頻供應商類型"
-#: ../src/connection-editor/page-mobile.c:687
+#: ../src/connection-editor/page-mobile.c:647
msgid ""
"Select the technology your mobile broadband provider uses. If you are "
"unsure, ask your provider."
-msgstr "請選擇您的無線寬頻供應商所使用的技術。如果您不確定，請洽詢供應商。"
+msgstr "請選擇你的無線寬頻供應商所使用的技術。如果你不確定，請洽詢供應商。"
-#: ../src/connection-editor/page-mobile.c:692
+#: ../src/connection-editor/page-mobile.c:652
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:699
+#: ../src/connection-editor/page-mobile.c:659
msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
msgstr "我的供應商使用 C_DMA 為主的技術（例如 1xRTT、EVDO）"
-#: ../src/connection-editor/page-mobile.c:709 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
#: ../src/mobile-helpers.c:270
msgid "CDMA"
msgstr "CDMA"
-#: ../src/connection-editor/page-mobile.c:712 ../src/mb-menu-item.c:58
+#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
#: ../src/mobile-helpers.c:268
msgid "GSM"
msgstr "GSM"
@@ -2422,24 +2497,24 @@ msgid "EAP"
msgstr "EAP"
#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/wireless-security/eap-method-ttls.c:248
msgid "PAP"
msgstr "PAP"
#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/wireless-security/eap-method-ttls.c:298
msgid "CHAP"
msgstr "CHAP"
#: ../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
+#: ../src/wireless-security/eap-method-peap.c:264
+#: ../src/wireless-security/eap-method-ttls.c:281
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/wireless-security/eap-method-ttls.c:265
msgid "MSCHAP"
msgstr "MSCHAP"
@@ -2461,11 +2536,54 @@ msgstr "PPP 設定值"
msgid "Could not load PPP user interface."
msgstr "無法載入 PPP 使用者介面。"
-#: ../src/connection-editor/page-vlan.c:477
+#: ../src/connection-editor/page-team.c:94
+#: ../src/connection-editor/page-team-port.c:77
+#: ../src/connection-editor/vpn-helpers.c:234
+msgid "Select file to import"
+msgstr "選擇要匯入的檔案"
+
+#: ../src/connection-editor/page-team.c:114
+#: ../src/connection-editor/page-team-port.c:97
+msgid "Error: file doesn't contain a valid JSON configuration"
+msgstr "錯誤：檔案不含有效的 JSON 組態"
+
+#: ../src/connection-editor/page-team.c:258
+#| msgid "Could not load vlan user interface."
+msgid "Could not load team user interface."
+msgstr "無法載入隊伍使用者介面。"
+
+#: ../src/connection-editor/page-team.c:353
+#, c-format
+#| msgid "Wired connection %d"
+msgid "Team connection %d"
+msgstr "隊伍連線 %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:157
+#| msgid "Bridge Port"
+msgid "Team Port"
+msgstr "隊伍連接埠"
+
+#: ../src/connection-editor/page-team-port.c:159
+#| msgid "Could not load bridge port user interface."
+msgid "Could not load team port user interface."
+msgstr "無法載入隊伍連接埠使用者介面。"
+
+#. Translators: the first %s is a device name (eg, "em1"), the
+#. * second is a connection name (eg, "Auto Ethernet").
+#.
+#: ../src/connection-editor/page-vlan.c:318
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr "%s (經由「%s」)"
+
+#: ../src/connection-editor/page-vlan.c:484
msgid "Could not load vlan user interface."
msgstr "無法載入 vlan 使用者介面。"
-#: ../src/connection-editor/page-vlan.c:673
+#: ../src/connection-editor/page-vlan.c:680
#, c-format
msgid "VLAN connection %d"
msgstr "VLAN 連線 %d"
@@ -2504,17 +2622,13 @@ 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: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:172
#: ../src/connection-editor/page-wifi.c:176
@@ -2532,50 +2646,45 @@ msgstr "%u (%u MHz)"
msgid "Could not load Wi-Fi user interface."
msgstr "無法載入 Wi-Fi 使用者介面。"
-#: ../src/connection-editor/page-wifi.c:645
+#: ../src/connection-editor/page-wifi.c:638
#, c-format
msgid "Wi-Fi connection %d"
msgstr "Wi-Fi 連線 %d"
-#: ../src/connection-editor/page-wifi-security.c:265
-msgctxt "Wi-Fi/Ethernet security"
-msgid "None"
-msgstr "沒有"
-
-#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/libnm-gtk/nm-wifi-dialog.c:892
msgid "WEP 40/128-bit Key (Hex or ASCII)"
msgstr "WEP 40/128-位元 密碼匙 (Hex 或 ASCII)"
-#: ../src/connection-editor/page-wifi-security.c:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:296
+#: ../src/libnm-gtk/nm-wifi-dialog.c:901
msgid "WEP 128-bit Passphrase"
msgstr "WEP 128-位元 密語"
-#: ../src/connection-editor/page-wifi-security.c:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../src/connection-editor/page-wifi-security.c:322
+#: ../src/libnm-gtk/nm-wifi-dialog.c:931
msgid "Dynamic WEP (802.1x)"
msgstr "動態 WEP (802.1x)"
-#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:336
+#: ../src/libnm-gtk/nm-wifi-dialog.c:945
msgid "WPA & WPA2 Personal"
msgstr "WPA & WPA2 個人版"
-#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:350
+#: ../src/libnm-gtk/nm-wifi-dialog.c:959
msgid "WPA & WPA2 Enterprise"
msgstr "WPA & WPA2 企業版"
-#: ../src/connection-editor/page-wifi-security.c:396
+#: ../src/connection-editor/page-wifi-security.c:391
msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
msgstr "無法載入 Wi-Fi 安全性使用者介面；失去 Wi-Fi 設定值。"
-#: ../src/connection-editor/page-wifi-security.c:407
+#: ../src/connection-editor/page-wifi-security.c:402
msgid "Wi-Fi Security"
msgstr "Wi-Fi 安全性"
-#: ../src/connection-editor/page-wifi-security.c:409
+#: ../src/connection-editor/page-wifi-security.c:404
msgid "Could not load Wi-Fi security user interface."
msgstr "無法載入 Wi-Fi 安全性使用者介面。"
@@ -2604,29 +2713,25 @@ msgstr ""
"\n"
"錯誤：%s。"
-#: ../src/connection-editor/vpn-helpers.c:241
-msgid "Select file to import"
-msgstr "選擇要匯入的檔案"
-
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:284
#, c-format
msgid "A file named \"%s\" already exists."
msgstr "名為「%s」的檔案已經存在。"
-#: ../src/connection-editor/vpn-helpers.c:294
+#: ../src/connection-editor/vpn-helpers.c:286
msgid "_Replace"
msgstr "取代(_R)"
-#: ../src/connection-editor/vpn-helpers.c:296
+#: ../src/connection-editor/vpn-helpers.c:288
#, 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
+#: ../src/connection-editor/vpn-helpers.c:324
msgid "Cannot export VPN connection"
msgstr "不能匯出 VPN 連線"
-#: ../src/connection-editor/vpn-helpers.c:334
+#: ../src/connection-editor/vpn-helpers.c:326
#, c-format
msgid ""
"The VPN connection '%s' could not be exported to %s.\n"
@@ -2637,11 +2742,11 @@ msgstr ""
"\n"
"錯誤：%s。"
-#: ../src/connection-editor/vpn-helpers.c:369
+#: ../src/connection-editor/vpn-helpers.c:361
msgid "Export VPN connection..."
msgstr "匯出 VPN 連線…"
-#: ../src/ethernet-dialog.c:91 ../src/ethernet-dialog.c:99
+#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
msgid ""
"The NetworkManager Applet could not find some required resources (the .ui "
"file was not found)."
@@ -2680,11 +2785,11 @@ msgstr "無法建立 DUN 連線：%s"
#: ../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:456
msgid "Mobile wizard was canceled"
-msgstr "流動精靈已經取消"
+msgstr "行動精靈已經取消"
#: ../src/gnome-bluetooth/nma-bt-device.c:465
msgid "Unknown phone device type (not GSM or CDMA)"
@@ -2750,22 +2855,22 @@ msgstr "啟用網絡連線"
#: ../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:211
msgid "Your Device:"
-msgstr "您的裝置："
+msgstr "你的裝置："
#. Provider
#: ../src/libnm-gtk/nm-mobile-wizard.c:222
msgid "Your Provider:"
-msgstr "您的供應商："
+msgstr "你的供應商："
#. Plan and APN
#: ../src/libnm-gtk/nm-mobile-wizard.c:233
msgid "Your Plan:"
-msgstr "您的計劃："
+msgstr "你的計劃："
#: ../src/libnm-gtk/nm-mobile-wizard.c:254
msgid ""
@@ -2774,10 +2879,7 @@ msgid ""
"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:266
msgid "Confirm Mobile Broadband Settings"
@@ -2787,124 +2889,124 @@ msgstr "確認流動寬頻設定"
msgid "Unlisted"
msgstr "未列出的"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: ../src/libnm-gtk/nm-mobile-wizard.c:461
msgid "_Select your plan:"
-msgstr "選擇您的計劃(_S)："
+msgstr "選擇你的計劃(_S)："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:505
+#: ../src/libnm-gtk/nm-mobile-wizard.c:485
msgid "Selected plan _APN (Access Point Name):"
msgstr "選擇計劃的 _APN（Access Point Name，存取點名稱）："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:525
+#: ../src/libnm-gtk/nm-mobile-wizard.c:505
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:532
+#: ../src/libnm-gtk/nm-mobile-wizard.c:512
msgid "Choose your Billing Plan"
-msgstr "選擇您的計費計劃"
+msgstr "選擇你的計費計劃"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:581
+#: ../src/libnm-gtk/nm-mobile-wizard.c:561
msgid "My plan is not listed..."
msgstr "我的計劃沒有列出…"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:734
+#: ../src/libnm-gtk/nm-mobile-wizard.c:714
msgid "Select your provider from a _list:"
msgstr "請從清單裏選擇供應商(_L)："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:747
+#: ../src/libnm-gtk/nm-mobile-wizard.c:727
msgid "Provider"
msgstr "供應商"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:772
+#: ../src/libnm-gtk/nm-mobile-wizard.c:752
msgid "I can't find my provider and I wish to enter it _manually:"
msgstr "我找不到我的供應商，我想要手動輸入(_M)："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:785
+#: ../src/libnm-gtk/nm-mobile-wizard.c:765
msgid "Provider:"
msgstr "供應商："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:802
+#: ../src/libnm-gtk/nm-mobile-wizard.c:782
msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
msgstr "我的供應商使用 GSM 技術（GPRS、EDGE、UMTS、HSPA）"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:804
+#: ../src/libnm-gtk/nm-mobile-wizard.c:784
msgid "My provider uses CDMA technology (1xRTT, EVDO)"
msgstr "我的供應商使用 CDMA 技術（1xRTT、EVDO）"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:815
+#: ../src/libnm-gtk/nm-mobile-wizard.c:795
msgid "Choose your Provider"
-msgstr "選擇您的供應商"
+msgstr "選擇你的供應商"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1047
msgid "Country or Region List:"
msgstr "國家或地區清單："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1080
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1060
msgid "Country or region"
msgstr "國家或地區"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1090
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1070
msgid "My country is not listed"
msgstr "我的國家並沒有列出來"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1140
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1120
msgid "Choose your Provider's Country or Region"
-msgstr "選擇您的供應商的國家或地區"
+msgstr "選擇你的供應商的國家或地區"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1194
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1174
msgid "Installed GSM device"
msgstr "已安裝的 GSM 裝置"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1197
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1177
msgid "Installed CDMA device"
msgstr "已安裝的 CDMA 裝置"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1365
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1345
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:1370
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1350
msgid "You will need the following information:"
-msgstr "您需要以下資訊："
+msgstr "你需要以下資訊："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1381
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
msgid "Your broadband provider's name"
msgstr "寬頻供應商的名稱"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1387
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1367
msgid "Your broadband billing plan name"
msgstr "寬頻計費計劃的名稱"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1393
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1373
msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-msgstr "(在某些情況下) 您的寬頻計費計劃的 APN (存取點名稱)"
+msgstr "（在有些情況下）你的寬頻計費計劃的 APN（存取點名稱）"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1420
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
msgid "Create a connection for _this mobile broadband device:"
msgstr "為這個流動寬頻裝置建立連線(_T)"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1435
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1417
msgid "Any device"
msgstr "任何裝置"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1448
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1430
msgid "Set up a Mobile Broadband Connection"
msgstr "設定流動寬頻連線"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1621
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1603
msgid "New Mobile Broadband Connection"
msgstr "新的流動寬頻連線"
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
+#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
msgid "Wired"
msgstr "有線"
@@ -2916,15 +3018,15 @@ msgstr "藍牙"
msgid "OLPC Mesh"
msgstr "OLPC Mesh"
-#: ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/libnm-gtk/nm-ui-utils.c:345
msgid "ADSL"
msgstr "ADSL"
-#: ../src/libnm-gtk/nm-ui-utils.c:405
+#: ../src/libnm-gtk/nm-ui-utils.c:408
msgid "PCI"
msgstr "PCI"
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:410
msgid "USB"
msgstr "USB"
@@ -2934,59 +3036,64 @@ msgstr "USB"
#. * "%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
+#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
#, c-format
msgctxt "long device name"
msgid "%s %s"
msgstr "%s %s"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:437
+#: ../src/libnm-gtk/nm-wifi-dialog.c:435
msgid "New..."
msgstr "新增…"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
+#: ../src/libnm-gtk/nm-wifi-dialog.c:875
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "沒有"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1046
msgid "C_reate"
msgstr "建立(_R)"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1130
#, c-format
msgid ""
"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
msgstr "需要密碼或是加密密碼匙來存取 Wi-Fi 網絡「%s」。"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1132
msgid "Wi-Fi Network Authentication Required"
msgstr "Wi-Fi 網絡連線需要驗證"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1134
msgid "Authentication required by Wi-Fi network"
msgstr "Wi-Fi 網絡連線需要驗證"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
msgid "Create New Wi-Fi Network"
msgstr "建立新的 Wi-Fi 網絡"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
msgid "New Wi-Fi network"
msgstr "新的 Wi-Fi 網絡"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1142
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
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
msgid "Connect to Hidden Wi-Fi Network"
msgstr "連接到隱藏的 Wi-Fi 網絡"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
msgid "Hidden Wi-Fi network"
msgstr "隱藏的 Wi-Fi 網絡"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
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:"
@@ -3016,8 +3123,7 @@ msgstr "用法："
msgid ""
"This program is a component of NetworkManager (https://wiki.gnome.org/";
"Projects/NetworkManager/)."
-msgstr ""
-"本程式是 NetworkManager（https://wiki.gnome.org/Projects/NetworkManager/）的元件";
+msgstr "本程式是 NetworkManager（https://wiki.gnome.org/Projects/NetworkManager/）的元件";
#: ../src/main.c:76
msgid ""
@@ -3072,7 +3178,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
@@ -3095,28 +3201,28 @@ 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
msgid "Roaming network"
msgstr "漫遊網絡"
-#: ../src/mobile-helpers.c:317
+#: ../src/mobile-helpers.c:318
#, c-format
msgid "PIN code for SIM card '%s' on '%s'"
msgstr "SIM 卡「%s」在「%s」的 PIN 碼"
-#: ../src/mobile-helpers.c:450
+#: ../src/mobile-helpers.c:451
msgid "PIN code required"
msgstr "需要 PIN 碼"
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:459
msgid "PIN code is needed for the mobile broadband device"
msgstr "這個流動寬頻裝置需要 PIN 碼"
@@ -3126,45 +3232,36 @@ msgstr "這個流動寬頻裝置需要 PIN 碼"
msgid "%s connection"
msgstr "%s 連線"
-#: ../src/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "未選擇任何證書授權單位 (CA) 證書"
+#: ../src/utils/utils.c:376
+msgid "Store the password only for this _user"
+msgstr "只儲存這個使用者的密碼(_U)"
-#: ../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 網絡 (可能被竊取、劫聽"
-"之意)。是否要選擇一個證書中心的證書？"
+#: ../src/utils/utils.c:378
+msgid "Store the password for _all users"
+msgstr "儲存所有使用者的密碼(_A)"
-#: ../src/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "選擇 CA 證書"
-
-#: ../src/wireless-security/eap-method.c:645
+#: ../src/wireless-security/eap-method.c:440
msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr "DER、PEM 或是 PKCS#12 私人金鑰 (*.der, *.pem, *.p12, *.key)"
+msgstr "DER、PEM 或是 PKCS#12 私人密碼匙 (*.der, *.pem, *.p12, *.key)"
-#: ../src/wireless-security/eap-method.c:648
+#: ../src/wireless-security/eap-method.c:443
msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
msgstr "DER 或 PEM 證書 (*.der, *.pem, *.crt, *.cer)"
#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-peap.c:298
msgid "GTC"
msgstr "GTC"
-#: ../src/wireless-security/eap-method-fast.c:399
+#: ../src/wireless-security/eap-method-fast.c:400
msgid "Choose a PAC file..."
msgstr "選擇一個 PAC 檔案…"
-#: ../src/wireless-security/eap-method-fast.c:406
+#: ../src/wireless-security/eap-method-fast.c:407
msgid "PAC files (*.pac)"
msgstr "PAC 檔案 (*.pac)"
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:411
msgid "All files"
msgstr "所有檔案"
@@ -3191,8 +3288,8 @@ msgid "PAC _file:"
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
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
msgid "_Inner authentication:"
msgstr "內部驗證(_I)："
@@ -3200,14 +3297,14 @@ msgstr "內部驗證(_I)："
msgid "Allow automatic PAC pro_visioning"
msgstr "允許自動供應 PAC (_V)"
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:409
+#: ../src/wireless-security/eap-method-peap.c:281
+#: ../src/wireless-security/wireless-security.c:417
msgid "MD5"
msgstr "MD5"
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:434
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../src/wireless-security/eap-method-peap.c:377
+#: ../src/wireless-security/eap-method-tls.c:464
+#: ../src/wireless-security/eap-method-ttls.c:377
msgid "Choose a Certificate Authority certificate..."
msgstr "選擇證書授權單位 (CA) 證書…"
@@ -3225,7 +3322,14 @@ msgstr "版本 1"
msgid "C_A certificate:"
msgstr "C_A 證書："
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#| msgid "Ignore CA certificate"
+msgid "No CA certificate is _required"
+msgstr "不需要 CA 證書(_R)"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
msgid "PEAP _version:"
msgstr "PEAP 版本(_V)："
@@ -3233,11 +3337,11 @@ msgstr "PEAP 版本(_V)："
msgid "As_k for this password every time"
msgstr "每次都詢問密碼(_K)"
-#: ../src/wireless-security/eap-method-tls.c:260
+#: ../src/wireless-security/eap-method-tls.c:279
msgid "Unencrypted private keys are insecure"
msgstr "未加密的私密密碼匙是不安全的"
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-tls.c:282
msgid ""
"The selected private key does not appear to be protected by a password. "
"This could allow your security credentials to be compromised. Please select "
@@ -3245,18 +3349,17 @@ 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
+#: ../src/wireless-security/eap-method-tls.c:458
msgid "Choose your personal certificate..."
-msgstr "選擇您的個人證書…"
+msgstr "選擇你的個人證書…"
-#: ../src/wireless-security/eap-method-tls.c:440
+#: ../src/wireless-security/eap-method-tls.c:470
msgid "Choose your private key..."
-msgstr "選擇您的私密密碼匙…"
+msgstr "選擇你的私密密碼匙…"
#: ../src/wireless-security/eap-method-tls.ui.h:1
msgid "I_dentity:"
@@ -3266,27 +3369,31 @@ msgstr "識別(_D)："
msgid "_User certificate:"
msgstr "使用者證書(_U)："
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
msgid "Private _key:"
msgstr "私密密碼匙(_K)："
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
msgid "_Private key password:"
msgstr "私密密碼匙密碼(_P)："
-#: ../src/wireless-security/wireless-security.c:421
+#: ../src/wireless-security/wireless-security.c:429
msgid "TLS"
msgstr "TLS"
-#: ../src/wireless-security/wireless-security.c:445
+#: ../src/wireless-security/wireless-security.c:454
+msgid "PWD"
+msgstr "PWD"
+
+#: ../src/wireless-security/wireless-security.c:465
msgid "FAST"
msgstr "快"
-#: ../src/wireless-security/wireless-security.c:456
+#: ../src/wireless-security/wireless-security.c:476
msgid "Tunneled TLS"
msgstr "穿隧式 TLS"
-#: ../src/wireless-security/wireless-security.c:467
+#: ../src/wireless-security/wireless-security.c:487
msgid "Protected EAP (PEAP)"
msgstr "保護式 EAP (PEAP)"
@@ -3332,6 +3439,20 @@ msgstr "顯示密碼匙(_W)"
msgid "WEP inde_x:"
msgstr "WEP 索引(_X)："
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "未選擇任何憑證授權單位 (CA) 憑證"
+
+#~ 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 網路 (可能被竊取、"
+#~ "劫聽之意)。是否要選擇一個憑證中心的憑證？"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "選擇 CA 憑證"
+
#~ msgid "Yes"
#~ msgstr "是"
@@ -3357,41 +3478,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)"
@@ -3418,22 +3539,22 @@ msgstr "WEP 索引(_X)："
#~ msgstr "未連線 - 您現在是離線"
#~ msgid "Wireless network"
-#~ msgstr "無線網絡"
+#~ msgstr "無線網路"
#~ msgid "Ethernet network"
-#~ msgstr "乙太網絡"
+#~ msgstr "乙太網路"
#~ msgid "Modem network"
-#~ msgstr "調制解調器網絡"
+#~ msgstr "數據機網路"
#~ msgid "Mobile Broadband network"
-#~ msgstr "流動寬頻網絡"
+#~ msgstr "行動寬頻網路"
#~ msgid "CDMA network"
-#~ msgstr "CDMA 網絡"
+#~ msgstr "CDMA 網路"
#~ msgid "Wired network"
-#~ msgstr "有線網絡"
+#~ msgstr "有線網路"
#~ msgid "ad-hoc"
#~ msgstr "ad-hoc"
@@ -3442,40 +3563,40 @@ msgstr "WEP 索引(_X)："
#~ msgstr "安全。"
#~ msgid "WiMAX network"
-#~ msgstr "WiMAX 網絡"
+#~ msgstr "WiMAX 網路"
+
+#~ msgid "Enter a name for the wireless network you wish to create."
+#~ msgstr "輸入您要建立的無線網路的名稱。"
#~ msgid "New wireless network"
-#~ msgstr "新的無線網絡"
+#~ msgstr "新的無線網路"
#~ msgid "E_xport"
#~ msgstr "匯出(_X)"
#~ msgid "Wired Network"
-#~ msgstr "有線網絡"
+#~ msgstr "有線網路"
#~ msgid "Wired Networks"
-#~ msgstr "有線網絡"
-
-#~ msgid "Wireless _adapter:"
-#~ msgstr "無線網絡卡(_A)："
+#~ msgstr "有線網路"
#~ msgid "Enable _Wireless"
-#~ msgstr "啟用無線網絡(_W)"
+#~ msgstr "啟用無線網路(_W)"
#~ msgid "Create New Wireless Network"
-#~ msgstr "建立新的無線網絡"
+#~ msgstr "建立新的無線網路"
#~ msgid "Wired network connection '%s' active"
-#~ msgstr "有線網絡連線「%s」在使用中"
+#~ msgstr "有線網路連線「%s」在使用中"
#~ msgid "Wireless Networks Available"
-#~ msgstr "可用的無線網絡"
+#~ msgstr "可用的無線網路"
#~ msgid "Wireless network connection '%s' active: %s (%d%%)"
-#~ msgstr "無線網絡連線「%s」在使用中： %s (%d%%)"
+#~ msgstr "無線網路連線「%s」在使用中： %s (%d%%)"
#~ msgid "Could not load wired user interface."
-#~ msgstr "無法載入有線網絡使用者介面。"
+#~ msgstr "無法載入有線網路使用者介面。"
#~ msgid "Could not load WiFi user interface."
#~ msgstr "無法載入 WiFi 使用者介面。"
@@ -3487,41 +3608,38 @@ msgstr "WEP 索引(_X)："
#~ msgstr "無法載入 WiFi 防護使用者介面。"
#~ msgid "Wireless Security"
-#~ msgstr "無線網絡防護"
+#~ msgstr "無線網路防護"
#~ msgid "Error creating connection editor dialog."
#~ msgstr "建立連線編輯器對話盒時發生錯誤。"
-#~ msgid "Wired connection %d"
-#~ msgstr "有線網絡連線 %d"
-
#~ msgid "Wired 802.1X authentication"
-#~ msgstr "有線網絡 802.1X 驗證"
+#~ msgstr "有線網路 802.1X 驗證"
#~ msgid ""
#~ "Passwords or encryption keys are required to access the wireless network "
#~ "'%s'."
-#~ msgstr "需要密碼或是加密密碼匙來存取無線網絡「%s」。"
+#~ msgstr "需要密碼或是加密金鑰來存取無線網路「%s」。"
#~ msgid "Wireless Network Authentication Required"
-#~ msgstr "無線網絡驗證要求"
+#~ msgstr "無線網路驗證要求"
#~ msgid "Authentication required by wireless network"
-#~ msgstr "無線網絡所需要的驗證"
+#~ msgstr "無線網路所需要的驗證"
#~ msgid "Connect to Hidden Wireless Network"
-#~ msgstr "連接到隱藏的無線網絡"
+#~ msgstr "連接到隱藏的無線網路"
#~ msgid "Hidden wireless network"
-#~ msgstr "隱藏的無線網絡"
-
-#~ msgid "Enter a name for the wireless network you wish to create."
-#~ msgstr "輸入您要建立的無線網絡的名稱。"
+#~ msgstr "隱藏的無線網路"
#~ msgid ""
#~ "Enter the name and security details of the hidden wireless network you "
#~ "wish to connect to."
-#~ msgstr "輸入您要連接的隱藏無線網絡的名稱與安全性詳細資料。"
+#~ msgstr "輸入您要連接的隱藏無線網路的名稱與安全性詳細資料。"
+
+#~ msgid "Wireless _adapter:"
+#~ msgstr "無線網路卡(_A)："
#~ msgid ""
#~ "This option locks this connection to the wireless access point (AP) "
@@ -3534,41 +3652,41 @@ msgstr "WEP 索引(_X)："
#~ msgstr "_DNS 伺服器："
#~ msgid "Preparing wired network connection '%s'..."
-#~ msgstr "正在準備有線網絡連線「%s」…"
+#~ msgstr "正在準備有線網路連線「%s」…"
#~ msgid "User authentication required for wired network connection '%s'..."
-#~ msgstr "有線網絡連線「%s」需要使用者驗證…"
+#~ msgstr "有線網路連線「%s」需要使用者驗證…"
#~ msgid "Requesting a wired network address for '%s'..."
-#~ msgstr "正要求有線網絡「%s」提供網絡位址…"
+#~ msgstr "正要求有線網路「%s」提供網路位址…"
#~ msgid "_Connect to Hidden Wireless Network..."
-#~ msgstr "連接到隱藏的無線網絡(_C)…"
+#~ msgstr "連接到隱藏的無線網路(_C)…"
#~ msgid "Create _New Wireless Network..."
-#~ msgstr "建立新的無線網絡(_N)…"
+#~ msgstr "建立新的無線網路(_N)…"
#~ msgid "Use the network menu to connect to a wireless network"
-#~ msgstr "使用網絡選單來連線到無線網絡"
+#~ msgstr "使用網路選單來連線到無線網路"
#~ msgid "User authentication required for wireless network '%s'..."
-#~ msgstr "無線網絡「%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) 的證書會造成連線不安全、流氓無線網絡 (可能被竊取、劫聽"
-#~ "之意) 。是否要選擇一個證書中心的證書？"
+#~ "不使用憑證中心 (CA) 的憑證會造成連線不安全、流氓無線網路 (可能被竊取、劫聽"
+#~ "之意) 。是否要選擇一個憑證中心的憑證？"
#~ msgid ""
#~ "Set this to true to disable notifications when wireless networks are "
#~ "available."
-#~ msgstr "將這設為「TURE」，以停用有無線網絡可用。"
+#~ msgstr "將這設為 True，以停用有無線網路可用。"
#~ msgid "Additional _DNS servers:"
#~ msgstr "額外的 _DNS 伺服器："
#~ msgid "Wireless _security:"
-#~ msgstr "無線網絡安全(_W)："
+#~ msgstr "無線網路安全(_W)："
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f59f4c0..0357a2b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12,16 +12,17 @@
msgid ""
msgstr ""
"Project-Id-Version: network-manager-applet 0.9.8\n"
-"Report-Msgid-Bugs-To: \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"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
+"POT-Creation-Date: 2013-12-28 11:26+0000\n"
+"PO-Revision-Date: 2014-01-31 07:16+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\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.3\n"
#: ../nm-applet.desktop.in.h:1
msgid "Network"
@@ -117,7 +118,7 @@ msgid ""
"authentication."
msgstr "將這設為 True，以停用在 EAP 認證第二階段中關於 CA 證書的警告。"
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
msgid "802.1X authentication"
msgstr "802.1X 驗證"
@@ -126,37 +127,37 @@ msgstr "802.1X 驗證"
msgid "_Network name:"
msgstr "網路名稱(_N)："
-#: ../src/applet.c:563
+#: ../src/applet.c:574
msgid "Failed to add/activate connection"
msgstr "無法加入/使用連線"
-#: ../src/applet.c:565 ../src/applet.c:609 ../src/applet.c:635
-#: ../src/applet-device-wifi.c:1377 ../src/applet-device-wifi.c:1396
+#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
+#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
msgid "Unknown error"
msgstr "不明的錯誤"
-#: ../src/applet.c:568 ../src/applet.c:638 ../src/applet-device-wifi.c:1380
-#: ../src/applet-device-wifi.c:1399
+#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
+#: ../src/applet-device-wifi.c:1350
msgid "Connection failure"
msgstr "連線失敗"
-#: ../src/applet.c:607
+#: ../src/applet.c:618
msgid "Device disconnect failed"
msgstr "裝置斷線失敗"
-#: ../src/applet.c:612
+#: ../src/applet.c:623
msgid "Disconnect failure"
msgstr "斷線失敗"
-#: ../src/applet.c:633
+#: ../src/applet.c:644
msgid "Connection activation failed"
msgstr "連線生效失敗"
-#: ../src/applet.c:946 ../src/applet-device-wifi.c:1065
+#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
msgid "Don't show this message again"
msgstr "不要再顯示這個訊息"
-#: ../src/applet.c:1035
+#: ../src/applet.c:1046
#, c-format
msgid ""
"\n"
@@ -166,7 +167,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為網路連線被中斷了。"
-#: ../src/applet.c:1038
+#: ../src/applet.c:1049
#, c-format
msgid ""
"\n"
@@ -175,7 +176,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為 VPN 服務意外的停止了。"
-#: ../src/applet.c:1041
+#: ../src/applet.c:1052
#, c-format
msgid ""
"\n"
@@ -185,7 +186,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為 VPN 服務傳回無效的組態。"
-#: ../src/applet.c:1044
+#: ../src/applet.c:1055
#, c-format
msgid ""
"\n"
@@ -194,7 +195,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為連線的嘗試已逾時。"
-#: ../src/applet.c:1047
+#: ../src/applet.c:1058
#, c-format
msgid ""
"\n"
@@ -203,7 +204,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為 VPN 服務沒有及時啟動。"
-#: ../src/applet.c:1050
+#: ../src/applet.c:1061
#, c-format
msgid ""
"\n"
@@ -212,7 +213,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為 VPN 服務啟動失敗。"
-#: ../src/applet.c:1053
+#: ../src/applet.c:1064
#, c-format
msgid ""
"\n"
@@ -221,7 +222,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為沒有有效的 VPN 服務。"
-#: ../src/applet.c:1056
+#: ../src/applet.c:1067
#, c-format
msgid ""
"\n"
@@ -230,7 +231,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為無效的 VPN 機密。"
-#: ../src/applet.c:1063
+#: ../src/applet.c:1074
#, c-format
msgid ""
"\n"
@@ -239,7 +240,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗。"
-#: ../src/applet.c:1081
+#: ../src/applet.c:1092
#, c-format
msgid ""
"\n"
@@ -249,7 +250,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為網路連線中斷了。"
-#: ../src/applet.c:1084
+#: ../src/applet.c:1095
#, c-format
msgid ""
"\n"
@@ -258,7 +259,7 @@ msgstr ""
"\n"
"VPN 連線「%s」失敗，因為 VPN 服務已停止。"
-#: ../src/applet.c:1090
+#: ../src/applet.c:1101
#, c-format
msgid ""
"\n"
@@ -267,7 +268,7 @@ msgstr ""
"\n"
"VPN 連線「%s」已斷線。"
-#: ../src/applet.c:1120
+#: ../src/applet.c:1131
#, c-format
msgid ""
"VPN connection has been successfully established.\n"
@@ -277,19 +278,19 @@ msgstr ""
"VPN 連線已成功的。\n"
"%s\n"
-#: ../src/applet.c:1122
+#: ../src/applet.c:1133
msgid "VPN connection has been successfully established.\n"
msgstr "VPN 連線已成功的。\n"
-#: ../src/applet.c:1124
+#: ../src/applet.c:1135
msgid "VPN Login Message"
msgstr "VPN 登錄訊息"
-#: ../src/applet.c:1130 ../src/applet.c:1138 ../src/applet.c:1188
+#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
msgid "VPN Connection Failed"
msgstr "VPN 連線失敗"
-#: ../src/applet.c:1195
+#: ../src/applet.c:1206
#, c-format
msgid ""
"\n"
@@ -302,7 +303,7 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1198
+#: ../src/applet.c:1209
#, c-format
msgid ""
"\n"
@@ -315,156 +316,156 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1522
+#: ../src/applet.c:1533
msgid "device not ready (firmware missing)"
msgstr "裝置尚未就緒 (缺少韌體)"
-#: ../src/applet.c:1524
+#: ../src/applet.c:1535
msgid "device not ready"
msgstr "裝置尚未就緒"
#. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1534 ../src/applet-device-ethernet.c:123
+#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
msgid "disconnected"
msgstr "已斷線"
-#: ../src/applet.c:1550
+#: ../src/applet.c:1561
msgid "Disconnect"
msgstr "斷線"
-#: ../src/applet.c:1564
+#: ../src/applet.c:1575
msgid "device not managed"
msgstr "裝置無法管理"
-#: ../src/applet.c:1722
+#: ../src/applet.c:1735
msgid "No network devices available"
msgstr "沒有可用的網路裝置"
-#: ../src/applet.c:1775
+#: ../src/applet.c:1788
msgid "_VPN Connections"
msgstr "_VPN 連線"
-#: ../src/applet.c:1832
+#: ../src/applet.c:1845
msgid "_Configure VPN..."
msgstr "設置 VPN(_C)…"
-#: ../src/applet.c:1836
+#: ../src/applet.c:1849
msgid "_Disconnect VPN"
msgstr "與 VPN 斷線(_D)"
-#: ../src/applet.c:1952
+#: ../src/applet.c:1965
msgid "NetworkManager is not running..."
msgstr "NetworkManager 沒有執行…."
-#: ../src/applet.c:1957 ../src/applet.c:2927
+#: ../src/applet.c:1970 ../src/applet.c:2940
msgid "Networking disabled"
msgstr "網路已停用"
#. 'Enable Networking' item
-#: ../src/applet.c:2177
+#: ../src/applet.c:2190
msgid "Enable _Networking"
msgstr "啟用網路(_N)"
#. 'Enable Wi-Fi' item
-#: ../src/applet.c:2186
+#: ../src/applet.c:2199
msgid "Enable _Wi-Fi"
msgstr "啟用 _Wi-Fi"
#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2195
+#: ../src/applet.c:2208
msgid "Enable _Mobile Broadband"
msgstr "啟用行動寬頻(_M)"
#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2204
+#: ../src/applet.c:2217
msgid "Enable WiMA_X Mobile Broadband"
msgstr "啟用 WiMA_X 行動寬頻"
#. Toggle notifications item
-#: ../src/applet.c:2215
+#: ../src/applet.c:2228
msgid "Enable N_otifications"
msgstr "啟用通知功能(_O)"
#. 'Connection Information' item
-#: ../src/applet.c:2226
+#: ../src/applet.c:2239
msgid "Connection _Information"
msgstr "連線資訊(_I)"
#. 'Edit Connections...' item
-#: ../src/applet.c:2236
+#: ../src/applet.c:2249
msgid "Edit Connections..."
msgstr "編輯連線…"
#. Help item
-#: ../src/applet.c:2250
+#: ../src/applet.c:2263
msgid "_Help"
msgstr "求助(_H)"
#. About item
-#: ../src/applet.c:2259
+#: ../src/applet.c:2272
msgid "_About"
msgstr "關於(_A)"
-#: ../src/applet.c:2512
+#: ../src/applet.c:2525
#, c-format
msgid "You are now connected to '%s'."
msgstr "您現在已連線至「%s」。"
-#: ../src/applet.c:2553
+#: ../src/applet.c:2566
msgid "Disconnected"
msgstr "已斷線"
-#: ../src/applet.c:2554
+#: ../src/applet.c:2567
msgid "The network connection has been disconnected."
msgstr "網路連線已中斷。"
-#: ../src/applet.c:2789
+#: ../src/applet.c:2802
#, c-format
msgid "Preparing network connection '%s'..."
msgstr "正在準備網路連線「%s」…"
-#: ../src/applet.c:2792
+#: ../src/applet.c:2805
#, c-format
msgid "User authentication required for network connection '%s'..."
msgstr "網路連線「%s」需要使用者驗證…"
-#: ../src/applet.c:2795 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:590
+#: ../src/applet.c:2808 ../src/applet-device-bt.c:136
+#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
#, c-format
msgid "Requesting a network address for '%s'..."
msgstr "正在要求提供「%s」的網路位址…"
-#: ../src/applet.c:2798
+#: ../src/applet.c:2811
#, c-format
msgid "Network connection '%s' active"
msgstr "網路連線「%s」在使用中"
-#: ../src/applet.c:2881
+#: ../src/applet.c:2894
#, c-format
msgid "Starting VPN connection '%s'..."
msgstr "正在啟動 VPN 連線「%s」…"
-#: ../src/applet.c:2884
+#: ../src/applet.c:2897
#, c-format
msgid "User authentication required for VPN connection '%s'..."
msgstr "VPN 連線「%s」需要使用者驗證…"
-#: ../src/applet.c:2887
+#: ../src/applet.c:2900
#, c-format
msgid "Requesting a VPN address for '%s'..."
msgstr "正在要求 VPN 提供「%s」的網路位址…"
-#: ../src/applet.c:2890
+#: ../src/applet.c:2903
#, c-format
msgid "VPN connection '%s' active"
msgstr "VPN 連線「%s」在使用中"
-#: ../src/applet.c:2932
+#: ../src/applet.c:2945
msgid "No network connection"
msgstr "沒有網路連接"
-#: ../src/applet.c:3639
+#: ../src/applet.c:3615
msgid "NetworkManager Applet"
msgstr "NetworkManager 面板程式"
@@ -472,8 +473,8 @@ msgstr "NetworkManager 面板程式"
#: ../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
+#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
+#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
msgid "Available"
msgstr "可用"
@@ -481,8 +482,8 @@ msgstr "可用"
#: ../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
+#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
+#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
msgid "Connection Established"
msgstr "已建立連線"
@@ -506,7 +507,8 @@ 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
+#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
+#: ../src/applet-device-vlan.c:237
#, c-format
msgid "Requesting address for '%s'..."
msgstr "正在要求「%s」的網路位址…"
@@ -554,15 +556,15 @@ 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
+#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:421
#, 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/connection-editor/new-connection.c:114
+#: ../src/connection-editor/page-mobile.c:351
#: ../src/libnm-gtk/nm-ui-utils.c:333
msgid "Mobile Broadband"
msgstr "行動寬頻"
@@ -581,12 +583,12 @@ msgid "Mobile Broadband network."
msgstr "行動寬頻網路。"
#: ../src/applet-device-broadband.c:933 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:663
+#: ../src/applet-device-gsm.c:662
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
+#: ../src/applet-device-gsm.c:668
msgid "You are now registered on a roaming network."
msgstr "您現在已註冊至漫遊網路。"
@@ -595,24 +597,24 @@ 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
+#: ../src/mobile-helpers.c:582
#, 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
+#: ../src/mobile-helpers.c:585
#, 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
+#: ../src/mobile-helpers.c:588
#, c-format
msgid "User authentication required for mobile broadband connection '%s'..."
msgstr "行動寬頻連線「%s」需要使用者驗證…"
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:607
+#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
#, c-format
msgid "Mobile broadband connection '%s' active"
msgstr "行動寬頻連線「%s」在使用中"
@@ -694,7 +696,7 @@ msgstr "新的行動寬頻 (GSM) 連線…"
msgid "You are now connected to the GSM network."
msgstr "您現在已連線至 GSM 網路。"
-#: ../src/applet-device-gsm.c:662 ../src/applet-device-gsm.c:668
+#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
msgid "GSM network."
msgstr "GSM 網路。"
@@ -744,6 +746,35 @@ msgstr "InfiniBand 連線「%s」需要使用者驗證…"
msgid "InfiniBand connection '%s' active"
msgstr "InfiniBand 連線「%s」在使用中"
+#: ../src/applet-device-team.c:86
+#| msgid "You are now connected to the ethernet network."
+msgid "You are now connected to the teamed network."
+msgstr "您現在已連線至團隊網路。"
+
+#: ../src/applet-device-team.c:110
+#, c-format
+#| msgid "Preparing bridge connection '%s'..."
+msgid "Preparing team connection '%s'..."
+msgstr "正在準備團隊的網路連線「%s」…"
+
+#: ../src/applet-device-team.c:113
+#, c-format
+#| msgid "Configuring bridge connection '%s'..."
+msgid "Configuring team connection '%s'..."
+msgstr "正在設定團隊的網路連線「%s」…"
+
+#: ../src/applet-device-team.c:116
+#, c-format
+#| msgid "User authentication required for VPN connection '%s'..."
+msgid "User authentication required for team connection '%s'..."
+msgstr "團隊連線「%s」需要使用者驗證…"
+
+#: ../src/applet-device-team.c:123
+#, c-format
+#| msgid "VPN connection '%s' active"
+msgid "Team connection '%s' active"
+msgstr "團隊連線「%s」在使用中"
+
#: ../src/applet-device-vlan.c:204
msgid "You are now connected to the VLAN."
msgstr "您現在已連線至 VLAN 網路。"
@@ -768,93 +799,93 @@ msgstr "VLAN 連線「%s」需要使用者驗證…"
msgid "VLAN connection '%s' active"
msgstr "VLAN 連線「%s」在使用中"
-#: ../src/applet-device-wifi.c:98
+#: ../src/applet-device-wifi.c:96
msgid "_Connect to Hidden Wi-Fi Network..."
msgstr "連接到隱藏的 Wi-Fi 網路(_C)…"
-#: ../src/applet-device-wifi.c:149
+#: ../src/applet-device-wifi.c:147
msgid "Create _New Wi-Fi Network..."
msgstr "建立新的 Wi-Fi 網路(_N)…"
-#: ../src/applet-device-wifi.c:293
+#: ../src/applet-device-wifi.c:291
msgid "(none)"
msgstr "(無)"
-#: ../src/applet-device-wifi.c:788
+#: ../src/applet-device-wifi.c:769
#, c-format
msgid "Wi-Fi Networks (%s)"
msgstr "Wi-Fi 網路 (%s)"
-#: ../src/applet-device-wifi.c:790
+#: ../src/applet-device-wifi.c:771
#, c-format
msgid "Wi-Fi Network (%s)"
msgstr "Wi-Fi 網路 (%s)"
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:773
msgid "Wi-Fi Network"
msgid_plural "Wi-Fi Networks"
msgstr[0] "Wi-Fi 網路"
-#: ../src/applet-device-wifi.c:821
+#: ../src/applet-device-wifi.c:802
msgid "Wi-Fi is disabled"
msgstr "Wi-Fi 已停用"
-#: ../src/applet-device-wifi.c:822
+#: ../src/applet-device-wifi.c:803
msgid "Wi-Fi is disabled by hardware switch"
msgstr "Wi-Fi 已被硬體開關停用"
-#: ../src/applet-device-wifi.c:883
+#: ../src/applet-device-wifi.c:864
msgid "More networks"
msgstr "更多網路"
-#: ../src/applet-device-wifi.c:1061
+#: ../src/applet-device-wifi.c:1042
msgid "Wi-Fi Networks Available"
msgstr "有 Wi-Fi 網路可用"
-#: ../src/applet-device-wifi.c:1062
+#: ../src/applet-device-wifi.c:1043
msgid "Use the network menu to connect to a Wi-Fi network"
msgstr "使用網路選單來連線到 Wi-Fi 網路"
-#: ../src/applet-device-wifi.c:1261
+#: ../src/applet-device-wifi.c:1242
#, c-format
msgid "You are now connected to the Wi-Fi network '%s'."
msgstr "您現在已連線至 Wi-Fi 網路「%s」。"
-#: ../src/applet-device-wifi.c:1292
+#: ../src/applet-device-wifi.c:1273
#, c-format
msgid "Preparing Wi-Fi network connection '%s'..."
msgstr "正在準備 Wi-Fi 網路連線「%s」…"
-#: ../src/applet-device-wifi.c:1295
+#: ../src/applet-device-wifi.c:1276
#, c-format
msgid "Configuring Wi-Fi network connection '%s'..."
msgstr "正在設定 Wi-Fi 網路連線「%s」…"
-#: ../src/applet-device-wifi.c:1298
+#: ../src/applet-device-wifi.c:1279
#, c-format
msgid "User authentication required for Wi-Fi network '%s'..."
msgstr "Wi-Fi 網路連線「%s」需要使用者驗證…"
-#: ../src/applet-device-wifi.c:1301
+#: ../src/applet-device-wifi.c:1282
#, c-format
msgid "Requesting a Wi-Fi network address for '%s'..."
msgstr "正在要求提供「%s」的 Wi-Fi 網路位址…"
-#: ../src/applet-device-wifi.c:1322
+#: ../src/applet-device-wifi.c:1303
#, c-format
msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
msgstr "Wi-Fi 網路連線「%s」在使用中： %s (%d%%)"
-#: ../src/applet-device-wifi.c:1327
+#: ../src/applet-device-wifi.c:1308
#, c-format
msgid "Wi-Fi network connection '%s' active"
msgstr "Wi-Fi 網路連線「%s」在使用中"
-#: ../src/applet-device-wifi.c:1375
+#: ../src/applet-device-wifi.c:1326
msgid "Failed to activate connection"
msgstr "無法使用連線"
-#: ../src/applet-device-wifi.c:1394
+#: ../src/applet-device-wifi.c:1345
msgid "Failed to add new connection"
msgstr "無法加入新連線"
@@ -879,12 +910,12 @@ msgstr "WiMAX 已被硬體開關停用"
msgid "You are now connected to the WiMAX network."
msgstr "您現在已連線至 WiMAX 網路。"
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:602
+#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
#, c-format
msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
msgstr "行動寬頻連線「%s」在使用中：(%d%%%s%s)"
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:605
+#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
msgid "roaming"
msgstr "漫遊"
@@ -893,9 +924,9 @@ msgid "Error displaying connection information:"
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:433
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnm-gtk/nm-wifi-dialog.c:918
+#: ../src/wireless-security/wireless-security.c:441
msgid "LEAP"
msgstr "LEAP"
@@ -903,195 +934,195 @@ msgstr "LEAP"
msgid "Dynamic WEP"
msgstr "動態 WEP"
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:246
-#: ../src/applet-dialogs.c:248
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
+#: ../src/applet-dialogs.c:244
msgid "WPA/WPA2"
msgstr "WPA/WPA2"
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:240
msgid "WEP"
msgstr "WEP"
-#: ../src/applet-dialogs.c:252 ../src/applet-dialogs.c:261
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
+#: ../src/connection-editor/page-wifi-security.c:261
+msgctxt "Wi-Fi/Ethernet security"
msgid "None"
msgstr "沒有"
-#: ../src/applet-dialogs.c:278
+#: ../src/applet-dialogs.c:274
#, c-format
msgid "%s (default)"
msgstr "%s (預設值)"
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:485
+#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:481
#, c-format
msgid "%u Mb/s"
msgstr "%u Mb/s"
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:487
+#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:483
msgctxt "Speed"
msgid "Unknown"
msgstr "不明"
-#: ../src/applet-dialogs.c:362
+#: ../src/applet-dialogs.c:358
#, c-format
msgid "%d dB"
msgstr "%d dB"
-#: ../src/applet-dialogs.c:364
+#: ../src/applet-dialogs.c:360
msgctxt "WiMAX CINR"
msgid "unknown"
msgstr "不明"
-#: ../src/applet-dialogs.c:376
+#: ../src/applet-dialogs.c:372
msgctxt "WiMAX Base Station ID"
msgid "unknown"
msgstr "不明"
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:407
#, c-format
msgid "Ethernet (%s)"
msgstr "乙太網路 (%s)"
-#: ../src/applet-dialogs.c:414
+#: ../src/applet-dialogs.c:410
#, c-format
msgid "802.11 WiFi (%s)"
msgstr "802.11 WiFi (%s)"
-#: ../src/applet-dialogs.c:421
+#: ../src/applet-dialogs.c:417
#, c-format
msgid "GSM (%s)"
msgstr "GSM (%s)"
-#: ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:419
#, c-format
msgid "CDMA (%s)"
msgstr "CDMA (%s)"
-#: ../src/applet-dialogs.c:427
+#: ../src/applet-dialogs.c:423
#, c-format
msgid "WiMAX (%s)"
msgstr "WiMAX (%s)"
#. --- General ---
-#: ../src/applet-dialogs.c:433 ../src/applet-dialogs.c:792
-#: ../src/connection-editor/page-general.c:325
+#: ../src/applet-dialogs.c:429 ../src/applet-dialogs.c:788
+#: ../src/connection-editor/page-general.c:327
msgid "General"
msgstr "一般"
-#: ../src/applet-dialogs.c:437
+#: ../src/applet-dialogs.c:433
msgid "Interface:"
msgstr "介面："
-#: ../src/applet-dialogs.c:453
+#: ../src/applet-dialogs.c:449
msgid "Hardware Address:"
msgstr "硬體位址："
#. Driver
-#: ../src/applet-dialogs.c:461
+#: ../src/applet-dialogs.c:457
msgid "Driver:"
msgstr "驅動程式："
-#: ../src/applet-dialogs.c:490
+#: ../src/applet-dialogs.c:486
msgid "Speed:"
msgstr "速度："
-#: ../src/applet-dialogs.c:500
+#: ../src/applet-dialogs.c:496
msgid "Security:"
msgstr "安全性："
-#: ../src/applet-dialogs.c:513
+#: ../src/applet-dialogs.c:509
msgid "CINR:"
msgstr "CINR："
-#: ../src/applet-dialogs.c:526
+#: ../src/applet-dialogs.c:522
msgid "BSID:"
msgstr "BSID："
#. --- IPv4 ---
-#: ../src/applet-dialogs.c:543
+#: ../src/applet-dialogs.c:539
msgid "IPv4"
msgstr "IPv4"
#. Address
-#: ../src/applet-dialogs.c:554 ../src/applet-dialogs.c:661
+#: ../src/applet-dialogs.c:550 ../src/applet-dialogs.c:657
msgid "IP Address:"
msgstr "IP 位址："
-#: ../src/applet-dialogs.c:556 ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:568
msgctxt "Address"
msgid "Unknown"
msgstr "不明"
-#: ../src/applet-dialogs.c:570
+#: ../src/applet-dialogs.c:566
msgid "Broadcast Address:"
msgstr "廣播位址："
#. Prefix
-#: ../src/applet-dialogs.c:579
+#: ../src/applet-dialogs.c:575
msgid "Subnet Mask:"
msgstr "子網路遮罩："
-#: ../src/applet-dialogs.c:581
+#: ../src/applet-dialogs.c:577
msgctxt "Subnet Mask"
msgid "Unknown"
msgstr "不明"
-#: ../src/applet-dialogs.c:589 ../src/applet-dialogs.c:676
+#: ../src/applet-dialogs.c:585 ../src/applet-dialogs.c:672
msgid "Default Route:"
msgstr "預設路由："
-#: ../src/applet-dialogs.c:601
+#: ../src/applet-dialogs.c:597
msgid "Primary DNS:"
msgstr "主要 DNS："
-#: ../src/applet-dialogs.c:610
+#: ../src/applet-dialogs.c:606
msgid "Secondary DNS:"
msgstr "次要 DNS："
-#: ../src/applet-dialogs.c:620
+#: ../src/applet-dialogs.c:616
msgid "Ternary DNS:"
msgstr "第三 DNS："
#. --- IPv6 ---
-#: ../src/applet-dialogs.c:635
+#: ../src/applet-dialogs.c:631
msgid "IPv6"
msgstr "IPv6"
-#: ../src/applet-dialogs.c:644
+#: ../src/applet-dialogs.c:640
msgid "Ignored"
msgstr "已忽略"
-#: ../src/applet-dialogs.c:797
+#: ../src/applet-dialogs.c:793
msgid "VPN Type:"
msgstr "VPN 類型："
-#: ../src/applet-dialogs.c:804
+#: ../src/applet-dialogs.c:800
msgid "VPN Gateway:"
msgstr "VPN 閘道器："
-#: ../src/applet-dialogs.c:810
+#: ../src/applet-dialogs.c:806
msgid "VPN Username:"
msgstr "VPN 使用者名稱："
-#: ../src/applet-dialogs.c:816
+#: ../src/applet-dialogs.c:812
msgid "VPN Banner:"
msgstr "VPN 旗幟："
-#: ../src/applet-dialogs.c:822
+#: ../src/applet-dialogs.c:818
msgid "Base Connection:"
msgstr "基礎連線："
-#: ../src/applet-dialogs.c:824 ../src/libnm-gtk/nm-ui-utils.c:345
+#: ../src/applet-dialogs.c:820 ../src/libnm-gtk/nm-ui-utils.c:347
msgid "Unknown"
msgstr "不明"
#. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:887
+#: ../src/applet-dialogs.c:883
msgid "No valid active connections found!"
msgstr "找不到有效的使用中連線！"
-#: ../src/applet-dialogs.c:915
+#: ../src/applet-dialogs.c:911
msgid ""
"Copyright © 2004-2011 Red Hat, Inc.\n"
"Copyright © 2005-2008 Novell, Inc.\n"
@@ -1101,42 +1132,42 @@ msgstr ""
"Copyright © 2005-2008 Novell, Inc.\n"
"與許多其他社群貢獻者與翻譯者"
-#: ../src/applet-dialogs.c:918
+#: ../src/applet-dialogs.c:914
msgid ""
"Notification area applet for managing your network devices and connections."
msgstr "用來管理您的網路裝置與連線的通知區面板程式。"
-#: ../src/applet-dialogs.c:920
+#: ../src/applet-dialogs.c:916
msgid "NetworkManager Website"
msgstr "NetworkManager 網站"
-#: ../src/applet-dialogs.c:935
+#: ../src/applet-dialogs.c:931
msgid "Missing resources"
msgstr "遺失資源"
-#: ../src/applet-dialogs.c:960
+#: ../src/applet-dialogs.c:956
msgid "Mobile broadband network password"
msgstr "行動寬頻網路密碼"
-#: ../src/applet-dialogs.c:969
+#: ../src/applet-dialogs.c:965
#, c-format
msgid "A password is required to connect to '%s'."
msgstr "連線至「%s」需要密碼。"
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:980
msgid "Password:"
msgstr "密碼："
-#: ../src/applet-dialogs.c:1282
+#: ../src/applet-dialogs.c:1261
msgid "SIM PIN unlock required"
msgstr "需要解鎖 SIM PIN 碼"
-#: ../src/applet-dialogs.c:1283
+#: ../src/applet-dialogs.c:1262
msgid "SIM PIN Unlock Required"
msgstr "需要解鎖 SIM PIN 碼"
#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1285
+#: ../src/applet-dialogs.c:1264
#, c-format
msgid ""
"The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1144,25 +1175,25 @@ msgid ""
msgstr "要使用行動寬頻裝置「%s」之前，需要 SIM PIN 碼。"
#. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1287
+#: ../src/applet-dialogs.c:1266
msgid "PIN code:"
msgstr "PIN 碼："
#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1291
+#: ../src/applet-dialogs.c:1270
msgid "Show PIN code"
msgstr "顯示 PIN 碼"
-#: ../src/applet-dialogs.c:1293
+#: ../src/applet-dialogs.c:1272
msgid "SIM PUK unlock required"
msgstr "需要解鎖 SIM PUK 碼"
-#: ../src/applet-dialogs.c:1294
+#: ../src/applet-dialogs.c:1273
msgid "SIM PUK Unlock Required"
msgstr "需要解鎖 SIM PUK 碼"
#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1296
+#: ../src/applet-dialogs.c:1275
#, c-format
msgid ""
"The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1170,22 +1201,22 @@ msgid ""
msgstr "要使用行動寬頻裝置「%s」之前，需要 SIM PUK 碼。"
#. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1298
+#: ../src/applet-dialogs.c:1277
msgid "PUK code:"
msgstr "PUK 碼："
#. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1301
+#: ../src/applet-dialogs.c:1280
msgid "New PIN code:"
msgstr "新的 PIN 碼："
#. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1303
+#: ../src/applet-dialogs.c:1282
msgid "Re-enter new PIN code:"
msgstr "重新輸入 PIN 碼："
#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1308
+#: ../src/applet-dialogs.c:1287
msgid "Show PIN/PUK codes"
msgstr "顯示 PIN/PUK 碼"
@@ -1292,14 +1323,16 @@ msgstr "模式(_M)："
#. Edit
#: ../src/connection-editor/ce-page-bond.ui.h:12
#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:685
+#: ../src/connection-editor/ce-page-team.ui.h:4
+#: ../src/connection-editor/nm-connection-list.c:686
msgid "_Edit"
msgstr "編輯(_E)"
#. Delete
#: ../src/connection-editor/ce-page-bond.ui.h:13
#: ../src/connection-editor/ce-page-bridge.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:702
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#: ../src/connection-editor/nm-connection-list.c:703
msgid "_Delete"
msgstr "刪除(_D)"
@@ -1313,6 +1346,7 @@ msgstr "毫秒"
#: ../src/connection-editor/ce-page-bond.ui.h:16
#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: ../src/connection-editor/ce-page-team.ui.h:6
msgid "_Interface name:"
msgstr "介面名稱(_I)："
@@ -1339,6 +1373,17 @@ msgstr "連線延遲(_U)："
msgid "Link _down delay:"
msgstr "斷線延遲(_D)："
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+#| msgid "Primary DNS:"
+msgid "_Primary:"
+msgstr "主要(_P):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+msgid ""
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
+msgstr "主要介面的介面名稱。如果設定，這個裝置在可用時會永遠成為使用中的從屬。"
+
#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
msgid "Path _cost:"
msgstr "路徑成本(_C)："
@@ -1384,7 +1429,7 @@ msgstr "存續時間(_A)："
msgid "automatic"
msgstr "自動"
-#: ../src/connection-editor/ce-page.c:348
+#: ../src/connection-editor/ce-page.c:342
msgid "Failed to update connection secrets due to an unknown error."
msgstr "由於不明的錯誤使連線機密的更新失敗。"
@@ -1403,7 +1448,7 @@ msgstr "服務(_S)："
#: ../src/connection-editor/ce-page-dsl.ui.h:3
#: ../src/wireless-security/eap-method-leap.ui.h:3
#: ../src/wireless-security/eap-method-simple.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../src/wireless-security/eap-method-tls.ui.h:7
#: ../src/wireless-security/ws-leap.ui.h:3
#: ../src/wireless-security/ws-wpa-psk.ui.h:3
msgid "Sho_w password"
@@ -1611,7 +1656,6 @@ msgid "DNS ser_vers:"
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."
@@ -1636,6 +1680,18 @@ msgstr ""
msgid "_Routes…"
msgstr "路由(_R)…"
+#: ../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."
+msgid ""
+"IP addresses of domain name servers used to resolve host names. Use commas "
+"to separate multiple domain name server addresses. Link-local addresses will "
+"be automatically scoped to the connecting interface."
+msgstr ""
+"網域名稱伺服器的 IP 位址，用來解析主機名稱。請使用逗號來分開多個網域伺服器的"
+"位址。Link-local 位址會自動設定到連線中的介面。"
+
#: ../src/connection-editor/ce-page-ip6.ui.h:13
msgid "Require IPv_6 addressing for this connection to complete"
msgstr "需要 IPv_6 addressing 才可完成此連線"
@@ -1765,6 +1821,26 @@ msgstr "回響"
msgid "Send PPP _echo packets"
msgstr "傳送 PPP _echo 封包"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr "_JSON 設定:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#| msgid "Import a saved VPN configuration..."
+msgid "_Import team configuration from a file..."
+msgstr "從檔案匯入團隊組態(_I)…"
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#| msgid "Bonded _connections:"
+msgid "_Teamed connections:"
+msgstr "團隊連線(_T):"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#| msgid "Import a saved VPN configuration..."
+msgid "I_mport team configuration from a file..."
+msgstr "從檔案匯入團隊組態(_M)…"
+
#: ../src/connection-editor/ce-page-vlan.ui.h:1
msgid "_Parent interface:"
msgstr "父介面(_P)："
@@ -1899,175 +1975,181 @@ msgstr ""
"在大多數情況下，網路供應者的 PPP 伺服器會支援所有的驗證方法。如果連線失敗，請"
"嘗試停用某些方法的支援。"
-#: ../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
+#: ../src/connection-editor/ip4-routes-dialog.c:724
+#: ../src/connection-editor/ip6-routes-dialog.c:666
+#: ../src/connection-editor/page-ip4.c:924
+#: ../src/connection-editor/page-ip6.c:887
msgid "Address"
msgstr "地址"
-#: ../src/connection-editor/ip4-routes-dialog.c:766
-#: ../src/connection-editor/page-ip4.c:932
+#: ../src/connection-editor/ip4-routes-dialog.c:741
+#: ../src/connection-editor/page-ip4.c:941
msgid "Netmask"
msgstr "網路遮罩"
-#: ../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
+#: ../src/connection-editor/ip4-routes-dialog.c:758
+#: ../src/connection-editor/ip6-routes-dialog.c:700
+#: ../src/connection-editor/page-ip4.c:958
+#: ../src/connection-editor/page-ip6.c:921
msgid "Gateway"
msgstr "通訊閘"
-#: ../src/connection-editor/ip4-routes-dialog.c:800
-#: ../src/connection-editor/ip6-routes-dialog.c:742
+#: ../src/connection-editor/ip4-routes-dialog.c:775
+#: ../src/connection-editor/ip6-routes-dialog.c:717
msgid "Metric"
msgstr "度量 (Metric)"
-#: ../src/connection-editor/ip6-routes-dialog.c:708
-#: ../src/connection-editor/page-ip6.c:898
+#: ../src/connection-editor/ip6-routes-dialog.c:683
+#: ../src/connection-editor/page-ip6.c:904
msgid "Prefix"
msgstr "前綴"
-#: ../src/connection-editor/new-connection.c:101
+#: ../src/connection-editor/new-connection.c:102
#: ../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/new-connection.c:108
#: ../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/new-connection.c:120
#: ../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"
-#: ../src/connection-editor/new-connection.c:125
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/new-connection.c:126
+#: ../src/connection-editor/page-dsl.c:137
msgid "DSL"
msgstr "DSL"
-#: ../src/connection-editor/new-connection.c:131
+#: ../src/connection-editor/new-connection.c:132
#: ../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:412 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:559
+#: ../src/connection-editor/new-connection.c:138
+#: ../src/connection-editor/page-bond.c:430 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/libnm-gtk/nm-ui-utils.c:562
msgid "Bond"
msgstr "繫結"
-#: ../src/connection-editor/new-connection.c:143
+#: ../src/connection-editor/new-connection.c:144
+#: ../src/connection-editor/page-team.c:255 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:564
+msgid "Team"
+msgstr "團隊"
+
+#: ../src/connection-editor/new-connection.c:150
#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
msgid "Bridge"
msgstr "橋接"
-#: ../src/connection-editor/new-connection.c:149
-#: ../src/connection-editor/page-vlan.c:475 ../src/libnm-gtk/nm-ui-utils.c:341
-#: ../src/libnm-gtk/nm-ui-utils.c:563
+#: ../src/connection-editor/new-connection.c:156
+#: ../src/connection-editor/page-vlan.c:482 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/libnm-gtk/nm-ui-utils.c:568
msgid "VLAN"
msgstr "VLAN"
-#: ../src/connection-editor/new-connection.c:162
-#: ../src/connection-editor/new-connection.c:302
+#: ../src/connection-editor/new-connection.c:169
+#: ../src/connection-editor/new-connection.c:309
#: ../src/connection-editor/page-vpn.c:113
msgid "VPN"
msgstr "VPN"
-#: ../src/connection-editor/new-connection.c:252
+#: ../src/connection-editor/new-connection.c:259
msgid "Hardware"
msgstr "硬體"
-#: ../src/connection-editor/new-connection.c:272
+#: ../src/connection-editor/new-connection.c:279
msgid "Virtual"
msgstr "虛擬"
-#: ../src/connection-editor/new-connection.c:340
-#: ../src/connection-editor/new-connection.c:342
+#: ../src/connection-editor/new-connection.c:347
+#: ../src/connection-editor/new-connection.c:349
msgid "Import a saved VPN configuration..."
msgstr "匯入已儲存的 VPN 組態…"
-#: ../src/connection-editor/new-connection.c:371
+#: ../src/connection-editor/new-connection.c:378
msgid ""
"The connection editor dialog could not be initialized due to an unknown "
"error."
msgstr "由於不明的錯誤使連線編輯器對話盒無法初始化。"
-#: ../src/connection-editor/new-connection.c:380
+#: ../src/connection-editor/new-connection.c:387
msgid "Could not create new connection"
msgstr "無法建立新連線"
-#: ../src/connection-editor/new-connection.c:515
+#: ../src/connection-editor/new-connection.c:522
msgid "Connection delete failed"
msgstr "刪除連線失敗"
-#: ../src/connection-editor/new-connection.c:562
+#: ../src/connection-editor/new-connection.c:569
#, c-format
msgid "Are you sure you wish to delete the connection %s?"
msgstr "您確定要刪除連線 %s ？"
-#: ../src/connection-editor/nm-connection-editor.c:118
+#: ../src/connection-editor/nm-connection-editor.c:122
#, c-format
msgid "Editing %s"
msgstr "編輯 %s"
-#: ../src/connection-editor/nm-connection-editor.c:122
+#: ../src/connection-editor/nm-connection-editor.c:126
msgid "Editing un-named connection"
msgstr "編輯未命名的連線"
-#: ../src/connection-editor/nm-connection-editor.c:282
+#: ../src/connection-editor/nm-connection-editor.c:286
msgid ""
"The connection editor could not find some required resources (the .ui file "
"was not found)."
msgstr "連線編輯器找不到一些需要的資源（找不到 .ui 檔）。"
-#: ../src/connection-editor/nm-connection-editor.c:413
+#: ../src/connection-editor/nm-connection-editor.c:417
msgid "_Save"
msgstr "儲存(_S)"
-#: ../src/connection-editor/nm-connection-editor.c:414
+#: ../src/connection-editor/nm-connection-editor.c:418
msgid "Save any changes made to this connection."
msgstr "儲存任何對這個連線進行的變更。"
-#: ../src/connection-editor/nm-connection-editor.c:415
+#: ../src/connection-editor/nm-connection-editor.c:419
msgid "_Save..."
msgstr "儲存(_S)…"
-#: ../src/connection-editor/nm-connection-editor.c:416
+#: ../src/connection-editor/nm-connection-editor.c:420
msgid "Authenticate to save this connection for all users of this machine."
msgstr "驗證以儲存這個連線給此電腦上的所有使用者。"
-#: ../src/connection-editor/nm-connection-editor.c:432
+#: ../src/connection-editor/nm-connection-editor.c:436
msgid "Could not create connection"
msgstr "無法建立連線"
-#: ../src/connection-editor/nm-connection-editor.c:432
+#: ../src/connection-editor/nm-connection-editor.c:436
msgid "Could not edit connection"
msgstr "無法編輯連線"
-#: ../src/connection-editor/nm-connection-editor.c:434
+#: ../src/connection-editor/nm-connection-editor.c:438
msgid "Unknown error creating connection editor dialog."
msgstr "建立連線編輯器對話盒時發生不明錯誤。"
-#: ../src/connection-editor/nm-connection-editor.c:602
+#: ../src/connection-editor/nm-connection-editor.c:572
msgid "Error initializing editor"
msgstr "初始化編輯器時發生錯誤"
-#: ../src/connection-editor/nm-connection-editor.c:923
+#: ../src/connection-editor/nm-connection-editor.c:903
msgid "Connection add failed"
msgstr "新增連線失敗"
-#: ../src/connection-editor/nm-connection-editor.c:973
+#: ../src/connection-editor/nm-connection-editor.c:943
msgid "Error saving connection"
msgstr "儲存連線時錯誤"
-#: ../src/connection-editor/nm-connection-editor.c:974
+#: ../src/connection-editor/nm-connection-editor.c:944
#, c-format
msgid "The property '%s' / '%s' is invalid: %d"
msgstr "屬性「%s」/「%s」是無效的：%d"
@@ -2120,56 +2202,56 @@ msgid "%d year ago"
msgid_plural "%d years ago"
msgstr[0] "%d 年以前"
-#: ../src/connection-editor/nm-connection-list.c:631
+#: ../src/connection-editor/nm-connection-list.c:632
msgid "Name"
msgstr "名稱"
-#: ../src/connection-editor/nm-connection-list.c:644
+#: ../src/connection-editor/nm-connection-list.c:645
msgid "Last Used"
msgstr "最後使用的"
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:687
msgid "Edit the selected connection"
msgstr "編輯選取的連線"
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:688
msgid "_Edit..."
msgstr "編輯(_E)…"
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:689
msgid "Authenticate to edit the selected connection"
msgstr "驗證以編輯選取的連線"
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:704
msgid "Delete the selected connection"
msgstr "刪除選取的連線"
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:705
msgid "_Delete..."
msgstr "刪除(_D)…"
-#: ../src/connection-editor/nm-connection-list.c:705
+#: ../src/connection-editor/nm-connection-list.c:706
msgid "Authenticate to delete the selected connection"
msgstr "驗證以刪除選取的連線"
-#: ../src/connection-editor/nm-connection-list.c:934
+#: ../src/connection-editor/nm-connection-list.c:935
msgid "No VPN plugins are installed."
msgstr "尚未安裝任何 VPN 外掛程式。"
-#: ../src/connection-editor/nm-connection-list.c:936
+#: ../src/connection-editor/nm-connection-list.c:937
#, c-format
msgid "Don't know how to create '%s' connections"
msgstr "不知道如何建立「%s」連線"
-#: ../src/connection-editor/nm-connection-list.c:938
+#: ../src/connection-editor/nm-connection-list.c:939
msgid "Error creating connection"
msgstr "建立連線時發生錯誤"
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:995
msgid "Error editing connection"
msgstr "編輯連線時發生錯誤"
-#: ../src/connection-editor/nm-connection-list.c:995
+#: ../src/connection-editor/nm-connection-list.c:996
#, c-format
msgid "Did not find a connection with UUID '%s'"
msgstr "找不到 UUID「%s」的連線"
@@ -2186,11 +2268,11 @@ msgstr "無法載入 802.1x 安全性使用者介面。"
msgid "Use 802.1_X security for this connection"
msgstr "在這個連線使用 802.1_X 防護"
-#: ../src/connection-editor/page-bond.c:415
+#: ../src/connection-editor/page-bond.c:433
msgid "Could not load bond user interface."
msgstr "無法載入繫結的使用者介面。"
-#: ../src/connection-editor/page-bond.c:557
+#: ../src/connection-editor/page-bond.c:587
#, c-format
msgid "Bond connection %d"
msgstr "繫結的連線 %d"
@@ -2215,11 +2297,11 @@ msgstr "橋接連接埠"
msgid "Could not load bridge port user interface."
msgstr "無法載入橋接連接埠使用者介面。"
-#: ../src/connection-editor/page-dsl.c:143
+#: ../src/connection-editor/page-dsl.c:139
msgid "Could not load DSL user interface."
msgstr "無法載入 DSL 使用者介面。"
-#: ../src/connection-editor/page-dsl.c:235
+#: ../src/connection-editor/page-dsl.c:231
#, c-format
msgid "DSL connection %d"
msgstr "DSL 連線 %d"
@@ -2263,7 +2345,7 @@ msgstr ""
msgid "FirewallD is not running."
msgstr "FirewallD 沒有執行。"
-#: ../src/connection-editor/page-general.c:328
+#: ../src/connection-editor/page-general.c:330
msgid "Could not load General user interface."
msgstr "無法載入一般使用者介面。"
@@ -2333,16 +2415,16 @@ msgstr "額外的 _DNS 伺服器："
msgid "Additional s_earch domains:"
msgstr "額外的搜尋網域(_E)："
-#: ../src/connection-editor/page-ip4.c:847
+#: ../src/connection-editor/page-ip4.c:856
#, c-format
msgid "Editing IPv4 routes for %s"
msgstr "編輯 %s 的 IPv4 路由"
-#: ../src/connection-editor/page-ip4.c:998
+#: ../src/connection-editor/page-ip4.c:1008
msgid "IPv4 Settings"
msgstr "IPv4 設定"
-#: ../src/connection-editor/page-ip4.c:1000
+#: ../src/connection-editor/page-ip4.c:1010
msgid "Could not load IPv4 user interface."
msgstr "無法載入 IPv4 使用者介面。"
@@ -2351,7 +2433,6 @@ msgid "Automatic, addresses only"
msgstr "自動，僅限位址"
#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:281
msgid "Ignore"
msgstr "忽略"
@@ -2359,57 +2440,74 @@ msgstr "忽略"
msgid "Automatic, DHCP only"
msgstr "自動，僅使用 DHCP"
-#: ../src/connection-editor/page-ip6.c:813
+#: ../src/connection-editor/page-ip6.c:819
#, c-format
msgid "Editing IPv6 routes for %s"
msgstr "為 %s 編輯 IPv6 路由"
-#: ../src/connection-editor/page-ip6.c:962
+#: ../src/connection-editor/page-ip6.c:969
msgid "IPv6 Settings"
msgstr "IPv6 設定"
-#: ../src/connection-editor/page-ip6.c:964
+#: ../src/connection-editor/page-ip6.c:971
msgid "Could not load IPv6 user interface."
msgstr "無法載入 IPv6 使用者介面。"
-#: ../src/connection-editor/page-master.c:284
+#: ../src/connection-editor/page-master.c:244
+#: ../src/connection-editor/page-master.c:255
+msgid "Duplicate slaves"
+msgstr "重製從屬"
+
+#: ../src/connection-editor/page-master.c:245
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr "從屬「%s」與「%s」都套用到裝置「%s」"
+
+#: ../src/connection-editor/page-master.c:256
+#, c-format
+msgid ""
+"Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
+"same physical device."
+msgstr "從屬「%s」與「%s」套用到同個實體裝置不同的虛擬連接埠(「%s」與「%s」)。"
+
+#: ../src/connection-editor/page-master.c:373
#, c-format
msgid "%s slave %d"
msgstr "%s slave %d"
-#: ../src/connection-editor/page-mobile.c:393
+#: ../src/connection-editor/page-mobile.c:353
msgid "Could not load mobile broadband user interface."
msgstr "無法載入行動寬頻使用者介面。"
-#: ../src/connection-editor/page-mobile.c:410
+#: ../src/connection-editor/page-mobile.c:370
msgid "Unsupported mobile broadband connection type."
msgstr "不支援的行動寬頻連線類型。"
#. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:660
+#: ../src/connection-editor/page-mobile.c:620
msgid "Select Mobile Broadband Provider Type"
msgstr "選擇行動寬頻供應商類型"
-#: ../src/connection-editor/page-mobile.c:687
+#: ../src/connection-editor/page-mobile.c:647
msgid ""
"Select the technology your mobile broadband provider uses. If you are "
"unsure, ask your provider."
msgstr "請選擇您的無線寬頻供應商所使用的技術。如果您不確定，請洽詢供應商。"
-#: ../src/connection-editor/page-mobile.c:692
+#: ../src/connection-editor/page-mobile.c:652
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:699
+#: ../src/connection-editor/page-mobile.c:659
msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
msgstr "我的供應商使用 C_DMA 為主的技術（例如 1xRTT、EVDO）"
-#: ../src/connection-editor/page-mobile.c:709 ../src/mb-menu-item.c:54
+#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
#: ../src/mobile-helpers.c:270
msgid "CDMA"
msgstr "CDMA"
-#: ../src/connection-editor/page-mobile.c:712 ../src/mb-menu-item.c:58
+#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
#: ../src/mobile-helpers.c:268
msgid "GSM"
msgstr "GSM"
@@ -2419,24 +2517,24 @@ msgid "EAP"
msgstr "EAP"
#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/wireless-security/eap-method-ttls.c:248
msgid "PAP"
msgstr "PAP"
#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/wireless-security/eap-method-ttls.c:298
msgid "CHAP"
msgstr "CHAP"
#: ../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
+#: ../src/wireless-security/eap-method-peap.c:264
+#: ../src/wireless-security/eap-method-ttls.c:281
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/wireless-security/eap-method-ttls.c:265
msgid "MSCHAP"
msgstr "MSCHAP"
@@ -2458,11 +2556,54 @@ msgstr "PPP 設定值"
msgid "Could not load PPP user interface."
msgstr "無法載入 PPP 使用者介面。"
-#: ../src/connection-editor/page-vlan.c:477
+#: ../src/connection-editor/page-team.c:94
+#: ../src/connection-editor/page-team-port.c:77
+#: ../src/connection-editor/vpn-helpers.c:234
+msgid "Select file to import"
+msgstr "選擇要匯入的檔案"
+
+#: ../src/connection-editor/page-team.c:114
+#: ../src/connection-editor/page-team-port.c:97
+msgid "Error: file doesn't contain a valid JSON configuration"
+msgstr "錯誤：檔案不含有效的 JSON 組態"
+
+#: ../src/connection-editor/page-team.c:258
+#| msgid "Could not load vlan user interface."
+msgid "Could not load team user interface."
+msgstr "無法載入團隊使用者介面。"
+
+#: ../src/connection-editor/page-team.c:353
+#, c-format
+#| msgid "Wired connection %d"
+msgid "Team connection %d"
+msgstr "團隊連線 %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:157
+#| msgid "Bridge Port"
+msgid "Team Port"
+msgstr "團隊連接埠"
+
+#: ../src/connection-editor/page-team-port.c:159
+#| msgid "Could not load bridge port user interface."
+msgid "Could not load team port user interface."
+msgstr "無法載入團隊連接埠使用者介面。"
+
+#. Translators: the first %s is a device name (eg, "em1"), the
+#. * second is a connection name (eg, "Auto Ethernet").
+#.
+#: ../src/connection-editor/page-vlan.c:318
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr "%s (經由「%s」)"
+
+#: ../src/connection-editor/page-vlan.c:484
msgid "Could not load vlan user interface."
msgstr "無法載入 vlan 使用者介面。"
-#: ../src/connection-editor/page-vlan.c:673
+#: ../src/connection-editor/page-vlan.c:680
#, c-format
msgid "VLAN connection %d"
msgstr "VLAN 連線 %d"
@@ -2529,50 +2670,45 @@ msgstr "%u (%u MHz)"
msgid "Could not load Wi-Fi user interface."
msgstr "無法載入 Wi-Fi 使用者介面。"
-#: ../src/connection-editor/page-wifi.c:645
+#: ../src/connection-editor/page-wifi.c:638
#, c-format
msgid "Wi-Fi connection %d"
msgstr "Wi-Fi 連線 %d"
-#: ../src/connection-editor/page-wifi-security.c:265
-msgctxt "Wi-Fi/Ethernet security"
-msgid "None"
-msgstr "沒有"
-
-#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/libnm-gtk/nm-wifi-dialog.c:892
msgid "WEP 40/128-bit Key (Hex or ASCII)"
msgstr "WEP 40/128-位元 金鑰 (Hex 或 ASCII)"
-#: ../src/connection-editor/page-wifi-security.c:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:296
+#: ../src/libnm-gtk/nm-wifi-dialog.c:901
msgid "WEP 128-bit Passphrase"
msgstr "WEP 128-位元 密語"
-#: ../src/connection-editor/page-wifi-security.c:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../src/connection-editor/page-wifi-security.c:322
+#: ../src/libnm-gtk/nm-wifi-dialog.c:931
msgid "Dynamic WEP (802.1x)"
msgstr "動態 WEP (802.1x)"
-#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:336
+#: ../src/libnm-gtk/nm-wifi-dialog.c:945
msgid "WPA & WPA2 Personal"
msgstr "WPA & WPA2 個人版"
-#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:350
+#: ../src/libnm-gtk/nm-wifi-dialog.c:959
msgid "WPA & WPA2 Enterprise"
msgstr "WPA & WPA2 企業版"
-#: ../src/connection-editor/page-wifi-security.c:396
+#: ../src/connection-editor/page-wifi-security.c:391
msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
msgstr "無法載入 Wi-Fi 安全性使用者介面；失去 Wi-Fi 設定值。"
-#: ../src/connection-editor/page-wifi-security.c:407
+#: ../src/connection-editor/page-wifi-security.c:402
msgid "Wi-Fi Security"
msgstr "Wi-Fi 安全性"
-#: ../src/connection-editor/page-wifi-security.c:409
+#: ../src/connection-editor/page-wifi-security.c:404
msgid "Could not load Wi-Fi security user interface."
msgstr "無法載入 Wi-Fi 安全性使用者介面。"
@@ -2601,29 +2737,25 @@ msgstr ""
"\n"
"錯誤：%s。"
-#: ../src/connection-editor/vpn-helpers.c:241
-msgid "Select file to import"
-msgstr "選擇要匯入的檔案"
-
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:284
#, c-format
msgid "A file named \"%s\" already exists."
msgstr "名為「%s」的檔案已經存在。"
-#: ../src/connection-editor/vpn-helpers.c:294
+#: ../src/connection-editor/vpn-helpers.c:286
msgid "_Replace"
msgstr "取代(_R)"
-#: ../src/connection-editor/vpn-helpers.c:296
+#: ../src/connection-editor/vpn-helpers.c:288
#, c-format
msgid "Do you want to replace %s with the VPN connection you are saving?"
msgstr "您是否要以準備儲存的 VPN 連線取代 %s？"
-#: ../src/connection-editor/vpn-helpers.c:332
+#: ../src/connection-editor/vpn-helpers.c:324
msgid "Cannot export VPN connection"
msgstr "不能匯出 VPN 連線"
-#: ../src/connection-editor/vpn-helpers.c:334
+#: ../src/connection-editor/vpn-helpers.c:326
#, c-format
msgid ""
"The VPN connection '%s' could not be exported to %s.\n"
@@ -2634,11 +2766,11 @@ msgstr ""
"\n"
"錯誤：%s。"
-#: ../src/connection-editor/vpn-helpers.c:369
+#: ../src/connection-editor/vpn-helpers.c:361
msgid "Export VPN connection..."
msgstr "匯出 VPN 連線…"
-#: ../src/ethernet-dialog.c:91 ../src/ethernet-dialog.c:99
+#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
msgid ""
"The NetworkManager Applet could not find some required resources (the .ui "
"file was not found)."
@@ -2784,15 +2916,15 @@ msgstr "確認行動寬頻設定"
msgid "Unlisted"
msgstr "未列出的"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: ../src/libnm-gtk/nm-mobile-wizard.c:461
msgid "_Select your plan:"
msgstr "選擇您的方案(_S)："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:505
+#: ../src/libnm-gtk/nm-mobile-wizard.c:485
msgid "Selected plan _APN (Access Point Name):"
msgstr "選擇方案的 _APN（Access Point Name，存取點名稱）："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:525
+#: ../src/libnm-gtk/nm-mobile-wizard.c:505
msgid ""
"Warning: Selecting an incorrect plan may result in billing issues for your "
"broadband account or may prevent connectivity.\n"
@@ -2803,105 +2935,105 @@ msgstr ""
"\n"
"如果您不確定所使用的方案，請洽詢供應商，以得知方案的 APN 為何。"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:532
+#: ../src/libnm-gtk/nm-mobile-wizard.c:512
msgid "Choose your Billing Plan"
msgstr "選擇您的計費方案"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:581
+#: ../src/libnm-gtk/nm-mobile-wizard.c:561
msgid "My plan is not listed..."
msgstr "我的方案沒有列出…"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:734
+#: ../src/libnm-gtk/nm-mobile-wizard.c:714
msgid "Select your provider from a _list:"
msgstr "請從清單裡選擇供應商(_L)："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:747
+#: ../src/libnm-gtk/nm-mobile-wizard.c:727
msgid "Provider"
msgstr "供應商"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:772
+#: ../src/libnm-gtk/nm-mobile-wizard.c:752
msgid "I can't find my provider and I wish to enter it _manually:"
msgstr "我找不到我的供應商，我想要手動輸入(_M)："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:785
+#: ../src/libnm-gtk/nm-mobile-wizard.c:765
msgid "Provider:"
msgstr "供應商："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:802
+#: ../src/libnm-gtk/nm-mobile-wizard.c:782
msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
msgstr "我的供應商使用 GSM 技術（GPRS、EDGE、UMTS、HSPA）"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:804
+#: ../src/libnm-gtk/nm-mobile-wizard.c:784
msgid "My provider uses CDMA technology (1xRTT, EVDO)"
msgstr "我的供應商使用 CDMA 技術（1xRTT、EVDO）"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:815
+#: ../src/libnm-gtk/nm-mobile-wizard.c:795
msgid "Choose your Provider"
msgstr "選擇您的供應商"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1047
msgid "Country or Region List:"
msgstr "國家或地區清單："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1080
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1060
msgid "Country or region"
msgstr "國家或地區"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1090
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1070
msgid "My country is not listed"
msgstr "我的國家並沒有列出來"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1140
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1120
msgid "Choose your Provider's Country or Region"
msgstr "選擇您的供應商的國家或地區"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1194
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1174
msgid "Installed GSM device"
msgstr "已安裝的 GSM 裝置"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1197
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1177
msgid "Installed CDMA device"
msgstr "已安裝的 CDMA 裝置"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1365
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1345
msgid ""
"This assistant helps you easily set up a mobile broadband connection to a "
"cellular (3G) network."
msgstr "這能幫助您輕易地設定行動寬頻連線，連至手機 (3G) 網路。"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1370
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1350
msgid "You will need the following information:"
msgstr "您需要以下資訊："
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1381
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
msgid "Your broadband provider's name"
msgstr "寬頻供應商的名稱"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1387
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1367
msgid "Your broadband billing plan name"
msgstr "寬頻計費方案的名稱"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1393
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1373
msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
msgstr "（在有些情況下）您的寬頻計費方案的 APN（存取點名稱）"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1420
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
msgid "Create a connection for _this mobile broadband device:"
msgstr "為這個行動寬頻裝置建立連線(_T)"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1435
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1417
msgid "Any device"
msgstr "任何裝置"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1448
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1430
msgid "Set up a Mobile Broadband Connection"
msgstr "設定行動寬頻連線"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1621
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1603
msgid "New Mobile Broadband Connection"
msgstr "新的行動寬頻連線"
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
+#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
msgid "Wired"
msgstr "有線"
@@ -2913,15 +3045,15 @@ msgstr "藍牙"
msgid "OLPC Mesh"
msgstr "OLPC Mesh"
-#: ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/libnm-gtk/nm-ui-utils.c:345
msgid "ADSL"
msgstr "ADSL"
-#: ../src/libnm-gtk/nm-ui-utils.c:405
+#: ../src/libnm-gtk/nm-ui-utils.c:408
msgid "PCI"
msgstr "PCI"
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:410
msgid "USB"
msgstr "USB"
@@ -2931,55 +3063,60 @@ msgstr "USB"
#. * "%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
+#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
#, c-format
msgctxt "long device name"
msgid "%s %s"
msgstr "%s %s"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:437
+#: ../src/libnm-gtk/nm-wifi-dialog.c:435
msgid "New..."
msgstr "新增…"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
+#: ../src/libnm-gtk/nm-wifi-dialog.c:875
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "沒有"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1046
msgid "C_reate"
msgstr "建立(_R)"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1130
#, c-format
msgid ""
"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
msgstr "需要密碼或是加密金鑰來存取 Wi-Fi 網路「%s」。"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1132
msgid "Wi-Fi Network Authentication Required"
msgstr "Wi-Fi 網路連線需要驗證"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1134
msgid "Authentication required by Wi-Fi network"
msgstr "Wi-Fi 網路連線需要驗證"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
msgid "Create New Wi-Fi Network"
msgstr "建立新的 Wi-Fi 網路"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
msgid "New Wi-Fi network"
msgstr "新的 Wi-Fi 網路"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1142
msgid "Enter a name for the Wi-Fi network you wish to create."
msgstr "輸入您要建立的 Wi-Fi 網路的名稱。"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
msgid "Connect to Hidden Wi-Fi Network"
msgstr "連接到隱藏的 Wi-Fi 網路"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
msgid "Hidden Wi-Fi network"
msgstr "隱藏的 Wi-Fi 網路"
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
msgid ""
"Enter the name and security details of the hidden Wi-Fi network you wish to "
"connect to."
@@ -3014,7 +3151,8 @@ msgid ""
"This program is a component of NetworkManager (https://wiki.gnome.org/";
"Projects/NetworkManager/)."
msgstr ""
-"本程式是 NetworkManager（https://wiki.gnome.org/Projects/NetworkManager/）的元件";
+"本程式是 NetworkManager（https://wiki.gnome.org/Projects/NetworkManager/）的";
+"元件"
#: ../src/main.c:76
msgid ""
@@ -3104,16 +3242,16 @@ msgstr "漫遊網路（%s）"
msgid "Roaming network"
msgstr "漫遊網路"
-#: ../src/mobile-helpers.c:317
+#: ../src/mobile-helpers.c:318
#, c-format
msgid "PIN code for SIM card '%s' on '%s'"
msgstr "SIM 卡「%s」在「%s」的 PIN 碼"
-#: ../src/mobile-helpers.c:450
+#: ../src/mobile-helpers.c:451
msgid "PIN code required"
msgstr "需要 PIN 碼"
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:459
msgid "PIN code is needed for the mobile broadband device"
msgstr "這個行動寬頻裝置需要 PIN 碼"
@@ -3123,45 +3261,36 @@ msgstr "這個行動寬頻裝置需要 PIN 碼"
msgid "%s connection"
msgstr "%s 連線"
-#: ../src/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "未選擇任何憑證授權單位 (CA) 憑證"
+#: ../src/utils/utils.c:376
+msgid "Store the password only for this _user"
+msgstr "只儲存這個使用者的密碼(_U)"
-#: ../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 網路 (可能被竊取、劫聽"
-"之意)。是否要選擇一個憑證中心的憑證？"
-
-#: ../src/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "選擇 CA 憑證"
+#: ../src/utils/utils.c:378
+msgid "Store the password for _all users"
+msgstr "儲存所有使用者的密碼(_A)"
-#: ../src/wireless-security/eap-method.c:645
+#: ../src/wireless-security/eap-method.c:440
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
+#: ../src/wireless-security/eap-method.c:443
msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)"
#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-peap.c:298
msgid "GTC"
msgstr "GTC"
-#: ../src/wireless-security/eap-method-fast.c:399
+#: ../src/wireless-security/eap-method-fast.c:400
msgid "Choose a PAC file..."
msgstr "選擇一個 PAC 檔案…"
-#: ../src/wireless-security/eap-method-fast.c:406
+#: ../src/wireless-security/eap-method-fast.c:407
msgid "PAC files (*.pac)"
msgstr "PAC 檔案 (*.pac)"
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:411
msgid "All files"
msgstr "所有檔案"
@@ -3188,8 +3317,8 @@ msgid "PAC _file:"
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
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
msgid "_Inner authentication:"
msgstr "內部驗證(_I)："
@@ -3197,14 +3326,14 @@ msgstr "內部驗證(_I)："
msgid "Allow automatic PAC pro_visioning"
msgstr "允許自動供應 PAC (_V)"
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:409
+#: ../src/wireless-security/eap-method-peap.c:281
+#: ../src/wireless-security/wireless-security.c:417
msgid "MD5"
msgstr "MD5"
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:434
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../src/wireless-security/eap-method-peap.c:377
+#: ../src/wireless-security/eap-method-tls.c:464
+#: ../src/wireless-security/eap-method-ttls.c:377
msgid "Choose a Certificate Authority certificate..."
msgstr "選擇憑證授權單位 (CA) 憑證…"
@@ -3222,7 +3351,14 @@ msgstr "版本 1"
msgid "C_A certificate:"
msgstr "C_A 憑證："
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#| msgid "Ignore CA certificate"
+msgid "No CA certificate is _required"
+msgstr "不需要 CA 憑證(_R)"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
msgid "PEAP _version:"
msgstr "PEAP 版本(_V)："
@@ -3230,11 +3366,11 @@ msgstr "PEAP 版本(_V)："
msgid "As_k for this password every time"
msgstr "每次都詢問密碼(_K)"
-#: ../src/wireless-security/eap-method-tls.c:260
+#: ../src/wireless-security/eap-method-tls.c:279
msgid "Unencrypted private keys are insecure"
msgstr "未加密的私密金鑰是不安全的"
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-tls.c:282
msgid ""
"The selected private key does not appear to be protected by a password. "
"This could allow your security credentials to be compromised. Please select "
@@ -3247,11 +3383,11 @@ msgstr ""
"\n"
"（您可以使用 openssl 來加密您的私密金鑰）"
-#: ../src/wireless-security/eap-method-tls.c:428
+#: ../src/wireless-security/eap-method-tls.c:458
msgid "Choose your personal certificate..."
msgstr "選擇您的個人憑證…"
-#: ../src/wireless-security/eap-method-tls.c:440
+#: ../src/wireless-security/eap-method-tls.c:470
msgid "Choose your private key..."
msgstr "選擇您的私密金鑰…"
@@ -3263,27 +3399,31 @@ msgstr "識別(_D)："
msgid "_User certificate:"
msgstr "使用者憑證(_U)："
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
msgid "Private _key:"
msgstr "私密金鑰(_K)："
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
msgid "_Private key password:"
msgstr "私密金鑰密碼(_P)："
-#: ../src/wireless-security/wireless-security.c:421
+#: ../src/wireless-security/wireless-security.c:429
msgid "TLS"
msgstr "TLS"
-#: ../src/wireless-security/wireless-security.c:445
+#: ../src/wireless-security/wireless-security.c:454
+msgid "PWD"
+msgstr "PWD"
+
+#: ../src/wireless-security/wireless-security.c:465
msgid "FAST"
msgstr "快"
-#: ../src/wireless-security/wireless-security.c:456
+#: ../src/wireless-security/wireless-security.c:476
msgid "Tunneled TLS"
msgstr "穿隧式 TLS"
-#: ../src/wireless-security/wireless-security.c:467
+#: ../src/wireless-security/wireless-security.c:487
msgid "Protected EAP (PEAP)"
msgstr "保護式 EAP (PEAP)"
@@ -3329,6 +3469,20 @@ msgstr "顯示金鑰(_W)"
msgid "WEP inde_x:"
msgstr "WEP 索引(_X)："
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "未選擇任何憑證授權單位 (CA) 憑證"
+
+#~ 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 網路 (可能被竊取、"
+#~ "劫聽之意)。是否要選擇一個憑證中心的憑證？"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "選擇 CA 憑證"
+
#~ msgid "Yes"
#~ msgstr "是"
@@ -3489,9 +3643,6 @@ msgstr "WEP 索引(_X)："
#~ msgid "Error creating connection editor dialog."
#~ msgstr "建立連線編輯器對話盒時發生錯誤。"
-#~ msgid "Wired connection %d"
-#~ msgstr "有線網路連線 %d"
-
#~ msgid "Wired 802.1X authentication"
#~ msgstr "有線網路 802.1X 驗證"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
