summary refs log tree commit diff
path: root/po/zh_TW.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_TW.po')
-rw-r--r--po/zh_TW.po3574
1 files changed, 1933 insertions, 1641 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9a85a2c8..6f3cb1d6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,28 +1,27 @@
 # 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
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-22 10:02+0200\n"
-"PO-Revision-Date: 2014-01-28 02:24-0500\n"
-"Last-Translator: tchuang <tchuang@redhat.com>\n"
-"Language-Team: Traditional Chinese <zh@li.org>\n"
-"Language: zh-TW\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"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: Traditional Chinese <zh@li.org>\n"
+"Language: zh-TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.8.4\n"
+"X-Generator: Zanata 3.9.3\n"
 
 #: ../clients/cli/agent.c:39
 #, c-format
@@ -86,21 +85,21 @@ msgstr "錯誤:啟動連線失敗:%s"
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr ""
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:8703
-#: ../clients/cli/devices.c:3727 ../clients/cli/general.c:344
-#: ../clients/cli/general.c:473
+#: ../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:239
+#: ../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:237 ../clients/cli/connections.c:259
+#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
 msgid "GROUP"
 msgstr "GROUP"
 
@@ -112,7 +111,7 @@ msgstr "ADDRESS"
 #. 1
 #. 2
 #: ../clients/cli/common.c:40 ../clients/cli/common.c:61
-#: ../clients/cli/connections.c:262
+#: ../clients/cli/connections.c:217
 msgid "GATEWAY"
 msgstr "GATEWAY"
 
@@ -180,7 +179,7 @@ msgstr "不受管理的"
 msgid "unavailable"
 msgstr "無法使用"
 
-#: ../clients/cli/common.c:498 ../clients/cli/general.c:246
+#: ../clients/cli/common.c:498 ../clients/cli/general.c:245
 msgid "disconnected"
 msgstr "離線"
 
@@ -208,11 +207,11 @@ msgstr "正在連線(正在檢查 IP 連線)"
 msgid "connecting (starting secondary connections)"
 msgstr "正在連線(正在啟用次要連線)"
 
-#: ../clients/cli/common.c:512 ../clients/cli/general.c:242
+#: ../clients/cli/common.c:512 ../clients/cli/general.c:241
 msgid "connected"
 msgstr "已連線"
 
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:690
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
 msgid "deactivating"
 msgstr "正在停用"
 
@@ -221,53 +220,52 @@ msgid "connection failed"
 msgstr "連線失敗"
 
 #: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:695 ../clients/cli/connections.c:718
-#: ../clients/cli/connections.c:1995 ../clients/cli/devices.c:1104
-#: ../clients/cli/devices.c:1145 ../clients/cli/devices.c:1147
-#: ../clients/cli/general.c:249 ../clients/cli/general.c:287
-#: ../clients/cli/general.c:422 ../clients/cli/general.c:437
-#: ../clients/cli/settings.c:845 ../clients/cli/settings.c:931
-#: ../clients/cli/settings.c:1315 ../clients/cli/settings.c:1954
-#: ../clients/cli/settings.c:3317
+#: ../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
 #, c-format
 msgid "unknown"
 msgstr "不明"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1013 ../clients/cli/connections.c:1082
-#: ../clients/cli/connections.c:1083 ../clients/cli/connections.c:1085
-#: ../clients/cli/connections.c:3291 ../clients/cli/connections.c:4414
-#: ../clients/cli/connections.c:6229 ../clients/cli/connections.c:6230
-#: ../clients/cli/devices.c:782 ../clients/cli/devices.c:1069
-#: ../clients/cli/devices.c:1070 ../clients/cli/devices.c:1071
-#: ../clients/cli/devices.c:1072 ../clients/cli/devices.c:1073
-#: ../clients/cli/devices.c:1108 ../clients/cli/devices.c:1110
-#: ../clients/cli/devices.c:1138 ../clients/cli/devices.c:1139
-#: ../clients/cli/devices.c:1140 ../clients/cli/devices.c:1141
-#: ../clients/cli/devices.c:1142 ../clients/cli/devices.c:1143
-#: ../clients/cli/devices.c:1144 ../clients/cli/devices.c:1146
-#: ../clients/cli/devices.c:1148 ../clients/cli/general.c:431
-#: ../clients/cli/settings.c:3312
+#: ../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
 msgid "yes"
 msgstr "是"
 
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:975
-#: ../clients/cli/connections.c:977 ../clients/cli/connections.c:979
-#: ../clients/cli/connections.c:1082 ../clients/cli/connections.c:1083
-#: ../clients/cli/connections.c:1085 ../clients/cli/connections.c:3292
-#: ../clients/cli/connections.c:4413 ../clients/cli/connections.c:6229
-#: ../clients/cli/connections.c:6230 ../clients/cli/devices.c:782
-#: ../clients/cli/devices.c:1069 ../clients/cli/devices.c:1070
-#: ../clients/cli/devices.c:1071 ../clients/cli/devices.c:1072
-#: ../clients/cli/devices.c:1073 ../clients/cli/devices.c:1108
-#: ../clients/cli/devices.c:1110 ../clients/cli/devices.c:1138
-#: ../clients/cli/devices.c:1139 ../clients/cli/devices.c:1140
-#: ../clients/cli/devices.c:1141 ../clients/cli/devices.c:1142
-#: ../clients/cli/devices.c:1143 ../clients/cli/devices.c:1144
-#: ../clients/cli/devices.c:1146 ../clients/cli/devices.c:1148
-#: ../clients/cli/general.c:433 ../clients/cli/settings.c:3314
+#: ../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
 msgid "no"
 msgstr "否"
 
@@ -284,7 +282,7 @@ msgid "No reason given"
 msgstr "未提供理由"
 
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:3140
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
 #, c-format
 msgid "Unknown error"
 msgstr "不明的錯誤"
@@ -540,8 +538,8 @@ 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:1898
-#: ../libnm/nm-device.c:1849
+#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
+#: ../libnm/nm-device.c:1839
 msgid "Unknown"
 msgstr "不明"
 
@@ -583,117 +581,73 @@ msgid ""
 msgstr ""
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:61
+#: ../clients/cli/connections.c:41
 msgid "Setting name? "
 msgstr "設定名稱?"
 
-#: ../clients/cli/connections.c:62
+#: ../clients/cli/connections.c:42
 msgid "Property name? "
 msgstr "屬性名稱?"
 
-#: ../clients/cli/connections.c:63
+#: ../clients/cli/connections.c:43
 msgid "Enter connection type: "
 msgstr "輸入連線類型:"
 
 #. define some other prompts
-#: ../clients/cli/connections.c:66
-#, fuzzy
-msgid "Connection type"
+#: ../clients/cli/connections.c:46
+msgid "Connection type: "
 msgstr "連線類型:"
 
-#: ../clients/cli/connections.c:67
-#, fuzzy
-msgid "VPN type"
+#: ../clients/cli/connections.c:47
+msgid "VPN type: "
 msgstr "VPN 類型:"
 
-#: ../clients/cli/connections.c:68
+#: ../clients/cli/connections.c:48
 #, fuzzy
-msgid "Master"
+msgid "Master: "
 msgstr "Bond master:"
 
-#: ../clients/cli/connections.c:70 ../clients/tui/nmt-page-infiniband.c:88
-msgid "Transport mode"
-msgstr "傳輸模式"
-
-#: ../clients/cli/connections.c:75
-#, fuzzy
-msgid "Bluetooth type"
-msgstr "藍牙"
-
-#: ../clients/cli/connections.c:81
-#, fuzzy
-msgid "Bonding mode"
-msgstr "連結監控"
-
-#: ../clients/cli/connections.c:83 ../clients/cli/connections.c:4014
-#, fuzzy
-msgid "Bonding monitoring mode"
-msgstr "連結監控"
-
-#: ../clients/cli/connections.c:88
-msgid "Protocol"
-msgstr ""
-
-#: ../clients/cli/connections.c:91
-#, fuzzy
-msgid "Wi-Fi mode"
-msgstr "無線網路"
-
-#: ../clients/cli/connections.c:97
-#, fuzzy
-msgid "ADSL encapsulation"
-msgstr "DSL 身份認證"
-
-#: ../clients/cli/connections.c:100
-#, fuzzy
-msgid "Tun mode"
-msgstr "傳輸模式"
-
-#: ../clients/cli/connections.c:105
-#, fuzzy
-msgid "IP Tunnel mode"
-msgstr "編輯連線"
-
-#: ../clients/cli/connections.c:107
-#, fuzzy
-msgid "MACVLAN mode"
-msgstr "VLAN"
-
-#: ../clients/cli/connections.c:109
-#, fuzzy
-msgid "Connection (name, UUID, or path)"
+#: ../clients/cli/connections.c:49
+msgid "Connection (name, UUID, or path): "
 msgstr "連線(名稱、UUID 或是路徑):"
 
-#: ../clients/cli/connections.c:110
+#: ../clients/cli/connections.c:50
 #, fuzzy
-msgid "VPN connection (name, UUID, or path)"
+msgid "VPN connection (name, UUID, or path): "
 msgstr "連線(名稱、UUID 或是路徑):"
 
-#: ../clients/cli/connections.c:111
+#: ../clients/cli/connections.c:51
 #, fuzzy
-msgid "Connection(s) (name, UUID, or path)"
+msgid "Connection(s) (name, UUID, or path): "
 msgstr "連線(名稱、UUID 或是路徑):"
 
-#: ../clients/cli/connections.c:112
+#: ../clients/cli/connections.c:52
 #, fuzzy
-msgid "Connection(s) (name, UUID, path or apath)"
+msgid "Connection(s) (name, UUID, path or apath): "
 msgstr "連線(名稱、UUID 或是路徑):"
 
+#: ../clients/cli/connections.c:53
+msgid "Tunnel mode: "
+msgstr ""
+
+#: ../clients/cli/connections.c:54
+msgid "MACVLAN mode: "
+msgstr ""
+
 #. 0
-#: ../clients/cli/connections.c:118 ../clients/cli/connections.c:238
+#: ../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:220
-#: ../clients/cli/devices.c:261
+#: ../clients/cli/devices.c:210 ../clients/cli/devices.c:251
 msgid "NAME"
 msgstr "NAME"
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:119 ../clients/cli/connections.c:239
+#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
 msgid "UUID"
 msgstr "UUID"
 
@@ -701,36 +655,36 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:120 ../clients/cli/connections.c:260
+#: ../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
 msgid "TYPE"
 msgstr "TYPE"
 
 #. 2
-#: ../clients/cli/connections.c:121
+#: ../clients/cli/connections.c:76
 msgid "TIMESTAMP"
 msgstr "TIMESTAMP"
 
 #. 3
-#: ../clients/cli/connections.c:122
+#: ../clients/cli/connections.c:77
 msgid "TIMESTAMP-REAL"
 msgstr "TIMESTAMP-REAL"
 
 #. 4
 #. 16
-#: ../clients/cli/connections.c:123 ../clients/cli/devices.c:72
+#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72
 msgid "AUTOCONNECT"
 msgstr "AUTOCONNECT"
 
 #. 5
-#: ../clients/cli/connections.c:124
+#: ../clients/cli/connections.c:79
 #, fuzzy
 msgid "AUTOCONNECT-PRIORITY"
 msgstr "AUTOCONNECT"
 
 #. 6
-#: ../clients/cli/connections.c:125
+#: ../clients/cli/connections.c:80
 msgid "READONLY"
 msgstr "READONLY"
 
@@ -739,7 +693,7 @@ msgstr "READONLY"
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:126 ../clients/cli/connections.c:246
+#: ../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
 msgid "DBUS-PATH"
@@ -748,7 +702,7 @@ msgstr "DBUS-PATH"
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:127 ../clients/cli/devices.c:164
+#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164
 #: ../clients/cli/devices.c:181
 msgid "ACTIVE"
 msgstr "ACTIVE"
@@ -758,9 +712,9 @@ msgstr "ACTIVE"
 #. 12
 #. 3
 #. 0
-#: ../clients/cli/connections.c:128 ../clients/cli/devices.c:40
+#: ../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:262
+#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252
 msgid "DEVICE"
 msgstr "DEVICE"
 
@@ -769,42 +723,43 @@ msgstr "DEVICE"
 #. 1
 #. 10
 #. 1
-#: ../clients/cli/connections.c:129 ../clients/cli/connections.c:241
+#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196
 #: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66
-#: ../clients/cli/general.c:37
+#: ../clients/cli/general.c:36
 msgid "STATE"
 msgstr "STATE"
 
 #. 11
-#: ../clients/cli/connections.c:130
+#: ../clients/cli/connections.c:85
 #, fuzzy
 msgid "ACTIVE-PATH"
 msgstr "MASTER-PATH"
 
 #. 2
-#: ../clients/cli/connections.c:240
+#: ../clients/cli/connections.c:195
 msgid "DEVICES"
 msgstr "DEVICES"
 
 #. 4
-#: ../clients/cli/connections.c:242
+#: ../clients/cli/connections.c:197
 msgid "DEFAULT"
 msgstr "DEFAULT"
 
 #. 5
-#: ../clients/cli/connections.c:243
+#: ../clients/cli/connections.c:198
 msgid "DEFAULT6"
 msgstr "DEFAULT6"
 
 #. 6
-#: ../clients/cli/connections.c:244
+#: ../clients/cli/connections.c:199
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
 #. 7
 #. 4
-#: ../clients/cli/connections.c:245 ../clients/cli/connections.c:283
-#: ../clients/tui/nm-editor-utils.c:233
+#. 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
 msgid "VPN"
 msgstr "VPN"
@@ -812,70 +767,70 @@ msgstr "VPN"
 #. 9
 #. 5
 #. 22
-#: ../clients/cli/connections.c:247 ../clients/cli/devices.c:46
+#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
 #: ../clients/cli/devices.c:78
 msgid "CON-PATH"
 msgstr "CON-PATH"
 
 #. 10
-#: ../clients/cli/connections.c:248
+#: ../clients/cli/connections.c:203
 msgid "ZONE"
 msgstr "ZONE"
 
 #. 11
-#: ../clients/cli/connections.c:249
+#: ../clients/cli/connections.c:204
 msgid "MASTER-PATH"
 msgstr "MASTER-PATH"
 
 #. 1
-#: ../clients/cli/connections.c:261
+#: ../clients/cli/connections.c:216
 msgid "USERNAME"
 msgstr "USERNAME"
 
 #. 3
-#: ../clients/cli/connections.c:263
+#: ../clients/cli/connections.c:218
 msgid "BANNER"
 msgstr "BANNER"
 
 #. 4
-#: ../clients/cli/connections.c:264
+#: ../clients/cli/connections.c:219
 msgid "VPN-STATE"
 msgstr "VPN-STATE"
 
 #. 5
-#: ../clients/cli/connections.c:265
+#: ../clients/cli/connections.c:220
 msgid "CFG"
 msgstr "CFG"
 
-#: ../clients/cli/connections.c:278 ../clients/cli/devices.c:235
+#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
 msgid "GENERAL"
 msgstr "GENERAL"
 
 #. 0
 #. 6
-#: ../clients/cli/connections.c:279 ../clients/cli/devices.c:242
+#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232
 msgid "IP4"
 msgstr "IP4"
 
 #. 1
 #. 7
-#: ../clients/cli/connections.c:280 ../clients/cli/devices.c:243
+#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:281 ../clients/cli/devices.c:244
+#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
 msgid "IP6"
 msgstr "IP6"
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:282 ../clients/cli/devices.c:245
+#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:314
+#: ../clients/cli/connections.c:272
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -891,8 +846,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"
@@ -917,8 +872,8 @@ msgid ""
 msgstr ""
 "Usage: nmcli connection { COMMAND | help }\n"
 "\n"
-"COMMAND := { show | up | down | add | modify | edit | delete | reload | "
-"load }\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"
@@ -943,7 +898,7 @@ msgstr ""
 "  load <filename> [ <filename>... ]\n"
 "\n"
 
-#: ../clients/cli/connections.c:336
+#: ../clients/cli/connections.c:294
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -970,7 +925,7 @@ msgid ""
 "well.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:357
+#: ../clients/cli/connections.c:315
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -1013,7 +968,7 @@ msgstr ""
 "nsp    - specifies NSP to connect to (only valid for WiMAX)\n"
 "\n"
 
-#: ../clients/cli/connections.c:378
+#: ../clients/cli/connections.c:336
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -1036,13 +991,13 @@ msgstr ""
 "UUID or D-Bus path.\n"
 "\n"
 
-#: ../clients/cli/connections.c:390
+#: ../clients/cli/connections.c:348
 #, 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"
@@ -1129,8 +1084,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"
@@ -1272,7 +1227,7 @@ msgstr ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:502
+#: ../clients/cli/connections.c:460
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1287,8 +1242,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"
@@ -1297,7 +1252,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:525
+#: ../clients/cli/connections.c:483
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1305,13 +1260,12 @@ 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:537
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1338,7 +1292,7 @@ msgstr ""
 "Add a new connection profile in an interactive editor.\n"
 "\n"
 
-#: ../clients/cli/connections.c:552
+#: ../clients/cli/connections.c:510
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1357,7 +1311,7 @@ msgstr ""
 "The profile is identified by its name, UUID or D-Bus path.\n"
 "\n"
 
-#: ../clients/cli/connections.c:563
+#: ../clients/cli/connections.c:521
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -1381,7 +1335,7 @@ msgstr ""
 "Add a new connection profile in an interactive editor.\n"
 "\n"
 
-#: ../clients/cli/connections.c:575
+#: ../clients/cli/connections.c:533
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1394,7 +1348,7 @@ msgstr ""
 "Reload all connection files from disk.\n"
 "\n"
 
-#: ../clients/cli/connections.c:583
+#: ../clients/cli/connections.c:541
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1417,7 +1371,7 @@ msgstr ""
 "state.\n"
 "\n"
 
-#: ../clients/cli/connections.c:595
+#: ../clients/cli/connections.c:553
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1432,7 +1386,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:608
+#: ../clients/cli/connections.c:566
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -1451,880 +1405,1315 @@ msgstr ""
 "The profile is identified by its name, UUID or D-Bus path.\n"
 "\n"
 
-#: ../clients/cli/connections.c:686
+#: ../clients/cli/connections.c:644
 msgid "activating"
 msgstr "啟用中"
 
-#: ../clients/cli/connections.c:688
+#: ../clients/cli/connections.c:646
 msgid "activated"
 msgstr "已啟用"
 
 # auto translated by TM merge from project: firewalld, version: 0.3.4, DocId: firewalld
-#: ../clients/cli/connections.c:692
+#: ../clients/cli/connections.c:650
 msgid "deactivated"
 msgstr "已停止"
 
-#: ../clients/cli/connections.c:704
+#: ../clients/cli/connections.c:662
 msgid "VPN connecting (prepare)"
 msgstr "VPN 連線(準備)"
 
-#: ../clients/cli/connections.c:706
+#: ../clients/cli/connections.c:664
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 連線(需要身份認證)"
 
-#: ../clients/cli/connections.c:708
+#: ../clients/cli/connections.c:666
 msgid "VPN connecting"
 msgstr "VPN 連線"
 
-#: ../clients/cli/connections.c:710
+#: ../clients/cli/connections.c:668
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 連線(取得 IP 配置)"
 
-#: ../clients/cli/connections.c:712
+#: ../clients/cli/connections.c:670
 msgid "VPN connected"
 msgstr "VPN 已連線"
 
-#: ../clients/cli/connections.c:714
+#: ../clients/cli/connections.c:672
 msgid "VPN connection failed"
 msgstr "VPN 連線失敗"
 
-#: ../clients/cli/connections.c:716
+#: ../clients/cli/connections.c:674
 msgid "VPN disconnected"
 msgstr "VPN 已離線"
 
-#: ../clients/cli/connections.c:786
+#: ../clients/cli/connections.c:744
 #, fuzzy, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "儲存連線錯誤:%s"
 
-#: ../clients/cli/connections.c:806
+#: ../clients/cli/connections.c:764
 #, fuzzy
 msgid "Connection profile details"
 msgstr "連線詳情"
 
-#: ../clients/cli/connections.c:818 ../clients/cli/connections.c:1211
+#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
 #, fuzzy, c-format
 msgid "Error: 'connection show': %s"
 msgstr "錯誤:「device show」:%s"
 
-#: ../clients/cli/connections.c:974 ../clients/cli/settings.c:1950
+#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
 msgid "never"
 msgstr "永不"
 
-#: ../clients/cli/connections.c:1199
+#: ../clients/cli/connections.c:1157
 #, fuzzy
 msgid "Activate connection details"
 msgstr "有效連線的詳細資訊"
 
-#: ../clients/cli/connections.c:1435
+#: ../clients/cli/connections.c:1393
 #, fuzzy, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "無效的欄位「%s」; 允許的欄位:%s"
 
-#: ../clients/cli/connections.c:1450 ../clients/cli/connections.c:1458
+#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
 #, fuzzy, c-format
 msgid "'%s' has to be alone"
 msgstr "欄位 '%s' 必須是單獨的"
 
 #. Add headers
-#: ../clients/cli/connections.c:1680
+#: ../clients/cli/connections.c:1634
 #, fuzzy
 msgid "NetworkManager active profiles"
 msgstr "NetworkManager 狀態"
 
-#: ../clients/cli/connections.c:1681
+#: ../clients/cli/connections.c:1635
 #, fuzzy
 msgid "NetworkManager connection profiles"
 msgstr "NetworkManager 進入了睡眠狀態"
 
