summaryrefslogtreecommitdiff
path: root/po/zh_TW.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_TW.po')
-rw-r--r--po/zh_TW.po5188
1 files changed, 2542 insertions, 2646 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6f3cb1d6ca..65d8f34f40 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,27 +1,29 @@
# translation of zh_TW.po to Traditional Chinese
# Traditional Chinese translation of Network Manager.
# Copyright (C) 2005, 2010 Free Software Foundation, Inc.
-#
+#
# Woodman Tuen <wmtuen@gmail.com>, 2005.
# Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2008.
# Chester Cheng <ccheng 於 redhat>, 2010.
# Chester Cheng <ccheng@紅帽子>, 2010.
# Terry Chuang <tchuang at redhat>, 2010.
# Terry Chuang <tchuang@redhat.com>, 2010.
+# Lubomir Rintel <lkundrak@v3.sk>, 2016. #zanata
+# Lubomir Rintel <lkundrak@v3.sk>, 2017. #zanata
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-29 14:24+0530\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-07-05 08:42+0000\n"
+"POT-Creation-Date: 2017-01-16 16:07+0100\n"
+"PO-Revision-Date: 2017-01-16 10:38-0500\n"
"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
"Language-Team: Traditional Chinese <zh@li.org>\n"
"Language: zh-TW\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: Zanata 3.9.3\n"
+"X-Generator: Zanata 3.9.6\n"
#: ../clients/cli/agent.c:39
#, c-format
@@ -65,589 +67,684 @@ msgid ""
"\n"
msgstr ""
-#: ../clients/cli/agent.c:149
+#: ../clients/cli/agent.c:156
#, c-format
msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
msgstr ""
-#: ../clients/cli/agent.c:151
+#: ../clients/cli/agent.c:158
#, fuzzy, c-format
msgid "Error: secret agent initialization failed"
msgstr "數據機初始化失敗"
-#: ../clients/cli/agent.c:166
+#: ../clients/cli/agent.c:176
#, fuzzy, c-format
msgid "Error: polkit agent initialization failed: %s"
msgstr "錯誤:啟動連線失敗:%s"
-#: ../clients/cli/agent.c:174
+#: ../clients/cli/agent.c:184
#, c-format
msgid "nmcli successfully registered as a polkit agent.\n"
msgstr ""
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
-#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
-#: ../clients/cli/general.c:484
-#, c-format
-msgid "Error: NetworkManager is not running."
-msgstr "錯誤:NetworkManager 未執行。"
-
-#: ../clients/cli/agent.c:242
-#, fuzzy, c-format
-msgid "Error: 'agent' command '%s' is not valid."
-msgstr "錯誤:「general」指令「%s」無效。"
-
-#: ../clients/cli/common.c:38 ../clients/cli/common.c:51
-#: ../clients/cli/common.c:59 ../clients/cli/common.c:71
-#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
+#: ../clients/cli/common.c:40 ../clients/cli/common.c:53
+#: ../clients/cli/common.c:61 ../clients/cli/common.c:73
+#: ../clients/cli/connections.c:211 ../clients/cli/connections.c:233
msgid "GROUP"
msgstr "GROUP"
#. 0
-#: ../clients/cli/common.c:39 ../clients/cli/common.c:60
+#: ../clients/cli/common.c:41 ../clients/cli/common.c:62
msgid "ADDRESS"
msgstr "ADDRESS"
#. 1
#. 2
-#: ../clients/cli/common.c:40 ../clients/cli/common.c:61
-#: ../clients/cli/connections.c:217
+#: ../clients/cli/common.c:42 ../clients/cli/common.c:63
+#: ../clients/cli/connections.c:236
msgid "GATEWAY"
msgstr "GATEWAY"
#. 2
-#: ../clients/cli/common.c:41 ../clients/cli/common.c:62
+#: ../clients/cli/common.c:43 ../clients/cli/common.c:64
msgid "ROUTE"
msgstr "ROUTE"
#. 3
-#: ../clients/cli/common.c:42 ../clients/cli/common.c:63
+#: ../clients/cli/common.c:44 ../clients/cli/common.c:65
msgid "DNS"
msgstr "DNS"
#. 4
-#: ../clients/cli/common.c:43 ../clients/cli/common.c:64
+#: ../clients/cli/common.c:45 ../clients/cli/common.c:66
msgid "DOMAIN"
msgstr "DOMAIN"
#. 5
-#: ../clients/cli/common.c:44
+#: ../clients/cli/common.c:46
msgid "WINS"
msgstr "WINS"
#. 0
-#: ../clients/cli/common.c:52 ../clients/cli/common.c:72
+#: ../clients/cli/common.c:54 ../clients/cli/common.c:74
msgid "OPTION"
msgstr "OPTION"
-#: ../clients/cli/common.c:376 ../clients/cli/common.c:436
+#: ../clients/cli/common.c:378 ../clients/cli/common.c:440
#, fuzzy, c-format
msgid "invalid prefix '%s'; <1-%d> allowed"
msgstr "無效的前綴「%s」;允許的值爲 <1-32>"
-#: ../clients/cli/common.c:384
+#: ../clients/cli/common.c:386
#, fuzzy, c-format
msgid "invalid IP address: %s"
msgstr "無效的 IPv4 位址「%s」"
-#: ../clients/cli/common.c:448
+#: ../clients/cli/common.c:452
#, c-format
msgid ""
"the second component of route ('%s') is neither a next hop address nor a "
"metric"
msgstr ""
-#: ../clients/cli/common.c:457
+#: ../clients/cli/common.c:462
#, c-format
msgid "invalid metric '%s'"
msgstr "無效的單位「%s」"
-#: ../clients/cli/common.c:465
+#: ../clients/cli/common.c:471
#, fuzzy, c-format
msgid "invalid route: %s"
msgstr "無效的 IPv4 路由「%s」"
-#: ../clients/cli/common.c:477
+#: ../clients/cli/common.c:483
msgid "default route cannot be added (NetworkManager handles it by itself)"
msgstr ""
-#: ../clients/cli/common.c:494
+#: ../clients/cli/common.c:500
msgid "unmanaged"
msgstr "不受管理的"
-#: ../clients/cli/common.c:496
+#: ../clients/cli/common.c:502
msgid "unavailable"
msgstr "無法使用"
-#: ../clients/cli/common.c:498 ../clients/cli/general.c:245
+#: ../clients/cli/common.c:504 ../clients/cli/general.c:248
msgid "disconnected"
msgstr "離線"
-#: ../clients/cli/common.c:500
+#: ../clients/cli/common.c:506
msgid "connecting (prepare)"
msgstr "連線中(準備)"
-#: ../clients/cli/common.c:502
+#: ../clients/cli/common.c:508
msgid "connecting (configuring)"
msgstr "連線中(配置中)"
-#: ../clients/cli/common.c:504
+#: ../clients/cli/common.c:510
msgid "connecting (need authentication)"
msgstr "連線中(需要身份認證)"
-#: ../clients/cli/common.c:506
+#: ../clients/cli/common.c:512
msgid "connecting (getting IP configuration)"
msgstr "連線中(正在取得 IP 配置)"
-#: ../clients/cli/common.c:508
+#: ../clients/cli/common.c:514
msgid "connecting (checking IP connectivity)"
msgstr "正在連線(正在檢查 IP 連線)"
-#: ../clients/cli/common.c:510
+#: ../clients/cli/common.c:516
msgid "connecting (starting secondary connections)"
msgstr "正在連線(正在啟用次要連線)"
-#: ../clients/cli/common.c:512 ../clients/cli/general.c:241
+#: ../clients/cli/common.c:518 ../clients/cli/general.c:244
msgid "connected"
msgstr "已連線"
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
+#: ../clients/cli/common.c:520 ../clients/cli/connections.c:628
msgid "deactivating"
msgstr "正在停用"
-#: ../clients/cli/common.c:516
+#: ../clients/cli/common.c:522
msgid "connection failed"
msgstr "連線失敗"
-#: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
-#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
-#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
-#: ../clients/cli/general.c:248 ../clients/cli/general.c:286
-#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
-#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
-#: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
-#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
+#: ../clients/cli/common.c:524 ../clients/cli/common.c:541
+#: ../clients/cli/connections.c:633 ../clients/cli/connections.c:656
+#: ../clients/cli/connections.c:2136 ../clients/cli/devices.c:1190
+#: ../clients/cli/devices.c:1231 ../clients/cli/devices.c:1233
+#: ../clients/cli/general.c:251 ../clients/cli/general.c:289
+#: ../clients/cli/general.c:437 ../clients/cli/general.c:452
+#: ../clients/cli/settings.c:869 ../clients/cli/settings.c:955
+#: ../clients/cli/settings.c:1402 ../clients/cli/settings.c:2065
+#: ../clients/cli/settings.c:3533
#, c-format
msgid "unknown"
msgstr "不明"
#. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
-#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
-#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
-#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
-#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
-#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
-#: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
-#: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
-#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
-#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058
-#: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060
-#: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
-#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
-#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
-#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
+#: ../clients/cli/common.c:533 ../clients/cli/connections.c:944
+#: ../clients/cli/connections.c:946 ../clients/cli/connections.c:948
+#: ../clients/cli/connections.c:983 ../clients/cli/connections.c:1053
+#: ../clients/cli/connections.c:1054 ../clients/cli/connections.c:1056
+#: ../clients/cli/connections.c:3471 ../clients/cli/connections.c:4673
+#: ../clients/cli/connections.c:6492 ../clients/cli/connections.c:6493
+#: ../clients/cli/devices.c:868 ../clients/cli/devices.c:1155
+#: ../clients/cli/devices.c:1156 ../clients/cli/devices.c:1157
+#: ../clients/cli/devices.c:1158 ../clients/cli/devices.c:1159
+#: ../clients/cli/devices.c:1194 ../clients/cli/devices.c:1196
+#: ../clients/cli/devices.c:1224 ../clients/cli/devices.c:1225
+#: ../clients/cli/devices.c:1226 ../clients/cli/devices.c:1227
+#: ../clients/cli/devices.c:1228 ../clients/cli/devices.c:1229
+#: ../clients/cli/devices.c:1230 ../clients/cli/devices.c:1232
+#: ../clients/cli/devices.c:1234 ../clients/cli/general.c:446
+#: ../clients/cli/settings.c:3528
msgid "yes"
msgstr "是"
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
-#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
-#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
-#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
-#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
-#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
-#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
-#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
-#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030
-#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059
-#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
-#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
-#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
-#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
-#: ../clients/cli/settings.c:3202
+#: ../clients/cli/common.c:535 ../clients/cli/connections.c:944
+#: ../clients/cli/connections.c:946 ../clients/cli/connections.c:948
+#: ../clients/cli/connections.c:1053 ../clients/cli/connections.c:1054
+#: ../clients/cli/connections.c:1056 ../clients/cli/connections.c:3472
+#: ../clients/cli/connections.c:4672 ../clients/cli/connections.c:6492
+#: ../clients/cli/connections.c:6493 ../clients/cli/devices.c:868
+#: ../clients/cli/devices.c:1155 ../clients/cli/devices.c:1156
+#: ../clients/cli/devices.c:1157 ../clients/cli/devices.c:1158
+#: ../clients/cli/devices.c:1159 ../clients/cli/devices.c:1194
+#: ../clients/cli/devices.c:1196 ../clients/cli/devices.c:1224
+#: ../clients/cli/devices.c:1225 ../clients/cli/devices.c:1226
+#: ../clients/cli/devices.c:1227 ../clients/cli/devices.c:1228
+#: ../clients/cli/devices.c:1229 ../clients/cli/devices.c:1230
+#: ../clients/cli/devices.c:1232 ../clients/cli/devices.c:1234
+#: ../clients/cli/general.c:448 ../clients/cli/settings.c:3530
msgid "no"
msgstr "否"
-#: ../clients/cli/common.c:531
+#: ../clients/cli/common.c:537
msgid "yes (guessed)"
msgstr ""
-#: ../clients/cli/common.c:533
+#: ../clients/cli/common.c:539
msgid "no (guessed)"
msgstr ""
-#: ../clients/cli/common.c:544
+#: ../clients/cli/common.c:550
msgid "No reason given"
msgstr "未提供理由"
#. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
+#: ../clients/cli/common.c:553 ../clients/cli/connections.c:3320
#, c-format
msgid "Unknown error"
msgstr "不明的錯誤"
-#: ../clients/cli/common.c:550
+#: ../clients/cli/common.c:556
msgid "Device is now managed"
msgstr "裝置現在已受管理"
-#: ../clients/cli/common.c:553
+#: ../clients/cli/common.c:559
msgid "Device is now unmanaged"
msgstr "裝置現在已不受管理"
-#: ../clients/cli/common.c:556
+#: ../clients/cli/common.c:562
msgid "The device could not be readied for configuration"
msgstr "裝置尚未準備好進行配置"
-#: ../clients/cli/common.c:559
+#: ../clients/cli/common.c:565
msgid ""
"IP configuration could not be reserved (no available address, timeout, etc.)"
msgstr "IP 配置無法預留(沒有可用的位址、逾時等等。)"
-#: ../clients/cli/common.c:562
+#: ../clients/cli/common.c:568
msgid "The IP configuration is no longer valid"
msgstr "IP 配置已不再有效"
-#: ../clients/cli/common.c:565
+#: ../clients/cli/common.c:571
msgid "Secrets were required, but not provided"
msgstr "需要機密,但尚未提供"
-#: ../clients/cli/common.c:568
+#: ../clients/cli/common.c:574
msgid "802.1X supplicant disconnected"
msgstr "802.1X 請求已斷線"
-#: ../clients/cli/common.c:571
+#: ../clients/cli/common.c:577
msgid "802.1X supplicant configuration failed"
msgstr "802.1X 請求組態失敗"
-#: ../clients/cli/common.c:574
+#: ../clients/cli/common.c:580
msgid "802.1X supplicant failed"
msgstr "802.1X 請求已失敗"
-#: ../clients/cli/common.c:577
+#: ../clients/cli/common.c:583
msgid "802.1X supplicant took too long to authenticate"
msgstr "802.1X 請求花了太長時間進行認證"
-#: ../clients/cli/common.c:580
+#: ../clients/cli/common.c:586
msgid "PPP service failed to start"
msgstr "無法啟動 PPP 服務"
-#: ../clients/cli/common.c:583
+#: ../clients/cli/common.c:589
msgid "PPP service disconnected"
msgstr "PPP 服務已斷線"
-#: ../clients/cli/common.c:586
+#: ../clients/cli/common.c:592
msgid "PPP failed"
msgstr "PPP 失敗"
-#: ../clients/cli/common.c:589
+#: ../clients/cli/common.c:595
msgid "DHCP client failed to start"
msgstr "DHCP 客戶端啟動失敗"
-#: ../clients/cli/common.c:592
+#: ../clients/cli/common.c:598
msgid "DHCP client error"
msgstr "DHCP 客戶端錯誤"
-#: ../clients/cli/common.c:595
+#: ../clients/cli/common.c:601
msgid "DHCP client failed"
msgstr "DHCP 客戶端失敗"
-#: ../clients/cli/common.c:598
+#: ../clients/cli/common.c:604
msgid "Shared connection service failed to start"
msgstr "共享的連線服務啟動失敗"
-#: ../clients/cli/common.c:601
+#: ../clients/cli/common.c:607
msgid "Shared connection service failed"
msgstr "共享連線服務失敗"
-#: ../clients/cli/common.c:604
+#: ../clients/cli/common.c:610
msgid "AutoIP service failed to start"
msgstr "AutoIP 服務啟用失敗"
-#: ../clients/cli/common.c:607
+#: ../clients/cli/common.c:613
msgid "AutoIP service error"
msgstr "AutoIP 服務錯誤"
-#: ../clients/cli/common.c:610
+#: ../clients/cli/common.c:616
msgid "AutoIP service failed"
msgstr "AutoIP 服務失敗"
-#: ../clients/cli/common.c:613
+#: ../clients/cli/common.c:619
msgid "The line is busy"
msgstr "忙線中"
-#: ../clients/cli/common.c:616
+#: ../clients/cli/common.c:622
msgid "No dial tone"
msgstr "沒有撥號音"
-#: ../clients/cli/common.c:619
+#: ../clients/cli/common.c:625
msgid "No carrier could be established"
msgstr "無法建立載體"
-#: ../clients/cli/common.c:622
+#: ../clients/cli/common.c:628
msgid "The dialing request timed out"
msgstr "撥號要求逾時"
-#: ../clients/cli/common.c:625
+#: ../clients/cli/common.c:631
msgid "The dialing attempt failed"
msgstr "嘗試撥號失敗"
-#: ../clients/cli/common.c:628
+#: ../clients/cli/common.c:634
msgid "Modem initialization failed"
msgstr "數據機初始化失敗"
-#: ../clients/cli/common.c:631
+#: ../clients/cli/common.c:637
msgid "Failed to select the specified APN"
msgstr "無法選擇指定的 APN"
-#: ../clients/cli/common.c:634
+#: ../clients/cli/common.c:640
msgid "Not searching for networks"
msgstr "不要搜尋網路"
-#: ../clients/cli/common.c:637
+#: ../clients/cli/common.c:643
msgid "Network registration denied"
msgstr "網路登記被拒絕"
-#: ../clients/cli/common.c:640
+#: ../clients/cli/common.c:646
msgid "Network registration timed out"
msgstr "網路登記逾時"
-#: ../clients/cli/common.c:643
+#: ../clients/cli/common.c:649
msgid "Failed to register with the requested network"
msgstr "無法向要求的網路登記"
-#: ../clients/cli/common.c:646
+#: ../clients/cli/common.c:652
msgid "PIN check failed"
msgstr "PIN 檢查失敗"
-#: ../clients/cli/common.c:649
+#: ../clients/cli/common.c:655
msgid "Necessary firmware for the device may be missing"
msgstr "可能缺少裝置的必要韌體"
-#: ../clients/cli/common.c:652
+#: ../clients/cli/common.c:658
msgid "The device was removed"
msgstr "裝置已移除"
-#: ../clients/cli/common.c:655
+#: ../clients/cli/common.c:661
msgid "NetworkManager went to sleep"
msgstr "NetworkManager 進入了睡眠狀態"
-#: ../clients/cli/common.c:658
+#: ../clients/cli/common.c:664
msgid "The device's active connection disappeared"
msgstr "裝置的連線消失"
-#: ../clients/cli/common.c:661
+#: ../clients/cli/common.c:667
msgid "Device disconnected by user or client"
msgstr "裝置的連線已被使用者或客戶端切斷"
-#: ../clients/cli/common.c:664
+#: ../clients/cli/common.c:670
msgid "Carrier/link changed"
msgstr "載體/連結已更改"
-#: ../clients/cli/common.c:667
+#: ../clients/cli/common.c:673
msgid "The device's existing connection was assumed"
msgstr "已假設了裝置的既有連線"
-#: ../clients/cli/common.c:670
+#: ../clients/cli/common.c:676
msgid "The supplicant is now available"
msgstr "要求現在已能進行"
-#: ../clients/cli/common.c:673
+#: ../clients/cli/common.c:679
msgid "The modem could not be found"
msgstr "找不到數據機"
-#: ../clients/cli/common.c:676
+#: ../clients/cli/common.c:682
msgid "The Bluetooth connection failed or timed out"
msgstr "藍牙連線失敗或逾時"
-#: ../clients/cli/common.c:679
+#: ../clients/cli/common.c:685
msgid "GSM Modem's SIM card not inserted"
msgstr "GSM 數據機的 SIM 卡尚未插入"
-#: ../clients/cli/common.c:682
+#: ../clients/cli/common.c:688
msgid "GSM Modem's SIM PIN required"
msgstr "需要 GSM 數據機的 SIM PIN"
-#: ../clients/cli/common.c:685
+#: ../clients/cli/common.c:691
msgid "GSM Modem's SIM PUK required"
msgstr "需要 GSM 數據機的 SIM PUK"
-#: ../clients/cli/common.c:688
+#: ../clients/cli/common.c:694
msgid "GSM Modem's SIM wrong"
msgstr "GSM 數據機的 SIM 錯誤"
-#: ../clients/cli/common.c:691
+#: ../clients/cli/common.c:697
msgid "InfiniBand device does not support connected mode"
msgstr "InfiniBand 裝置不支援已連接模式"
-#: ../clients/cli/common.c:694
+#: ../clients/cli/common.c:700
msgid "A dependency of the connection failed"
msgstr "連線的相依性發生錯誤"
-#: ../clients/cli/common.c:697
+#: ../clients/cli/common.c:703
msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
msgstr "ADSL 橋接上發生了 RFC 2684 乙太網路上的問題"
-#: ../clients/cli/common.c:700
+#: ../clients/cli/common.c:706
msgid "ModemManager is unavailable"
msgstr "ModemManager 無法使用"
-#: ../clients/cli/common.c:703
+#: ../clients/cli/common.c:709
msgid "The Wi-Fi network could not be found"
msgstr "找不到 Wi-Fi 網路"
-#: ../clients/cli/common.c:706
+#: ../clients/cli/common.c:712
msgid "A secondary connection of the base connection failed"
msgstr "基礎連線的次要連線失敗"
-#: ../clients/cli/common.c:709
+#: ../clients/cli/common.c:715
msgid "DCB or FCoE setup failed"
msgstr "設定 DCB 或 FCoE 失敗"
-#: ../clients/cli/common.c:712
+#: ../clients/cli/common.c:718
msgid "teamd control failed"
msgstr "teamd 控制失敗"
-#: ../clients/cli/common.c:715
+#: ../clients/cli/common.c:721
#, fuzzy
msgid "Modem failed or no longer available"
msgstr "ModemManager 無法使用"
-#: ../clients/cli/common.c:718
+#: ../clients/cli/common.c:724
#, fuzzy
msgid "Modem now ready and available"
msgstr "ModemManager 無法使用"
-#: ../clients/cli/common.c:721
+#: ../clients/cli/common.c:727
msgid "SIM PIN was incorrect"
msgstr ""
-#: ../clients/cli/common.c:724
+#: ../clients/cli/common.c:730
#, fuzzy
msgid "New connection activation was enqueued"
msgstr "錯誤:啟動連線失敗。"
-#: ../clients/cli/common.c:727
+#: ../clients/cli/common.c:733
#, fuzzy
msgid "The device's parent changed"
msgstr "裝置已移除"
-#: ../clients/cli/common.c:730
+#: ../clients/cli/common.c:736
#, fuzzy
msgid "The device parent's management changed"
msgstr "裝置已移除"
#. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
-#: ../libnm/nm-device.c:1839
+#: ../clients/cli/common.c:740 ../libnm-glib/nm-device.c:1898
+#: ../libnm/nm-device.c:1700
msgid "Unknown"
msgstr "不明"
-#: ../clients/cli/common.c:776
+#: ../clients/cli/common.c:782
#, c-format
msgid "invalid priority map '%s'"
msgstr "無效的優先順序對映「%s」"
-#: ../clients/cli/common.c:783 ../clients/cli/common.c:789
+#: ../clients/cli/common.c:789 ../clients/cli/common.c:795
#, c-format
msgid "priority '%s' is not valid (<0-%ld>)"
msgstr "優先順序「%s」無效(<0-%ld>)"
-#: ../clients/cli/common.c:856
+#: ../clients/cli/common.c:869
#, c-format
-msgid "'%s' is not a valid team configuration or file name."
-msgstr "'%s' 不是合於規定的 team 配置或檔名"
+msgid "cannot read team config from file '%s'"
+msgstr ""
+
+#: ../clients/cli/common.c:876
+#, c-format
+msgid "team config file '%s' contains non-valid utf-8"
+msgstr ""
+
+#: ../clients/cli/common.c:888
+#, c-format
+msgid "'%s' does not contain a valid team configuration"
+msgstr ""
+
+#: ../clients/cli/common.c:891
+#, c-format
+msgid "team configuration must be a JSON object"
+msgstr ""
+
+#: ../clients/cli/common.c:944
+#, c-format
+msgid "cannot read pac-script from file '%s'"
+msgstr ""
+
+#: ../clients/cli/common.c:951
+#, c-format
+msgid "file '%s' contains non-valid utf-8"
+msgstr ""
-#: ../clients/cli/common.c:958
+#: ../clients/cli/common.c:964
+#, c-format
+msgid "'%s' does not contain a valid PAC Script"
+msgstr ""
+
+#: ../clients/cli/common.c:967
+#, c-format
+msgid "Not a valid PAC Script"
+msgstr ""
+
+#: ../clients/cli/common.c:1090
#, fuzzy, c-format
msgid "Error: openconnect failed: %s\n"
msgstr "錯誤:連線驗證失敗:%s\n"
-#: ../clients/cli/common.c:965
+#: ../clients/cli/common.c:1097
#, fuzzy, c-format
msgid "Error: openconnect failed with status %d\n"
msgstr "錯誤:連線無效:%s\n"
-#: ../clients/cli/common.c:967
+#: ../clients/cli/common.c:1099
#, fuzzy, c-format
msgid "Error: openconnect failed with signal %d\n"
msgstr "錯誤:連線無效:%s\n"
-#: ../clients/cli/common.c:1045
+#: ../clients/cli/common.c:1180
#, c-format
msgid ""
"Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
"without '--ask' option.\n"
msgstr ""
+#: ../clients/cli/common.c:1609 ../clients/nm-online.c:159
+#, fuzzy, c-format
+msgid "Error: Could not create NMClient object: %s."
+msgstr "錯誤:無法建立 NMClient 物件。"
+
+#: ../clients/cli/common.c:1629
+msgid "Error: NetworkManager is not running."
+msgstr "錯誤:NetworkManager 未執行。"
+
+#: ../clients/cli/common.c:1713
+#, c-format
+msgid "Error: argument '%s' not understood. Try passing --help instead."
+msgstr ""
+
+#: ../clients/cli/common.c:1723
+msgid "Error: missing argument. Try passing --help."
+msgstr ""
+
+#: ../clients/cli/common.c:1776
+msgid "access denied"
+msgstr ""
+
#. define some prompts for connection editor
-#: ../clients/cli/connections.c:41
+#: ../clients/cli/connections.c:62
msgid "Setting name? "
msgstr "設定名稱?"
-#: ../clients/cli/connections.c:42
+#: ../clients/cli/connections.c:63
msgid "Property name? "
msgstr "屬性名稱?"
-#: ../clients/cli/connections.c:43
+#: ../clients/cli/connections.c:64
msgid "Enter connection type: "
msgstr "輸入連線類型:"
#. define some other prompts
-#: ../clients/cli/connections.c:46
-msgid "Connection type: "
+#: ../clients/cli/connections.c:67
+#, fuzzy
+msgid "Connection type"
msgstr "連線類型:"
-#: ../clients/cli/connections.c:47
-msgid "VPN type: "
+#: ../clients/cli/connections.c:68
+#, fuzzy
+msgid "Interface name [*]"
+msgstr "介面卡名稱 [*]:"
+
+#: ../clients/cli/connections.c:69
+#, fuzzy
+msgid "VPN type"
msgstr "VPN 類型:"
-#: ../clients/cli/connections.c:48
+#: ../clients/cli/connections.c:70
#, fuzzy
-msgid "Master: "
+msgid "Master"
msgstr "Bond master:"
-#: ../clients/cli/connections.c:49
-msgid "Connection (name, UUID, or path): "
-msgstr "連線(名稱、UUID 或是路徑):"
+#: ../clients/cli/connections.c:72 ../clients/tui/nmt-page-infiniband.c:88
+msgid "Transport mode"
+msgstr "傳輸模式"
-#: ../clients/cli/connections.c:50
+#: ../clients/cli/connections.c:77
#, fuzzy
-msgid "VPN connection (name, UUID, or path): "
-msgstr "連線(名稱、UUID 或是路徑):"
+msgid "Bluetooth type"
+msgstr "藍牙"
+
+#: ../clients/cli/connections.c:83
+#, fuzzy
+msgid "Bonding mode"
+msgstr "連結監控"
+
+#: ../clients/cli/connections.c:85 ../clients/cli/connections.c:4257
+#, fuzzy
+msgid "Bonding monitoring mode"
+msgstr "連結監控"
+
+#: ../clients/cli/connections.c:90
+msgid "Protocol"
+msgstr ""
+
+#: ../clients/cli/connections.c:93
+#, fuzzy
+msgid "Wi-Fi mode"
+msgstr "無線網路"
+
+#: ../clients/cli/connections.c:99
+#, fuzzy
+msgid "ADSL encapsulation"
+msgstr "DSL 身份認證"
+
+#: ../clients/cli/connections.c:102
+#, fuzzy
+msgid "Tun mode"
+msgstr "傳輸模式"
+
+#: ../clients/cli/connections.c:107
+#, fuzzy
+msgid "IP Tunnel mode"
+msgstr "編輯連線"
+
+#: ../clients/cli/connections.c:109
+#, fuzzy
+msgid "MACVLAN mode"
+msgstr "VLAN"
-#: ../clients/cli/connections.c:51
+#: ../clients/cli/connections.c:111
#, fuzzy
-msgid "Connection(s) (name, UUID, or path): "
+msgid "Connection (name, UUID, or path)"
msgstr "連線(名稱、UUID 或是路徑):"
-#: ../clients/cli/connections.c:52
+#: ../clients/cli/connections.c:112
#, fuzzy
-msgid "Connection(s) (name, UUID, path or apath): "
+msgid "VPN connection (name, UUID, or path)"
msgstr "連線(名稱、UUID 或是路徑):"
-#: ../clients/cli/connections.c:53
-msgid "Tunnel mode: "
-msgstr ""
+#: ../clients/cli/connections.c:113
+#, fuzzy
+msgid "Connection(s) (name, UUID, or path)"
+msgstr "連線(名稱、UUID 或是路徑):"
-#: ../clients/cli/connections.c:54
-msgid "MACVLAN mode: "
-msgstr ""
+#: ../clients/cli/connections.c:114
+#, fuzzy
+msgid "Connection(s) (name, UUID, path or apath)"
+msgstr "連線(名稱、UUID 或是路徑):"
#. 0
-#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
-#: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89
-#: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110
-#: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137
-#: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176
-#: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200
-#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251
+#: ../clients/cli/connections.c:120 ../clients/cli/connections.c:212
+#: ../clients/cli/devices.c:56 ../clients/cli/devices.c:90
+#: ../clients/cli/devices.c:100 ../clients/cli/devices.c:111
+#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:138
+#: ../clients/cli/devices.c:151 ../clients/cli/devices.c:177
+#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
+#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:221
+#: ../clients/cli/devices.c:262
msgid "NAME"
msgstr "NAME"
#. 0
#. 1
-#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
+#: ../clients/cli/connections.c:121 ../clients/cli/connections.c:213
msgid "UUID"
msgstr "UUID"
@@ -655,36 +752,36 @@ msgstr "UUID"
#. 0
#. 1
#. 2
-#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215
-#: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57
-#: ../clients/cli/devices.c:179
+#: ../clients/cli/connections.c:122 ../clients/cli/connections.c:234
+#: ../clients/cli/devices.c:42 ../clients/cli/devices.c:58
+#: ../clients/cli/devices.c:180
msgid "TYPE"
msgstr "TYPE"
#. 2
-#: ../clients/cli/connections.c:76
+#: ../clients/cli/connections.c:123
msgid "TIMESTAMP"
msgstr "TIMESTAMP"
#. 3
-#: ../clients/cli/connections.c:77
+#: ../clients/cli/connections.c:124
msgid "TIMESTAMP-REAL"
msgstr "TIMESTAMP-REAL"
#. 4
#. 16
-#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72
+#: ../clients/cli/connections.c:125 ../clients/cli/devices.c:73
msgid "AUTOCONNECT"
msgstr "AUTOCONNECT"
#. 5
-#: ../clients/cli/connections.c:79
+#: ../clients/cli/connections.c:126
#, fuzzy
msgid "AUTOCONNECT-PRIORITY"
msgstr "AUTOCONNECT"
#. 6
-#: ../clients/cli/connections.c:80
+#: ../clients/cli/connections.c:127
msgid "READONLY"
msgstr "READONLY"
@@ -693,17 +790,17 @@ msgstr "READONLY"
#. 2
#. 15
#. 5
-#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201
-#: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166
-#: ../clients/cli/devices.c:182
+#: ../clients/cli/connections.c:128 ../clients/cli/connections.c:220
+#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:167
+#: ../clients/cli/devices.c:183
msgid "DBUS-PATH"
msgstr "DBUS-PATH"
#. 8
#. 13
#. 4
-#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164
-#: ../clients/cli/devices.c:181
+#: ../clients/cli/connections.c:129 ../clients/cli/devices.c:165
+#: ../clients/cli/devices.c:182
msgid "ACTIVE"
msgstr "ACTIVE"
@@ -712,9 +809,9 @@ msgstr "ACTIVE"
#. 12
#. 3
#. 0
-#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40
-#: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163
-#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252
+#: ../clients/cli/connections.c:130 ../clients/cli/devices.c:41
+#: ../clients/cli/devices.c:57 ../clients/cli/devices.c:164
+#: ../clients/cli/devices.c:181 ../clients/cli/devices.c:263
msgid "DEVICE"
msgstr "DEVICE"
@@ -723,120 +820,124 @@ msgstr "DEVICE"
#. 1
#. 10
#. 1
-#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196
-#: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66
-#: ../clients/cli/general.c:36
+#: ../clients/cli/connections.c:131 ../clients/cli/connections.c:215
+#: ../clients/cli/devices.c:43 ../clients/cli/devices.c:67
+#: ../clients/cli/general.c:39
msgid "STATE"
msgstr "STATE"
#. 11
-#: ../clients/cli/connections.c:85
+#: ../clients/cli/connections.c:132
#, fuzzy
msgid "ACTIVE-PATH"
msgstr "MASTER-PATH"
+#. 12
+#: ../clients/cli/connections.c:133
+msgid "SLAVE"
+msgstr ""
+
#. 2
-#: ../clients/cli/connections.c:195
+#: ../clients/cli/connections.c:214
msgid "DEVICES"
msgstr "DEVICES"
#. 4
-#: ../clients/cli/connections.c:197
+#: ../clients/cli/connections.c:216
msgid "DEFAULT"
msgstr "DEFAULT"
#. 5
-#: ../clients/cli/connections.c:198
+#: ../clients/cli/connections.c:217
msgid "DEFAULT6"
msgstr "DEFAULT6"
#. 6
-#: ../clients/cli/connections.c:199
+#: ../clients/cli/connections.c:218
msgid "SPEC-OBJECT"
msgstr "SPEC-OBJECT"
#. 7
#. 4
-#. Ask for optional 'vpn' arguments.
-#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
-#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
-#: ../clients/tui/nmt-connect-connection-list.c:405
+#: ../clients/cli/connections.c:219 ../clients/cli/connections.c:257
+#: ../clients/cli/general.c:1131 ../clients/tui/nm-editor-utils.c:241
+#: ../clients/tui/nmt-connect-connection-list.c:406
msgid "VPN"
msgstr "VPN"
#. 9
#. 5
#. 22
-#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
-#: ../clients/cli/devices.c:78
+#: ../clients/cli/connections.c:221 ../clients/cli/devices.c:47
+#: ../clients/cli/devices.c:79
msgid "CON-PATH"
msgstr "CON-PATH"
#. 10
-#: ../clients/cli/connections.c:203
+#: ../clients/cli/connections.c:222
msgid "ZONE"
msgstr "ZONE"
#. 11
-#: ../clients/cli/connections.c:204
+#: ../clients/cli/connections.c:223
msgid "MASTER-PATH"
msgstr "MASTER-PATH"
#. 1
-#: ../clients/cli/connections.c:216
+#: ../clients/cli/connections.c:235
msgid "USERNAME"
msgstr "USERNAME"
#. 3
-#: ../clients/cli/connections.c:218
+#: ../clients/cli/connections.c:237
msgid "BANNER"
msgstr "BANNER"
#. 4
-#: ../clients/cli/connections.c:219
+#: ../clients/cli/connections.c:238
msgid "VPN-STATE"
msgstr "VPN-STATE"
#. 5
-#: ../clients/cli/connections.c:220
+#: ../clients/cli/connections.c:239
msgid "CFG"
msgstr "CFG"
-#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
+#: ../clients/cli/connections.c:252 ../clients/cli/devices.c:236
msgid "GENERAL"
msgstr "GENERAL"
#. 0
#. 6
-#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232
+#: ../clients/cli/connections.c:253 ../clients/cli/devices.c:243
msgid "IP4"
msgstr "IP4"
#. 1
#. 7
-#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
+#: ../clients/cli/connections.c:254 ../clients/cli/devices.c:244
msgid "DHCP4"
msgstr "DHCP4"
#. 2
#. 8
-#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
+#: ../clients/cli/connections.c:255 ../clients/cli/devices.c:245
msgid "IP6"
msgstr "IP6"
#. 3
#. 9
-#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
+#: ../clients/cli/connections.c:256 ../clients/cli/devices.c:246
msgid "DHCP6"
msgstr "DHCP6"
-#: ../clients/cli/connections.c:272
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:288
+#, c-format
msgid ""
"Usage: nmcli connection { COMMAND | help }\n"
"\n"
-"COMMAND := { show | up | down | add | modify | edit | delete | monitor | "
-"reload | load }\n"
+"COMMAND := { show | up | down | add | modify | clone | edit | delete | "
+"monitor | reload | load | import | export }\n"
"\n"
" show [--active] [--order <order spec>]\n"
" show [--active] [id | uuid | path | apath] <ID> ...\n"
@@ -846,8 +947,8 @@ msgid ""
"\n"
" down [id | uuid | path | apath] <ID> ...\n"
"\n"
-" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
-"]<setting>.<property> <value>)+]\n"
+" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
+"([+|-]<setting>.<property> <value>)+]\n"
"\n"
" modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
"<value>)+\n"
@@ -870,35 +971,8 @@ msgid ""
" export [id | uuid | path] <ID> [<output file>]\n"
"\n"
msgstr ""
-"Usage: nmcli connection { COMMAND | help }\n"
-"\n"
-"COMMAND := { show | up | down | add | modify | edit | delete | reload | load "
-"}\n"
-"\n"
-" show configured [[id | uuid | path] <ID>]\n"
-" show active [[id | uuid | path | apath] <ID>]\n"
-"\n"
-" up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [nsp <name>]\n"
-"\n"
-" up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>]\n"
-"\n"
-" down [id | uuid | path | apath] <ID>\n"
-"\n"
-" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
-"\n"
-" modify [id | uuid | path] <ID> <setting>.<property> <value>\n"
-"\n"
-" edit [id | uuid | path] <ID>\n"
-" edit [type <new_con_type>] [con-name <new_con_name>]\n"
-"\n"
-" delete [id | uuid | path] <ID>\n"
-"\n"
-" reload\n"
-"\n"
-" load <filename> [ <filename>... ]\n"
-"\n"
-#: ../clients/cli/connections.c:294
+#: ../clients/cli/connections.c:310
#, c-format
msgid ""
"Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -925,7 +999,7 @@ msgid ""
"well.\n"
msgstr ""
-#: ../clients/cli/connections.c:315
+#: ../clients/cli/connections.c:331
#, fuzzy, c-format
msgid ""
"Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -968,7 +1042,7 @@ msgstr ""
"nsp - specifies NSP to connect to (only valid for WiMAX)\n"
"\n"
-#: ../clients/cli/connections.c:336
+#: ../clients/cli/connections.c:352
#, fuzzy, c-format
msgid ""
"Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -991,13 +1065,13 @@ msgstr ""
"UUID or D-Bus path.\n"
"\n"
-#: ../clients/cli/connections.c:348
+#: ../clients/cli/connections.c:364
#, fuzzy, c-format
msgid ""
"Usage: nmcli connection add { ARGUMENTS | help }\n"
"\n"
-"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
-"- ([+|-]<setting>.<property> <value>)+]\n"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS "
+"[-- ([+|-]<setting>.<property> <value>)+]\n"
"\n"
" COMMON_OPTIONS:\n"
" type <type>\n"
@@ -1084,8 +1158,8 @@ msgid ""
" [path-cost <1-65535>]\n"
" [hairpin yes|no]\n"
"\n"
-" vpn: vpn-type "
-"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
+" vpn: vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
+"ssh|l2tp|iodine|...\n"
" [user <username>]\n"
"\n"
" olpc-mesh: ssid <SSID>\n"
@@ -1227,7 +1301,7 @@ msgstr ""
" [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
"\n"
-#: ../clients/cli/connections.c:460
+#: ../clients/cli/connections.c:476
#, c-format
msgid ""
"Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1242,8 +1316,8 @@ msgid ""
"\n"
"Examples:\n"
"nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
-"8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
"nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
"nmcli con mod em1-1 -ipv4.dns 1\n"
"nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1252,7 +1326,7 @@ msgid ""
"\n"
msgstr ""
-#: ../clients/cli/connections.c:483
+#: ../clients/cli/connections.c:499
#, c-format
msgid ""
"Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1260,12 +1334,13 @@ msgid ""
"ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
"\n"
"Clone an existing connection profile. The newly created connection will be\n"
-"the exact copy of the <ID>, except the uuid property (will be generated) and\n"
+"the exact copy of the <ID>, except the uuid property (will be generated) "
+"and\n"
"id (provided as <new name> argument).\n"
"\n"
msgstr ""
-#: ../clients/cli/connections.c:495
+#: ../clients/cli/connections.c:511
#, c-format
msgid ""
"Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1292,7 +1367,7 @@ msgstr ""
"Add a new connection profile in an interactive editor.\n"
"\n"
-#: ../clients/cli/connections.c:510
+#: ../clients/cli/connections.c:526
#, c-format
msgid ""
"Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1311,7 +1386,7 @@ msgstr ""
"The profile is identified by its name, UUID or D-Bus path.\n"
"\n"
-#: ../clients/cli/connections.c:521
+#: ../clients/cli/connections.c:537
#, fuzzy, c-format
msgid ""
"Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -1335,7 +1410,7 @@ msgstr ""
"Add a new connection profile in an interactive editor.\n"
"\n"
-#: ../clients/cli/connections.c:533
+#: ../clients/cli/connections.c:549
#, c-format
msgid ""
"Usage: nmcli connection reload { help }\n"
@@ -1348,7 +1423,7 @@ msgstr ""
"Reload all connection files from disk.\n"
"\n"
-#: ../clients/cli/connections.c:541
+#: ../clients/cli/connections.c:557
#, c-format
msgid ""
"Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1371,7 +1446,7 @@ msgstr ""
"state.\n"
"\n"
-#: ../clients/cli/connections.c:553
+#: ../clients/cli/connections.c:569
#, c-format
msgid ""
"Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1386,7 +1461,7 @@ msgid ""
"\n"
msgstr ""
-#: ../clients/cli/connections.c:566
+#: ../clients/cli/connections.c:582
#, fuzzy, c-format
msgid ""
"Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -1405,1315 +1480,913 @@ msgstr ""
"The profile is identified by its name, UUID or D-Bus path.\n"
"\n"
-#: ../clients/cli/connections.c:644
+#: ../clients/cli/connections.c:624
msgid "activating"
msgstr "啟用中"
-#: ../clients/cli/connections.c:646
+#: ../clients/cli/connections.c:626
msgid "activated"
msgstr "已啟用"
# auto translated by TM merge from project: firewalld, version: 0.3.4, DocId: firewalld
-#: ../clients/cli/connections.c:650
+#: ../clients/cli/connections.c:630
msgid "deactivated"
msgstr "已停止"
-#: ../clients/cli/connections.c:662
+#: ../clients/cli/connections.c:642
msgid "VPN connecting (prepare)"
msgstr "VPN 連線(準備)"
-#: ../clients/cli/connections.c:664
+#: ../clients/cli/connections.c:644
msgid "VPN connecting (need authentication)"
msgstr "VPN 連線(需要身份認證)"
-#: ../clients/cli/connections.c:666
+#: ../clients/cli/connections.c:646
msgid "VPN connecting"
msgstr "VPN 連線"
-#: ../clients/cli/connections.c:668
+#: ../clients/cli/connections.c:648
msgid "VPN connecting (getting IP configuration)"
msgstr "VPN 連線(取得 IP 配置)"
-#: ../clients/cli/connections.c:670
+#: ../clients/cli/connections.c:650
msgid "VPN connected"
msgstr "VPN 已連線"
-#: ../clients/cli/connections.c:672
+#: ../clients/cli/connections.c:652
msgid "VPN connection failed"
msgstr "VPN 連線失敗"
-#: ../clients/cli/connections.c:674
+#: ../clients/cli/connections.c:654
msgid "VPN disconnected"
msgstr "VPN 已離線"
-#: ../clients/cli/connections.c:744
+#: ../clients/cli/connections.c:724
#, fuzzy, c-format
msgid "Error updating secrets for %s: %s\n"
msgstr "儲存連線錯誤:%s"
-#: ../clients/cli/connections.c:764
+#: ../clients/cli/connections.c:744
#, fuzzy
msgid "Connection profile details"
msgstr "連線詳情"
-#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
+#: ../clients/cli/connections.c:756 ../clients/cli/connections.c:1183
#, fuzzy, c-format
msgid "Error: 'connection show': %s"
msgstr "錯誤:「device show」:%s"
-#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
+#: ../clients/cli/connections.c:943 ../clients/cli/settings.c:2061
msgid "never"
msgstr "永不"
-#: ../clients/cli/connections.c:1157
+#: ../clients/cli/connections.c:1171
#, fuzzy
msgid "Activate connection details"
msgstr "有效連線的詳細資訊"
-#: ../clients/cli/connections.c:1393
+#: ../clients/cli/connections.c:1407
#, fuzzy, c-format
msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
msgstr "無效的欄位「%s」; 允許的欄位:%s"
-#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
+#: ../clients/cli/connections.c:1422 ../clients/cli/connections.c:1430
#, fuzzy, c-format
msgid "'%s' has to be alone"
msgstr "欄位 '%s' 必須是單獨的"
+#: ../clients/cli/connections.c:1630
+#, c-format
+msgid "incorrect string '%s' of '--order' option"
+msgstr ""
+
+#: ../clients/cli/connections.c:1656
+#, c-format
+msgid "incorrect item '%s' in '--order' option"
+msgstr ""
+
+#: ../clients/cli/connections.c:1686
+msgid "No connection specified"
+msgstr ""
+
+#: ../clients/cli/connections.c:1699
+#, c-format
+msgid "%s argument is missing"
+msgstr ""
+
+#: ../clients/cli/connections.c:1709
+#, c-format
+msgid "unknown connection '%s'"
+msgstr ""
+
+#: ../clients/cli/connections.c:1750
+#, fuzzy
+msgid "'--order' argument is missing"
+msgstr "錯誤:沒有 %s 參數。"
+
#. Add headers
-#: ../clients/cli/connections.c:1634
+#: ../clients/cli/connections.c:1792
#, fuzzy
msgid "NetworkManager active profiles"
msgstr "NetworkManager 狀態"
-#: ../clients/cli/connections.c:1635
+#: ../clients/cli/connections.c:1793
#, fuzzy
msgid "NetworkManager connection profiles"
msgstr "NetworkManager 進入了睡眠狀態"
-#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
-#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
-#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
-#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
-#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
-#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
-#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
-#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
-#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
-#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
-#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
-#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
-#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
-#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
-#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
-#: ../clients/cli/devices.c:3503
+#: ../clients/cli/connections.c:1844 ../clients/cli/connections.c:2625
+#: ../clients/cli/connections.c:2635 ../clients/cli/connections.c:2645
+#: ../clients/cli/connections.c:2812 ../clients/cli/connections.c:8517
+#: ../clients/cli/connections.c:8528 ../clients/cli/devices.c:2640
+#: ../clients/cli/devices.c:2648 ../clients/cli/devices.c:2883
+#: ../clients/cli/devices.c:2891 ../clients/cli/devices.c:2907
+#: ../clients/cli/devices.c:2914 ../clients/cli/devices.c:2933
+#: ../clients/cli/devices.c:2941 ../clients/cli/devices.c:2956
+#: ../clients/cli/devices.c:3332 ../clients/cli/devices.c:3340
+#: ../clients/cli/devices.c:3346 ../clients/cli/devices.c:3356
+#: ../clients/cli/devices.c:3369 ../clients/cli/devices.c:3375
+#: ../clients/cli/devices.c:3547 ../clients/cli/devices.c:3556
+#: ../clients/cli/devices.c:3731
#, c-format
msgid "Error: %s argument is missing."
msgstr "錯誤:沒有 %s 參數。"
-#: ../clients/cli/connections.c:1696
+#: ../clients/cli/connections.c:1863
#, fuzzy, c-format
msgid "Error: %s - no such connection profile."
msgstr "錯誤:%s - 此連線不存在。"
-#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
-#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
-#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
-#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
-#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
-#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
-#: ../clients/cli/general.c:843
+#: ../clients/cli/connections.c:1927 ../clients/cli/connections.c:2614
+#: ../clients/cli/connections.c:2673 ../clients/cli/connections.c:8042
+#: ../clients/cli/connections.c:8151 ../clients/cli/connections.c:8639
+#: ../clients/cli/devices.c:1496 ../clients/cli/devices.c:1554
+#: ../clients/cli/devices.c:1840 ../clients/cli/devices.c:2008
+#: ../clients/cli/devices.c:2115 ../clients/cli/devices.c:2303
+#: ../clients/cli/devices.c:3513 ../clients/cli/devices.c:3623
+#: ../clients/cli/devices.c:3737 ../clients/cli/devices.c:3795
+#: ../clients/cli/general.c:391 ../clients/cli/general.c:572
+#: ../clients/cli/general.c:615 ../clients/cli/general.c:642
+#: ../clients/cli/general.c:832 ../clients/cli/general.c:886
#, c-format
msgid "Error: %s."
msgstr "錯誤:%s。"
-#: ../clients/cli/connections.c:1851
+#: ../clients/cli/connections.c:2025
#, c-format
msgid "no active connection on device '%s'"
msgstr "裝置「%s」上沒有使用中的連線"
-#: ../clients/cli/connections.c:1859
+#: ../clients/cli/connections.c:2033
msgid "no active connection or device"
msgstr "沒有使用中的連線或裝置"
-#: ../clients/cli/connections.c:1910
+#: ../clients/cli/connections.c:2053
+#, c-format
+msgid "device '%s' not compatible with connection '%s':"
+msgstr ""
+
+#: ../clients/cli/connections.c:2089
#, c-format
msgid "device '%s' not compatible with connection '%s'"
msgstr "裝置「%s」和連線「%s」不相容"
-#: ../clients/cli/connections.c:1913
+#: ../clients/cli/connections.c:2092
#, c-format
msgid "no device found for connection '%s'"
msgstr "連線「%s」沒有找到任何裝置"
-#: ../clients/cli/connections.c:1925
+#: ../clients/cli/connections.c:2112
msgid "unknown reason"
msgstr "原因不明"
-#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
+#: ../clients/cli/connections.c:2114 ../clients/cli/general.c:280
msgid "none"
msgstr "none"
-#: ../clients/cli/connections.c:1929
+#: ../clients/cli/connections.c:2116
msgid "the user was disconnected"
msgstr "該使用者已經斷線"
-#: ../clients/cli/connections.c:1931
+#: ../clients/cli/connections.c:2118
msgid "the base network connection was interrupted"
msgstr "基礎的網路連線已經中斷"
-#: ../clients/cli/connections.c:1933
+#: ../clients/cli/connections.c:2120
msgid "the VPN service stopped unexpectedly"
msgstr "VPN 服務無預期停止"
-#: ../clients/cli/connections.c:1935
+#: ../clients/cli/connections.c:2122
msgid "the VPN service returned invalid configuration"
msgstr "VPN 服務傳回無效的配置"
-#: ../clients/cli/connections.c:1937
+#: ../clients/cli/connections.c:2124
msgid "the connection attempt timed out"
msgstr "嚐試連線已經逾時"
-#: ../clients/cli/connections.c:1939
+#: ../clients/cli/connections.c:2126
msgid "the VPN service did not start in time"
msgstr "VPN 服務並沒有按時開始"
-#: ../clients/cli/connections.c:1941
+#: ../clients/cli/connections.c:2128
msgid "the VPN service failed to start"
msgstr "VPN 服務無法開始"
-#: ../clients/cli/connections.c:1943
+#: ../clients/cli/connections.c:2130
msgid "no valid VPN secrets"
msgstr "VPN 密碼不正確"
-#: ../clients/cli/connections.c:1945
+#: ../clients/cli/connections.c:2132
msgid "invalid VPN secrets"
msgstr "VPN 密碼不正確"
-#: ../clients/cli/connections.c:1947
+#: ../clients/cli/connections.c:2134
msgid "the connection was removed"
msgstr "連線已移除"
-#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
-#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
+#: ../clients/cli/connections.c:2156 ../clients/cli/connections.c:2193
+#: ../clients/cli/connections.c:2372 ../clients/cli/connections.c:6382
#, c-format
msgid "Connection successfully activated (D-Bus active path: %s)\n"
msgstr "連線已成功啟用(D-Bus 啟用路徑:%s)\n"
-#: ../clients/cli/connections.c:1976
+#: ../clients/cli/connections.c:2164
#, fuzzy, c-format
msgid ""
"Connection successfully activated (master waiting for slaves) (D-Bus active "
"path: %s)\n"
msgstr "連線已成功啟用(D-Bus 啟用路徑:%s)\n"
-#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
+#: ../clients/cli/connections.c:2176 ../clients/cli/connections.c:2197
#, c-format
msgid "Error: Connection activation failed."
msgstr "錯誤:啟動連線失敗。"
-#: ../clients/cli/connections.c:2053
+#: ../clients/cli/connections.c:2245
#, c-format
msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
msgstr "VPN 連線已成功啟用(D-Bus 啟用路徑:%s)\n"
-#: ../clients/cli/connections.c:2061
+#: ../clients/cli/connections.c:2252
#, c-format
msgid "Error: Connection activation failed: %s."
msgstr "錯誤:啟動連線失敗:%s。"
-#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
+#: ../clients/cli/connections.c:2266
#, c-format
-msgid "Error: Timeout %d sec expired."
-msgstr "錯誤:逾時 %d 秒。"
+msgid "Error: Timeout expired (%d seconds)"
+msgstr ""
-#: ../clients/cli/connections.c:2140
+#: ../clients/cli/connections.c:2352
#, c-format
msgid "Error: Connection activation failed: %s"
msgstr "錯誤:啟動連線失敗:%s"
-#: ../clients/cli/connections.c:2225
+#: ../clients/cli/connections.c:2441
#, fuzzy, c-format
msgid "failed to read passwd-file '%s': %s"
msgstr "錯誤:移除「%s」的值失敗:%s\n"
-#: ../clients/cli/connections.c:2237
+#: ../clients/cli/connections.c:2453
#, c-format
msgid "missing colon in 'password' entry '%s'"
msgstr ""
-#: ../clients/cli/connections.c:2245
+#: ../clients/cli/connections.c:2461
#, c-format
msgid "missing dot in 'password' entry '%s'"
msgstr ""
-#: ../clients/cli/connections.c:2258
+#: ../clients/cli/connections.c:2474
#, c-format
msgid "invalid setting name in 'password' entry '%s'"
msgstr ""
-#: ../clients/cli/connections.c:2314
+#: ../clients/cli/connections.c:2530
#, c-format
msgid "unknown device '%s'."
msgstr "不明的裝置「%s」。"
-#: ../clients/cli/connections.c:2319
+#: ../clients/cli/connections.c:2535
msgid "neither a valid connection nor device given"
msgstr "連線無效或是無裝置"
-#: ../clients/cli/connections.c:2402
-#, fuzzy, c-format
-msgid "Error: Connection '%s' does not exist."
-msgstr "錯誤:連線無效:%s\n"
-
-#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
-#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
-#: ../clients/cli/devices.c:3336
+#: ../clients/cli/connections.c:2655 ../clients/cli/devices.c:1502
+#: ../clients/cli/devices.c:2655 ../clients/cli/devices.c:2969
+#: ../clients/cli/devices.c:3562
#, c-format
msgid "Unknown parameter: %s\n"
msgstr "不明的參數:%s\n"
-#: ../clients/cli/connections.c:2462
+#: ../clients/cli/connections.c:2681
msgid "preparing"
msgstr "正在準備"
-#: ../clients/cli/connections.c:2483
+#: ../clients/cli/connections.c:2700
#, fuzzy, c-format
msgid "Connection '%s' (%s) successfully deleted.\n"
msgstr "連線「%s」 (%s) 已成功新增。\n"
-#: ../clients/cli/connections.c:2499
+#: ../clients/cli/connections.c:2716
#, fuzzy, c-format
msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
msgstr "連線已成功啟用(D-Bus 啟用路徑:%s)\n"
-#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
-#: ../clients/cli/connections.c:10590
+#: ../clients/cli/connections.c:2790 ../clients/cli/connections.c:8260
+#: ../clients/cli/connections.c:8292 ../clients/cli/connections.c:8445
#, c-format
msgid "Error: No connection specified."
msgstr "錯誤:尚未指定連線。"
-#: ../clients/cli/connections.c:2602
+#: ../clients/cli/connections.c:2829
#, fuzzy, c-format
msgid "Error: '%s' is not an active connection.\n"
msgstr "錯誤:「%s」並非啟用中的連線。"
-#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
+#: ../clients/cli/connections.c:2830
#, fuzzy, c-format
msgid "Error: not all active connections found."
msgstr "錯誤:「%s」並非啟用中的連線。"
-#: ../clients/cli/connections.c:2612
+#: ../clients/cli/connections.c:2839
#, fuzzy, c-format
msgid "Error: no active connection provided."
msgstr "錯誤:無法啟用連線:%s。\n"
-#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
+#: ../clients/cli/connections.c:3300 ../clients/cli/utils.c:646
#, c-format
msgid "'%s' not among [%s]"
msgstr "「%s」不在「%s」之間"
-#: ../clients/cli/connections.c:3032
+#: ../clients/cli/connections.c:3460
#, c-format
-msgid "Error: '%s': '%s' is not a valid %s MAC address."
-msgstr "錯誤:「%s」:「%s」不是個有效的 %s MAC 位址。"
-
-#. Ask for optional arguments
-#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
-#: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
-msgid "InfiniBand"
-msgstr "InfiniBand"
+msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
+msgstr ""
-#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
-#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
-msgid "Ethernet"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:3634
+#, fuzzy, c-format
+msgid "Error: don't know how to create '%s' setting."
+msgstr "錯誤:無法取得系統設定。"
-#: ../clients/cli/connections.c:3053
+#: ../clients/cli/connections.c:3645
#, c-format
-msgid "Error: 'mtu': '%s' is not a valid MTU."
-msgstr "錯誤:「mtu」:「%s」不是個有效的 MTU。"
+msgid "Error: invalid property '%s': %s."
+msgstr "錯誤:無效的內容「%s」:%s。"
-#: ../clients/cli/connections.c:3069
+#: ../clients/cli/connections.c:3662
#, c-format
-msgid "Error: 'parent': '%s' is not a valid interface name."
-msgstr "錯誤:「parent」:「%s」不是組有效的介面卡名稱。"
+msgid "Error: failed to modify %s.%s: %s."
+msgstr "錯誤:無法修改 %s.%s:%s。"
-#: ../clients/cli/connections.c:3090
-#, c-format
-msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
-msgstr "錯誤:「p-key」:「%s」不是組有效的 InfiniBand P_KEY。"
+#: ../clients/cli/connections.c:3681
+#, fuzzy, c-format
+msgid "Error: failed to remove a value from %s.%s: %s."
+msgstr "錯誤:移除「%s」的值失敗:%s\n"
-#: ../clients/cli/connections.c:3105
+#: ../clients/cli/connections.c:3707
#, fuzzy, c-format
-msgid "Error: '%s' is not a valid UID/GID."
-msgstr "錯誤:「mtu」:「%s」不是個有效的 MTU。"
+msgid "Error: '%s' is mandatory."
+msgstr "錯誤:「%s」設定不存在\n"
-#: ../clients/cli/connections.c:3149
+#: ../clients/cli/connections.c:3739
#, fuzzy, c-format
-msgid "Error: '%s': '%s' is not a valid %s %s."
-msgstr "錯誤:「%s」:「%s」無效;%s"
+msgid "Error: invalid slave type; %s."
+msgstr "錯誤:無效的連線類型;%s。"
-#: ../clients/cli/connections.c:3162
-#, fuzzy
-msgid "Wi-Fi mode"
-msgstr "無線網路"
+#: ../clients/cli/connections.c:3752
+#, c-format
+msgid "Error: invalid connection type; %s."
+msgstr "錯誤:無效的連線類型;%s。"
-#: ../clients/cli/connections.c:3171
-#, fuzzy
-msgid "InfiniBand transport mode"
-msgstr "傳輸模式"
+#: ../clients/cli/connections.c:3939
+#, fuzzy, c-format
+msgid "Error: bad connection type: %s."
+msgstr "錯誤:無效的連線類型;%s。"
-#: ../clients/cli/connections.c:3183
-msgid "ADSL protocol"
+#: ../clients/cli/connections.c:4002
+#, c-format
+msgid "Error: '%s': %s"
msgstr ""
-#: ../clients/cli/connections.c:3194
-#, fuzzy
-msgid "ADSL encapsulation"
-msgstr "DSL 身份認證"
-
-#: ../clients/cli/connections.c:3203
+#: ../clients/cli/connections.c:4023
#, fuzzy
-msgid "TUN device mode"
-msgstr "裝置已移除"
-
-#: ../clients/cli/connections.c:3216
-#, c-format
-msgid "Error: 'flags': '%s' is not valid; use <0-7>."
-msgstr "錯誤:「flags」:「%s」無效;使用 <0-7>。"
+msgid "Error: master is required"
+msgstr "錯誤:需要「mater」。"
-#: ../clients/cli/connections.c:3238
-#, c-format
-msgid "Error: '%s': '%s' is not valid; %s "
-msgstr "錯誤:「%s」:「%s」無效;%s"
+#: ../clients/cli/connections.c:4082
+#, fuzzy, c-format
+msgid "Error: error adding bond option '%s=%s'."
+msgstr "錯誤:不明的連線「%s」。"
-#: ../clients/cli/connections.c:3416
+#: ../clients/cli/connections.c:4113
#, c-format
-msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr ""
+msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
+msgstr "錯誤:「%s」不是個有效的監控模式;請使用「%s」或是「%s」。\n"
-#: ../clients/cli/connections.c:3441
+#: ../clients/cli/connections.c:4144
#, c-format
-msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
-msgstr "錯誤:「%s」:「%s」無效;使用 <%u-%u>。"
+msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
+msgstr "錯誤:「bt-type」:「%s」無效;請使用 [%s, %s (%s), %s]。"
-#. Ask for optional arguments.
-#: ../clients/cli/connections.c:3497
-#, fuzzy, c-format
-msgid "There is %d optional argument for '%s' connection type.\n"
-msgid_plural "There are %d optional arguments for '%s' connection type.\n"
-msgstr[0] "「%s」的連線類型有一個選用引數。\n"
+#: ../clients/cli/connections.c:4219
+#, fuzzy
+msgid "PPPoE username"
+msgstr "PPPoE 使用者名稱:"
-#: ../clients/cli/connections.c:3500
-#, fuzzy, c-format
-msgid "Do you want to provide it? %s"
-msgid_plural "Do you want to provide them? %s"
-msgstr[0] "您是否希望提供它?(yes/no)[yes]"
+#: ../clients/cli/connections.c:4220 ../clients/cli/connections.c:4241
+#: ../clients/cli/connections.c:4243 ../clients/cli/connections.c:4292
+#, fuzzy
+msgid "Password [none]"
+msgstr "密碼 [none]:"
-#. Ask for optional arguments
-#: ../clients/cli/connections.c:3517
-msgid "ethernet"
-msgstr "乙太網路"
+#: ../clients/cli/connections.c:4221
+#, fuzzy
+msgid "Service [none]"
+msgstr "服務 [none]:"
-#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
-#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
-msgid "MTU [auto]: "
+#: ../clients/cli/connections.c:4222 ../clients/cli/connections.c:4225
+#: ../clients/cli/connections.c:4234
+#, fuzzy
+msgid "MTU [auto]"
msgstr "MTU [auto]:"
-#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
-#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
-#: ../clients/cli/connections.c:4101
-msgid "MAC [none]: "
+#: ../clients/cli/connections.c:4223 ../clients/cli/connections.c:4226
+#: ../clients/cli/connections.c:4235 ../clients/cli/connections.c:4238
+#: ../clients/cli/connections.c:4279
+#, fuzzy
+msgid "MAC [none]"
msgstr "MAC [none]:"
-#: ../clients/cli/connections.c:3544
-msgid "Cloned MAC [none]: "
+#: ../clients/cli/connections.c:4224 ../clients/cli/connections.c:4236
+#, fuzzy
+msgid "Cloned MAC [none]"
msgstr "Cloned MAC [none]:"
-#: ../clients/cli/connections.c:3592
-#, fuzzy, c-format
-msgid "Transport mode %s"
-msgstr "傳輸模式"
-
-#: ../clients/cli/connections.c:3605
-msgid "Parent interface [none]: "
+#: ../clients/cli/connections.c:4229
+#, fuzzy
+msgid "Parent interface [none]"
msgstr "父介面卡 [none]:"
-#: ../clients/cli/connections.c:3616
-msgid "P_KEY [none]: "
+#: ../clients/cli/connections.c:4230
+#, fuzzy
+msgid "P_KEY [none]"
msgstr "P_KEY [none]:"
-#: ../clients/cli/connections.c:3626
-#, c-format
-msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
-msgstr "錯誤:當指定了「parent」時,「p-key」是必要的。\n"
-
-#. Ask for optional arguments
-#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
-#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
-msgid "Wi-Fi"
-msgstr "無線網路"
-
-#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
-#, fuzzy, c-format
-msgid "Mode %s"
-msgstr "模式"
-
-#. Ask for optional 'wimax' arguments.
-#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
-#: ../libnm/nm-device.c:1808
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#. Ask for optional 'pppoe' arguments.
-#: ../clients/cli/connections.c:3694
-msgid "PPPoE"
-msgstr ""
-
-#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
-#: ../clients/cli/connections.c:4223
-msgid "Password [none]: "
-msgstr "密碼 [none]:"
+#. 0
+#: ../clients/cli/connections.c:4231 ../clients/cli/connections.c:4286
+#: ../clients/cli/devices.c:152 ../clients/tui/nmt-page-wifi.c:224
+msgid "SSID"
+msgstr "SSID"
-#: ../clients/cli/connections.c:3700
-msgid "Service [none]: "
-msgstr "服務 [none]:"
+#: ../clients/cli/connections.c:4237
+#, fuzzy
+msgid "WiMAX NSP name"
+msgstr "WiMAX NSP 名稱:"
-#. Ask for optional 'gsm' or 'cdma' arguments.
-#: ../clients/cli/connections.c:3730
+#: ../clients/cli/connections.c:4239
#, fuzzy
-msgid "mobile broadband"
-msgstr "行動寬頻"
+msgid "APN"
+msgstr "AP"
-#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
-msgid "Username [none]: "
+#: ../clients/cli/connections.c:4240 ../clients/cli/connections.c:4242
+#: ../clients/cli/connections.c:4285
+#, fuzzy
+msgid "Username [none]"
msgstr "使用者名稱 [none]:"
-#. Ask for optional 'bluetooth' arguments.
-#: ../clients/cli/connections.c:3749
+#: ../clients/cli/connections.c:4244
#, fuzzy
-msgid "bluetooth"
-msgstr "藍牙"
-
-#: ../clients/cli/connections.c:3756
-#, fuzzy, c-format
-msgid "Bluetooth type %s"
-msgstr "藍牙"
+msgid "Bluetooth device address"
+msgstr "藍牙裝置位址:"
-#: ../clients/cli/connections.c:3762
-#, c-format
-msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
-msgstr "錯誤:「bt-type」:「%s」不是個有效的藍牙類型。\n"
+#: ../clients/cli/connections.c:4247
+#, fuzzy
+msgid "VLAN parent device or connection UUID"
+msgstr "VLAN 父裝置或連線 UUID:"
-#. Ask for optional 'vlan' arguments.
-#. 13
-#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
-#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
-#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
-#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
-msgid "VLAN"
-msgstr "VLAN"
+#: ../clients/cli/connections.c:4249
+#, fuzzy
+msgid "VLAN ID (<0-4094>)"
+msgstr "VLAN ID <0-4095>:"
-#: ../clients/cli/connections.c:3794
-msgid "VLAN flags (<0-7>) [none]: "
+#: ../clients/cli/connections.c:4250
+#, fuzzy
+msgid "VLAN flags (<0-7>) [none]"
msgstr "VLAN 旗標(<0-7>)[none]:"
-#: ../clients/cli/connections.c:3805
-msgid "Ingress priority maps [none]: "
+#: ../clients/cli/connections.c:4251
+#, fuzzy
+msgid "Ingress priority maps [none]"
msgstr "Ingress 優先順序對映 [none]:"
-#: ../clients/cli/connections.c:3816
-msgid "Egress priority maps [none]: "
+#: ../clients/cli/connections.c:4252
+#, fuzzy
+msgid "Egress priority maps [none]"
msgstr "Egress 優先順序對映 [none]:"
-#: ../clients/cli/connections.c:3827
-msgid "Bonding mode [balance-rr]: "
-msgstr "Bonding 模式 [balance-rr]:"
-
-#. Ask for optional 'bond' arguments.
-#: ../clients/cli/connections.c:3843
-msgid "bond"
-msgstr ""
-
-#: ../clients/cli/connections.c:3865
-msgid "Bonding primary interface [none]: "
+#: ../clients/cli/connections.c:4255
+#, fuzzy
+msgid "Bonding primary interface [none]"
msgstr "Bonding 主要介面卡 [none]:"
-#: ../clients/cli/connections.c:3868
-#, c-format
-msgid "Error: 'primary': '%s' is not a valid interface name.\n"
-msgstr "錯誤:「primary」:「%s」不是組有效的介面卡名稱。\n"
-
-#: ../clients/cli/connections.c:3876
-#, fuzzy, c-format
-msgid "Bonding monitoring mode %s"
-msgstr "連結監控"
-
-#: ../clients/cli/connections.c:3882
-#, c-format
-msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
-msgstr "錯誤:「%s」不是個有效的監控模式;請使用「%s」或是「%s」。\n"
-
-#: ../clients/cli/connections.c:3891
-msgid "Bonding miimon [100]: "
+#: ../clients/cli/connections.c:4259
+#, fuzzy
+msgid "Bonding miimon [100]"
msgstr "Bonding miimon [100]:"
-#: ../clients/cli/connections.c:3894
-#, c-format
-msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
-msgstr "錯誤:「miimon」:「%s」不是個有效的數字 <0-%u>。\n"
-
-#: ../clients/cli/connections.c:3902
-msgid "Bonding downdelay [0]: "
+#: ../clients/cli/connections.c:4260
+#, fuzzy
+msgid "Bonding downdelay [0]"
msgstr "Bonding downdelay [0]:"
-#: ../clients/cli/connections.c:3905
-#, c-format
-msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
-msgstr "錯誤:「downdelay」:「%s」不是個有效的數字 <0-%u>。\n"
-
-#: ../clients/cli/connections.c:3913
-msgid "Bonding updelay [0]: "
+#: ../clients/cli/connections.c:4261
+#, fuzzy
+msgid "Bonding updelay [0]"
msgstr "Bonding updelay [0]:"
-#: ../clients/cli/connections.c:3916
-#, c-format
-msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
-msgstr "錯誤:「updelay」:「%s」不是個有效的數字 <0-%u>。\n"
-
-#: ../clients/cli/connections.c:3925
-msgid "Bonding arp-interval [0]: "
+#: ../clients/cli/connections.c:4262
+#, fuzzy
+msgid "Bonding arp-interval [0]"
msgstr "Bonding arp-interval [0]:"
-#: ../clients/cli/connections.c:3928
-#, c-format
-msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
-msgstr "錯誤:「arp-interval」:「%s」不是個有效的數字 <0-%u>。\n"
-
-#. FIXME: verify the string
-#: ../clients/cli/connections.c:3936
-msgid "Bonding arp-ip-target [none]: "
+#: ../clients/cli/connections.c:4264
+#, fuzzy
+msgid "Bonding arp-ip-target [none]"
msgstr "Bonding arp-ip-target [none]:"
-#: ../clients/cli/connections.c:3943
-msgid "LACP rate ('slow' or 'fast') [slow]: "
+#: ../clients/cli/connections.c:4266
+msgid "LACP rate ('slow' or 'fast') [slow]"
msgstr ""
-#: ../clients/cli/connections.c:3949
-#, fuzzy, c-format
-msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
-msgstr "錯誤:「master」:「%s」不是個有效的 UUID 或是介面卡。"
-
-#: ../clients/cli/connections.c:3972
-msgid "Team JSON configuration [none]: "
+#: ../clients/cli/connections.c:4268 ../clients/cli/connections.c:4269
+#, fuzzy
+msgid "Team JSON configuration [none]"
msgstr "團隊 JSON 的配置 [none]:"
-#: ../clients/cli/connections.c:3989
-msgid "team"
-msgstr "team"
-
-#: ../clients/cli/connections.c:3995
-msgid "team-slave"
-msgstr "team-slave"
-
-#. Ask for optional 'bridge' arguments.
-#: ../clients/cli/connections.c:4007
+#: ../clients/cli/connections.c:4270
#, fuzzy
-msgid "bridge"
-msgstr "橋接"
-
-#: ../clients/cli/connections.c:4013
-#, fuzzy, c-format
-msgid "Enable STP %s"
+msgid "Enable STP [no]"
msgstr "啟用 STP(yes/no)[yes]:"
-#: ../clients/cli/connections.c:4018
-#, fuzzy, c-format
-msgid "Error: 'stp': %s.\n"
-msgstr "錯誤:「stp」:%s。"
-
-#: ../clients/cli/connections.c:4026
+#: ../clients/cli/connections.c:4272
#, fuzzy
-msgid "STP priority [32768]: "
+msgid "STP priority [32768]"
msgstr "STP 優先順序 [128]:"
-#: ../clients/cli/connections.c:4030
-#, c-format
-msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
-msgstr "錯誤:「priority」:「%s」不是個有效的數字 <0-%d>。\n"
-
-#: ../clients/cli/connections.c:4038
-msgid "Forward delay [15]: "
+#: ../clients/cli/connections.c:4273
+#, fuzzy
+msgid "Forward delay [15]"
msgstr "Forward delay [15]:"
-#: ../clients/cli/connections.c:4042
-#, c-format
-msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
-msgstr "錯誤:「forward-delay」:「%s」不是個有效的數字 <2-30>。\n"
-
-#: ../clients/cli/connections.c:4051
-msgid "Hello time [2]: "
+#: ../clients/cli/connections.c:4274
+#, fuzzy
+msgid "Hello time [2]"
msgstr "Hello time [2]:"
-#: ../clients/cli/connections.c:4055
-#, c-format
-msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
-msgstr "錯誤:「hello-time」:「%s」不是個有效的數字 <1-10>。\n"
-
-#: ../clients/cli/connections.c:4063
-msgid "Max age [20]: "
+#: ../clients/cli/connections.c:4275
+#, fuzzy
+msgid "Max age [20]"
msgstr "Max age [20]:"
-#: ../clients/cli/connections.c:4067
-#, c-format
-msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
-msgstr "錯誤:「max-age」:「%s」不是個有效的數字 <6-40>。\n"
-
-#: ../clients/cli/connections.c:4075
-msgid "MAC address ageing time [300]: "
+#: ../clients/cli/connections.c:4276
+#, fuzzy
+msgid "MAC address ageing time [300]"
msgstr "MAC address ageing time [300]:"
-#: ../clients/cli/connections.c:4079
-#, c-format
-msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
-msgstr "錯誤:「ageing-time」:「%s」不是個有效的數字 <0-1000000>。\n"
-
-#: ../clients/cli/connections.c:4088
-#, c-format
-msgid "Enable IGMP snooping %s"
+#: ../clients/cli/connections.c:4277
+msgid "Enable IGMP snooping [no]"
msgstr ""
-#: ../clients/cli/connections.c:4093
-#, fuzzy, c-format
-msgid "Error: 'multicast-snooping': %s.\n"
-msgstr "錯誤:「stp」:%s。"
-
-#. Ask for optional 'bridge-slave' arguments.
-#: ../clients/cli/connections.c:4120
+#: ../clients/cli/connections.c:4280
#, fuzzy
-msgid "bridge-slave"
-msgstr "team-slave"
-
-#: ../clients/cli/connections.c:4125
-msgid "Bridge port priority [32]: "
+msgid "Bridge port priority [32]"
msgstr "橋接連接埠優先順序 [32]:"
-#: ../clients/cli/connections.c:4138
-msgid "Bridge port STP path cost [100]: "
+#: ../clients/cli/connections.c:4281
+#, fuzzy
+msgid "Bridge port STP path cost [100]"
msgstr "橋接連接埠 STP path cost [100]:"
-#: ../clients/cli/connections.c:4152
-#, fuzzy, c-format
-msgid "Hairpin %s"
+#: ../clients/cli/connections.c:4282
+#, fuzzy
+msgid "Hairpin [no]"
msgstr "Hairpin 模式"
-#: ../clients/cli/connections.c:4157
-#, fuzzy, c-format
-msgid "Error: 'hairpin': %s.\n"
-msgstr "錯誤:「hairpin」:%s。"
-
-#. Ask for optional 'olpc' arguments.
-#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
-#: ../libnm/nm-device.c:1806
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
-
-#: ../clients/cli/connections.c:4189
-msgid "OLPC Mesh channel [1]: "
+#: ../clients/cli/connections.c:4287
+#, fuzzy
+msgid "OLPC Mesh channel [1]"
msgstr "OLPC Mesh channel [1]:"
-#: ../clients/cli/connections.c:4192
-#, c-format
-msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
-msgstr "錯誤:「channel」:「%s」不是個有效的數字 <1-13>。\n"
-
-#: ../clients/cli/connections.c:4200
-msgid "DHCP anycast MAC address [none]: "
+#: ../clients/cli/connections.c:4288
+#, fuzzy
+msgid "DHCP anycast MAC address [none]"
msgstr "DHCP anycast MAC address [none]:"
-#. Ask for optional 'adsl' arguments.
-#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
-#: ../libnm/nm-device.c:1822
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../clients/cli/connections.c:4227
-#, fuzzy, c-format
-msgid "ADSL encapsulation %s"
-msgstr "ADSL 連線 %d"
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. * is not visible here since we only care about phase2 authentication
+#. * (and don't even care of which one)
+#.
+#: ../clients/cli/connections.c:4289
+#: ../clients/common/nm-secret-agent-simple.c:223
+#: ../clients/common/nm-secret-agent-simple.c:328
+#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
+msgid "Username"
+msgstr "使用者名稱"
-#. Ask for optional 'macvlan' arguments.
-#: ../clients/cli/connections.c:4245
-msgid "macvlan"
-msgstr ""
+#: ../clients/cli/connections.c:4295
+#, fuzzy
+msgid "MACVLAN parent device or connection UUID"
+msgstr "VLAN 父裝置或連線 UUID:"
-#: ../clients/cli/connections.c:4251
-#, c-format
-msgid "Tap %s"
+#: ../clients/cli/connections.c:4299
+msgid "Tap [no]"
msgstr ""
-#: ../clients/cli/connections.c:4256
-#, fuzzy, c-format
-msgid "Error: 'tap': %s.\n"
-msgstr "錯誤:「stp」:%s。"
+#: ../clients/cli/connections.c:4301
+#, fuzzy
+msgid "VXLAN ID"
+msgstr "VLAN ID <0-4095>:"
-#. Ask for optional 'vxlan' arguments.
-#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
-#: ../libnm/nm-device.c:1826
-msgid "VXLAN"
-msgstr ""
+#: ../clients/cli/connections.c:4302 ../clients/cli/connections.c:4321
+#, fuzzy
+msgid "Remote"
+msgstr "移除"
-#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
+#: ../clients/cli/connections.c:4303 ../clients/cli/connections.c:4322
#, fuzzy
-msgid "Parent device [none]: "
+msgid "Parent device [none]"
msgstr "父介面卡 [none]:"
-#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
-#, fuzzy, c-format
-msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
-msgstr "錯誤:「dev」:「%s」不是 UUID、介面卡名稱,或是 MAC。"
-
-#: ../clients/cli/connections.c:4291
+#: ../clients/cli/connections.c:4305
#, fuzzy
-msgid "Local address [none]: "
+msgid "Local address [none]"
msgstr "DHCP anycast MAC address [none]:"
-#: ../clients/cli/connections.c:4296
-#, fuzzy, c-format
-msgid "Error: 'local': '%s' is not a valid IP address.\n"
-msgstr "錯誤:「%s」:「%s」不是個有效的 %s MAC 位址。"
-
-#: ../clients/cli/connections.c:4305
-msgid "Minimum source port [0]: "
+#: ../clients/cli/connections.c:4306
+msgid "Minimum source port [0]"
msgstr ""
-#: ../clients/cli/connections.c:4309
-#, fuzzy, c-format
-msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
-msgstr "錯誤:「priority」:「%s」不是個有效的數字 <0-%d>。\n"
-
-#: ../clients/cli/connections.c:4318
-msgid "Maximum source port [0]: "
+#: ../clients/cli/connections.c:4307
+msgid "Maximum source port [0]"
msgstr ""
-#: ../clients/cli/connections.c:4322
-#, fuzzy, c-format
-msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
-msgstr "錯誤:「priority」:「%s」不是個有效的數字 <0-%d>。\n"
-
-#: ../clients/cli/connections.c:4331
+#: ../clients/cli/connections.c:4308
#, fuzzy
-msgid "Destination port [8472]: "
+msgid "Destination port [8472]"
msgstr "目的"
-#: ../clients/cli/connections.c:4335
-#, fuzzy, c-format
-msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
-msgstr "錯誤:「miimon」:「%s」不是個有效的數字 <0-%u>。\n"
-
-#: ../clients/cli/connections.c:4374
+#: ../clients/cli/connections.c:4311
#, fuzzy
-msgid "IPv4 address (IP[/plen]) [none]: "
-msgstr "IPv4 address (IP[/plen] [gateway]) [none]:"
+msgid "User ID [none]"
+msgstr "使用者名稱 [none]:"
-#: ../clients/cli/connections.c:4376
+#: ../clients/cli/connections.c:4312
#, fuzzy
-msgid "IPv6 address (IP[/plen]) [none]: "
-msgstr "IPv6 address (IP[/plen] [gateway]) [none]:"
+msgid "Group ID [none]"
+msgstr "MAC [none]:"
-#: ../clients/cli/connections.c:4390
-#, fuzzy, c-format
-msgid " Address successfully added: %s\n"
-msgstr "位址已成功新增:%s %s\n"
+#: ../clients/cli/connections.c:4313
+#, fuzzy
+msgid "Enable PI [no]"
+msgstr "啟用 STP(yes/no)[yes]:"
-#: ../clients/cli/connections.c:4392
-#, fuzzy, c-format
-msgid " Warning: address already present: %s\n"
-msgstr "警告:位址已存在:%s %s\n"
+#: ../clients/cli/connections.c:4315
+msgid "Enable VNET header [no]"
+msgstr ""
-#: ../clients/cli/connections.c:4394
-#, c-format
-msgid " Warning: ignoring garbage at the end: '%s'\n"
-msgstr "警告:將忽略尾端不必要的項目:「%s」\n"
+#: ../clients/cli/connections.c:4317
+msgid "Enable multi queue [no]"
+msgstr ""
-#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
-#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
-#: ../clients/cli/connections.c:6602
-msgid "Error: "
-msgstr "錯誤:"
+#: ../clients/cli/connections.c:4320
+#, fuzzy
+msgid "Local endpoint [none]"
+msgstr "父介面卡 [none]:"
-#: ../clients/cli/connections.c:4416
+#: ../clients/cli/connections.c:4324
#, fuzzy
-msgid "IPv4 gateway [none]: "
+msgid "IPv4 address (IP[/plen]) [none]"
msgstr "IPv4 address (IP[/plen] [gateway]) [none]:"
-#: ../clients/cli/connections.c:4419
+#: ../clients/cli/connections.c:4326
#, fuzzy
-msgid "IPv6 gateway [none]: "
-msgstr "IPv6 address (IP[/plen] [gateway]) [none]:"
-
-#: ../clients/cli/connections.c:4439
-#, fuzzy, c-format
-msgid "Error: invalid gateway address '%s'\n"
-msgstr "錯誤:無效的額外引數「%s」。"
-
-#. Ask for IP addresses
-#: ../clients/cli/connections.c:4452
-#, fuzzy, c-format
-msgid "Do you want to add IP addresses? %s"
-msgstr "您是否希望新增 IP 位址?(yes/no)[yes]"
-
-#: ../clients/cli/connections.c:4460
-#, c-format
-msgid "Press <Enter> to finish adding addresses.\n"
-msgstr "按下 <Enter> 來完成新增位址。\n"
-
-#. Ask for optional 'tun' arguments.
-#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
-#: ../libnm/nm-device.c:1830
-msgid "Tun"
-msgstr ""
+msgid "IPv4 gateway [none]"
+msgstr "IPv4 address (IP[/plen] [gateway]) [none]:"
-#: ../clients/cli/connections.c:4509
+#: ../clients/cli/connections.c:4327
#, fuzzy
-msgid "User ID [none]: "
-msgstr "使用者名稱 [none]:"
+msgid "IPv6 address (IP[/plen]) [none]"
+msgstr "IPv6 address (IP[/plen] [gateway]) [none]:"
-#: ../clients/cli/connections.c:4522
+#: ../clients/cli/connections.c:4329
#, fuzzy
-msgid "Group ID [none]: "
-msgstr "MAC [none]:"
+msgid "IPv6 gateway [none]"
+msgstr "IPv6 address (IP[/plen] [gateway]) [none]:"
-#: ../clients/cli/connections.c:4536
-#, c-format
-msgid "Enable PI %s"
+#: ../clients/cli/connections.c:4330
+msgid "Proxy method"
msgstr ""
-#: ../clients/cli/connections.c:4541
-#, fuzzy, c-format
-msgid "Error: 'pi': %s.\n"
-msgstr "錯誤:「stp」:%s。"
-
-#: ../clients/cli/connections.c:4549
-#, c-format
-msgid "Enable VNET header %s"
+#: ../clients/cli/connections.c:4331
+msgid "Browser Only"
msgstr ""
-#: ../clients/cli/connections.c:4554
-#, fuzzy, c-format
-msgid "Error: 'vnet-hdr': %s.\n"
-msgstr "錯誤:「vpn-type」:%s。"
-
-#: ../clients/cli/connections.c:4562
-#, c-format
-msgid "Enable multi queue %s"
+#: ../clients/cli/connections.c:4332
+msgid "PAC Url"
msgstr ""
-#: ../clients/cli/connections.c:4567
-#, fuzzy, c-format
-msgid "Error: 'multi-queue': %s.\n"
-msgstr "錯誤:「mode」:%s。"
-
-#. Ask for optional 'ip-tunnel' arguments.
-#: ../clients/cli/connections.c:4581
-msgid "IP Tunnel"
+#: ../clients/cli/connections.c:4333
+msgid "PAC Script"
msgstr ""
-#: ../clients/cli/connections.c:4586
-#, fuzzy
-msgid "Local endpoint [none]: "
-msgstr "父介面卡 [none]:"
-
-#: ../clients/cli/connections.c:4592
-#, fuzzy, c-format
-msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
-msgstr "錯誤:「%s」:「%s」不是個有效的 %s MAC 位址。"
-
-#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
-#, c-format
-msgid "Error: <setting>.<property> argument is missing."
-msgstr "錯誤:<setting>.<property> 引數遺失。"
-
-#: ../clients/cli/connections.c:4663
+#: ../clients/cli/connections.c:4468
#, fuzzy, c-format
msgid "Error: value for '%s' is missing."
msgstr "錯誤:找不到 '%s' 選項的欄位。"
-#: ../clients/cli/connections.c:4681
-#, c-format
-msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "錯誤:無效的 <setting>.<property> '%s'。"
+#: ../clients/cli/connections.c:4513
+msgid "Error: <setting>.<property> argument is missing."
+msgstr "錯誤:<setting>.<property> 引數遺失。"
-#: ../clients/cli/connections.c:4689
+#: ../clients/cli/connections.c:4536
#, c-format
msgid "Error: invalid or not allowed setting '%s': %s."
msgstr "錯誤:設定「%s」無效或不被允許:%s。"
-#: ../clients/cli/connections.c:4700
+#: ../clients/cli/connections.c:4560
#, fuzzy, c-format
-msgid "Error: don't know how to create '%s' setting."
-msgstr "錯誤:無法取得系統設定。"
-
-#: ../clients/cli/connections.c:4710
-#, c-format
-msgid "Error: invalid property '%s': %s."
-msgstr "錯誤:無效的內容「%s」:%s。"
+msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
+msgstr "「%s」意義含糊不清(%s x %s)"
-#: ../clients/cli/connections.c:4722
+#: ../clients/cli/connections.c:4574
#, c-format
-msgid "Error: failed to modify %s.%s: %s."
-msgstr "錯誤:無法修改 %s.%s:%s。"
+msgid "Error: invalid <setting>.<property> '%s'."
+msgstr "錯誤:無效的 <setting>.<property> '%s'。"
-#: ../clients/cli/connections.c:4741
+#: ../clients/cli/connections.c:4615 ../clients/cli/connections.c:8093
#, fuzzy, c-format
-msgid "Error: failed to remove a value from %s.%s: %s."
-msgstr "錯誤:移除「%s」的值失敗:%s\n"
-
-#: ../clients/cli/connections.c:4775
-#, c-format
-msgid ""
-"Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
-msgstr ""
-
-#: ../clients/cli/connections.c:4783
-#, fuzzy
-msgid "Error: redundant 'master' option."
-msgstr "錯誤:'%s' 選項的引數遺失。"
-
-#: ../clients/cli/connections.c:4796
-msgid "Error: 'master' is required."
-msgstr "錯誤:需要「mater」。"
+msgid "Error: Failed to add '%s' connection: %s"
+msgstr "錯誤:無法新增「%s」連線:(%d) %s"
-#: ../clients/cli/connections.c:4950
+#: ../clients/cli/connections.c:4620
#, c-format
-msgid "Error: 'parent': not valid without 'p-key'."
-msgstr "錯誤:「parent」:缺少「p-key」無效。"
-
-#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
-msgid "SSID: "
-msgstr "SSID:"
-
-#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
-msgid "Error: 'ssid' is required."
-msgstr "錯誤:需要「ssid」。"
-
-#: ../clients/cli/connections.c:5072
-msgid "WiMAX NSP name: "
-msgstr "WiMAX NSP 名稱:"
-
-#: ../clients/cli/connections.c:5075
-msgid "Error: 'nsp' is required."
-msgstr "錯誤:需要「nsp」。"
-
-#: ../clients/cli/connections.c:5127
-msgid "PPPoE username: "
-msgstr "PPPoE 使用者名稱:"
-
-#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
-msgid "Error: 'username' is required."
-msgstr "錯誤:需要「username」。"
-
-#: ../clients/cli/connections.c:5199
-msgid "APN: "
-msgstr "APN:"
-
-#: ../clients/cli/connections.c:5202
-msgid "Error: 'apn' is required."
-msgstr "錯誤:需要「apn」。"
-
-#: ../clients/cli/connections.c:5260
-msgid "Bluetooth device address: "
-msgstr "藍牙裝置位址:"
-
-#: ../clients/cli/connections.c:5263
-msgid "Error: 'addr' is required."
-msgstr "錯誤:需要「addr」。"
+msgid "Connection '%s' (%s) successfully added.\n"
+msgstr "連線「%s」 (%s) 已成功新增。\n"
-#: ../clients/cli/connections.c:5304
+#: ../clients/cli/connections.c:4738
#, c-format
-msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
-msgstr "錯誤:「bt-type」:「%s」無效;請使用 [%s, %s (%s), %s]。"
-
-#: ../clients/cli/connections.c:5348
-msgid "VLAN parent device or connection UUID: "
-msgstr "VLAN 父裝置或連線 UUID:"
-
-#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
-msgid "Error: 'dev' is required."
-msgstr "錯誤:需要「dev」。"
-
-#: ../clients/cli/connections.c:5355
-#, fuzzy
-msgid "VLAN ID <0-4094>: "
-msgstr "VLAN ID <0-4095>:"
-
-#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
-msgid "Error: 'id' is required."
-msgstr "錯誤:需要「id」。"
+msgid ""
+"You can specify this option more than once. Press <Enter> when you're done.\n"
+msgstr ""
-#: ../clients/cli/connections.c:5364
+#. Ask for optional arguments.
+#: ../clients/cli/connections.c:4776
#, fuzzy, c-format
-msgid "Error: 'id': '%s' is not valid; use <0-4094>."
-msgstr "錯誤:「id」:「%s」無效;請使用 <0-4095>。"
-
-#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
-#, c-format
-msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
-msgstr "錯誤:「dev」:「%s」不是 UUID、介面卡名稱,或是 MAC。"
-
-#: ../clients/cli/connections.c:5506
-#, c-format
-msgid "Error: 'mode': %s."
-msgstr "錯誤:「mode」:%s。"
-
-#: ../clients/cli/connections.c:5515
-#, c-format
-msgid "Error: 'primary': '%s' is not a valid interface name."
-msgstr "錯誤:「primary」:「%s」不是組有效的介面卡名稱。"
-
-#: ../clients/cli/connections.c:5738
-#, c-format
-msgid "Error: 'stp': %s."
-msgstr "錯誤:「stp」:%s。"
+msgid "There is %d optional setting for %s.\n"
+msgid_plural "There are %d optional settings for %s.\n"
+msgstr[0] "「%s」的連線類型有一個選用引數。\n"
-#: ../clients/cli/connections.c:5747
+#: ../clients/cli/connections.c:4779
#, fuzzy, c-format
-msgid "Error: 'multicast-snooping': %s."
-msgstr "錯誤:「stp」:%s。"
-
-#: ../clients/cli/connections.c:5866
-#, c-format
-msgid "Error: 'hairpin': %s."
-msgstr "錯誤:「hairpin」:%s。"
+msgid "Do you want to provide it? %s"
+msgid_plural "Do you want to provide them? %s"
+msgstr[0] "您是否希望提供它?(yes/no)[yes]"
-#: ../clients/cli/connections.c:5915
-msgid "Error: 'vpn-type' is required."
-msgstr "錯誤:需要「vpn-type」。"
+#: ../clients/cli/connections.c:4793
+#, fuzzy
+msgid "Wired Ethernet"
+msgstr "Ethernet"
-#: ../clients/cli/connections.c:5922
-#, fuzzy, c-format
-msgid "Warning: 'vpn-type': %s not known.\n"
-msgstr "錯誤:「vpn-type」:%s。"
+#: ../clients/cli/connections.c:4795 ../src/devices/nm-device-infiniband.c:186
+#, fuzzy
+msgid "InfiniBand connection"
+msgstr "InfiniBand 連線 %d"
-#: ../clients/cli/connections.c:5983
-#, c-format
-msgid "Error: 'channel': '%s' is not valid; use <1-13>."
-msgstr "錯誤:「channel」:「%s」無效;請使用 <1-13>。"
+#: ../clients/cli/connections.c:4797
+#, fuzzy
+msgid "Wi-Fi connection"
+msgstr "Wi-Fi 連線 %d"
-#: ../clients/cli/connections.c:6034
-msgid "Username: "
-msgstr "使用者名稱:"
+#: ../clients/cli/connections.c:4799
+#, fuzzy
+msgid "WiMAX connection"
+msgstr "CDMA 連線 %d"
-#: ../clients/cli/connections.c:6043
-#, c-format
-msgid "Protocol %s"
+#: ../clients/cli/connections.c:4801
+msgid "PPPoE"
msgstr ""
-#: ../clients/cli/connections.c:6046
+#: ../clients/cli/connections.c:4803
#, fuzzy
-msgid "Error: 'protocol' is required."
-msgstr "錯誤:需要「nsp」。"
+msgid "CDMA mobile broadband connection"
+msgstr "行動寬頻連線 %d"
-#: ../clients/cli/connections.c:6105
+#: ../clients/cli/connections.c:4805
#, fuzzy
-msgid "MACVLAN parent device or connection UUID: "
-msgstr "VLAN 父裝置或連線 UUID:"
+msgid "GSM mobile broadband connection"
+msgstr "行動寬頻連線 %d"
-#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
-#: ../clients/cli/connections.c:6307
+#: ../clients/cli/connections.c:4807
#, fuzzy
-msgid "Error: 'mode' is required."
-msgstr "錯誤:需要「dev」。"
+msgid "bluetooth connection"
+msgstr "Bond 連線 %d"
-#: ../clients/cli/connections.c:6131
+#: ../clients/cli/connections.c:4809 ../src/devices/nm-device-vlan.c:432
#, fuzzy
-msgid "Error: 'mode' is not valid."
-msgstr "錯誤:「dev」指令「%s」不合乎規定。"
-
-#: ../clients/cli/connections.c:6144
-#, fuzzy, c-format
-msgid "Error: 'tap': %s."
-msgstr "錯誤:「stp」:%s。"
-
-#: ../clients/cli/connections.c:6230
-#, fuzzy, c-format
-msgid "Error: 'pi': %s."
-msgstr "錯誤:「stp」:%s。"
-
-#: ../clients/cli/connections.c:6241
-#, fuzzy, c-format
-msgid "Error: 'vnet-hdr': %s."
-msgstr "錯誤:「vpn-type」:%s。"
-
-#: ../clients/cli/connections.c:6252
-#, fuzzy, c-format
-msgid "Error: 'multi-queue': %s."
-msgstr "錯誤:「mode」:%s。"
-
-#: ../clients/cli/connections.c:6321
-#, fuzzy, c-format
-msgid "Error: 'mode': '%s' is not valid, use one of %s"
-msgstr "錯誤:「%s」:「%s」無效;%s"
-
-#: ../clients/cli/connections.c:6327
-msgid "Remote endpoint: "
-msgstr ""
+msgid "VLAN connection"
+msgstr "VLAN 連線 %d"
-#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
+#: ../clients/cli/connections.c:4811
#, fuzzy
-msgid "Error: 'remote' is required."
-msgstr "錯誤:需要「mater」。"
-
-#: ../clients/cli/connections.c:6337
-#, fuzzy, c-format
-msgid "Error: 'remote': '%s' is not valid; must be an IP address"
-msgstr "錯誤:「%s」:「%s」不是個有效的 %s MAC 位址。"
-
-#: ../clients/cli/connections.c:6351
-#, fuzzy, c-format
-msgid "Error: 'local': '%s' is not valid; must be an IP address"
-msgstr "錯誤:「%s」:「%s」不是個有效的 %s MAC 位址。"
+msgid "Bond device"
+msgstr "Ethernet"
-#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
-#, fuzzy, c-format
-msgid "Error: 'dev': '%s' is neither UUID nor interface name."
-msgstr "錯誤:「dev」:「%s」不是 UUID、介面卡名稱,或是 MAC。"
+#: ../clients/cli/connections.c:4813
+#, fuzzy
+msgid "Team device"
+msgstr "裝置已移除"
-#: ../clients/cli/connections.c:6421
+#: ../clients/cli/connections.c:4815
#, fuzzy
-msgid "VXLAN ID: "
-msgstr "VLAN ID <0-4095>:"
+msgid "Team port"
+msgstr "Team"
-#: ../clients/cli/connections.c:6429
+#: ../clients/cli/connections.c:4817
#, fuzzy
-msgid "Remote: "
-msgstr "移除"
+msgid "Bridge device"
+msgstr "Ethernet"
-#: ../clients/cli/connections.c:6438
-#, fuzzy, c-format
-msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
-msgstr "錯誤:「id」:「%s」無效;請使用 <0-4095>。"
+#: ../clients/cli/connections.c:4819
+#, fuzzy
+msgid "Bridge port"
+msgstr "橋接"
-#: ../clients/cli/connections.c:6464
-#, fuzzy, c-format
-msgid "Error: 'remote': '%s' is not a valid IP address"
-msgstr "錯誤:「%s」:「%s」不是個有效的 %s MAC 位址。"
+#: ../clients/cli/connections.c:4821 ../src/nm-manager.c:3824
+#, fuzzy
+msgid "VPN connection"
+msgstr "VPN 連線"
-#: ../clients/cli/connections.c:6473
-#, fuzzy, c-format
-msgid "Error: 'local': '%s' is not a valid IP address"
-msgstr "錯誤:「%s」:「%s」不是個有效的 %s MAC 位址。"
+#: ../clients/cli/connections.c:4823
+#, fuzzy
+msgid "OLPC Mesh connection"
+msgstr "CDMA 連線 %d"
-#: ../clients/cli/connections.c:6482
-#, fuzzy, c-format
-msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
-msgstr "錯誤:「id」:「%s」無效;請使用 <0-4095>。"
+#: ../clients/cli/connections.c:4825 ../src/devices/adsl/nm-device-adsl.c:137
+#, fuzzy
+msgid "ADSL connection"
+msgstr "ADSL 連線 %d"
-#: ../clients/cli/connections.c:6491
-#, fuzzy, c-format
-msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
-msgstr "錯誤:「flags」:「%s」無效;使用 <0-7>。"
+#: ../clients/cli/connections.c:4827
+#, fuzzy
+msgid "macvlan connection"
+msgstr "Bond 連線 %d"
-#: ../clients/cli/connections.c:6500
-#, fuzzy, c-format
-msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
-msgstr "錯誤:「id」:「%s」無效;請使用 <0-4095>。"
+#: ../clients/cli/connections.c:4829 ../src/devices/nm-device-vxlan.c:369
+#, fuzzy
+msgid "VXLAN connection"
+msgstr "VLAN 連線 %d"
-#: ../clients/cli/connections.c:6540
-#, c-format
-msgid "Error: '%s' is not a valid connection type."
-msgstr "錯誤:「%s」不是個有效的連線類型。"
+#: ../clients/cli/connections.c:4831
+#, fuzzy
+msgid "Tun device"
+msgstr "裝置已移除"
-#: ../clients/cli/connections.c:6581
-#, c-format
-msgid "Error: IPv4 gateway specified without IPv4 addresses"
+#: ../clients/cli/connections.c:4833
+msgid "IPv4 protocol"
msgstr ""
-#: ../clients/cli/connections.c:6585
-#, fuzzy, c-format
-msgid "Error: multiple IPv4 gateways specified"
-msgstr "錯誤:尚未指定介面卡。"
-
-#: ../clients/cli/connections.c:6589
-#, fuzzy, c-format
-msgid "Error: Invalid IPv4 gateway '%s'"
-msgstr "無效的閘道器「%s」"
-
-#: ../clients/cli/connections.c:6614
-#, c-format
-msgid "Error: IPv6 gateway specified without IPv6 addresses"
+#: ../clients/cli/connections.c:4835
+msgid "IPv6 protocol"
msgstr ""
-#: ../clients/cli/connections.c:6618
-#, fuzzy, c-format
-msgid "Error: multiple IPv6 gateways specified"
-msgstr "錯誤:尚未指定介面卡。"
-
-#: ../clients/cli/connections.c:6622
-#, fuzzy, c-format
-msgid "Error: Invalid IPv6 gateway '%s'"
-msgstr "無效的閘道器「%s」"
-
-#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
-#, fuzzy, c-format
-msgid "Error: Failed to add '%s' connection: %s"
-msgstr "錯誤:無法新增「%s」連線:(%d) %s"
-
-#: ../clients/cli/connections.c:6675
-#, c-format
-msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "連線「%s」 (%s) 已成功新增。\n"
-
-#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
-#, c-format
-msgid "Error: 'type' argument is required."
-msgstr "錯誤:需要「type」引數。"
-
-#: ../clients/cli/connections.c:6959
-#, c-format
-msgid "Error: invalid connection type; %s."
-msgstr "錯誤:無效的連線類型;%s。"
+#: ../clients/cli/connections.c:4837
+msgid "Proxy"
+msgstr ""
-#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
+#: ../clients/cli/connections.c:4920 ../clients/cli/utils.c:122
#, c-format
-msgid "Error: 'autoconnect': %s."
-msgstr "錯誤:「autoconnect」:%s。"
+msgid "Error: value for '%s' argument is required."
+msgstr "錯誤:「%s」引數需要有個值。"
-#: ../clients/cli/connections.c:6978
+#: ../clients/cli/connections.c:4926
#, fuzzy, c-format
msgid "Error: 'save': %s."
msgstr "錯誤:「stp」:%s。"
-#: ../clients/cli/connections.c:6995
-msgid "Interface name [*]: "
-msgstr "介面卡名稱 [*]:"
-
-#: ../clients/cli/connections.c:7000
-#, c-format
-msgid "Error: 'ifname' argument is required."
-msgstr "錯誤:需要「ifname」引數。"
-
-#: ../clients/cli/connections.c:7002
-#, c-format
-msgid "Error: mandatory 'ifname' not seen before '%s'."
-msgstr ""
-
-#: ../clients/cli/connections.c:7011
-#, c-format
-msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
-msgstr "錯誤:「ifname」:「%s」不是個有效的介面卡或是「*」。"
+#: ../clients/cli/connections.c:4998
+#, fuzzy, c-format
+msgid "Error: '%s' argument is required."
+msgstr "錯誤:需要「type」引數。"
-#: ../clients/cli/connections.c:8035
+#: ../clients/cli/connections.c:5968
#, c-format
msgid "['%s' setting values]\n"
msgstr "[「%s」設定值]\n"
#. TRANSLATORS: do not translate command names and keywords before ::
#. * However, you should translate terms enclosed in <>.
-#.
-#: ../clients/cli/connections.c:8117
+#.
+#: ../clients/cli/connections.c:6050
#, fuzzy, c-format
msgid ""
"---[ Main menu ]---\n"
@@ -2745,7 +2418,7 @@ msgstr ""
"nmcli <conf-option> <value> :: nmcli 配置\n"
"quit :: 退出 nmcli\n"
-#: ../clients/cli/connections.c:8144
+#: ../clients/cli/connections.c:6077
#, c-format
msgid ""
"goto <setting>[.<prop>] | <prop> :: enter setting/property for editing\n"
@@ -2764,12 +2437,13 @@ msgstr ""
" nmcli connection> goto secondaries\n"
" nmcli> goto ipv4.addresses\n"
-#: ../clients/cli/connections.c:8151
+#: ../clients/cli/connections.c:6084
#, c-format
msgid ""
"remove <setting>[.<prop>] :: remove setting or reset property value\n"
"\n"
-"This command removes an entire setting from the connection, or if a property\n"
+"This command removes an entire setting from the connection, or if a "
+"property\n"
"is given, resets that property to the default value.\n"
"\n"
"Examples: nmcli> remove wifi-sec\n"
@@ -2783,7 +2457,7 @@ msgstr ""
"範例:nmcli> remove wifi-sec\n"
" nmcli> remove eth.mtu\n"
-#: ../clients/cli/connections.c:8158
+#: ../clients/cli/connections.c:6091
#, c-format
msgid ""
"set [<setting>.<prop> <value>] :: set property value\n"
@@ -2798,7 +2472,7 @@ msgstr ""
"\n"
"範例:nmcli> set con.id My connection\n"
-#: ../clients/cli/connections.c:8163
+#: ../clients/cli/connections.c:6096
#, c-format
msgid ""
"describe [<setting>.<prop>] :: describe property\n"
@@ -2808,9 +2482,10 @@ msgid ""
msgstr ""
"describe [<setting>.<prop>] :: 描述內容\n"
"\n"
-"顯示內容的描述。您可查看 nm-settings(5) man page,以檢視所有的 NM 設定和內容屬性。\n"
+"顯示內容的描述。您可查看 nm-settings(5) man page,以檢視所有的 NM 設定和內容"
+"屬性。\n"
-#: ../clients/cli/connections.c:8168
+#: ../clients/cli/connections.c:6101
#, c-format
msgid ""
"print [all] :: print setting or connection values\n"
@@ -2818,19 +2493,21 @@ msgid ""
"Shows current property or the whole connection.\n"
"\n"
"Example: nmcli ipv4> print all\n"
-msgstr "print [all] :: 印出設定或是連線值\n"
+msgstr ""
+"print [all] :: 印出設定或是連線值\n"
"\n"
"顯示目前的內容或是整個連線。\n"
"\n"
"範例:nmcli ipv4> print all\n"
-#: ../clients/cli/connections.c:8173
+#: ../clients/cli/connections.c:6106
#, fuzzy, c-format
msgid ""
"verify [all | fix] :: verify setting or connection validity\n"
"\n"
"Verifies whether the setting or connection is valid and can be saved later.\n"
-"It indicates invalid values on error. Some errors may be fixed automatically\n"
+"It indicates invalid values on error. Some errors may be fixed "
+"automatically\n"
"by 'fix' option.\n"
"\n"
"Examples: nmcli> verify\n"
@@ -2844,7 +2521,7 @@ msgstr ""
"範例:nmcli> verify\n"
" nmcli bond> verify\n"
-#: ../clients/cli/connections.c:8182
+#: ../clients/cli/connections.c:6115
#, c-format
msgid ""
"save [persistent|temporary] :: save the connection\n"
@@ -2860,7 +2537,7 @@ msgid ""
"profile must be deleted.\n"
msgstr ""
-#: ../clients/cli/connections.c:8193
+#: ../clients/cli/connections.c:6126
#, c-format
msgid ""
"activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n"
@@ -2878,23 +2555,28 @@ msgstr ""
"\n"
"可用選項:\n"
"<ifname> - 連線將會被啟用於的裝置\n"
-" /<ap>|<nsp> - AP(Wi-Fi)或是 NSP(WiMAX)(當未指定 <ifname> 時,以 / 作為前置)\n"
+" /<ap>|<nsp> - AP(Wi-Fi)或是 NSP(WiMAX)(當未指定 <ifname> 時,以 / 作為"
+"前置)\n"
-#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
+#: ../clients/cli/connections.c:6133 ../clients/cli/connections.c:6292
#, c-format
-msgid "back :: go to upper menu level\n"
+msgid ""
+"back :: go to upper menu level\n"
"\n"
-msgstr "back :: 往上返回上一層的選單\n"
+msgstr ""
+"back :: 往上返回上一層的選單\n"
"\n"
-#: ../clients/cli/connections.c:8203
+#: ../clients/cli/connections.c:6136
#, c-format
-msgid "help/? [<command>] :: help for the nmcli commands\n"
+msgid ""
+"help/? [<command>] :: help for the nmcli commands\n"
"\n"
-msgstr "help/? [<command>] :: nmcli 指令的協助\n"
+msgstr ""
+"help/? [<command>] :: nmcli 指令的協助\n"
"\n"
-#: ../clients/cli/connections.c:8206
+#: ../clients/cli/connections.c:6139
#, fuzzy, c-format
msgid ""
"nmcli [<conf-option> <value>] :: nmcli configuration\n"
@@ -2920,27 +2602,28 @@ msgstr ""
" nmcli> nmcli save-confirmation no\n"
" nmcli> nmcli prompt-color 3\n"
-#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
+#: ../clients/cli/connections.c:6161 ../clients/cli/connections.c:6298
#, c-format
msgid ""
"quit :: exit nmcli\n"
"\n"
"This command exits nmcli. When the connection being edited is not saved, the "
"user is asked to confirm the action.\n"
-msgstr "quit :: 退出 nmcli\n"
+msgstr ""
+"quit :: 退出 nmcli\n"
"\n"
"這項指令會退出 nmcli。當被編輯的連線尚未儲存時,使用者會被要求確認動作。\n"
-#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
-#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
+#: ../clients/cli/connections.c:6166 ../clients/cli/connections.c:6303
+#: ../clients/cli/connections.c:6723 ../clients/cli/connections.c:7675
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "不明的指令:「%s」\n"
#. TRANSLATORS: do not translate command names and keywords before ::
#. * However, you should translate terms enclosed in <>.
-#.
-#: ../clients/cli/connections.c:8299
+#.
+#: ../clients/cli/connections.c:6232
#, c-format
msgid ""
"---[ Property menu ]---\n"
@@ -2966,17 +2649,18 @@ msgstr ""
"help/? [<command>] :: 印出此協助或指令描述\n"
"quit :: 退出 nmcli\n"
-#: ../clients/cli/connections.c:8324
+#: ../clients/cli/connections.c:6257
#, c-format
msgid ""
"set [<value>] :: set new value\n"
"\n"
"This command sets provided <value> to this property\n"
-msgstr "set [<value>] :: 設定新的值\n"
+msgstr ""
+"set [<value>] :: 設定新的值\n"
"\n"
"這項指令會將提供的 <value> 設置至此內容\n"
-#: ../clients/cli/connections.c:8328
+#: ../clients/cli/connections.c:6261
#, fuzzy, c-format
msgid ""
"add [<value>] :: append new value to the property\n"
@@ -2987,19 +2671,21 @@ msgid ""
msgstr ""
"add [<value>] :: 新增選項至內容\n"
"\n"
-"這項指令會將提供的 <value> 新增至此內容(若這項內容乃 container 類型的話)。若是單值的內容,它會將值替換掉(和「set」相同)。\n"
+"這項指令會將提供的 <value> 新增至此內容(若這項內容乃 container 類型的話)。"
+"若是單值的內容,它會將值替換掉(和「set」相同)。\n"
-#: ../clients/cli/connections.c:8334
+#: ../clients/cli/connections.c:6267
#, c-format
msgid ""
"change :: change current value\n"
"\n"
"Displays current value and allows editing it.\n"
-msgstr "change :: 更改目前的值\n"
+msgstr ""
+"change :: 更改目前的值\n"
"\n"
"顯示目前的值,並允許對其進行編輯。\n"
-#: ../clients/cli/connections.c:8338
+#: ../clients/cli/connections.c:6271
#, c-format
msgid ""
"remove [<value>|<index>|<option name>] :: delete the value\n"
@@ -3019,7 +2705,7 @@ msgid ""
"\n"
msgstr ""
-#: ../clients/cli/connections.c:8349
+#: ../clients/cli/connections.c:6282
#, c-format
msgid ""
"describe :: describe property\n"
@@ -3029,9 +2715,10 @@ msgid ""
msgstr ""
"describe :: 描述內容\n"
"\n"
-"顯示內容的描述。您可查看 nm-settings(5) man page 以檢視所有的 NM 設定和內容。\n"
+"顯示內容的描述。您可查看 nm-settings(5) man page 以檢視所有的 NM 設定和內"
+"容。\n"
-#: ../clients/cli/connections.c:8354
+#: ../clients/cli/connections.c:6287
#, c-format
msgid ""
"print [property|setting|connection] :: print property (setting, connection) "
@@ -3044,980 +2731,963 @@ msgstr ""
"\n"
"顯示內容的值。提供一項引數,您亦可顯示整個設定或是連線的值。\n"
-#: ../clients/cli/connections.c:8362
+#: ../clients/cli/connections.c:6295
#, c-format
-msgid "help/? [<command>] :: help for nmcli commands\n"
+msgid ""
+"help/? [<command>] :: help for nmcli commands\n"
"\n"
-msgstr "help/? [<command>] :: nmcli 指令的協助\n"
+msgstr ""
+"help/? [<command>] :: nmcli 指令的協助\n"
"\n"
-#: ../clients/cli/connections.c:8460
+#: ../clients/cli/connections.c:6388
#, c-format
msgid "Error: Connection activation failed.\n"
msgstr "錯誤:連線啟用失敗。\n"
-#: ../clients/cli/connections.c:8543
+#: ../clients/cli/connections.c:6472
#, c-format
msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
msgstr "錯誤:設定「%s」乃必要的,並且不可移除。\n"
#. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:8561
+#: ../clients/cli/connections.c:6490
#, fuzzy, c-format
msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
msgstr "[ Connection type: %s | name: %s | UUID: %s | dirty: %s ]\n"
-#: ../clients/cli/connections.c:8597
+#: ../clients/cli/connections.c:6526
#, fuzzy, c-format
msgid "The connection is not saved. Do you really want to quit? %s"
msgstr "連線尚未儲存。您是否真的希望退出?[y/n]\n"
-#: ../clients/cli/connections.c:8646
+#: ../clients/cli/connections.c:6575
#, c-format
msgid ""
"The connection profile has been removed from another client. You may type "
"'save' in the main menu to restore it.\n"
-msgstr "連線設定檔已經從另一個客戶端上移除。您可以在主選單輸入「儲存」來復原。\n"
+msgstr ""
+"連線設定檔已經從另一個客戶端上移除。您可以在主選單輸入「儲存」來復原。\n"
-#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
-#: ../clients/cli/connections.c:9151
+#: ../clients/cli/connections.c:6600 ../clients/cli/connections.c:7021
+#: ../clients/cli/connections.c:7079
#, c-format
msgid "Allowed values for '%s' property: %s\n"
msgstr "「%s」內容所能使用的值:%s\n"
-#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
-#: ../clients/cli/connections.c:9155
+#: ../clients/cli/connections.c:6604 ../clients/cli/connections.c:7025
+#: ../clients/cli/connections.c:7083
#, c-format
msgid "Enter '%s' value: "
msgstr "輸入「%s」的值:"
-#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
-#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
+#: ../clients/cli/connections.c:6619 ../clients/cli/connections.c:6641
+#: ../clients/cli/connections.c:7029 ../clients/cli/connections.c:7088
#, c-format
msgid "Error: failed to set '%s' property: %s\n"
msgstr "錯誤:設置「%s」內容失敗:%s\n"
-#: ../clients/cli/connections.c:8706
+#: ../clients/cli/connections.c:6635
#, c-format
msgid "Edit '%s' value: "
msgstr "編輯「%s」的值:"
-#: ../clients/cli/connections.c:8735
+#: ../clients/cli/connections.c:6664
#, c-format
msgid "Error: %s\n"
msgstr "錯誤:%s\n"
-#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
-#: ../clients/cli/connections.c:9290
+#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:7180
+#: ../clients/cli/connections.c:7228
#, c-format
msgid "Error: failed to remove value of '%s': %s\n"
msgstr "錯誤:移除「%s」的值失敗:%s\n"
-#: ../clients/cli/connections.c:8762
+#: ../clients/cli/connections.c:6691
#, c-format
msgid "Unknown command argument: '%s'\n"
msgstr "不明的檔案引數:「%s」\n"
-#: ../clients/cli/connections.c:8867
+#: ../clients/cli/connections.c:6796
#, c-format
msgid "Available settings: %s\n"
msgstr "可用設定:%s\n"
-#: ../clients/cli/connections.c:8879
+#: ../clients/cli/connections.c:6808
#, c-format
msgid "Error: invalid setting name; %s\n"
msgstr "錯誤:無效的設定名稱;%s\n"
-#: ../clients/cli/connections.c:8896
+#: ../clients/cli/connections.c:6825
#, c-format
msgid "Available properties: %s\n"
msgstr "可用的內容:%s\n"
-#: ../clients/cli/connections.c:8904
+#: ../clients/cli/connections.c:6833
#, c-format
msgid "Error: property %s\n"
msgstr "錯誤:內容 %s\n"
-#: ../clients/cli/connections.c:8945
+#: ../clients/cli/connections.c:6874
#, fuzzy, c-format
msgid ""
"Saving the connection with 'autoconnect=yes'. That might result in an "
"immediate activation of the connection.\n"
"Do you still want to save? %s"
-msgstr "以「autoconnect=yes」儲存連線。這可能會即刻將連線啟用。\n"
+msgstr ""
+"以「autoconnect=yes」儲存連線。這可能會即刻將連線啟用。\n"
"您是否還是希望儲存?[是]"
-#: ../clients/cli/connections.c:9035
+#: ../clients/cli/connections.c:6963
#, c-format
msgid "You may edit the following settings: %s\n"
msgstr "您可編輯以下設定:%s\n"
-#: ../clients/cli/connections.c:9063
+#: ../clients/cli/connections.c:6991
#, c-format
msgid ""
"The connection profile has been removed from another client. You may type "
"'save' to restore it.\n"
msgstr "連線設定檔已經從另一個客戶端上移除。您可輸入「儲存」來復原。\n"
-#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
+#: ../clients/cli/connections.c:7033 ../clients/cli/connections.c:7273
#, c-format
msgid "Error: no setting selected; valid are [%s]\n"
msgstr "錯誤:尚未選擇設定;有效的值爲「%s」\n"
-#: ../clients/cli/connections.c:9106
+#: ../clients/cli/connections.c:7034
#, c-format
msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
msgstr "先使用「goto <setting>」,或是「set <setting>.<property>」\n"
-#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
-#: ../clients/cli/connections.c:9357
+#: ../clients/cli/connections.c:7048 ../clients/cli/connections.c:7207
+#: ../clients/cli/connections.c:7295
#, c-format
msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
msgstr "錯誤:無效的設定引數「%s」;有效的值爲「%s」\n"
-#: ../clients/cli/connections.c:9130
+#: ../clients/cli/connections.c:7058
#, c-format
msgid "Error: missing setting for '%s' property\n"
msgstr "錯誤:「%s」內容的設定遺失\n"
-#: ../clients/cli/connections.c:9137
+#: ../clients/cli/connections.c:7065
#, c-format
msgid "Error: invalid property: %s\n"
msgstr "錯誤:無效的內容:%s\n"
-#: ../clients/cli/connections.c:9190
+#: ../clients/cli/connections.c:7118
#, c-format
msgid "Error: unknown setting '%s'\n"
msgstr "錯誤:「%s」設定不明\n"
-#: ../clients/cli/connections.c:9203
+#: ../clients/cli/connections.c:7141
#, c-format
msgid "You may edit the following properties: %s\n"
msgstr "您可編輯下列內容:%s\n"
-#: ../clients/cli/connections.c:9247
+#: ../clients/cli/connections.c:7185
#, c-format
msgid "Error: no argument given; valid are [%s]\n"
msgstr "錯誤:尚未提供引數;有效的值爲「%s」\n"
-#: ../clients/cli/connections.c:9266
+#: ../clients/cli/connections.c:7204
#, c-format
msgid "Setting '%s' is not present in the connection.\n"
msgstr "設定「%s」不存在連線中。\n"
-#: ../clients/cli/connections.c:9311
+#: ../clients/cli/connections.c:7249
#, c-format
msgid "Error: %s properties, nor it is a setting name.\n"
msgstr "錯誤:%s 內容,它也不是組設定名稱。\n"
-#: ../clients/cli/connections.c:9336
+#: ../clients/cli/connections.c:7274
#, c-format
msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
msgstr "先使用「goto <setting>」,或是「describe <setting>.<property>」\n"
-#: ../clients/cli/connections.c:9385
+#: ../clients/cli/connections.c:7323
#, c-format
msgid "Error: invalid property: %s, neither a valid setting name.\n"
msgstr "錯誤:無效的內容:%s,也不是組有效的設定名稱。\n"
-#: ../clients/cli/connections.c:9417
+#: ../clients/cli/connections.c:7355
#, c-format
msgid "Error: unknown setting: '%s'\n"
msgstr "錯誤:不明的設定:「%s」\n"
-#: ../clients/cli/connections.c:9422
+#: ../clients/cli/connections.c:7360
#, fuzzy, c-format
msgid "Error: '%s' setting not present in the connection\n"
msgstr "設定「%s」不存在連線中。\n"
-#: ../clients/cli/connections.c:9450
+#: ../clients/cli/connections.c:7388
#, fuzzy, c-format
msgid "Error: invalid property: %s%s\n"
msgstr "錯誤:無效的內容:%s\n"
-#: ../clients/cli/connections.c:9452
+#: ../clients/cli/connections.c:7390
#, fuzzy
msgid ", neither a valid setting name"
msgstr "錯誤:無效的內容:%s,也不是組有效的設定名稱。\n"
-#: ../clients/cli/connections.c:9469
+#: ../clients/cli/connections.c:7407
#, fuzzy, c-format
msgid "Invalid verify option: %s\n"
msgstr "無效的選項「%s」"
-#: ../clients/cli/connections.c:9477
+#: ../clients/cli/connections.c:7415
#, c-format
msgid "Verify setting '%s': %s\n"
msgstr "驗證設定「%s」:%s\n"
-#: ../clients/cli/connections.c:9492
+#: ../clients/cli/connections.c:7430
#, c-format
msgid "Verify connection: %s\n"
msgstr "驗證連線:%s\n"
-#: ../clients/cli/connections.c:9495
+#: ../clients/cli/connections.c:7433
#, c-format
msgid "The error cannot be fixed automatically.\n"
msgstr ""
-#: ../clients/cli/connections.c:9512
+#: ../clients/cli/connections.c:7450
#, fuzzy, c-format
msgid "Error: invalid argument '%s'\n"
msgstr "錯誤:無效的額外引數「%s」。"
-#: ../clients/cli/connections.c:9545
+#: ../clients/cli/connections.c:7482
#, fuzzy, c-format
msgid "Error: Failed to save '%s' (%s) connection: %s\n"
msgstr "錯誤:儲存「%s」(%s)連線失敗:(%d) %s\n"
-#: ../clients/cli/connections.c:9552
+#: ../clients/cli/connections.c:7489
#, c-format
msgid "Connection '%s' (%s) successfully saved.\n"
msgstr "連線「%s」(%s) 已成功儲存。\n"
-#: ../clients/cli/connections.c:9553
+#: ../clients/cli/connections.c:7490
#, fuzzy, c-format
msgid "Connection '%s' (%s) successfully updated.\n"
msgstr "連線「%s」 (%s) 已成功新增。\n"
-#: ../clients/cli/connections.c:9586
+#: ../clients/cli/connections.c:7522
#, c-format
msgid "Error: connection verification failed: %s\n"
msgstr "錯誤:連線驗證失敗:%s\n"
-#: ../clients/cli/connections.c:9587
+#: ../clients/cli/connections.c:7523
msgid "(unknown error)"
msgstr "(不明錯誤)"
-#: ../clients/cli/connections.c:9588
+#: ../clients/cli/connections.c:7524
#, c-format
msgid "You may try running 'verify fix' to fix errors.\n"
msgstr ""
-#: ../clients/cli/connections.c:9610
+#: ../clients/cli/connections.c:7546
#, c-format
msgid "Error: connection is not saved. Type 'save' first.\n"
msgstr "錯誤:連線尚未儲存。請先輸入「save」。\n"
-#: ../clients/cli/connections.c:9614
+#: ../clients/cli/connections.c:7550
#, c-format
msgid "Error: connection is not valid: %s\n"
msgstr "錯誤:連線無效:%s\n"
-#: ../clients/cli/connections.c:9624
+#: ../clients/cli/connections.c:7560
#, c-format
msgid "Error: Cannot activate connection: %s.\n"
msgstr "錯誤:無法啟用連線:%s。\n"
-#: ../clients/cli/connections.c:9634
+#: ../clients/cli/connections.c:7569
#, fuzzy, c-format
msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
msgstr "錯誤:啟用「%s」(%s) 連線失敗:(%d) %s\n"
-#: ../clients/cli/connections.c:9640
-#, c-format
+#: ../clients/cli/connections.c:7575
msgid "Monitoring connection activation (press any key to continue)\n"
msgstr "監控連線啟用(按下任何鍵以繼續進行)\n"
-#: ../clients/cli/connections.c:9678
+#: ../clients/cli/connections.c:7611
#, c-format
msgid "Error: status-line: %s\n"
msgstr "錯誤:status-line:%s\n"
-#: ../clients/cli/connections.c:9686
+#: ../clients/cli/connections.c:7619
#, c-format
msgid "Error: save-confirmation: %s\n"
msgstr "錯誤:save-confirmation:%s\n"
-#: ../clients/cli/connections.c:9694
+#: ../clients/cli/connections.c:7627
#, fuzzy, c-format
msgid "Error: show-secrets: %s\n"
msgstr "錯誤:「show active」:%s"
-#: ../clients/cli/connections.c:9703
+#: ../clients/cli/connections.c:7636
#, fuzzy, c-format
msgid "Error: bad color: %s\n"
msgstr "錯誤:無效的內容:%s\n"
-#: ../clients/cli/connections.c:9717
+#: ../clients/cli/connections.c:7650
#, c-format
msgid "Current nmcli configuration:\n"
msgstr "目前的 nmcli 配置:\n"
-#: ../clients/cli/connections.c:9727
+#: ../clients/cli/connections.c:7660
#, c-format
msgid "Invalid configuration option '%s'; allowed [%s]\n"
msgstr "無效的配置選項「%s」;允許「%s」\n"
-#: ../clients/cli/connections.c:9982
+#: ../clients/cli/connections.c:7877
#, c-format
msgid "Error: only one of 'id', uuid, or 'path' can be provided."
msgstr "錯誤:只能提供「id」、uuid 或是「path」其中一項。"
-#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
-#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
-#: ../clients/cli/connections.c:10782
+#: ../clients/cli/connections.c:7889 ../clients/cli/connections.c:8050
#, c-format
msgid "Error: Unknown connection '%s'."
msgstr "錯誤:不明的連線「%s」。"
-#: ../clients/cli/connections.c:10012
+#: ../clients/cli/connections.c:7907
#, c-format
msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
msgstr "警告:正要編輯既有的連線「%s」;「type」引數已忽略\n"
-#: ../clients/cli/connections.c:10015
+#: ../clients/cli/connections.c:7910
#, c-format
msgid ""
"Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
msgstr "警告:正要編輯既有的連線「%s」;「con-name」引數已忽略\n"
-#: ../clients/cli/connections.c:10029
+#: ../clients/cli/connections.c:7924
#, c-format
msgid "Valid connection types: %s\n"
msgstr "有效的連線類型:%s\n"
-#: ../clients/cli/connections.c:10031
+#: ../clients/cli/connections.c:7926
#, c-format
msgid "Error: invalid connection type; %s\n"
msgstr "錯誤:無效的連線類型;%s\n"
-#: ../clients/cli/connections.c:10070
+#: ../clients/cli/connections.c:7965
#, c-format
msgid "===| nmcli interactive connection editor |==="
msgstr "===| nmcli 互動式連線編輯程式 |==="
-#: ../clients/cli/connections.c:10073
+#: ../clients/cli/connections.c:7968
#, c-format
msgid "Editing existing '%s' connection: '%s'"
msgstr "編輯既有的「%s」連線:「%s」"
-#: ../clients/cli/connections.c:10075
+#: ../clients/cli/connections.c:7970
#, c-format
msgid "Adding a new '%s' connection"
msgstr "新增一項「%s」連線"
-#: ../clients/cli/connections.c:10077
+#: ../clients/cli/connections.c:7972
#, c-format
msgid "Type 'help' or '?' for available commands."
msgstr "輸入「help」或是「?」以取得可用指令。"
-#: ../clients/cli/connections.c:10079
+#: ../clients/cli/connections.c:7974
#, c-format
msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
msgstr "輸入「describe [<setting>.<prop>]」以取得詳細的內容描述。"
-#: ../clients/cli/connections.c:10117
+#: ../clients/cli/connections.c:8009
#, fuzzy, c-format
msgid "Error: Failed to modify connection '%s': %s"
msgstr "錯誤:修改連線「%s」失敗:(%d) %s"
-#: ../clients/cli/connections.c:10124
+#: ../clients/cli/connections.c:8016
#, c-format
msgid "Connection '%s' (%s) successfully modified.\n"
msgstr "連線「%s」(%s) 已成功修改。\n"
-#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
-#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
-#, c-format
-msgid "Error: No arguments provided."
-msgstr "錯誤:未提供引數。"
-
-#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
-#: ../clients/cli/connections.c:10776
-#, c-format
-msgid "Error: connection ID is missing."
-msgstr "錯誤:連線 ID 遺失。"
-
-#: ../clients/cli/connections.c:10228
+#: ../clients/cli/connections.c:8098
#, c-format
msgid "%s (%s) cloned as %s (%s).\n"
msgstr ""
-#: ../clients/cli/connections.c:10260
+#: ../clients/cli/connections.c:8162
#, fuzzy
msgid "New connection name: "
msgstr "新連線"
-#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
+#: ../clients/cli/connections.c:8164
#, fuzzy, c-format
msgid "Error: <new name> argument is missing."
msgstr "錯誤:沒有 %s 參數。"
-#: ../clients/cli/connections.c:10287
+#: ../clients/cli/connections.c:8170 ../clients/cli/connections.c:8653
#, fuzzy, c-format
-msgid "Error: unexpected extra argument '%s'."
-msgstr "錯誤:非預期的引數「%s」"
+msgid "Error: unknown extra argument: '%s'."
+msgstr "錯誤:無效的額外引數「%s」。"
-#: ../clients/cli/connections.c:10356
+#: ../clients/cli/connections.c:8219
#, fuzzy, c-format
msgid "Error: not all connections deleted."
msgstr "錯誤:尚未指定連線。"
-#: ../clients/cli/connections.c:10357
+#: ../clients/cli/connections.c:8220
#, c-format
msgid "Error: Connection deletion failed: %s"
msgstr "錯誤:連線刪除失敗:%s"
-#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
-#, fuzzy, c-format
-msgid "Error: unknown connection '%s'\n"
-msgstr "錯誤:不明的連線:%s\n"
+#: ../clients/cli/connections.c:8277 ../clients/cli/connections.c:8400
+#, c-format
+msgid "Error: %s.\n"
+msgstr ""
-#: ../clients/cli/connections.c:10433
+#: ../clients/cli/connections.c:8278 ../clients/cli/connections.c:8401
#, fuzzy, c-format
-msgid "Error: no connection provided."
-msgstr "錯誤:尚未指定連線。"
+msgid "Error: not all connections found."
+msgstr "錯誤:「%s」不是個有效的「connection」指令。"
#. truncate trailing ", "
-#: ../clients/cli/connections.c:10458
+#: ../clients/cli/connections.c:8320
#, c-format
msgid "Error: cannot delete unknown connection(s): %s."
msgstr "錯誤:無法刪除不明的連線:%s。"
-#: ../clients/cli/connections.c:10470
+#: ../clients/cli/connections.c:8332
#, fuzzy, c-format
msgid "%s: connection profile changed\n"
msgstr "連線失敗"
-#: ../clients/cli/connections.c:10496
+#: ../clients/cli/connections.c:8358
#, fuzzy, c-format
msgid "%s: connection profile created\n"
msgstr "連線失敗"
-#: ../clients/cli/connections.c:10505
+#: ../clients/cli/connections.c:8367
#, fuzzy, c-format
msgid "%s: connection profile removed\n"
msgstr "連線已移除"
-#: ../clients/cli/connections.c:10548
-#, fuzzy, c-format
-msgid "Error: not all connections found."
-msgstr "錯誤:「%s」不是個有效的「connection」指令。"
-
-#: ../clients/cli/connections.c:10571
+#: ../clients/cli/connections.c:8428
#, fuzzy, c-format
msgid "Error: failed to reload connections: %s."
msgstr "錯誤:無法新增「%s」連線:(%d) %s"
-#: ../clients/cli/connections.c:10603
+#: ../clients/cli/connections.c:8460
#, fuzzy, c-format
msgid "Error: failed to load connection: %s."
msgstr "錯誤:無法新增「%s」連線:(%d) %s"
-#: ../clients/cli/connections.c:10611
+#: ../clients/cli/connections.c:8468
#, c-format
msgid "Could not load file '%s'\n"
msgstr "無法載入檔案「%s」\n"
-#: ../clients/cli/connections.c:10620
+#: ../clients/cli/connections.c:8477
#, fuzzy
msgid "File to import: "
msgstr "加密失敗:%d。"
-#: ../clients/cli/connections.c:10655
+#: ../clients/cli/connections.c:8501
+#, c-format
+msgid "Error: No arguments provided."
+msgstr "錯誤:未提供引數。"
+
+#: ../clients/cli/connections.c:8524
#, c-format
msgid "Warning: 'type' already specified, ignoring extra one.\n"
msgstr ""
-#: ../clients/cli/connections.c:10666
+#: ../clients/cli/connections.c:8537
#, c-format
msgid "Warning: 'file' already specified, ignoring extra one.\n"
msgstr ""
-#: ../clients/cli/connections.c:10668
+#: ../clients/cli/connections.c:8539
#, fuzzy, c-format
msgid "Unknown parameter: %s"
msgstr "不明的參數:%s\n"
-#: ../clients/cli/connections.c:10683
+#: ../clients/cli/connections.c:8552
+#, c-format
+msgid "Error: 'type' argument is required."
+msgstr "錯誤:需要「type」引數。"
+
+#: ../clients/cli/connections.c:8557
#, fuzzy, c-format
msgid "Error: 'file' argument is required."
msgstr "錯誤:需要「ifname」引數。"
-#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
+#: ../clients/cli/connections.c:8564
+#, fuzzy, c-format
+msgid "Error: failed to find VPN plugin for %s."
+msgstr "錯誤:無法修改 %s.%s:%s。"
+
+#: ../clients/cli/connections.c:8572 ../clients/cli/connections.c:8669
#, fuzzy, c-format
msgid "Error: failed to load VPN plugin: %s."
msgstr "錯誤:無法修改 %s.%s:%s。"
-#: ../clients/cli/connections.c:10699
+#: ../clients/cli/connections.c:8580
#, fuzzy, c-format
msgid "Error: failed to import '%s': %s."
msgstr "錯誤:無法修改 %s.%s:%s。"
-#: ../clients/cli/connections.c:10745
+#: ../clients/cli/connections.c:8650
#, fuzzy
msgid "Output file name: "
msgstr "檔案名稱"
-#: ../clients/cli/connections.c:10769
-#, fuzzy, c-format
-msgid "Error: unknown extra argument: '%s'."
-msgstr "錯誤:無效的額外引數「%s」。"
-
-#: ../clients/cli/connections.c:10789
+#: ../clients/cli/connections.c:8660
#, fuzzy, c-format
msgid "Error: the connection is not VPN."
msgstr "錯誤:連線無效:%s\n"
-#: ../clients/cli/connections.c:10810
+#: ../clients/cli/connections.c:8681
#, fuzzy, c-format
msgid "Error: failed to create temporary file %s."
msgstr "無法建立暫時性檔案:%s"
-#: ../clients/cli/connections.c:10819
+#: ../clients/cli/connections.c:8690
#, fuzzy, c-format
msgid "Error: failed to export '%s': %s."
msgstr "錯誤:設置「%s」內容失敗:%s\n"
-#: ../clients/cli/connections.c:10830
+#: ../clients/cli/connections.c:8701
#, fuzzy, c-format
msgid "Error: failed to read temporary file '%s': %s."
msgstr "錯誤:移除「%s」的值失敗:%s\n"
-#: ../clients/cli/connections.c:10976
-#, c-format
-msgid "incorrect string '%s' of '--order' option"
-msgstr ""
-
-#: ../clients/cli/connections.c:11002
-#, c-format
-msgid "incorrect item '%s' in '--order' option"
-msgstr ""
-
-#: ../clients/cli/connections.c:11089
-#, fuzzy
-msgid "'--order' argument is missing"
-msgstr "錯誤:沒有 %s 參數。"
-
-#: ../clients/cli/connections.c:11154
-#, c-format
-msgid "Error: '%s' is not valid 'connection' command."
-msgstr "錯誤:「%s」不是個有效的「connection」指令。"
-
#. define some prompts
-#: ../clients/cli/devices.c:35
+#: ../clients/cli/devices.c:36
msgid "Interface: "
msgstr "介面卡:"
-#: ../clients/cli/devices.c:36
+#: ../clients/cli/devices.c:37
#, fuzzy
msgid "Interface(s): "
msgstr "介面卡:"
#. 3
#. 20
-#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:76
+#: ../clients/cli/devices.c:45 ../clients/cli/devices.c:77
msgid "CONNECTION"
msgstr "CONNECTION"
#. 4
#. 21
-#: ../clients/cli/devices.c:45 ../clients/cli/devices.c:77
+#: ../clients/cli/devices.c:46 ../clients/cli/devices.c:78
msgid "CON-UUID"
msgstr "CON-UUID"
#. 2
-#: ../clients/cli/devices.c:58
+#: ../clients/cli/devices.c:59
#, fuzzy
msgid "NM-TYPE"
msgstr "TYPE"
#. 3
-#: ../clients/cli/devices.c:59
+#: ../clients/cli/devices.c:60
msgid "VENDOR"
msgstr "VENDOR"
#. 4
-#: ../clients/cli/devices.c:60
+#: ../clients/cli/devices.c:61
msgid "PRODUCT"
msgstr "PRODUCT"
#. 5
-#: ../clients/cli/devices.c:61
+#: ../clients/cli/devices.c:62
msgid "DRIVER"
msgstr "DRIVER"
#. 6
-#: ../clients/cli/devices.c:62
+#: ../clients/cli/devices.c:63
msgid "DRIVER-VERSION"
msgstr "DRIVER-VERSION"
#. 7
-#: ../clients/cli/devices.c:63
+#: ../clients/cli/devices.c:64
msgid "FIRMWARE-VERSION"
msgstr "FIRMWARE-VERSION"
#. 8
-#: ../clients/cli/devices.c:64
+#: ../clients/cli/devices.c:65
msgid "HWADDR"
msgstr "HWADDR"
#. 9
-#: ../clients/cli/devices.c:65 ../clients/tui/nmt-page-ethernet.c:83
-#: ../clients/tui/nmt-page-infiniband.c:94 ../clients/tui/nmt-page-vlan.c:128
+#: ../clients/cli/devices.c:66 ../clients/tui/nmt-page-ethernet.c:83
+#: ../clients/tui/nmt-page-infiniband.c:94
+#: ../clients/tui/nmt-page-ip-tunnel.c:186 ../clients/tui/nmt-page-vlan.c:128
#: ../clients/tui/nmt-page-wifi.c:370
msgid "MTU"
msgstr "MTU"
#. 11
-#: ../clients/cli/devices.c:67
+#: ../clients/cli/devices.c:68
msgid "REASON"
msgstr "REASON"
#. 12
-#: ../clients/cli/devices.c:68
+#: ../clients/cli/devices.c:69
msgid "UDI"
msgstr "UDI"
#. 13
-#: ../clients/cli/devices.c:69
+#: ../clients/cli/devices.c:70
msgid "IP-IFACE"
msgstr "IP-IFACE"
#. 14
#. 2
-#: ../clients/cli/devices.c:70 ../clients/cli/devices.c:102
+#: ../clients/cli/devices.c:71 ../clients/cli/devices.c:103
msgid "IS-SOFTWARE"
msgstr ""
#. 15
-#: ../clients/cli/devices.c:71
+#: ../clients/cli/devices.c:72
msgid "NM-MANAGED"
msgstr "NM-MANAGED"
#. 17
-#: ../clients/cli/devices.c:73
+#: ../clients/cli/devices.c:74
msgid "FIRMWARE-MISSING"
msgstr "FIRMWARE-MISSING"
#. 18
-#: ../clients/cli/devices.c:74
+#: ../clients/cli/devices.c:75
msgid "NM-PLUGIN-MISSING"
msgstr ""
#. 19
-#: ../clients/cli/devices.c:75
+#: ../clients/cli/devices.c:76
msgid "PHYS-PORT-ID"
msgstr ""
#. 23
-#: ../clients/cli/devices.c:79
+#: ../clients/cli/devices.c:80
msgid "METERED"
msgstr ""
#. 0
-#: ../clients/cli/devices.c:90
+#: ../clients/cli/devices.c:91
msgid "AVAILABLE-CONNECTION-PATHS"
msgstr "AVAILABLE-CONNECTION-PATHS"
#. 1
-#: ../clients/cli/devices.c:91
+#: ../clients/cli/devices.c:92
msgid "AVAILABLE-CONNECTIONS"
msgstr "AVAILABLE-CONNECTIONS"
#. 0
-#: ../clients/cli/devices.c:100
+#: ../clients/cli/devices.c:101
msgid "CARRIER-DETECT"
msgstr "CARRIER-DETECT"
#. 1
-#: ../clients/cli/devices.c:101
+#: ../clients/cli/devices.c:102
msgid "SPEED"
msgstr "SPEED"
#. 0
-#: ../clients/cli/devices.c:111
+#: ../clients/cli/devices.c:112
msgid "CARRIER"
msgstr "CARRIER"
#. 1
-#: ../clients/cli/devices.c:112
+#: ../clients/cli/devices.c:113
msgid "S390-SUBCHANNELS"
msgstr ""
#. 0
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
+#: ../clients/cli/devices.c:122 ../clients/cli/devices.c:827
msgid "WEP"
msgstr "WEP"
#. 1
-#: ../clients/cli/devices.c:122
+#: ../clients/cli/devices.c:123
msgid "WPA"
msgstr "WPA"
#. 2
-#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:739
+#: ../clients/cli/devices.c:124 ../clients/cli/devices.c:835
msgid "WPA2"
msgstr "WPA2"
#. 3
-#: ../clients/cli/devices.c:124
+#: ../clients/cli/devices.c:125
msgid "TKIP"
msgstr "TKIP"
#. 4
-#: ../clients/cli/devices.c:125
+#: ../clients/cli/devices.c:126
msgid "CCMP"
msgstr "CCMP"
#. 5
#. 2
-#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228
+#: ../clients/cli/devices.c:127 ../clients/cli/devices.c:239
msgid "AP"
msgstr "AP"
#. 6
-#: ../clients/cli/devices.c:127
+#: ../clients/cli/devices.c:128
msgid "ADHOC"
msgstr "ADHOC"
#. 7
-#: ../clients/cli/devices.c:128
+#: ../clients/cli/devices.c:129
msgid "2GHZ"
msgstr ""
#. 8
-#: ../clients/cli/devices.c:129
+#: ../clients/cli/devices.c:130
msgid "5GHZ"
msgstr ""
#. 0
-#: ../clients/cli/devices.c:138
+#: ../clients/cli/devices.c:139
msgid "CTR-FREQ"
msgstr "CTR-FREQ"
#. 1
-#: ../clients/cli/devices.c:139
+#: ../clients/cli/devices.c:140
msgid "RSSI"
msgstr "RSSI"
#. 2
-#: ../clients/cli/devices.c:140
+#: ../clients/cli/devices.c:141
msgid "CINR"
msgstr "CINR"
#. 3
-#: ../clients/cli/devices.c:141
+#: ../clients/cli/devices.c:142
msgid "TX-POW"
msgstr "TX-POW"
#. 4
-#: ../clients/cli/devices.c:142
+#: ../clients/cli/devices.c:143
msgid "BSID"
msgstr "BSID"
-#. 0
-#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
-msgid "SSID"
-msgstr "SSID"
-
#. 1
-#: ../clients/cli/devices.c:152
+#: ../clients/cli/devices.c:153
msgid "SSID-HEX"
msgstr "SSID-HEX"
#. 2
-#: ../clients/cli/devices.c:153 ../clients/tui/nmt-page-wifi.c:358
+#: ../clients/cli/devices.c:154 ../clients/tui/nmt-page-wifi.c:358
msgid "BSSID"
msgstr "BSSID"
#. 3
-#: ../clients/cli/devices.c:154
+#: ../clients/cli/devices.c:155
msgid "MODE"
msgstr "MODE"
#. 4
-#: ../clients/cli/devices.c:155
+#: ../clients/cli/devices.c:156
msgid "CHAN"
msgstr "CHAN"
#. 5
-#: ../clients/cli/devices.c:156
+#: ../clients/cli/devices.c:157
msgid "FREQ"
msgstr "FREQ"
#. 6
-#: ../clients/cli/devices.c:157
+#: ../clients/cli/devices.c:158
msgid "RATE"
msgstr "RATE"
#. 7
#. 1
-#: ../clients/cli/devices.c:158 ../clients/cli/devices.c:178
+#: ../clients/cli/devices.c:159 ../clients/cli/devices.c:179
msgid "SIGNAL"
msgstr "SIGNAL"
#. 8
-#: ../clients/cli/devices.c:159
+#: ../clients/cli/devices.c:160
msgid "BARS"
msgstr "BARS"
#. 9
-#: ../clients/cli/devices.c:160
+#: ../clients/cli/devices.c:161
msgid "SECURITY"
msgstr "SECURITY"
#. 10
-#: ../clients/cli/devices.c:161
+#: ../clients/cli/devices.c:162
msgid "WPA-FLAGS"
msgstr "WPA-FLAGS"
#. 11
-#: ../clients/cli/devices.c:162
+#: ../clients/cli/devices.c:163
msgid "RSN-FLAGS"
msgstr "RSN-FLAGS"
#. 14
-#: ../clients/cli/devices.c:165
+#: ../clients/cli/devices.c:166
msgid "*"
msgstr "*"
#. 0
#. 5
-#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:231
+#: ../clients/cli/devices.c:178 ../clients/cli/devices.c:242
msgid "NSP"
msgstr "NSP"
#. 0
-#: ../clients/cli/devices.c:192
+#: ../clients/cli/devices.c:193 ../clients/cli/devices.c:202
msgid "SLAVES"
msgstr "SLAVES"
+#. 1
+#: ../clients/cli/devices.c:203
+msgid "CONFIG"
+msgstr ""
+
#. 0
-#: ../clients/cli/devices.c:201
+#: ../clients/cli/devices.c:212
msgid "PARENT"
msgstr ""
#. 1
-#: ../clients/cli/devices.c:202
+#: ../clients/cli/devices.c:213
msgid "ID"
msgstr "ID"
#. 0
-#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:226
+#: ../clients/cli/devices.c:222 ../clients/cli/devices.c:237
msgid "CAPABILITIES"
msgstr "CAPABILITIES"
#. 1
-#: ../clients/cli/devices.c:227
+#: ../clients/cli/devices.c:238
msgid "WIFI-PROPERTIES"
msgstr "WIFI-PROPERTIES"
#. 3
-#: ../clients/cli/devices.c:229
+#: ../clients/cli/devices.c:240
msgid "WIRED-PROPERTIES"
msgstr "WIRED-PROPERTIES"
#. 4
-#: ../clients/cli/devices.c:230
+#: ../clients/cli/devices.c:241
msgid "WIMAX-PROPERTIES"
msgstr "WIMAX-PROPERTIES"
#. 10
-#: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351
+#: ../clients/cli/devices.c:247 ../clients/tui/nmt-page-bond.c:351
msgid "BOND"
msgstr "BOND"
#. 11
-#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-team.c:145
+#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-team.c:145
msgid "TEAM"
msgstr "團隊"
#. 12
-#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-bridge.c:74
+#: ../clients/cli/devices.c:249 ../clients/tui/nmt-page-bridge.c:74
msgid "BRIDGE"
msgstr "BRIDGE"
+#. 13
+#: ../clients/cli/devices.c:250 ../clients/tui/nm-editor-utils.c:217
+#: ../clients/tui/nmt-page-vlan.c:94 ../libnm-core/nm-connection.c:1897
+#: ../libnm-glib/nm-device.c:1879 ../libnm-util/nm-connection.c:1632
+#: ../libnm/nm-device.c:1681
+msgid "VLAN"
+msgstr "VLAN"
+
#. 14
-#: ../clients/cli/devices.c:240
+#: ../clients/cli/devices.c:251
msgid "BLUETOOTH"
msgstr ""
#. 15
-#: ../clients/cli/devices.c:241
+#: ../clients/cli/devices.c:252
msgid "CONNECTIONS"
msgstr "CONNECTIONS"
#. 1
-#: ../clients/cli/devices.c:253
+#: ../clients/cli/devices.c:264
msgid "CHASSIS-ID"
msgstr ""
#. 2
-#: ../clients/cli/devices.c:254
+#: ../clients/cli/devices.c:265
msgid "PORT-ID"
msgstr ""
#. 3
-#: ../clients/cli/devices.c:255
+#: ../clients/cli/devices.c:266
msgid "PORT-DESCRIPTION"
msgstr ""
#. 4
-#: ../clients/cli/devices.c:256
+#: ../clients/cli/devices.c:267
#, fuzzy
msgid "SYSTEM-NAME"
msgstr "USERNAME"
#. 5
-#: ../clients/cli/devices.c:257
+#: ../clients/cli/devices.c:268
msgid "SYSTEM-DESCRIPTION"
msgstr ""
#. 6
-#: ../clients/cli/devices.c:258
+#: ../clients/cli/devices.c:269
#, fuzzy
msgid "SYSTEM-CAPABILITIES"
msgstr "CAPABILITIES"
#. 7
-#: ../clients/cli/devices.c:259
+#: ../clients/cli/devices.c:270
msgid "IEEE-802-1-PVID"
msgstr ""
#. 8
-#: ../clients/cli/devices.c:260
+#: ../clients/cli/devices.c:271
msgid "IEEE-802-1-PPVID"
msgstr ""
#. 9
-#: ../clients/cli/devices.c:261
+#: ../clients/cli/devices.c:272
msgid "IEEE-802-1-PPVID-FLAGS"
msgstr ""
#. 10
-#: ../clients/cli/devices.c:262
+#: ../clients/cli/devices.c:273
msgid "IEEE-802-1-VID"
msgstr ""
#. 11
-#: ../clients/cli/devices.c:263
+#: ../clients/cli/devices.c:274
msgid "IEEE-802-1-VLAN-NAME"
msgstr ""
#. 12
-#: ../clients/cli/devices.c:264
+#: ../clients/cli/devices.c:275
msgid "DESTINATION"
msgstr ""
#. 13
-#: ../clients/cli/devices.c:265
+#: ../clients/cli/devices.c:276
msgid "CHASSIS-ID-TYPE"
msgstr ""
#. 14
-#: ../clients/cli/devices.c:266
+#: ../clients/cli/devices.c:277
msgid "PORT-ID-TYPE"
msgstr ""
-#: ../clients/cli/devices.c:283
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:294
+#, c-format
msgid ""
"Usage: nmcli device { COMMAND | help }\n"
"\n"
-"COMMAND := { status | show | connect | reapply | disconnect | delete | "
-"monitor | wifi | lldp }\n"
+"COMMAND := { status | show | set | connect | reapply | modify | disconnect | "
+"delete | monitor | wifi | lldp }\n"
"\n"
" status\n"
"\n"
@@ -4027,7 +3697,9 @@ msgid ""
"\n"
" connect <ifname>\n"
"\n"
-" reapply <ifname> ...\n"
+" reapply <ifname>\n"
+"\n"
+" modify <ifname> ([+|-]<setting>.<property> <value>)+\n"
"\n"
" disconnect <ifname> ...\n"
"\n"
@@ -4050,32 +3722,8 @@ msgid ""
" lldp [list [ifname <ifname>]]\n"
"\n"
msgstr ""
-"Usage: nmcli device { COMMAND | help }\n"
-"\n"
-"COMMAND := { status | show | connect | disconnect | wifi | wimax }\n"
-"\n"
-"COMMAND := { status | show | connect | disconnect | wifi }\n"
-"\n"
-" status\n"
-"\n"
-" show [<ifname>]\n"
-"\n"
-" connect <ifname>\n"
-"\n"
-" disconnect <ifname>\n"
-"\n"
-" wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
-"\n"
-" wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
-"[ifname <ifname>]\n"
-" [bssid <BSSID>] [name <name>] [private yes|no]\n"
-"\n"
-" wifi rescan [[ifname] <ifname>]\n"
-"\n"
-" wimax [list [ifname <ifname>] [nsp <name>]]\n"
-"\n"
-#: ../clients/cli/devices.c:305
+#: ../clients/cli/devices.c:317
#, c-format
msgid ""
"Usage: nmcli device status { help }\n"
@@ -4086,8 +3734,10 @@ msgid ""
" TYPE - device type\n"
" STATE - device state\n"
" CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' "
+"is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device "
+"status'.\n"
"\n"
msgstr ""
"Usage: nmcli device status { help }\n"
@@ -4098,11 +3748,13 @@ msgstr ""
" TYPE - device type\n"
" STATE - device state\n"
" CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' "
+"is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device "
+"status'.\n"
"\n"
-#: ../clients/cli/devices.c:320
+#: ../clients/cli/devices.c:332
#, c-format
msgid ""
"Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -4121,7 +3773,7 @@ msgstr ""
"The command lists details for all devices, or for a given device.\n"
"\n"
-#: ../clients/cli/devices.c:331
+#: ../clients/cli/devices.c:343
#, c-format
msgid ""
"Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -4129,8 +3781,8 @@ msgid ""
"ARGUMENTS := <ifname>\n"
"\n"
"Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be activated."
-"\n"
+"NetworkManager will try to find a suitable connection that will be "
+"activated.\n"
"It will also consider connections that are not set to auto-connect.\n"
"\n"
msgstr ""
@@ -4139,17 +3791,17 @@ msgstr ""
"ARGUMENTS := <ifname>\n"
"\n"
"Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be activated."
-"\n"
+"NetworkManager will try to find a suitable connection that will be "
+"activated.\n"
"It will also consider connections that are not set to auto-connect.\n"
"\n"
-#: ../clients/cli/devices.c:343
+#: ../clients/cli/devices.c:355
#, fuzzy, c-format
msgid ""
"Usage: nmcli device reapply { ARGUMENTS | help }\n"
"\n"
-"ARGUMENTS := <ifname> ...\n"
+"ARGUMENTS := <ifname>\n"
"\n"
"Attempts to update device with changes to the currently active connection\n"
"made since it was last applied.\n"
@@ -4164,7 +3816,29 @@ msgstr ""
"further connections without user/manual intervention.\n"
"\n"
-#: ../clients/cli/devices.c:354
+#: ../clients/cli/devices.c:366
+#, c-format
+msgid ""
+"Usage: nmcli device modify { ARGUMENTS | --help }\n"
+"\n"
+"ARGUMENTS := <ifname> ([+|-]<setting>.<property> <value>)+\n"
+"\n"
+"Modify one or more properties currently active on the device without "
+"modifying\n"
+"the connection profile. The changes have immediate effect. For multi-valued\n"
+"properties you can use optional '+' or '-' prefix to the property name.\n"
+"The '+' sign allows appending items instead of overwriting the whole value.\n"
+"The '-' sign allows removing selected items instead of the whole value.\n"
+"\n"
+"Examples:\n"
+"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
+"nmcli dev mod em1 +ipv4.dns 8.8.4.4\n"
+"nmcli dev mod em1 -ipv4.dns 1\n"
+"nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
+msgstr ""
+
+#: ../clients/cli/devices.c:386
#, fuzzy, c-format
msgid ""
"Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -4185,7 +3859,7 @@ msgstr ""
"further connections without user/manual intervention.\n"
"\n"
-#: ../clients/cli/devices.c:366
+#: ../clients/cli/devices.c:398
#, fuzzy, c-format
msgid ""
"Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -4206,7 +3880,7 @@ msgstr ""
"The command lists details for all devices, or for a given device.\n"
"\n"
-#: ../clients/cli/devices.c:379
+#: ../clients/cli/devices.c:411
#, c-format
msgid ""
"Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -4220,7 +3894,7 @@ msgid ""
"\n"
msgstr ""
-#: ../clients/cli/devices.c:392
+#: ../clients/cli/devices.c:424
#, fuzzy, c-format
msgid ""
"Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -4240,8 +3914,8 @@ msgstr ""
"The command lists details for all devices, or for a given device.\n"
"\n"
-#: ../clients/cli/devices.c:404
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:436
+#, c-format
msgid ""
"Usage: nmcli device wifi { ARGUMENTS | help }\n"
"\n"
@@ -4252,9 +3926,9 @@ msgid ""
"List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
"used to list APs for a particular interface, or with a specific BSSID.\n"
"\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
-"key|phrase] [ifname <ifname>]\n"
-" [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
+"phrase] [ifname <ifname>]\n"
+" [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
"yes|no]\n"
"\n"
"Connect to a Wi-Fi network specified by SSID or BSSID. The command creates\n"
@@ -4266,9 +3940,8 @@ msgid ""
"only open, WEP and WPA-PSK networks are supported at the moment. It is also\n"
"assumed that IP configuration is obtained via DHCP.\n"
"\n"
-"ARGUMENTS := wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
-" [band a|bg] [channel <channel>] [password "
-"<password>]\n"
+"ARGUMENTS := hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
+" [band a|bg] [channel <channel>] [password <password>]\n"
"\n"
"Create a Wi-Fi hotspot. Use 'connection down' or 'device disconnect'\n"
"to stop the hotspot.\n"
@@ -4282,8 +3955,10 @@ msgid ""
"\n"
"ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
"\n"
-"Request that NetworkManager immediately re-scan for available access points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
+"Request that NetworkManager immediately re-scan for available access "
+"points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
+"might\n"
"be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
"SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
"be\n"
@@ -4291,44 +3966,16 @@ msgid ""
"use 'nmcli device wifi list' for that.\n"
"\n"
msgstr ""
-"Usage: nmcli device wifi { ARGUMENTS | help }\n"
-"\n"
-"Perform operation on Wi-Fi devices.\n"
-"\n"
-"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>]]\n"
-"\n"
-"List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
-"used to list APs for a particular interface, or with a specific BSSID.\n"
-"\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
-"key|phrase] [ifname <ifname>]\n"
-" [bssid <BSSID>] [name <name>] [private yes|no]\n"
-"\n"
-"Connect to a Wi-Fi network specified by SSID or BSSID. The command creates\n"
-"a new connection and then activates it on a device. This is a command-line\n"
-"counterpart of clicking an SSID in a GUI client. The command always creates\n"
-"a new connection and thus it is mainly useful for connecting to new Wi-Fi\n"
-"networks. If a connection for the network already exists, it is better to\n"
-"bring up the existing profile as follows: nmcli con up id <name>. Note that\n"
-"only open, WEP and WPA-PSK networks are supported at the moment. It is also\n"
-"assumed that IP configuration is obtained via DHCP.\n"
-"\n"
-"ARGUMENTS := rescan [[ifname] <ifname>]\n"
-"\n"
-"Request that NetworkManager immediately re-scan for available access points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
-"be useful to start scanning manually. Note that this command does not show\n"
-"the APs, use 'nmcli device wifi list' for that.\n"
-"\n"
-#: ../clients/cli/devices.c:451
+#: ../clients/cli/devices.c:483
#, fuzzy, c-format
msgid ""
"Usage: nmcli device lldp { ARGUMENTS | help }\n"
"\n"
"ARGUMENTS := [list [ifname <ifname>]]\n"
"\n"
-"List neighboring devices discovered through LLDP. The 'ifname' option can be\n"
+"List neighboring devices discovered through LLDP. The 'ifname' option can "
+"be\n"
"used to list neighbors for a particular interface.\n"
"\n"
msgstr ""
@@ -4342,503 +3989,499 @@ msgstr ""
"list networks for a particular interface, or with a specific NSP.\n"
"\n"
-#: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
-#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879
-#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
+#: ../clients/cli/devices.c:584
#, c-format
msgid "Error: No interface specified."
msgstr "錯誤:尚未指定介面卡。"
-#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
+#: ../clients/cli/devices.c:607
#, c-format
msgid "Warning: argument '%s' is duplicated.\n"
msgstr ""
-#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
+#: ../clients/cli/devices.c:610
#, fuzzy, c-format
msgid "Error: Device '%s' not found.\n"
msgstr "錯誤:找不到「%s」裝置。"
-#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
+#: ../clients/cli/devices.c:611
#, fuzzy, c-format
msgid "Error: not all devices found."
msgstr "錯誤:找不到 Wi-Fi 裝置。"
-#: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801
+#: ../clients/cli/devices.c:640
+msgid "No interface specified"
+msgstr ""
+
+#: ../clients/cli/devices.c:659
+#, c-format
+msgid "Device '%s' not found"
+msgstr ""
+
+#: ../clients/cli/devices.c:745 ../clients/cli/devices.c:897
msgid "(none)"
msgstr "(none)"
-#: ../clients/cli/devices.c:719
+#: ../clients/cli/devices.c:815
#, c-format
msgid "%u MHz"
msgstr "%u MHz"
-#: ../clients/cli/devices.c:720
+#: ../clients/cli/devices.c:816
#, c-format
msgid "%u Mbit/s"
msgstr "%u Mbit/s"
-#: ../clients/cli/devices.c:735
+#: ../clients/cli/devices.c:831
msgid "WPA1"
msgstr "WPA1"
-#: ../clients/cli/devices.c:744
+#: ../clients/cli/devices.c:840
msgid "802.1X"
msgstr "802.1X"
-#: ../clients/cli/devices.c:760
+#: ../clients/cli/devices.c:856
msgid "Ad-Hoc"
msgstr "Ad-Hoc"
-#: ../clients/cli/devices.c:761
+#: ../clients/cli/devices.c:857
msgid "Infra"
msgstr "Infra"
# auto translated by TM merge from project: gnome-system-monitor, version: 3.8.2.1, DocId: gnome-system-monitor
-#: ../clients/cli/devices.c:762
+#: ../clients/cli/devices.c:858
msgid "N/A"
msgstr "N/A"
-#: ../clients/cli/devices.c:916
+#: ../clients/cli/devices.c:1082
msgid "Device details"
msgstr "裝置詳細資訊"
-#: ../clients/cli/devices.c:928
+#: ../clients/cli/devices.c:1094
#, c-format
msgid "Error: 'device show': %s"
msgstr "錯誤:「device show」:%s"
-#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983
+#: ../clients/cli/devices.c:1146 ../clients/cli/devices.c:1149
msgid "(unknown)"
msgstr "(不明)"
-#: ../clients/cli/devices.c:1024
+#: ../clients/cli/devices.c:1190
#, c-format
msgid "%u Mb/s"
msgstr "%u Mb/s"
-#: ../clients/cli/devices.c:1115
+#: ../clients/cli/devices.c:1281
msgid "on"
msgstr "開"
-#: ../clients/cli/devices.c:1115
+#: ../clients/cli/devices.c:1281
msgid "off"
msgstr "關"
-#: ../clients/cli/devices.c:1342
+#: ../clients/cli/devices.c:1519
#, c-format
msgid "Error: 'device status': %s"
msgstr "錯誤:「device status」:%s"
#. Add headers
-#: ../clients/cli/devices.c:1349
+#: ../clients/cli/devices.c:1525
msgid "Status of devices"
msgstr "裝置的狀態"
-#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
+#: ../clients/cli/devices.c:1559 ../clients/cli/devices.c:2013
+#: ../clients/cli/devices.c:3741
#, c-format
msgid "Error: invalid extra argument '%s'."
msgstr "錯誤:無效的額外引數「%s」。"
-#: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
-#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
-#: ../clients/cli/devices.c:3548
+#: ../clients/cli/devices.c:1596 ../clients/cli/general.c:461
#, c-format
-msgid "Error: Device '%s' not found."
-msgstr "錯誤:找不到「%s」裝置。"
+msgid "Error: Timeout %d sec expired."
+msgstr "錯誤:逾時 %d 秒。"
-#: ../clients/cli/devices.c:1475
+#: ../clients/cli/devices.c:1645
#, fuzzy, c-format
msgid "Device '%s' successfully activated with '%s'.\n"
msgstr "成功:裝置「%s」已成功啟用。"
-#: ../clients/cli/devices.c:1481
+#: ../clients/cli/devices.c:1651
#, fuzzy, c-format
msgid "Error: Connection activation failed: (%d) %s.\n"
msgstr "錯誤:連線啟用失敗:(%d) %s。"
-#: ../clients/cli/devices.c:1517
+#: ../clients/cli/devices.c:1687
#, fuzzy, c-format
msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
msgstr "錯誤:無法設定主機名稱:(%d) %s"
-#: ../clients/cli/devices.c:1520
+#: ../clients/cli/devices.c:1690
#, fuzzy, c-format
msgid "Error: Failed to add/activate new connection: %s"
msgstr "錯誤:新增/啟用新連線失敗:(%d) %s"
-#: ../clients/cli/devices.c:1530
+#: ../clients/cli/devices.c:1700
#, fuzzy, c-format
msgid "Error: Failed to setup a Wi-Fi hotspot"
msgstr "錯誤:無法設定主機名稱:(%d) %s"
-#: ../clients/cli/devices.c:1532
+#: ../clients/cli/devices.c:1702
#, c-format
msgid "Error: Failed to add/activate new connection: Unknown error"
msgstr "錯誤:新增/啟用新連線失敗:不明的錯誤"
-#: ../clients/cli/devices.c:1544
+#: ../clients/cli/devices.c:1714
#, c-format
msgid "Connection with UUID '%s' created and activated on device '%s'\n"
msgstr "UUID 爲「%s」的連線已建立並啟用於「%s」裝置上\n"
-#: ../clients/cli/devices.c:1547
+#: ../clients/cli/devices.c:1717
#, fuzzy, c-format
msgid "Hotspot '%s' activated on device '%s'\n"
msgstr "UUID 爲「%s」的連線已建立並啟用於「%s」裝置上\n"
-#: ../clients/cli/devices.c:1611
+#: ../clients/cli/devices.c:1781
#, c-format
msgid "Error: Device activation failed: %s"
msgstr "錯誤:裝置啟用失敗:%s"
-#: ../clients/cli/devices.c:1620
+#: ../clients/cli/devices.c:1790
#, fuzzy, c-format
msgid "Error: Device activation failed: device was disconnected"
msgstr "錯誤:裝置啟用失敗:%s"
-#: ../clients/cli/devices.c:1635
+#: ../clients/cli/devices.c:1805
#, c-format
msgid "Device '%s' has been connected.\n"
msgstr "裝置「%s」已連上。\n"
-#: ../clients/cli/devices.c:1691
+#: ../clients/cli/devices.c:1845
#, c-format
msgid "Error: extra argument not allowed: '%s'."
msgstr "錯誤:不允許額外的引數:「%s」。"
-#: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
-#: ../clients/cli/devices.c:1964
+#: ../clients/cli/devices.c:1917 ../clients/cli/devices.c:1932
+#: ../clients/cli/devices.c:2160
#, fuzzy, c-format
msgid "Device '%s' successfully disconnected.\n"
msgstr "成功:裝置「%s」已經成功地斷線。"
-#: ../clients/cli/devices.c:1779
+#: ../clients/cli/devices.c:1920
#, fuzzy, c-format
msgid "Device '%s' successfully removed.\n"
msgstr "成功:裝置「%s」已成功啟用。"
-#: ../clients/cli/devices.c:1838
-#, fuzzy, c-format
-msgid "Error: not all connections reapplied."
-msgstr "錯誤:尚未指定連線。"
-
-#: ../clients/cli/devices.c:1839
+#: ../clients/cli/devices.c:1979 ../clients/cli/devices.c:2048
#, fuzzy, c-format
-msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
msgstr "錯誤:裝置「%s」(%s)斷線失敗:%s"
-#: ../clients/cli/devices.c:1849
+#: ../clients/cli/devices.c:1989 ../clients/cli/devices.c:2057
#, fuzzy, c-format
msgid "Connection successfully reapplied to device '%s'.\n"
msgstr "連線已成功啟用(D-Bus 啟用路徑:%s)\n"
-#: ../clients/cli/devices.c:1912
-#, fuzzy, c-format
-msgid "Error: no valid device provided."
-msgstr "錯誤:找不到 Wi-Fi 裝置。"
+#: ../clients/cli/devices.c:2082
+#, c-format
+msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
+msgstr ""
-#: ../clients/cli/devices.c:1949
+#: ../clients/cli/devices.c:2145
#, fuzzy, c-format
msgid "Error: not all devices disconnected."
msgstr "錯誤:找不到 Wi-Fi 裝置。"
-#: ../clients/cli/devices.c:1950
+#: ../clients/cli/devices.c:2146
#, fuzzy, c-format
msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
msgstr "錯誤:裝置「%s」(%s)斷線失敗:%s"
-#: ../clients/cli/devices.c:2025
+#: ../clients/cli/devices.c:2223
#, fuzzy, c-format
msgid "Error: not all devices deleted."
msgstr "錯誤:找不到 Wi-Fi 裝置。"
-#: ../clients/cli/devices.c:2026
+#: ../clients/cli/devices.c:2224
#, fuzzy, c-format
msgid "Error: Device '%s' (%s) deletion failed: %s\n"
msgstr "錯誤:裝置「%s」(%s)斷線失敗:%s"
-#: ../clients/cli/devices.c:2132
+#: ../clients/cli/devices.c:2308
#, fuzzy, c-format
msgid "Error: No property specified."
msgstr "錯誤:尚未指定連線。"
-#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
+#: ../clients/cli/devices.c:2321 ../clients/cli/devices.c:2336
#, c-format
msgid "Error: '%s' argument is missing."
msgstr "錯誤:找不到「%s」參數。"
-#: ../clients/cli/devices.c:2149
+#: ../clients/cli/devices.c:2327
#, fuzzy, c-format
msgid "Error: 'managed': %s."
msgstr "錯誤:「mode」:%s。"
-#: ../clients/cli/devices.c:2174
+#: ../clients/cli/devices.c:2342
+#, c-format
+msgid "Error: 'autoconnect': %s."
+msgstr "錯誤:「autoconnect」:%s。"
+
+#: ../clients/cli/devices.c:2350
#, fuzzy, c-format
msgid "Error: property '%s' is not known."
msgstr "錯誤:無效的內容「%s」:%s。"
-#: ../clients/cli/devices.c:2220
+#: ../clients/cli/devices.c:2400
#, fuzzy, c-format
msgid "%s: using connection '%s'\n"
msgstr "沒有此連線「%s」"
-#: ../clients/cli/devices.c:2246
+#: ../clients/cli/devices.c:2426
#, c-format
msgid "%s: device created\n"
msgstr ""
-#: ../clients/cli/devices.c:2253
+#: ../clients/cli/devices.c:2433
#, fuzzy, c-format
msgid "%s: device removed\n"
msgstr "裝置已移除"
-#: ../clients/cli/devices.c:2339
+#: ../clients/cli/devices.c:2630
msgid "Wi-Fi scan list"
msgstr "Wi-Fi 掃描清單"
-#: ../clients/cli/devices.c:2377
+#: ../clients/cli/devices.c:2674
#, c-format
msgid "Error: 'device wifi': %s"
msgstr "錯誤:「device wifi」:%s"
-#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
+#: ../clients/cli/devices.c:2685
+#, c-format
+msgid "Error: Device '%s' not found."
+msgstr "錯誤:找不到「%s」裝置。"
+
+#: ../clients/cli/devices.c:2706 ../clients/cli/devices.c:2788
#, c-format
msgid "Error: Access point with bssid '%s' not found."
msgstr "錯誤:找不到 bssid 爲「%s」的存取點。"
-#: ../clients/cli/devices.c:2446
+#: ../clients/cli/devices.c:2732
#, fuzzy, c-format
msgid ""
"Error: Device '%s' was not recognized as a Wi-Fi device, check "
"NetworkManager Wi-Fi plugin."
msgstr "錯誤:裝置「%s」不是個 Wi-Fi 裝置。"
-#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
-#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
+#: ../clients/cli/devices.c:2736 ../clients/cli/devices.c:2998
+#: ../clients/cli/devices.c:3421 ../clients/cli/devices.c:3576
#, c-format
msgid "Error: Device '%s' is not a Wi-Fi device."
msgstr "錯誤:裝置「%s」不是個 Wi-Fi 裝置。"
-#: ../clients/cli/devices.c:2660
+#: ../clients/cli/devices.c:2863
msgid "SSID or BSSID: "
msgstr "SSID 或 BSSID:"
-#: ../clients/cli/devices.c:2665
+#: ../clients/cli/devices.c:2868
#, c-format
msgid "Error: SSID or BSSID are missing."
msgstr "錯誤:SSID 或 BSSID 遺失。"
-#: ../clients/cli/devices.c:2689
+#: ../clients/cli/devices.c:2900
#, c-format
msgid "Error: bssid argument value '%s' is not a valid BSSID."
msgstr "錯誤:bssid 引數值「%s」不是個有效的 BSSID。"
-#: ../clients/cli/devices.c:2713
+#: ../clients/cli/devices.c:2926
#, c-format
msgid ""
"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
msgstr "錯誤:wep-key-type 引數值「%s」無效,請使用「key」或是「phrase」。"
-#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
+#: ../clients/cli/devices.c:2948 ../clients/cli/devices.c:2963
#, c-format
msgid "Error: %s: %s."
msgstr "錯誤:%s:%s。"
-#: ../clients/cli/devices.c:2761
+#: ../clients/cli/devices.c:2981
#, c-format
msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
msgstr "錯誤:欲連上的 BSSID(%s)與 bssid 引數(%s)不同。"
-#: ../clients/cli/devices.c:2767
+#: ../clients/cli/devices.c:2987
#, c-format
msgid "Error: Parameter '%s' is neither SSID nor BSSID."
msgstr "錯誤:參數「%s」既不是 SSID 也不是 BSSID。"
-#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
-#: ../clients/cli/devices.c:3351
+#: ../clients/cli/devices.c:3000 ../clients/cli/devices.c:3423
+#: ../clients/cli/devices.c:3578
#, c-format
msgid "Error: No Wi-Fi device found."
msgstr "錯誤:找不到 Wi-Fi 裝置。"
-#: ../clients/cli/devices.c:2802
+#: ../clients/cli/devices.c:3020
#, fuzzy, c-format
msgid "Error: Failed to scan hidden SSID: %s."
msgstr "錯誤:無法修改 %s.%s:%s。"
-#: ../clients/cli/devices.c:2827
+#: ../clients/cli/devices.c:3047
#, c-format
msgid "Error: No network with SSID '%s' found."
msgstr "錯誤:找不到 SSID 爲「%s」的網路。"
-#: ../clients/cli/devices.c:2829
+#: ../clients/cli/devices.c:3049
#, c-format
msgid "Error: No access point with BSSID '%s' found."
msgstr "錯誤:找不到 BSSID 爲「%s」的存取點。"
-#: ../clients/cli/devices.c:2871
+#: ../clients/cli/devices.c:3091
#, c-format
msgid ""
"Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
msgstr ""
-#: ../clients/cli/devices.c:2885
+#: ../clients/cli/devices.c:3105
msgid "Password: "
msgstr "密碼:"
-#: ../clients/cli/devices.c:3034
+#: ../clients/cli/devices.c:3254
#, fuzzy, c-format
msgid "'%s' is not valid WPA PSK"
msgstr "「%s」不是個有效的 PSK"
-#: ../clients/cli/devices.c:3051
+#: ../clients/cli/devices.c:3271
#, fuzzy, c-format
msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
msgstr "'%s' 的長度不合規定(應為 5 或 6 位數)"
-#: ../clients/cli/devices.c:3067
+#: ../clients/cli/devices.c:3287
#, c-format
msgid "Hotspot password: %s\n"
msgstr ""
-#: ../clients/cli/devices.c:3125
+#: ../clients/cli/devices.c:3351
#, fuzzy, c-format
msgid "Error: ssid is too long."
msgstr "錯誤:需要「ssid」。"
-#: ../clients/cli/devices.c:3137
+#: ../clients/cli/devices.c:3363
#, fuzzy, c-format
msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
msgstr "錯誤:wep-key-type 引數值「%s」無效,請使用「key」或是「phrase」。"
-#: ../clients/cli/devices.c:3161
+#: ../clients/cli/devices.c:3384
#, fuzzy, c-format
msgid "Error: Unknown parameter %s."
msgstr "不明的參數:%s\n"
-#: ../clients/cli/devices.c:3180
+#: ../clients/cli/devices.c:3405
#, fuzzy, c-format
msgid "Error: channel requires band too."
msgstr "錯誤:需要「apn」。"
-#: ../clients/cli/devices.c:3186
+#: ../clients/cli/devices.c:3410
#, fuzzy, c-format
msgid "Error: channel '%s' not valid for band '%s'."
msgstr "錯誤:「channel」:「%s」無效;請使用 <1-13>。"
-#: ../clients/cli/devices.c:3214
+#: ../clients/cli/devices.c:3434
#, fuzzy, c-format
msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
msgstr "錯誤:裝置「%s」不是個 Wi-Fi 裝置。"
-#: ../clients/cli/devices.c:3249
+#: ../clients/cli/devices.c:3468
#, fuzzy, c-format
msgid "Error: Invalid 'password': %s."
msgstr "錯誤:無效的內容「%s」:%s。"
-#: ../clients/cli/devices.c:3318
+#: ../clients/cli/devices.c:3542
#, fuzzy, c-format
msgid "Error: '%s' cannot repeat."
msgstr "錯誤:「%s」設定不存在\n"
-#: ../clients/cli/devices.c:3399
-#, c-format
-msgid "Error: 'device wifi' command '%s' is not valid."
-msgstr "錯誤:「device wifi」指令「%s」無效。"
-
#. Main header name
-#: ../clients/cli/devices.c:3425
+#: ../clients/cli/devices.c:3651
msgid "Device LLDP neighbors"
msgstr ""
-#: ../clients/cli/devices.c:3528
+#: ../clients/cli/devices.c:3759
#, fuzzy, c-format
msgid "Error: 'device lldp list': %s"
msgstr "錯誤:「device status」:%s"
-#: ../clients/cli/devices.c:3575
-#, fuzzy, c-format
-msgid "Error: 'device lldp' command '%s' is not valid."
-msgstr "錯誤:「device wifi」指令「%s」無效。"
-
-#: ../clients/cli/devices.c:3770
-#, c-format
-msgid "Error: 'dev' command '%s' is not valid."
-msgstr "錯誤:「dev」指令「%s」不合乎規定。"
-
-#: ../clients/cli/general.c:34
+#: ../clients/cli/general.c:37
msgid "RUNNING"
msgstr "RUNNING"
#. 0
-#: ../clients/cli/general.c:35
+#: ../clients/cli/general.c:38
msgid "VERSION"
msgstr "VERSION"
#. 2
-#: ../clients/cli/general.c:37
+#: ../clients/cli/general.c:40
msgid "STARTUP"
msgstr "STARTUP"
#. 3
-#: ../clients/cli/general.c:38
+#: ../clients/cli/general.c:41
msgid "CONNECTIVITY"
msgstr "CONNECTIVITY"
#. 4
-#: ../clients/cli/general.c:39
+#: ../clients/cli/general.c:42
msgid "NETWORKING"
msgstr "NETWORKING"
#. 5
-#: ../clients/cli/general.c:40
+#: ../clients/cli/general.c:43
msgid "WIFI-HW"
msgstr "WIFI-HW"
#. 6
-#: ../clients/cli/general.c:41
+#: ../clients/cli/general.c:44
msgid "WIFI"
msgstr "WIFI-HARDWARE"
#. 7
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:45
msgid "WWAN-HW"
msgstr "WWAN-HW"
#. 8
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:46
msgid "WWAN"
msgstr "WWAN"
#. 9
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:47
msgid "WIMAX-HW"
msgstr "WIMAX-HW"
#. 10
-#: ../clients/cli/general.c:45
+#: ../clients/cli/general.c:48
msgid "WIMAX"
msgstr "WIMAX"
-#: ../clients/cli/general.c:61
+#: ../clients/cli/general.c:64
msgid "PERMISSION"
msgstr "PERMISSION"
#. 0
-#: ../clients/cli/general.c:62
+#: ../clients/cli/general.c:65
msgid "VALUE"
msgstr "VALUE"
-#: ../clients/cli/general.c:70
+#: ../clients/cli/general.c:73
msgid "LEVEL"
msgstr "LEVEL"
#. 0
-#: ../clients/cli/general.c:71
+#: ../clients/cli/general.c:74
msgid "DOMAINS"
msgstr "DOMAINS"
-#: ../clients/cli/general.c:85
+#: ../clients/cli/general.c:88
#, c-format
msgid ""
"Usage: nmcli general { COMMAND | help }\n"
@@ -4867,7 +4510,7 @@ msgstr ""
" logging [level <log level>] [domains <log domains>]\n"
"\n"
-#: ../clients/cli/general.c:96
+#: ../clients/cli/general.c:99
#, c-format
msgid ""
"Usage: nmcli general status { help }\n"
@@ -4884,7 +4527,7 @@ msgstr ""
"status'\n"
"\n"
-#: ../clients/cli/general.c:105
+#: ../clients/cli/general.c:108
#, c-format
msgid ""
"Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -4893,8 +4536,8 @@ msgid ""
"\n"
"Get or change persistent system hostname.\n"
"With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system hostname."
-"\n"
+"a hostname, NetworkManager will set it as the new persistent system "
+"hostname.\n"
"\n"
msgstr ""
"Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -4903,11 +4546,11 @@ msgstr ""
"\n"
"Get or change persistent system hostname.\n"
"With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system hostname."
-"\n"
+"a hostname, NetworkManager will set it as the new persistent system "
+"hostname.\n"
"\n"
-#: ../clients/cli/general.c:117
+#: ../clients/cli/general.c:120
#, c-format
msgid ""
"Usage: nmcli general permissions { help }\n"
@@ -4920,7 +4563,7 @@ msgstr ""
"Show caller permissions for authenticated operations.\n"
"\n"
-#: ../clients/cli/general.c:125
+#: ../clients/cli/general.c:128
#, c-format
msgid ""
"Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -4947,7 +4590,7 @@ msgstr ""
"for the list of possible logging domains.\n"
"\n"
-#: ../clients/cli/general.c:138
+#: ../clients/cli/general.c:141
#, c-format
msgid ""
"Usage: nmcli networking { COMMAND | help }\n"
@@ -4972,29 +4615,33 @@ msgstr ""
" connectivity [check]\n"
"\n"
-#: ../clients/cli/general.c:148
+#: ../clients/cli/general.c:151
#, c-format
-msgid "Usage: nmcli networking on { help }\n"
+msgid ""
+"Usage: nmcli networking on { help }\n"
"\n"
"Switch networking on.\n"
"\n"
-msgstr "Usage: nmcli networking on { help }\n"
+msgstr ""
+"Usage: nmcli networking on { help }\n"
"\n"
"Switch networking on.\n"
"\n"
-#: ../clients/cli/general.c:156
+#: ../clients/cli/general.c:159
#, c-format
-msgid "Usage: nmcli networking off { help }\n"
+msgid ""
+"Usage: nmcli networking off { help }\n"
"\n"
"Switch networking off.\n"
"\n"
-msgstr "Usage: nmcli networking off { help }\n"
+msgstr ""
+"Usage: nmcli networking off { help }\n"
"\n"
"Switch networking off.\n"
"\n"
-#: ../clients/cli/general.c:164
+#: ../clients/cli/general.c:167
#, c-format
msgid ""
"Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -5002,8 +4649,8 @@ msgid ""
"ARGUMENTS := [check]\n"
"\n"
"Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the connectivity."
-"\n"
+"The optional 'check' argument makes NetworkManager re-check the "
+"connectivity.\n"
"\n"
msgstr ""
"Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -5011,11 +4658,11 @@ msgstr ""
"ARGUMENTS := [check]\n"
"\n"
"Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the connectivity."
-"\n"
+"The optional 'check' argument makes NetworkManager re-check the "
+"connectivity.\n"
"\n"
-#: ../clients/cli/general.c:176
+#: ../clients/cli/general.c:179
#, fuzzy, c-format
msgid ""
"Usage: nmcli radio { COMMAND | help }\n"
@@ -5036,7 +4683,7 @@ msgstr ""
" all | wifi | wwan [ on | off ]\n"
"\n"
-#: ../clients/cli/general.c:185
+#: ../clients/cli/general.c:188
#, c-format
msgid ""
"Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -5053,7 +4700,7 @@ msgstr ""
"Get status of all radio switches, or turn them on/off.\n"
"\n"
-#: ../clients/cli/general.c:195
+#: ../clients/cli/general.c:198
#, c-format
msgid ""
"Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -5070,7 +4717,7 @@ msgstr ""
"Get status of Wi-Fi radio switch, or turn it on/off.\n"
"\n"
-#: ../clients/cli/general.c:205
+#: ../clients/cli/general.c:208
#, c-format
msgid ""
"Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -5087,7 +4734,7 @@ msgstr ""
"Get status of mobile broadband radio switch, or turn it on/off.\n"
"\n"
-#: ../clients/cli/general.c:215
+#: ../clients/cli/general.c:218
#, c-format
msgid ""
"Usage: nmcli monitor\n"
@@ -5097,215 +4744,268 @@ msgid ""
"\n"
msgstr ""
-#: ../clients/cli/general.c:233
+#: ../clients/cli/general.c:236
msgid "asleep"
msgstr "睡眠中"
-#: ../clients/cli/general.c:235
+#: ../clients/cli/general.c:238
msgid "connecting"
msgstr "連線中"
-#: ../clients/cli/general.c:237
+#: ../clients/cli/general.c:240
msgid "connected (local only)"
msgstr "已連上(只有本機)"
-#: ../clients/cli/general.c:239
+#: ../clients/cli/general.c:242
msgid "connected (site only)"
msgstr "已連上(只有網站)"
-#: ../clients/cli/general.c:243
+#: ../clients/cli/general.c:246
msgid "disconnecting"
msgstr "正在切斷連線"
-#: ../clients/cli/general.c:279
+#: ../clients/cli/general.c:282
msgid "portal"
msgstr "入口網站"
-#: ../clients/cli/general.c:281
+#: ../clients/cli/general.c:284
msgid "limited"
msgstr "受限"
-#: ../clients/cli/general.c:283
+#: ../clients/cli/general.c:286
msgid "full"
msgstr "已滿"
-#: ../clients/cli/general.c:334
+#: ../clients/cli/general.c:337
#, c-format
msgid "Error: only these fields are allowed: %s"
msgstr "錯誤:只允許這些欄位:%s"
-#: ../clients/cli/general.c:360
+#: ../clients/cli/general.c:352
msgid "NetworkManager status"
msgstr "NetworkManager 狀態"
-#: ../clients/cli/general.c:365
+#: ../clients/cli/general.c:357
msgid "running"
msgstr "執行中"
-#: ../clients/cli/general.c:368
+#: ../clients/cli/general.c:360
msgid "starting"
msgstr "正在開始"
-#: ../clients/cli/general.c:368
+#: ../clients/cli/general.c:360
msgid "started"
msgstr "已開始"
-#: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
-#: ../clients/cli/general.c:374
+#: ../clients/cli/general.c:362 ../clients/cli/general.c:363
+#: ../clients/cli/general.c:364 ../clients/cli/general.c:365
+#: ../clients/cli/general.c:366
msgid "enabled"
msgstr "已啟用"
-#: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
-#: ../clients/cli/general.c:374
+#: ../clients/cli/general.c:362 ../clients/cli/general.c:363
+#: ../clients/cli/general.c:364 ../clients/cli/general.c:365
+#: ../clients/cli/general.c:366
msgid "disabled"
msgstr "已停用"
-#: ../clients/cli/general.c:446
+#: ../clients/cli/general.c:450
msgid "auth"
msgstr "auth"
-#: ../clients/cli/general.c:475
+#: ../clients/cli/general.c:491
#, c-format
msgid "Error: 'general permissions': %s"
msgstr "錯誤:「general permissions」:%s"
-#: ../clients/cli/general.c:489
+#: ../clients/cli/general.c:497
msgid "NetworkManager permissions"
msgstr "NetworkManager 權限"
-#: ../clients/cli/general.c:530
+#: ../clients/cli/general.c:607
#, c-format
msgid "Error: 'general logging': %s"
msgstr "錯誤:「general logging」:%s"
-#: ../clients/cli/general.c:545
+#: ../clients/cli/general.c:621
msgid "NetworkManager logging"
msgstr "NetworkManager 日誌"
-#: ../clients/cli/general.c:567
-#, fuzzy, c-format
-msgid "Error: failed to set hostname: %s"
-msgstr "錯誤:無法設定主機名稱:(%d) %s"
-
-#: ../clients/cli/general.c:680
+#: ../clients/cli/general.c:670
#, fuzzy, c-format
msgid "Error: failed to set logging: %s"
msgstr "錯誤:設置日誌的存取被拒絕;%s"
-#: ../clients/cli/general.c:689
-#, c-format
-msgid "Error: 'general' command '%s' is not valid."
-msgstr "錯誤:「general」指令「%s」無效。"
+#: ../clients/cli/general.c:687
+#, fuzzy, c-format
+msgid "Error: failed to set hostname: %s"
+msgstr "錯誤:無法設定主機名稱:(%d) %s"
-#: ../clients/cli/general.c:707
+#: ../clients/cli/general.c:753
#, c-format
msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
msgstr "錯誤:「--fields」值「%s」在此無效(允許的欄位:%s)"
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:778
#, c-format
msgid "Error: invalid '%s' argument: '%s' (use on/off)."
msgstr "錯誤:無效的「%s」引數:「%s」(請使用 on/off)。"
-#: ../clients/cli/general.c:743
+#. no arguments -> get current state
+#: ../clients/cli/general.c:823 ../clients/cli/general.c:835
msgid "Connectivity"
msgstr "連線性"
-#: ../clients/cli/general.c:758
-msgid "Networking"
-msgstr "網路作業"
-
-#: ../clients/cli/general.c:783
-#, c-format
-msgid "Error: 'networking connectivity' command '%s' is not valid."
-msgstr "錯誤:「network connectivity」指令「%s」無效。"
-
-#: ../clients/cli/general.c:799
+#: ../clients/cli/general.c:838
#, c-format
msgid "Error: 'networking' command '%s' is not valid."
msgstr "錯誤:「networking」指令「%s」無效。"
-#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
+#: ../clients/cli/general.c:851
+msgid "Networking"
+msgstr "網路作業"
+
+#: ../clients/cli/general.c:889
msgid "Radio switches"
msgstr "Radio 開關"
#. no argument, show current WiFi state
-#: ../clients/cli/general.c:866
+#: ../clients/cli/general.c:918
msgid "Wi-Fi radio switch"
msgstr "Wi-fi radio 開關"
#. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:944
msgid "WWAN radio switch"
msgstr "WWAN radio 開關"
-#: ../clients/cli/general.c:893
-#, c-format
-msgid "Error: 'radio' command '%s' is not valid."
-msgstr "錯誤:「radio」指令「%s」無效。"
-
-#: ../clients/cli/general.c:914
+#: ../clients/cli/general.c:991
#, fuzzy
msgid "NetworkManager has started"
msgstr "NetworkManager 狀態"
-#: ../clients/cli/general.c:917
+#: ../clients/cli/general.c:991
#, fuzzy
msgid "NetworkManager has stopped"
msgstr "NetworkManager 狀態"
-#: ../clients/cli/general.c:931
+#: ../clients/cli/general.c:1002
#, fuzzy, c-format
msgid "Hostname set to '%s'\n"
msgstr "將主機名稱設定為「%s」"
-#: ../clients/cli/general.c:946
+#: ../clients/cli/general.c:1017
#, fuzzy, c-format
msgid "'%s' is now the primary connection\n"
msgstr "設定「%s」不存在連線中。\n"
-#: ../clients/cli/general.c:948
+#: ../clients/cli/general.c:1019
#, fuzzy, c-format
msgid "There's no primary connection\n"
msgstr "驗證連線:%s\n"
-#: ../clients/cli/general.c:960
+#: ../clients/cli/general.c:1031
#, fuzzy, c-format
msgid "Connectivity is now '%s'\n"
msgstr "連線性"
-#: ../clients/cli/general.c:973
+#: ../clients/cli/general.c:1044
#, fuzzy, c-format
msgid "Networkmanager is now in the '%s' state\n"
msgstr "NetworkManager 並不在執行中。"
-#: ../clients/cli/general.c:984
+#: ../clients/cli/general.c:1065
+msgid "connection available"
+msgstr ""
+
+#: ../clients/cli/general.c:1067
+msgid "connections available"
+msgstr ""
+
+#: ../clients/cli/general.c:1085
+msgid "autoconnect"
+msgstr ""
+
+#: ../clients/cli/general.c:1087
+msgid "fw missing"
+msgstr ""
+
+#: ../clients/cli/general.c:1092
+msgid "plugin missing"
+msgstr ""
+
+#: ../clients/cli/general.c:1097
+msgid "sw"
+msgstr ""
+
+#: ../clients/cli/general.c:1099
+msgid "hw"
+msgstr ""
+
+#: ../clients/cli/general.c:1104
+msgid "iface"
+msgstr ""
+
+#: ../clients/cli/general.c:1107
+msgid "port"
+msgstr ""
+
+#: ../clients/cli/general.c:1110
+msgid "mtu"
+msgstr ""
+
+#: ../clients/cli/general.c:1127
+msgid "master"
+msgstr ""
+
+#: ../clients/cli/general.c:1133
+msgid "ip4 default"
+msgstr ""
+
+#: ../clients/cli/general.c:1135
+msgid "ip6 default"
+msgstr ""
+
+#: ../clients/cli/general.c:1213
+#, c-format
+msgid "%s VPN connection"
+msgstr ""
+
+#: ../clients/cli/general.c:1283
+#, c-format
+msgid ""
+"Use \"nmcli device show\" to get complete information about known devices "
+"and\n"
+"\"nmcli connection show\" to get an overview on active connection profiles.\n"
+"\n"
+"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
+"details.\n"
+msgstr ""
+
+#: ../clients/cli/general.c:1302
#, fuzzy, c-format
msgid "Error: 'monitor' command '%s' is not valid."
msgstr "錯誤:「radio」指令「%s」無效。"
-#: ../clients/cli/general.c:998
+#: ../clients/cli/general.c:1314
#, fuzzy
msgid "Networkmanager is not running (waiting for it)\n"
msgstr "NetworkManager 並不在執行中。"
-#: ../clients/cli/nmcli.c:83
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:181
+#, c-format
msgid ""
-"Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+"Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
"\n"
"OPTIONS\n"
" -t[erse] terse output\n"
" -p[retty] pretty output\n"
" -m[ode] tabular|multiline output mode\n"
-" -c[olors] auto|yes|no whether to use colors in output\n"
+" -c[olors] auto|yes|no whether to use colors in "
+"output\n"
" -f[ields] <field1,field2,...>|all|common specify fields to output\n"
" -e[scape] yes|no escape columns separators in "
"values\n"
-" -n[ocheck] don't check nmcli and "
-"NetworkManager versions\n"
" -a[sk] ask for missing parameters\n"
" -s[how-secrets] allow displaying passwords\n"
" -w[ait] <seconds> set timeout waiting for "
@@ -5323,111 +5023,65 @@ msgid ""
" m[onitor] monitor NetworkManager changes\n"
"\n"
msgstr ""
-"使用方法:%s [OPTIONS] OBJECT { COMMAND | help }\n"
-"\n"
-"OPTIONS\n"
-" -t[erse] terse output\n"
-" -p[retty] pretty output\n"
-" -m[ode] tabular|multiline output mode\n"
-" -f[ields] <field1,field2,...>|all|common specify fields to output\n"
-" -e[scape] yes|no escape columns separators in "
-"values\n"
-" -n[ocheck] don't check nmcli and "
-"NetworkManager versions\n"
-" -a[sk] ask for missing parameters\n"
-" -w[ait] <seconds> set timeout waiting for "
-"finishing operations\n"
-" -v[ersion] show program version\n"
-" -h[elp] print this help\n"
-"\n"
-"OBJECT\n"
-" g[eneral] NetworkManager's general status and operations\n"
-" n[etworking] overall networking control\n"
-" r[adio] NetworkManager radio switches\n"
-" c[onnection] NetworkManager's connections\n"
-" d[evice] devices managed by NetworkManager\n"
-"\n"
-#: ../clients/cli/nmcli.c:143
-#, c-format
-msgid "Error: Object '%s' is unknown, try 'nmcli help'."
-msgstr "錯誤:物件 '%s' 不明,請嘗試 'nmcli help'。"
-
-#: ../clients/cli/nmcli.c:173
+#: ../clients/cli/nmcli.c:258
#, c-format
msgid "Error: Option '--terse' is specified the second time."
msgstr "錯誤:選項 '--terse' 已指定了第二次。"
-#: ../clients/cli/nmcli.c:178
+#: ../clients/cli/nmcli.c:263
#, c-format
msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
msgstr "錯誤:選項 '--terse' 和 '--pretty' 是互斥的。"
-#: ../clients/cli/nmcli.c:186
+#: ../clients/cli/nmcli.c:271
#, c-format
msgid "Error: Option '--pretty' is specified the second time."
msgstr "錯誤:選項 '--pretty' 已指定了第二次。"
-#: ../clients/cli/nmcli.c:191
+#: ../clients/cli/nmcli.c:276
#, c-format
msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
msgstr "錯誤:選項 '--pretty' 和 '--terse' 是互斥的。"
-#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
-#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
+#: ../clients/cli/nmcli.c:285 ../clients/cli/nmcli.c:302
+#: ../clients/cli/nmcli.c:321 ../clients/cli/nmcli.c:354
#, c-format
msgid "Error: missing argument for '%s' option."
msgstr "錯誤:'%s' 選項的引數遺失。"
-#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
-#: ../clients/cli/nmcli.c:244
+#: ../clients/cli/nmcli.c:296 ../clients/cli/nmcli.c:315
+#: ../clients/cli/nmcli.c:332
#, c-format
msgid "Error: '%s' is not valid argument for '%s' option."
msgstr "錯誤:'%s' 不是 '%s' 選項的有效引數。"
-#: ../clients/cli/nmcli.c:251
+#: ../clients/cli/nmcli.c:338
#, c-format
msgid "Error: fields for '%s' options are missing."
msgstr "錯誤:找不到 '%s' 選項的欄位。"
-#: ../clients/cli/nmcli.c:271
+#: ../clients/cli/nmcli.c:359
#, c-format
msgid "Error: '%s' is not a valid timeout for '%s' option."
msgstr "錯誤:「%s」不是「%s」選項的有效逾時值。"
-#: ../clients/cli/nmcli.c:278
+#: ../clients/cli/nmcli.c:367
#, c-format
msgid "nmcli tool, version %s\n"
msgstr "nmcli 工具,版本 %s\n"
-#: ../clients/cli/nmcli.c:284
+#: ../clients/cli/nmcli.c:374
#, c-format
msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
msgstr "錯誤:選項 '%s' 不明,請嚐試 'nmcli -help'。"
-#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
-#, fuzzy, c-format
-msgid "\n"
-"Error: nmcli terminated by signal %s (%d)\n"
-msgstr "\n"
-"錯誤:nmcli 已被訊號 %d 終止。"
-
-#: ../clients/cli/nmcli.c:408
-#, fuzzy, c-format
-msgid "Failed to set signal mask: %d\n"
-msgstr "無法設置訊號遮罩:%d"
-
-#: ../clients/cli/nmcli.c:415
-#, fuzzy, c-format
-msgid "Failed to create signal handling thread: %d\n"
-msgstr "無法建立訊號處理執行續:%d"
-
-#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
-#, fuzzy, c-format
-msgid "Error: Could not create NMClient object: %s."
-msgstr "錯誤:無法建立 NMClient 物件。"
+#: ../clients/cli/nmcli.c:419 ../clients/cli/nmcli.c:426
+#, c-format
+msgid "Error: nmcli terminated by signal %s (%d)\n"
+msgstr ""
-#: ../clients/cli/nmcli.c:529
+#: ../clients/cli/nmcli.c:524
msgid "Success"
msgstr "成功"
@@ -5446,292 +5100,315 @@ msgstr "身份認證"
msgid "Warning: polkit agent initialization failed: %s\n"
msgstr "數據機初始化失敗"
-#: ../clients/cli/settings.c:790
+#: ../clients/cli/settings.c:820
#, fuzzy, c-format
msgid "%d (key)"
msgstr "%d(十六進位的 ascii-key)"
-#: ../clients/cli/settings.c:792
+#: ../clients/cli/settings.c:822
#, fuzzy, c-format
msgid "%d (passphrase)"
msgstr "%d(104/128 位元密碼)"
-#: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881
+#: ../clients/cli/settings.c:825 ../clients/cli/settings.c:911
#, c-format
msgid "%d (unknown)"
msgstr "%d(不明)"
-#: ../clients/cli/settings.c:824
+#: ../clients/cli/settings.c:854
msgid "0 (NONE)"
msgstr "0 (NONE)"
-#: ../clients/cli/settings.c:830
+#: ../clients/cli/settings.c:860
msgid "REORDER_HEADERS, "
msgstr "REORDER_HEADERS, "
-#: ../clients/cli/settings.c:832
+#: ../clients/cli/settings.c:862
msgid "GVRP, "
msgstr "GVRP, "
-#: ../clients/cli/settings.c:834
+#: ../clients/cli/settings.c:864
msgid "LOOSE_BINDING, "
msgstr "LOOSE_BINDING, "
-#: ../clients/cli/settings.c:836
+#: ../clients/cli/settings.c:866
#, fuzzy
msgid "MVRP, "
msgstr "GVRP, "
-#: ../clients/cli/settings.c:875
+#: ../clients/cli/settings.c:905
#, c-format
msgid "%d (disabled)"
msgstr "%d (已停用)"
-#: ../clients/cli/settings.c:877
+#: ../clients/cli/settings.c:907
#, c-format
msgid "%d (enabled, prefer public IP)"
msgstr "%d (已啟用,建議使用公用 IP)"
-#: ../clients/cli/settings.c:879
+#: ../clients/cli/settings.c:909
#, c-format
msgid "%d (enabled, prefer temporary IP)"
msgstr "%d (已啟用,建議使用暫時性 IP)"
-#: ../clients/cli/settings.c:894
+#: ../clients/cli/settings.c:924
#, fuzzy, c-format
msgid "%d (no)"
msgstr "%d(不明)"
-#: ../clients/cli/settings.c:896
+#: ../clients/cli/settings.c:926
#, c-format
msgid "%d (yes)"
msgstr ""
-#: ../clients/cli/settings.c:899 ../clients/cli/settings.c:1554
+#: ../clients/cli/settings.c:929 ../clients/cli/settings.c:1340
+#: ../clients/cli/settings.c:1692
#, fuzzy, c-format
msgid "%d (default)"
msgstr "(預設)"
-#: ../clients/cli/settings.c:912
+#: ../clients/cli/settings.c:942
msgid "0 (none)"
msgstr "0 (none)"
-#: ../clients/cli/settings.c:918
+#: ../clients/cli/settings.c:948
msgid "agent-owned, "
msgstr "agent-owned, "
-#: ../clients/cli/settings.c:920
+#: ../clients/cli/settings.c:950
msgid "not saved, "
msgstr "not saved, "
-#: ../clients/cli/settings.c:922
+#: ../clients/cli/settings.c:952
msgid "not required, "
msgstr "not required, "
-#: ../clients/cli/settings.c:971 ../clients/tui/nmt-mtu-entry.c:84
+#: ../clients/cli/settings.c:1001 ../clients/tui/nmt-mtu-entry.c:84
msgid "(default)"
msgstr "(預設)"
-#: ../clients/cli/settings.c:1252
+#. ----------------------------------------------------------------------------
+#: ../clients/cli/settings.c:1093 ../clients/cli/settings.c:1150
+#: ../clients/cli/settings.c:1191 ../clients/cli/settings.c:1225
+#: ../clients/cli/settings.c:8301
+msgid "<hidden>"
+msgstr ""
+
+#: ../clients/cli/settings.c:1342
+#, c-format
+msgid "%d (forever)"
+msgstr ""
+
+#: ../clients/cli/settings.c:1389
msgid "0 (disabled)"
msgstr "0(已停用)"
-#: ../clients/cli/settings.c:1258
+#: ../clients/cli/settings.c:1395
msgid "enabled, "
msgstr "enabled, "
-#: ../clients/cli/settings.c:1260
+#: ../clients/cli/settings.c:1397
msgid "advertise, "
msgstr "advertise, "
-#: ../clients/cli/settings.c:1262
+#: ../clients/cli/settings.c:1399
msgid "willing, "
msgstr "willing, "
-#: ../clients/cli/settings.c:1290
+#: ../clients/cli/settings.c:1427
msgid "-1 (unset)"
msgstr "-1(反設定)"
-#: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724
-#: ../clients/cli/settings.c:1864
+#: ../clients/cli/settings.c:1559 ../clients/cli/settings.c:1887
+#: ../clients/cli/settings.c:2028
msgid "auto"
msgstr "auto"
-#: ../clients/cli/settings.c:1435 ../clients/cli/settings.c:1895
+#: ../clients/cli/settings.c:1572 ../clients/cli/settings.c:2059
msgid "default"
msgstr "default"
-#: ../clients/cli/settings.c:1556
+#: ../clients/cli/settings.c:1694
#, fuzzy, c-format
msgid "%d (off)"
msgstr "%d(不明)"
-#: ../clients/cli/settings.c:1770
+#: ../clients/cli/settings.c:1933
#, c-format
msgid ""
"invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
"'none'"
msgstr ""
-#: ../clients/cli/settings.c:1781
+#: ../clients/cli/settings.c:1944
msgid "'default' and 'ignore' are incompatible with other flags"
msgstr ""
-#: ../clients/cli/settings.c:1817
+#: ../clients/cli/settings.c:1980
#, fuzzy, c-format
msgid "invalid mode '%s', use one of %s"
msgstr "無效的欄位「%s」; 允許的欄位:%s"
-#: ../clients/cli/settings.c:1899
+#: ../clients/cli/settings.c:2063
#, c-format
msgid "always"
msgstr ""
-#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
-#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
-#: ../libnm-core/nm-keyfile-reader.c:573
+#: ../clients/cli/settings.c:2163 ../clients/cli/settings.c:3618
+#: ../clients/cli/settings.c:4803 ../clients/cli/settings.c:5307
+#: ../libnm-core/nm-keyfile-reader.c:579
#, fuzzy, c-format
msgid "invalid option '%s', use one of [%s]"
msgstr "不合於規定的選項 '%s' 或其值為 '%s'"
-#: ../clients/cli/settings.c:2116
+#: ../clients/cli/settings.c:2236
+#, c-format
+msgid "invalid method '%s', use one of %s"
+msgstr ""
+
+#: ../clients/cli/settings.c:2332
#, c-format
msgid "Do you also want to set '%s' to '%s'? [yes]: "
msgstr "您是否也希望將「%s」設為「%s」?[yes]:"
-#: ../clients/cli/settings.c:2118
+#: ../clients/cli/settings.c:2334
#, c-format
msgid "Do you also want to clear '%s'? [yes]: "
msgstr "您是否也希望清除「%s」?[yes]:"
-#: ../clients/cli/settings.c:2279
+#: ../clients/cli/settings.c:2510
#, c-format
msgid ""
"Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
msgstr ""
-#: ../clients/cli/settings.c:2298
+#: ../clients/cli/settings.c:2529
#, c-format
msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
msgstr ""
-#: ../clients/cli/settings.c:2300
+#: ../clients/cli/settings.c:2531
#, fuzzy
msgid "Do you want to remove them? [yes] "
msgstr "您是否希望提供它們?(yes/no)[yes]"
-#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
-#: ../clients/cli/settings.c:5182
+#: ../clients/cli/settings.c:2677 ../clients/cli/settings.c:3072
+#: ../clients/cli/settings.c:5508
#, c-format
msgid "'%s' is not valid"
msgstr "「%s」無效"
-#: ../clients/cli/settings.c:2419
+#: ../clients/cli/settings.c:2700
#, c-format
msgid "'%d' is not valid; use <%d-%d>"
msgstr "「%d」無效;請使用 <%d-%d>"
-#: ../clients/cli/settings.c:2441
+#: ../clients/cli/settings.c:2722
#, fuzzy, c-format
msgid "'%lld' is not valid; use <%lld-%lld>"
msgstr "「%d」無效;請使用 <%d-%d>"
-#: ../clients/cli/settings.c:2463
+#: ../clients/cli/settings.c:2744
#, fuzzy, c-format
msgid "'%u' is not valid; use <%u-%u>"
msgstr "「%u」無效;請使用 <%d-%d>"
-#: ../clients/cli/settings.c:2502
+#: ../clients/cli/settings.c:2783
#, fuzzy, c-format
msgid "'%u' flags are not valid; use combination of %s"
msgstr "「%s」無效;請使用「%s」或是「%s」"
-#: ../clients/cli/settings.c:2569
+#: ../clients/cli/settings.c:2850
#, c-format
msgid "'%s' is not valid; use <option>=<value>"
msgstr "「%s」無效;請使用 <option>=<value>"
-#: ../clients/cli/settings.c:2603
+#: ../clients/cli/settings.c:2884
#, c-format
msgid "index '%s' is not valid"
msgstr "索引「%s」無效"
-#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
+#: ../clients/cli/settings.c:2889 ../clients/cli/settings.c:2914
msgid "no item to remove"
msgstr "沒有可移除的項目"
-#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
+#: ../clients/cli/settings.c:2893 ../clients/cli/settings.c:2918
#, c-format
msgid "index '%d' is not in range <0-%d>"
msgstr "索引「%d」不在範圍內 <0-%d>"
-#: ../clients/cli/settings.c:2652
+#: ../clients/cli/settings.c:2933
#, c-format
msgid "invalid option '%s'"
msgstr "無效的選項「%s」"
-#: ../clients/cli/settings.c:2654
+#: ../clients/cli/settings.c:2935
msgid "missing option"
msgstr "遺失選項"
-#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
-#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
+#: ../clients/cli/settings.c:2962 ../clients/cli/settings.c:2982
+#: ../clients/cli/settings.c:3002 ../clients/cli/settings.c:3022
#, c-format
msgid "'%s' is not a valid number (or out of range)"
msgstr "「%s」不是個有效的數字(或是不在範圍內)"
-#: ../clients/cli/settings.c:2775
+#: ../clients/cli/settings.c:3056
#, fuzzy, c-format
msgid "'%s' is not a valid value; use -1, 0 or 1"
msgstr "「%s」無效;請使用 0、1 或 2"
-#: ../clients/cli/settings.c:2807
+#: ../clients/cli/settings.c:3089
#, c-format
msgid "'%s' is not a valid Ethernet MAC"
msgstr "「%s」不是個有效的乙太網路 MAC"
-#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
-#: ../libnm-core/nm-setting-infiniband.c:255
-#: ../libnm-util/nm-setting-connection.c:834
-#: ../libnm-util/nm-setting-infiniband.c:269
-#, c-format
-msgid "'%s' is not a valid interface name"
-msgstr "「%s」不是組有效的介面卡名稱"
-
-#: ../clients/cli/settings.c:2856
+#: ../clients/cli/settings.c:3148
#, fuzzy, c-format
msgid "'%s' is not a valid flag number; use <0-%d>"
msgstr "「%s」不是個有效的頻道;請使用 <1-13>"
-#: ../clients/cli/settings.c:2868
+#: ../clients/cli/settings.c:3160
#, c-format
msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
msgstr ""
-#: ../clients/cli/settings.c:2909
+#: ../clients/cli/settings.c:3211
#, c-format
msgid "'%s' is not a valid hex character"
msgstr "「%s」不是個有效的十六進位字元"
-#: ../clients/cli/settings.c:2939
+#: ../clients/cli/settings.c:3241
#, c-format
msgid "'%s' is not a valid MAC"
msgstr "「%s」不是個有效的 MAC"
-#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
+#. Don't allow setting type unless the connection is brand new.
+#. * Just because it's a bad idea and the user wouldn't probably want that.
+#. * No technical reason, really.
+#. * Also, using uuid to see if the connection is brand new is a bit
+#. * hacky: we can not see if the type is already set, because
+#. * nmc_setting_set_property() is called only after the property
+#. * we're setting (type) has been removed.
+#: ../clients/cli/settings.c:3269
+#, fuzzy, c-format
+msgid "Can not change the connection type"
+msgstr "輸入連線類型:"
+
+#: ../clients/cli/settings.c:3293 ../libnm-core/nm-setting-connection.c:887
#: ../libnm-util/nm-setting-connection.c:791
#, c-format
msgid "'%s' is not a valid UUID"
msgstr "「%s」不是個有效的 UUID"
-#: ../clients/cli/settings.c:3032
+#: ../clients/cli/settings.c:3360
#, c-format
msgid "the property doesn't contain permission '%s'"
msgstr ""
-#: ../clients/cli/settings.c:3044
+#: ../clients/cli/settings.c:3372
msgid ""
-"Enter a list of user permissions. This is a list of user names formatted as:\n"
+"Enter a list of user permissions. This is a list of user names formatted "
+"as:\n"
" [user:]<user name 1>, [user:]<user name 2>,...\n"
"The items can be separated by commas or spaces.\n"
"\n"
@@ -5743,39 +5420,40 @@ msgstr ""
"\n"
"例如:alice bob charlie\n"
-#: ../clients/cli/settings.c:3063
+#: ../clients/cli/settings.c:3391
#, c-format
msgid "'%s' is not valid master; use ifname or connection UUID"
msgstr "「%s」不是個有效的 master;請使用 ifname 或是連線 UUID"
-#: ../clients/cli/settings.c:3107
+#: ../clients/cli/settings.c:3436
#, c-format
msgid "Warning: %s is not an UUID of any existing connection profile\n"
msgstr ""
-#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
+#: ../clients/cli/settings.c:3440 ../clients/cli/settings.c:3455
#, fuzzy, c-format
msgid "'%s' is not a VPN connection profile"
msgstr "錯誤:「%s」不是個有效的連線類型。"
-#: ../clients/cli/settings.c:3120
+#: ../clients/cli/settings.c:3448
#, fuzzy, c-format
msgid "'%s' is not a name of any exiting profile"
msgstr "'%s' 不是合於規定的 team 配置或檔名"
-#: ../clients/cli/settings.c:3154
+#: ../clients/cli/settings.c:3482
#, fuzzy, c-format
msgid "the value '%s' is not a valid UUID"
msgstr "「%s」不是個有效的 UUID"
-#: ../clients/cli/settings.c:3161
+#: ../clients/cli/settings.c:3489
#, c-format
msgid "the property doesn't contain UUID '%s'"
msgstr ""
-#: ../clients/cli/settings.c:3173
+#: ../clients/cli/settings.c:3501
msgid ""
-"Enter secondary connections that should be activated when this connection is\n"
+"Enter secondary connections that should be activated when this connection "
+"is\n"
"activated. Connections can be specified either by UUID or ID (name). nmcli\n"
"transparently translates names to UUIDs. Note that NetworkManager only "
"supports\n"
@@ -5785,7 +5463,7 @@ msgid ""
"Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
msgstr ""
-#: ../clients/cli/settings.c:3240
+#: ../clients/cli/settings.c:3568
msgid ""
"Enter a value which indicates whether the connection is subject to a data\n"
"quota, usage costs or other limitations. Accepted options are:\n"
@@ -5794,16 +5472,12 @@ msgid ""
"'unknown' to let NetworkManager choose a value using some heuristics\n"
msgstr ""
-#: ../clients/cli/settings.c:3364
-msgid "private key password not provided"
-msgstr "未提供私密金鑰密碼"
-
-#: ../clients/cli/settings.c:3392
+#: ../clients/cli/settings.c:3717
#, fuzzy, c-format
msgid "the property doesn't contain EAP method '%s'"
msgstr "內容不可更改"
-#: ../clients/cli/settings.c:3409
+#: ../clients/cli/settings.c:3734
msgid ""
"Enter file path to CA certificate (optionally prefixed with file://).\n"
" [file://]<file path>\n"
@@ -5811,12 +5485,12 @@ msgid ""
"Example: /home/cimrman/cacert.crt\n"
msgstr ""
-#: ../clients/cli/settings.c:3428
+#: ../clients/cli/settings.c:3753
#, c-format
msgid "the property doesn't contain alternative subject match '%s'"
msgstr ""
-#: ../clients/cli/settings.c:3444
+#: ../clients/cli/settings.c:3769
msgid ""
"Enter file path to client certificate (optionally prefixed with file://).\n"
" [file://]<file path>\n"
@@ -5824,7 +5498,7 @@ msgid ""
"Example: /home/cimrman/jara.crt\n"
msgstr ""
-#: ../clients/cli/settings.c:3456
+#: ../clients/cli/settings.c:3781
msgid ""
"Enter file path to CA certificate for inner authentication (optionally "
"prefixed\n"
@@ -5834,12 +5508,12 @@ msgid ""
"Example: /home/cimrman/ca-zweite-phase.crt\n"
msgstr ""
-#: ../clients/cli/settings.c:3476
+#: ../clients/cli/settings.c:3801
#, c-format
msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
msgstr ""
-#: ../clients/cli/settings.c:3492
+#: ../clients/cli/settings.c:3817
msgid ""
"Enter file path to client certificate for inner authentication (optionally "
"prefixed\n"
@@ -5849,7 +5523,7 @@ msgid ""
"Example: /home/cimrman/jara-zweite-phase.crt\n"
msgstr ""
-#: ../clients/cli/settings.c:3512
+#: ../clients/cli/settings.c:3837
#, fuzzy
msgid ""
"Enter path to a private key and the key password (if not set yet):\n"
@@ -5861,11 +5535,12 @@ msgstr ""
" <file path> [<password>]\n"
"範例:/home/cimrman/jara-priv-key Dardanely\n"
-#: ../clients/cli/settings.c:3583
+#: ../clients/cli/settings.c:3908
msgid ""
"Enter bytes as a list of hexadecimal values.\n"
"Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one "
+"byte\n"
"(b) space-separated list of bytes written as hexadecimal digits (with "
"optional 0x/0X prefix, and optional leading 0).\n"
"\n"
@@ -5875,12 +5550,13 @@ msgstr ""
"以十六進位的值來輸入位元組。\n"
"接受的格式有兩種:\n"
"(a) 十六進位數字字串,每兩個數字代表一個位元組\n"
-"(b) 以空格區隔開來的一列十六進位數字位元組清單(包含選用性的 0x/0x 前綴以及選用性的前置 0)。\n"
+"(b) 以空格區隔開來的一列十六進位數字位元組清單(包含選用性的 0x/0x 前綴以及選"
+"用性的前置 0)。\n"
"\n"
"範例:ab0455a6ea3a74C2\n"
" ab 4 55 0xa6 ea 3a 74 C2\n"
-#: ../clients/cli/settings.c:3704
+#: ../clients/cli/settings.c:4029
#, c-format
msgid ""
"Enter a list of bonding options formatted as:\n"
@@ -5911,56 +5587,57 @@ msgstr ""
"\n"
"範例:mode=2,miimon=120\n"
-#: ../clients/cli/settings.c:3735
+#: ../clients/cli/settings.c:4060
#, c-format
msgid "'%s' is not a valid InfiniBand MAC"
msgstr "「%s」不是個有效的 InfiniBand MAC"
-#: ../clients/cli/settings.c:3772
+#: ../clients/cli/settings.c:4097
#, c-format
msgid "'%s' is not a valid IBoIP P_Key"
msgstr "「%s」不是個有效的 IBoIP P_Key"
-#: ../clients/cli/settings.c:3803
+#: ../clients/cli/settings.c:4128
#, fuzzy, c-format
msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
msgstr "「%s」無效(請使用 ip/[prefix] next-hop [metric])"
-#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
+#: ../clients/cli/settings.c:4176 ../clients/cli/settings.c:4195
#, c-format
msgid "invalid IPv4 address '%s'"
msgstr "無效的 IPv4 位址「%s」"
-#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
+#: ../clients/cli/settings.c:4201 ../clients/cli/settings.c:4509
#, c-format
msgid "the property doesn't contain DNS server '%s'"
msgstr ""
-#: ../clients/cli/settings.c:3888
+#: ../clients/cli/settings.c:4213
msgid ""
"Enter a list of IPv4 addresses of DNS servers.\n"
"\n"
"Example: 8.8.8.8, 8.8.4.4\n"
-msgstr "輸入一列 DNS 伺服器的 IPv4 位址。\n"
+msgstr ""
+"輸入一列 DNS 伺服器的 IPv4 位址。\n"
"\n"
"範例:8.8.8.8, 8.8.4.4\n"
-#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
+#: ../clients/cli/settings.c:4249 ../clients/cli/settings.c:4563
#, c-format
msgid "the property doesn't contain DNS search domain '%s'"
msgstr ""
-#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
+#: ../clients/cli/settings.c:4287 ../clients/cli/settings.c:4601
#, c-format
msgid "the property doesn't contain DNS option '%s'"
msgstr ""
-#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
+#: ../clients/cli/settings.c:4341 ../clients/cli/settings.c:4654
#, c-format
msgid "the property doesn't contain IP address '%s'"
msgstr ""
-#: ../clients/cli/settings.c:4029
+#: ../clients/cli/settings.c:4354
#, fuzzy
msgid ""
"Enter a list of IPv4 addresses formatted as:\n"
@@ -5975,17 +5652,17 @@ msgstr ""
"\n"
"範例:192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
-#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
+#: ../clients/cli/settings.c:4370 ../clients/cli/settings.c:4683
#, fuzzy, c-format
msgid "invalid gateway address '%s'"
msgstr "無效的閘道器「%s」"
-#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
+#: ../clients/cli/settings.c:4425 ../clients/cli/settings.c:4738
#, fuzzy, c-format
msgid "the property doesn't contain route '%s'"
msgstr "內容不可更改"
-#: ../clients/cli/settings.c:4113
+#: ../clients/cli/settings.c:4438
#, fuzzy
msgid ""
"Enter a list of IPv4 routes formatted as:\n"
@@ -6005,12 +5682,12 @@ msgstr ""
"\n"
"Example: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
-#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
+#: ../clients/cli/settings.c:4484 ../clients/cli/settings.c:4503
#, c-format
msgid "invalid IPv6 address '%s'"
msgstr "無效的 IPv6 位址「%s」"
-#: ../clients/cli/settings.c:4196
+#: ../clients/cli/settings.c:4521
msgid ""
"Enter a list of IPv6 addresses of DNS servers. If the IPv6 configuration "
"method is 'auto' these DNS servers are appended to those (if any) returned "
@@ -6021,13 +5698,14 @@ msgid ""
"\n"
"Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
msgstr ""
-"輸入一列 DNS 伺服器的 IPv6 位址。若 IPv6 配置方式為「auto」,這些 DNS "
-"伺服器將會被附加至那些由自動配置所回傳的項目(若存在的話)。因為沒有上游網路,因此 DNS 伺服器不可搭配「shared」或是「link-"
-"local」IPv6 配置方式使用。在所有其它 IPv6 配置方式中,這些 DNS 伺服器會被作為此連線的唯一 DNS 伺服器使用。\n"
+"輸入一列 DNS 伺服器的 IPv6 位址。若 IPv6 配置方式為「auto」,這些 DNS 伺服器"
+"將會被附加至那些由自動配置所回傳的項目(若存在的話)。因為沒有上游網路,因此 "
+"DNS 伺服器不可搭配「shared」或是「link-local」IPv6 配置方式使用。在所有其它 "
+"IPv6 配置方式中,這些 DNS 伺服器會被作為此連線的唯一 DNS 伺服器使用。\n"
"\n"
"範例:2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
-#: ../clients/cli/settings.c:4342
+#: ../clients/cli/settings.c:4667
#, fuzzy
msgid ""
"Enter a list of IPv6 addresses formatted as:\n"
@@ -6040,10 +5718,10 @@ msgstr ""
" ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
"遺失的前綴會被視為 128 這個前綴。\n"
"\n"
-"範例:2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, 1050:0:0:0:5:600:300c:"
-"326b\n"
+"範例:2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, "
+"1050:0:0:0:5:600:300c:326b\n"
-#: ../clients/cli/settings.c:4426
+#: ../clients/cli/settings.c:4751
#, fuzzy
msgid ""
"Enter a list of IPv6 routes formatted as:\n"
@@ -6065,28 +5743,28 @@ msgstr ""
"Example: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
"db8:beef::3 2\n"
-#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4768 ../libnm-core/nm-setting-gsm.c:363
#: ../libnm-util/nm-setting-gsm.c:364
#, c-format
msgid "'%s' is not a number"
msgstr "「%s」不是個數字"
-#: ../clients/cli/settings.c:4450
+#: ../clients/cli/settings.c:4775
#, c-format
msgid "'%s' is not valid; use 0, 1, or 2"
msgstr "「%s」無效;請使用 0、1 或 2"
-#: ../clients/cli/settings.c:4497
+#: ../clients/cli/settings.c:4822
#, c-format
msgid "'%s' is not a valid channel; use <1-13>"
msgstr "「%s」不是個有效的頻道;請使用 <1-13>"
-#: ../clients/cli/settings.c:4534
+#: ../clients/cli/settings.c:4859
#, c-format
msgid "'%s' is not valid; use [e, o, n]"
msgstr "「%s」無效;請使用 [e, o, n]"
-#: ../clients/cli/settings.c:4562
+#: ../clients/cli/settings.c:4887
msgid ""
"nmcli can accepts both direct JSON configuration data and a file name "
"containing the configuration. In the latter case the file is read and the "
@@ -6096,328 +5774,284 @@ msgid ""
"\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
" set team.config /etc/my-team.conf\n"
msgstr ""
-"nmcli 能接受直接的 JSON 配置資料以及一組包含了配置的檔案名稱。當在第二種情況下時,檔案會被讀取並且內容會被放入此內容中。\n"
+"nmcli 能接受直接的 JSON 配置資料以及一組包含了配置的檔案名稱。當在第二種情況"
+"下時,檔案會被讀取並且內容會被放入此內容中。\n"
"\n"
"範例:set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
"\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
" set team.config /etc/my-team.conf\n"
-#: ../clients/cli/settings.c:4602
+#: ../clients/cli/settings.c:4927
msgid "no priority to remove"
msgstr "沒有可移除的優先順序"
-#: ../clients/cli/settings.c:4606
+#: ../clients/cli/settings.c:4931
#, c-format
msgid "index '%d' is not in the range of <0-%d>"
msgstr "索引「%d」不在 <0-%d> 的範圍內"
-#: ../clients/cli/settings.c:4645
+#: ../clients/cli/settings.c:4970
#, c-format
msgid ""
-"Warning: only one mapping at a time is supported; taking the first one "
-"(%s)\n"
+"Warning: only one mapping at a time is supported; taking the first one (%s)\n"
msgstr ""
-#: ../clients/cli/settings.c:4652
+#: ../clients/cli/settings.c:4977
#, fuzzy, c-format
msgid "the property doesn't contain mapping '%s'"
msgstr "內容不可更改"
-#: ../clients/cli/settings.c:4700
+#: ../clients/cli/settings.c:5025
#, fuzzy, c-format
msgid "'%s' cannot be empty"
msgstr "未設定 '%s' 選項"
-#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
-#: ../libnm-core/nm-setting-wired.c:651
-#: ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:832
-#: ../libnm-util/nm-setting-wired.c:646
+#: ../clients/cli/settings.c:5100 ../clients/cli/settings.c:5267
+#: ../libnm-core/nm-setting-wired.c:662 ../libnm-core/nm-setting-wireless.c:857
+#: ../libnm-core/nm-setting-wireless.c:869 ../libnm-util/nm-setting-wired.c:646
#: ../libnm-util/nm-setting-wireless.c:859
#: ../libnm-util/nm-setting-wireless.c:873
#, c-format
msgid "'%s' is not a valid MAC address"
msgstr "「%s」不是個有效的 MAC 位址"
-#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
+#: ../clients/cli/settings.c:5106 ../clients/cli/settings.c:5273
#, c-format
msgid "the property doesn't contain MAC address '%s'"
msgstr ""
-#: ../clients/cli/settings.c:4799
+#: ../clients/cli/settings.c:5125
#, fuzzy, c-format
msgid "'%s' is not valid; 2 or 3 strings should be provided"
msgstr "「%s」無效;應提供三個字串"
-#: ../clients/cli/settings.c:4813
+#: ../clients/cli/settings.c:5139
#, fuzzy
msgid ""
"Enter a list of subchannels (comma or space separated).\n"
"\n"
"Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"
-msgstr "輸入一列三個頻道(以逗號或空格區隔開)。\n"
+msgstr ""
+"輸入一列三個頻道(以逗號或空格區隔開)。\n"
"\n"
"範例:0.0.0e20 0.0.0e21 0.0.0e22\n"
-#: ../clients/cli/settings.c:4835
+#: ../clients/cli/settings.c:5161
#, c-format
msgid "'%s' string value should consist of 1 - 199 characters"
msgstr ""
-#: ../clients/cli/settings.c:4867
+#: ../clients/cli/settings.c:5193
#, c-format
msgid ""
"Enter a list of S/390 options formatted as:\n"
" option = <value>, option = <value>,...\n"
"Valid options are: %s\n"
-msgstr "輸入一列 S/390 選項,格式為:\n"
+msgstr ""
+"輸入一列 S/390 選項,格式為:\n"
" option = <value>, option = <value>,...\n"
"可用選項為:%s\n"
-#: ../clients/cli/settings.c:4913
+#: ../clients/cli/settings.c:5239
#, c-format
msgid "'%s' is not a valid channel"
msgstr "「%s」不是個有效的頻道"
-#: ../clients/cli/settings.c:4919
+#: ../clients/cli/settings.c:5245
#, c-format
msgid "'%ld' is not a valid channel"
msgstr "「%ld」不是個有效的頻道"
-#: ../clients/cli/settings.c:5013
+#: ../clients/cli/settings.c:5339
#, fuzzy, c-format
msgid "invalid option '%s', use 'default', 'never' or 'always'"
msgstr "不合於規定的選項 '%s' 或其值為 '%s'"
-#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
-#: ../clients/cli/settings.c:5152
+#: ../clients/cli/settings.c:5400 ../clients/cli/settings.c:5439
+#: ../clients/cli/settings.c:5478
#, c-format
msgid "the property doesn't contain protocol '%s'"
msgstr ""
-#: ../clients/cli/settings.c:5191
+#: ../clients/cli/settings.c:5517
#, c-format
msgid ""
"'%s' not compatible with %s '%s', please change the key or set the right %s "
"first."
msgstr ""
-#: ../clients/cli/settings.c:5199
+#: ../clients/cli/settings.c:5525
#, c-format
msgid "WEP key is guessed to be of '%s'\n"
msgstr "預測 WEP key 為「%s」\n"
-#: ../clients/cli/settings.c:5201
+#: ../clients/cli/settings.c:5527
#, fuzzy, c-format
msgid "WEP key index set to '%d'\n"
msgstr "預測 WEP key 為「%s」\n"
-#: ../clients/cli/settings.c:5224
+#: ../clients/cli/settings.c:5550
#, c-format
msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
msgstr "「%s」不在 [0 (unknown), 1 (key), 2 (passphrase)] 之間"
-#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
-#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
+#: ../clients/cli/settings.c:5566 ../clients/cli/settings.c:5569
+#: ../clients/cli/settings.c:5572 ../clients/cli/settings.c:5575
#, c-format
msgid ""
"Warning: '%s' is not compatible with '%s' type, please change or delete the "
"key.\n"
msgstr ""
-#: ../clients/cli/settings.c:5262
+#: ../clients/cli/settings.c:5588
#, c-format
msgid ""
"Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
"and 2 or passphrase.\n"
-msgstr "輸入 WEP key 的類型。接受的值為:0 或 unknown、1 或 key,以及 2 或 passphrase。\n"
+msgstr ""
+"輸入 WEP key 的類型。接受的值為:0 或 unknown、1 或 key,以及 2 或 "
+"passphrase。\n"
-#: ../clients/cli/settings.c:5275
+#: ../clients/cli/settings.c:5601
#, c-format
msgid "'%s' is not a valid PSK"
msgstr "「%s」不是個有效的 PSK"
-#: ../clients/cli/settings.c:5319
+#: ../clients/cli/settings.c:5645
#, c-format
msgid "'%s' is not a valid DCB flag"
msgstr "「%s」不是有效的 DCB 旗標"
-#: ../clients/cli/settings.c:5342
+#: ../clients/cli/settings.c:5668
#, c-format
msgid "'%s' is not a DCB app priority"
msgstr "「%s」不是有效的 DCP 應用程式優先順序"
-#: ../clients/cli/settings.c:5368
+#: ../clients/cli/settings.c:5694
msgid "must contain 8 comma-separated numbers"
msgstr "必須包含 8 個以逗號區隔開的數字"
-#: ../clients/cli/settings.c:5385
+#: ../clients/cli/settings.c:5711
#, c-format
msgid "'%s' not a number between 0 and %u (inclusive) or %u"
msgstr "「%s」不是組介於 0 和(包含)%u 之間的數字或是 %u"
-#: ../clients/cli/settings.c:5388
+#: ../clients/cli/settings.c:5714
#, c-format
msgid "'%s' not a number between 0 and %u (inclusive)"
msgstr "「%s」不是組介於 0 和(包含)%u 之間的數字"
-#: ../clients/cli/settings.c:5410
+#: ../clients/cli/settings.c:5736
#, c-format
-msgid "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
+msgid ""
+"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
"\n"
-msgstr "警告:在「%s」包含 1(啟用)之前,變更將不會生效\n"
+msgstr ""
+"警告:在「%s」包含 1(啟用)之前,變更將不會生效\n"
"\n"
-#: ../clients/cli/settings.c:5463
+#: ../clients/cli/settings.c:5789
#, c-format
msgid "bandwidth percentages must total 100%%"
msgstr "頻寬比率總額必須是 100%%"
-#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
+#: ../clients/cli/settings.c:5875 ../clients/cli/settings.c:5881
msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
msgstr ""
-#: ../clients/cli/settings.c:5598
+#: ../clients/cli/settings.c:5924
#, fuzzy, c-format
msgid "invalid option '%s', use '%s' or '%s'"
msgstr "不合於規定的選項 '%s' 或其值為 '%s'"
-#: ../clients/cli/settings.c:7644
+#: ../clients/cli/settings.c:8049
msgid "don't know how to get the property value"
msgstr "不知如何取得內容值"
-#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
+#: ../clients/cli/settings.c:8102 ../clients/cli/settings.c:8142
msgid "the property can't be changed"
msgstr "內容不可更改"
-#: ../clients/cli/settings.c:7821
-#, fuzzy
-msgid "(not available)"
-msgstr "無法使用"
-
-#: ../clients/cli/settings.c:7846
+#: ../clients/cli/settings.c:8247
msgid "[NM property description]"
msgstr "[NM property description]"
-#: ../clients/cli/settings.c:7851
+#: ../clients/cli/settings.c:8252
msgid "[nmcli specific description]"
msgstr "[nmcli specific description]"
-#. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:7900
-msgid "<hidden>"
-msgstr ""
-
-#: ../clients/cli/utils.c:124
-#, c-format
-msgid "Error: value for '%s' argument is required."
-msgstr "錯誤:「%s」引數需要有個值。"
-
-#: ../clients/cli/utils.c:149
+#: ../clients/cli/utils.c:147
#, c-format
msgid "Error: Argument '%s' was expected, but '%s' provided."
msgstr "錯誤:預期「%s」引數,但卻提供了「%s」。"
-#: ../clients/cli/utils.c:152
+#: ../clients/cli/utils.c:150
#, c-format
msgid "Error: Unexpected argument '%s'"
msgstr "錯誤:非預期的引數「%s」"
-#: ../clients/cli/utils.c:202
-#, c-format
-msgid "Error converting IP4 address '0x%X' to text form"
-msgstr "將 IP4 位址「0x%X」轉換為文字格式時發生了錯誤"
-
-#: ../clients/cli/utils.c:230
-#, c-format
-msgid "Error converting IP6 address '%s' to text form"
-msgstr "將 IP6 位址「%s」轉換為文字格式時發生了錯誤"
-
#. Translators: the first %s is the partial value entered by
#. * the user, the second %s a list of compatible values.
-#.
-#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
+#.
+#: ../clients/cli/utils.c:490 ../clients/cli/utils.c:521
#, fuzzy, c-format
msgid "'%s' is ambiguous (%s)"
msgstr "「%s」意義含糊不清(%s x %s)"
-#: ../clients/cli/utils.c:556
+#: ../clients/cli/utils.c:500
#, c-format
msgid "'%s' is not valid; use [%s] or [%s]"
msgstr "「%s」無效;請使用「%s」或是「%s」"
-#: ../clients/cli/utils.c:589
+#: ../clients/cli/utils.c:533
#, fuzzy, c-format
msgid "'%s' is not valid; use [%s], [%s] or [%s]"
msgstr "「%s」無效;請使用「%s」或是「%s」"
-#: ../clients/cli/utils.c:688
+#: ../clients/cli/utils.c:632
#, c-format
msgid "'%s' is ambiguous (%s x %s)"
msgstr "「%s」意義含糊不清(%s x %s)"
-#: ../clients/cli/utils.c:700
+#: ../clients/cli/utils.c:644
#, c-format
msgid "missing name, try one of [%s]"
msgstr "名稱遺失,請嘗試 [%s] 其中之一"
-#: ../clients/cli/utils.c:964
+#: ../clients/cli/utils.c:891
#, c-format
msgid "field '%s' has to be alone"
msgstr "欄位 '%s' 必須是單獨的"
-#: ../clients/cli/utils.c:967
+#: ../clients/cli/utils.c:894
#, c-format
msgid "invalid field '%s'; allowed fields: %s"
msgstr "無效的欄位「%s」; 允許的欄位:%s"
-#: ../clients/cli/utils.c:1024
+#: ../clients/cli/utils.c:951
msgid "Option '--terse' requires specifying '--fields'"
msgstr "選項 '--terse' 需指定 '--fields'"
-#: ../clients/cli/utils.c:1028
+#: ../clients/cli/utils.c:955
#, c-format
msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
msgstr "選項 '--terse' 需要特定的 '--fields' 選項值,而不是 '%s'"
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr "警告:nmcli(%s)和 NetworkManager(%s)的版本不符。請使用 --nocheck 來抑止警告訊息。\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr "錯誤:nmcli(%s)和 NetworkManager(%s)的版本不符。請使用 --nocheck 來強制執行,不過結果無法預期。"
-
#: ../clients/common/nm-polkit-listener.c:212
msgid "An authentication session is already underway."
msgstr ""
-#. TTLS and PEAP are actually much more complicated, but this complication
-#. * is not visible here since we only care about phase2 authentication
-#. * (and don't even care of which one)
-#.
-#: ../clients/common/nm-secret-agent-simple.c:223
-#: ../clients/common/nm-secret-agent-simple.c:328
-#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
-msgid "Username"
-msgstr "使用者名稱"
-
#: ../clients/common/nm-secret-agent-simple.c:230
#: ../clients/common/nm-secret-agent-simple.c:273
#: ../clients/common/nm-secret-agent-simple.c:303
#: ../clients/common/nm-secret-agent-simple.c:342
-#: ../clients/common/nm-secret-agent-simple.c:492
-#: ../clients/common/nm-secret-agent-simple.c:507
-#: ../clients/common/nm-secret-agent-simple.c:525
-#: ../clients/common/nm-vpn-helpers.c:101
-#: ../clients/common/nm-vpn-helpers.c:102
-#: ../clients/common/nm-vpn-helpers.c:105 ../clients/tui/nmt-page-dsl.c:75
+#: ../clients/common/nm-secret-agent-simple.c:504
+#: ../clients/common/nm-secret-agent-simple.c:519
+#: ../clients/common/nm-secret-agent-simple.c:537
+#: ../clients/common/nm-vpn-helpers.c:119
+#: ../clients/common/nm-vpn-helpers.c:120
+#: ../clients/common/nm-vpn-helpers.c:124
+#: ../clients/common/nm-vpn-helpers.c:127 ../clients/tui/nmt-page-dsl.c:75
#: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
#: ../clients/tui/nmt-page-wifi.c:341
msgid "Password"
@@ -6441,120 +6075,153 @@ msgstr "金鑰"
msgid "Service"
msgstr "服務"
-#: ../clients/common/nm-secret-agent-simple.c:448
+#: ../clients/common/nm-secret-agent-simple.c:465
msgid "Authentication required by wireless network"
msgstr "無線網路所需的身份認證"
-#: ../clients/common/nm-secret-agent-simple.c:449
+#: ../clients/common/nm-secret-agent-simple.c:466
#, c-format
msgid ""
"Passwords or encryption keys are required to access the wireless network "
"'%s'."
msgstr "需要密碼或加密金鑰來存取無線網路「%s」。"
-#: ../clients/common/nm-secret-agent-simple.c:457
+#: ../clients/common/nm-secret-agent-simple.c:474
msgid "Wired 802.1X authentication"
msgstr "有線網路 802.1X 身份認證"
-#: ../clients/common/nm-secret-agent-simple.c:460
-msgid "Network name"
-msgstr "網路名稱"
+#: ../clients/common/nm-secret-agent-simple.c:475
+#, c-format
+msgid "Secrets are required to access the wired network '%s'"
+msgstr ""
-#: ../clients/common/nm-secret-agent-simple.c:469
+#: ../clients/common/nm-secret-agent-simple.c:480
msgid "DSL authentication"
msgstr "DSL 身份認證"
-#: ../clients/common/nm-secret-agent-simple.c:477
+#: ../clients/common/nm-secret-agent-simple.c:481
+#, c-format
+msgid "Secrets are required for the DSL connection '%s'"
+msgstr ""
+
+#: ../clients/common/nm-secret-agent-simple.c:489
msgid "PIN code required"
msgstr "需要 PIN 碼"
-#: ../clients/common/nm-secret-agent-simple.c:478
+#: ../clients/common/nm-secret-agent-simple.c:490
msgid "PIN code is needed for the mobile broadband device"
msgstr "手機寬頻裝置需要 PIN 碼"
-#: ../clients/common/nm-secret-agent-simple.c:480
+#: ../clients/common/nm-secret-agent-simple.c:492
msgid "PIN"
msgstr "PIN"
-#: ../clients/common/nm-secret-agent-simple.c:488
-#: ../clients/common/nm-secret-agent-simple.c:503
-#: ../clients/common/nm-secret-agent-simple.c:521
+#: ../clients/common/nm-secret-agent-simple.c:500
+#: ../clients/common/nm-secret-agent-simple.c:515
+#: ../clients/common/nm-secret-agent-simple.c:533
msgid "Mobile broadband network password"
msgstr "行動寬頻網路的密碼"
-#: ../clients/common/nm-secret-agent-simple.c:489
-#: ../clients/common/nm-secret-agent-simple.c:504
-#: ../clients/common/nm-secret-agent-simple.c:522
-#: ../clients/common/nm-secret-agent-simple.c:542
+#: ../clients/common/nm-secret-agent-simple.c:501
+#: ../clients/common/nm-secret-agent-simple.c:516
+#: ../clients/common/nm-secret-agent-simple.c:534
+#: ../clients/common/nm-secret-agent-simple.c:554
#, c-format
msgid "A password is required to connect to '%s'."
msgstr "需要密碼才能連線至「%s」。"
-#: ../clients/common/nm-secret-agent-simple.c:537
+#: ../clients/common/nm-secret-agent-simple.c:549
#, fuzzy
msgid "VPN password required"
msgstr "需要 PIN 碼"
-#: ../clients/common/nm-vpn-helpers.c:61
-msgid "could not get VPN plugin info"
+#: ../clients/common/nm-vpn-helpers.c:48
+#, fuzzy, c-format
+msgid "unknown VPN plugin \"%s\""
+msgstr "不明日誌網域「%s」"
+
+#: ../clients/common/nm-vpn-helpers.c:59
+#, c-format
+msgid "cannot load legacy-only VPN plugin \"%s\" for \"%s\""
+msgstr ""
+
+#: ../clients/common/nm-vpn-helpers.c:64
+#, c-format
+msgid ""
+"cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
msgstr ""
-#: ../clients/common/nm-vpn-helpers.c:103
-#: ../clients/common/nm-vpn-helpers.c:106
+#: ../clients/common/nm-vpn-helpers.c:69
+#, fuzzy, c-format
+msgid "failed to load VPN plugin \"%s\": %s"
+msgstr "錯誤:無法修改 %s.%s:%s。"
+
+#: ../clients/common/nm-vpn-helpers.c:121
+#, fuzzy
+msgid "Certificate password"
+msgstr "私密金鑰的密碼"
+
+#: ../clients/common/nm-vpn-helpers.c:122
+#, fuzzy
+msgid "HTTP proxy password"
+msgstr "顯示密碼"
+
+#: ../clients/common/nm-vpn-helpers.c:125
+#: ../clients/common/nm-vpn-helpers.c:128
#, fuzzy
msgid "Group password"
msgstr "顯示密碼"
-#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:143
#: ../clients/tui/nmt-page-ip6.c:143
msgid "Gateway"
msgstr "閘道器"
-#: ../clients/common/nm-vpn-helpers.c:109
+#: ../clients/common/nm-vpn-helpers.c:131
msgid "Cookie"
msgstr ""
-#: ../clients/common/nm-vpn-helpers.c:110
+#: ../clients/common/nm-vpn-helpers.c:132
msgid "Gateway certificate hash"
msgstr ""
-#: ../clients/nm-online.c:94
+#: ../clients/nm-online.c:114
msgid "Connecting"
msgstr "正在連線"
-#: ../clients/nm-online.c:147
+#: ../clients/nm-online.c:181
msgid ""
"Time to wait for a connection, in seconds (without the option, default value "
"is 30)"
msgstr "連線的等待時間,以秒為單位(少了此選項,預設值將會是 30)"
-#: ../clients/nm-online.c:148
+#: ../clients/nm-online.c:182
#, fuzzy
msgid "Exit immediately if NetworkManager is not running or connecting"
msgstr "若 NetworkManager 沒有在執行的話,即刻退出"
-#: ../clients/nm-online.c:149
+#: ../clients/nm-online.c:183
msgid "Don't print anything"
msgstr "不印出任何東西"
-#: ../clients/nm-online.c:150
+#: ../clients/nm-online.c:184
#, fuzzy
msgid "Wait for NetworkManager startup instead of a connection"
msgstr "等待 NetworkManager 完成啟用開啟網路連線。"
-#: ../clients/nm-online.c:171
+#: ../clients/nm-online.c:204
msgid ""
"Waits for NetworkManager to finish activating startup network connections."
msgstr "等待 NetworkManager 完成啟用開啟網路連線。"
-#: ../clients/nm-online.c:178 ../clients/nm-online.c:184
+#: ../clients/nm-online.c:211 ../clients/nm-online.c:217
msgid "Invalid option. Please use --help to see a list of valid options."
msgstr "無效的選項。請使用 --help 來查看可用選項的清單。"
-#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:415
+#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:418
#: ../clients/tui/nmt-password-dialog.c:174
#: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:114
+#: ../clients/tui/nmtui.c:136
msgid "OK"
msgstr "確定"
@@ -6584,23 +6251,38 @@ msgstr "編輯程式錯誤:%s"
msgid "Could not re-read file: %s"
msgstr "無法重新讀取檔案:%s"
+#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1859
+#: ../libnm/nm-device.c:1661
+msgid "Ethernet"
+msgstr "Ethernet"
+
#: ../clients/tui/nm-editor-utils.c:150
#, c-format
msgid "Ethernet connection %d"
msgstr "乙太網路連線 %d"
+#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1861
+#: ../libnm/nm-device.c:1663
+msgid "Wi-Fi"
+msgstr "無線網路"
+
#: ../clients/tui/nm-editor-utils.c:158
#, c-format
msgid "Wi-Fi connection %d"
msgstr "Wi-Fi 連線 %d"
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1899
+#: ../libnm-glib/nm-device.c:1871 ../libnm/nm-device.c:1673
+msgid "InfiniBand"
+msgstr "InfiniBand"
+
#: ../clients/tui/nm-editor-utils.c:167
#, c-format
msgid "InfiniBand connection %d"
msgstr "InfiniBand 連線 %d"
-#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1859
-#: ../libnm/nm-device.c:1810
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1869
+#: ../libnm/nm-device.c:1671
msgid "Mobile Broadband"
msgstr "行動寬頻"
@@ -6618,9 +6300,10 @@ msgstr "DSL"
msgid "DSL connection %d"
msgstr "DSL 連線 %d"
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
-#: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4182
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1891
+#: ../libnm-glib/nm-device.c:1873 ../libnm-util/nm-connection.c:1626
+#: ../libnm/nm-device.c:1675
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4308
msgid "Bond"
msgstr "Bond"
@@ -6629,9 +6312,10 @@ msgstr "Bond"
msgid "Bond connection %d"
msgstr "Bond 連線 %d"
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
-#: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4479
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1895
+#: ../libnm-glib/nm-device.c:1877 ../libnm-util/nm-connection.c:1630
+#: ../libnm/nm-device.c:1679
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4605
msgid "Bridge"
msgstr "橋接"
@@ -6640,9 +6324,10 @@ msgstr "橋接"
msgid "Bridge connection %d"
msgstr "橋接連線 %d"
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
-#: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4288
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1893
+#: ../libnm-glib/nm-device.c:1875 ../libnm-util/nm-connection.c:1628
+#: ../libnm/nm-device.c:1677
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4414
msgid "Team"
msgstr "Team"
@@ -6656,7 +6341,16 @@ msgstr "Team 連線 %d"
msgid "VLAN connection %d"
msgstr "VLAN 連線 %d"
-#: ../clients/tui/nm-editor-utils.c:236
+#: ../clients/tui/nm-editor-utils.c:225 ../clients/tui/nmt-page-ip-tunnel.c:136
+msgid "IP tunnel"
+msgstr ""
+
+#: ../clients/tui/nm-editor-utils.c:229
+#, c-format
+msgid "IP tunnel connection %d"
+msgstr ""
+
+#: ../clients/tui/nm-editor-utils.c:244
#, c-format
msgid "VPN connection %d"
msgstr "VPN 連線 %d"
@@ -6676,7 +6370,7 @@ msgid "Edit..."
msgstr "編輯..."
#: ../clients/tui/nmt-edit-connection-list.c:116
-#: ../clients/tui/nmtui-edit.c:526
+#: ../clients/tui/nmtui-edit.c:531
msgid "Delete"
msgstr "刪除"
@@ -6688,56 +6382,56 @@ msgstr "隱藏"
msgid "Show"
msgstr "顯示"
-#: ../clients/tui/nmt-editor.c:97
+#: ../clients/tui/nmt-editor.c:98
#, c-format
msgid "Could not create editor for connection '%s' of type '%s'."
msgstr "無法為「%s」連線(類型「%s」)建立編輯程式。"
-#: ../clients/tui/nmt-editor.c:101
+#: ../clients/tui/nmt-editor.c:102
#, c-format
msgid "Could not create editor for invalid connection '%s'."
msgstr "無法為無效的連線「%s」建立編輯程式。"
-#: ../clients/tui/nmt-editor.c:111
+#: ../clients/tui/nmt-editor.c:112
#, fuzzy
msgid "Edit Connection"
msgstr "編輯連線"
-#: ../clients/tui/nmt-editor.c:164
+#: ../clients/tui/nmt-editor.c:165
#, c-format
msgid "Unable to save connection: %s"
msgstr "無法儲存連線:%s"
-#: ../clients/tui/nmt-editor.c:178
+#: ../clients/tui/nmt-editor.c:179
#, c-format
msgid "Unable to add new connection: %s"
msgstr "無法新增連線:%s"
-#: ../clients/tui/nmt-editor.c:320
+#: ../clients/tui/nmt-editor.c:321
msgid "Profile name"
msgstr "設定檔名稱"
-#: ../clients/tui/nmt-editor.c:331
+#: ../clients/tui/nmt-editor.c:332
#, fuzzy
msgid "Ethernet device"
msgstr "Ethernet"
-#: ../clients/tui/nmt-editor.c:333
+#: ../clients/tui/nmt-editor.c:334
msgid "Device"
msgstr "裝置"
#. And finally the bottom widgets
-#: ../clients/tui/nmt-editor.c:391
+#: ../clients/tui/nmt-editor.c:394
msgid "Automatically connect"
msgstr "自動連線"
-#: ../clients/tui/nmt-editor.c:397
+#: ../clients/tui/nmt-editor.c:400
msgid "Available to all users"
msgstr "所有使用者皆可使用"
-#: ../clients/tui/nmt-editor.c:412 ../clients/tui/nmt-password-dialog.c:171
-#: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:217
-#: ../clients/tui/nmtui-edit.c:525 ../clients/tui/nmtui-hostname.c:67
+#: ../clients/tui/nmt-editor.c:415 ../clients/tui/nmt-password-dialog.c:171
+#: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:222
+#: ../clients/tui/nmtui-edit.c:530 ../clients/tui/nmtui-hostname.c:67
msgid "Cancel"
msgstr "取消"
@@ -6786,7 +6480,8 @@ msgstr "ARP"
msgid "Slaves"
msgstr "Slave"
-#: ../clients/tui/nmt-page-bond.c:367 ../clients/tui/nmt-page-wifi.c:230
+#: ../clients/tui/nmt-page-bond.c:367 ../clients/tui/nmt-page-ip-tunnel.c:148
+#: ../clients/tui/nmt-page-wifi.c:230
msgid "Mode"
msgstr "模式"
@@ -6887,10 +6582,6 @@ msgstr "已連線"
msgid "INFINIBAND"
msgstr "INFINIBAND"
-#: ../clients/tui/nmt-page-infiniband.c:88
-msgid "Transport mode"
-msgstr "傳輸模式"
-
#: ../clients/tui/nmt-page-ip4.c:38
msgid "Disabled"
msgstr "已停用"
@@ -6969,6 +6660,63 @@ msgstr "IPv6 配置"
msgid "Require IPv6 addressing for this connection"
msgstr "此連線需使用 IPv6 位址"
+#. The order must match the NM_IP_TUNNEL_MODE_* enum
+#: ../clients/tui/nmt-page-ip-tunnel.c:78
+msgid "IPIP"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:79
+msgid "GRE"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:80
+msgid "SIT"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:81
+msgid "ISATAP"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:82
+msgid "VTI"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:83
+msgid "IP6IP6"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:84
+msgid "IPIP6"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:85
+msgid "IP6GRE"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:86
+msgid "VTI6"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:150 ../clients/tui/nmt-page-vlan.c:99
+msgid "Parent"
+msgstr "父"
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:157
+msgid "Local IP"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:163
+msgid "Remote IP"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:169
+msgid "Input key"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip-tunnel.c:176
+msgid "Output key"
+msgstr ""
+
#: ../clients/tui/nmt-page-ppp.c:131
#, fuzzy
msgid "PPP CONFIGURATION"
@@ -7035,10 +6783,6 @@ msgstr "團隊連接埠"
msgid "JSON configuration"
msgstr "JSON 配置"
-#: ../clients/tui/nmt-page-vlan.c:99
-msgid "Parent"
-msgstr "父"
-
#: ../clients/tui/nmt-page-vlan.c:114
msgid "VLAN id"
msgstr "VLAN id"
@@ -7229,62 +6973,68 @@ msgstr "啟用失敗"
msgid "Connecting..."
msgstr "連接中..."
-#: ../clients/tui/nmtui-connect.c:268 ../clients/tui/nmtui-connect.c:299
+#: ../clients/tui/nmtui-connect.c:271 ../clients/tui/nmtui-connect.c:302
#, c-format
msgid "Could not activate connection: %s"
msgstr "無法啟動連線:%s"
-#: ../clients/tui/nmtui-connect.c:359 ../clients/tui/nmtui-connect.c:408
+#: ../clients/tui/nmtui-connect.c:362 ../clients/tui/nmtui-connect.c:411
msgid "Activate"
msgstr "啟動"
-#: ../clients/tui/nmtui-connect.c:361
+#: ../clients/tui/nmtui-connect.c:364
msgid "Deactivate"
msgstr "取消啟動"
-#: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:108
+#: ../clients/tui/nmtui-connect.c:416 ../clients/tui/nmtui-edit.c:120
+#: ../clients/tui/nmtui.c:130
msgid "Quit"
msgstr "離開"
-#: ../clients/tui/nmtui-connect.c:436
+#: ../clients/tui/nmtui-connect.c:416 ../clients/tui/nmtui-edit.c:120
+msgid "Back"
+msgstr ""
+
+#: ../clients/tui/nmtui-connect.c:439
#, c-format
msgid "No such connection '%s'"
msgstr "沒有此連線「%s」"
-#: ../clients/tui/nmtui-connect.c:438
+#: ../clients/tui/nmtui-connect.c:441
msgid "Connection is already active"
msgstr "連線已啟用"
-#: ../clients/tui/nmtui-edit.c:225
+#: ../clients/tui/nmtui-edit.c:230
msgid "Create"
msgstr "建立"
-#: ../clients/tui/nmtui-edit.c:367
+#: ../clients/tui/nmtui-edit.c:372
msgid "Select the type of connection you wish to create."
msgstr "選擇您想要建立的連線類型。"
-#: ../clients/tui/nmtui-edit.c:375
+#: ../clients/tui/nmtui-edit.c:380
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 "如果您要建立 VPN,但此 VPN 連線沒有出現在清單上,您可能尚未安裝正確的 VPN 外掛程式。"
+msgstr ""
+"如果您要建立 VPN,但此 VPN 連線沒有出現在清單上,您可能尚未安裝正確的 VPN 外"
+"掛程式。"
-#: ../clients/tui/nmtui-edit.c:411 ../clients/tui/nmtui-edit.c:427
+#: ../clients/tui/nmtui-edit.c:416 ../clients/tui/nmtui-edit.c:432
msgid "New Connection"
msgstr "新連線"
-#: ../clients/tui/nmtui-edit.c:466
+#: ../clients/tui/nmtui-edit.c:471
#, c-format
msgid "Unable to delete connection: %s"
msgstr "無法刪除連線:%s"
-#: ../clients/tui/nmtui-edit.c:505
+#: ../clients/tui/nmtui-edit.c:510
#, fuzzy, c-format
msgid "Could not delete connection '%s': %s"
msgstr "無法刪除連線:%s"
-#: ../clients/tui/nmtui-edit.c:527
+#: ../clients/tui/nmtui-edit.c:532
#, c-format
msgid "Are you sure you want to delete the connection '%s'?"
msgstr "確定要刪除連線「%s」?"
@@ -7328,28 +7078,28 @@ msgstr "新主機名稱"
msgid "Set system hostname"
msgstr "設定系統的主機名稱"
-#: ../clients/tui/nmtui.c:83
+#: ../clients/tui/nmtui.c:104
msgid "NetworkManager TUI"
msgstr "NetworkManager 文字介面"
-#: ../clients/tui/nmtui.c:91
+#: ../clients/tui/nmtui.c:112
msgid "Please select an option"
msgstr "請選擇一個選項"
-#: ../clients/tui/nmtui.c:143
+#: ../clients/tui/nmtui.c:160
msgid "Usage"
msgstr "用法"
-#: ../clients/tui/nmtui.c:224
+#: ../clients/tui/nmtui.c:241
msgid "Could not parse arguments"
msgstr "無法剖析引數"
-#: ../clients/tui/nmtui.c:234
+#: ../clients/tui/nmtui.c:251
#, fuzzy, c-format
msgid "Could not contact NetworkManager: %s.\n"
msgstr "無法啟動連線:%s"
-#: ../clients/tui/nmtui.c:239
+#: ../clients/tui/nmtui.c:256
msgid "NetworkManager is not running."
msgstr "NetworkManager 並不在執行中。"
@@ -7635,77 +7385,75 @@ msgstr "無法驗證 PKCS#12 檔案:%d"
msgid "Could not generate random data."
msgstr "無法產生隨機資料。"
-#: ../libnm-core/nm-connection.c:224
+#: ../libnm-core/nm-connection.c:225
msgid "wrong type; should be a list of strings."
msgstr ""
-#: ../libnm-core/nm-connection.c:294
+#: ../libnm-core/nm-connection.c:295
#, fuzzy
msgid "unknown setting name"
msgstr "錯誤:「%s」設定不明\n"
-#: ../libnm-core/nm-connection.c:306
+#: ../libnm-core/nm-connection.c:307
#, fuzzy
msgid "duplicate setting name"
msgstr "錯誤:「%s」設定不明\n"
-#: ../libnm-core/nm-connection.c:873
+#: ../libnm-core/nm-connection.c:1044
msgid "setting not found"
msgstr ""
-#: ../libnm-core/nm-connection.c:937
+#: ../libnm-core/nm-connection.c:1110
#, fuzzy
msgid "setting not allowed in slave connection"
msgstr "設定「%s」不存在連線中。\n"
-#: ../libnm-core/nm-connection.c:948
+#: ../libnm-core/nm-connection.c:1126
msgid "setting is required for non-slave connections"
msgstr ""
-#: ../libnm-core/nm-connection.c:1042
+#: ../libnm-core/nm-connection.c:1221
#, fuzzy
msgid "Unexpected failure to verify the connection"
msgstr "無法刪除連線:%s"
-#: ../libnm-core/nm-connection.c:1075
+#: ../libnm-core/nm-connection.c:1258
#, fuzzy
msgid "Unexpected failure to normalize the connection"
msgstr "無法刪除連線:%s"
-#: ../libnm-core/nm-connection.c:1576 ../libnm-core/nm-setting-8021x.c:2411
-#: ../libnm-core/nm-setting-8021x.c:2428 ../libnm-core/nm-setting-8021x.c:2459
-#: ../libnm-core/nm-setting-8021x.c:2476 ../libnm-core/nm-setting-8021x.c:2518
-#: ../libnm-core/nm-setting-8021x.c:2530 ../libnm-core/nm-setting-8021x.c:2548
-#: ../libnm-core/nm-setting-8021x.c:2560 ../libnm-core/nm-setting-8021x.c:2584
-#: ../libnm-core/nm-setting-8021x.c:2749 ../libnm-core/nm-setting-adsl.c:189
+#: ../libnm-core/nm-connection.c:1759 ../libnm-core/nm-setting-8021x.c:2654
+#: ../libnm-core/nm-setting-8021x.c:2671 ../libnm-core/nm-setting-8021x.c:2702
+#: ../libnm-core/nm-setting-8021x.c:2719 ../libnm-core/nm-setting-8021x.c:2761
+#: ../libnm-core/nm-setting-8021x.c:2773 ../libnm-core/nm-setting-8021x.c:2791
+#: ../libnm-core/nm-setting-8021x.c:2803 ../libnm-core/nm-setting-8021x.c:2827
+#: ../libnm-core/nm-setting-8021x.c:2992 ../libnm-core/nm-setting-adsl.c:189
#: ../libnm-core/nm-setting-bluetooth.c:120
-#: ../libnm-core/nm-setting-bluetooth.c:138
-#: ../libnm-core/nm-setting-cdma.c:141
-#: ../libnm-core/nm-setting-connection.c:837
-#: ../libnm-core/nm-setting-connection.c:876
-#: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2167
+#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:141
+#: ../libnm-core/nm-setting-connection.c:871
+#: ../libnm-core/nm-setting-connection.c:912
+#: ../libnm-core/nm-setting-connection.c:1025
+#: ../libnm-core/nm-setting-ip-config.c:2258
+#: ../libnm-core/nm-setting-ip-tunnel.c:352
#: ../libnm-core/nm-setting-olpc-mesh.c:120
#: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
#: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
#: ../libnm-core/nm-setting-wireless-security.c:861
-#: ../libnm-core/nm-setting-wireless.c:729 ../libnm-util/nm-setting.c:1357
+#: ../libnm-core/nm-setting-wireless.c:750 ../libnm-util/nm-setting.c:1357
#: ../libnm-util/nm-setting.c:1376 ../libnm-util/nm-setting.c:1394
#: ../libnm-util/nm-setting-8021x.c:2325 ../libnm-util/nm-setting-8021x.c:2342
#: ../libnm-util/nm-setting-8021x.c:2383 ../libnm-util/nm-setting-8021x.c:2400
#: ../libnm-util/nm-setting-8021x.c:2452 ../libnm-util/nm-setting-8021x.c:2464
#: ../libnm-util/nm-setting-8021x.c:2482 ../libnm-util/nm-setting-8021x.c:2494
#: ../libnm-util/nm-setting-8021x.c:2518 ../libnm-util/nm-setting-8021x.c:2680
-#: ../libnm-util/nm-setting-adsl.c:209
-#: ../libnm-util/nm-setting-bluetooth.c:142
-#: ../libnm-util/nm-setting-bluetooth.c:160
-#: ../libnm-util/nm-setting-cdma.c:162
+#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:142
+#: ../libnm-util/nm-setting-bluetooth.c:160 ../libnm-util/nm-setting-cdma.c:162
#: ../libnm-util/nm-setting-connection.c:768
#: ../libnm-util/nm-setting-connection.c:784
#: ../libnm-util/nm-setting-connection.c:845
#: ../libnm-util/nm-setting-ip4-config.c:869
#: ../libnm-util/nm-setting-ip6-config.c:833
-#: ../libnm-util/nm-setting-ip6-config.c:896
+#: ../libnm-util/nm-setting-ip6-config.c:899
#: ../libnm-util/nm-setting-olpc-mesh.c:123
#: ../libnm-util/nm-setting-pppoe.c:163 ../libnm-util/nm-setting-vpn.c:423
#: ../libnm-util/nm-setting-wimax.c:150
@@ -7714,168 +7462,175 @@ msgstr "無法刪除連線:%s"
msgid "property is missing"
msgstr "找不到屬性"
+#: ../libnm-core/nm-connection.c:1902
+msgid "IP Tunnel"
+msgstr ""
+
#: ../libnm-core/nm-dbus-utils.c:188
#, c-format
msgid "Method returned type '%s', but expected '%s'"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:136
+#: ../libnm-core/nm-keyfile-reader.c:142
msgid "ignoring missing number"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:145
+#: ../libnm-core/nm-keyfile-reader.c:151
#, fuzzy, c-format
msgid "ignoring invalid number '%s'"
msgstr "無效的單位「%s」"
-#: ../libnm-core/nm-keyfile-reader.c:165
+#: ../libnm-core/nm-keyfile-reader.c:171
#, fuzzy, c-format
msgid "ignoring invalid %s address: %s"
msgstr "無效的 IPv4 位址「%s」"
-#: ../libnm-core/nm-keyfile-reader.c:205
+#: ../libnm-core/nm-keyfile-reader.c:211
#, fuzzy, c-format
msgid "ignoring invalid gateway '%s' for %s route"
msgstr "無效的閘道器「%s」"
-#: ../libnm-core/nm-keyfile-reader.c:225
+#: ../libnm-core/nm-keyfile-reader.c:231
#, fuzzy, c-format
msgid "ignoring invalid %s route: %s"
msgstr "無效的 IPv4 路由「%s」"
-#: ../libnm-core/nm-keyfile-reader.c:343
+#: ../libnm-core/nm-keyfile-reader.c:349
#, c-format
msgid "unexpected character '%c' for address %s: '%s' (position %td)"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:353
+#: ../libnm-core/nm-keyfile-reader.c:359
#, c-format
msgid "unexpected character '%c' for %s: '%s' (position %td)"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:362
+#: ../libnm-core/nm-keyfile-reader.c:368
#, c-format
msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:373
+#: ../libnm-core/nm-keyfile-reader.c:379
#, c-format
msgid "garbage at the end of value %s: '%s'"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:379
+#: ../libnm-core/nm-keyfile-reader.c:385
#, c-format
msgid "deprecated semicolon at the end of value %s: '%s'"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:394
+#: ../libnm-core/nm-keyfile-reader.c:400
#, c-format
msgid "invalid prefix length for %s '%s', defaulting to %d"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:401
+#: ../libnm-core/nm-keyfile-reader.c:407
#, c-format
msgid "missing prefix length for %s '%s', defaulting to %d"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:504
+#: ../libnm-core/nm-keyfile-reader.c:510
#, fuzzy, c-format
msgid "ignoring invalid DNS server IPv4 address '%s'"
msgstr "無效的 IPv4 位址「%s」"
-#: ../libnm-core/nm-keyfile-reader.c:543
+#: ../libnm-core/nm-keyfile-reader.c:549
#, fuzzy, c-format
msgid "ignoring invalid DNS server IPv6 address '%s'"
msgstr "無效的 IPv6 位址「%s」"
-#: ../libnm-core/nm-keyfile-reader.c:628 ../libnm-core/nm-keyfile-reader.c:769
-#: ../libnm-core/nm-keyfile-reader.c:1446
+#: ../libnm-core/nm-keyfile-reader.c:644 ../libnm-core/nm-keyfile-reader.c:1540
#, c-format
msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:642
+#: ../libnm-core/nm-keyfile-reader.c:655
#, fuzzy
msgid "ignoring invalid MAC address"
msgstr "不是個有效的 MAC 位址"
-#: ../libnm-core/nm-keyfile-reader.c:758
-#, fuzzy
-msgid "ignoring invalid binary property"
-msgstr "錯誤:無效的內容:%s\n"
-
-#: ../libnm-core/nm-keyfile-reader.c:801
+#: ../libnm-core/nm-keyfile-reader.c:864
msgid "ignoring invalid SSID"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:817
+#: ../libnm-core/nm-keyfile-reader.c:880
msgid "ignoring invalid raw password"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:892
-#: ../libnm-core/nm-keyfile-reader.c:1058
+#: ../libnm-core/nm-keyfile-reader.c:955 ../libnm-core/nm-keyfile-reader.c:1131
#, c-format
msgid "certificate or key file '%s' does not exist"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:897
+#: ../libnm-core/nm-keyfile-reader.c:960
#, fuzzy, c-format
msgid "invalid key/cert value path \"%s\""
msgstr "無效的「%s」或是它的值「%s」無效"
-#: ../libnm-core/nm-keyfile-reader.c:935
+#: ../libnm-core/nm-keyfile-reader.c:970
+#, c-format
+msgid "invalid PKCS#11 URI \"%s\""
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:1008
msgid "invalid key/cert value data:;base64, is not base64"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:948
+#: ../libnm-core/nm-keyfile-reader.c:1021
msgid "invalid key/cert value data:;base64,file://"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:1095
+#: ../libnm-core/nm-keyfile-reader.c:1168
msgid "invalid key/cert value is not a valid blob"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:1100
+#: ../libnm-core/nm-keyfile-reader.c:1173
#, fuzzy
msgid "invalid key/cert value"
msgstr "無效的「%s」或是它的值「%s」無效"
-#: ../libnm-core/nm-keyfile-reader.c:1147
+#: ../libnm-core/nm-keyfile-reader.c:1220
#, fuzzy, c-format
msgid "invalid parity value '%s'"
msgstr "無效的「%s」或是它的值「%s」無效"
-#: ../libnm-core/nm-keyfile-reader.c:1347
+#: ../libnm-core/nm-keyfile-reader.c:1238
+#, c-format
+msgid "ignoring invalid team configuration: %s"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:1441
#, fuzzy, c-format
msgid "error loading setting value: %s"
msgstr "錯誤:無效的設定名稱;%s\n"
-#: ../libnm-core/nm-keyfile-reader.c:1379
+#: ../libnm-core/nm-keyfile-reader.c:1473
#, fuzzy, c-format
msgid "invalid negative value (%i)"
msgstr "無效的閘道器「%s」"
-#: ../libnm-core/nm-keyfile-reader.c:1400
+#: ../libnm-core/nm-keyfile-reader.c:1494
#, fuzzy, c-format
msgid "invalid char value (%i)"
msgstr "無效的「%s」或是它的值「%s」無效"
-#: ../libnm-core/nm-keyfile-reader.c:1423
+#: ../libnm-core/nm-keyfile-reader.c:1517
#, fuzzy, c-format
msgid "invalid int64 value (%s)"
msgstr "無效的「%s」或是它的值「%s」無效"
-#: ../libnm-core/nm-keyfile-reader.c:1482
+#: ../libnm-core/nm-keyfile-reader.c:1576
#, c-format
msgid "too large FLAGS property '%s' (%llu)"
msgstr ""
-#: ../libnm-core/nm-keyfile-reader.c:1495
+#: ../libnm-core/nm-keyfile-reader.c:1589
#, fuzzy, c-format
msgid "unhandled setting property type '%s'"
msgstr "錯誤:無效的 <setting>.<property> '%s'。"
-#: ../libnm-core/nm-keyfile-reader.c:1526
+#: ../libnm-core/nm-keyfile-reader.c:1620
#, fuzzy, c-format
msgid "invalid setting name '%s'"
msgstr "錯誤:無效的設定名稱;%s\n"
@@ -7885,55 +7640,53 @@ msgstr "錯誤:無效的設定名稱;%s\n"
msgid "data missing"
msgstr "找不到屬性"
-#: ../libnm-core/nm-setting-8021x.c:448
+#: ../libnm-core/nm-setting-8021x.c:450
msgid "binary data missing"
msgstr ""
-#: ../libnm-core/nm-setting-8021x.c:465
-msgid "file:// URI not NUL terminated"
+#: ../libnm-core/nm-setting-8021x.c:478
+msgid "URI not NUL terminated"
msgstr ""
-#: ../libnm-core/nm-setting-8021x.c:474
-msgid "file:// URI is empty"
+#: ../libnm-core/nm-setting-8021x.c:487
+msgid "URI is empty"
msgstr ""
-#: ../libnm-core/nm-setting-8021x.c:482
-#, fuzzy
-msgid "file:// URI is not valid UTF-8"
-msgstr "索引「%s」無效"
+#: ../libnm-core/nm-setting-8021x.c:495
+msgid "URI is not valid UTF-8"
+msgstr ""
-#: ../libnm-core/nm-setting-8021x.c:681 ../libnm-util/nm-setting-8021x.c:639
+#: ../libnm-core/nm-setting-8021x.c:731 ../libnm-util/nm-setting-8021x.c:639
msgid "CA certificate must be in X.509 format"
msgstr ""
-#: ../libnm-core/nm-setting-8021x.c:1012 ../libnm-core/nm-setting-8021x.c:1276
-#: ../libnm-core/nm-setting-8021x.c:1612 ../libnm-util/nm-setting-8021x.c:957
+#: ../libnm-core/nm-setting-8021x.c:1101 ../libnm-core/nm-setting-8021x.c:1405
+#: ../libnm-core/nm-setting-8021x.c:1781 ../libnm-util/nm-setting-8021x.c:957
#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543
#, fuzzy
msgid "invalid certificate format"
msgstr "初始化憑證資料時發生錯誤:%s"
-#: ../libnm-core/nm-setting-8021x.c:1895 ../libnm-util/nm-setting-8021x.c:1812
+#: ../libnm-core/nm-setting-8021x.c:2098 ../libnm-util/nm-setting-8021x.c:1812
#, fuzzy
msgid "invalid private key"
msgstr "無效的閘道器「%s」"
-#: ../libnm-core/nm-setting-8021x.c:2207 ../libnm-util/nm-setting-8021x.c:2123
+#: ../libnm-core/nm-setting-8021x.c:2445 ../libnm-util/nm-setting-8021x.c:2123
#, fuzzy
msgid "invalid phase2 private key"
msgstr "解密私密金鑰失敗。"
-#: ../libnm-core/nm-setting-8021x.c:2418 ../libnm-core/nm-setting-8021x.c:2435
-#: ../libnm-core/nm-setting-8021x.c:2466 ../libnm-core/nm-setting-8021x.c:2483
-#: ../libnm-core/nm-setting-8021x.c:2524 ../libnm-core/nm-setting-8021x.c:2536
-#: ../libnm-core/nm-setting-8021x.c:2554 ../libnm-core/nm-setting-8021x.c:2566
-#: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-adsl.c:196
+#: ../libnm-core/nm-setting-8021x.c:2661 ../libnm-core/nm-setting-8021x.c:2678
+#: ../libnm-core/nm-setting-8021x.c:2709 ../libnm-core/nm-setting-8021x.c:2726
+#: ../libnm-core/nm-setting-8021x.c:2767 ../libnm-core/nm-setting-8021x.c:2779
+#: ../libnm-core/nm-setting-8021x.c:2797 ../libnm-core/nm-setting-8021x.c:2809
+#: ../libnm-core/nm-setting-8021x.c:2834 ../libnm-core/nm-setting-adsl.c:196
#: ../libnm-core/nm-setting-cdma.c:148 ../libnm-core/nm-setting-cdma.c:157
-#: ../libnm-core/nm-setting-connection.c:844
-#: ../libnm-core/nm-setting-connection.c:887
-#: ../libnm-core/nm-setting-gsm.c:281 ../libnm-core/nm-setting-gsm.c:338
-#: ../libnm-core/nm-setting-gsm.c:375 ../libnm-core/nm-setting-gsm.c:384
-#: ../libnm-core/nm-setting-ip-config.c:2174
+#: ../libnm-core/nm-setting-connection.c:878
+#: ../libnm-core/nm-setting-connection.c:923 ../libnm-core/nm-setting-gsm.c:281
+#: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
+#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2265
#: ../libnm-core/nm-setting-ip4-config.c:198
#: ../libnm-core/nm-setting-ip4-config.c:205
#: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -7949,9 +7702,8 @@ msgstr "解密私密金鑰失敗。"
#: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:169
#: ../libnm-util/nm-setting-cdma.c:178
#: ../libnm-util/nm-setting-connection.c:775
-#: ../libnm-util/nm-setting-connection.c:852
-#: ../libnm-util/nm-setting-gsm.c:282 ../libnm-util/nm-setting-gsm.c:339
-#: ../libnm-util/nm-setting-ip4-config.c:934
+#: ../libnm-util/nm-setting-connection.c:852 ../libnm-util/nm-setting-gsm.c:282
+#: ../libnm-util/nm-setting-gsm.c:339 ../libnm-util/nm-setting-ip4-config.c:934
#: ../libnm-util/nm-setting-ip4-config.c:943
#: ../libnm-util/nm-setting-pppoe.c:170 ../libnm-util/nm-setting-pppoe.c:179
#: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
@@ -7961,28 +7713,28 @@ msgstr "解密私密金鑰失敗。"
msgid "property is empty"
msgstr "屬性為空"
-#: ../libnm-core/nm-setting-8021x.c:2448 ../libnm-core/nm-setting-8021x.c:2496
+#: ../libnm-core/nm-setting-8021x.c:2691 ../libnm-core/nm-setting-8021x.c:2739
#: ../libnm-util/nm-setting-8021x.c:2360 ../libnm-util/nm-setting-8021x.c:2372
#: ../libnm-util/nm-setting-8021x.c:2418 ../libnm-util/nm-setting-8021x.c:2430
#, c-format
msgid "has to match '%s' property for PKCS#12"
msgstr "必須符合 PKCS#12 的 '%s' 屬性"
-#: ../libnm-core/nm-setting-8021x.c:2723
+#: ../libnm-core/nm-setting-8021x.c:2966
#, fuzzy, c-format
msgid "certificate is invalid: %s"
msgstr "屬性不合規定"
-#: ../libnm-core/nm-setting-8021x.c:2758
+#: ../libnm-core/nm-setting-8021x.c:3001
#: ../libnm-core/nm-setting-bluetooth.c:129
#: ../libnm-core/nm-setting-infiniband.c:192
#: ../libnm-core/nm-setting-infiniband.c:207
#: ../libnm-core/nm-setting-ip4-config.c:189
-#: ../libnm-core/nm-setting-ip6-config.c:188
-#: ../libnm-core/nm-setting-ip6-config.c:199
+#: ../libnm-core/nm-setting-ip6-config.c:215
+#: ../libnm-core/nm-setting-ip6-config.c:226
#: ../libnm-core/nm-setting-olpc-mesh.c:149
-#: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:665
-#: ../libnm-core/nm-setting-wired.c:675
+#: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:676
+#: ../libnm-core/nm-setting-wired.c:686
#: ../libnm-core/nm-setting-wireless-security.c:934
#: ../libnm-core/nm-setting-wireless-security.c:943
#: ../libnm-core/nm-setting-wireless-security.c:952
@@ -7990,16 +7742,16 @@ msgstr "屬性不合規定"
#: ../libnm-core/nm-setting-wireless-security.c:998
#: ../libnm-core/nm-setting-wireless-security.c:1029
#: ../libnm-core/nm-setting-wireless-security.c:1068
-#: ../libnm-core/nm-setting-wireless.c:790
-#: ../libnm-core/nm-setting-wireless.c:799
-#: ../libnm-core/nm-setting-wireless.c:808 ../libnm-util/nm-setting.c:1367
+#: ../libnm-core/nm-setting-wireless.c:811
+#: ../libnm-core/nm-setting-wireless.c:820
+#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-util/nm-setting.c:1367
#: ../libnm-util/nm-setting.c:1385 ../libnm-util/nm-setting.c:1404
#: ../libnm-util/nm-setting-8021x.c:2655 ../libnm-util/nm-setting-8021x.c:2689
#: ../libnm-util/nm-setting-bluetooth.c:151
#: ../libnm-util/nm-setting-infiniband.c:205
#: ../libnm-util/nm-setting-infiniband.c:221
#: ../libnm-util/nm-setting-ip4-config.c:925
-#: ../libnm-util/nm-setting-ip6-config.c:887
+#: ../libnm-util/nm-setting-ip6-config.c:890
#: ../libnm-util/nm-setting-olpc-mesh.c:151
#: ../libnm-util/nm-setting-wimax.c:168 ../libnm-util/nm-setting-wired.c:658
#: ../libnm-util/nm-setting-wired.c:667
@@ -8014,17 +7766,15 @@ msgstr "屬性不合規定"
msgid "property is invalid"
msgstr "屬性不合規定"
-#: ../libnm-core/nm-setting-8021x.c:2783 ../libnm-core/nm-setting-8021x.c:2793
-#: ../libnm-core/nm-setting-8021x.c:2803 ../libnm-core/nm-setting-8021x.c:2813
-#: ../libnm-core/nm-setting-8021x.c:2823 ../libnm-core/nm-setting-adsl.c:208
-#: ../libnm-core/nm-setting-adsl.c:220
-#: ../libnm-core/nm-setting-bluetooth.c:146
+#: ../libnm-core/nm-setting-8021x.c:3026 ../libnm-core/nm-setting-8021x.c:3036
+#: ../libnm-core/nm-setting-8021x.c:3046 ../libnm-core/nm-setting-8021x.c:3056
+#: ../libnm-core/nm-setting-8021x.c:3066 ../libnm-core/nm-setting-adsl.c:208
+#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:146
#: ../libnm-core/nm-setting-wireless-security.c:870
#: ../libnm-util/nm-setting-8021x.c:2714 ../libnm-util/nm-setting-8021x.c:2724
#: ../libnm-util/nm-setting-8021x.c:2734 ../libnm-util/nm-setting-8021x.c:2744
#: ../libnm-util/nm-setting-8021x.c:2754 ../libnm-util/nm-setting-adsl.c:228
-#: ../libnm-util/nm-setting-adsl.c:240
-#: ../libnm-util/nm-setting-bluetooth.c:168
+#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:168
#: ../libnm-util/nm-setting-wireless-security.c:900
#, c-format
msgid "'%s' is not a valid value for the property"
@@ -8035,75 +7785,75 @@ msgstr "'%s' 不是合於屬性規定的值"
msgid "'%s' connection requires '%s' or '%s' setting"
msgstr "需要 '%s' 或 '%s' 設定"
-#: ../libnm-core/nm-setting-bond.c:485 ../libnm-util/nm-setting-bond.c:502
+#: ../libnm-core/nm-setting-bond.c:550 ../libnm-util/nm-setting-bond.c:502
#, c-format
msgid "invalid option '%s' or its value '%s'"
msgstr "不合於規定的選項 '%s' 或其值為 '%s'"
-#: ../libnm-core/nm-setting-bond.c:510 ../libnm-util/nm-setting-bond.c:521
+#: ../libnm-core/nm-setting-bond.c:575 ../libnm-util/nm-setting-bond.c:521
#, c-format
msgid "only one of '%s' and '%s' can be set"
msgstr "只能設定 '%s' 與 '%s' 其中之一"
-#: ../libnm-core/nm-setting-bond.c:523 ../libnm-util/nm-setting-bond.c:532
+#: ../libnm-core/nm-setting-bond.c:588 ../libnm-util/nm-setting-bond.c:532
#, c-format
msgid "mandatory option '%s' is missing"
msgstr "找不到必要選項 '%s'"
-#: ../libnm-core/nm-setting-bond.c:533 ../libnm-util/nm-setting-bond.c:541
+#: ../libnm-core/nm-setting-bond.c:598 ../libnm-util/nm-setting-bond.c:541
#, c-format
msgid "'%s' is not a valid value for '%s'"
msgstr "'%s' 不是合於 '%s' 規定的值"
-#: ../libnm-core/nm-setting-bond.c:547 ../libnm-util/nm-setting-bond.c:554
+#: ../libnm-core/nm-setting-bond.c:612 ../libnm-util/nm-setting-bond.c:554
#, c-format
msgid "'%s=%s' is incompatible with '%s > 0'"
msgstr "'%s=%s' 與 '%s > 0' 不相容"
-#: ../libnm-core/nm-setting-bond.c:560 ../libnm-util/nm-setting-bond.c:567
+#: ../libnm-core/nm-setting-bond.c:627
#, c-format
-msgid "'%s' is not a valid interface name for '%s' option"
-msgstr "'%s' 不是 '%s' 選項合於規定的介面名稱"
+msgid "'%s' is not a valid for '%s' option: %s"
+msgstr ""
-#: ../libnm-core/nm-setting-bond.c:570 ../libnm-util/nm-setting-bond.c:577
+#: ../libnm-core/nm-setting-bond.c:638 ../libnm-util/nm-setting-bond.c:577
#, c-format
msgid "'%s' option is only valid for '%s=%s'"
msgstr "'%s' 選項僅適用於 '%s=%s'"
-#: ../libnm-core/nm-setting-bond.c:583 ../libnm-util/nm-setting-bond.c:590
+#: ../libnm-core/nm-setting-bond.c:651 ../libnm-util/nm-setting-bond.c:590
#, c-format
msgid "'%s=%s' is not a valid configuration for '%s'"
msgstr "'%s=%s' 不是合於 '%s' 規定的配置"
-#: ../libnm-core/nm-setting-bond.c:596 ../libnm-core/nm-setting-bond.c:605
-#: ../libnm-core/nm-setting-bond.c:625 ../libnm-core/nm-setting-bond.c:661
+#: ../libnm-core/nm-setting-bond.c:664 ../libnm-core/nm-setting-bond.c:673
+#: ../libnm-core/nm-setting-bond.c:693 ../libnm-core/nm-setting-bond.c:729
#: ../libnm-util/nm-setting-bond.c:603 ../libnm-util/nm-setting-bond.c:612
#: ../libnm-util/nm-setting-bond.c:632 ../libnm-util/nm-setting-bond.c:668
#, c-format
msgid "'%s' option requires '%s' option to be set"
msgstr "'%s' 選項需要先設定 '%s' 選項"
-#: ../libnm-core/nm-setting-bond.c:636 ../libnm-util/nm-setting-bond.c:643
+#: ../libnm-core/nm-setting-bond.c:704 ../libnm-util/nm-setting-bond.c:643
#, c-format
msgid "'%s' option is empty"
msgstr "未設定 '%s' 選項"
-#: ../libnm-core/nm-setting-bond.c:648 ../libnm-util/nm-setting-bond.c:655
+#: ../libnm-core/nm-setting-bond.c:716 ../libnm-util/nm-setting-bond.c:655
#, c-format
msgid "'%s' is not a valid IPv4 address for '%s' option"
msgstr "'%s' 不是合於 '%s' 選項的 IPv4 位址。"
-#: ../libnm-core/nm-setting-bond.c:676 ../libnm-util/nm-setting-bond.c:682
+#: ../libnm-core/nm-setting-bond.c:744 ../libnm-util/nm-setting-bond.c:682
#, fuzzy, c-format
msgid "'%s' option is only valid with mode '%s'"
msgstr "'%s' 選項僅適用於 '%s=%s'"
-#: ../libnm-core/nm-setting-bond.c:687
+#: ../libnm-core/nm-setting-bond.c:755
#, c-format
msgid "'%s' and '%s' cannot have different values"
msgstr ""
-#: ../libnm-core/nm-setting-bond.c:703
+#: ../libnm-core/nm-setting-bond.c:771
#, fuzzy, c-format
msgid "'%s' option should be string"
msgstr "未設定 '%s' 選項"
@@ -8117,13 +7867,13 @@ msgid "'%d' is not a valid value for the property (should be <= %d)"
msgstr "'%d' 不是屬性合於規定的值(應該 <= %d)"
#: ../libnm-core/nm-setting-bridge-port.c:154
-#: ../libnm-core/nm-setting-team-port.c:97
+#: ../libnm-core/nm-setting-team-port.c:99
#, fuzzy, c-format
msgid "missing setting"
msgstr "遺失選項"
#: ../libnm-core/nm-setting-bridge-port.c:165
-#: ../libnm-core/nm-setting-team-port.c:108
+#: ../libnm-core/nm-setting-team-port.c:110
#, c-format
msgid ""
"A connection with a '%s' setting must have the slave-type set to '%s'. "
@@ -8135,57 +7885,57 @@ msgstr ""
msgid "value '%d' is out of range <%d-%d>"
msgstr "'%d' 值落在範圍之外 <%d-%d>"
-#: ../libnm-core/nm-setting-bridge.c:244 ../libnm-core/nm-setting-wired.c:639
-#: ../libnm-core/nm-setting-wired.c:699 ../libnm-core/nm-setting-wired.c:727
+#: ../libnm-core/nm-setting-bridge.c:244 ../libnm-core/nm-setting-wired.c:650
+#: ../libnm-core/nm-setting-wired.c:712 ../libnm-core/nm-setting-wired.c:754
#: ../libnm-util/nm-setting-bridge.c:286 ../libnm-util/nm-setting-wired.c:633
#: ../libnm-util/nm-setting-wired.c:691
msgid "is not a valid MAC address"
msgstr "不是個有效的 MAC 位址"
-#: ../libnm-core/nm-setting-connection.c:816
+#: ../libnm-core/nm-setting-connection.c:850
#, fuzzy, c-format
msgid "setting required for connection of type '%s'"
msgstr "無法為「%s」連線(類型「%s」)建立編輯程式。"
-#: ../libnm-core/nm-setting-connection.c:897
+#: ../libnm-core/nm-setting-connection.c:933
#, fuzzy, c-format
msgid "connection type '%s' is not valid"
msgstr "索引「%s」無效"
-#: ../libnm-core/nm-setting-connection.c:932
+#: ../libnm-core/nm-setting-connection.c:968
#: ../libnm-util/nm-setting-connection.c:877
#, fuzzy, c-format
msgid "Unknown slave type '%s'"
msgstr "不明日誌層級「%s」"
-#: ../libnm-core/nm-setting-connection.c:942
+#: ../libnm-core/nm-setting-connection.c:978
#: ../libnm-util/nm-setting-connection.c:887
#, fuzzy, c-format
msgid "Slave connections need a valid '%s' property"
msgstr "「%s」連線需要「%s」在此內容中"
-#: ../libnm-core/nm-setting-connection.c:963
+#: ../libnm-core/nm-setting-connection.c:999
#: ../libnm-util/nm-setting-connection.c:897
#, c-format
msgid "Cannot set '%s' without '%s'"
msgstr ""
-#: ../libnm-core/nm-setting-connection.c:977
+#: ../libnm-core/nm-setting-connection.c:1013
#, fuzzy, c-format
msgid "metered value %d is not valid"
msgstr "索引「%s」無效"
-#: ../libnm-core/nm-setting-connection.c:998
+#: ../libnm-core/nm-setting-connection.c:1034
#, c-format
msgid "property type should be set to '%s'"
msgstr ""
-#: ../libnm-core/nm-setting-connection.c:1013
+#: ../libnm-core/nm-setting-connection.c:1049
#, fuzzy, c-format
msgid "slave-type '%s' requires a '%s' setting in the connection"
msgstr "連線中需要 '%s' 設定存在"
-#: ../libnm-core/nm-setting-connection.c:1023
+#: ../libnm-core/nm-setting-connection.c:1059
#, c-format
msgid ""
"Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
@@ -8246,22 +7996,17 @@ msgstr "屬性為空"
msgid "property must contain only digits"
msgstr ""
-#: ../libnm-core/nm-setting-infiniband.c:217
-#: ../libnm-util/nm-setting-infiniband.c:231
-msgid "not a valid interface name"
-msgstr "不是合於規定的介面名稱"
-
-#: ../libnm-core/nm-setting-infiniband.c:225
+#: ../libnm-core/nm-setting-infiniband.c:228
#: ../libnm-util/nm-setting-infiniband.c:239
msgid "Must specify a P_Key if specifying parent"
msgstr "如果指定父屬,就必須指定一組 P_Key"
-#: ../libnm-core/nm-setting-infiniband.c:235
+#: ../libnm-core/nm-setting-infiniband.c:238
#: ../libnm-util/nm-setting-infiniband.c:249
msgid "InfiniBand P_Key connection did not specify parent interface name"
msgstr "InfiniBand P_Key 連線並位指定父介面的名稱"
-#: ../libnm-core/nm-setting-infiniband.c:271
+#: ../libnm-core/nm-setting-infiniband.c:275
#: ../libnm-util/nm-setting-infiniband.c:285
#, c-format
msgid ""
@@ -8269,7 +8014,7 @@ msgid ""
"it is '%s')"
msgstr ""
-#: ../libnm-core/nm-setting-infiniband.c:286
+#: ../libnm-core/nm-setting-infiniband.c:290
#, c-format
msgid "mtu for transport mode '%s' can be at most %d but it is %d"
msgstr ""
@@ -8309,47 +8054,52 @@ msgstr "無效的 IPv6 位址「%s」"
msgid "Invalid routing metric '%s'"
msgstr "無效的單位「%s」"
-#: ../libnm-core/nm-setting-ip-config.c:2187
+#: ../libnm-core/nm-setting-ip-config.c:2278
#, fuzzy, c-format
msgid "%d. DNS server address is invalid"
msgstr "%d。IPv4 位址不合規定"
-#: ../libnm-core/nm-setting-ip-config.c:2203
+#: ../libnm-core/nm-setting-ip-config.c:2294
#, fuzzy, c-format
msgid "%d. IP address is invalid"
msgstr "%d。IPv4 位址不合規定"
-#: ../libnm-core/nm-setting-ip-config.c:2215
+#: ../libnm-core/nm-setting-ip-config.c:2306
#, fuzzy, c-format
msgid "%d. IP address has 'label' property with invalid type"
msgstr "%d。IPv4 位址的前綴不合規定"
-#: ../libnm-core/nm-setting-ip-config.c:2224
+#: ../libnm-core/nm-setting-ip-config.c:2315
#, fuzzy, c-format
msgid "%d. IP address has invalid label '%s'"
msgstr "%d。IPv4 位址的前綴不合規定"
-#: ../libnm-core/nm-setting-ip-config.c:2238
+#: ../libnm-core/nm-setting-ip-config.c:2329
msgid "gateway cannot be set if there are no addresses configured"
msgstr ""
-#: ../libnm-core/nm-setting-ip-config.c:2247
+#: ../libnm-core/nm-setting-ip-config.c:2338
#, fuzzy
msgid "gateway is invalid"
msgstr "屬性不合規定"
-#: ../libnm-core/nm-setting-ip-config.c:2261
+#: ../libnm-core/nm-setting-ip-config.c:2352
#, c-format
msgid "%d. route is invalid"
msgstr "%d。路徑不合規定"
-#: ../libnm-core/nm-setting-ip-config.c:2270
+#: ../libnm-core/nm-setting-ip-config.c:2361
#, c-format
msgid "%d. route cannot be a default route"
msgstr ""
+#: ../libnm-core/nm-setting-ip-config.c:2372
+#, fuzzy, c-format
+msgid "a gateway is incompatible with '%s'"
+msgstr "'%s=%s' 與 '%s > 0' 不相容"
+
#: ../libnm-core/nm-setting-ip4-config.c:143
-#: ../libnm-core/nm-setting-ip6-config.c:144
+#: ../libnm-core/nm-setting-ip6-config.c:167
#: ../libnm-util/nm-setting-ip4-config.c:879
#: ../libnm-util/nm-setting-ip6-config.c:843
#, fuzzy, c-format
@@ -8359,15 +8109,15 @@ msgstr "此屬性不能用於 '%s=%s'"
#: ../libnm-core/nm-setting-ip4-config.c:155
#: ../libnm-core/nm-setting-ip4-config.c:165
#: ../libnm-core/nm-setting-ip4-config.c:177
-#: ../libnm-core/nm-setting-ip6-config.c:156
-#: ../libnm-core/nm-setting-ip6-config.c:166
-#: ../libnm-core/nm-setting-ip6-config.c:176
+#: ../libnm-core/nm-setting-ip6-config.c:182
+#: ../libnm-core/nm-setting-ip6-config.c:192
+#: ../libnm-core/nm-setting-ip6-config.c:202
#: ../libnm-util/nm-setting-ip4-config.c:891
#: ../libnm-util/nm-setting-ip4-config.c:901
#: ../libnm-util/nm-setting-ip4-config.c:913
#: ../libnm-util/nm-setting-ip6-config.c:855
#: ../libnm-util/nm-setting-ip6-config.c:865
-#: ../libnm-util/nm-setting-ip6-config.c:875
+#: ../libnm-util/nm-setting-ip6-config.c:877
#, c-format
msgid "this property is not allowed for '%s=%s'"
msgstr "此屬性不能用於 '%s=%s'"
@@ -8381,39 +8131,65 @@ msgstr "「%s」不是個有效的 UUID"
msgid "property cannot be set when dhcp-hostname is also set"
msgstr ""
+#: ../libnm-core/nm-setting-ip4-config.c:235
+#, c-format
+msgid "multiple addresses are not allowed for '%s=%s'"
+msgstr ""
+
+#: ../libnm-core/nm-setting-ip4-config.c:249
+msgid "property should be TRUE when method is set to disabled"
+msgstr ""
+
+#: ../libnm-core/nm-setting-ip6-config.c:241
+#, fuzzy
+msgid "value is not a valid token"
+msgstr "「%s」不是個有效的 UUID"
+
+#: ../libnm-core/nm-setting-ip6-config.c:252
+msgid "only makes sense with EUI64 address generation mode"
+msgstr ""
+
+#: ../libnm-core/nm-setting-ip6-config.c:264
+msgid "token is not in canonical form"
+msgstr ""
+
+#: ../libnm-core/nm-setting-ip6-config.c:276
+msgid "property should be TRUE when method is set to ignore"
+msgstr ""
+
#: ../libnm-core/nm-setting-ip-tunnel.c:318
#, fuzzy, c-format
msgid "'%d' is not a valid tunnel mode"
msgstr "'%d' 不是合於規定的頻道"
#: ../libnm-core/nm-setting-ip-tunnel.c:330
-#: ../libnm-core/nm-setting-macvlan.c:167 ../libnm-core/nm-setting-vlan.c:647
+#: ../libnm-core/nm-setting-macvlan.c:167 ../libnm-core/nm-setting-vlan.c:645
#: ../libnm-core/nm-setting-vxlan.c:403 ../libnm-util/nm-setting-vlan.c:567
#, c-format
msgid "'%s' is neither an UUID nor an interface name"
msgstr "'%s' 既不是 UUID 也不是介面名稱"
#: ../libnm-core/nm-setting-ip-tunnel.c:341
-#: ../libnm-core/nm-setting-ip-tunnel.c:352
+#: ../libnm-core/nm-setting-ip-tunnel.c:361
#, fuzzy, c-format
msgid "'%s' is not a valid IPv%c address"
msgstr "「%s」不是個有效的 MAC 位址"
-#: ../libnm-core/nm-setting-ip-tunnel.c:366
+#: ../libnm-core/nm-setting-ip-tunnel.c:375
msgid "tunnel keys can only be specified for GRE tunnels"
msgstr ""
-#: ../libnm-core/nm-setting-ip-tunnel.c:379
-#: ../libnm-core/nm-setting-ip-tunnel.c:395
+#: ../libnm-core/nm-setting-ip-tunnel.c:388
+#: ../libnm-core/nm-setting-ip-tunnel.c:404
#, fuzzy, c-format
msgid "'%s' is not a valid tunnel key"
msgstr "「%s」不是個有效的頻道"
-#: ../libnm-core/nm-setting-ip-tunnel.c:407
+#: ../libnm-core/nm-setting-ip-tunnel.c:416
msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
msgstr ""
-#: ../libnm-core/nm-setting-macvlan.c:181 ../libnm-core/nm-setting-vlan.c:661
+#: ../libnm-core/nm-setting-macvlan.c:181 ../libnm-core/nm-setting-vlan.c:659
#: ../libnm-util/nm-setting-vlan.c:580
#, c-format
msgid "property is not specified and neither is '%s:%s'"
@@ -8424,14 +8200,14 @@ msgid "non promiscuous operation is allowed only in passthru mode"
msgstr ""
#: ../libnm-core/nm-setting-olpc-mesh.c:130
-#: ../libnm-core/nm-setting-wireless.c:739
+#: ../libnm-core/nm-setting-wireless.c:760
#: ../libnm-util/nm-setting-olpc-mesh.c:132
#: ../libnm-util/nm-setting-wireless.c:778
msgid "SSID length is out of range <1-32> bytes"
msgstr "SSID 的長度落於範圍 <1-32> 位元之外"
#: ../libnm-core/nm-setting-olpc-mesh.c:139
-#: ../libnm-core/nm-setting-wireless.c:779
+#: ../libnm-core/nm-setting-wireless.c:800
#: ../libnm-util/nm-setting-olpc-mesh.c:141
#: ../libnm-util/nm-setting-wireless.c:818
#, c-format
@@ -8448,6 +8224,36 @@ msgstr "'%d' 落於範圍 <128-16384> 之外"
msgid "setting this property requires non-zero '%s' property"
msgstr "設定此屬性需要非零值的 '%s' 屬性"
+#: ../libnm-core/nm-setting-proxy.c:163
+#, c-format
+msgid "invalid proxy method"
+msgstr ""
+
+#: ../libnm-core/nm-setting-proxy.c:173 ../libnm-core/nm-setting-proxy.c:182
+#, c-format
+msgid "this property is not allowed for method none"
+msgstr ""
+
+#: ../libnm-core/nm-setting-proxy.c:193
+#, c-format
+msgid "the script is too large"
+msgstr ""
+
+#: ../libnm-core/nm-setting-proxy.c:201
+#, c-format
+msgid "the script is not valid utf8"
+msgstr ""
+
+#: ../libnm-core/nm-setting-proxy.c:209
+#, c-format
+msgid "the script lacks FindProxyForURL function"
+msgstr ""
+
+#: ../libnm-core/nm-setting-team.c:94 ../libnm-core/nm-setting-team-port.c:122
+#, c-format
+msgid "team config exceeds size limit"
+msgstr ""
+
#: ../libnm-core/nm-setting-tun.c:187
#, fuzzy, c-format
msgid "'%u': invalid mode"
@@ -8463,17 +8269,17 @@ msgstr "「%s」不是個有效的 UUID"
msgid "'%s': invalid group ID"
msgstr "「%s」不是個有效的 UUID"
-#: ../libnm-core/nm-setting-vlan.c:636 ../libnm-util/nm-setting-vlan.c:556
+#: ../libnm-core/nm-setting-vlan.c:634 ../libnm-util/nm-setting-vlan.c:556
#, c-format
msgid "'%s' value doesn't match '%s=%s'"
msgstr "'%s' 的值與 '%s=%s' 不符"
-#: ../libnm-core/nm-setting-vlan.c:672 ../libnm-util/nm-setting-vlan.c:600
+#: ../libnm-core/nm-setting-vlan.c:670 ../libnm-util/nm-setting-vlan.c:600
#, c-format
msgid "the vlan id must be in range 0-4094 but is %u"
msgstr ""
-#: ../libnm-core/nm-setting-vlan.c:681 ../libnm-util/nm-setting-vlan.c:591
+#: ../libnm-core/nm-setting-vlan.c:679 ../libnm-util/nm-setting-vlan.c:591
msgid "flags are invalid"
msgstr "旗標不合規定"
@@ -8499,15 +8305,11 @@ msgstr ""
msgid "secret is not of correct type"
msgstr ""
-#: ../libnm-core/nm-setting-vpn.c:586
+#: ../libnm-core/nm-setting-vpn.c:582
#, fuzzy, c-format
msgid "failed to convert value '%s' to uint"
msgstr "錯誤:移除「%s」的值失敗:%s\n"
-#: ../libnm-core/nm-setting-vpn.c:594
-msgid "secret flags property not found"
-msgstr ""
-
#: ../libnm-core/nm-setting-vxlan.c:375
#, fuzzy, c-format
msgid "'%s' is not a valid IP address"
@@ -8523,29 +8325,41 @@ msgstr "「%s」不是個有效的 MAC 位址"
msgid "%d is greater than local port max %d"
msgstr ""
-#: ../libnm-core/nm-setting-wired.c:619 ../libnm-util/nm-setting-wired.c:613
+#: ../libnm-core/nm-setting-wired.c:630 ../libnm-util/nm-setting-wired.c:613
#, fuzzy, c-format
msgid "'%s' is not a valid Ethernet port value"
msgstr "'%s' 不是合於規定的乙太網路連接埠之值"
-#: ../libnm-core/nm-setting-wired.c:629 ../libnm-util/nm-setting-wired.c:623
+#: ../libnm-core/nm-setting-wired.c:640 ../libnm-util/nm-setting-wired.c:623
#, c-format
msgid "'%s' is not a valid duplex value"
msgstr "「%s」不是個有效的雙工值"
-#: ../libnm-core/nm-setting-wired.c:688 ../libnm-util/nm-setting-wired.c:680
+#: ../libnm-core/nm-setting-wired.c:699 ../libnm-util/nm-setting-wired.c:680
#, c-format
msgid "invalid '%s' or its value '%s'"
msgstr "無效的「%s」或是它的值「%s」無效"
-#: ../libnm-core/nm-setting-wired.c:709
+#: ../libnm-core/nm-setting-wired.c:736
msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
msgstr ""
-#: ../libnm-core/nm-setting-wired.c:718
+#: ../libnm-core/nm-setting-wired.c:745
msgid "Wake-on-LAN password can only be used with magic packet mode"
msgstr ""
+#: ../libnm-core/nm-setting-wired.c:768
+msgid "when link autonegotiation is enabled no duplex value is accepted"
+msgstr ""
+
+#: ../libnm-core/nm-setting-wired.c:776
+msgid "when link autonegotiation is enabled speed should be 0"
+msgstr ""
+
+#: ../libnm-core/nm-setting-wired.c:786
+msgid "both speed and duplex are required for static link configuration"
+msgstr ""
+
#: ../libnm-core/nm-setting-wireless-security.c:882
#: ../libnm-util/nm-setting-wireless-security.c:912
#, c-format
@@ -8576,23 +8390,33 @@ msgstr "「%s」連線需要「%s」在此內容中"
msgid "'%s' can only be used with '%s=%s' (WEP)"
msgstr "「%s」只能與「%s=%s」(WEP)搭配使用"
-#: ../libnm-core/nm-setting-wireless.c:748
+#: ../libnm-core/nm-setting-wireless.c:769
#: ../libnm-util/nm-setting-wireless.c:787
#, c-format
msgid "'%s' is not a valid Wi-Fi mode"
msgstr "「%s」不是個有效的 Wi-Fi 模式"
-#: ../libnm-core/nm-setting-wireless.c:758
+#: ../libnm-core/nm-setting-wireless.c:779
#: ../libnm-util/nm-setting-wireless.c:797
#, c-format
msgid "'%s' is not a valid band"
msgstr "「%s」不是個有效的頻道"
-#: ../libnm-core/nm-setting-wireless.c:768
+#: ../libnm-core/nm-setting-wireless.c:789
#, fuzzy, c-format
msgid "'%s' requires setting '%s' property"
msgstr "需要設定「%s」內容"
+#: ../libnm-core/nm-setting-wireless.c:883
+#, c-format
+msgid "invalid value"
+msgstr ""
+
+#: ../libnm-core/nm-setting-wireless.c:904
+#, c-format
+msgid "conflicting value of mac-address-randomization and cloned-mac-address"
+msgstr ""
+
#: ../libnm-core/nm-setting.c:837
#, c-format
msgid "duplicate property"
@@ -8626,164 +8450,231 @@ msgstr ""
msgid "secret is not set"
msgstr ""
-#: ../libnm-core/nm-utils.c:2447
+#: ../libnm-core/nm-utils.c:2488
#, fuzzy, c-format
msgid "failed stat file %s: %s"
msgstr "無法設置訊號遮罩:%d"
-#: ../libnm-core/nm-utils.c:2456
+#: ../libnm-core/nm-utils.c:2497
#, fuzzy, c-format
msgid "not a file (%s)"
msgstr "無法載入檔案「%s」\n"
-#: ../libnm-core/nm-utils.c:2467
+#: ../libnm-core/nm-utils.c:2508
#, fuzzy, c-format
msgid "invalid file owner %d for %s"
msgstr "無效的欄位「%s」; 允許的欄位:%s"
-#: ../libnm-core/nm-utils.c:2478
+#: ../libnm-core/nm-utils.c:2519
#, c-format
msgid "file permissions for %s"
msgstr ""
-#: ../libnm-core/nm-utils.c:2488
+#: ../libnm-core/nm-utils.c:2529
#, c-format
msgid "reject %s"
msgstr ""
-#: ../libnm-core/nm-utils.c:2508
+#: ../libnm-core/nm-utils.c:2549
#, c-format
msgid "path is not absolute (%s)"
msgstr ""
-#: ../libnm-core/nm-utils.c:2522
+#: ../libnm-core/nm-utils.c:2563
#, c-format
msgid "Plugin file does not exist (%s)"
msgstr ""
-#: ../libnm-core/nm-utils.c:2530
+#: ../libnm-core/nm-utils.c:2571
#, fuzzy, c-format
msgid "Plugin is not a valid file (%s)"
msgstr "'%s' 不是合於 '%s' 規定的值"
-#: ../libnm-core/nm-utils.c:2540
+#: ../libnm-core/nm-utils.c:2581
#, c-format
msgid "libtool archives are not supported (%s)"
msgstr ""
-#: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815
+#: ../libnm-core/nm-utils.c:2663 ../libnm-util/nm-utils.c:1803
#, c-format
msgid "Could not find \"%s\" binary"
msgstr ""
-#: ../libnm-core/nm-vpn-editor-plugin.c:124
+#: ../libnm-core/nm-utils.c:3709
#, c-format
-msgid "cannot load plugin %s"
+msgid "not a valid ethernet MAC address for mask at position %lld"
msgstr ""
-#: ../libnm-core/nm-vpn-editor-plugin.c:150
+#: ../libnm-core/nm-utils.c:3724
#, c-format
-msgid "cannot load VPN plugin in '%s': missing plugin name"
+msgid "not a valid ethernet MAC address #%u at position %lld"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:3758
+msgid "interface name is too short"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:3764
+msgid "interface name is longer than 15 characters"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:3770
+msgid "interface name is reserved"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:3777
+msgid "interface name contains an invalid character"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:4495 ../libnm-core/nm-utils.c:4629
+msgid "value is NULL"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:4495 ../libnm-core/nm-utils.c:4629
+msgid "value is empty"
msgstr ""
-#: ../libnm-core/nm-vpn-editor-plugin.c:157
+#: ../libnm-core/nm-utils.c:4504
#, c-format
-msgid "cannot load VPN plugin in '%s': invalid service name"
+msgid "invalid JSON at position %d (%s)"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:4516 ../libnm-core/nm-utils.c:4648
+msgid "is not a JSON object"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:4618
+msgid "not valid utf-8"
msgstr ""
-#: ../libnm-core/nm-vpn-editor-plugin.c:173
+#: ../libnm-core/nm-vpn-editor-plugin.c:296
#, c-format
-msgid "unknown error initializing plugin %s"
+msgid "cannot load plugin \"%s\": %s"
msgstr ""
-#: ../libnm-core/nm-vpn-editor-plugin.c:185
+#: ../libnm-core/nm-vpn-editor-plugin.c:307
#, c-format
msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
msgstr ""
-#: ../libnm-core/nm-vpn-editor-plugin.c:292
+#: ../libnm-core/nm-vpn-editor-plugin.c:332
+#, c-format
+msgid "unknown error initializing plugin %s"
+msgstr ""
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:349
+#, c-format
+msgid "cannot load VPN plugin in '%s': missing plugin name"
+msgstr ""
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:358
+#, c-format
+msgid "cannot load VPN plugin in '%s': invalid service name"
+msgstr ""
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:501
#, c-format
msgid "the plugin does not support import capability"
msgstr ""
-#: ../libnm-core/nm-vpn-editor-plugin.c:312
+#: ../libnm-core/nm-vpn-editor-plugin.c:521
#, c-format
msgid "the plugin does not support export capability"
msgstr ""
-#: ../libnm-core/nm-vpn-plugin-info.c:109
+#: ../libnm-core/nm-vpn-plugin-info.c:110
#, fuzzy, c-format
msgid "missing filename"
msgstr "遺失選項"
-#: ../libnm-core/nm-vpn-plugin-info.c:117
+#: ../libnm-core/nm-vpn-plugin-info.c:118
#, c-format
msgid "filename must be an absolute path (%s)"
msgstr ""
-#: ../libnm-core/nm-vpn-plugin-info.c:126
+#: ../libnm-core/nm-vpn-plugin-info.c:127
#, c-format
msgid "filename has invalid format (%s)"
msgstr ""
-#: ../libnm-core/nm-vpn-plugin-info.c:383
+#: ../libnm-core/nm-vpn-plugin-info.c:450
#, c-format
msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
msgstr ""
-#: ../libnm-core/nm-vpn-plugin-info.c:421
+#: ../libnm-core/nm-vpn-plugin-info.c:488
#, c-format
msgid "there exists a conflicting plugin with the same name (%s)"
msgstr ""
-#: ../libnm-core/nm-vpn-plugin-info.c:740
+#: ../libnm-core/nm-vpn-plugin-info.c:1071
#, fuzzy, c-format
msgid "missing \"plugin\" setting"
msgstr "遺失選項"
-#: ../libnm-core/nm-vpn-plugin-info.c:750
+#: ../libnm-core/nm-vpn-plugin-info.c:1081
#, c-format
msgid "%s: don't retry loading plugin which already failed previously"
msgstr ""
-#: ../libnm-core/nm-vpn-plugin-info.c:842
+#: ../libnm-core/nm-vpn-plugin-info.c:1175
msgid "missing filename to load VPN plugin info"
msgstr ""
-#: ../libnm-core/nm-vpn-plugin-info.c:854
+#: ../libnm-core/nm-vpn-plugin-info.c:1187
msgid "missing name for VPN plugin info"
msgstr ""
-#: ../libnm-core/nm-vpn-plugin-info.c:863
+#: ../libnm-core/nm-vpn-plugin-info.c:1196
msgid "missing service for VPN plugin info"
msgstr ""
-#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804
+#: ../libnm-glib/nm-device.c:1863 ../libnm/nm-device.c:1665
msgid "Bluetooth"
msgstr "藍牙"
-#: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
+#: ../libnm-glib/nm-device.c:1865 ../libnm/nm-device.c:1667
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../libnm-glib/nm-device.c:1867 ../libnm/nm-device.c:1669
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1683
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../libnm-glib/nm-device.c:1883 ../libnm/nm-device.c:1685
#, fuzzy
msgid "MACVLAN"
msgstr "VLAN"
-#: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
+#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1687
+msgid "VXLAN"
+msgstr ""
+
+#: ../libnm-glib/nm-device.c:1887 ../libnm/nm-device.c:1689
msgid "IPTunnel"
msgstr ""
-#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
+#: ../libnm-glib/nm-device.c:1889 ../libnm/nm-device.c:1691
+msgid "Tun"
+msgstr ""
+
+#: ../libnm-glib/nm-device.c:1891 ../libnm/nm-device.c:1693
msgid "Veth"
msgstr ""
-#: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864
+#: ../libnm-glib/nm-device.c:1923 ../libnm/nm-device.c:1725
msgid "Wired"
msgstr "有線網路"
-#: ../libnm-glib/nm-device.c:1944 ../libnm/nm-device.c:1895
+#: ../libnm-glib/nm-device.c:1954 ../libnm/nm-device.c:1756
msgid "PCI"
msgstr "PCI"
-#: ../libnm-glib/nm-device.c:1946 ../libnm/nm-device.c:1897
+#: ../libnm-glib/nm-device.c:1956 ../libnm/nm-device.c:1758
msgid "USB"
msgstr "USB"
@@ -8792,9 +8683,9 @@ msgstr "USB"
#. * "Ethernet"). You can change this to something like
#. * "%2$s (%1$s)" if there's no grammatical way to combine
#. * the strings otherwise.
-#.
-#: ../libnm-glib/nm-device.c:2042 ../libnm-glib/nm-device.c:2061
-#: ../libnm/nm-device.c:1991 ../libnm/nm-device.c:2010
+#.
+#: ../libnm-glib/nm-device.c:2052 ../libnm-glib/nm-device.c:2071
+#: ../libnm/nm-device.c:1852 ../libnm/nm-device.c:1871
#, c-format
msgctxt "long device name"
msgid "%s %s"
@@ -8830,11 +8721,26 @@ msgstr "無法將密碼轉為 UCS2:%d"
msgid "requires '%s' or '%s' setting"
msgstr "需要 '%s' 或 '%s' 設定"
+#: ../libnm-util/nm-setting-bond.c:567
+#, c-format
+msgid "'%s' is not a valid interface name for '%s' option"
+msgstr "'%s' 不是 '%s' 選項合於規定的介面名稱"
+
+#: ../libnm-util/nm-setting-connection.c:834
+#: ../libnm-util/nm-setting-infiniband.c:269
+#, c-format
+msgid "'%s' is not a valid interface name"
+msgstr "「%s」不是組有效的介面卡名稱"
+
#: ../libnm-util/nm-setting-connection.c:862
#, c-format
msgid "requires presence of '%s' setting in the connection"
msgstr "連線中需要 '%s' 設定存在"
+#: ../libnm-util/nm-setting-infiniband.c:231
+msgid "not a valid interface name"
+msgstr "不是合於規定的介面名稱"
+
#: ../libnm-util/nm-setting-ip4-config.c:957
#, c-format
msgid "%d. IPv4 address is invalid"
@@ -8846,17 +8752,17 @@ msgid "%d. IPv4 address has invalid prefix"
msgstr "%d。IPv4 位址的前綴不合規定"
#: ../libnm-util/nm-setting-ip4-config.c:983
-#: ../libnm-util/nm-setting-ip6-config.c:936
+#: ../libnm-util/nm-setting-ip6-config.c:939
#, c-format
msgid "%d. route has invalid prefix"
msgstr "%d。路徑的前綴不合規定"
-#: ../libnm-util/nm-setting-ip6-config.c:910
+#: ../libnm-util/nm-setting-ip6-config.c:913
#, fuzzy, c-format
msgid "%d. IPv6 address is invalid"
msgstr "%d。IPv4 位址不合規定"
-#: ../libnm-util/nm-setting-ip6-config.c:920
+#: ../libnm-util/nm-setting-ip6-config.c:923
#, fuzzy, c-format
msgid "%d. IPv6 address has invalid prefix"
msgstr "%d。IPv4 位址的前綴不合規定"
@@ -8876,127 +8782,132 @@ msgstr ""
msgid "requires setting '%s' property"
msgstr "需要設定「%s」內容"
-#: ../libnm/nm-device-adsl.c:74
+#: ../libnm/nm-device-adsl.c:73
#, fuzzy
msgid "The connection was not an ADSL connection."
msgstr "正在連線(正在啟用次要連線)"
-#: ../libnm/nm-device-bond.c:112
+#: ../libnm/nm-device-bond.c:111
#, fuzzy
msgid "The connection was not a bond connection."
msgstr "正在連線(正在啟用次要連線)"
-#: ../libnm/nm-device-bridge.c:112
+#: ../libnm/nm-device-bridge.c:111
#, fuzzy
msgid "The connection was not a bridge connection."
msgstr "正在連線(正在啟用次要連線)"
-#: ../libnm/nm-device-bt.c:137
+#: ../libnm/nm-device-bt.c:136
#, fuzzy, c-format
msgid "The connection was not a Bluetooth connection."
msgstr "「bluetooth」連線類型有一項選用性引數。\n"
-#: ../libnm/nm-device-bt.c:146
+#: ../libnm/nm-device-bt.c:145
msgid "Invalid device Bluetooth address."
msgstr ""
-#: ../libnm/nm-device-bt.c:153
+#: ../libnm/nm-device-bt.c:152
msgid "The Bluetooth addresses of the device and the connection didn't match."
msgstr ""
-#: ../libnm/nm-device-bt.c:162
+#: ../libnm/nm-device-bt.c:161
msgid ""
"The device is lacking Bluetooth capabilities required by the connection."
msgstr ""
-#: ../libnm/nm-device-ethernet.c:207
+#: ../libnm/nm-device-ethernet.c:206
#, fuzzy
msgid "The connection was not an Ethernet or PPPoE connection."
msgstr "「PPPoE」的連線類型有四個選用引數。\n"
-#: ../libnm/nm-device-ethernet.c:222
+#: ../libnm/nm-device-ethernet.c:221
msgid "The connection and device differ in S390 subchannels."
msgstr ""
-#: ../libnm/nm-device-ethernet.c:232 ../libnm/nm-device-infiniband.c:102
-#: ../libnm/nm-device-wifi.c:604 ../libnm/nm-device-wimax.c:326
-#, fuzzy
-msgid "Invalid device MAC address."
-msgstr "不是個有效的 MAC 位址"
+#: ../libnm/nm-device-ethernet.c:236
+#, c-format
+msgid "Invalid device MAC address %s."
+msgstr ""
-#: ../libnm/nm-device-ethernet.c:237
+#: ../libnm/nm-device-ethernet.c:241
msgid "The MACs of the device and the connection do not match."
msgstr ""
-#: ../libnm/nm-device-ethernet.c:247
+#: ../libnm/nm-device-ethernet.c:251
#, c-format
msgid "Invalid MAC in the blacklist: %s."
msgstr ""
-#: ../libnm/nm-device-ethernet.c:253
+#: ../libnm/nm-device-ethernet.c:257
#, c-format
msgid "Device MAC (%s) is blacklisted by the connection."
msgstr ""
-#: ../libnm/nm-device-generic.c:91
+#: ../libnm/nm-device-generic.c:90
#, fuzzy
msgid "The connection was not a generic connection."
msgstr "正在連線(正在啟用次要連線)"
-#: ../libnm/nm-device-generic.c:98
+#: ../libnm/nm-device-generic.c:97
#, fuzzy
msgid "The connection did not specify an interface name."
msgstr "InfiniBand P_Key 連線並位指定父介面的名稱"
-#: ../libnm/nm-device-tun.c:209
+#: ../libnm/nm-device-tun.c:208
#, fuzzy
msgid "The connection was not a tun connection."
msgstr "正在連線(正在啟用次要連線)"
-#: ../libnm/nm-device-tun.c:218
+#: ../libnm/nm-device-tun.c:217
#, fuzzy
msgid "The mode of the device and the connection didn't match"
msgstr "裝置的連線消失"
-#: ../libnm/nm-device-infiniband.c:94
+#: ../libnm/nm-device-infiniband.c:93
#, fuzzy
msgid "The connection was not an InfiniBand connection."
msgstr "「InfiniBand」連線類型有五個選用性引數。\n"
-#: ../libnm/nm-device-infiniband.c:110 ../libnm/nm-device-wifi.c:611
-#: ../libnm/nm-device-wimax.c:333
+#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:599
+#: ../libnm/nm-device-wimax.c:324
+#, fuzzy
+msgid "Invalid device MAC address."
+msgstr "不是個有效的 MAC 位址"
+
+#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:606
+#: ../libnm/nm-device-wimax.c:331
msgid "The MACs of the device and the connection didn't match."
msgstr ""
-#: ../libnm/nm-device-ip-tunnel.c:254
+#: ../libnm/nm-device-ip-tunnel.c:253
#, fuzzy
msgid "The connection was not an IP tunnel connection."
msgstr "正在連線(正在啟用次要連線)"
-#: ../libnm/nm-device-macvlan.c:159
+#: ../libnm/nm-device-macvlan.c:158
msgid "The connection was not a MAC-VLAN connection."
msgstr ""
-#: ../libnm/nm-device-modem.c:120
+#: ../libnm/nm-device-modem.c:119
#, fuzzy
msgid "The connection was not a modem connection."
msgstr "連線已移除"
-#: ../libnm/nm-device-modem.c:128
+#: ../libnm/nm-device-modem.c:127
#, fuzzy
msgid "The connection was not a valid modem connection."
msgstr "正在連線(正在啟用次要連線)"
-#: ../libnm/nm-device-modem.c:135
+#: ../libnm/nm-device-modem.c:134
msgid "The device is lacking capabilities required by the connection."
msgstr ""
-#: ../libnm/nm-device-olpc-mesh.c:115
+#: ../libnm/nm-device-olpc-mesh.c:114
#, fuzzy
msgid "The connection was not an OLPC Mesh connection."
msgstr "「OLPC Mesh」連線類型有兩個選用性引數。\n"
-#: ../libnm/nm-device-team.c:118
+#: ../libnm/nm-device-team.c:138
#, fuzzy
msgid "The connection was not a team connection."
msgstr "連線已移除"
@@ -9010,200 +8921,215 @@ msgstr "「VLAN」連線類型有四個選用性引數。\n"
msgid "The VLAN identifiers of the device and the connection didn't match."
msgstr ""
-#: ../libnm/nm-device-vlan.c:148
+#: ../libnm/nm-device-vlan.c:150
msgid "The hardware address of the device and the connection didn't match."
msgstr ""
-#: ../libnm/nm-device-vxlan.c:387
+#: ../libnm/nm-device-vxlan.c:386
#, fuzzy
msgid "The connection was not a VXLAN connection."
msgstr "「VLAN」連線類型有四個選用性引數。\n"
-#: ../libnm/nm-device-vxlan.c:394
+#: ../libnm/nm-device-vxlan.c:393
msgid "The VXLAN identifiers of the device and the connection didn't match."
msgstr ""
-#: ../libnm/nm-device-wifi.c:595
+#: ../libnm/nm-device-wifi.c:590
msgid "The connection was not a Wi-Fi connection."
msgstr ""
-#: ../libnm/nm-device-wifi.c:631
+#: ../libnm/nm-device-wifi.c:626
msgid "The device is lacking WPA capabilities required by the connection."
msgstr ""
-#: ../libnm/nm-device-wifi.c:638
-msgid ""
-"The device is lacking WPA2/RSN capabilities required by the connection."
+#: ../libnm/nm-device-wifi.c:633
+msgid "The device is lacking WPA2/RSN capabilities required by the connection."
msgstr ""
-#: ../libnm/nm-device-wimax.c:317
+#: ../libnm/nm-device-wimax.c:315
#, fuzzy
msgid "The connection was not a WiMAX connection."
msgstr "「WiMax」連線類型有一項選用性引數。\n"
-#: ../libnm/nm-device.c:2729
+#: ../libnm/nm-device.c:2583
#, fuzzy, c-format
msgid "The connection was not valid: %s"
msgstr "錯誤:連線無效:%s\n"
-#: ../libnm/nm-device.c:2738
+#: ../libnm/nm-device.c:2592
#, c-format
msgid "The interface names of the device and the connection didn't match."
msgstr ""
-#: ../libnm/nm-manager.c:874
-#, fuzzy
-msgid "Active connection could not be attached to the device"
-msgstr "沒有使用中的連線或裝置"
-
-#: ../libnm/nm-manager.c:1098
+#: ../libnm/nm-manager.c:822
#, fuzzy
msgid "Active connection removed before it was initialized"
msgstr "有效連線的詳細資訊"
-#: ../libnm/nm-object.c:1545 ../libnm/nm-object.c:1691
-msgid "Caller did not specify D-Bus path for object"
-msgstr ""
-
-#: ../libnm/nm-remote-settings.c:261
+#: ../libnm/nm-remote-settings.c:256
msgid "Connection removed before it was initialized"
msgstr ""
-#: ../libnm/nm-vpn-plugin-old.c:957 ../libnm/nm-vpn-service-plugin.c:978
+#: ../libnm/nm-vpn-plugin-old.c:957 ../libnm/nm-vpn-service-plugin.c:979
#, fuzzy
msgid "No service name specified"
msgstr "錯誤:尚未指定介面卡。"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:1
msgid "Enable or disable system networking"
msgstr "啟用或停用系統網路"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:2
msgid "System policy prevents enabling or disabling system networking"
msgstr "系統政策防止啟用或停用系統網路作業"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:3
+#, fuzzy
+msgid "Reload NetworkManager configuration"
+msgstr "印出 NetworkManager 的版本並退出"
+
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:4
+#, fuzzy
+msgid "System policy prevents reloading NetworkManager"
+msgstr "系統政策防止啟用或停用系統網路作業"
+
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:5
msgid ""
"Put NetworkManager to sleep or wake it up (should only be used by system "
"power management)"
msgstr "將 NetworkManager 導入睡眠模式或將它啟用(只應被系統電源管理所使用)"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:6
msgid "System policy prevents putting NetworkManager to sleep or waking it up"
msgstr "系統政策防止將 NetworkManager 導入睡眠模式或將其啟用"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:7
msgid "Enable or disable WiFi devices"
msgstr "啟用或停用 WiFi 裝置"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:8
msgid "System policy prevents enabling or disabling WiFi devices"
msgstr "系統政策防止啟用或停用 WiFi 裝置"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:9
msgid "Enable or disable mobile broadband devices"
msgstr "啟用或停用行動寬頻裝置"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:10
msgid "System policy prevents enabling or disabling mobile broadband devices"
msgstr "系統政策防止啟用或停用行動寬頻裝置"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:11
msgid "Enable or disable WiMAX mobile broadband devices"
msgstr "啟用或停用 WiMAX 行動寬頻裝置"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:12
msgid ""
"System policy prevents enabling or disabling WiMAX mobile broadband devices"
msgstr "系統政策防止啟用或停用 WiMAX 行動寬頻裝置"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:13
msgid "Allow control of network connections"
msgstr "允許控制網路連線"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:14
msgid "System policy prevents control of network connections"
msgstr "系統政策防止網路連線的控制"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:15
msgid "Connection sharing via a protected WiFi network"
msgstr "透過受保護的 WiFi 網路共享連線"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
-msgid ""
-"System policy prevents sharing connections via a protected WiFi network"
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:16
+msgid "System policy prevents sharing connections via a protected WiFi network"
msgstr "系統政策讓您無法透過受保護的 WiFi 網路共享連結"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:17
msgid "Connection sharing via an open WiFi network"
msgstr "透過開放的 WiFi 網路共享連線"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:18
msgid "System policy prevents sharing connections via an open WiFi network"
msgstr "系統政策讓您無法透過開放的 WiFi 網路共享連線"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:19
msgid "Modify personal network connections"
msgstr "修改個人網路連線"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:20
msgid "System policy prevents modification of personal network settings"
msgstr "系統政策防止修改個人網路設定"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:21
msgid "Modify network connections for all users"
msgstr "修改所有使用者的網路連線"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:22
msgid "System policy prevents modification of network settings for all users"
msgstr "系統政策防止修改所有使用者的網路設定"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:23
msgid "Modify persistent system hostname"
msgstr "修改永久系統的主機名稱"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:24
msgid "System policy prevents modification of the persistent system hostname"
msgstr "系統政策讓您無法修改永久的系統主機名稱"
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:25
msgid "Modify persistent global DNS configuration"
msgstr ""
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:26
#, fuzzy
msgid ""
"System policy prevents modification of the persistent global DNS "
"configuration"
msgstr "系統政策讓您無法修改永久的系統主機名稱"
-#: ../shared/nm-shared-utils.c:208
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:27
+msgid "Perform a checkpoint or rollback of interfaces configuration"
+msgstr ""
+
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:28
+msgid "System policy prevents the creation of a checkpoint or its rollback"
+msgstr ""
+
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:29
+msgid "Enable or disable device statistics"
+msgstr ""
+
+#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:30
+msgid "System policy prevents enabling or disabling device statistics"
+msgstr ""
+
+#: ../shared/nm-utils/nm-shared-utils.c:264
#, c-format
msgid "object class '%s' has no property named '%s'"
msgstr ""
-#: ../shared/nm-shared-utils.c:215
+#: ../shared/nm-utils/nm-shared-utils.c:271
#, c-format
msgid "property '%s' of object class '%s' is not writable"
msgstr ""
-#: ../shared/nm-shared-utils.c:222
+#: ../shared/nm-utils/nm-shared-utils.c:278
#, c-format
msgid ""
"construct property \"%s\" for object '%s' can't be set after construction"
msgstr ""
-#: ../shared/nm-shared-utils.c:230
+#: ../shared/nm-utils/nm-shared-utils.c:286
#, c-format
msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
msgstr ""
-#: ../shared/nm-shared-utils.c:239
+#: ../shared/nm-utils/nm-shared-utils.c:295
#, c-format
msgid "unable to set property '%s' of type '%s' from value of type '%s'"
msgstr ""
-#: ../shared/nm-shared-utils.c:250
+#: ../shared/nm-utils/nm-shared-utils.c:306
#, c-format
msgid ""
"value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -9214,85 +9140,82 @@ msgstr ""
#. * as "Wired Connection" or "VPN Connection". The %d is a number
#. * that is combined with the first argument to create a unique
#. * connection id.
-#: ../src/NetworkManagerUtils.c:111
+#: ../src/NetworkManagerUtils.c:112
#, fuzzy, c-format
msgctxt "connection id fallback"
msgid "%s %d"
msgstr "%s %s"
-#: ../src/main.c:220 ../src/main.c:358
+#: ../src/main.c:171 ../src/main.c:306
#, fuzzy, c-format
msgid "Failed to read configuration: %s\n"
msgstr "無法讀取配置:(%d)%s\n"
#. Logging/debugging
-#: ../src/main.c:234 ../src/nm-iface-helper.c:298
+#: ../src/main.c:185 ../src/nm-iface-helper.c:302
msgid "Print NetworkManager version and exit"
msgstr "印出 NetworkManager 的版本並退出"
-#: ../src/main.c:235 ../src/nm-iface-helper.c:299
+#: ../src/main.c:186 ../src/nm-iface-helper.c:303
msgid "Don't become a daemon"
msgstr "不要成為 daemon"
-#: ../src/main.c:236 ../src/nm-iface-helper.c:301
+#: ../src/main.c:187 ../src/nm-iface-helper.c:305
#, c-format
msgid "Log level: one of [%s]"
msgstr "日誌等級:[%s] 之一"
-#: ../src/main.c:238 ../src/nm-iface-helper.c:303
+#: ../src/main.c:189 ../src/nm-iface-helper.c:307
#, c-format
msgid "Log domains separated by ',': any combination of [%s]"
msgstr "以「,」區隔開來的日誌區域:任何 [%s] 的組合"
-#: ../src/main.c:240 ../src/nm-iface-helper.c:305
+#: ../src/main.c:191 ../src/nm-iface-helper.c:309
msgid "Make all warnings fatal"
msgstr "使所有警告表示嚴重錯誤"
-#: ../src/main.c:241
+#: ../src/main.c:192
msgid "Specify the location of a PID file"
msgstr "指定 PID 檔案的位置"
-#: ../src/main.c:242
-msgid "State file location"
-msgstr "指定檔案位置"
-
-#: ../src/main.c:244
+#: ../src/main.c:194
#, fuzzy
msgid "Print NetworkManager configuration and exit"
msgstr "印出 NetworkManager 的版本並退出"
-#: ../src/main.c:254
+#: ../src/main.c:204
msgid ""
"NetworkManager monitors all network connections and automatically\n"
"chooses the best connection to use. It also allows the user to\n"
"specify wireless access points which wireless cards in the computer\n"
"should associate with."
-msgstr "NetworkManager 會監控所有網路連線並自動\n"
+msgstr ""
+"NetworkManager 會監控所有網路連線並自動\n"
"選擇最佳的連線。它也能允許使用者指定\n"
"電腦中的無線網路卡應與哪個\n"
"無線存取點相聯。"
-#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
+#: ../src/main.c:291 ../src/main-utils.c:283 ../src/nm-iface-helper.c:407
#, c-format
msgid "%s. Please use --help to see a list of valid options.\n"
msgstr "%s。請使用 --help 來查看有效選項的清單。\n"
-#: ../src/main.c:348 ../src/nm-iface-helper.c:398
+#: ../src/main.c:296 ../src/nm-iface-helper.c:412
#, c-format
msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
msgstr "即將忽略傳送至指令列上的日誌區域「%s」。\n"
-#: ../src/main.c:373
+#: ../src/main.c:321
#, c-format
msgid "Error in configuration file: %s.\n"
msgstr "配置檔案錯誤:%s。\n"
-#: ../src/main.c:378
+#: ../src/main.c:326
#, c-format
msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
msgstr "正在忽略來自於配置檔案中無法辨識的日誌區域「%s」。\n"
-#: ../src/main.c:389 ../src/nm-iface-helper.c:408
+#: ../src/main.c:337 ../src/nm-iface-helper.c:422
#, c-format
msgid "Could not daemonize: %s [error %u]\n"
msgstr "無法成為 daemon:%s [error %u]\n"
@@ -9312,497 +9235,470 @@ msgstr "寫入 %s 失敗:%s\n"
msgid "Closing %s failed: %s\n"
msgstr "關閉 %s 失敗:%s\n"
-#: ../src/main-utils.c:145
+#: ../src/main-utils.c:148 ../src/main-utils.c:156
#, c-format
msgid "Cannot create '%s': %s"
msgstr ""
-#: ../src/main-utils.c:197
+#: ../src/main-utils.c:209
#, fuzzy, c-format
msgid "%s is already running (pid %ld)\n"
msgstr "NetworkManager 已在執行(pid %ld)\n"
-#: ../src/main-utils.c:207
+#: ../src/main-utils.c:219
#, fuzzy, c-format
msgid "You must be root to run %s!\n"
msgstr "您必須成為 root 才能執行 NetworkManager!\n"
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:213
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:252
msgid "# Created by NetworkManager\n"
msgstr "# Created by NetworkManager\n"
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:220
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:261
#, c-format
-msgid "# Merged from %s\n"
+msgid ""
+"# Merged from %s\n"
"\n"
-msgstr "# Merged from %s\n"
+msgstr ""
+"# Merged from %s\n"
"\n"
-#: ../src/devices/adsl/nm-device-adsl.c:133
-#, fuzzy
-msgid "ADSL connection"
-msgstr "ADSL 連線 %d"
-
-#: ../src/devices/bluetooth/nm-bluez-device.c:197
+#: ../src/devices/bluetooth/nm-bluez-device.c:209
#, c-format
msgid "%s Network"
msgstr "%s 網路"
-#: ../src/devices/bluetooth/nm-device-bt.c:253
+#: ../src/devices/bluetooth/nm-device-bt.c:264
msgid "PAN requested, but Bluetooth device does not support NAP"
msgstr ""
-#: ../src/devices/bluetooth/nm-device-bt.c:263
+#: ../src/devices/bluetooth/nm-device-bt.c:274
msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
msgstr ""
-#: ../src/devices/bluetooth/nm-device-bt.c:276
+#: ../src/devices/bluetooth/nm-device-bt.c:287
#, fuzzy
msgid "PAN connection"
msgstr "PAN 連線 %d"
-#: ../src/devices/bluetooth/nm-device-bt.c:283
+#: ../src/devices/bluetooth/nm-device-bt.c:294
msgid "DUN requested, but Bluetooth device does not support DUN"
msgstr ""
-#: ../src/devices/bluetooth/nm-device-bt.c:293
+#: ../src/devices/bluetooth/nm-device-bt.c:304
msgid "DUN connection must include a GSM or CDMA setting"
msgstr ""
-#: ../src/devices/bluetooth/nm-device-bt.c:303
-#: ../src/devices/wwan/nm-modem-broadband.c:655
+#: ../src/devices/bluetooth/nm-device-bt.c:314
+#: ../src/devices/wwan/nm-modem-broadband.c:706
#, fuzzy
msgid "GSM connection"
msgstr "GSM 連線 %d"
-#: ../src/devices/bluetooth/nm-device-bt.c:307
-#: ../src/devices/wwan/nm-modem-broadband.c:679
+#: ../src/devices/bluetooth/nm-device-bt.c:318
+#: ../src/devices/wwan/nm-modem-broadband.c:730
#, fuzzy
msgid "CDMA connection"
msgstr "CDMA 連線 %d"
-#: ../src/devices/bluetooth/nm-device-bt.c:315
+#: ../src/devices/bluetooth/nm-device-bt.c:326
msgid "Unknown/unhandled Bluetooth connection type"
msgstr ""
-#: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1415
-#: ../src/devices/nm-device-infiniband.c:193
-#: ../src/devices/wifi/nm-device-wifi.c:872
+#: ../src/devices/bluetooth/nm-device-bt.c:347
+#: ../src/devices/nm-device-ethernet.c:1508
+#: ../src/devices/nm-device-infiniband.c:204
+#: ../src/devices/wifi/nm-device-wifi.c:910
#, fuzzy
msgid "connection does not match device"
msgstr "沒有使用中的連線或裝置"
-#: ../src/devices/nm-device-bond.c:105
+#: ../src/devices/nm-device-bond.c:109
#, fuzzy
msgid "Bond connection"
msgstr "Bond 連線 %d"
-#: ../src/devices/nm-device-bridge.c:111
+#: ../src/devices/nm-device-bridge.c:115
#, fuzzy
msgid "Bridge connection"
msgstr "橋接連線 %d"
-#: ../src/devices/nm-device-ethernet.c:1396
+#: ../src/devices/nm-device-ethernet.c:1489
#, fuzzy
msgid "PPPoE connection"
msgstr "PPPoE 連線 %d"
-#: ../src/devices/nm-device-ethernet.c:1396
+#: ../src/devices/nm-device-ethernet.c:1489
#, fuzzy
msgid "Wired connection"
msgstr "有線連線 %d"
-#: ../src/devices/nm-device-ethernet-utils.c:39
+#: ../src/devices/nm-device-ethernet-utils.c:36
#, c-format
msgid "Wired connection %d"
msgstr "有線連線 %d"
-#: ../src/devices/nm-device-infiniband.c:175
-#, fuzzy
-msgid "InfiniBand connection"
-msgstr "InfiniBand 連線 %d"
-
-#: ../src/devices/nm-device-ip-tunnel.c:346
+#: ../src/devices/nm-device-ip-tunnel.c:340
#, fuzzy
msgid "IP tunnel connection"
msgstr "編輯連線"
-#: ../src/devices/nm-device-macvlan.c:435
+#: ../src/devices/nm-device-macvlan.c:407
#, fuzzy
msgid "MACVLAN connection"
msgstr "VLAN 連線 %d"
-#: ../src/devices/nm-device-tun.c:129
+#: ../src/devices/nm-device-tun.c:146
#, fuzzy
msgid "TUN connection"
msgstr "DUN 連線 %d"
-#: ../src/devices/nm-device-vlan.c:457
-#, fuzzy
-msgid "VLAN connection"
-msgstr "VLAN 連線 %d"
-
-#: ../src/devices/nm-device-vxlan.c:373
-#, fuzzy
-msgid "VXLAN connection"
-msgstr "VLAN 連線 %d"
-
-#: ../src/devices/team/nm-device-team.c:115
+#: ../src/devices/team/nm-device-team.c:134
#, fuzzy
msgid "Team connection"
msgstr "Team 連線 %d"
-#: ../src/devices/wifi/nm-device-olpc-mesh.c:146
+#: ../src/devices/wifi/nm-device-olpc-mesh.c:156
#, fuzzy
msgid "Mesh"
msgstr "Mesh 連線 %d"
-#: ../src/devices/wifi/nm-device-wifi.c:839
+#: ../src/devices/wifi/nm-device-wifi.c:877
msgid "WPA Ad-Hoc disabled due to kernel bugs"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:42
+#: ../src/devices/wifi/nm-wifi-utils.c:43
#, fuzzy, c-format
msgid "%s is incompatible with static WEP keys"
msgstr "'%s=%s' 與 '%s > 0' 不相容"
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:76
+#: ../src/devices/wifi/nm-wifi-utils.c:77
#, fuzzy
msgid "LEAP authentication requires a LEAP username"
msgstr "無線網路所需的身份認證"
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:86
+#: ../src/devices/wifi/nm-wifi-utils.c:87
msgid "LEAP username requires 'leap' authentication"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:99
+#: ../src/devices/wifi/nm-wifi-utils.c:100
msgid "LEAP authentication requires IEEE 802.1x key management"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:119
+#: ../src/devices/wifi/nm-wifi-utils.c:120
msgid "LEAP authentication is incompatible with Ad-Hoc mode"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:131
+#: ../src/devices/wifi/nm-wifi-utils.c:132
msgid "LEAP authentication is incompatible with 802.1x setting"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:153
+#: ../src/devices/wifi/nm-wifi-utils.c:154
#, c-format
msgid "a connection using '%s' authentication cannot use WPA key management"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:164
+#: ../src/devices/wifi/nm-wifi-utils.c:165
#, c-format
msgid "a connection using '%s' authentication cannot specify WPA protocols"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:180
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:197
+#: ../src/devices/wifi/nm-wifi-utils.c:181
+#: ../src/devices/wifi/nm-wifi-utils.c:198
#, c-format
msgid "a connection using '%s' authentication cannot specify WPA ciphers"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:209
+#: ../src/devices/wifi/nm-wifi-utils.c:210
#, c-format
msgid "a connection using '%s' authentication cannot specify a WPA password"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:240
+#: ../src/devices/wifi/nm-wifi-utils.c:241
#, fuzzy
msgid "Dynamic WEP requires an 802.1x setting"
msgstr "動態 WEP(802.1x)"
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:250
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:278
+#: ../src/devices/wifi/nm-wifi-utils.c:251
+#: ../src/devices/wifi/nm-wifi-utils.c:279
msgid "Dynamic WEP requires 'open' authentication"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:265
+#: ../src/devices/wifi/nm-wifi-utils.c:266
msgid "Dynamic WEP requires 'ieee8021x' key management"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:312
+#: ../src/devices/wifi/nm-wifi-utils.c:313
msgid "WPA-PSK authentication is incompatible with 802.1x"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:322
+#: ../src/devices/wifi/nm-wifi-utils.c:323
#, fuzzy
msgid "WPA-PSK requires 'open' authentication"
msgstr "有線網路 802.1X 身份認證"
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:334
+#: ../src/devices/wifi/nm-wifi-utils.c:335
msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:347
+#: ../src/devices/wifi/nm-wifi-utils.c:348
msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:359
+#: ../src/devices/wifi/nm-wifi-utils.c:360
#, fuzzy
msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
msgstr "無線網路所需的身份認證"
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:371
+#: ../src/devices/wifi/nm-wifi-utils.c:372
msgid "WPA Ad-Hoc requires 'tkip' group cipher"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:385
+#: ../src/devices/wifi/nm-wifi-utils.c:386
msgid "Access point does not support PSK but setting requires it"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:415
+#: ../src/devices/wifi/nm-wifi-utils.c:416
msgid "WPA-EAP authentication requires an 802.1x setting"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:425
+#: ../src/devices/wifi/nm-wifi-utils.c:426
#, fuzzy
msgid "WPA-EAP requires 'open' authentication"
msgstr "有線網路 802.1X 身份認證"
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:436
+#: ../src/devices/wifi/nm-wifi-utils.c:437
msgid "802.1x setting requires 'wpa-eap' key management"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:449
+#: ../src/devices/wifi/nm-wifi-utils.c:450
msgid "Access point does not support 802.1x but setting requires it"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:477
+#: ../src/devices/wifi/nm-wifi-utils.c:478
msgid ""
"Access point mode is Ad-Hoc but setting requires Infrastructure security"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:487
+#: ../src/devices/wifi/nm-wifi-utils.c:488
msgid "Ad-Hoc mode is incompatible with 802.1x security"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:496
+#: ../src/devices/wifi/nm-wifi-utils.c:497
msgid "Ad-Hoc mode is incompatible with LEAP security"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:506
+#: ../src/devices/wifi/nm-wifi-utils.c:507
msgid "Ad-Hoc mode requires 'open' authentication"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:516
+#: ../src/devices/wifi/nm-wifi-utils.c:517
msgid ""
"Access point mode is Infrastructure but setting requires Ad-Hoc security"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:558
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:588
+#: ../src/devices/wifi/nm-wifi-utils.c:559
+#: ../src/devices/wifi/nm-wifi-utils.c:589
#, c-format
msgid "connection does not match access point"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:612
+#: ../src/devices/wifi/nm-wifi-utils.c:613
msgid "Access point is unencrypted but setting specifies security"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:701
+#: ../src/devices/wifi/nm-wifi-utils.c:702
msgid ""
"WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
"WEP"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:711
+#: ../src/devices/wifi/nm-wifi-utils.c:712
msgid "WPA authentication is incompatible with Shared Key authentication"
msgstr ""
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:758
+#: ../src/devices/wifi/nm-wifi-utils.c:759
#, fuzzy
msgid "Failed to determine AP security information"
msgstr "設定解密用的對稱式金鑰失敗。"
-#: ../src/devices/wwan/nm-modem-broadband.c:641
+#: ../src/devices/wwan/nm-modem-broadband.c:692
#, fuzzy
msgid "GSM mobile broadband connection requires a 'gsm' setting"
msgstr "行動寬頻連線 %d"
-#: ../src/nm-config.c:465
+#: ../src/nm-config.c:466
msgid "Config file location"
msgstr "配置檔案位置"
-#: ../src/nm-config.c:466
+#: ../src/nm-config.c:467
msgid "Config directory location"
msgstr "配置目錄位置"
-#: ../src/nm-config.c:467
+#: ../src/nm-config.c:468
#, fuzzy
msgid "System config directory location"
msgstr "配置目錄位置"
-#: ../src/nm-config.c:468
+#: ../src/nm-config.c:469
#, fuzzy
msgid "Internal config file location"
msgstr "配置檔案位置"
-#: ../src/nm-config.c:469
+#: ../src/nm-config.c:470
+msgid "State file location"
+msgstr "指定檔案位置"
+
+#: ../src/nm-config.c:471
msgid "State file for no-auto-default devices"
msgstr ""
-#: ../src/nm-config.c:470
+#: ../src/nm-config.c:472
msgid "List of plugins separated by ','"
msgstr "外掛程式清單,以「,」區隔開。"
-#: ../src/nm-config.c:471
+#: ../src/nm-config.c:473
#, fuzzy
msgid "Quit after initial configuration"
msgstr "目前的 nmcli 配置:\n"
-#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300
+#: ../src/nm-config.c:474 ../src/nm-iface-helper.c:304
msgid "Don't become a daemon, and log to stderr"
msgstr "不要成為 daemon,並記錄至 stderr"
#. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:475
+#: ../src/nm-config.c:477
msgid "An http(s) address for checking internet connectivity"
msgstr "檢查網際網路連線的 http 位址"
-#: ../src/nm-config.c:476
+#: ../src/nm-config.c:478
msgid "The interval between connectivity checks (in seconds)"
msgstr "連線檢查之間的間隔(秒)"
-#: ../src/nm-config.c:477
+#: ../src/nm-config.c:479
msgid "The expected start of the response"
msgstr "預期的反應起始"
#. Interface/IP config
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:284
#, fuzzy
msgid "The interface to manage"
msgstr "父介面卡 [none]:"
-#: ../src/nm-iface-helper.c:281
-msgid "eth0"
-msgstr "eth0"
-
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:285
#, fuzzy
msgid "Connection UUID"
msgstr "連線"
-#: ../src/nm-iface-helper.c:282
-msgid "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
+#: ../src/nm-iface-helper.c:286
+msgid "Connection Token for Stable IDs"
msgstr ""
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:287
msgid "Whether to manage IPv6 SLAAC"
msgstr ""
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:288
msgid "Whether SLAAC must be successful"
msgstr ""
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:289
msgid "Use an IPv6 temporary privacy address"
msgstr ""
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:290
#, fuzzy
msgid "Current DHCPv4 address"
msgstr "複製的 MAC 位址"
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:291
msgid "Whether DHCPv4 must be successful"
msgstr ""
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:292
#, fuzzy
msgid "Hex-encoded DHCPv4 client ID"
msgstr "不支援的 DHCP 用戶端「%s」"
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:293
msgid "Hostname to send to DHCP server"
msgstr ""
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:293
msgid "barbar"
msgstr ""
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:294
msgid "FQDN to send to DHCP server"
msgstr ""
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:294
msgid "host.domain.org"
msgstr ""
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:295
#, fuzzy
msgid "Route priority for IPv4"
msgstr "沒有可移除的優先順序"
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:295
msgid "0"
msgstr "0"
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:296
#, fuzzy
msgid "Route priority for IPv6"
msgstr "沒有可移除的優先順序"
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:296
msgid "1024"
msgstr ""
-#: ../src/nm-iface-helper.c:293
+#: ../src/nm-iface-helper.c:297
msgid "Hex-encoded Interface Identifier"
msgstr ""
-#: ../src/nm-iface-helper.c:294
+#: ../src/nm-iface-helper.c:298
msgid "IPv6 SLAAC address generation mode"
msgstr ""
-#: ../src/nm-iface-helper.c:295
+#: ../src/nm-iface-helper.c:299
msgid ""
"The logging backend configuration value. See logging.backend in "
"NetworkManager.conf"
msgstr ""
-#: ../src/nm-iface-helper.c:315
+#: ../src/nm-iface-helper.c:319
msgid ""
"nm-iface-helper is a small, standalone process that manages a single network "
"interface."
msgstr ""
-#: ../src/nm-iface-helper.c:374
+#: ../src/nm-iface-helper.c:388
#, c-format
msgid "An interface name and UUID are required\n"
msgstr ""
-#: ../src/nm-iface-helper.c:380
+#: ../src/nm-iface-helper.c:394
#, c-format
msgid "Failed to find interface index for %s (%s)\n"
msgstr ""
-#: ../src/nm-iface-helper.c:442
+#: ../src/nm-iface-helper.c:456
#, c-format
msgid "(%s): Invalid IID %s\n"
msgstr ""
-#: ../src/nm-logging.c:216
+#: ../src/nm-logging.c:266
#, c-format
msgid "Unknown log level '%s'"
msgstr "不明日誌層級「%s」"
-#: ../src/nm-logging.c:309
+#: ../src/nm-logging.c:368
#, c-format
msgid "Unknown log domain '%s'"
msgstr "不明日誌網域「%s」"
-#: ../src/nm-manager.c:3635
-#, fuzzy
-msgid "VPN connection"
-msgstr "VPN 連線"
-
-#: ../src/nm-sleep-monitor-systemd.c:131
-msgid "NetworkManager needs to turn off networks"
-msgstr "NetworkManager 需要關閉網路"
-
-#: ../src/settings/plugins/ifcfg-rh/reader.c:108
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:107
msgid "System"
msgstr "系統"