-#.
-#. * TODO(?): complete uuid, path or id
-#. if (nmc->complete) {
-#. quit ();
-#. }
-#.
-#: ../clients/cli/connections.c:1727 ../clients/cli/connections.c:2445
-#: ../clients/cli/connections.c:2467 ../clients/cli/connections.c:2476
-#: ../clients/cli/connections.c:2485 ../clients/cli/connections.c:2648
-#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7896
-#: ../clients/cli/connections.c:8032 ../clients/cli/connections.c:8170
-#: ../clients/cli/connections.c:8289 ../clients/cli/connections.c:8300
-#: ../clients/cli/connections.c:8410 ../clients/cli/devices.c:2402
-#: ../clients/cli/devices.c:2410 ../clients/cli/devices.c:2736
-#: ../clients/cli/devices.c:2743 ../clients/cli/devices.c:2757
-#: ../clients/cli/devices.c:2764 ../clients/cli/devices.c:2781
-#: ../clients/cli/devices.c:2789 ../clients/cli/devices.c:2802
-#: ../clients/cli/devices.c:3166 ../clients/cli/devices.c:3173
-#: ../clients/cli/devices.c:3180 ../clients/cli/devices.c:3192
-#: ../clients/cli/devices.c:3205 ../clients/cli/devices.c:3212
-#: ../clients/cli/devices.c:3384 ../clients/cli/devices.c:3391
-#: ../clients/cli/devices.c:3564
+#: ../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
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "錯誤:沒有 %s 參數。"
 
-#: ../clients/cli/connections.c:1742
+#: ../clients/cli/connections.c:1696
 #, fuzzy, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "錯誤:%s - 此連線不存在。"
 
-#: ../clients/cli/connections.c:1801 ../clients/cli/connections.c:2508
-#: ../clients/cli/connections.c:8825 ../clients/cli/devices.c:3353
-#: ../clients/cli/devices.c:3834 ../clients/cli/general.c:528
-#: ../clients/cli/general.c:577 ../clients/cli/general.c:594
-#: ../clients/cli/general.c:633 ../clients/cli/general.c:647
-#: ../clients/cli/general.c:765 ../clients/cli/general.c:812
-#: ../clients/cli/general.c:832
+#: ../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
 #, c-format
 msgid "Error: %s."
 msgstr "錯誤:%s。"
 
-#: ../clients/cli/connections.c:1897
+#: ../clients/cli/connections.c:1851
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "裝置「%s」上沒有使用中的連線"
 
-#: ../clients/cli/connections.c:1905
+#: ../clients/cli/connections.c:1859
 msgid "no active connection or device"
 msgstr "沒有使用中的連線或裝置"
 
-#: ../clients/cli/connections.c:1956
+#: ../clients/cli/connections.c:1910
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "裝置「%s」和連線「%s」不相容"
 
-#: ../clients/cli/connections.c:1959
+#: ../clients/cli/connections.c:1913
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "連線「%s」沒有找到任何裝置"
 
-#: ../clients/cli/connections.c:1971
+#: ../clients/cli/connections.c:1925
 msgid "unknown reason"
 msgstr "原因不明"
 
-#: ../clients/cli/connections.c:1973 ../clients/cli/general.c:278
+#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
 msgid "none"
 msgstr "none"
 
-#: ../clients/cli/connections.c:1975
+#: ../clients/cli/connections.c:1929
 msgid "the user was disconnected"
 msgstr "該使用者已經斷線"
 
-#: ../clients/cli/connections.c:1977
+#: ../clients/cli/connections.c:1931
 msgid "the base network connection was interrupted"
 msgstr "基礎的網路連線已經中斷"
 
-#: ../clients/cli/connections.c:1979
+#: ../clients/cli/connections.c:1933
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN 服務無預期停止"
 
-#: ../clients/cli/connections.c:1981
+#: ../clients/cli/connections.c:1935
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN 服務傳回無效的配置"
 
-#: ../clients/cli/connections.c:1983
+#: ../clients/cli/connections.c:1937
 msgid "the connection attempt timed out"
 msgstr "嚐試連線已經逾時"
 
-#: ../clients/cli/connections.c:1985
+#: ../clients/cli/connections.c:1939
 msgid "the VPN service did not start in time"
 msgstr "VPN 服務並沒有按時開始"
 
-#: ../clients/cli/connections.c:1987
+#: ../clients/cli/connections.c:1941
 msgid "the VPN service failed to start"
 msgstr "VPN 服務無法開始"
 
-#: ../clients/cli/connections.c:1989
+#: ../clients/cli/connections.c:1943
 msgid "no valid VPN secrets"
 msgstr "VPN 密碼不正確"
 
-#: ../clients/cli/connections.c:1991
+#: ../clients/cli/connections.c:1945
 msgid "invalid VPN secrets"
 msgstr "VPN 密碼不正確"
 
-#: ../clients/cli/connections.c:1993
+#: ../clients/cli/connections.c:1947
 msgid "the connection was removed"
 msgstr "連線已移除"
 
-#: ../clients/cli/connections.c:2015 ../clients/cli/connections.c:2050
-#: ../clients/cli/connections.c:2211 ../clients/cli/connections.c:6120
+#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "連線已成功啟用(D-Bus 啟用路徑:%s)\n"
 
-#: ../clients/cli/connections.c:2023
+#: ../clients/cli/connections.c:1976
 #, 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:2030 ../clients/cli/connections.c:6126
-#, c-format
-msgid "Error: Connection activation failed.\n"
-msgstr "錯誤:連線啟用失敗。\n"
-
-#: ../clients/cli/connections.c:2033 ../clients/cli/connections.c:2055
+#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "錯誤:啟動連線失敗。"
 
-#: ../clients/cli/connections.c:2106
+#: ../clients/cli/connections.c:2053
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "VPN 連線已成功啟用(D-Bus 啟用路徑:%s)\n"
 
-#: ../clients/cli/connections.c:2114
+#: ../clients/cli/connections.c:2061
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "錯誤:啟動連線失敗:%s。"
 
-#: ../clients/cli/connections.c:2133 ../clients/cli/devices.c:1506
+#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "錯誤:逾時 %d 秒。"
 
-#: ../clients/cli/connections.c:2193
+#: ../clients/cli/connections.c:2140
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "錯誤:啟動連線失敗:%s"
 
-#: ../clients/cli/connections.c:2278
+#: ../clients/cli/connections.c:2225
 #, fuzzy, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "錯誤:移除「%s」的值失敗:%s\n"
 
-#: ../clients/cli/connections.c:2290
+#: ../clients/cli/connections.c:2237
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2298
+#: ../clients/cli/connections.c:2245
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2311
+#: ../clients/cli/connections.c:2258
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr ""
 
-#: ../clients/cli/connections.c:2367
+#: ../clients/cli/connections.c:2314
 #, c-format
 msgid "unknown device '%s'."
 msgstr "不明的裝置「%s」。"
 
-#: ../clients/cli/connections.c:2372
+#: ../clients/cli/connections.c:2319
 msgid "neither a valid connection nor device given"
 msgstr "連線無效或是無裝置"
 
-#: ../clients/cli/connections.c:2458
+#: ../clients/cli/connections.c:2402
 #, fuzzy, c-format
 msgid "Error: Connection '%s' does not exist."
 msgstr "錯誤:連線無效:%s\n"
 
-#: ../clients/cli/connections.c:2493 ../clients/cli/devices.c:1405
-#: ../clients/cli/devices.c:2416 ../clients/cli/devices.c:2813
-#: ../clients/cli/devices.c:3397
+#: ../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
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "不明的參數:%s\n"
 
-#: ../clients/cli/connections.c:2518
+#: ../clients/cli/connections.c:2462
 msgid "preparing"
 msgstr "正在準備"
 
-#: ../clients/cli/connections.c:2539
+#: ../clients/cli/connections.c:2483
 #, fuzzy, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "連線「%s」 (%s) 已成功新增。\n"
 
-#: ../clients/cli/connections.c:2555
+#: ../clients/cli/connections.c:2499
 #, fuzzy, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr "連線已成功啟用(D-Bus 啟用路徑:%s)\n"
 
-#: ../clients/cli/connections.c:2630 ../clients/cli/connections.c:8018
-#: ../clients/cli/connections.c:8226
+#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
+#: ../clients/cli/connections.c:10590
 #, c-format
 msgid "Error: No connection specified."
 msgstr "錯誤:尚未指定連線。"
 
-#: ../clients/cli/connections.c:2662
+#: ../clients/cli/connections.c:2602
 #, fuzzy, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "錯誤:「%s」並非啟用中的連線。"
 
-#: ../clients/cli/connections.c:2663 ../clients/cli/connections.c:8047
+#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
 #, fuzzy, c-format
 msgid "Error: not all active connections found."
 msgstr "錯誤:「%s」並非啟用中的連線。"
 
-#: ../clients/cli/connections.c:2672
+#: ../clients/cli/connections.c:2612
 #, fuzzy, c-format
 msgid "Error: no active connection provided."
 msgstr "錯誤:無法啟用連線:%s。\n"
 
-#: ../clients/cli/connections.c:3120 ../clients/cli/utils.c:648
+#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "「%s」不在「%s」之間"
 
-#: ../clients/cli/connections.c:3280
+#: ../clients/cli/connections.c:3032
 #, c-format
-msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr ""
+msgid "Error: '%s': '%s' is not a valid %s MAC address."
+msgstr "錯誤:「%s」:「%s」不是個有效的 %s MAC 位址。"
 
-#: ../clients/cli/connections.c:3451
-#, fuzzy, c-format
-msgid "Error: don't know how to create '%s' setting."
-msgstr "錯誤:無法取得系統設定。"
+#. 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"
 
-#: ../clients/cli/connections.c:3462
+#: ../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:3053
 #, c-format
-msgid "Error: invalid property '%s': %s."
-msgstr "錯誤:無效的內容「%s」:%s。"
+msgid "Error: 'mtu': '%s' is not a valid MTU."
+msgstr "錯誤:「mtu」:「%s」不是個有效的 MTU。"
 
-#: ../clients/cli/connections.c:3479
+#: ../clients/cli/connections.c:3069
 #, c-format
-msgid "Error: failed to modify %s.%s: %s."
-msgstr "錯誤:無法修改 %s.%s:%s。"
+msgid "Error: 'parent': '%s' is not a valid interface name."
+msgstr "錯誤:「parent」:「%s」不是組有效的介面卡名稱。"
 
-#: ../clients/cli/connections.c:3498
-#, fuzzy, c-format
-msgid "Error: failed to remove a value from %s.%s: %s."
-msgstr "錯誤:移除「%s」的值失敗:%s\n"
+#: ../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:3524
+#: ../clients/cli/connections.c:3105
 #, fuzzy, c-format
-msgid "Error: '%s' is mandatory."
-msgstr "錯誤:「%s」設定不存在\n"
+msgid "Error: '%s' is not a valid UID/GID."
+msgstr "錯誤:「mtu」:「%s」不是個有效的 MTU。"
 
-#: ../clients/cli/connections.c:3556
+#: ../clients/cli/connections.c:3149
 #, fuzzy, c-format
-msgid "Error: invalid slave type; %s."
-msgstr "錯誤:無效的連線類型;%s。"
+msgid "Error: '%s': '%s' is not a valid %s %s."
+msgstr "錯誤:「%s」:「%s」無效;%s"
 
-#: ../clients/cli/connections.c:3569
-#, c-format
-msgid "Error: invalid connection type; %s."
-msgstr "錯誤:無效的連線類型;%s。"
+#: ../clients/cli/connections.c:3162
+#, fuzzy
+msgid "Wi-Fi mode"
+msgstr "無線網路"
 
-#: ../clients/cli/connections.c:3744
-#, fuzzy, c-format
-msgid "Error: bad connection type: %s."
-msgstr "錯誤:無效的連線類型;%s。"
+#: ../clients/cli/connections.c:3171
+#, fuzzy
+msgid "InfiniBand transport mode"
+msgstr "傳輸模式"
 
-#: ../clients/cli/connections.c:3802
-#, fuzzy, c-format
-msgid "Error: '%s' is not a valid interface nor '*'."
-msgstr "錯誤:「ifname」:「%s」不是個有效的介面卡或是「*」。"
+#: ../clients/cli/connections.c:3183
+msgid "ADSL protocol"
+msgstr ""
 
-#: ../clients/cli/connections.c:3825
+#: ../clients/cli/connections.c:3194
 #, fuzzy
-msgid "Error: master is required"
-msgstr "錯誤:需要「mater」。"
+msgid "ADSL encapsulation"
+msgstr "DSL 身份認證"
 
-#: ../clients/cli/connections.c:3883
-#, fuzzy, c-format
-msgid "Error: error adding bond option '%s=%s'."
-msgstr "錯誤:不明的連線「%s」。"
+#: ../clients/cli/connections.c:3203
+#, fuzzy
+msgid "TUN device mode"
+msgstr "裝置已移除"
 
-#: ../clients/cli/connections.c:3914
+#: ../clients/cli/connections.c:3216
 #, c-format
-msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
-msgstr "錯誤:「%s」不是個有效的監控模式;請使用「%s」或是「%s」。\n"
+msgid "Error: 'flags': '%s' is not valid; use <0-7>."
+msgstr "錯誤:「flags」:「%s」無效;使用 <0-7>。"
 
-#: ../clients/cli/connections.c:3945
+#: ../clients/cli/connections.c:3238
 #, c-format
-msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
-msgstr "錯誤:「bt-type」:「%s」無效;請使用 [%s, %s (%s), %s]。"
+msgid "Error: '%s': '%s' is not valid; %s "
+msgstr "錯誤:「%s」:「%s」無效;%s"
 
-#: ../clients/cli/connections.c:3972
-#, fuzzy
-msgid "Interface name [*]"
-msgstr "介面卡名稱 [*]:"
+#: ../clients/cli/connections.c:3416
+#, c-format
+msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
+msgstr ""
 
-#: ../clients/cli/connections.c:3976
-#, fuzzy
-msgid "PPPoE username"
-msgstr "PPPoE 使用者名稱:"
+#: ../clients/cli/connections.c:3441
+#, c-format
+msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
+msgstr "錯誤:「%s」:「%s」無效;使用 <%u-%u>。"
 
-#: ../clients/cli/connections.c:3977 ../clients/cli/connections.c:3998
-#: ../clients/cli/connections.c:4000 ../clients/cli/connections.c:4049
-#, fuzzy
-msgid "Password [none]"
-msgstr "密碼 [none]:"
+#. 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:3978
-#, fuzzy
-msgid "Service [none]"
-msgstr "服務 [none]:"
+#: ../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:3979 ../clients/cli/connections.c:3982
-#: ../clients/cli/connections.c:3991
-#, fuzzy
-msgid "MTU [auto]"
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3517
+msgid "ethernet"
+msgstr "乙太網路"
+
+#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
+#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
+msgid "MTU [auto]: "
 msgstr "MTU [auto]:"
 
-#: ../clients/cli/connections.c:3980 ../clients/cli/connections.c:3983
-#: ../clients/cli/connections.c:3992 ../clients/cli/connections.c:3995
-#: ../clients/cli/connections.c:4036
-#, fuzzy
-msgid "MAC [none]"
+#: ../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]: "
 msgstr "MAC [none]:"
 
-#: ../clients/cli/connections.c:3981 ../clients/cli/connections.c:3993
-#, fuzzy
-msgid "Cloned MAC [none]"
+#: ../clients/cli/connections.c:3544
+msgid "Cloned MAC [none]: "
 msgstr "Cloned MAC [none]:"
 
-#: ../clients/cli/connections.c:3986
-#, fuzzy
-msgid "Parent interface [none]"
+#: ../clients/cli/connections.c:3592
+#, fuzzy, c-format
+msgid "Transport mode %s"
+msgstr "傳輸模式"
+
+#: ../clients/cli/connections.c:3605
+msgid "Parent interface [none]: "
 msgstr "父介面卡 [none]:"
 
-#: ../clients/cli/connections.c:3987
-#, fuzzy
-msgid "P_KEY [none]"
+#: ../clients/cli/connections.c:3616
+msgid "P_KEY [none]: "
 msgstr "P_KEY [none]:"
 
-#. 0
-#: ../clients/cli/connections.c:3988 ../clients/cli/connections.c:4043
-#: ../clients/cli/devices.c:151 ../clients/tui/nmt-page-wifi.c:224
-msgid "SSID"
-msgstr "SSID"
+#: ../clients/cli/connections.c:3626
+#, c-format
+msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
+msgstr "錯誤:當指定了「parent」時,「p-key」是必要的。\n"
 
-#: ../clients/cli/connections.c:3994
-#, fuzzy
-msgid "WiMAX NSP name"
-msgstr "WiMAX NSP 名稱:"
+#. 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:3996
-#, fuzzy
-msgid "APN"
-msgstr "AP"
+#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
+#, fuzzy, c-format
+msgid "Mode %s"
+msgstr "模式"
 
-#: ../clients/cli/connections.c:3997 ../clients/cli/connections.c:3999
-#: ../clients/cli/connections.c:4042
+#. 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]:"
+
+#: ../clients/cli/connections.c:3700
+msgid "Service [none]: "
+msgstr "服務 [none]:"
+
+#. Ask for optional 'gsm' or 'cdma' arguments.
+#: ../clients/cli/connections.c:3730
 #, fuzzy
-msgid "Username [none]"
+msgid "mobile broadband"
+msgstr "行動寬頻"
+
+#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
+msgid "Username [none]: "
 msgstr "使用者名稱 [none]:"
 
-#: ../clients/cli/connections.c:4001
+#. Ask for optional 'bluetooth' arguments.
+#: ../clients/cli/connections.c:3749
 #, fuzzy
-msgid "Bluetooth device address"
-msgstr "藍牙裝置位址:"
+msgid "bluetooth"
+msgstr "藍牙"
 
-#: ../clients/cli/connections.c:4004
-#, fuzzy
-msgid "VLAN parent device or connection UUID"
-msgstr "VLAN 父裝置或連線 UUID:"
+#: ../clients/cli/connections.c:3756
+#, fuzzy, c-format
+msgid "Bluetooth type %s"
+msgstr "藍牙"
 
-#: ../clients/cli/connections.c:4006
-#, fuzzy
-msgid "VLAN ID (<0-4094>)"
-msgstr "VLAN ID <0-4095>:"
+#: ../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:4007
-#, fuzzy
-msgid "VLAN flags (<0-7>) [none]"
+#. 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:3794
+msgid "VLAN flags (<0-7>) [none]: "
 msgstr "VLAN 旗標(<0-7>)[none]:"
 
-#: ../clients/cli/connections.c:4008
-#, fuzzy
-msgid "Ingress priority maps [none]"
+#: ../clients/cli/connections.c:3805
+msgid "Ingress priority maps [none]: "
 msgstr "Ingress 優先順序對映 [none]:"
 
-#: ../clients/cli/connections.c:4009
-#, fuzzy
-msgid "Egress priority maps [none]"
+#: ../clients/cli/connections.c:3816
+msgid "Egress priority maps [none]: "
 msgstr "Egress 優先順序對映 [none]:"
 
-#: ../clients/cli/connections.c:4012
-#, fuzzy
-msgid "Bonding primary interface [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]: "
 msgstr "Bonding 主要介面卡 [none]:"
 
-#: ../clients/cli/connections.c:4016
-#, fuzzy
-msgid "Bonding miimon [100]"
+#: ../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]: "
 msgstr "Bonding miimon [100]:"
 
-#: ../clients/cli/connections.c:4017
-#, fuzzy
-msgid "Bonding downdelay [0]"
+#: ../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]: "
 msgstr "Bonding downdelay [0]:"
 
-#: ../clients/cli/connections.c:4018
-#, fuzzy
-msgid "Bonding updelay [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]: "
 msgstr "Bonding updelay [0]:"
 
-#: ../clients/cli/connections.c:4019
-#, fuzzy
-msgid "Bonding arp-interval [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]: "
 msgstr "Bonding arp-interval [0]:"
 
-#: ../clients/cli/connections.c:4021
-#, fuzzy
-msgid "Bonding arp-ip-target [none]"
+#: ../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]: "
 msgstr "Bonding arp-ip-target [none]:"
 
-#: ../clients/cli/connections.c:4023
-msgid "LACP rate ('slow' or 'fast') [slow]"
+#: ../clients/cli/connections.c:3943
+msgid "LACP rate ('slow' or 'fast') [slow]: "
 msgstr ""
 
-#: ../clients/cli/connections.c:4025 ../clients/cli/connections.c:4026
-#, fuzzy
-msgid "Team JSON configuration [none]"
+#: ../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]: "
 msgstr "團隊 JSON 的配置 [none]:"
 
-#: ../clients/cli/connections.c:4027
+#: ../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
 #, fuzzy
-msgid "Enable STP [no]"
+msgid "bridge"
+msgstr "橋接"
+
+#: ../clients/cli/connections.c:4013
+#, fuzzy, c-format
+msgid "Enable STP %s"
 msgstr "啟用 STP(yes/no)[yes]:"
 
-#: ../clients/cli/connections.c:4029
+#: ../clients/cli/connections.c:4018
+#, fuzzy, c-format
+msgid "Error: 'stp': %s.\n"
+msgstr "錯誤:「stp」:%s。"
+
+#: ../clients/cli/connections.c:4026
 #, fuzzy
-msgid "STP priority [32768]"
+msgid "STP priority [32768]: "
 msgstr "STP 優先順序 [128]:"
 
 #: ../clients/cli/connections.c:4030
-#, fuzzy
-msgid "Forward delay [15]"
+#, 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]: "
 msgstr "Forward delay [15]:"
 
-#: ../clients/cli/connections.c:4031
-#, fuzzy
-msgid "Hello time [2]"
+#: ../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]: "
 msgstr "Hello time [2]:"
 
-#: ../clients/cli/connections.c:4032
-#, fuzzy
-msgid "Max age [20]"
+#: ../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]: "
 msgstr "Max age [20]:"
 
-#: ../clients/cli/connections.c:4033
-#, fuzzy
-msgid "MAC address ageing time [300]"
+#: ../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]: "
 msgstr "MAC address ageing time [300]:"
 
-#: ../clients/cli/connections.c:4034
+#: ../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 [no]"
+msgid "Enable IGMP snooping %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:4037
+#: ../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
 #, fuzzy
-msgid "Bridge port priority [32]"
+msgid "bridge-slave"
+msgstr "team-slave"
+
+#: ../clients/cli/connections.c:4125
+msgid "Bridge port priority [32]: "
 msgstr "橋接連接埠優先順序 [32]:"
 
-#: ../clients/cli/connections.c:4038
-#, fuzzy
-msgid "Bridge port STP path cost [100]"
+#: ../clients/cli/connections.c:4138
+msgid "Bridge port STP path cost [100]: "
 msgstr "橋接連接埠 STP path cost [100]:"
 
-#: ../clients/cli/connections.c:4039
-#, fuzzy
-msgid "Hairpin [no]"
+#: ../clients/cli/connections.c:4152
+#, fuzzy, c-format
+msgid "Hairpin %s"
 msgstr "Hairpin 模式"
 
-#: ../clients/cli/connections.c:4044
-#, fuzzy
-msgid "OLPC Mesh channel [1]"
+#: ../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]: "
 msgstr "OLPC Mesh channel [1]:"
 
-#: ../clients/cli/connections.c:4045
-#, fuzzy
-msgid "DHCP anycast MAC address [none]"
+#: ../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]: "
 msgstr "DHCP anycast MAC address [none]:"
 
-#. 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:4046
-#: ../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 '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:4052
-#, fuzzy
-msgid "MACVLAN parent device or connection UUID"
-msgstr "VLAN 父裝置或連線 UUID:"
+#: ../clients/cli/connections.c:4227
+#, fuzzy, c-format
+msgid "ADSL encapsulation %s"
+msgstr "ADSL 連線 %d"
 
-#: ../clients/cli/connections.c:4055
-msgid "Tap [no]"
+#. Ask for optional 'macvlan' arguments.
+#: ../clients/cli/connections.c:4245
+msgid "macvlan"
 msgstr ""
 
-#: ../clients/cli/connections.c:4057
-#, fuzzy
-msgid "VXLAN ID"
-msgstr "VLAN ID <0-4095>:"
+#: ../clients/cli/connections.c:4251
+#, c-format
+msgid "Tap %s"
+msgstr ""
 
-#: ../clients/cli/connections.c:4058 ../clients/cli/connections.c:4076
-#, fuzzy
-msgid "Remote"
-msgstr "移除"
+#: ../clients/cli/connections.c:4256
+#, fuzzy, c-format
+msgid "Error: 'tap': %s.\n"
+msgstr "錯誤:「stp」:%s。"
 
-#: ../clients/cli/connections.c:4059 ../clients/cli/connections.c:4077
+#. 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:4277 ../clients/cli/connections.c:4601
 #, fuzzy
-msgid "Parent device [none]"
+msgid "Parent device [none]: "
 msgstr "父介面卡 [none]:"
 
-#: ../clients/cli/connections.c:4060
+#: ../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
 #, fuzzy
-msgid "Local address [none]"
+msgid "Local address [none]: "
 msgstr "DHCP anycast MAC address [none]:"
 
-#: ../clients/cli/connections.c:4061
-msgid "Minimum source port [0]"
+#: ../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]: "
 msgstr ""
 
-#: ../clients/cli/connections.c:4062
-msgid "Maximum source port [0]"
+#: ../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]: "
 msgstr ""
 
-#: ../clients/cli/connections.c:4063
+#: ../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
 #, fuzzy
-msgid "Destination port [8472]"
+msgid "Destination port [8472]: "
 msgstr "目的"
 
-#: ../clients/cli/connections.c:4066
-#, fuzzy
-msgid "User ID [none]"
-msgstr "使用者名稱 [none]:"
+#: ../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:4067
+#: ../clients/cli/connections.c:4374
 #, fuzzy
-msgid "Group ID [none]"
-msgstr "MAC [none]:"
+msgid "IPv4 address (IP[/plen]) [none]: "
+msgstr "IPv4 address (IP[/plen] [gateway]) [none]:"
 
-#: ../clients/cli/connections.c:4068
+#: ../clients/cli/connections.c:4376
 #, fuzzy
-msgid "Enable PI [no]"
-msgstr "啟用 STP(yes/no)[yes]:"
+msgid "IPv6 address (IP[/plen]) [none]: "
+msgstr "IPv6 address (IP[/plen] [gateway]) [none]:"
 
-#: ../clients/cli/connections.c:4070
-msgid "Enable VNET header [no]"
-msgstr ""
+#: ../clients/cli/connections.c:4390
+#, fuzzy, c-format
+msgid "  Address successfully added: %s\n"
+msgstr "位址已成功新增:%s %s\n"
 
-#: ../clients/cli/connections.c:4072
-msgid "Enable multi queue [no]"
-msgstr ""
+#: ../clients/cli/connections.c:4392
+#, fuzzy, c-format
+msgid "  Warning: address already present: %s\n"
+msgstr "警告:位址已存在:%s %s\n"
 
-#: ../clients/cli/connections.c:4075
-#, fuzzy
-msgid "Local endpoint [none]"
-msgstr "父介面卡 [none]:"
+#: ../clients/cli/connections.c:4394
+#, c-format
+msgid "  Warning: ignoring garbage at the end: '%s'\n"
+msgstr "警告:將忽略尾端不必要的項目:「%s」\n"
 
-#: ../clients/cli/connections.c:4078
-#, fuzzy
-msgid "IPv4 address (IP[/plen]) [none]"
-msgstr "IPv4 address (IP[/plen] [gateway]) [none]:"
+#: ../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:4079
+#: ../clients/cli/connections.c:4416
 #, fuzzy
-msgid "IPv4 gateway [none]"
+msgid "IPv4 gateway [none]: "
 msgstr "IPv4 address (IP[/plen] [gateway]) [none]:"
 
-#: ../clients/cli/connections.c:4080
+#: ../clients/cli/connections.c:4419
 #, fuzzy
-msgid "IPv6 address (IP[/plen]) [none]"
+msgid "IPv6 gateway [none]: "
 msgstr "IPv6 address (IP[/plen] [gateway]) [none]:"
 
-#: ../clients/cli/connections.c:4081
+#: ../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 ""
+
+#: ../clients/cli/connections.c:4509
 #, fuzzy
-msgid "IPv6 gateway [none]"
-msgstr "IPv6 address (IP[/plen] [gateway]) [none]:"
+msgid "User ID [none]: "
+msgstr "使用者名稱 [none]:"
 
-#: ../clients/cli/connections.c:4205
+#: ../clients/cli/connections.c:4522
+#, fuzzy
+msgid "Group ID [none]: "
+msgstr "MAC [none]:"
+
+#: ../clients/cli/connections.c:4536
+#, c-format
+msgid "Enable PI %s"
+msgstr ""
+
+#: ../clients/cli/connections.c:4541
 #, fuzzy, c-format
-msgid "Error: value for '%s' is missing."
-msgstr "錯誤:找不到 '%s' 選項的欄位。"
+msgid "Error: 'pi': %s.\n"
+msgstr "錯誤:「stp」:%s。"
 
-#: ../clients/cli/connections.c:4252
-msgid "Error: <setting>.<property> argument is missing."
-msgstr "錯誤:<setting>.<property> 引數遺失。"
+#: ../clients/cli/connections.c:4549
+#, c-format
+msgid "Enable VNET header %s"
+msgstr ""
+
+#: ../clients/cli/connections.c:4554
+#, fuzzy, c-format
+msgid "Error: 'vnet-hdr': %s.\n"
+msgstr "錯誤:「vpn-type」:%s。"
 
-#: ../clients/cli/connections.c:4274
+#: ../clients/cli/connections.c:4562
 #, c-format
-msgid "Error: invalid or not allowed setting '%s': %s."
-msgstr "錯誤:設定「%s」無效或不被允許:%s。"
+msgid "Enable multi queue %s"
+msgstr ""
 
-#: ../clients/cli/connections.c:4301
+#: ../clients/cli/connections.c:4567
 #, fuzzy, c-format
-msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
-msgstr "「%s」意義含糊不清(%s x %s)"
+msgid "Error: 'multi-queue': %s.\n"
+msgstr "錯誤:「mode」:%s。"
+
+#. Ask for optional 'ip-tunnel' arguments.
+#: ../clients/cli/connections.c:4581
+msgid "IP Tunnel"
+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
+#, fuzzy, c-format
+msgid "Error: value for '%s' is missing."
+msgstr "錯誤:找不到 '%s' 選項的欄位。"
 
-#: ../clients/cli/connections.c:4315
+#: ../clients/cli/connections.c:4681
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "錯誤:無效的 <setting>.<property> '%s'。"
 
-#: ../clients/cli/connections.c:4356 ../clients/cli/connections.c:7842
+#: ../clients/cli/connections.c:4689
+#, c-format
+msgid "Error: invalid or not allowed setting '%s': %s."
+msgstr "錯誤:設定「%s」無效或不被允許:%s。"
+
+#: ../clients/cli/connections.c:4700
 #, fuzzy, c-format
-msgid "Error: Failed to add '%s' connection: %s"
-msgstr "錯誤:無法新增「%s」連線:(%d) %s"
+msgid "Error: don't know how to create '%s' setting."
+msgstr "錯誤:無法取得系統設定。"
 
-#: ../clients/cli/connections.c:4361
+#: ../clients/cli/connections.c:4710
 #, c-format
-msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "連線「%s」 (%s) 已成功新增。\n"
+msgid "Error: invalid property '%s': %s."
+msgstr "錯誤:無效的內容「%s」:%s。"
+
+#: ../clients/cli/connections.c:4722
+#, c-format
+msgid "Error: failed to modify %s.%s: %s."
+msgstr "錯誤:無法修改 %s.%s:%s。"
+
+#: ../clients/cli/connections.c:4741
+#, fuzzy, c-format
+msgid "Error: failed to remove a value from %s.%s: %s."
+msgstr "錯誤:移除「%s」的值失敗:%s\n"
 
-#: ../clients/cli/connections.c:4477
+#: ../clients/cli/connections.c:4775
 #, c-format
 msgid ""
-"You can specify this option more than once. Press <Enter> when you're done.\n"
+"Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
 msgstr ""
 
-#. Ask for optional arguments.
-#: ../clients/cli/connections.c:4515
+#: ../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」。"
+
+#: ../clients/cli/connections.c:4950
+#, 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」。"
+
+#: ../clients/cli/connections.c:5304
+#, 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」。"
+
+#: ../clients/cli/connections.c:5364
 #, fuzzy, c-format
-msgid "There is %d optional setting for %s.\n"
-msgid_plural "There are %d optional settings for %s.\n"
-msgstr[0] "「%s」的連線類型有一個選用引數。\n"
+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:4518
+#: ../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。"
+
+#: ../clients/cli/connections.c:5747
 #, 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]"
+msgid "Error: 'multicast-snooping': %s."
+msgstr "錯誤:「stp」:%s。"
 
-#: ../clients/cli/connections.c:4532
-#, fuzzy
-msgid "Wired Ethernet"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:5866
+#, c-format
+msgid "Error: 'hairpin': %s."
+msgstr "錯誤:「hairpin」:%s。"
 
-#: ../clients/cli/connections.c:4534 ../src/devices/nm-device-infiniband.c:175
-#, fuzzy
-msgid "InfiniBand connection"
-msgstr "InfiniBand 連線 %d"
+#: ../clients/cli/connections.c:5915
+msgid "Error: 'vpn-type' is required."
+msgstr "錯誤:需要「vpn-type」。"
 
-#: ../clients/cli/connections.c:4536
-#, fuzzy
-msgid "Wi-Fi connection"
-msgstr "Wi-Fi 連線 %d"
+#: ../clients/cli/connections.c:5922
+#, fuzzy, c-format
+msgid "Warning: 'vpn-type': %s not known.\n"
+msgstr "錯誤:「vpn-type」:%s。"
 
-#: ../clients/cli/connections.c:4538
-#, fuzzy
-msgid "WiMAX connection"
-msgstr "CDMA 連線 %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:4540
-msgid "PPPoE"
+#: ../clients/cli/connections.c:6034
+msgid "Username: "
+msgstr "使用者名稱:"
+
+#: ../clients/cli/connections.c:6043
+#, c-format
+msgid "Protocol %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:4542
+#: ../clients/cli/connections.c:6046
 #, fuzzy
-msgid "CDMA mobile broadband connection"
-msgstr "行動寬頻連線 %d"
+msgid "Error: 'protocol' is required."
+msgstr "錯誤:需要「nsp」。"
 
-#: ../clients/cli/connections.c:4544
+#: ../clients/cli/connections.c:6105
 #, fuzzy
-msgid "GSM mobile broadband connection"
-msgstr "行動寬頻連線 %d"
+msgid "MACVLAN parent device or connection UUID: "
+msgstr "VLAN 父裝置或連線 UUID:"
 
-#: ../clients/cli/connections.c:4546
+#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
+#: ../clients/cli/connections.c:6307
 #, fuzzy
-msgid "bluetooth connection"
-msgstr "Bond 連線 %d"
+msgid "Error: 'mode' is required."
+msgstr "錯誤:需要「dev」。"
 
-#: ../clients/cli/connections.c:4548 ../src/devices/nm-device-vlan.c:458
+#: ../clients/cli/connections.c:6131
 #, fuzzy
-msgid "VLAN connection"
-msgstr "VLAN 連線 %d"
+msgid "Error: 'mode' is not valid."
+msgstr "錯誤:「dev」指令「%s」不合乎規定。"
 
-#: ../clients/cli/connections.c:4550
-#, fuzzy
-msgid "Bond device"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:6144
+#, fuzzy, c-format
+msgid "Error: 'tap': %s."
+msgstr "錯誤:「stp」:%s。"
 
-#: ../clients/cli/connections.c:4552
-#, fuzzy
-msgid "Team device"
-msgstr "裝置已移除"
+#: ../clients/cli/connections.c:6230
+#, fuzzy, c-format
+msgid "Error: 'pi': %s."
+msgstr "錯誤:「stp」:%s。"
 
-#: ../clients/cli/connections.c:4554
-#, fuzzy
-msgid "Team port"
-msgstr "Team"
+#: ../clients/cli/connections.c:6241
+#, fuzzy, c-format
+msgid "Error: 'vnet-hdr': %s."
+msgstr "錯誤:「vpn-type」:%s。"
 
-#: ../clients/cli/connections.c:4556
-#, fuzzy
-msgid "Bridge device"
-msgstr "Ethernet"
+#: ../clients/cli/connections.c:6252
+#, fuzzy, c-format
+msgid "Error: 'multi-queue': %s."
+msgstr "錯誤:「mode」:%s。"
 
-#: ../clients/cli/connections.c:4558
-#, fuzzy
-msgid "Bridge port"
-msgstr "橋接"
+#: ../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:4560 ../src/nm-manager.c:3716
-#, fuzzy
-msgid "VPN connection"
-msgstr "VPN 連線"
+#: ../clients/cli/connections.c:6327
+msgid "Remote endpoint: "
+msgstr ""
 
-#: ../clients/cli/connections.c:4562
+#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
 #, fuzzy
-msgid "OLPC Mesh connection"
-msgstr "CDMA 連線 %d"
+msgid "Error: 'remote' is required."
+msgstr "錯誤:需要「mater」。"
 
-#: ../clients/cli/connections.c:4564 ../src/devices/adsl/nm-device-adsl.c:133
-#, fuzzy
-msgid "ADSL connection"
-msgstr "ADSL 連線 %d"
+#: ../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:4566
-#, fuzzy
-msgid "macvlan connection"
-msgstr "Bond 連線 %d"
+#: ../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 位址。"
 
-#: ../clients/cli/connections.c:4568 ../src/devices/nm-device-vxlan.c:374
+#: ../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:6421
 #, fuzzy
-msgid "VXLAN connection"
-msgstr "VLAN 連線 %d"
+msgid "VXLAN ID: "
+msgstr "VLAN ID <0-4095>:"
 
-#: ../clients/cli/connections.c:4570
+#: ../clients/cli/connections.c:6429
 #, fuzzy
-msgid "Tun device"
-msgstr "裝置已移除"
+msgid "Remote: "
+msgstr "移除"
+
+#: ../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:6464
+#, fuzzy, c-format
+msgid "Error: 'remote': '%s' is not a valid IP address"
+msgstr "錯誤:「%s」:「%s」不是個有效的 %s MAC 位址。"
+
+#: ../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: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: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:4572
-msgid "IPv4 protocol"
+#: ../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:6540
+#, c-format
+msgid "Error: '%s' is not a valid connection type."
+msgstr "錯誤:「%s」不是個有效的連線類型。"
+
+#: ../clients/cli/connections.c:6581
+#, c-format
+msgid "Error: IPv4 gateway specified without IPv4 addresses"
 msgstr ""
 
-#: ../clients/cli/connections.c:4574
-msgid "IPv6 protocol"
+#: ../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"
 msgstr ""
 
-#: ../clients/cli/connections.c:4657 ../clients/cli/utils.c:124
+#: ../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 "Error: value for '%s' argument is required."
-msgstr "錯誤:「%s」引數需要有個值。"
+msgid "Connection '%s' (%s) successfully added.\n"
+msgstr "連線「%s」 (%s) 已成功新增。\n"
 
-#: ../clients/cli/connections.c:4663
+#: ../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:6968 ../clients/cli/devices.c:2164
+#, c-format
+msgid "Error: 'autoconnect': %s."
+msgstr "錯誤:「autoconnect」:%s。"
+
+#: ../clients/cli/connections.c:6978
 #, fuzzy, c-format
 msgid "Error: 'save': %s."
 msgstr "錯誤:「stp」:%s。"
 
-#: ../clients/cli/connections.c:4732
-#, fuzzy, c-format
-msgid "Error: '%s' argument is required."
-msgstr "錯誤:需要「type」引數。"
+#: ../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:5701
+#: ../clients/cli/connections.c:7011
+#, c-format
+msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
+msgstr "錯誤:「ifname」:「%s」不是個有效的介面卡或是「*」。"
+
+#: ../clients/cli/connections.c:8035
 #, 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:5783
+#. 
+#: ../clients/cli/connections.c:8117
 #, fuzzy, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -2356,7 +2745,7 @@ msgstr ""
 "nmcli    <conf-option> <value>       :: nmcli 配置\n"
 "quit                                 :: 退出 nmcli\n"
 
-#: ../clients/cli/connections.c:5810
+#: ../clients/cli/connections.c:8144
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2375,13 +2764,12 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:5817
+#: ../clients/cli/connections.c:8151
 #, 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"
@@ -2395,7 +2783,7 @@ msgstr ""
 "範例:nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:5824
+#: ../clients/cli/connections.c:8158
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2410,7 +2798,7 @@ msgstr ""
 "\n"
 "範例:nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:5829
+#: ../clients/cli/connections.c:8163
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2420,10 +2808,9 @@ 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:5834
+#: ../clients/cli/connections.c:8168
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2431,21 +2818,19 @@ 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:5839
+#: ../clients/cli/connections.c:8173
 #, 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"
@@ -2459,7 +2844,7 @@ msgstr ""
 "範例:nmcli> verify\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:5848
+#: ../clients/cli/connections.c:8182
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2475,7 +2860,7 @@ msgid ""
 "profile must be deleted.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:5859
+#: ../clients/cli/connections.c:8193
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -2493,28 +2878,23 @@ 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:5866 ../clients/cli/connections.c:6025
+#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
 #, 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:5869
+#: ../clients/cli/connections.c:8203
 #, 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:5872
+#: ../clients/cli/connections.c:8206
 #, fuzzy, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -2540,28 +2920,27 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:5894 ../clients/cli/connections.c:6031
+#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
 #, 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:5899 ../clients/cli/connections.c:6036
-#: ../clients/cli/connections.c:6460 ../clients/cli/connections.c:7407
+#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
+#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
 #, 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:5965
+#. 
+#: ../clients/cli/connections.c:8299
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2587,18 +2966,17 @@ msgstr ""
 "help/?   [<command>]             :: 印出此協助或指令描述\n"
 "quit                             :: 退出 nmcli\n"
 
-#: ../clients/cli/connections.c:5990
+#: ../clients/cli/connections.c:8324
 #, 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:5994
+#: ../clients/cli/connections.c:8328
 #, fuzzy, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -2609,21 +2987,19 @@ msgid ""
 msgstr ""
 "add [<value>]  :: 新增選項至內容\n"
 "\n"
-"這項指令會將提供的 <value> 新增至此內容(若這項內容乃 container 類型的話)。"
-"若是單值的內容,它會將值替換掉(和「set」相同)。\n"
+"這項指令會將提供的 <value> 新增至此內容(若這項內容乃 container 類型的話)。若是單值的內容,它會將值替換掉(和「set」相同)。\n"
 
-#: ../clients/cli/connections.c:6000
+#: ../clients/cli/connections.c:8334
 #, 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:6004
+#: ../clients/cli/connections.c:8338
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -2643,7 +3019,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:6015
+#: ../clients/cli/connections.c:8349
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -2653,10 +3029,9 @@ msgid ""
 msgstr ""
 "describe  :: 描述內容\n"
 "\n"
-"顯示內容的描述。您可查看 nm-settings(5) man page 以檢視所有的 NM 設定和內"
-"容。\n"
+"顯示內容的描述。您可查看 nm-settings(5) man page 以檢視所有的 NM 設定和內容。\n"
 
-#: ../clients/cli/connections.c:6020
+#: ../clients/cli/connections.c:8354
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -2669,567 +3044,553 @@ msgstr ""
 "\n"
 "顯示內容的值。提供一項引數,您亦可顯示整個設定或是連線的值。\n"
 
-#: ../clients/cli/connections.c:6028
+#: ../clients/cli/connections.c:8362
 #, 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:6209
+#: ../clients/cli/connections.c:8460
+#, c-format
+msgid "Error: Connection activation failed.\n"
+msgstr "錯誤:連線啟用失敗。\n"
+
+#: ../clients/cli/connections.c:8543
 #, 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:6227
+#: ../clients/cli/connections.c:8561
 #, 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:6263
+#: ../clients/cli/connections.c:8597
 #, fuzzy, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "連線尚未儲存。您是否真的希望退出?[y/n]\n"
 
-#: ../clients/cli/connections.c:6312
+#: ../clients/cli/connections.c:8646
 #, 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:6337 ../clients/cli/connections.c:6758
-#: ../clients/cli/connections.c:6816
+#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
+#: ../clients/cli/connections.c:9151
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "「%s」內容所能使用的值:%s\n"
 
-#: ../clients/cli/connections.c:6341 ../clients/cli/connections.c:6762
-#: ../clients/cli/connections.c:6820
+#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "輸入「%s」的值:"
 
-#: ../clients/cli/connections.c:6356 ../clients/cli/connections.c:6378
-#: ../clients/cli/connections.c:6766 ../clients/cli/connections.c:6825
+#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
+#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "錯誤:設置「%s」內容失敗:%s\n"
 
-#: ../clients/cli/connections.c:6372
+#: ../clients/cli/connections.c:8706
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "編輯「%s」的值:"
 
-#: ../clients/cli/connections.c:6401
+#: ../clients/cli/connections.c:8735
 #, c-format
 msgid "Error: %s\n"
 msgstr "錯誤:%s\n"
 
-#: ../clients/cli/connections.c:6407 ../clients/cli/connections.c:6907
-#: ../clients/cli/connections.c:6955
+#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
+#: ../clients/cli/connections.c:9290
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "錯誤:移除「%s」的值失敗:%s\n"
 
-#: ../clients/cli/connections.c:6428
+#: ../clients/cli/connections.c:8762
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "不明的檔案引數:「%s」\n"
 
-#: ../clients/cli/connections.c:6533
+#: ../clients/cli/connections.c:8867
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "可用設定:%s\n"
 
-#: ../clients/cli/connections.c:6545
+#: ../clients/cli/connections.c:8879
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "錯誤:無效的設定名稱;%s\n"
 
-#: ../clients/cli/connections.c:6562
+#: ../clients/cli/connections.c:8896
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "可用的內容:%s\n"
 
-#: ../clients/cli/connections.c:6570
+#: ../clients/cli/connections.c:8904
 #, c-format
 msgid "Error: property %s\n"
 msgstr "錯誤:內容 %s\n"
 
-#: ../clients/cli/connections.c:6611
+#: ../clients/cli/connections.c:8945
 #, 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:6700
+#: ../clients/cli/connections.c:9035
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "您可編輯以下設定:%s\n"
 
-#: ../clients/cli/connections.c:6728
+#: ../clients/cli/connections.c:9063
 #, 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:6770 ../clients/cli/connections.c:7000
+#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "錯誤:尚未選擇設定;有效的值爲「%s」\n"
 
-#: ../clients/cli/connections.c:6771
+#: ../clients/cli/connections.c:9106
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr "先使用「goto <setting>」,或是「set <setting>.<property>」\n"
 
-#: ../clients/cli/connections.c:6785 ../clients/cli/connections.c:6934
-#: ../clients/cli/connections.c:7022
+#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
+#: ../clients/cli/connections.c:9357
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "錯誤:無效的設定引數「%s」;有效的值爲「%s」\n"
 
-#: ../clients/cli/connections.c:6795
+#: ../clients/cli/connections.c:9130
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "錯誤:「%s」內容的設定遺失\n"
 
-#: ../clients/cli/connections.c:6802
+#: ../clients/cli/connections.c:9137
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "錯誤:無效的內容:%s\n"
 
-#: ../clients/cli/connections.c:6855
+#: ../clients/cli/connections.c:9190
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "錯誤:「%s」設定不明\n"
 
-#: ../clients/cli/connections.c:6868
+#: ../clients/cli/connections.c:9203
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "您可編輯下列內容:%s\n"
 
-#: ../clients/cli/connections.c:6912
+#: ../clients/cli/connections.c:9247
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "錯誤:尚未提供引數;有效的值爲「%s」\n"
 
-#: ../clients/cli/connections.c:6931
+#: ../clients/cli/connections.c:9266
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "設定「%s」不存在連線中。\n"
 
-#: ../clients/cli/connections.c:6976
+#: ../clients/cli/connections.c:9311
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "錯誤:%s 內容,它也不是組設定名稱。\n"
 
-#: ../clients/cli/connections.c:7001
+#: ../clients/cli/connections.c:9336
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr "先使用「goto <setting>」,或是「describe <setting>.<property>」\n"
 
-#: ../clients/cli/connections.c:7050
+#: ../clients/cli/connections.c:9385
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "錯誤:無效的內容:%s,也不是組有效的設定名稱。\n"
 
-#: ../clients/cli/connections.c:7082
+#: ../clients/cli/connections.c:9417
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "錯誤:不明的設定:「%s」\n"
 
-#: ../clients/cli/connections.c:7087
+#: ../clients/cli/connections.c:9422
 #, fuzzy, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "設定「%s」不存在連線中。\n"
 
-#: ../clients/cli/connections.c:7115
+#: ../clients/cli/connections.c:9450
 #, fuzzy, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "錯誤:無效的內容:%s\n"
 
-#: ../clients/cli/connections.c:7117
+#: ../clients/cli/connections.c:9452
 #, fuzzy
 msgid ", neither a valid setting name"
 msgstr "錯誤:無效的內容:%s,也不是組有效的設定名稱。\n"
 
-#: ../clients/cli/connections.c:7134
+#: ../clients/cli/connections.c:9469
 #, fuzzy, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "無效的選項「%s」"
 
-#: ../clients/cli/connections.c:7142
+#: ../clients/cli/connections.c:9477
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "驗證設定「%s」:%s\n"
 
-#: ../clients/cli/connections.c:7157
+#: ../clients/cli/connections.c:9492
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "驗證連線:%s\n"
 
-#: ../clients/cli/connections.c:7160
+#: ../clients/cli/connections.c:9495
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7177
+#: ../clients/cli/connections.c:9512
 #, fuzzy, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "錯誤:無效的額外引數「%s」。"
 
-#: ../clients/cli/connections.c:7210
+#: ../clients/cli/connections.c:9545
 #, fuzzy, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "錯誤:儲存「%s」(%s)連線失敗:(%d) %s\n"
 
-#: ../clients/cli/connections.c:7217
+#: ../clients/cli/connections.c:9552
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "連線「%s」(%s) 已成功儲存。\n"
 
-#: ../clients/cli/connections.c:7218
+#: ../clients/cli/connections.c:9553
 #, fuzzy, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "連線「%s」 (%s) 已成功新增。\n"
 
-#: ../clients/cli/connections.c:7251
+#: ../clients/cli/connections.c:9586
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "錯誤:連線驗證失敗:%s\n"
 
-#: ../clients/cli/connections.c:7252
+#: ../clients/cli/connections.c:9587
 msgid "(unknown error)"
 msgstr "(不明錯誤)"
 
-#: ../clients/cli/connections.c:7253
+#: ../clients/cli/connections.c:9588
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7275
+#: ../clients/cli/connections.c:9610
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "錯誤:連線尚未儲存。請先輸入「save」。\n"
 
-#: ../clients/cli/connections.c:7279
+#: ../clients/cli/connections.c:9614
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "錯誤:連線無效:%s\n"
 
-#: ../clients/cli/connections.c:7289
+#: ../clients/cli/connections.c:9624
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "錯誤:無法啟用連線:%s。\n"
 
-#: ../clients/cli/connections.c:7299
+#: ../clients/cli/connections.c:9634
 #, fuzzy, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "錯誤:啟用「%s」(%s) 連線失敗:(%d) %s\n"
 
-#: ../clients/cli/connections.c:7305
+#: ../clients/cli/connections.c:9640
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr "監控連線啟用(按下任何鍵以繼續進行)\n"
 
-#: ../clients/cli/connections.c:7343
+#: ../clients/cli/connections.c:9678
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "錯誤:status-line:%s\n"
 
-#: ../clients/cli/connections.c:7351
+#: ../clients/cli/connections.c:9686
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "錯誤:save-confirmation:%s\n"
 
-#: ../clients/cli/connections.c:7359
+#: ../clients/cli/connections.c:9694
 #, fuzzy, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "錯誤:「show active」:%s"
 
-#: ../clients/cli/connections.c:7368
+#: ../clients/cli/connections.c:9703
 #, fuzzy, c-format
 msgid "Error: bad color: %s\n"
 msgstr "錯誤:無效的內容:%s\n"
 
-#: ../clients/cli/connections.c:7382
+#: ../clients/cli/connections.c:9717
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "目前的 nmcli 配置:\n"
 
-#: ../clients/cli/connections.c:7392
+#: ../clients/cli/connections.c:9727
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "無效的配置選項「%s」;允許「%s」\n"
 
-#: ../clients/cli/connections.c:7593
+#: ../clients/cli/connections.c:9982
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "錯誤:只能提供「id」、uuid 或是「path」其中一項。"
 
-#: ../clients/cli/connections.c:7605 ../clients/cli/connections.c:7788
-#: ../clients/cli/connections.c:7795 ../clients/cli/connections.c:7929
-#: ../clients/cli/connections.c:8434
+#: ../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
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "錯誤:不明的連線「%s」。"
 
-#: ../clients/cli/connections.c:7623
+#: ../clients/cli/connections.c:10012
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr "警告:正要編輯既有的連線「%s」;「type」引數已忽略\n"
 
-#: ../clients/cli/connections.c:7626
+#: ../clients/cli/connections.c:10015
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
 msgstr "警告:正要編輯既有的連線「%s」;「con-name」引數已忽略\n"
 
-#: ../clients/cli/connections.c:7640
+#: ../clients/cli/connections.c:10029
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "有效的連線類型:%s\n"
 
-#: ../clients/cli/connections.c:7642
+#: ../clients/cli/connections.c:10031
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "錯誤:無效的連線類型;%s\n"
 
-#: ../clients/cli/connections.c:7681
+#: ../clients/cli/connections.c:10070
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli 互動式連線編輯程式 |==="
 
-#: ../clients/cli/connections.c:7684
+#: ../clients/cli/connections.c:10073
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "編輯既有的「%s」連線:「%s」"
 
-#: ../clients/cli/connections.c:7686
+#: ../clients/cli/connections.c:10075
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "新增一項「%s」連線"
 
-#: ../clients/cli/connections.c:7688
+#: ../clients/cli/connections.c:10077
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "輸入「help」或是「?」以取得可用指令。"
 
-#: ../clients/cli/connections.c:7690
+#: ../clients/cli/connections.c:10079
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr "輸入「describe [<setting>.<prop>]」以取得詳細的內容描述。"
 
-#: ../clients/cli/connections.c:7728
+#: ../clients/cli/connections.c:10117
 #, fuzzy, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "錯誤:修改連線「%s」失敗:(%d) %s"
 
-#: ../clients/cli/connections.c:7735
+#: ../clients/cli/connections.c:10124
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "連線「%s」(%s) 已成功修改。\n"
 
-#.
-#. * TODO(?) complete "uuid", "path", "id" or connection name.
-#. * (if we ever will move this here from shell completion script)
-#. if (nmc->complete) {
-#. quit ();
-#.
-#: ../clients/cli/connections.c:7761 ../clients/cli/connections.c:7885
-#: ../clients/cli/connections.c:8280 ../clients/cli/connections.c:8399
+#: ../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:7847
+#: ../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
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:7883
+#: ../clients/cli/connections.c:10260
 #, fuzzy
 msgid "New connection name: "
 msgstr "新連線"
 
-#: ../clients/cli/connections.c:7904 ../clients/cli/connections.c:7922
+#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
 #, fuzzy, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "錯誤:沒有 %s 參數。"
 
-#: ../clients/cli/connections.c:7910
+#: ../clients/cli/connections.c:10287
 #, fuzzy, c-format
 msgid "Error: unexpected extra argument '%s'."
 msgstr "錯誤:非預期的引數「%s」"
 
-#: ../clients/cli/connections.c:7917 ../clients/cli/connections.c:8428
-#, c-format
-msgid "Error: connection ID is missing."
-msgstr "錯誤:連線 ID 遺失。"
-
-#: ../clients/cli/connections.c:7979
+#: ../clients/cli/connections.c:10356
 #, fuzzy, c-format
 msgid "Error: not all connections deleted."
 msgstr "錯誤:尚未指定連線。"
 
-#: ../clients/cli/connections.c:7980
+#: ../clients/cli/connections.c:10357
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "錯誤:連線刪除失敗:%s"
 
-#: ../clients/cli/connections.c:8046 ../clients/cli/connections.c:8179
+#: ../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:8060
+#: ../clients/cli/connections.c:10433
 #, fuzzy, c-format
 msgid "Error: no connection provided."
 msgstr "錯誤:尚未指定連線。"
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8085
+#: ../clients/cli/connections.c:10458
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "錯誤:無法刪除不明的連線:%s。"
 
-#: ../clients/cli/connections.c:8097
+#: ../clients/cli/connections.c:10470
 #, fuzzy, c-format
 msgid "%s: connection profile changed\n"
 msgstr "連線失敗"
 
-#: ../clients/cli/connections.c:8123
+#: ../clients/cli/connections.c:10496
 #, fuzzy, c-format
 msgid "%s: connection profile created\n"
 msgstr "連線失敗"
 
-#: ../clients/cli/connections.c:8132
+#: ../clients/cli/connections.c:10505
 #, fuzzy, c-format
 msgid "%s: connection profile removed\n"
 msgstr "連線已移除"
 
-#: ../clients/cli/connections.c:8180
+#: ../clients/cli/connections.c:10548
 #, fuzzy, c-format
 msgid "Error: not all connections found."
 msgstr "錯誤:「%s」不是個有效的「connection」指令。"
 
-#: ../clients/cli/connections.c:8205
+#: ../clients/cli/connections.c:10571
 #, fuzzy, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "錯誤:無法新增「%s」連線:(%d) %s"
 
-#: ../clients/cli/connections.c:8239
+#: ../clients/cli/connections.c:10603
 #, fuzzy, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "錯誤:無法新增「%s」連線:(%d) %s"
 
-#: ../clients/cli/connections.c:8247
+#: ../clients/cli/connections.c:10611
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "無法載入檔案「%s」\n"
 
-#: ../clients/cli/connections.c:8256
+#: ../clients/cli/connections.c:10620
 #, fuzzy
 msgid "File to import: "
 msgstr "加密失敗:%d。"
 
-#: ../clients/cli/connections.c:8296
+#: ../clients/cli/connections.c:10655
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8307
+#: ../clients/cli/connections.c:10666
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr ""
 
-#: ../clients/cli/connections.c:8309
+#: ../clients/cli/connections.c:10668
 #, fuzzy, c-format
 msgid "Unknown parameter: %s"
 msgstr "不明的參數:%s\n"
 
-#: ../clients/cli/connections.c:8319
-#, c-format
-msgid "Error: 'type' argument is required."
-msgstr "錯誤:需要「type」引數。"
-
-#: ../clients/cli/connections.c:8324
+#: ../clients/cli/connections.c:10683
 #, fuzzy, c-format
 msgid "Error: 'file' argument is required."
 msgstr "錯誤:需要「ifname」引數。"
 
-#: ../clients/cli/connections.c:8331
-#, fuzzy, c-format
-msgid "Error: failed to find VPN plugin for %s."
-msgstr "錯誤:無法修改 %s.%s:%s。"
-
-#: ../clients/cli/connections.c:8339 ../clients/cli/connections.c:8450
+#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
 #, fuzzy, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "錯誤:無法修改 %s.%s:%s。"
 
-#: ../clients/cli/connections.c:8347
+#: ../clients/cli/connections.c:10699
 #, fuzzy, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "錯誤:無法修改 %s.%s:%s。"
 
-#: ../clients/cli/connections.c:8397
+#: ../clients/cli/connections.c:10745
 #, fuzzy
 msgid "Output file name: "
 msgstr "檔案名稱"
 
-#: ../clients/cli/connections.c:8421
+#: ../clients/cli/connections.c:10769
 #, fuzzy, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "錯誤:無效的額外引數「%s」。"
 
-#: ../clients/cli/connections.c:8441
+#: ../clients/cli/connections.c:10789
 #, fuzzy, c-format
 msgid "Error: the connection is not VPN."
 msgstr "錯誤:連線無效:%s\n"
 
-#: ../clients/cli/connections.c:8462
+#: ../clients/cli/connections.c:10810
 #, fuzzy, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "無法建立暫時性檔案:%s"
 
-#: ../clients/cli/connections.c:8471
+#: ../clients/cli/connections.c:10819
 #, fuzzy, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "錯誤:設置「%s」內容失敗:%s\n"
 
-#: ../clients/cli/connections.c:8482
+#: ../clients/cli/connections.c:10830
 #, fuzzy, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "錯誤:移除「%s」的值失敗:%s\n"
 
-#: ../clients/cli/connections.c:8628
+#: ../clients/cli/connections.c:10976
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr ""
 
-#: ../clients/cli/connections.c:8654
+#: ../clients/cli/connections.c:11002
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr ""
 
-#: ../clients/cli/connections.c:8740
+#: ../clients/cli/connections.c:11089
 #, fuzzy
 msgid "'--order' argument is missing"
 msgstr "錯誤:沒有 %s 參數。"
 
-#: ../clients/cli/connections.c:8816
+#: ../clients/cli/connections.c:11154
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
 msgstr "錯誤:「%s」不是個有效的「connection」指令。"
@@ -3376,7 +3737,7 @@ msgid "S390-SUBCHANNELS"
 msgstr ""
 
 #. 0
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:741
+#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
 msgid "WEP"
 msgstr "WEP"
 
@@ -3386,7 +3747,7 @@ msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:749
+#: ../clients/cli/devices.c:123 ../clients/cli/devices.c:739
 msgid "WPA2"
 msgstr "WPA2"
 
@@ -3402,7 +3763,7 @@ msgstr "CCMP"
 
 #. 5
 #. 2
-#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:238
+#: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228
 msgid "AP"
 msgstr "AP"
 
@@ -3446,6 +3807,11 @@ msgstr "TX-POW"
 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
 msgid "SSID-HEX"
@@ -3509,156 +3875,143 @@ msgstr "*"
 
 #. 0
 #. 5
-#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:241
+#: ../clients/cli/devices.c:177 ../clients/cli/devices.c:231
 msgid "NSP"
 msgstr "NSP"
 
 #. 0
-#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
+#: ../clients/cli/devices.c:192
 msgid "SLAVES"
 msgstr "SLAVES"
 
-#. 1
-#: ../clients/cli/devices.c:202
-msgid "CONFIG"
-msgstr ""
-
 #. 0
-#: ../clients/cli/devices.c:211
+#: ../clients/cli/devices.c:201
 msgid "PARENT"
 msgstr ""
 
 #. 1
-#: ../clients/cli/devices.c:212
+#: ../clients/cli/devices.c:202
 msgid "ID"
 msgstr "ID"
 
 #. 0
-#: ../clients/cli/devices.c:221 ../clients/cli/devices.c:236
+#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:226
 msgid "CAPABILITIES"
 msgstr "CAPABILITIES"
 
 #. 1
-#: ../clients/cli/devices.c:237
+#: ../clients/cli/devices.c:227
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-PROPERTIES"
 
 #. 3
-#: ../clients/cli/devices.c:239
+#: ../clients/cli/devices.c:229
 msgid "WIRED-PROPERTIES"
 msgstr "WIRED-PROPERTIES"
 
 #. 4
-#: ../clients/cli/devices.c:240
+#: ../clients/cli/devices.c:230
 msgid "WIMAX-PROPERTIES"
 msgstr "WIMAX-PROPERTIES"
 
 #. 10
-#: ../clients/cli/devices.c:246 ../clients/tui/nmt-page-bond.c:351
+#: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351
 msgid "BOND"
 msgstr "BOND"
 
 #. 11
-#: ../clients/cli/devices.c:247 ../clients/tui/nmt-page-team.c:145
+#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
 msgstr "團隊"
 
 #. 12
-#: ../clients/cli/devices.c:248 ../clients/tui/nmt-page-bridge.c:74
+#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-bridge.c:74
 msgid "BRIDGE"
 msgstr "BRIDGE"
 
-#. 13
-#: ../clients/cli/devices.c:249 ../clients/tui/nm-editor-utils.c:217
-#: ../clients/tui/nmt-page-vlan.c:94 ../libnm-core/nm-connection.c:1746
-#: ../libnm-glib/nm-device.c:1879 ../libnm-util/nm-connection.c:1632
-#: ../libnm/nm-device.c:1830
-msgid "VLAN"
-msgstr "VLAN"
-
 #. 14
-#: ../clients/cli/devices.c:250
+#: ../clients/cli/devices.c:240
 msgid "BLUETOOTH"
 msgstr ""
 
 #. 15
-#: ../clients/cli/devices.c:251
+#: ../clients/cli/devices.c:241
 msgid "CONNECTIONS"
 msgstr "CONNECTIONS"
 
 #. 1
-#: ../clients/cli/devices.c:263
+#: ../clients/cli/devices.c:253
 msgid "CHASSIS-ID"
 msgstr ""
 
 #. 2
-#: ../clients/cli/devices.c:264
+#: ../clients/cli/devices.c:254
 msgid "PORT-ID"
 msgstr ""
 
 #. 3
-#: ../clients/cli/devices.c:265
+#: ../clients/cli/devices.c:255
 msgid "PORT-DESCRIPTION"
 msgstr ""
 
 #. 4
-#: ../clients/cli/devices.c:266
+#: ../clients/cli/devices.c:256
 #, fuzzy
 msgid "SYSTEM-NAME"
 msgstr "USERNAME"
 
 #. 5
-#: ../clients/cli/devices.c:267
+#: ../clients/cli/devices.c:257
 msgid "SYSTEM-DESCRIPTION"
 msgstr ""
 
 #. 6
-#: ../clients/cli/devices.c:268
+#: ../clients/cli/devices.c:258
 #, fuzzy
 msgid "SYSTEM-CAPABILITIES"
 msgstr "CAPABILITIES"
 
 #. 7
-#: ../clients/cli/devices.c:269
+#: ../clients/cli/devices.c:259
 msgid "IEEE-802-1-PVID"
 msgstr ""
 
 #. 8
-#: ../clients/cli/devices.c:270
+#: ../clients/cli/devices.c:260
 msgid "IEEE-802-1-PPVID"
 msgstr ""
 
 #. 9
-#: ../clients/cli/devices.c:271
+#: ../clients/cli/devices.c:261
 msgid "IEEE-802-1-PPVID-FLAGS"
 msgstr ""
 
 #. 10
-#: ../clients/cli/devices.c:272
+#: ../clients/cli/devices.c:262
 msgid "IEEE-802-1-VID"
 msgstr ""
 
 #. 11
-#: ../clients/cli/devices.c:273
+#: ../clients/cli/devices.c:263
 msgid "IEEE-802-1-VLAN-NAME"
 msgstr ""
 
 #. 12
-#: ../clients/cli/devices.c:274
+#: ../clients/cli/devices.c:264
 msgid "DESTINATION"
 msgstr ""
 
 #. 13
-#: ../clients/cli/devices.c:275
+#: ../clients/cli/devices.c:265
 msgid "CHASSIS-ID-TYPE"
 msgstr ""
 
 #. 14
-#: ../clients/cli/devices.c:276
+#: ../clients/cli/devices.c:266
 msgid "PORT-ID-TYPE"
 msgstr ""
 
-#: ../clients/cli/devices.c:293
+#: ../clients/cli/devices.c:283
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
@@ -3674,7 +4027,7 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  reapply <ifname>\n"
+"  reapply <ifname> ...\n"
 "\n"
 "  disconnect <ifname> ...\n"
 "\n"
@@ -3722,7 +4075,7 @@ msgstr ""
 "  wimax [list [ifname <ifname>] [nsp <name>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:315
+#: ../clients/cli/devices.c:305
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -3733,10 +4086,8 @@ 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"
@@ -3747,13 +4098,11 @@ 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:330
+#: ../clients/cli/devices.c:320
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -3772,7 +4121,7 @@ msgstr ""
 "The command lists details for all devices, or for a given device.\n"
 "\n"
 
-#: ../clients/cli/devices.c:341
+#: ../clients/cli/devices.c:331
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -3780,8 +4129,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 ""
@@ -3790,17 +4139,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:353
+#: ../clients/cli/devices.c:343
 #, 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"
@@ -3815,7 +4164,7 @@ msgstr ""
 "further connections without user/manual intervention.\n"
 "\n"
 
-#: ../clients/cli/devices.c:364
+#: ../clients/cli/devices.c:354
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -3836,7 +4185,7 @@ msgstr ""
 "further connections without user/manual intervention.\n"
 "\n"
 
-#: ../clients/cli/devices.c:376
+#: ../clients/cli/devices.c:366
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -3857,7 +4206,7 @@ msgstr ""
 "The command lists details for all devices, or for a given device.\n"
 "\n"
 
-#: ../clients/cli/devices.c:389
+#: ../clients/cli/devices.c:379
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -3871,7 +4220,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:402
+#: ../clients/cli/devices.c:392
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -3891,7 +4240,7 @@ msgstr ""
 "The command lists details for all devices, or for a given device.\n"
 "\n"
 
-#: ../clients/cli/devices.c:414
+#: ../clients/cli/devices.c:404
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
@@ -3903,8 +4252,8 @@ 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"
+"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"
@@ -3933,10 +4282,8 @@ 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"
@@ -3953,8 +4300,8 @@ msgstr ""
 "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"
+"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"
@@ -3968,23 +4315,20 @@ msgstr ""
 "\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"
+"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:461
+#: ../clients/cli/devices.c:451
 #, 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 ""
@@ -3998,508 +4342,503 @@ msgstr ""
 "list networks for a particular interface, or with a specific NSP.\n"
 "\n"
 
-#: ../clients/cli/devices.c:537 ../clients/cli/devices.c:1756
-#: ../clients/cli/devices.c:1765 ../clients/cli/devices.c:1956
-#: ../clients/cli/devices.c:2161 ../clients/cli/devices.c:2168
+#: ../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
 #, c-format
 msgid "Error: No interface specified."
 msgstr "錯誤:尚未指定介面卡。"
 
-#: ../clients/cli/devices.c:557
+#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:559
+#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
 #, fuzzy, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "錯誤:找不到「%s」裝置。"
 
-#: ../clients/cli/devices.c:560
+#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
 #, fuzzy, c-format
 msgid "Error: not all devices found."
 msgstr "錯誤:找不到 Wi-Fi 裝置。"
 
-#: ../clients/cli/devices.c:660 ../clients/cli/devices.c:811
+#: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801
 msgid "(none)"
 msgstr "(none)"
 
-#: ../clients/cli/devices.c:729
+#: ../clients/cli/devices.c:719
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:730
+#: ../clients/cli/devices.c:720
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:745
+#: ../clients/cli/devices.c:735
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:754
+#: ../clients/cli/devices.c:744
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:770
+#: ../clients/cli/devices.c:760
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../clients/cli/devices.c:771
+#: ../clients/cli/devices.c:761
 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:772
+#: ../clients/cli/devices.c:762
 msgid "N/A"
 msgstr "N/A"
 
-#: ../clients/cli/devices.c:996
+#: ../clients/cli/devices.c:916
 msgid "Device details"
 msgstr "裝置詳細資訊"
 
-#: ../clients/cli/devices.c:1008
+#: ../clients/cli/devices.c:928
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "錯誤:「device show」:%s"
 
-#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983
 msgid "(unknown)"
 msgstr "(不明)"
 
-#: ../clients/cli/devices.c:1104
+#: ../clients/cli/devices.c:1024
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "on"
 msgstr "開"
 
-#: ../clients/cli/devices.c:1195
+#: ../clients/cli/devices.c:1115
 msgid "off"
 msgstr "關"
 
-#: ../clients/cli/devices.c:1422
+#: ../clients/cli/devices.c:1342
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "錯誤:「device status」:%s"
 
 #. Add headers
-#: ../clients/cli/devices.c:1429
+#: ../clients/cli/devices.c:1349
 msgid "Status of devices"
 msgstr "裝置的狀態"
 
-#: ../clients/cli/devices.c:1460 ../clients/cli/devices.c:3570
+#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "錯誤:無效的額外引數「%s」。"
 
-#: ../clients/cli/devices.c:1477 ../clients/cli/devices.c:1787
-#: ../clients/cli/devices.c:2184 ../clients/cli/devices.c:2454
-#: ../clients/cli/devices.c:3609
+#: ../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
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "錯誤:找不到「%s」裝置。"
 
-#: ../clients/cli/devices.c:1555
+#: ../clients/cli/devices.c:1475
 #, fuzzy, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "成功:裝置「%s」已成功啟用。"
 
-#: ../clients/cli/devices.c:1561
+#: ../clients/cli/devices.c:1481
 #, fuzzy, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "錯誤:連線啟用失敗:(%d) %s。"
 
-#: ../clients/cli/devices.c:1597
+#: ../clients/cli/devices.c:1517
 #, fuzzy, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr "錯誤:無法設定主機名稱:(%d) %s"
 
-#: ../clients/cli/devices.c:1600
+#: ../clients/cli/devices.c:1520
 #, fuzzy, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr "錯誤:新增/啟用新連線失敗:(%d) %s"
 
-#: ../clients/cli/devices.c:1610
+#: ../clients/cli/devices.c:1530
 #, fuzzy, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
 msgstr "錯誤:無法設定主機名稱:(%d) %s"
 
-#: ../clients/cli/devices.c:1612
+#: ../clients/cli/devices.c:1532
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr "錯誤:新增/啟用新連線失敗:不明的錯誤"
 
-#: ../clients/cli/devices.c:1624
+#: ../clients/cli/devices.c:1544
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
 msgstr "UUID 爲「%s」的連線已建立並啟用於「%s」裝置上\n"
 
-#: ../clients/cli/devices.c:1627
+#: ../clients/cli/devices.c:1547
 #, fuzzy, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
 msgstr "UUID 爲「%s」的連線已建立並啟用於「%s」裝置上\n"
 
-#: ../clients/cli/devices.c:1691
+#: ../clients/cli/devices.c:1611
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "錯誤:裝置啟用失敗:%s"
 
-#: ../clients/cli/devices.c:1700
+#: ../clients/cli/devices.c:1620
 #, fuzzy, c-format
 msgid "Error: Device activation failed: device was disconnected"
 msgstr "錯誤:裝置啟用失敗:%s"
 
-#: ../clients/cli/devices.c:1715
+#: ../clients/cli/devices.c:1635
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "裝置「%s」已連上。\n"
 
-#: ../clients/cli/devices.c:1771
+#: ../clients/cli/devices.c:1691
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "錯誤:不允許額外的引數:「%s」。"
 
-#: ../clients/cli/devices.c:1856 ../clients/cli/devices.c:1871
-#: ../clients/cli/devices.c:2022
+#: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
+#: ../clients/cli/devices.c:1964
 #, fuzzy, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "成功:裝置「%s」已經成功地斷線。"
 
-#: ../clients/cli/devices.c:1859
+#: ../clients/cli/devices.c:1779
 #, fuzzy, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "成功:裝置「%s」已成功啟用。"
 
-#: ../clients/cli/devices.c:1918
+#: ../clients/cli/devices.c:1838
+#, fuzzy, c-format
+msgid "Error: not all connections reapplied."
+msgstr "錯誤:尚未指定連線。"
+
+#: ../clients/cli/devices.c:1839
 #, fuzzy, c-format
-msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
 msgstr "錯誤:裝置「%s」(%s)斷線失敗:%s"
 
-#: ../clients/cli/devices.c:1928
+#: ../clients/cli/devices.c:1849
 #, fuzzy, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "連線已成功啟用(D-Bus 啟用路徑:%s)\n"
 
-#: ../clients/cli/devices.c:1965
-#, fuzzy, c-format
-msgid "Error: unsupported argument '%s'."
-msgstr "錯誤:非預期的引數「%s」"
-
-#: ../clients/cli/devices.c:1979
+#: ../clients/cli/devices.c:1912
 #, fuzzy, c-format
-msgid "Error: device '%s' not found."
-msgstr "錯誤:找不到「%s」裝置。"
+msgid "Error: no valid device provided."
+msgstr "錯誤:找不到 Wi-Fi 裝置。"
 
-#: ../clients/cli/devices.c:2007
+#: ../clients/cli/devices.c:1949
 #, fuzzy, c-format
 msgid "Error: not all devices disconnected."
 msgstr "錯誤:找不到 Wi-Fi 裝置。"
 
-#: ../clients/cli/devices.c:2008
+#: ../clients/cli/devices.c:1950
 #, fuzzy, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "錯誤:裝置「%s」(%s)斷線失敗:%s"
 
-#: ../clients/cli/devices.c:2083
+#: ../clients/cli/devices.c:2025
 #, fuzzy, c-format
 msgid "Error: not all devices deleted."
 msgstr "錯誤:找不到 Wi-Fi 裝置。"
 
-#: ../clients/cli/devices.c:2084
+#: ../clients/cli/devices.c:2026
 #, fuzzy, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "錯誤:裝置「%s」(%s)斷線失敗:%s"
 
-#: ../clients/cli/devices.c:2190
+#: ../clients/cli/devices.c:2132
 #, fuzzy, c-format
 msgid "Error: No property specified."
 msgstr "錯誤:尚未指定連線。"
 
-#: ../clients/cli/devices.c:2202 ../clients/cli/devices.c:2217
+#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "錯誤:找不到「%s」參數。"
 
-#: ../clients/cli/devices.c:2207
+#: ../clients/cli/devices.c:2149
 #, fuzzy, c-format
 msgid "Error: 'managed': %s."
 msgstr "錯誤:「mode」:%s。"
 
-#: ../clients/cli/devices.c:2222
-#, c-format
-msgid "Error: 'autoconnect': %s."
-msgstr "錯誤:「autoconnect」:%s。"
-
-#: ../clients/cli/devices.c:2232
+#: ../clients/cli/devices.c:2174
 #, fuzzy, c-format
 msgid "Error: property '%s' is not known."
 msgstr "錯誤:無效的內容「%s」:%s。"
 
-#: ../clients/cli/devices.c:2278
+#: ../clients/cli/devices.c:2220
 #, fuzzy, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "沒有此連線「%s」"
 
-#: ../clients/cli/devices.c:2304
+#: ../clients/cli/devices.c:2246
 #, c-format
 msgid "%s: device created\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:2311
+#: ../clients/cli/devices.c:2253
 #, fuzzy, c-format
 msgid "%s: device removed\n"
 msgstr "裝置已移除"
 
-#: ../clients/cli/devices.c:2397
+#: ../clients/cli/devices.c:2339
 msgid "Wi-Fi scan list"
 msgstr "Wi-Fi 掃描清單"
 
-#: ../clients/cli/devices.c:2435
+#: ../clients/cli/devices.c:2377
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "錯誤:「device wifi」:%s"
 
-#: ../clients/cli/devices.c:2477 ../clients/cli/devices.c:2561
+#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "錯誤:找不到 bssid 爲「%s」的存取點。"
 
-#: ../clients/cli/devices.c:2504
+#: ../clients/cli/devices.c:2446
 #, 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:2508 ../clients/cli/devices.c:2841
-#: ../clients/cli/devices.c:3261 ../clients/cli/devices.c:3410
+#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
+#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "錯誤:裝置「%s」不是個 Wi-Fi 裝置。"
 
-#: ../clients/cli/devices.c:2721
+#: ../clients/cli/devices.c:2660
 msgid "SSID or BSSID: "
 msgstr "SSID 或 BSSID:"
 
-#: ../clients/cli/devices.c:2726
+#: ../clients/cli/devices.c:2665
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "錯誤:SSID 或 BSSID 遺失。"
 
-#: ../clients/cli/devices.c:2750
+#: ../clients/cli/devices.c:2689
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "錯誤:bssid 引數值「%s」不是個有效的 BSSID。"
 
-#: ../clients/cli/devices.c:2774
+#: ../clients/cli/devices.c:2713
 #, 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:2794 ../clients/cli/devices.c:2807
+#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
 #, c-format
 msgid "Error: %s: %s."
 msgstr "錯誤:%s:%s。"
 
-#: ../clients/cli/devices.c:2822
+#: ../clients/cli/devices.c:2761
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr "錯誤:欲連上的 BSSID(%s)與 bssid 引數(%s)不同。"
 
-#: ../clients/cli/devices.c:2828
+#: ../clients/cli/devices.c:2767
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "錯誤:參數「%s」既不是 SSID 也不是 BSSID。"
 
-#: ../clients/cli/devices.c:2843 ../clients/cli/devices.c:3263
-#: ../clients/cli/devices.c:3412
+#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
+#: ../clients/cli/devices.c:3351
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "錯誤:找不到 Wi-Fi 裝置。"
 
-#: ../clients/cli/devices.c:2863
+#: ../clients/cli/devices.c:2802
 #, fuzzy, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "錯誤:無法修改 %s.%s:%s。"
 
-#: ../clients/cli/devices.c:2888
+#: ../clients/cli/devices.c:2827
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "錯誤:找不到 SSID 爲「%s」的網路。"
 
-#: ../clients/cli/devices.c:2890
+#: ../clients/cli/devices.c:2829
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "錯誤:找不到 BSSID 爲「%s」的存取點。"
 
-#: ../clients/cli/devices.c:2932
+#: ../clients/cli/devices.c:2871
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:2946
+#: ../clients/cli/devices.c:2885
 msgid "Password: "
 msgstr "密碼:"
 
-#: ../clients/cli/devices.c:3095
+#: ../clients/cli/devices.c:3034
 #, fuzzy, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "「%s」不是個有效的 PSK"
 
-#: ../clients/cli/devices.c:3112
+#: ../clients/cli/devices.c:3051
 #, 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:3128
+#: ../clients/cli/devices.c:3067
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:3186
+#: ../clients/cli/devices.c:3125
 #, fuzzy, c-format
 msgid "Error: ssid is too long."
 msgstr "錯誤:需要「ssid」。"
 
-#: ../clients/cli/devices.c:3198
+#: ../clients/cli/devices.c:3137
 #, 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:3222
+#: ../clients/cli/devices.c:3161
 #, fuzzy, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "不明的參數:%s\n"
 
-#: ../clients/cli/devices.c:3241
+#: ../clients/cli/devices.c:3180
 #, fuzzy, c-format
 msgid "Error: channel requires band too."
 msgstr "錯誤:需要「apn」。"
 
-#: ../clients/cli/devices.c:3247
+#: ../clients/cli/devices.c:3186
 #, fuzzy, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "錯誤:「channel」:「%s」無效;請使用 <1-13>。"
 
-#: ../clients/cli/devices.c:3275
+#: ../clients/cli/devices.c:3214
 #, fuzzy, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr "錯誤:裝置「%s」不是個 Wi-Fi 裝置。"
 
-#: ../clients/cli/devices.c:3310
+#: ../clients/cli/devices.c:3249
 #, fuzzy, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "錯誤:無效的內容「%s」:%s。"
 
-#: ../clients/cli/devices.c:3379
+#: ../clients/cli/devices.c:3318
 #, fuzzy, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "錯誤:「%s」設定不存在\n"
 
-#: ../clients/cli/devices.c:3460
+#: ../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:3486
+#: ../clients/cli/devices.c:3425
 msgid "Device LLDP neighbors"
 msgstr ""
 
-#: ../clients/cli/devices.c:3589
+#: ../clients/cli/devices.c:3528
 #, fuzzy, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "錯誤:「device status」:%s"
 
-#: ../clients/cli/devices.c:3636
+#: ../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:3825
+#: ../clients/cli/devices.c:3770
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "錯誤:「dev」指令「%s」不合乎規定。"
 
-#: ../clients/cli/general.c:35
+#: ../clients/cli/general.c:34
 msgid "RUNNING"
 msgstr "RUNNING"
 
 #. 0
-#: ../clients/cli/general.c:36
+#: ../clients/cli/general.c:35
 msgid "VERSION"
 msgstr "VERSION"
 
 #. 2
-#: ../clients/cli/general.c:38
+#: ../clients/cli/general.c:37
 msgid "STARTUP"
 msgstr "STARTUP"
 
 #. 3
-#: ../clients/cli/general.c:39
+#: ../clients/cli/general.c:38
 msgid "CONNECTIVITY"
 msgstr "CONNECTIVITY"
 
 #. 4
-#: ../clients/cli/general.c:40
+#: ../clients/cli/general.c:39
 msgid "NETWORKING"
 msgstr "NETWORKING"
 
 #. 5
-#: ../clients/cli/general.c:41
+#: ../clients/cli/general.c:40
 msgid "WIFI-HW"
 msgstr "WIFI-HW"
 
 #. 6
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:41
 msgid "WIFI"
 msgstr "WIFI-HARDWARE"
 
 #. 7
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:42
 msgid "WWAN-HW"
 msgstr "WWAN-HW"
 
 #. 8
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:43
 msgid "WWAN"
 msgstr "WWAN"
 
 #. 9
-#: ../clients/cli/general.c:45
+#: ../clients/cli/general.c:44
 msgid "WIMAX-HW"
 msgstr "WIMAX-HW"
 
 #. 10
-#: ../clients/cli/general.c:46
+#: ../clients/cli/general.c:45
 msgid "WIMAX"
 msgstr "WIMAX"
 
-#: ../clients/cli/general.c:62
+#: ../clients/cli/general.c:61
 msgid "PERMISSION"
 msgstr "PERMISSION"
 
 #. 0
-#: ../clients/cli/general.c:63
+#: ../clients/cli/general.c:62
 msgid "VALUE"
 msgstr "VALUE"
 
-#: ../clients/cli/general.c:71
+#: ../clients/cli/general.c:70
 msgid "LEVEL"
 msgstr "LEVEL"
 
 #. 0
-#: ../clients/cli/general.c:72
+#: ../clients/cli/general.c:71
 msgid "DOMAINS"
 msgstr "DOMAINS"
 
-#: ../clients/cli/general.c:86
+#: ../clients/cli/general.c:85
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -4528,7 +4867,7 @@ msgstr ""
 "  logging [level <log level>] [domains <log domains>]\n"
 "\n"
 
-#: ../clients/cli/general.c:97
+#: ../clients/cli/general.c:96
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -4545,7 +4884,7 @@ msgstr ""
 "status'\n"
 "\n"
 
-#: ../clients/cli/general.c:106
+#: ../clients/cli/general.c:105
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -4554,8 +4893,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"
@@ -4564,11 +4903,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:118
+#: ../clients/cli/general.c:117
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -4581,7 +4920,7 @@ msgstr ""
 "Show caller permissions for authenticated operations.\n"
 "\n"
 
-#: ../clients/cli/general.c:126
+#: ../clients/cli/general.c:125
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -4608,7 +4947,7 @@ msgstr ""
 "for the list of possible logging domains.\n"
 "\n"
 
-#: ../clients/cli/general.c:139
+#: ../clients/cli/general.c:138
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -4633,33 +4972,29 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:149
+#: ../clients/cli/general.c:148
 #, 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:157
+#: ../clients/cli/general.c:156
 #, 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:165
+#: ../clients/cli/general.c:164
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -4667,8 +5002,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"
@@ -4676,11 +5011,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:177
+#: ../clients/cli/general.c:176
 #, fuzzy, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -4701,7 +5036,7 @@ msgstr ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:186
+#: ../clients/cli/general.c:185
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -4718,7 +5053,7 @@ msgstr ""
 "Get status of all radio switches, or turn them on/off.\n"
 "\n"
 
-#: ../clients/cli/general.c:196
+#: ../clients/cli/general.c:195
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -4735,7 +5070,7 @@ msgstr ""
 "Get status of Wi-Fi radio switch, or turn it on/off.\n"
 "\n"
 
-#: ../clients/cli/general.c:206
+#: ../clients/cli/general.c:205
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -4752,7 +5087,7 @@ msgstr ""
 "Get status of mobile broadband radio switch, or turn it on/off.\n"
 "\n"
 
-#: ../clients/cli/general.c:216
+#: ../clients/cli/general.c:215
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -4762,196 +5097,196 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../clients/cli/general.c:234
+#: ../clients/cli/general.c:233
 msgid "asleep"
 msgstr "睡眠中"
 
-#: ../clients/cli/general.c:236
+#: ../clients/cli/general.c:235
 msgid "connecting"
 msgstr "連線中"
 
-#: ../clients/cli/general.c:238
+#: ../clients/cli/general.c:237
 msgid "connected (local only)"
 msgstr "已連上(只有本機)"
 
-#: ../clients/cli/general.c:240
+#: ../clients/cli/general.c:239
 msgid "connected (site only)"
 msgstr "已連上(只有網站)"
 
-#: ../clients/cli/general.c:244
+#: ../clients/cli/general.c:243
 msgid "disconnecting"
 msgstr "正在切斷連線"
 
-#: ../clients/cli/general.c:280
+#: ../clients/cli/general.c:279
 msgid "portal"
 msgstr "入口網站"
 
-#: ../clients/cli/general.c:282
+#: ../clients/cli/general.c:281
 msgid "limited"
 msgstr "受限"
 
-#: ../clients/cli/general.c:284
+#: ../clients/cli/general.c:283
 msgid "full"
 msgstr "已滿"
 
-#: ../clients/cli/general.c:335
+#: ../clients/cli/general.c:334
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "錯誤:只允許這些欄位:%s"
 
-#: ../clients/cli/general.c:358
+#: ../clients/cli/general.c:360
 msgid "NetworkManager status"
 msgstr "NetworkManager 狀態"
 
-#: ../clients/cli/general.c:363
+#: ../clients/cli/general.c:365
 msgid "running"
 msgstr "執行中"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "starting"
 msgstr "正在開始"
 
-#: ../clients/cli/general.c:366
+#: ../clients/cli/general.c:368
 msgid "started"
 msgstr "已開始"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "enabled"
 msgstr "已啟用"
 
-#: ../clients/cli/general.c:368 ../clients/cli/general.c:369
 #: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
+#: ../clients/cli/general.c:374
 msgid "disabled"
 msgstr "已停用"
 
-#: ../clients/cli/general.c:435
+#: ../clients/cli/general.c:446
 msgid "auth"
 msgstr "auth"
 
-#: ../clients/cli/general.c:464
+#: ../clients/cli/general.c:475
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "錯誤:「general permissions」:%s"
 
-#: ../clients/cli/general.c:478
+#: ../clients/cli/general.c:489
 msgid "NetworkManager permissions"
 msgstr "NetworkManager 權限"
 
-#: ../clients/cli/general.c:519
+#: ../clients/cli/general.c:530
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "錯誤:「general logging」:%s"
 
-#: ../clients/cli/general.c:534
+#: ../clients/cli/general.c:545
 msgid "NetworkManager logging"
 msgstr "NetworkManager 日誌"
 
-#: ../clients/cli/general.c:556
+#: ../clients/cli/general.c:567
 #, fuzzy, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "錯誤:無法設定主機名稱:(%d) %s"
 
-#: ../clients/cli/general.c:669
+#: ../clients/cli/general.c:680
 #, fuzzy, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "錯誤:設置日誌的存取被拒絕;%s"
 
-#: ../clients/cli/general.c:678
+#: ../clients/cli/general.c:689
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
 msgstr "錯誤:「general」指令「%s」無效。"
 
-#: ../clients/cli/general.c:696
+#: ../clients/cli/general.c:707
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr "錯誤:「--fields」值「%s」在此無效(允許的欄位:%s)"
 
-#: ../clients/cli/general.c:721
+#: ../clients/cli/general.c:732
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "錯誤:無效的「%s」引數:「%s」(請使用 on/off)。"
 
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:743
 msgid "Connectivity"
 msgstr "連線性"
 
-#: ../clients/cli/general.c:747
+#: ../clients/cli/general.c:758
 msgid "Networking"
 msgstr "網路作業"
 
-#: ../clients/cli/general.c:772
+#: ../clients/cli/general.c:783
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
 msgstr "錯誤:「network connectivity」指令「%s」無效。"
 
-#: ../clients/cli/general.c:788
+#: ../clients/cli/general.c:799
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "錯誤:「networking」指令「%s」無效。"
 
-#: ../clients/cli/general.c:817 ../clients/cli/general.c:837
+#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
 msgid "Radio switches"
 msgstr "Radio 開關"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:855
+#: ../clients/cli/general.c:866
 msgid "Wi-Fi radio switch"
 msgstr "Wi-fi radio 開關"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:871
+#: ../clients/cli/general.c:882
 msgid "WWAN radio switch"
 msgstr "WWAN radio 開關"
 
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:893
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
 msgstr "錯誤:「radio」指令「%s」無效。"
 
-#: ../clients/cli/general.c:902
+#: ../clients/cli/general.c:914
 #, fuzzy
 msgid "NetworkManager has started"
 msgstr "NetworkManager 狀態"
 
-#: ../clients/cli/general.c:902
+#: ../clients/cli/general.c:917
 #, fuzzy
 msgid "NetworkManager has stopped"
 msgstr "NetworkManager 狀態"
 
-#: ../clients/cli/general.c:913
+#: ../clients/cli/general.c:931
 #, fuzzy, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "將主機名稱設定為「%s」"
 
-#: ../clients/cli/general.c:928
+#: ../clients/cli/general.c:946
 #, fuzzy, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "設定「%s」不存在連線中。\n"
 
-#: ../clients/cli/general.c:930
+#: ../clients/cli/general.c:948
 #, fuzzy, c-format
 msgid "There's no primary connection\n"
 msgstr "驗證連線:%s\n"
 
-#: ../clients/cli/general.c:942
+#: ../clients/cli/general.c:960
 #, fuzzy, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "連線性"
 
-#: ../clients/cli/general.c:955
+#: ../clients/cli/general.c:973
 #, fuzzy, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "NetworkManager 並不在執行中。"
 
-#: ../clients/cli/general.c:966
+#: ../clients/cli/general.c:984
 #, fuzzy, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "錯誤:「radio」指令「%s」無效。"
 
-#: ../clients/cli/general.c:980
+#: ../clients/cli/general.c:998
 #, fuzzy
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "NetworkManager 並不在執行中。"
@@ -4965,11 +5300,12 @@ msgid ""
 "  -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 "
@@ -4996,6 +5332,8 @@ msgstr ""
 "  -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"
@@ -5010,88 +5348,86 @@ msgstr ""
 "  d[evice]        devices managed by NetworkManager\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:142
+#: ../clients/cli/nmcli.c:143
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "錯誤:物件 '%s' 不明,請嘗試 'nmcli help'。"
 
-#: ../clients/cli/nmcli.c:183
+#: ../clients/cli/nmcli.c:173
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "錯誤:選項 '--terse' 已指定了第二次。"
 
-#: ../clients/cli/nmcli.c:188
+#: ../clients/cli/nmcli.c:178
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "錯誤:選項 '--terse' 和 '--pretty' 是互斥的。"
 
-#: ../clients/cli/nmcli.c:196
+#: ../clients/cli/nmcli.c:186
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "錯誤:選項 '--pretty' 已指定了第二次。"
 
-#: ../clients/cli/nmcli.c:201
+#: ../clients/cli/nmcli.c:191
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "錯誤:選項 '--pretty' 和 '--terse' 是互斥的。"
 
-#: ../clients/cli/nmcli.c:211 ../clients/cli/nmcli.c:227
-#: ../clients/cli/nmcli.c:245 ../clients/cli/nmcli.c:276
+#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
+#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "錯誤:'%s' 選項的引數遺失。"
 
-#: ../clients/cli/nmcli.c:220 ../clients/cli/nmcli.c:238
-#: ../clients/cli/nmcli.c:254
+#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
+#: ../clients/cli/nmcli.c:244
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "錯誤:'%s' 不是 '%s' 選項的有效引數。"
 
-#: ../clients/cli/nmcli.c:261
+#: ../clients/cli/nmcli.c:251
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "錯誤:找不到 '%s' 選項的欄位。"
 
-#: ../clients/cli/nmcli.c:281
+#: ../clients/cli/nmcli.c:271
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "錯誤:「%s」不是「%s」選項的有效逾時值。"
 
-#: ../clients/cli/nmcli.c:288
+#: ../clients/cli/nmcli.c:278
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli 工具,版本 %s\n"
 
-#: ../clients/cli/nmcli.c:294
+#: ../clients/cli/nmcli.c:284
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "錯誤:選項 '%s' 不明,請嚐試 'nmcli -help'。"
 
-#: ../clients/cli/nmcli.c:377 ../clients/cli/nmcli.c:387
+#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
 #, fuzzy, c-format
-msgid ""
-"\n"
+msgid "\n"
 "Error: nmcli terminated by signal %s (%d)\n"
-msgstr ""
-"\n"
+msgstr "\n"
 "錯誤:nmcli 已被訊號 %d 終止。"
 
-#: ../clients/cli/nmcli.c:418
+#: ../clients/cli/nmcli.c:408
 #, fuzzy, c-format
 msgid "Failed to set signal mask: %d\n"
 msgstr "無法設置訊號遮罩:%d"
 
-#: ../clients/cli/nmcli.c:425
+#: ../clients/cli/nmcli.c:415
 #, fuzzy, c-format
 msgid "Failed to create signal handling thread: %d\n"
 msgstr "無法建立訊號處理執行續:%d"
 
-#: ../clients/cli/nmcli.c:522 ../clients/nm-online.c:193
+#: ../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:539
+#: ../clients/cli/nmcli.c:529
 msgid "Success"
 msgstr "成功"
 
@@ -5110,258 +5446,251 @@ msgstr "身份認證"
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "數據機初始化失敗"
 
-#: ../clients/cli/settings.c:796
+#: ../clients/cli/settings.c:790
 #, fuzzy, c-format
 msgid "%d (key)"
 msgstr "%d(十六進位的 ascii-key)"
 
-#: ../clients/cli/settings.c:798
+#: ../clients/cli/settings.c:792
 #, fuzzy, c-format
 msgid "%d (passphrase)"
 msgstr "%d(104/128 位元密碼)"
 
-#: ../clients/cli/settings.c:801 ../clients/cli/settings.c:887
+#: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d(不明)"
 
-#: ../clients/cli/settings.c:830
+#: ../clients/cli/settings.c:824
 msgid "0 (NONE)"
 msgstr "0 (NONE)"
 
-#: ../clients/cli/settings.c:836
+#: ../clients/cli/settings.c:830
 msgid "REORDER_HEADERS, "
 msgstr "REORDER_HEADERS, "
 
-#: ../clients/cli/settings.c:838
+#: ../clients/cli/settings.c:832
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../clients/cli/settings.c:840
+#: ../clients/cli/settings.c:834
 msgid "LOOSE_BINDING, "
 msgstr "LOOSE_BINDING, "
 
-#: ../clients/cli/settings.c:842
+#: ../clients/cli/settings.c:836
 #, fuzzy
 msgid "MVRP, "
 msgstr "GVRP, "
 
-#: ../clients/cli/settings.c:881
+#: ../clients/cli/settings.c:875
 #, c-format
 msgid "%d (disabled)"
 msgstr "%d (已停用)"
 
-#: ../clients/cli/settings.c:883
+#: ../clients/cli/settings.c:877
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr "%d (已啟用,建議使用公用 IP)"
 
-#: ../clients/cli/settings.c:885
+#: ../clients/cli/settings.c:879
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (已啟用,建議使用暫時性 IP)"
 
-#: ../clients/cli/settings.c:900
+#: ../clients/cli/settings.c:894
 #, fuzzy, c-format
 msgid "%d (no)"
 msgstr "%d(不明)"
 
-#: ../clients/cli/settings.c:902
+#: ../clients/cli/settings.c:896
 #, c-format
 msgid "%d (yes)"
 msgstr ""
 
-#: ../clients/cli/settings.c:905 ../clients/cli/settings.c:1605
+#: ../clients/cli/settings.c:899 ../clients/cli/settings.c:1554
 #, fuzzy, c-format
 msgid "%d (default)"
 msgstr "(預設)"
 
-#: ../clients/cli/settings.c:918
+#: ../clients/cli/settings.c:912
 msgid "0 (none)"
 msgstr "0 (none)"
 
-#: ../clients/cli/settings.c:924
+#: ../clients/cli/settings.c:918
 msgid "agent-owned, "
 msgstr "agent-owned, "
 
-#: ../clients/cli/settings.c:926
+#: ../clients/cli/settings.c:920
 msgid "not saved, "
 msgstr "not saved, "
 
-#: ../clients/cli/settings.c:928
+#: ../clients/cli/settings.c:922
 msgid "not required, "
 msgstr "not required, "
 
-#: ../clients/cli/settings.c:977 ../clients/tui/nmt-mtu-entry.c:84
+#: ../clients/cli/settings.c:971 ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(預設)"
 
-#. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:1063 ../clients/cli/settings.c:1106
-#: ../clients/cli/settings.c:1140 ../clients/cli/settings.c:1167
-#: ../clients/cli/settings.c:8033
-msgid "<hidden>"
-msgstr ""
-
-#: ../clients/cli/settings.c:1302
+#: ../clients/cli/settings.c:1252
 msgid "0 (disabled)"
 msgstr "0(已停用)"
 
-#: ../clients/cli/settings.c:1308
+#: ../clients/cli/settings.c:1258
 msgid "enabled, "
 msgstr "enabled, "
 
-#: ../clients/cli/settings.c:1310
+#: ../clients/cli/settings.c:1260
 msgid "advertise, "
 msgstr "advertise, "
 
-#: ../clients/cli/settings.c:1312
+#: ../clients/cli/settings.c:1262
 msgid "willing, "
 msgstr "willing, "
 
-#: ../clients/cli/settings.c:1340
+#: ../clients/cli/settings.c:1290
 msgid "-1 (unset)"
 msgstr "-1(反設定)"
 
-#: ../clients/cli/settings.c:1472 ../clients/cli/settings.c:1777
-#: ../clients/cli/settings.c:1917
+#: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724
+#: ../clients/cli/settings.c:1864
 msgid "auto"
 msgstr "auto"
 
-#: ../clients/cli/settings.c:1485 ../clients/cli/settings.c:1948
+#: ../clients/cli/settings.c:1435 ../clients/cli/settings.c:1895
 msgid "default"
 msgstr "default"
 
-#: ../clients/cli/settings.c:1607
+#: ../clients/cli/settings.c:1556
 #, fuzzy, c-format
 msgid "%d (off)"
 msgstr "%d(不明)"
 
-#: ../clients/cli/settings.c:1823
+#: ../clients/cli/settings.c:1770
 #, c-format
 msgid ""
 "invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
 "'none'"
 msgstr ""
 
-#: ../clients/cli/settings.c:1834
+#: ../clients/cli/settings.c:1781
 msgid "'default' and 'ignore' are incompatible with other flags"
 msgstr ""
 
-#: ../clients/cli/settings.c:1870
+#: ../clients/cli/settings.c:1817
 #, fuzzy, c-format
 msgid "invalid mode '%s', use one of %s"
 msgstr "無效的欄位「%s」; 允許的欄位:%s"
 
-#: ../clients/cli/settings.c:1952
+#: ../clients/cli/settings.c:1899
 #, c-format
 msgid "always"
 msgstr ""
 
-#: ../clients/cli/settings.c:2052 ../clients/cli/settings.c:3398
-#: ../clients/cli/settings.c:4590 ../clients/cli/settings.c:5093
+#: ../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
 #, fuzzy, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "不合於規定的選項 '%s' 或其值為 '%s'"
 
-#: ../clients/cli/settings.c:2162
+#: ../clients/cli/settings.c:2116
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "您是否也希望將「%s」設為「%s」?[yes]:"
 
-#: ../clients/cli/settings.c:2164
+#: ../clients/cli/settings.c:2118
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "您是否也希望清除「%s」?[yes]:"
 
-#: ../clients/cli/settings.c:2325
+#: ../clients/cli/settings.c:2279
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:2344
+#: ../clients/cli/settings.c:2298
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:2346
+#: ../clients/cli/settings.c:2300
 #, fuzzy
 msgid "Do you want to remove them? [yes] "
 msgstr "您是否希望提供它們?(yes/no)[yes]"
 
-#: ../clients/cli/settings.c:2482 ../clients/cli/settings.c:2877
-#: ../clients/cli/settings.c:5294
+#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
+#: ../clients/cli/settings.c:5182
 #, c-format
 msgid "'%s' is not valid"
 msgstr "「%s」無效"
 
-#: ../clients/cli/settings.c:2505
+#: ../clients/cli/settings.c:2419
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
 msgstr "「%d」無效;請使用 <%d-%d>"
 
-#: ../clients/cli/settings.c:2527
+#: ../clients/cli/settings.c:2441
 #, fuzzy, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
 msgstr "「%d」無效;請使用 <%d-%d>"
 
-#: ../clients/cli/settings.c:2549
+#: ../clients/cli/settings.c:2463
 #, fuzzy, c-format
 msgid "'%u' is not valid; use <%u-%u>"
 msgstr "「%u」無效;請使用 <%d-%d>"
 
-#: ../clients/cli/settings.c:2588
+#: ../clients/cli/settings.c:2502
 #, fuzzy, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "「%s」無效;請使用「%s」或是「%s」"
 
-#: ../clients/cli/settings.c:2655
+#: ../clients/cli/settings.c:2569
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "「%s」無效;請使用 <option>=<value>"
 
-#: ../clients/cli/settings.c:2689
+#: ../clients/cli/settings.c:2603
 #, c-format
 msgid "index '%s' is not valid"
 msgstr "索引「%s」無效"
 
-#: ../clients/cli/settings.c:2694 ../clients/cli/settings.c:2719
+#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
 msgid "no item to remove"
 msgstr "沒有可移除的項目"
 
-#: ../clients/cli/settings.c:2698 ../clients/cli/settings.c:2723
+#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "索引「%d」不在範圍內 <0-%d>"
 
-#: ../clients/cli/settings.c:2738
+#: ../clients/cli/settings.c:2652
 #, c-format
 msgid "invalid option '%s'"
 msgstr "無效的選項「%s」"
 
-#: ../clients/cli/settings.c:2740
+#: ../clients/cli/settings.c:2654
 msgid "missing option"
 msgstr "遺失選項"
 
-#: ../clients/cli/settings.c:2767 ../clients/cli/settings.c:2787
-#: ../clients/cli/settings.c:2807 ../clients/cli/settings.c:2827
+#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
+#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "「%s」不是個有效的數字(或是不在範圍內)"
 
-#: ../clients/cli/settings.c:2861
+#: ../clients/cli/settings.c:2775
 #, fuzzy, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
 msgstr "「%s」無效;請使用 0、1 或 2"
 
-#: ../clients/cli/settings.c:2893
+#: ../clients/cli/settings.c:2807
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "「%s」不是個有效的乙太網路 MAC"
 
-#: ../clients/cli/settings.c:2918 ../libnm-core/nm-setting-connection.c:864
+#: ../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
@@ -5369,53 +5698,40 @@ msgstr "「%s」不是個有效的乙太網路 MAC"
 msgid "'%s' is not a valid interface name"
 msgstr "「%s」不是組有效的介面卡名稱"
 
-#: ../clients/cli/settings.c:2942
+#: ../clients/cli/settings.c:2856
 #, fuzzy, c-format
 msgid "'%s' is not a valid flag number; use <0-%d>"
 msgstr "「%s」不是個有效的頻道;請使用 <1-13>"
 
-#: ../clients/cli/settings.c:2954
+#: ../clients/cli/settings.c:2868
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:2995
+#: ../clients/cli/settings.c:2909
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "「%s」不是個有效的十六進位字元"
 
-#: ../clients/cli/settings.c:3025
+#: ../clients/cli/settings.c:2939
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "「%s」不是個有效的 MAC"
 
-#. 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:3053
-#, fuzzy, c-format
-msgid "Can not change the connection type"
-msgstr "輸入連線類型:"
-
-#: ../clients/cli/settings.c:3077 ../libnm-core/nm-setting-connection.c:853
+#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
 #: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "「%s」不是個有效的 UUID"
 
-#: ../clients/cli/settings.c:3144
+#: ../clients/cli/settings.c:3032
 #, c-format
 msgid "the property doesn't contain permission '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:3156
+#: ../clients/cli/settings.c:3044
 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"
@@ -5427,40 +5743,39 @@ msgstr ""
 "\n"
 "例如:alice bob charlie\n"
 
-#: ../clients/cli/settings.c:3175
+#: ../clients/cli/settings.c:3063
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr "「%s」不是個有效的 master;請使用 ifname 或是連線 UUID"
 
-#: ../clients/cli/settings.c:3219
+#: ../clients/cli/settings.c:3107
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3223 ../clients/cli/settings.c:3239
+#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
 #, fuzzy, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "錯誤:「%s」不是個有效的連線類型。"
 
-#: ../clients/cli/settings.c:3232
+#: ../clients/cli/settings.c:3120
 #, fuzzy, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "'%s' 不是合於規定的 team 配置或檔名"
 
-#: ../clients/cli/settings.c:3266
+#: ../clients/cli/settings.c:3154
 #, fuzzy, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "「%s」不是個有效的 UUID"
 
-#: ../clients/cli/settings.c:3273
+#: ../clients/cli/settings.c:3161
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:3285
+#: ../clients/cli/settings.c:3173
 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"
@@ -5470,7 +5785,7 @@ msgid ""
 "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3352
+#: ../clients/cli/settings.c:3240
 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"
@@ -5479,16 +5794,16 @@ msgid ""
 "'unknown' to let NetworkManager choose a value using some heuristics\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3476
+#: ../clients/cli/settings.c:3364
 msgid "private key password not provided"
 msgstr "未提供私密金鑰密碼"
 
-#: ../clients/cli/settings.c:3504
+#: ../clients/cli/settings.c:3392
 #, fuzzy, c-format
 msgid "the property doesn't contain EAP method '%s'"
 msgstr "內容不可更改"
 
-#: ../clients/cli/settings.c:3521
+#: ../clients/cli/settings.c:3409
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5496,12 +5811,12 @@ msgid ""
 "Example: /home/cimrman/cacert.crt\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3540
+#: ../clients/cli/settings.c:3428
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:3556
+#: ../clients/cli/settings.c:3444
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5509,7 +5824,7 @@ msgid ""
 "Example: /home/cimrman/jara.crt\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3568
+#: ../clients/cli/settings.c:3456
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5519,12 +5834,12 @@ msgid ""
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3588
+#: ../clients/cli/settings.c:3476
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:3604
+#: ../clients/cli/settings.c:3492
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5534,7 +5849,7 @@ msgid ""
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:3624
+#: ../clients/cli/settings.c:3512
 #, fuzzy
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
@@ -5546,12 +5861,11 @@ msgstr ""
 "  <file path> [<password>]\n"
 "範例:/home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/cli/settings.c:3695
+#: ../clients/cli/settings.c:3583
 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"
@@ -5561,13 +5875,12 @@ 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:3816
+#: ../clients/cli/settings.c:3704
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -5598,57 +5911,56 @@ msgstr ""
 "\n"
 "範例:mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:3847
+#: ../clients/cli/settings.c:3735
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "「%s」不是個有效的 InfiniBand MAC"
 
-#: ../clients/cli/settings.c:3884
+#: ../clients/cli/settings.c:3772
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "「%s」不是個有效的 IBoIP P_Key"
 
-#: ../clients/cli/settings.c:3915
+#: ../clients/cli/settings.c:3803
 #, 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:3963 ../clients/cli/settings.c:3982
+#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "無效的 IPv4 位址「%s」"
 
-#: ../clients/cli/settings.c:3988 ../clients/cli/settings.c:4296
+#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:4000
+#: ../clients/cli/settings.c:3888
 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:4036 ../clients/cli/settings.c:4350
+#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:4074 ../clients/cli/settings.c:4388
+#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:4128 ../clients/cli/settings.c:4441
+#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:4141
+#: ../clients/cli/settings.c:4029
 #, fuzzy
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
@@ -5663,17 +5975,17 @@ msgstr ""
 "\n"
 "範例:192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4157 ../clients/cli/settings.c:4470
+#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
 #, fuzzy, c-format
 msgid "invalid gateway address '%s'"
 msgstr "無效的閘道器「%s」"
 
-#: ../clients/cli/settings.c:4212 ../clients/cli/settings.c:4525
+#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
 #, fuzzy, c-format
 msgid "the property doesn't contain route '%s'"
 msgstr "內容不可更改"
 
-#: ../clients/cli/settings.c:4225
+#: ../clients/cli/settings.c:4113
 #, fuzzy
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
@@ -5693,12 +6005,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:4271 ../clients/cli/settings.c:4290
+#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "無效的 IPv6 位址「%s」"
 
-#: ../clients/cli/settings.c:4308
+#: ../clients/cli/settings.c:4196
 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 "
@@ -5709,14 +6021,13 @@ 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:4454
+#: ../clients/cli/settings.c:4342
 #, fuzzy
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
@@ -5729,10 +6040,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:4538
+#: ../clients/cli/settings.c:4426
 #, fuzzy
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
@@ -5754,28 +6065,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:4555 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4443 ../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:4562
+#: ../clients/cli/settings.c:4450
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "「%s」無效;請使用 0、1 或 2"
 
-#: ../clients/cli/settings.c:4609
+#: ../clients/cli/settings.c:4497
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "「%s」不是個有效的頻道;請使用 <1-13>"
 
-#: ../clients/cli/settings.c:4646
+#: ../clients/cli/settings.c:4534
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "「%s」無效;請使用 [e, o, n]"
 
-#: ../clients/cli/settings.c:4674
+#: ../clients/cli/settings.c:4562
 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 "
@@ -5785,217 +6096,223 @@ 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:4714
+#: ../clients/cli/settings.c:4602
 msgid "no priority to remove"
 msgstr "沒有可移除的優先順序"
 
-#: ../clients/cli/settings.c:4718
+#: ../clients/cli/settings.c:4606
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "索引「%d」不在 <0-%d> 的範圍內"
 
-#: ../clients/cli/settings.c:4757
+#: ../clients/cli/settings.c:4645
 #, 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:4764
+#: ../clients/cli/settings.c:4652
 #, fuzzy, c-format
 msgid "the property doesn't contain mapping '%s'"
 msgstr "內容不可更改"
 
-#: ../clients/cli/settings.c:4812
+#: ../clients/cli/settings.c:4700
 #, fuzzy, c-format
 msgid "'%s' cannot be empty"
 msgstr "未設定 '%s' 選項"
 
-#: ../clients/cli/settings.c:4886 ../clients/cli/settings.c:5053
-#: ../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: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
 #: ../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:4892 ../clients/cli/settings.c:5059
+#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:4911
+#: ../clients/cli/settings.c:4799
 #, fuzzy, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "「%s」無效;應提供三個字串"
 
-#: ../clients/cli/settings.c:4925
+#: ../clients/cli/settings.c:4813
 #, 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:4947
+#: ../clients/cli/settings.c:4835
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
 msgstr ""
 
-#: ../clients/cli/settings.c:4979
+#: ../clients/cli/settings.c:4867
 #, 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:5025
+#: ../clients/cli/settings.c:4913
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "「%s」不是個有效的頻道"
 
-#: ../clients/cli/settings.c:5031
+#: ../clients/cli/settings.c:4919
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "「%ld」不是個有效的頻道"
 
-#: ../clients/cli/settings.c:5125
+#: ../clients/cli/settings.c:5013
 #, fuzzy, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
 msgstr "不合於規定的選項 '%s' 或其值為 '%s'"
 
-#: ../clients/cli/settings.c:5186 ../clients/cli/settings.c:5225
-#: ../clients/cli/settings.c:5264
+#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
+#: ../clients/cli/settings.c:5152
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
 msgstr ""
 
-#: ../clients/cli/settings.c:5303
+#: ../clients/cli/settings.c:5191
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
 msgstr ""
 
-#: ../clients/cli/settings.c:5311
+#: ../clients/cli/settings.c:5199
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "預測 WEP key 為「%s」\n"
 
-#: ../clients/cli/settings.c:5313
+#: ../clients/cli/settings.c:5201
 #, fuzzy, c-format
 msgid "WEP key index set to '%d'\n"
 msgstr "預測 WEP key 為「%s」\n"
 
-#: ../clients/cli/settings.c:5336
+#: ../clients/cli/settings.c:5224
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
 msgstr "「%s」不在 [0 (unknown), 1 (key), 2 (passphrase)] 之間"
 
-#: ../clients/cli/settings.c:5352 ../clients/cli/settings.c:5355
-#: ../clients/cli/settings.c:5358 ../clients/cli/settings.c:5361
+#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
+#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
 "key.\n"
 msgstr ""
 
-#: ../clients/cli/settings.c:5374
+#: ../clients/cli/settings.c:5262
 #, 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:5387
+#: ../clients/cli/settings.c:5275
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "「%s」不是個有效的 PSK"
 
-#: ../clients/cli/settings.c:5431
+#: ../clients/cli/settings.c:5319
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "「%s」不是有效的 DCB 旗標"
 
-#: ../clients/cli/settings.c:5454
+#: ../clients/cli/settings.c:5342
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "「%s」不是有效的 DCP 應用程式優先順序"
 
-#: ../clients/cli/settings.c:5480
+#: ../clients/cli/settings.c:5368
 msgid "must contain 8 comma-separated numbers"
 msgstr "必須包含 8 個以逗號區隔開的數字"
 
-#: ../clients/cli/settings.c:5497
+#: ../clients/cli/settings.c:5385
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "「%s」不是組介於 0 和(包含)%u 之間的數字或是 %u"
 
-#: ../clients/cli/settings.c:5500
+#: ../clients/cli/settings.c:5388
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "「%s」不是組介於 0 和(包含)%u 之間的數字"
 
-#: ../clients/cli/settings.c:5522
+#: ../clients/cli/settings.c:5410
 #, 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:5575
+#: ../clients/cli/settings.c:5463
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "頻寬比率總額必須是 100%%"
 
-#: ../clients/cli/settings.c:5661 ../clients/cli/settings.c:5667
+#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
 msgstr ""
 
-#: ../clients/cli/settings.c:5710
+#: ../clients/cli/settings.c:5598
 #, fuzzy, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
 msgstr "不合於規定的選項 '%s' 或其值為 '%s'"
 
-#: ../clients/cli/settings.c:7777
+#: ../clients/cli/settings.c:7644
 msgid "don't know how to get the property value"
 msgstr "不知如何取得內容值"
 
-#: ../clients/cli/settings.c:7830 ../clients/cli/settings.c:7870
+#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
 msgid "the property can't be changed"
 msgstr "內容不可更改"
 
-#: ../clients/cli/settings.c:7954
+#: ../clients/cli/settings.c:7821
 #, fuzzy
 msgid "(not available)"
 msgstr "無法使用"
 
-#: ../clients/cli/settings.c:7979
+#: ../clients/cli/settings.c:7846
 msgid "[NM property description]"
 msgstr "[NM property description]"
 
-#: ../clients/cli/settings.c:7984
+#: ../clients/cli/settings.c:7851
 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
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
@@ -6006,57 +6323,91 @@ msgstr "錯誤:預期「%s」引數,但卻提供了「%s」。"
 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:492 ../clients/cli/utils.c:523
+#. 
+#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
 #, fuzzy, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "「%s」意義含糊不清(%s x %s)"
 
-#: ../clients/cli/utils.c:502
+#: ../clients/cli/utils.c:556
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "「%s」無效;請使用「%s」或是「%s」"
 
-#: ../clients/cli/utils.c:535
+#: ../clients/cli/utils.c:589
 #, fuzzy, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "「%s」無效;請使用「%s」或是「%s」"
 
-#: ../clients/cli/utils.c:634
+#: ../clients/cli/utils.c:688
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "「%s」意義含糊不清(%s x %s)"
 
-#: ../clients/cli/utils.c:646
+#: ../clients/cli/utils.c:700
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "名稱遺失,請嘗試 [%s] 其中之一"
 
-#: ../clients/cli/utils.c:893
+#: ../clients/cli/utils.c:964
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "欄位 '%s' 必須是單獨的"
 
-#: ../clients/cli/utils.c:896
+#: ../clients/cli/utils.c:967
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "無效的欄位「%s」; 允許的欄位:%s"
 
-#: ../clients/cli/utils.c:953
+#: ../clients/cli/utils.c:1024
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "選項 '--terse' 需指定 '--fields'"
 
-#: ../clients/cli/utils.c:957
+#: ../clients/cli/utils.c:1028
 #, 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
@@ -6064,10 +6415,9 @@ msgstr ""
 #: ../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: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/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/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
 #: ../clients/tui/nmt-page-wifi.c:341
 msgid "Password"
@@ -6145,53 +6495,26 @@ msgstr "需要密碼才能連線至「%s」。"
 msgid "VPN password required"
 msgstr "需要 PIN 碼"
 
-#: ../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 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?"
+#: ../clients/common/nm-vpn-helpers.c:61
+msgid "could not get VPN plugin info"
 msgstr ""
 
-#: ../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
+#: ../clients/common/nm-vpn-helpers.c:103
+#: ../clients/common/nm-vpn-helpers.c:106
 #, fuzzy
 msgid "Group password"
 msgstr "顯示密碼"
 
-#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
 msgid "Gateway"
 msgstr "閘道器"
 
-#: ../clients/common/nm-vpn-helpers.c:131
+#: ../clients/common/nm-vpn-helpers.c:109
 msgid "Cookie"
 msgstr ""
 
-#: ../clients/common/nm-vpn-helpers.c:132
+#: ../clients/common/nm-vpn-helpers.c:110
 msgid "Gateway certificate hash"
 msgstr ""
 
@@ -6231,7 +6554,7 @@ msgstr "無效的選項。請使用 --help 來查看可用選項的清單。"
 #: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:415
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:136
+#: ../clients/tui/nmtui.c:114
 msgid "OK"
 msgstr "確定"
 
@@ -6261,38 +6584,23 @@ 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:1810
-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:1812
-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:1748
-#: ../libnm-glib/nm-device.c:1871 ../libnm/nm-device.c:1822
-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:1869
-#: ../libnm/nm-device.c:1820
+#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1859
+#: ../libnm/nm-device.c:1810
 msgid "Mobile Broadband"
 msgstr "行動寬頻"
 
@@ -6310,9 +6618,9 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "DSL 連線 %d"
 
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1740
-#: ../libnm-glib/nm-device.c:1873 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1824 ../src/settings/plugins/ifcfg-rh/reader.c:4195
+#: ../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
 msgid "Bond"
 msgstr "Bond"
 
@@ -6321,9 +6629,9 @@ msgstr "Bond"
 msgid "Bond connection %d"
 msgstr "Bond 連線 %d"
 
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1744
-#: ../libnm-glib/nm-device.c:1877 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1828 ../src/settings/plugins/ifcfg-rh/reader.c:4492
+#: ../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
 msgid "Bridge"
 msgstr "橋接"
 
@@ -6332,9 +6640,9 @@ msgstr "橋接"
 msgid "Bridge connection %d"
 msgstr "橋接連線 %d"
 
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1742
-#: ../libnm-glib/nm-device.c:1875 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1826 ../src/settings/plugins/ifcfg-rh/reader.c:4301
+#: ../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
 msgid "Team"
 msgstr "Team"
 
@@ -6579,6 +6887,10 @@ 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 "已停用"
@@ -6668,26 +6980,24 @@ msgid "Allowed authentication methods:"
 msgstr "身份認證"
 
 #: ../clients/tui/nmt-page-ppp.c:147
-#, fuzzy
 msgid "EAP"
-msgstr "LEAP"
+msgstr "EAP"
 
 #: ../clients/tui/nmt-page-ppp.c:155
-#, fuzzy
 msgid "PAP"
-msgstr "AP"
+msgstr "PAP"
 
 #: ../clients/tui/nmt-page-ppp.c:163
 msgid "CHAP"
-msgstr ""
+msgstr "CHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:171
 msgid "MSCHAPv2"
-msgstr ""
+msgstr "MSCHAPv2"
 
 #: ../clients/tui/nmt-page-ppp.c:179
 msgid "MSCHAP"
-msgstr ""
+msgstr "MSCHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:195
 msgid "Use point-to-point encryption (MPPE)"
@@ -6933,14 +7243,10 @@ msgid "Deactivate"
 msgstr "取消啟動"
 
 #: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:130
+#: ../clients/tui/nmtui.c:108
 msgid "Quit"
 msgstr "離開"
 
-#: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-msgid "Back"
-msgstr ""
-
 #: ../clients/tui/nmtui-connect.c:436
 #, c-format
 msgid "No such connection '%s'"
@@ -6962,9 +7268,7 @@ msgstr "選擇您想要建立的連線類型。"
 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
 msgid "New Connection"
@@ -7024,28 +7328,28 @@ msgstr "新主機名稱"
 msgid "Set system hostname"
 msgstr "設定系統的主機名稱"
 
-#: ../clients/tui/nmtui.c:104
+#: ../clients/tui/nmtui.c:83
 msgid "NetworkManager TUI"
 msgstr "NetworkManager 文字介面"
 
-#: ../clients/tui/nmtui.c:112
+#: ../clients/tui/nmtui.c:91
 msgid "Please select an option"
 msgstr "請選擇一個選項"
 
-#: ../clients/tui/nmtui.c:160
+#: ../clients/tui/nmtui.c:143
 msgid "Usage"
 msgstr "用法"
 
-#: ../clients/tui/nmtui.c:241
+#: ../clients/tui/nmtui.c:224
 msgid "Could not parse arguments"
 msgstr "無法剖析引數"
 
-#: ../clients/tui/nmtui.c:251
+#: ../clients/tui/nmtui.c:234
 #, fuzzy, c-format
 msgid "Could not contact NetworkManager: %s.\n"
 msgstr "無法啟動連線:%s"
 
-#: ../clients/tui/nmtui.c:256
+#: ../clients/tui/nmtui.c:239
 msgid "NetworkManager is not running."
 msgstr "NetworkManager 並不在執行中。"
 
@@ -7331,55 +7635,56 @@ msgstr "無法驗證 PKCS#12 檔案:%d"
 msgid "Could not generate random data."
 msgstr "無法產生隨機資料。"
 
-#: ../libnm-core/nm-connection.c:225
+#: ../libnm-core/nm-connection.c:224
 msgid "wrong type; should be a list of strings."
 msgstr ""
 
-#: ../libnm-core/nm-connection.c:295
+#: ../libnm-core/nm-connection.c:294
 #, fuzzy
 msgid "unknown setting name"
 msgstr "錯誤:「%s」設定不明\n"
 
-#: ../libnm-core/nm-connection.c:307
+#: ../libnm-core/nm-connection.c:306
 #, fuzzy
 msgid "duplicate setting name"
 msgstr "錯誤:「%s」設定不明\n"
 
-#: ../libnm-core/nm-connection.c:905
+#: ../libnm-core/nm-connection.c:873
 msgid "setting not found"
 msgstr ""
 
-#: ../libnm-core/nm-connection.c:969
+#: ../libnm-core/nm-connection.c:937
 #, fuzzy
 msgid "setting not allowed in slave connection"
 msgstr "設定「%s」不存在連線中。\n"
 
-#: ../libnm-core/nm-connection.c:980
+#: ../libnm-core/nm-connection.c:948
 msgid "setting is required for non-slave connections"
 msgstr ""
 
-#: ../libnm-core/nm-connection.c:1074
+#: ../libnm-core/nm-connection.c:1042
 #, fuzzy
 msgid "Unexpected failure to verify the connection"
 msgstr "無法刪除連線:%s"
 
-#: ../libnm-core/nm-connection.c:1107
+#: ../libnm-core/nm-connection.c:1075
 #, fuzzy
 msgid "Unexpected failure to normalize the connection"
 msgstr "無法刪除連線:%s"
 
-#: ../libnm-core/nm-connection.c:1608 ../libnm-core/nm-setting-8021x.c:2411
+#: ../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-setting-bluetooth.c:120
-#: ../libnm-core/nm-setting-bluetooth.c:138 ../libnm-core/nm-setting-cdma.c:141
+#: ../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:2186
+#: ../libnm-core/nm-setting-ip-config.c:2167
 #: ../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
@@ -7391,8 +7696,10 @@ msgstr "無法刪除連線:%s"
 #: ../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
@@ -7505,7 +7812,8 @@ msgstr ""
 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:892
+#: ../libnm-core/nm-keyfile-reader.c:1058
 #, c-format
 msgid "certificate or key file '%s' does not exist"
 msgstr ""
@@ -7622,9 +7930,10 @@ msgstr "解密私密金鑰失敗。"
 #: ../libnm-core/nm-setting-8021x.c:2591 ../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:2193
+#: ../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-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
@@ -7640,8 +7949,9 @@ 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
@@ -7668,8 +7978,8 @@ msgstr "屬性不合規定"
 #: ../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:211
-#: ../libnm-core/nm-setting-ip6-config.c:222
+#: ../libnm-core/nm-setting-ip6-config.c:188
+#: ../libnm-core/nm-setting-ip6-config.c:199
 #: ../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
@@ -7707,12 +8017,14 @@ 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-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"
@@ -7805,13 +8117,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:109
+#: ../libnm-core/nm-setting-team-port.c:97
 #, fuzzy, c-format
 msgid "missing setting"
 msgstr "遺失選項"
 
 #: ../libnm-core/nm-setting-bridge-port.c:165
-#: ../libnm-core/nm-setting-team-port.c:120
+#: ../libnm-core/nm-setting-team-port.c:108
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
@@ -7997,52 +8309,47 @@ msgstr "無效的 IPv6 位址「%s」"
 msgid "Invalid routing metric '%s'"
 msgstr "無效的單位「%s」"
 
-#: ../libnm-core/nm-setting-ip-config.c:2206
+#: ../libnm-core/nm-setting-ip-config.c:2187
 #, fuzzy, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d。IPv4 位址不合規定"
 
-#: ../libnm-core/nm-setting-ip-config.c:2222
+#: ../libnm-core/nm-setting-ip-config.c:2203
 #, fuzzy, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d。IPv4 位址不合規定"
 
-#: ../libnm-core/nm-setting-ip-config.c:2234
+#: ../libnm-core/nm-setting-ip-config.c:2215
 #, fuzzy, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d。IPv4 位址的前綴不合規定"
 
-#: ../libnm-core/nm-setting-ip-config.c:2243
+#: ../libnm-core/nm-setting-ip-config.c:2224
 #, fuzzy, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d。IPv4 位址的前綴不合規定"
 
-#: ../libnm-core/nm-setting-ip-config.c:2257
+#: ../libnm-core/nm-setting-ip-config.c:2238
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:2266
+#: ../libnm-core/nm-setting-ip-config.c:2247
 #, fuzzy
 msgid "gateway is invalid"
 msgstr "屬性不合規定"
 
-#: ../libnm-core/nm-setting-ip-config.c:2280
+#: ../libnm-core/nm-setting-ip-config.c:2261
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d。路徑不合規定"
 
-#: ../libnm-core/nm-setting-ip-config.c:2289
+#: ../libnm-core/nm-setting-ip-config.c:2270
 #, c-format
 msgid "%d. route cannot be a default route"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip-config.c:2300
-#, 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:167
+#: ../libnm-core/nm-setting-ip6-config.c:144
 #: ../libnm-util/nm-setting-ip4-config.c:879
 #: ../libnm-util/nm-setting-ip6-config.c:843
 #, fuzzy, c-format
@@ -8052,9 +8359,9 @@ 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:179
-#: ../libnm-core/nm-setting-ip6-config.c:189
-#: ../libnm-core/nm-setting-ip6-config.c:199
+#: ../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-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
@@ -8074,19 +8381,6 @@ msgstr "「%s」不是個有效的 UUID"
 msgid "property cannot be set when dhcp-hostname is also set"
 msgstr ""
 
-#: ../libnm-core/nm-setting-ip6-config.c:237
-#, fuzzy
-msgid "value is not a valid token"
-msgstr "「%s」不是個有效的 UUID"
-
-#: ../libnm-core/nm-setting-ip6-config.c:248
-msgid "only makes sense with EUI64 address generation mode"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip6-config.c:260
-msgid "token is not in canonical form"
-msgstr ""
-
 #: ../libnm-core/nm-setting-ip-tunnel.c:318
 #, fuzzy, c-format
 msgid "'%d' is not a valid tunnel mode"
@@ -8332,184 +8626,164 @@ msgstr ""
 msgid "secret is not set"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2445
+#: ../libnm-core/nm-utils.c:2447
 #, fuzzy, c-format
 msgid "failed stat file %s: %s"
 msgstr "無法設置訊號遮罩:%d"
 
-#: ../libnm-core/nm-utils.c:2454
+#: ../libnm-core/nm-utils.c:2456
 #, fuzzy, c-format
 msgid "not a file (%s)"
 msgstr "無法載入檔案「%s」\n"
 
-#: ../libnm-core/nm-utils.c:2465
+#: ../libnm-core/nm-utils.c:2467
 #, fuzzy, c-format
 msgid "invalid file owner %d for %s"
 msgstr "無效的欄位「%s」; 允許的欄位:%s"
 
-#: ../libnm-core/nm-utils.c:2476
+#: ../libnm-core/nm-utils.c:2478
 #, c-format
 msgid "file permissions for %s"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2486
+#: ../libnm-core/nm-utils.c:2488
 #, c-format
 msgid "reject %s"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2506
+#: ../libnm-core/nm-utils.c:2508
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2520
+#: ../libnm-core/nm-utils.c:2522
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2528
+#: ../libnm-core/nm-utils.c:2530
 #, fuzzy, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "'%s' 不是合於 '%s' 規定的值"
 
-#: ../libnm-core/nm-utils.c:2538
+#: ../libnm-core/nm-utils.c:2540
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-utils.c:2620 ../libnm-util/nm-utils.c:1803
+#: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:296
+#: ../libnm-core/nm-vpn-editor-plugin.c:124
 #, c-format
-msgid "cannot load plugin \"%s\": %s"
+msgid "cannot load plugin %s"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:307
+#: ../libnm-core/nm-vpn-editor-plugin.c:150
 #, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgid "cannot load VPN plugin in '%s': missing plugin name"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:332
+#: ../libnm-core/nm-vpn-editor-plugin.c:157
 #, c-format
-msgid "unknown error initializing plugin %s"
+msgid "cannot load VPN plugin in '%s': invalid service name"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:349
+#: ../libnm-core/nm-vpn-editor-plugin.c:173
 #, c-format
-msgid "cannot load VPN plugin in '%s': missing plugin name"
+msgid "unknown error initializing plugin %s"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:358
+#: ../libnm-core/nm-vpn-editor-plugin.c:185
 #, c-format
-msgid "cannot load VPN plugin in '%s': invalid service name"
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:501
+#: ../libnm-core/nm-vpn-editor-plugin.c:292
 #, c-format
 msgid "the plugin does not support import capability"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:521
+#: ../libnm-core/nm-vpn-editor-plugin.c:312
 #, c-format
 msgid "the plugin does not support export capability"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:110
+#: ../libnm-core/nm-vpn-plugin-info.c:109
 #, fuzzy, c-format
 msgid "missing filename"
 msgstr "遺失選項"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:118
+#: ../libnm-core/nm-vpn-plugin-info.c:117
 #, c-format
 msgid "filename must be an absolute path (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:127
+#: ../libnm-core/nm-vpn-plugin-info.c:126
 #, c-format
 msgid "filename has invalid format (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:450
+#: ../libnm-core/nm-vpn-plugin-info.c:383
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:488
+#: ../libnm-core/nm-vpn-plugin-info.c:421
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1071
+#: ../libnm-core/nm-vpn-plugin-info.c:740
 #, fuzzy, c-format
 msgid "missing \"plugin\" setting"
 msgstr "遺失選項"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1081
+#: ../libnm-core/nm-vpn-plugin-info.c:750
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1175
+#: ../libnm-core/nm-vpn-plugin-info.c:842
 msgid "missing filename to load VPN plugin info"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1187
+#: ../libnm-core/nm-vpn-plugin-info.c:854
 msgid "missing name for VPN plugin info"
 msgstr ""
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1196
+#: ../libnm-core/nm-vpn-plugin-info.c:863
 msgid "missing service for VPN plugin info"
 msgstr ""
 
-#: ../libnm-glib/nm-device.c:1863 ../libnm/nm-device.c:1814
+#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804
 msgid "Bluetooth"
 msgstr "藍牙"
 
-#: ../libnm-glib/nm-device.c:1865 ../libnm/nm-device.c:1816
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
-
-#: ../libnm-glib/nm-device.c:1867 ../libnm/nm-device.c:1818
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../libnm-glib/nm-device.c:1883 ../libnm/nm-device.c:1834
+#: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
 #, fuzzy
 msgid "MACVLAN"
 msgstr "VLAN"
 
-#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1836
-msgid "VXLAN"
-msgstr ""
-
-#: ../libnm-glib/nm-device.c:1887 ../libnm/nm-device.c:1838
+#: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
 msgid "IPTunnel"
 msgstr ""
 
-#: ../libnm-glib/nm-device.c:1889 ../libnm/nm-device.c:1840
-msgid "Tun"
-msgstr ""
-
-#: ../libnm-glib/nm-device.c:1891 ../libnm/nm-device.c:1842
+#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
 msgid "Veth"
 msgstr ""
 
-#: ../libnm-glib/nm-device.c:1923 ../libnm/nm-device.c:1874
+#: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864
 msgid "Wired"
 msgstr "有線網路"
 
-#: ../libnm-glib/nm-device.c:1954 ../libnm/nm-device.c:1905
+#: ../libnm-glib/nm-device.c:1944 ../libnm/nm-device.c:1895
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1956 ../libnm/nm-device.c:1907
+#: ../libnm-glib/nm-device.c:1946 ../libnm/nm-device.c:1897
 msgid "USB"
 msgstr "USB"
 
@@ -8518,9 +8792,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:2052 ../libnm-glib/nm-device.c:2071
-#: ../libnm/nm-device.c:2001 ../libnm/nm-device.c:2020
+#. 
+#: ../libnm-glib/nm-device.c:2042 ../libnm-glib/nm-device.c:2061
+#: ../libnm/nm-device.c:1991 ../libnm/nm-device.c:2010
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
@@ -8722,7 +8996,7 @@ msgstr ""
 msgid "The connection was not an OLPC Mesh connection."
 msgstr "「OLPC Mesh」連線類型有兩個選用性引數。\n"
 
-#: ../libnm/nm-device-team.c:139
+#: ../libnm/nm-device-team.c:118
 #, fuzzy
 msgid "The connection was not a team connection."
 msgstr "連線已移除"
@@ -8758,7 +9032,8 @@ 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."
+msgid ""
+"The device is lacking WPA2/RSN capabilities required by the connection."
 msgstr ""
 
 #: ../libnm/nm-device-wimax.c:317
@@ -8766,22 +9041,22 @@ msgstr ""
 msgid "The connection was not a WiMAX connection."
 msgstr "「WiMax」連線類型有一項選用性引數。\n"
 
-#: ../libnm/nm-device.c:2739
+#: ../libnm/nm-device.c:2729
 #, fuzzy, c-format
 msgid "The connection was not valid: %s"
 msgstr "錯誤:連線無效:%s\n"
 
-#: ../libnm/nm-device.c:2748
+#: ../libnm/nm-device.c:2738
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr ""
 
-#: ../libnm/nm-manager.c:867
+#: ../libnm/nm-manager.c:874
 #, fuzzy
 msgid "Active connection could not be attached to the device"
 msgstr "沒有使用中的連線或裝置"
 
-#: ../libnm/nm-manager.c:1091
+#: ../libnm/nm-manager.c:1098
 #, fuzzy
 msgid "Active connection removed before it was initialized"
 msgstr "有效連線的詳細資訊"
@@ -8808,136 +9083,127 @@ msgid "System policy prevents enabling or disabling system networking"
 msgstr "系統政策防止啟用或停用系統網路作業"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
-#, fuzzy
-msgid "Reload NetworkManager configuration"
-msgstr "印出 NetworkManager 的版本並退出"
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
-#, fuzzy
-msgid "System policy prevents reloading NetworkManager"
-msgstr "系統政策防止啟用或停用系統網路作業"
-
-#: ../policy/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:6
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
 msgstr "系統政策防止將 NetworkManager 導入睡眠模式或將其啟用"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
 msgstr "啟用或停用 WiFi 裝置"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents enabling or disabling WiFi devices"
 msgstr "系統政策防止啟用或停用 WiFi 裝置"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable mobile broadband devices"
 msgstr "啟用或停用行動寬頻裝置"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr "系統政策防止啟用或停用行動寬頻裝置"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
 msgstr "啟用或停用 WiMAX 行動寬頻裝置"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr "系統政策防止啟用或停用 WiMAX 行動寬頻裝置"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
 msgstr "允許控制網路連線"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid "System policy prevents control of network connections"
 msgstr "系統政策防止網路連線的控制"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Connection sharing via a protected WiFi network"
 msgstr "透過受保護的 WiFi 網路共享連線"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
-msgid "System policy prevents sharing connections via a protected WiFi network"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid ""
+"System policy prevents sharing connections via a protected WiFi network"
 msgstr "系統政策讓您無法透過受保護的 WiFi 網路共享連結"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via an open WiFi network"
 msgstr "透過開放的 WiFi 網路共享連線"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
 msgstr "系統政策讓您無法透過開放的 WiFi 網路共享連線"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Modify personal network connections"
 msgstr "修改個人網路連線"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
 msgstr "系統政策防止修改個人網路設定"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify network connections for all users"
 msgstr "修改所有使用者的網路連線"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of network settings for all users"
 msgstr "系統政策防止修改所有使用者的網路設定"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify persistent system hostname"
 msgstr "修改永久系統的主機名稱"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr "系統政策讓您無法修改永久的系統主機名稱"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:25
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
 msgid "Modify persistent global DNS configuration"
 msgstr ""
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:26
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
 #, fuzzy
 msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
 msgstr "系統政策讓您無法修改永久的系統主機名稱"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-shared-utils.c:208
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-shared-utils.c:215
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-shared-utils.c:222
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-shared-utils.c:230
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-shared-utils.c:239
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-shared-utils.c:250
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -8948,130 +9214,136 @@ 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:112
+#: ../src/NetworkManagerUtils.c:111
 #, fuzzy, c-format
 msgctxt "connection id fallback"
 msgid "%s %d"
 msgstr "%s %s"
 
-#: ../src/main.c:165 ../src/main.c:300
+#: ../src/main.c:220 ../src/main.c:358
 #, fuzzy, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "無法讀取配置:(%d)%s\n"
 
 #. Logging/debugging
-#: ../src/main.c:179 ../src/nm-iface-helper.c:298
+#: ../src/main.c:234 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
 msgstr "印出 NetworkManager 的版本並退出"
 
-#: ../src/main.c:180 ../src/nm-iface-helper.c:299
+#: ../src/main.c:235 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
 msgstr "不要成為 daemon"
 
-#: ../src/main.c:181 ../src/nm-iface-helper.c:301
+#: ../src/main.c:236 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "日誌等級:[%s] 之一"
 
-#: ../src/main.c:183 ../src/nm-iface-helper.c:303
+#: ../src/main.c:238 ../src/nm-iface-helper.c:303
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "以「,」區隔開來的日誌區域:任何 [%s] 的組合"
 
-#: ../src/main.c:185 ../src/nm-iface-helper.c:305
+#: ../src/main.c:240 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
 msgstr "使所有警告表示嚴重錯誤"
 
-#: ../src/main.c:186
+#: ../src/main.c:241
 msgid "Specify the location of a PID file"
 msgstr "指定 PID 檔案的位置"
 
-#: ../src/main.c:188
+#: ../src/main.c:242
+msgid "State file location"
+msgstr "指定檔案位置"
+
+#: ../src/main.c:244
 #, fuzzy
 msgid "Print NetworkManager configuration and exit"
 msgstr "印出 NetworkManager 的版本並退出"
 
-#: ../src/main.c:198
+#: ../src/main.c:254
 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:285 ../src/main-utils.c:270 ../src/nm-iface-helper.c:393
+#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s。請使用 --help 來查看有效選項的清單。\n"
 
-#: ../src/main.c:290 ../src/nm-iface-helper.c:398
+#: ../src/main.c:348 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr "即將忽略傳送至指令列上的日誌區域「%s」。\n"
 
-#: ../src/main.c:315
+#: ../src/main.c:373
 #, c-format
 msgid "Error in configuration file: %s.\n"
 msgstr "配置檔案錯誤:%s。\n"
 
-#: ../src/main.c:320
+#: ../src/main.c:378
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
 msgstr "正在忽略來自於配置檔案中無法辨識的日誌區域「%s」。\n"
 
-#: ../src/main.c:331 ../src/nm-iface-helper.c:408
+#: ../src/main.c:389 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "無法成為 daemon:%s [error %u]\n"
 
-#: ../src/main-utils.c:98
+#: ../src/main-utils.c:99
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "開啟 %s 失敗:%s\n"
 
-#: ../src/main-utils.c:104
+#: ../src/main-utils.c:105
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "寫入 %s 失敗:%s\n"
 
-#: ../src/main-utils.c:109
+#: ../src/main-utils.c:110
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "關閉 %s 失敗:%s\n"
 
-#: ../src/main-utils.c:144
+#: ../src/main-utils.c:145
 #, c-format
 msgid "Cannot create '%s': %s"
 msgstr ""
 
-#: ../src/main-utils.c:196
+#: ../src/main-utils.c:197
 #, fuzzy, c-format
 msgid "%s is already running (pid %ld)\n"
 msgstr "NetworkManager 已在執行(pid %ld)\n"
 
-#: ../src/main-utils.c:206
+#: ../src/main-utils.c:207
 #, fuzzy, c-format
 msgid "You must be root to run %s!\n"
 msgstr "您必須成為 root 才能執行 NetworkManager!\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:214
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:213
 msgid "# Created by NetworkManager\n"
 msgstr "# Created by NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:222
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:220
 #, 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/bluetooth/nm-bluez-device.c:200
+#: ../src/devices/adsl/nm-device-adsl.c:133
+#, fuzzy
+msgid "ADSL connection"
+msgstr "ADSL 連線 %d"
+
+#: ../src/devices/bluetooth/nm-bluez-device.c:197
 #, c-format
 msgid "%s Network"
 msgstr "%s 網路"
@@ -9098,13 +9370,13 @@ 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:687
+#: ../src/devices/wwan/nm-modem-broadband.c:655
 #, fuzzy
 msgid "GSM connection"
 msgstr "GSM 連線 %d"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:307
-#: ../src/devices/wwan/nm-modem-broadband.c:711
+#: ../src/devices/wwan/nm-modem-broadband.c:679
 #, fuzzy
 msgid "CDMA connection"
 msgstr "CDMA 連線 %d"
@@ -9114,9 +9386,9 @@ msgid "Unknown/unhandled Bluetooth connection type"
 msgstr ""
 
 #: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1421
+#: ../src/devices/nm-device-ethernet.c:1415
 #: ../src/devices/nm-device-infiniband.c:193
-#: ../src/devices/wifi/nm-device-wifi.c:875
+#: ../src/devices/wifi/nm-device-wifi.c:872
 #, fuzzy
 msgid "connection does not match device"
 msgstr "沒有使用中的連線或裝置"
@@ -9131,27 +9403,32 @@ msgstr "Bond 連線 %d"
 msgid "Bridge connection"
 msgstr "橋接連線 %d"
 
-#: ../src/devices/nm-device-ethernet.c:1402
+#: ../src/devices/nm-device-ethernet.c:1396
 #, fuzzy
 msgid "PPPoE connection"
 msgstr "PPPoE 連線 %d"
 
-#: ../src/devices/nm-device-ethernet.c:1402
+#: ../src/devices/nm-device-ethernet.c:1396
 #, fuzzy
 msgid "Wired connection"
 msgstr "有線連線 %d"
 
-#: ../src/devices/nm-device-ethernet-utils.c:36
+#: ../src/devices/nm-device-ethernet-utils.c:39
 #, c-format
 msgid "Wired connection %d"
 msgstr "有線連線 %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:347
+#: ../src/devices/nm-device-infiniband.c:175
+#, fuzzy
+msgid "InfiniBand connection"
+msgstr "InfiniBand 連線 %d"
+
+#: ../src/devices/nm-device-ip-tunnel.c:346
 #, fuzzy
 msgid "IP tunnel connection"
 msgstr "編輯連線"
 
-#: ../src/devices/nm-device-macvlan.c:436
+#: ../src/devices/nm-device-macvlan.c:435
 #, fuzzy
 msgid "MACVLAN connection"
 msgstr "VLAN 連線 %d"
@@ -9161,7 +9438,17 @@ msgstr "VLAN 連線 %d"
 msgid "TUN connection"
 msgstr "DUN 連線 %d"
 
-#: ../src/devices/team/nm-device-team.c:121
+#: ../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
 #, fuzzy
 msgid "Team connection"
 msgstr "Team 連線 %d"
@@ -9171,7 +9458,7 @@ msgstr "Team 連線 %d"
 msgid "Mesh"
 msgstr "Mesh 連線 %d"
 
-#: ../src/devices/wifi/nm-device-wifi.c:842
+#: ../src/devices/wifi/nm-device-wifi.c:839
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
 msgstr ""
 
@@ -9330,60 +9617,56 @@ msgstr ""
 msgid "Failed to determine AP security information"
 msgstr "設定解密用的對稱式金鑰失敗。"
 
-#: ../src/devices/wwan/nm-modem-broadband.c:673
+#: ../src/devices/wwan/nm-modem-broadband.c:641
 #, fuzzy
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
 msgstr "行動寬頻連線 %d"
 
-#: ../src/nm-config.c:500
+#: ../src/nm-config.c:465
 msgid "Config file location"
 msgstr "配置檔案位置"
 
-#: ../src/nm-config.c:501
+#: ../src/nm-config.c:466
 msgid "Config directory location"
 msgstr "配置目錄位置"
 
-#: ../src/nm-config.c:502
+#: ../src/nm-config.c:467
 #, fuzzy
 msgid "System config directory location"
 msgstr "配置目錄位置"
 
-#: ../src/nm-config.c:503
+#: ../src/nm-config.c:468
 #, fuzzy
 msgid "Internal config file location"
 msgstr "配置檔案位置"
 
-#: ../src/nm-config.c:504
-msgid "State file location"
-msgstr "指定檔案位置"
-
-#: ../src/nm-config.c:505
+#: ../src/nm-config.c:469
 msgid "State file for no-auto-default devices"
 msgstr ""
 
-#: ../src/nm-config.c:506
+#: ../src/nm-config.c:470
 msgid "List of plugins separated by ','"
 msgstr "外掛程式清單,以「,」區隔開。"
 
-#: ../src/nm-config.c:507
+#: ../src/nm-config.c:471
 #, fuzzy
 msgid "Quit after initial configuration"
 msgstr "目前的 nmcli 配置:\n"
 
-#: ../src/nm-config.c:508 ../src/nm-iface-helper.c:300
+#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300
 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:511
+#: ../src/nm-config.c:475
 msgid "An http(s) address for checking internet connectivity"
 msgstr "檢查網際網路連線的 http 位址"
 
-#: ../src/nm-config.c:512
+#: ../src/nm-config.c:476
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "連線檢查之間的間隔(秒)"
 
-#: ../src/nm-config.c:513
+#: ../src/nm-config.c:477
 msgid "The expected start of the response"
 msgstr "預期的反應起始"
 
@@ -9395,7 +9678,7 @@ msgstr "父介面卡 [none]:"
 
 #: ../src/nm-iface-helper.c:281
 msgid "eth0"
-msgstr ""
+msgstr "eth0"
 
 #: ../src/nm-iface-helper.c:282
 #, fuzzy
@@ -9455,7 +9738,7 @@ msgstr "沒有可移除的優先順序"
 
 #: ../src/nm-iface-helper.c:291
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../src/nm-iface-helper.c:292
 #, fuzzy
@@ -9501,16 +9784,25 @@ msgstr ""
 msgid "(%s): Invalid IID %s\n"
 msgstr ""
 
-#: ../src/nm-logging.c:223
+#: ../src/nm-logging.c:216
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "不明日誌層級「%s」"
 
-#: ../src/nm-logging.c:318
+#: ../src/nm-logging.c:309
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "不明日誌網域「%s」"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:106
+#: ../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
 msgid "System"
 msgstr "系統"