summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorDingzhong Chen <wsxy162@gmail.com>2018-08-30 12:05:43 +0800
committerThomas Haller <thaller@redhat.com>2018-08-30 07:35:17 +0200
commitdc4db093c763bf27114dced6a480e18397cd7466 (patch)
tree92cc70f761a7379e9d59f5080720480115ba6c5f /po
parentd17d26887c69c8c3adcd6003a7ceea16b4eecd14 (diff)
downloadNetworkManager-dc4db093c763bf27114dced6a480e18397cd7466.tar.gz
po: update Chinese (zh_CN) translation
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/10
Diffstat (limited to 'po')
-rw-r--r--po/zh_CN.po8790
1 files changed, 5087 insertions, 3703 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5c5050c100..7e0fcd42a6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,34 +1,33 @@
-# translation of zh_CN.po to Wei Liu
-# Simplified Chinese translation to NetworkManager
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# Simplified Chinese translation for NetworkManager.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
# This file is distributed under the same license as the NetworkManager package.
-#
# Funda Wang <fundawang@linux.net.cn>, 2004.
# Leah Liu <lliu@redhat.com>, 2010.
# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
-# Simplified Chinese translation for NetworkManager
# tuhaihe <1132321739qq@gmail.com>, 2012, 2013.
# Wylmer Wang <wantinghard@gmail.com>, 2013.
# Luo Lei <luolei@ubuntukylin.com>, 2014.
-# Dingzhong Chen <wsxy162@gmail.com>, 2016.
# Ian Li <https://launchpad.net/~ian.li>, 2016.
# shijing <jingshi@ubuntukylin.com>, 2016.
# Mingye Wang (Arthur2e5) <arthur200126@gmail.com>, 2016.
-# lrintel <lrintel@redhat.com>, 2017. #zanata
+# Mingcong Bai <jeffbai@aosc.xyz>, 2017.
+# Dingzhong Chen <wsxy162@gmail.com>, 2016, 2017, 2018.
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-12 10:22+0100\n"
-"PO-Revision-Date: 2017-11-07 06:48+0000\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
-"Language: zh_Hans\n"
+"Project-Id-Version: NetworkManager master\n"
+"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/NetworkManager/"
+"NetworkManager/issues\n"
+"POT-Creation-Date: 2018-08-29 03:24+0000\n"
+"PO-Revision-Date: 2018-08-30 12:00+0800\n"
+"Last-Translator: Dingzhong Chen <wsxy162@gmail.com>\n"
+"Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 4.3.2\n"
+"X-Generator: Poedit 2.1.1\n"
#: ../clients/cli/agent.c:40
#, c-format
@@ -38,7 +37,7 @@ msgid ""
"COMMAND := { secret | polkit | all }\n"
"\n"
msgstr ""
-"用法: nmcli agent { 命令 | help }\n"
+"用法:nmcli agent { 命令 | help }\n"
"\n"
"命令 := { secret | polkit | all }\n"
"\n"
@@ -54,11 +53,12 @@ msgid ""
"and if a password is required asks the user for it.\n"
"\n"
msgstr ""
-"用法: nmcli agent secret { help }\n"
+"用法:nmcli agent secret { help }\n"
+"\n"
+"将 nmcli 作为网络管理器(NetworkManager)的密钥(secret)代理运行。当 "
+"NetworkManager 要求密码时,它将请求\n"
+"注册的代理提供。这个命令将使 nmcli 保持运行,如果要求密码则会请求用户提供。\n"
"\n"
-"将 nmcli 作为 NetworkManager 安全代理运行。当 NetworkManager 要求密码时,它将"
-"请求注册的代理提供。这个命令将使 nmcli 保持运行,如果要求密码则会请求用户提"
-"供。\n"
"\n"
#: ../clients/cli/agent.c:58
@@ -72,10 +72,10 @@ msgid ""
"the response back to polkit.\n"
"\n"
msgstr ""
-"用法: nmcli agent polkit { help }\n"
+"用法:nmcli agent polkit { help }\n"
"\n"
-"为用户会话将 nmcli 注册为 polkit 操作。当 polkit 守护进程要求授权时,nmcli 将"
-"向用户请求并响应 polkit。\n"
+"将 nmcli 注册为用于用户会话的 polkit 操作。\n"
+"当 polkit 守护进程要求授权时,nmcli 询问用户后将其响应返回 polkit。\n"
"\n"
#: ../clients/cli/agent.c:68
@@ -86,80 +86,85 @@ msgid ""
"Runs nmcli as both NetworkManager secret and a polkit agent.\n"
"\n"
msgstr ""
-"用法: nmcli agent all { help }\n"
+"用法:nmcli agent all { help }\n"
"\n"
-"将 nmcli 作为 NetworkManager 安全代理及 polkit 代理运行。\n"
+"将 nmcli 同时作为网络管理器(NetworkManager)的密钥(secret)代理及 polkit 代"
+"理运行。\n"
"\n"
-#: ../clients/cli/agent.c:158
+#: ../clients/cli/agent.c:157
#, c-format
msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
-msgstr "nmcli 已成功地注册为 NetworkManager 的安全代理。\n"
+msgstr ""
+"nmcli 已成功地注册为网络管理器(NetworkManager)的密钥(secret)代理。\n"
-#: ../clients/cli/agent.c:160
+#: ../clients/cli/agent.c:159
#, c-format
msgid "Error: secret agent initialization failed"
-msgstr "错误:安全代理初始化失败"
+msgstr "错误:密钥(secret)代理初始化失败"
-#: ../clients/cli/agent.c:179
+#: ../clients/cli/agent.c:178
#, c-format
msgid "Error: polkit agent initialization failed: %s"
msgstr "错误:polkit 代理初始化失败:%s"
-#: ../clients/cli/agent.c:187
+#: ../clients/cli/agent.c:186
#, c-format
msgid "nmcli successfully registered as a polkit agent.\n"
msgstr "nmcli 已成功地注册为 polkit 代理。\n"
-#: ../clients/cli/common.c:262 ../clients/cli/common.c:277
+#: ../clients/cli/common.c:361 ../clients/cli/common.c:362
+#: ../clients/cli/common.c:393 ../clients/cli/common.c:394
+#: ../clients/cli/connections.c:1390
msgid "GROUP"
-msgstr "群组"
+msgstr "组"
-#: ../clients/cli/common.c:559
+#: ../clients/cli/common.c:621
#, c-format
msgid "Error: openconnect failed: %s\n"
msgstr "错误:openconnect 失败:%s\n"
-#: ../clients/cli/common.c:566
+#: ../clients/cli/common.c:628
#, c-format
msgid "Error: openconnect failed with status %d\n"
msgstr "错误:openconnect 失败,状态为 %d\n"
-#: ../clients/cli/common.c:568
+#: ../clients/cli/common.c:630
#, c-format
msgid "Error: openconnect failed with signal %d\n"
msgstr "错误:openconnect 失败,信号为 %d\n"
-#: ../clients/cli/common.c:648
+#: ../clients/cli/common.c:710
#, c-format
msgid ""
"Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
"without '--ask' option.\n"
msgstr ""
-"警告: 'passwd-file' 里没有给出 '%s' 的密码,nmcli 无法用 '--ask' 选项进行请"
-"求。\n"
+"警告:\"passwd-file\" 里没有给定 \"%s\" 的密码而且 nmcli 没有 \"--ask\" 选项"
+"就无法进行\n"
+"询问。\n"
-#: ../clients/cli/common.c:1114
+#: ../clients/cli/common.c:1200
#, c-format
msgid "Error: Could not create NMClient object: %s."
msgstr "错误:无法创建 NMClient 对象:%s。"
-#: ../clients/cli/common.c:1134
+#: ../clients/cli/common.c:1220
msgid "Error: NetworkManager is not running."
-msgstr "错误:网络管理器未运行。"
+msgstr "错误:网络管理器(NetworkManager)未运行。"
-#: ../clients/cli/common.c:1231
+#: ../clients/cli/common.c:1316
#, c-format
msgid "Error: argument '%s' not understood. Try passing --help instead."
-msgstr "错误:参数“%s”不理解。试下替用 --help 来传送。"
+msgstr "错误:不能理解参数 \"%s\"。试下换成传递 --help 参数。"
-#: ../clients/cli/common.c:1241
+#: ../clients/cli/common.c:1326
msgid "Error: missing argument. Try passing --help."
-msgstr "错误:缺少参数。尝试传送 --help。"
+msgstr "错误:缺少参数。试下传递 --help 参数。"
-#: ../clients/cli/common.c:1294
+#: ../clients/cli/common.c:1379
msgid "access denied"
-msgstr "访问遭拒"
+msgstr "访问遭到拒绝"
#. define some prompts for connection editor
#: ../clients/cli/connections.c:64
@@ -168,7 +173,7 @@ msgstr "设置名称?"
#: ../clients/cli/connections.c:65
msgid "Property name? "
-msgstr "属性名称? "
+msgstr "属性名称?"
#: ../clients/cli/connections.c:66
msgid "Enter connection type: "
@@ -176,24 +181,87 @@ msgstr "输入连接类型:"
#. define some other prompts
#: ../clients/cli/connections.c:70
-msgid "Connection (name, UUID, or path)"
-msgstr "连接(名称、UUID 或路径)"
+msgid "Connection (name, UUID, or path): "
+msgstr "连接(名称、UUID 或路径):"
#: ../clients/cli/connections.c:71
-msgid "VPN connection (name, UUID, or path)"
-msgstr "VPN 连接(名称、UUID 或路径)"
+msgid "VPN connection (name, UUID, or path): "
+msgstr "VPN 连接(名称、UUID 或路径):"
#: ../clients/cli/connections.c:72
-msgid "Connection(s) (name, UUID, or path)"
-msgstr "连接(名称、UUID 或路径)"
+msgid "Connection(s) (name, UUID, or path): "
+msgstr "连接(名称、UUID 或路径):"
# apath = active path
#: ../clients/cli/connections.c:73
-msgid "Connection(s) (name, UUID, path or apath)"
-msgstr "连接(名称、UUID、路径或活动路径)"
+msgid "Connection(s) (name, UUID, path or apath): "
+msgstr "连接(名称、UUID、路径或活动路径):"
+
+#: ../clients/cli/connections.c:80 ../clients/cli/connections.c:89
+#: ../clients/cli/devices.c:421 ../clients/cli/devices.c:513
+#: ../clients/cli/devices.c:520 ../clients/cli/general.c:41
+#: ../clients/cli/general.c:82 ../clients/cli/general.c:150
+#: ../clients/cli/general.c:155 ../clients/common/nm-client-utils.c:260
+#: ../clients/common/nm-client-utils.c:273
+#: ../clients/common/nm-client-utils.c:277
+#: ../clients/common/nm-client-utils.c:282
+#: ../clients/common/nm-meta-setting-desc.c:1510
+#: ../clients/common/nm-meta-setting-desc.c:1560
+#: ../clients/common/nm-meta-setting-desc.c:2707
+#: ../clients/common/nm-meta-setting-desc.c:2762
+msgid "unknown"
+msgstr "未知"
+
+#: ../clients/cli/connections.c:81
+msgid "activating"
+msgstr "激活中"
+
+#: ../clients/cli/connections.c:82
+msgid "activated"
+msgstr "已激活"
+
+#: ../clients/cli/connections.c:83 ../clients/common/nm-client-utils.c:271
+msgid "deactivating"
+msgstr "停用中"
+
+#: ../clients/cli/connections.c:84
+msgid "deactivated"
+msgstr "已停用"
+
+#: ../clients/cli/connections.c:90
+msgid "VPN connecting (prepare)"
+msgstr "VPN 连接中(准备)"
+
+#: ../clients/cli/connections.c:91
+msgid "VPN connecting (need authentication)"
+msgstr "VPN 连接中(需要验证)"
+
+#: ../clients/cli/connections.c:92
+msgid "VPN connecting"
+msgstr "VPN 连接中"
+
+#: ../clients/cli/connections.c:93
+msgid "VPN connecting (getting IP configuration)"
+msgstr "VPN 连接中(获取 IP 配置中)"
+
+#: ../clients/cli/connections.c:94
+msgid "VPN connected"
+msgstr "VPN 已连接"
+
+#: ../clients/cli/connections.c:95
+msgid "VPN connection failed"
+msgstr "VPN 连接失败"
-#: ../clients/cli/connections.c:195
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:96
+msgid "VPN disconnected"
+msgstr "VPN 已断开"
+
+#: ../clients/cli/connections.c:464
+msgid "never"
+msgstr "从不"
+
+#: ../clients/cli/connections.c:814
+#, c-format
msgid ""
"Usage: nmcli connection { COMMAND | help }\n"
"\n"
@@ -240,21 +308,20 @@ msgstr ""
" show [--active] [--order <order spec>]\n"
" show [--active] [id | uuid | path | apath] <ID> ...\n"
"\n"
-" up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file "
-"<file with passwords>]\n"
+" up [[id | uuid | path] <ID>] [ifname <接口名>] [ap <BSSID>] [passwd-file <"
+"密码文件>]\n"
"\n"
" down [id | uuid | path | apath] <ID> ...\n"
"\n"
-" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-"([+|-]<setting>.<property> <value>)+]\n"
+" add 通用选项 类型特定选项 从属选项 IP_选项 [-- ([+|-]<设置>.<属性> <值"
+">)+]\n"
"\n"
-" modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
-"<value>)+\n"
+" modify [--temporary] [id | uuid | path] <ID> ([+|-]<设置>.<属性> <值>)+\n"
"\n"
-" clone [--temporary] [id | uuid | path ] <ID> <new name>\n"
+" clone [--temporary] [id | uuid | path ] <ID> <新名称>\n"
"\n"
" edit [id | uuid | path] <ID>\n"
-" edit [type <new_con_type>] [con-name <new_con_name>]\n"
+" edit [type <新连接类型>] [con-name <新连接名称>]\n"
"\n"
" delete [id | uuid | path] <ID>\n"
"\n"
@@ -262,14 +329,14 @@ msgstr ""
"\n"
" reload\n"
"\n"
-" load <filename> [ <filename>... ]\n"
+" load <文件名> [ <文件名>... ]\n"
"\n"
-" import [--temporary] type <type> file <file to import>\n"
+" import [--temporary] type <类型> file <要导入的文件>\n"
"\n"
-" export [id | uuid | path] <ID> [<output file>]\n"
+" export [id | uuid | path] <ID> [<输出文件>]\n"
"\n"
-#: ../clients/cli/connections.c:217
+#: ../clients/cli/connections.c:836
#, c-format
msgid ""
"Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -295,22 +362,26 @@ msgid ""
"account. Use global --show-secrets option to reveal associated secrets as "
"well.\n"
msgstr ""
-"用法:nmcli connection show { ARGUMENTS | help }\n"
+"用法:nmcli connection show { 参数 | help }\n"
"\n"
-"ARGUMENTS := [--active] [--order <order spec>]\n"
+"参数 := [--active] [--order <排序规则>]\n"
"\n"
-"列出 in-memory 和 on-disk 连接配置集,如果设备正在使用这个配置集,其中一些也"
-"可能是活动的。未使用参数时,所有的配置集都会被列出。当指定 --active 选项时,"
-"只显示活动的配置集。 --order 允许自定义连接排序(请参考手册页)。\n"
+"列出内存中以及磁盘上的连接配置集,其中也有些是活动的,如果它正被设备使用的"
+"话。\n"
+"未使用参数时,所有的配置集都将列出。当指定 --active 选项时,只显示活动的配"
+"置\n"
+"集。--order 允许自定义连接的顺序(请参考手册页)。\n"
"\n"
-"ARGUMENTS := [--active] [id | uuid | path | apath] <ID> ...\n"
+"参数 := [--active] [id | uuid | path | apath] <ID> ...\n"
"\n"
-"显示指定的连接的细节。在默认情况下,静态配置和活动连接数据都会被显示。您可以"
-"用全局的 '--fields' 选项过滤输出。更多信息请参考手册页。当指定 --active 选项"
-"时,只会考虑活动的配置集。请使用全局的 --show-secrets 选项来显示关联的秘"
-"密。\n"
+"显示指定连接的细节。在默认情况下,静态配置和活动连接数据都会被显示。您可以用"
+"全\n"
+"局的 \"--fields\" 选项过滤输出。更多信息请参考手册页。当指定 --active 选项"
+"时,只\n"
+"会考虑活动的配置集。请使用全局的 --show-secrets 选项以同时显示关联的密钥"
+"(secret)。\n"
-#: ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:857
#, c-format
msgid ""
"Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -334,24 +405,24 @@ msgid ""
"passwd-file - file with password(s) required to activate the connection\n"
"\n"
msgstr ""
-"用法:nmcli connection up { ARGUMENTS | help }\n"
+"用法:nmcli connection up { 参数 | help }\n"
"\n"
-"ARGUMENTS := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp "
-"<name>] [passwd-file <file with passwords>]\n"
+"参数 := [id | uuid | path] <ID> [ifname <接口名>] [ap <BSSID>] [nsp <名称>] "
+"[passwd-file <密码文件>]\n"
"\n"
-"激活设备上的连接。要激活的配置集是由它的名称、UUID 或 D-Bus 路径来确定。\n"
+"激活设备上的连接。要激活的配置集由它的名称、UUID 或 D-Bus 路径来确定。\n"
"\n"
-"ARGUMENTS := ifname <ifname> [ap <BSSID>] [nsp <name>] [passwd-file <file "
-"with passwords>]\n"
+"参数 := ifname <接口名称> [ap <BSSID>] [nsp <名称>] [passwd-file <密码文件"
+">]\n"
"\n"
-"用连接激活设备。NetworkManager 会自动选择连接配置集。\n"
+"用连接激活设备。网络管理器(NetworkManager)会自动选择连接配置集。\n"
"\n"
"ifname - 指定激活连接所用的设备\n"
"ap - 指定要连接的 AP(只对 Wi-Fi 有效)\n"
"nsp - 指定要连接的 NSP(只对 WiMAX 有效)\n"
-"passwd-file - 激活连接所需的密码\n"
+"passwd-file - 激活连接所需的密码文件\n"
-#: ../clients/cli/connections.c:259
+#: ../clients/cli/connections.c:878
#, c-format
msgid ""
"Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -364,15 +435,16 @@ msgid ""
"UUID or D-Bus path.\n"
"\n"
msgstr ""
-"用法:nmcli connection down { ARGUMENTS | help }\n"
+"用法:nmcli connection down { 参数 | help }\n"
"\n"
-"ARGUMENTS := [id | uuid | path | apath] <ID> ...\n"
+"参数 := [id | uuid | path | apath] <ID> ...\n"
"\n"
-"取消激活设备的连接(无需阻止设备再次自动激活)。要取消激活的配置集是由它的名"
-"称、UUID 或 D-Bus 路径来确定的。\n"
+"从设备停用连接(无需阻止设备再次自动激活)。要停用的配置集由它的名称、UUID "
+"或 \n"
+"D-Bus 路径来确定。\n"
"\n"
-#: ../clients/cli/connections.c:271
+#: ../clients/cli/connections.c:890
#, c-format
msgid ""
"Usage: nmcli connection add { ARGUMENTS | help }\n"
@@ -509,7 +581,14 @@ msgid ""
" [source-port-max <0-65535>]\n"
" [destination-port <0-65535>]\n"
"\n"
-" dummy: \n"
+" wpan: [short-addr <0x0000-0xffff>]\n"
+"\n"
+" [pan-id <0x0000-0xffff>]\n"
+"\n"
+" [mac <MAC address>]\n"
+"\n"
+" 6lowpan: dev <parent device (connection UUID, ifname, or MAC)>\n"
+" dummy:\n"
"\n"
" SLAVE_OPTIONS:\n"
" bridge: [priority <0-63>]\n"
@@ -523,8 +602,162 @@ msgid ""
" [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
"\n"
msgstr ""
+"用法:nmcli connection add { 参数 | help }\n"
+"\n"
+"参数 := 通用选项 类型特定选项 从属选项 IP_选项 [-- ([+|-]<设置>.<属性> <值"
+">)+]\n"
+"\n"
+" 通用选项:\n"
+" type <类型>\n"
+" ifname <接口名> | \"*\"\n"
+" [con-name <连接名称>]\n"
+" [autoconnect yes|no]\n"
+" [save yes|no]\n"
+" [master <主连接(接口名、连接的 UUID 或其名称)>]\n"
+" [slave-type <主连接类型>]\n"
+"\n"
+" 类型特定选项:\n"
+" ethernet: [mac <MAC 地址>]\n"
+" [cloned-mac <克隆的 MAC 地址>]\n"
+" [mtu <MTU>]\n"
+"\n"
+" wifi: ssid <SSID>\n"
+" [mac <MAC 地址>]\n"
+" [cloned-mac <克隆的 MAC 地址>]\n"
+" [mtu <MTU>]\n"
+" [mode infrastructure|ap|adhoc]\n"
+"\n"
+" wimax: [mac <MAC 地址>]\n"
+" [nsp <NSP>]\n"
+"\n"
+" pppoe: username <PPPoE 用户名>\n"
+" [password <PPPoE 密码>]\n"
+" [service <PPPoE 服务名>]\n"
+" [mtu <MTU>]\n"
+" [mac <MAC 地址>]\n"
+"\n"
+" gsm: apn <APN>\n"
+" [user <用户名>]\n"
+" [password <密码>]\n"
+"\n"
+" cdma: [user <用户名>]\n"
+" [password <密码>]\n"
+"\n"
+" infiniband: [mac <MAC 地址>]\n"
+" [mtu <MTU>]\n"
+" [transport-mode datagram | connected]\n"
+" [parent <接口名>]\n"
+" [p-key <IPoIB P_Key>]\n"
+"\n"
+" bluetooth: [addr <蓝牙地址>]\n"
+" [bt-type panu|nap|dun-gsm|dun-cdma]\n"
+"\n"
+" vlan: dev <上级设备(连接 UUID、接口名或 MAC)>\n"
+" id <VLAN ID>\n"
+" [flags <VLAN 标记>]\n"
+" [ingress <入口优先级映射>]\n"
+" [egress <出口优先级映射>]\n"
+" [mtu <MTU>]\n"
+"\n"
+" bond: [mode balance-rr (0) | active-backup (1) | balance-xor (2) "
+"| broadcast (3) |\n"
+" 802.3ad (4) | balance-tlb (5) | balance-alb "
+"(6)]\n"
+" [primary <接口名>]\n"
+" [miimon <数字>]\n"
+" [downdelay <数字>]\n"
+" [updelay <数字>]\n"
+" [arp-interval <数字>]\n"
+" [arp-ip-target <数字>]\n"
+" [lacp-rate slow (0) | fast (1)]\n"
+"\n"
+" bond-slave: master <主连接(接口名、连接的 UUID 或其名称)>\n"
+"\n"
+" team: [config <文件>|<原始 JSON 数据>]\n"
+"\n"
+" team-slave: master <主连接(接口名、连接的 UUID 或其名称)>\n"
+" [config <文件>|<原始 JSON 数据>]\n"
+"\n"
+" bridge: [stp yes|no]\n"
+" [priority <数字>]\n"
+" [forward-delay <2-30>]\n"
+" [hello-time <1-10>]\n"
+" [max-age <6-40>]\n"
+" [ageing-time <0-1000000>]\n"
+" [multicast-snooping yes|no]\n"
+" [mac <MAC 地址>]\n"
+"\n"
+" bridge-slave: master <主连接(接口名、连接的 UUID 或其名称)>\n"
+" [priority <0-63>]\n"
+" [path-cost <1-65535>]\n"
+" [hairpin yes|no]\n"
+"\n"
+" vpn: vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
+"ssh|l2tp|iodine|...\n"
+" [user <用户名>]\n"
+"\n"
+" olpc-mesh: ssid <SSID>\n"
+" [channel <1-13>]\n"
+" [dhcp-anycast <MAC 地址>]\n"
+"\n"
+" adsl: username <用户名>\n"
+" protocol pppoa|pppoe|ipoatm\n"
+" [password <密码>]\n"
+" [encapsulation vcmux|llc]\n"
+"\n"
+" tun: mode tun|tap\n"
+" [owner <UID>]\n"
+" [group <GID>]\n"
+" [pi yes|no]\n"
+" [vnet-hdr yes|no]\n"
+" [multi-queue yes|no]\n"
+"\n"
+" ip-tunnel: mode ipip|gre|sit|isatap|vti|ip6ip6|ipip6|ip6gre|vti6\n"
+" remote <远程端点 IP>\n"
+" [local <本地端点 IP>]\n"
+" [dev <上级设备(接口名或连接的 UUID)>]\n"
+"\n"
+" macsec: dev <上级设备(连接的 UUID、接口名或 MAC)>\n"
+" mode <psk|eap>\n"
+" [cak <key> ckn <key>]\n"
+" [encrypt yes|no]\n"
+" [port 1-65534]\n"
+"\n"
+"\n"
+" macvlan: dev <上级设备(连接的 UUID、接口名或 MAC)>\n"
+" mode vepa|bridge|private|passthru|source\n"
+" [tap yes|no]\n"
+"\n"
+" vxlan: id <VXLAN ID>\n"
+" remote <多播组或远程地址的 IP>\n"
+" [local <源 IP>]\n"
+" [dev <上级设备(接口名或连接的 UUID)>]\n"
+" [source-port-min <0-65535>]\n"
+" [source-port-max <0-65535>]\n"
+" [destination-port <0-65535>]\n"
+"\n"
+" wpan: [short-addr <0x0000-0xffff>]\n"
+"\n"
+" [pan-id <0x0000-0xffff>]\n"
+"\n"
+" [mac <MAC 地址>]\n"
+"\n"
+" 6lowpan: dev <上级设备(连接的 UUID、接口名 或 MAC)>\n"
+" dummy:\n"
+"\n"
+" 从属选项:\n"
+" bridge: [priority <0-63>]\n"
+" [path-cost <1-65535>]\n"
+" [hairpin yes|no]\n"
+"\n"
+" team: [config <文件>|<原始 JSON 数据>]\n"
+"\n"
+" IP_选项:\n"
+" [ip4 <IPv4 地址>] [gw4 <IPv4 网关>]\n"
+" [ip6 <IPv6 地址>] [gw6 <IPv6 网关>]\n"
+"\n"
-#: ../clients/cli/connections.c:389
+#: ../clients/cli/connections.c:1012
#, c-format
msgid ""
"Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -548,13 +781,15 @@ msgid ""
"nmcli con mod bond0 -bond.options downdelay\n"
"\n"
msgstr ""
-"用法:nmcli connection modify { ARGUMENTS | help }\n"
+"用法:nmcli connection modify { 参数 | help }\n"
"\n"
-"ARGUMENTS := [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
+"参数 := [id | uuid | path] <ID> ([+|-]<设置>.<属性> <值>)+\n"
"\n"
-"修改连接配置集的一个或多个属性。配置集是由其名称、UUID 或 D-Bus 路径来确定"
-"的。对于具有多个值的属性,您可以为属性名称使用可选的 '+' 或 '-' 前缀。'+' 标"
-"志允许附加项而不是覆盖整个值。'-' 标志允许删除选择的项而不是整个值。\n"
+"修改连接配置集的一个或多个属性。配置集由其名称、UUID 或 D-Bus 路径来确定。"
+"对\n"
+"于具有多个值的属性,您可以在属性名称前插入可选的 \"+\" 或 \"-\"。\"+\" 符号允"
+"许附加项\n"
+"而不是覆盖整个值。\"-\" 符号允许删除选中项而不是整个值。\n"
"\n"
"示例:\n"
"nmcli con mod home-wifi wifi.ssid rakosnicek\n"
@@ -567,7 +802,7 @@ msgstr ""
"nmcli con mod bond0 -bond.options downdelay\n"
"\n"
-#: ../clients/cli/connections.c:412
+#: ../clients/cli/connections.c:1035
#, c-format
msgid ""
"Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -580,15 +815,16 @@ msgid ""
"id (provided as <new name> argument).\n"
"\n"
msgstr ""
-"用法:nmcli connection clone { ARGUMENTS | help }\n"
+"用法:nmcli connection clone { 参数 | help }\n"
"\n"
-"ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
+"参数 := [--temporary] [id | uuid | path] <ID> <新名称>\n"
"\n"
-"克隆现有的连接配置集。新创建的连接将是 <ID> 的拷贝,除了 UUID 属性(将被生"
-"成)和 ID(作为 <new name> 参数提供)不同。\n"
+"克隆现有的连接配置集。新创建的连接将是 <ID> 的完全复制,除了 UUID 属性(将被"
+"生\n"
+"成)和 ID(由 <新名称> 参数提供)不同。\n"
"\n"
-#: ../clients/cli/connections.c:424
+#: ../clients/cli/connections.c:1047
#, c-format
msgid ""
"Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -607,15 +843,15 @@ msgstr ""
"\n"
"参数 := [id | uuid | path] <ID>\n"
"\n"
-"在交互式编辑器中编辑已有的连接配置文件。\n"
-"该配置文件由名称、UUID 或 D-Bus 路径确定。\n"
+"在交互式编辑器中编辑已有的连接配置集。\n"
+"配置集由其名称、UUID 或 D-Bus 路径来确定。\n"
"\n"
"参数 := [type <新连接类型>] [con-name <新连接名称>]\n"
"\n"
"在交互式编辑器中添加新的连接配置文件。\n"
"\n"
-#: ../clients/cli/connections.c:439
+#: ../clients/cli/connections.c:1062
#, c-format
msgid ""
"Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -630,11 +866,11 @@ msgstr ""
"\n"
"参数 := [id | uuid | path] <ID>\n"
"\n"
-"删除一个连接配置文件。\n"
-"该配置文件由名称、UUID 或 D-Bus 路径确定。\n"
+"删除一个连接配置集。\n"
+"配置集由其名称、UUID 或 D-Bus 路径来确定。\n"
"\n"
-#: ../clients/cli/connections.c:450
+#: ../clients/cli/connections.c:1073
#, c-format
msgid ""
"Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -646,14 +882,15 @@ msgid ""
"Monitors all connection profiles in case none is specified.\n"
"\n"
msgstr ""
-"用法:nmcli connection monitor { ARGUMENTS | help }\n"
+"用法:nmcli connection monitor { 参数 | help }\n"
"\n"
-"ARGUMENTS := [id | uuid | path] <ID> ...\n"
+"参数 := [id | uuid | path] <ID> ...\n"
+"\n"
+"监视连接配置集活动。\n"
+"每当指定的连接修改时,这个命令将其打印出来。如果没有指定则监视所有的连接。\n"
"\n"
-"监控连接配置集活动。每当指定的连接修改时,这个命令会打印一行。如果没有指定则"
-"监控所有的连接。 \n"
-#: ../clients/cli/connections.c:462
+#: ../clients/cli/connections.c:1085
#, c-format
msgid ""
"Usage: nmcli connection reload { help }\n"
@@ -666,7 +903,7 @@ msgstr ""
"从磁盘重新载入所有的连接文件。\n"
"\n"
-#: ../clients/cli/connections.c:470
+#: ../clients/cli/connections.c:1093
#, c-format
msgid ""
"Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -683,12 +920,11 @@ msgstr ""
"\n"
"参数 := <文件名> [<文件名>...]\n"
"\n"
-"从磁盘加载/重载一个或多个连接文件。在手动编辑\n"
-"连接文件后使用此方法以确保网络管理器能注意到\n"
-"最新状态。\n"
+"从磁盘加载/重载一个或多个连接文件。在手动编辑连接文件后使用此方法以确保\n"
+"网络管理器(NetworkManager)能注意到它的最新状态。\n"
"\n"
-#: ../clients/cli/connections.c:482
+#: ../clients/cli/connections.c:1105
#, c-format
msgid ""
"Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -702,15 +938,16 @@ msgid ""
"is imported by NetworkManager VPN plugins.\n"
"\n"
msgstr ""
-"用法: nmcli connection import { ARGUMENTS | help }\n"
+"用法:nmcli connection import { 参数 | help }\n"
"\n"
-"ARGUMENTS := [--temporary] type <type> file <file to import>\n"
+"参数 := [--temporary] type <类型> file <要导入的文件>\n"
"\n"
-"将外部配置作为 NetworkManager 连接配置导入。输入文件的类型是由 type 选项指定"
-"的。目前只支持 VPN 配置。配置是通过 NetworkManager VPN 插件导入的。\n"
+"将外部配置作为网络管理器(NetworkManager)连接配置导入。输入文件的类型由 "
+"type 选项指定。\n"
+"目前只支持 VPN 配置。配置通过 NetworkManager VPN 插件导入。\n"
"\n"
-#: ../clients/cli/connections.c:495
+#: ../clients/cli/connections.c:1118
#, c-format
msgid ""
"Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -721,444 +958,346 @@ msgid ""
"The data are directed to standard output or to a file if a name is given.\n"
"\n"
msgstr ""
-"用法:nmcli connection export { ARGUMENTS | help }\n"
+"用法:nmcli connection export { 参数 | help }\n"
"\n"
-"ARGUMENTS := [id | uuid | path] <ID> [<output file>]\n"
+"参数 := [id | uuid | path] <ID> [<输出文件>]\n"
+"\n"
+"导出连接。目前只支持 VPN 连接。数据会导出到标准输出或文件(如果给定了)。\n"
"\n"
-"导出连接。目前只支持 VPN 连接。数据会导出到标准输出或指定的文件。\n"
-
-#: ../clients/cli/connections.c:525
-msgid "activating"
-msgstr "激活中"
-
-#: ../clients/cli/connections.c:527
-msgid "activated"
-msgstr "已激活"
-
-#: ../clients/cli/connections.c:529 ../clients/common/nm-client-utils.c:243
-msgid "deactivating"
-msgstr "正在停用"
-
-#: ../clients/cli/connections.c:531
-msgid "deactivated"
-msgstr "已取消激活"
-
-#: ../clients/cli/connections.c:534 ../clients/cli/connections.c:557
-#: ../clients/cli/devices.c:1207 ../clients/cli/devices.c:1251
-#: ../clients/cli/devices.c:1253 ../clients/cli/general.c:41
-#: ../clients/cli/general.c:79 ../clients/cli/general.c:146
-#: ../clients/cli/general.c:151 ../clients/common/nm-client-utils.c:247
-#: ../clients/common/nm-client-utils.c:250
-#: ../clients/common/nm-client-utils.c:266
-#: ../clients/common/nm-client-utils.c:269
-#: ../clients/common/nm-meta-setting-desc.c:1479
-#: ../clients/common/nm-meta-setting-desc.c:1547
-#: ../clients/common/nm-meta-setting-desc.c:2692
-#: ../clients/common/nm-meta-setting-desc.c:2746
-msgid "unknown"
-msgstr "未知"
-
-#: ../clients/cli/connections.c:543
-msgid "VPN connecting (prepare)"
-msgstr "VPN 连接(准备)"
-
-#: ../clients/cli/connections.c:545
-msgid "VPN connecting (need authentication)"
-msgstr "VPN 连接中(需要验证)"
-
-#: ../clients/cli/connections.c:547
-msgid "VPN connecting"
-msgstr "VPN 连接中"
-
-#: ../clients/cli/connections.c:549
-msgid "VPN connecting (getting IP configuration)"
-msgstr "VPN 连接中(获取 IP 配置)"
-
-#: ../clients/cli/connections.c:551
-msgid "VPN connected"
-msgstr "VPN 已连接"
-
-#: ../clients/cli/connections.c:553
-msgid "VPN connection failed"
-msgstr "VPN 连接失败"
-
-#: ../clients/cli/connections.c:555
-msgid "VPN disconnected"
-msgstr "VPN 已断开"
-#: ../clients/cli/connections.c:625
+#: ../clients/cli/connections.c:1200
#, c-format
msgid "Error updating secrets for %s: %s\n"
-msgstr "更新 %s 的秘密出错:%s\n"
+msgstr "更新 %s 的密钥时出错:%s\n"
-#: ../clients/cli/connections.c:645
+#: ../clients/cli/connections.c:1243
msgid "Connection profile details"
msgstr "连接配置集详情"
-#: ../clients/cli/connections.c:658 ../clients/cli/connections.c:1108
+#: ../clients/cli/connections.c:1256 ../clients/cli/connections.c:1341
#, c-format
msgid "Error: 'connection show': %s"
-msgstr "错误:'connection show': %s"
-
-#: ../clients/cli/connections.c:876
-msgid "never"
-msgstr "从不"
-
-#. "CAPABILITIES"
-#: ../clients/cli/connections.c:877 ../clients/cli/connections.c:879
-#: ../clients/cli/connections.c:881 ../clients/cli/connections.c:914
-#: ../clients/cli/connections.c:981 ../clients/cli/connections.c:982
-#: ../clients/cli/connections.c:984 ../clients/cli/connections.c:4427
-#: ../clients/cli/connections.c:6365 ../clients/cli/connections.c:6366
-#: ../clients/cli/devices.c:881 ../clients/cli/devices.c:1170
-#: ../clients/cli/devices.c:1171 ../clients/cli/devices.c:1172
-#: ../clients/cli/devices.c:1173 ../clients/cli/devices.c:1174
-#: ../clients/cli/devices.c:1211 ../clients/cli/devices.c:1213
-#: ../clients/cli/devices.c:1214 ../clients/cli/devices.c:1244
-#: ../clients/cli/devices.c:1245 ../clients/cli/devices.c:1246
-#: ../clients/cli/devices.c:1247 ../clients/cli/devices.c:1248
-#: ../clients/cli/devices.c:1249 ../clients/cli/devices.c:1250
-#: ../clients/cli/devices.c:1252 ../clients/cli/devices.c:1254
-#: ../clients/cli/general.c:152 ../clients/common/nm-client-utils.c:258
-#: ../clients/common/nm-meta-setting-desc.c:719
-#: ../clients/common/nm-meta-setting-desc.c:2685
-msgid "yes"
-msgstr "是"
+msgstr "错误:\"connection show\":%s"
-#: ../clients/cli/connections.c:877 ../clients/cli/connections.c:879
-#: ../clients/cli/connections.c:881 ../clients/cli/connections.c:981
-#: ../clients/cli/connections.c:982 ../clients/cli/connections.c:984
-#: ../clients/cli/connections.c:4426 ../clients/cli/connections.c:6365
-#: ../clients/cli/connections.c:6366 ../clients/cli/devices.c:881
-#: ../clients/cli/devices.c:1170 ../clients/cli/devices.c:1171
-#: ../clients/cli/devices.c:1172 ../clients/cli/devices.c:1173
-#: ../clients/cli/devices.c:1174 ../clients/cli/devices.c:1211
-#: ../clients/cli/devices.c:1213 ../clients/cli/devices.c:1214
-#: ../clients/cli/devices.c:1244 ../clients/cli/devices.c:1245
-#: ../clients/cli/devices.c:1246 ../clients/cli/devices.c:1247
-#: ../clients/cli/devices.c:1248 ../clients/cli/devices.c:1249
-#: ../clients/cli/devices.c:1250 ../clients/cli/devices.c:1252
-#: ../clients/cli/devices.c:1254 ../clients/cli/general.c:153
-#: ../clients/common/nm-client-utils.c:260
-#: ../clients/common/nm-meta-setting-desc.c:719
-#: ../clients/common/nm-meta-setting-desc.c:2688
-msgid "no"
-msgstr "否"
-
-#: ../clients/cli/connections.c:1098
+#: ../clients/cli/connections.c:1331
msgid "Activate connection details"
-msgstr "激活连接细节"
+msgstr "激活连接详情"
-#: ../clients/cli/connections.c:1345
+#: ../clients/cli/connections.c:1439 ../clients/cli/devices.c:1484
+#: ../clients/cli/devices.c:1498 ../clients/cli/devices.c:1513
+#: ../clients/cli/devices.c:1571 ../clients/cli/devices.c:1673
+msgid "NAME"
+msgstr "名称"
+
+#: ../clients/cli/connections.c:1527
#, c-format
msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
-msgstr "无效字段 '%s'; 允许的字段为 %s 和 %s,或 %s,%s。"
+msgstr "无效字段 \"%s\";允许的字段为 %s 和 %s,或 %s,%s"
-#: ../clients/cli/connections.c:1360 ../clients/cli/connections.c:1368
+#: ../clients/cli/connections.c:1542 ../clients/cli/connections.c:1550
#, c-format
msgid "'%s' has to be alone"
-msgstr "'%s' 必须是单独的"
+msgstr "\"%s\" 必须是单独的"
-#: ../clients/cli/connections.c:1568
+#: ../clients/cli/connections.c:1815
#, c-format
msgid "incorrect string '%s' of '--order' option"
-msgstr "'--order' 选项的错误字符串 '%s' "
+msgstr "\"--order\" 选项的字符串 \"%s\" 错误"
-#: ../clients/cli/connections.c:1594
+#: ../clients/cli/connections.c:1840
#, c-format
msgid "incorrect item '%s' in '--order' option"
-msgstr "'--order' 选项里的错误项 '%s' "
+msgstr "\"--order\" 选项里有错误项 \"%s\""
-#: ../clients/cli/connections.c:1624
+#: ../clients/cli/connections.c:1878
msgid "No connection specified"
-msgstr ""
+msgstr "未指定连接"
-#: ../clients/cli/connections.c:1639
+#: ../clients/cli/connections.c:1889
#, c-format
msgid "%s argument is missing"
-msgstr ""
+msgstr "缺少 %s 参数"
-#: ../clients/cli/connections.c:1649
+#: ../clients/cli/connections.c:1907
#, c-format
msgid "unknown connection '%s'"
-msgstr ""
+msgstr "未知的连接 \"%s\""
-#: ../clients/cli/connections.c:1682
+#: ../clients/cli/connections.c:1936
msgid "'--order' argument is missing"
-msgstr "缺少 '--order' 参数"
+msgstr "缺少 \"--order\" 参数"
-#: ../clients/cli/connections.c:1737
+#: ../clients/cli/connections.c:1997
msgid "NetworkManager active profiles"
-msgstr "NetworkManager 的活动配置集"
+msgstr "网络管理器活动的配置集"
-#: ../clients/cli/connections.c:1738
+#: ../clients/cli/connections.c:1998
msgid "NetworkManager connection profiles"
-msgstr "NetworkManager 连接配置集"
-
-#: ../clients/cli/connections.c:1791 ../clients/cli/connections.c:2466
-#: ../clients/cli/connections.c:2478 ../clients/cli/connections.c:2490
-#: ../clients/cli/connections.c:2666 ../clients/cli/connections.c:8428
-#: ../clients/cli/connections.c:8445 ../clients/cli/devices.c:2678
-#: ../clients/cli/devices.c:2689 ../clients/cli/devices.c:2931
-#: ../clients/cli/devices.c:2942 ../clients/cli/devices.c:2960
-#: ../clients/cli/devices.c:2969 ../clients/cli/devices.c:2990
-#: ../clients/cli/devices.c:3001 ../clients/cli/devices.c:3019
-#: ../clients/cli/devices.c:3397 ../clients/cli/devices.c:3407
-#: ../clients/cli/devices.c:3415 ../clients/cli/devices.c:3427
-#: ../clients/cli/devices.c:3442 ../clients/cli/devices.c:3450
-#: ../clients/cli/devices.c:3624 ../clients/cli/devices.c:3635
-#: ../clients/cli/devices.c:3807
+msgstr "网络管理器连接配置集"
+
+#: ../clients/cli/connections.c:2050 ../clients/cli/connections.c:2749
+#: ../clients/cli/connections.c:2761 ../clients/cli/connections.c:2773
+#: ../clients/cli/connections.c:2999 ../clients/cli/connections.c:8702
+#: ../clients/cli/connections.c:8718 ../clients/cli/devices.c:3037
+#: ../clients/cli/devices.c:3049 ../clients/cli/devices.c:3062
+#: ../clients/cli/devices.c:3213 ../clients/cli/devices.c:3224
+#: ../clients/cli/devices.c:3242 ../clients/cli/devices.c:3251
+#: ../clients/cli/devices.c:3272 ../clients/cli/devices.c:3283
+#: ../clients/cli/devices.c:3301 ../clients/cli/devices.c:3681
+#: ../clients/cli/devices.c:3691 ../clients/cli/devices.c:3699
+#: ../clients/cli/devices.c:3711 ../clients/cli/devices.c:3726
+#: ../clients/cli/devices.c:3734 ../clients/cli/devices.c:3908
+#: ../clients/cli/devices.c:3919 ../clients/cli/devices.c:4090
#, c-format
msgid "Error: %s argument is missing."
msgstr "错误:缺少 %s 参数。"
-#: ../clients/cli/connections.c:1810
+#: ../clients/cli/connections.c:2078
#, c-format
msgid "Error: %s - no such connection profile."
msgstr "错误:%s - 没有这样的连接配置集。"
-#: ../clients/cli/connections.c:1874 ../clients/cli/connections.c:2453
-#: ../clients/cli/connections.c:2517 ../clients/cli/connections.c:7938
-#: ../clients/cli/connections.c:8049 ../clients/cli/connections.c:8559
-#: ../clients/cli/devices.c:1579 ../clients/cli/devices.c:1865
-#: ../clients/cli/devices.c:2034 ../clients/cli/devices.c:2142
-#: ../clients/cli/devices.c:2331 ../clients/cli/devices.c:3587
-#: ../clients/cli/devices.c:3813 ../clients/cli/general.c:928
+#: ../clients/cli/connections.c:2169 ../clients/cli/connections.c:2736
+#: ../clients/cli/connections.c:2800 ../clients/cli/connections.c:8226
+#: ../clients/cli/connections.c:8332 ../clients/cli/connections.c:8818
+#: ../clients/cli/devices.c:1758 ../clients/cli/devices.c:2044
+#: ../clients/cli/devices.c:2213 ../clients/cli/devices.c:2321
+#: ../clients/cli/devices.c:2510 ../clients/cli/devices.c:3871
+#: ../clients/cli/devices.c:4096 ../clients/cli/general.c:917
#, c-format
msgid "Error: %s."
msgstr "错误:%s。"
-#: ../clients/cli/connections.c:1972
+#: ../clients/cli/connections.c:2262
#, c-format
msgid "no active connection on device '%s'"
-msgstr "设备“%s”中没有活跃连接"
+msgstr "设备 \"%s\" 上没有活动的连接"
-#: ../clients/cli/connections.c:1980
+#: ../clients/cli/connections.c:2270
msgid "no active connection or device"
-msgstr "没有活跃连接或者设备"
+msgstr "没有活动的连接或设备"
-#: ../clients/cli/connections.c:2000
+#: ../clients/cli/connections.c:2290
#, c-format
msgid "device '%s' not compatible with connection '%s':"
-msgstr ""
+msgstr "设备 \"%s\" 与连接 \"%s\" 不兼容:"
-#: ../clients/cli/connections.c:2036
+#: ../clients/cli/connections.c:2323
#, c-format
msgid "device '%s' not compatible with connection '%s'"
-msgstr "设备“%s”不兼容连接“%s”"
+msgstr "设备 \"%s\" 与连接 \"%s\" 不兼容"
-#: ../clients/cli/connections.c:2039
+#: ../clients/cli/connections.c:2326
#, c-format
msgid "no device found for connection '%s'"
-msgstr "没有找到可用于连接“%s”的设备"
+msgstr "没有找到可用于连接 \"%s\" 的设备"
-#: ../clients/cli/connections.c:2067
+#: ../clients/cli/connections.c:2358
#, c-format
msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
-msgstr ""
+msgstr "连接已成功激活(%s)(D-Bus 活动路径:%s)\n"
-#: ../clients/cli/connections.c:2071 ../clients/cli/connections.c:2219
-#: ../clients/cli/connections.c:6244
+#: ../clients/cli/connections.c:2362 ../clients/cli/connections.c:2510
+#: ../clients/cli/connections.c:6590
#, c-format
msgid "Connection successfully activated (D-Bus active path: %s)\n"
msgstr "连接已成功激活(D-Bus 活动路径:%s)\n"
-#: ../clients/cli/connections.c:2078 ../clients/cli/connections.c:2199
+#: ../clients/cli/connections.c:2369 ../clients/cli/connections.c:2490
#, c-format
msgid "Error: Connection activation failed: %s"
-msgstr "错误:激活连接失败:%s"
+msgstr "错误:连接激活失败:%s"
-#: ../clients/cli/connections.c:2114
+#: ../clients/cli/connections.c:2405
#, c-format
msgid "Error: Timeout expired (%d seconds)"
-msgstr ""
+msgstr "错误:超时时间已到(%d 秒)"
-#: ../clients/cli/connections.c:2280
+#: ../clients/cli/connections.c:2572
#, c-format
msgid "failed to read passwd-file '%s': %s"
-msgstr "读取 passwd-file '%s' 失败:%s"
+msgstr "读取 passwd-file \"%s\" 失败:%s"
-#: ../clients/cli/connections.c:2292
+#: ../clients/cli/connections.c:2585
#, c-format
msgid "missing colon in 'password' entry '%s'"
-msgstr "'password' 条目 '%s' 缺失了冒号"
+msgstr "\"password\" 条目 \"%s\" 缺失了冒号"
-#: ../clients/cli/connections.c:2300
+#: ../clients/cli/connections.c:2593
#, c-format
msgid "missing dot in 'password' entry '%s'"
-msgstr "'password' 条目 '%s' 缺失了点号"
+msgstr "\"password\" 条目 \"%s\" 缺失了点号"
-#: ../clients/cli/connections.c:2313
+#: ../clients/cli/connections.c:2606
#, c-format
msgid "invalid setting name in 'password' entry '%s'"
-msgstr "'password' 条目 '%s' 里出现无效的设置名称"
+msgstr "\"password\" 条目 \"%s\" 里出现无效的设置名称"
-#: ../clients/cli/connections.c:2369
+#: ../clients/cli/connections.c:2652
#, c-format
msgid "unknown device '%s'."
-msgstr "未知设备“%s”"
+msgstr "未知设备 \"%s\"。"
-#: ../clients/cli/connections.c:2374
+#: ../clients/cli/connections.c:2657
msgid "neither a valid connection nor device given"
-msgstr "没有给定有效连接或者设备"
+msgstr "没有给定有效的连接或设备"
-#: ../clients/cli/connections.c:2500 ../clients/cli/devices.c:1530
-#: ../clients/cli/devices.c:2696 ../clients/cli/devices.c:3032
-#: ../clients/cli/devices.c:3641
+#: ../clients/cli/connections.c:2783 ../clients/cli/devices.c:1717
+#: ../clients/cli/devices.c:3094 ../clients/cli/devices.c:3314
+#: ../clients/cli/devices.c:3925
#, c-format
msgid "Unknown parameter: %s\n"
msgstr "未知参数:%s\n"
-#: ../clients/cli/connections.c:2525
+#: ../clients/cli/connections.c:2808
msgid "preparing"
-msgstr "正在准备"
+msgstr "准备中"
-#: ../clients/cli/connections.c:2545
+#: ../clients/cli/connections.c:2916
#, c-format
msgid "Connection '%s' (%s) successfully deleted.\n"
-msgstr "成功删除连接 '%s'(%s)。\n"
+msgstr "成功删除连接 \"%s\" (%s)。\n"
-#: ../clients/cli/connections.c:2561
+#: ../clients/cli/connections.c:2932
#, c-format
msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
msgstr ""
-"成功取消激活连接 '%s'(D-Bus 活动路径:%s)\n"
+"成功停用连接 \"%s\"(D-Bus 活动路径:%s)\n"
"\n"
-#: ../clients/cli/connections.c:2642 ../clients/cli/connections.c:8164
-#: ../clients/cli/connections.c:8196 ../clients/cli/connections.c:8353
+#: ../clients/cli/connections.c:2981 ../clients/cli/connections.c:8439
+#: ../clients/cli/connections.c:8470 ../clients/cli/connections.c:8628
#, c-format
msgid "Error: No connection specified."
msgstr "错误:未指定连接。"
-#: ../clients/cli/connections.c:2683
+#: ../clients/cli/connections.c:3011
#, c-format
msgid "Error: '%s' is not an active connection.\n"
-msgstr "错误:'%s' 不是活跃连接。\n"
+msgstr "错误:\"%s\" 不是活动的连接。\n"
-#: ../clients/cli/connections.c:2684
+#: ../clients/cli/connections.c:3012
#, c-format
msgid "Error: not all active connections found."
msgstr "错误:未找到所有的活动连接。"
-#: ../clients/cli/connections.c:2693
+#: ../clients/cli/connections.c:3020
#, c-format
msgid "Error: no active connection provided."
msgstr "错误:未提供活动连接。"
-#: ../clients/cli/connections.c:2727
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:3051
+#, c-format
msgid "Connection '%s' deactivation failed: %s\n"
-msgstr "错误:激活连接失败:%s"
+msgstr "错误:停用连接 \"%s\" 失败:%s\n"
-#: ../clients/cli/connections.c:2983 ../clients/cli/connections.c:3040
-#: ../clients/common/nm-client-utils.c:169
+#: ../clients/cli/connections.c:3302 ../clients/cli/connections.c:3359
+#: ../clients/common/nm-client-utils.c:221
#, c-format
msgid "'%s' not among [%s]"
-msgstr "'%s' 不在 [%s] 中"
+msgstr "\"%s\" 不在 [%s] 中"
#. We should not really come here
-#: ../clients/cli/connections.c:3003 ../clients/cli/connections.c:3063
-#: ../clients/common/nm-client-utils.c:279
+#: ../clients/cli/connections.c:3322 ../clients/cli/connections.c:3382
+#: ../clients/common/nm-client-utils.c:289
#, c-format
msgid "Unknown error"
msgstr "未知错误"
-#: ../clients/cli/connections.c:3197
+#: ../clients/cli/connections.c:3516
#, c-format
msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr "警告: master='%s' 没有应用任何现有的配置集。\n"
+msgstr "警告:master=\"%s\" 没有引用任何现有的配置集。\n"
-#: ../clients/cli/connections.c:3534
+#: ../clients/cli/connections.c:3865
#, c-format
msgid "Error: invalid property '%s': %s."
-msgstr "错误:无效的属性“%s”:%s。"
+msgstr "错误:无效的属性 \"%s\":%s。"
-#: ../clients/cli/connections.c:3551
+#: ../clients/cli/connections.c:3882
#, c-format
msgid "Error: failed to modify %s.%s: %s."
msgstr "错误:修改 %s.%s 失败:%s。"
-#: ../clients/cli/connections.c:3570
+#: ../clients/cli/connections.c:3902
#, c-format
msgid "Error: failed to remove a value from %s.%s: %s."
msgstr "错误:从 %s.%s 删除值失败:%s。"
-#: ../clients/cli/connections.c:3604
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:3936
+#, c-format
msgid "Error: '%s' is mandatory."
-msgstr "错误:设置“%s”是必填的而且无法移除。\n"
+msgstr "错误:设置 \"%s\" 是必填的。"
-#: ../clients/cli/connections.c:3631
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:3963
+#, c-format
msgid "Error: invalid slave type; %s."
-msgstr "错误:无效的连接类型;%s。"
+msgstr "错误:无效的从属类型;%s。"
-#: ../clients/cli/connections.c:3639
+#: ../clients/cli/connections.c:3971
#, c-format
msgid "Error: invalid connection type; %s."
msgstr "错误:无效的连接类型;%s。"
-#: ../clients/cli/connections.c:3716
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4048
+#, c-format
msgid "Error: bad connection type: %s"
-msgstr "错误:无效的连接类型;%s。"
+msgstr "错误:错误的连接类型:%s"
-#: ../clients/cli/connections.c:3762
+#: ../clients/cli/connections.c:4094
#, c-format
msgid "Error: '%s': %s"
-msgstr ""
+msgstr "错误:\"%s\":%s"
-#: ../clients/cli/connections.c:3783
-#, fuzzy
+#: ../clients/cli/connections.c:4115
msgid "Error: master is required"
msgstr "错误:需要主连接"
-#: ../clients/cli/connections.c:3842
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4174
+#, c-format
msgid "Error: error adding bond option '%s=%s'."
-msgstr "错误:未知连接“%s”。"
+msgstr "错误:添加绑定(bond)选项 \"%s=%s\" 时出错。"
-#: ../clients/cli/connections.c:3873
+#: ../clients/cli/connections.c:4205
#, c-format
msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
-msgstr "错误:“%s”不是有效的监控模式;使用“%s”或“%s”。\n"
+msgstr "错误:\"%s\" 不是有效的监视模式;使用 \"%s\" 或 \"%s\"。\n"
-#: ../clients/cli/connections.c:3904
+#: ../clients/cli/connections.c:4236
#, c-format
msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]."
-msgstr ""
+msgstr "错误:\"bt-type\":\"%s\" 无效;使用 [%s, %s, %s (%s), %s]。"
-#: ../clients/cli/connections.c:4153
+#: ../clients/cli/connections.c:4485
#, c-format
msgid "Error: value for '%s' is missing."
-msgstr "错误:缺失了 '%s' 的值。"
+msgstr "错误:缺少 \"%s\" 的值。"
-#: ../clients/cli/connections.c:4199
+#: ../clients/cli/connections.c:4531
msgid "Error: <setting>.<property> argument is missing."
msgstr "错误:缺少 <设置>.<属性> 参数。"
-#: ../clients/cli/connections.c:4222
+#: ../clients/cli/connections.c:4554
#, c-format
msgid "Error: invalid or not allowed setting '%s': %s."
-msgstr "错误:无效或不允许的设置“%s”:%s。"
+msgstr "错误:无效或不允许的设置 \"%s\":%s。"
-#: ../clients/cli/connections.c:4268 ../clients/cli/connections.c:4284
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4600 ../clients/cli/connections.c:4616
+#, c-format
msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
-msgstr "“%s” 含义模糊 (%s x %s)"
+msgstr "错误:\"%s\" 不明确(%s.%s 或 %s.%s)。"
-#: ../clients/cli/connections.c:4302
+#: ../clients/cli/connections.c:4634
#, c-format
msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "错误:无效的 <设置>.<属性> “%s”。"
+msgstr "错误:无效的 <设置>.<属性> \"%s\"。"
-#: ../clients/cli/connections.c:4346 ../clients/cli/connections.c:7989
+#: ../clients/cli/connections.c:4678 ../clients/cli/connections.c:8272
#, c-format
msgid "Error: Failed to add '%s' connection: %s"
-msgstr "错误:添加 '%s' 连接失败:%s"
+msgstr "错误:添加 \"%s\" 连接失败:%s"
-#: ../clients/cli/connections.c:4364
+#: ../clients/cli/connections.c:4696
#, c-format
msgid ""
"Warning: There is another connection with the name '%1$s'. Reference the "
@@ -1167,55 +1306,76 @@ msgid_plural ""
"Warning: There are %3$u other connections with the name '%1$s'. Reference "
"the connection by its uuid '%2$s'\n"
msgstr[0] ""
+"警告:存在 %3$u 条名为 \"%1$s\" 的其他连接。可由它的 uuid \"%2$s\" 引用\n"
-#: ../clients/cli/connections.c:4373
+#: ../clients/cli/connections.c:4705
#, c-format
msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "连接“%s”(%s) 已成功添加。\n"
+msgstr "连接 \"%s\" (%s) 已成功添加。\n"
+
+#: ../clients/cli/connections.c:4758 ../clients/cli/connections.c:6707
+#: ../clients/cli/connections.c:6708 ../clients/cli/devices.c:512
+#: ../clients/cli/devices.c:519 ../clients/cli/devices.c:1238
+#: ../clients/cli/general.c:157 ../clients/cli/utils.h:292
+#: ../clients/common/nm-client-utils.c:279
+#: ../clients/common/nm-meta-setting-desc.c:754
+#: ../clients/common/nm-meta-setting-desc.c:2702
+msgid "no"
+msgstr "否"
-#: ../clients/cli/connections.c:4511
+#: ../clients/cli/connections.c:4759 ../clients/cli/connections.c:6707
+#: ../clients/cli/connections.c:6708 ../clients/cli/devices.c:511
+#: ../clients/cli/devices.c:518 ../clients/cli/devices.c:1238
+#: ../clients/cli/general.c:156 ../clients/cli/utils.h:292
+#: ../clients/common/nm-client-utils.c:278
+#: ../clients/common/nm-meta-setting-desc.c:754
+#: ../clients/common/nm-meta-setting-desc.c:2699
+msgid "yes"
+msgstr "是"
+
+#: ../clients/cli/connections.c:4845
#, c-format
msgid ""
"You can specify this option more than once. Press <Enter> when you're done.\n"
-msgstr ""
+msgstr "您可以多次指定此选项。按下 <回车键> 以完成。\n"
#. Ask for optional arguments.
-#: ../clients/cli/connections.c:4610
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4944
+#, c-format
msgid "There is %d optional setting for %s.\n"
msgid_plural "There are %d optional settings for %s.\n"
-msgstr[0] "有 %d 可选参数可用于“%s”连接类型。\n"
+msgstr[0] "%2$s 有 %1$d 个可选的设置。\n"
-#: ../clients/cli/connections.c:4613
+#: ../clients/cli/connections.c:4947
#, c-format
msgid "Do you want to provide it? %s"
msgid_plural "Do you want to provide them? %s"
msgstr[0] "您要提供它吗?%s"
-#: ../clients/cli/connections.c:4749 ../clients/cli/utils.c:303
+#: ../clients/cli/connections.c:5080 ../clients/cli/utils.c:294
#, c-format
msgid "Error: value for '%s' argument is required."
-msgstr "错误:需要 “%s” 参数值。"
+msgstr "错误:需要 \"%s\" 参数的值。"
-#: ../clients/cli/connections.c:4755
+#: ../clients/cli/connections.c:5087
#, c-format
msgid "Error: 'save': %s."
-msgstr "错误:'save': %s。"
+msgstr "错误:\"save\":%s。"
-#: ../clients/cli/connections.c:4843 ../clients/cli/connections.c:4854
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:5173 ../clients/cli/connections.c:5184
+#, c-format
msgid "Error: '%s' argument is required."
-msgstr "错误:需要“type”参数。"
+msgstr "错误:需要 \"%s\" 参数。"
-#: ../clients/cli/connections.c:5832
+#: ../clients/cli/connections.c:6149
#, c-format
msgid "['%s' setting values]\n"
-msgstr "[“%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:5911
+#: ../clients/cli/connections.c:6258
#, c-format
msgid ""
"---[ Main menu ]---\n"
@@ -1233,22 +1393,21 @@ msgid ""
"nmcli <conf-option> <value> :: nmcli configuration\n"
"quit :: exit nmcli\n"
msgstr ""
-"---[ Main menu ]---\n"
-"goto [<setting> | <prop>] :: go to a setting or property\n"
-"remove <setting>[.<prop>] | <prop> :: remove setting or reset property "
-"value\n"
-"set [<setting>.<prop> <value>] :: set property value\n"
-"describe [<setting>.<prop>] :: describe property\n"
-"print [all | <setting>[.<prop>]] :: print the connection\n"
-"verify [all | fix] :: verify the connection\n"
-"save [persistent|temporary] :: save the connection\n"
-"activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n"
-"back :: go one level up (back)\n"
-"help/? [<command>] :: print this help\n"
-"nmcli <conf-option> <value> :: nmcli configuration\n"
-"quit :: exit nmcli\n"
+"---[ 主菜单 ]---\n"
+"goto [<设置> | <属性>] :: 转到设置或属性\n"
+"remove <设置>[.<属性>] | <属性> :: 移除设置或重置属性值\n"
+"set [<设置>.<属性> <值>] :: 设置属性值\n"
+"describe [<设置>.<属性>] :: 描述属性\n"
+"print [all | <设置>[.<属性>]] :: 输出连接\n"
+"verify [all | fix] :: 验证连接\n"
+"save [persistent|temporary] :: 保存连接\n"
+"activate [<接口名>] [/<ap>|<nsp>] :: 激活连接\n"
+"back :: 转到上层(返回)\n"
+"help/? [<命令>] :: 输出此帮助\n"
+"nmcli <配置选项> <值> :: nmcli configuration\n"
+"quit :: 退出 nmcli\n"
-#: ../clients/cli/connections.c:5938
+#: ../clients/cli/connections.c:6285
#, c-format
msgid ""
"goto <setting>[.<prop>] | <prop> :: enter setting/property for editing\n"
@@ -1264,10 +1423,10 @@ msgstr ""
"该命令进入设置或属性来进行编辑。\n"
"\n"
"示例:nmcli> goto connection\n"
-" nmcli connection> goto secondaries\n"
-" nmcli> goto ipv4.addresses\n"
+" nmcli connection> goto secondaries\n"
+" nmcli> goto ipv4.addresses\n"
-#: ../clients/cli/connections.c:5945
+#: ../clients/cli/connections.c:6292
#, c-format
msgid ""
"remove <setting>[.<prop>] :: remove setting or reset property value\n"
@@ -1284,9 +1443,9 @@ msgstr ""
"该命令移除来自连接的输入项设置,或者如果给定属性,重置该属性为默认值。\n"
"\n"
"示例:nmcli> remove wifi-sec\n"
-" nmcli> remove eth.mtu\n"
+" nmcli> remove eth.mtu\n"
-#: ../clients/cli/connections.c:5952
+#: ../clients/cli/connections.c:6299
#, c-format
msgid ""
"set [<setting>.<prop> <value>] :: set property value\n"
@@ -1301,7 +1460,7 @@ msgstr ""
"\n"
"示例:nmcli> set con.id 我的连接\n"
-#: ../clients/cli/connections.c:5957
+#: ../clients/cli/connections.c:6304
#, c-format
msgid ""
"describe [<setting>.<prop>] :: describe property\n"
@@ -1311,10 +1470,10 @@ msgid ""
msgstr ""
"describe [<设置>.<属性>] :: 描述属性\n"
"\n"
-"显示属性描述。您肯依参阅 nm-settings(5) 手册页来查看全部的网络管理器设置和属"
-"性。\n"
+"显示属性描述。您可以参阅 nm-settings(5) 手册页来查看全部的网络管理器"
+"(NetworkManager)设置和属性。\n"
-#: ../clients/cli/connections.c:5962
+#: ../clients/cli/connections.c:6309
#, c-format
msgid ""
"print [all] :: print setting or connection values\n"
@@ -1325,11 +1484,11 @@ msgid ""
msgstr ""
"print [all] :: 输出设置或连接值\n"
"\n"
-"显示当前属性或全部的连接。\n"
+"显示当前属性或整个连接。\n"
"\n"
"示例:nmcli ipv4> print all\n"
-#: ../clients/cli/connections.c:5967
+#: ../clients/cli/connections.c:6314
#, c-format
msgid ""
"verify [all | fix] :: verify setting or connection validity\n"
@@ -1343,16 +1502,17 @@ msgid ""
" nmcli> verify fix\n"
" nmcli bond> verify\n"
msgstr ""
-"verify [all | fix] :: 检验设置或连接的有效性\n"
+"verify [all | fix] :: 验证设置或连接的有效性\n"
"\n"
-"检验设置或连接是否有效且可在以后保存。发生错误时它会提示值无效。某些错误可以"
-"通过 'fix' 选项自动修复。\n"
+"验证设置或连接是否有效和可以稍后保存。发生错误时它会指出无效的值。有些错误可"
+"以\n"
+"通过 \"fix\" 选项自动修复。\n"
"\n"
"示例: nmcli> verify\n"
-" nmcli> verify fix\n"
-" nmcli bond> verify\n"
+" nmcli> verify fix\n"
+" nmcli bond> verify\n"
-#: ../clients/cli/connections.c:5976
+#: ../clients/cli/connections.c:6323
#, c-format
msgid ""
"save [persistent|temporary] :: save the connection\n"
@@ -1369,16 +1529,16 @@ msgid ""
msgstr ""
"save [persistent|temporary] :: 保存连接\n"
"\n"
-"发送连接配置集到 NetworkManager,或是永久保存 ,\n"
-"或是只保存在内存里。不带参数的 'save' \n"
-"表示 'save persistent'。\n"
-"请注意,一旦您永久地保存了配置集,这些设置在\n"
-"重启后都会存在。随后的修改可以是临时的,也\n"
-"可以是永久的,但任何临时的修改在重启后都会复原。\n"
-"如果您项完全删除持久性连接,连接配置集就必须\n"
-"被删除。\n"
+"发送连接配置集到网络管理器(NetworkManager),可以选择永久保存或者是只保存在"
+"内存里。不带参数\n"
+"的 \"save\" 表示 \"save persistent\"。\n"
+"请注意,一旦您永久地保存了配置集,这些设置在重启机器/NM 后都会存在。随后的修"
+"改\n"
+"可以是临时的,也可以是永久的,但任何临时的修改在重启后都会复原。如果您想完全"
+"删\n"
+"除永久性连接,连接配置集就必须被删除。\n"
-#: ../clients/cli/connections.c:5987
+#: ../clients/cli/connections.c:6334
#, c-format
msgid ""
"activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n"
@@ -1390,24 +1550,25 @@ msgid ""
"/<ap>|<nsp> - AP (Wi-Fi) or NSP (WiMAX) (prepend with / when <ifname> is not "
"specified)\n"
msgstr ""
-"activate [<ifname>] [/<ap>|<nsp>] :: 激活连接\n"
+"activate [<接口名>] [/<ap>|<nsp>] :: 激活连接\n"
"\n"
"激活连接。\n"
"\n"
"可用选项:\n"
-"<ifname> - 在其中激活连接的设备。\n"
-"/<ap>|<nsp> - AP (Wi-Fi) 或者 NSP (WiMAX) (未指定 <ifname> 时用 / 做前缀。)\n"
+"<接口名> - 将激活连接的设备。\n"
+"/<ap>|<nsp> - AP (Wi-Fi) 或者 NSP (WiMAX)(未指定 <接口名> 时前置 / 符"
+"号。)\n"
-#: ../clients/cli/connections.c:5994 ../clients/cli/connections.c:6153
+#: ../clients/cli/connections.c:6341 ../clients/cli/connections.c:6499
#, c-format
msgid ""
"back :: go to upper menu level\n"
"\n"
msgstr ""
-"back :: 转到上级菜单\n"
+"back :: 转到上层菜单\n"
"\n"
-#: ../clients/cli/connections.c:5997
+#: ../clients/cli/connections.c:6344
#, c-format
msgid ""
"help/? [<command>] :: help for the nmcli commands\n"
@@ -1416,7 +1577,7 @@ msgstr ""
"help/? [<命令>] :: nmcli 命令的帮助\n"
"\n"
-#: ../clients/cli/connections.c:6000
+#: ../clients/cli/connections.c:6347
#, c-format
msgid ""
"nmcli [<conf-option> <value>] :: nmcli configuration\n"
@@ -1431,19 +1592,19 @@ msgid ""
" nmcli> nmcli save-confirmation no\n"
" nmcli> nmcli prompt-color 3\n"
msgstr ""
-"nmcli [<conf-option> <value>] :: nmcli 配置\n"
+"nmcli [<配置选项> <值>] :: nmcli 配置\n"
"\n"
"配置 nmcli。以下是可用选项:\n"
-"status-line yes | no [default: no]\n"
-"save-confirmation yes | no [default: yes]\n"
-"show-secrets yes | no [default: no]\n"
-"prompt-color <color> | <0-8> [default: 0]\n"
+"status-line yes | no [默认:no]\n"
+"save-confirmation yes | no [默认:yes]\n"
+"show-secrets yes | no [默认:no]\n"
+"prompt-color <颜色> | <0-8> [默认:0]\n"
"%s\n"
"示例: nmcli> nmcli status-line yes\n"
-" nmcli> nmcli save-confirmation no\n"
-" nmcli> nmcli prompt-color 3\n"
+" nmcli> nmcli save-confirmation no\n"
+" nmcli> nmcli prompt-color 3\n"
-#: ../clients/cli/connections.c:6022 ../clients/cli/connections.c:6159
+#: ../clients/cli/connections.c:6369 ../clients/cli/connections.c:6505
#, c-format
msgid ""
"quit :: exit nmcli\n"
@@ -1453,18 +1614,18 @@ msgid ""
msgstr ""
"quit :: 退出 nmcli\n"
"\n"
-"此命令用于退出 nmcli。当被编辑的连接没有保存,会询问用户确定操作。\n"
+"此命令用于退出 nmcli。当被编辑的连接没有保存时,会询问用户确定操作。\n"
-#: ../clients/cli/connections.c:6027 ../clients/cli/connections.c:6164
-#: ../clients/cli/connections.c:6600 ../clients/cli/connections.c:7557
+#: ../clients/cli/connections.c:6374 ../clients/cli/connections.c:6510
+#: ../clients/cli/connections.c:6929 ../clients/cli/connections.c:7856
#, c-format
msgid "Unknown command: '%s'\n"
-msgstr "未知命令:“%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:6093
+#: ../clients/cli/connections.c:6439
#, c-format
msgid ""
"---[ Property menu ]---\n"
@@ -1480,17 +1641,17 @@ msgid ""
"quit :: exit nmcli\n"
msgstr ""
"---[ 属性菜单 ]---\n"
-"set [<值>] :: 设置新值\n"
-"add [<值>] :: 添加新选项到属性\n"
+"set [<值>] :: 设置新值\n"
+"add [<值>] :: 添加新选项到属性\n"
"change :: 更改当前值\n"
-"remove [<目录> | <选项>] :: 删除该值\n"
+"remove [<目录> | <选项>] :: 删除该值\n"
"describe :: 描述属性\n"
-"print [setting | connection] :: 输出 (设置/连接) 值\n"
+"print [setting | connection] :: 输出(设置/连接)值\n"
"back :: 转到上一级\n"
-"help/? [<命令>] :: 输出该帮助或命令描述\n"
+"help/? [<命令>] :: 输出该帮助或命令描述\n"
"quit :: 退出 nmcli\n"
-#: ../clients/cli/connections.c:6118
+#: ../clients/cli/connections.c:6464
#, c-format
msgid ""
"set [<value>] :: set new value\n"
@@ -1501,7 +1662,7 @@ msgstr ""
"\n"
"此命令用于设置提供的 <值> 到该属性\n"
-#: ../clients/cli/connections.c:6122
+#: ../clients/cli/connections.c:6468
#, c-format
msgid ""
"add [<value>] :: append new value to the property\n"
@@ -1510,13 +1671,13 @@ msgid ""
"container type. For single-valued properties the property value is replaced "
"(same as 'set').\n"
msgstr ""
-"add [<value>] :: 附加新值到这个属性\n"
+"add [<值>] :: 附加新值到这个属性\n"
"\n"
-"如果该属性为容器类型,则这个命令在这个属性中添加提供的 <value>。对于单值属"
-"性,它会替换该值(和‘set’一样)。\n"
+"如果该属性为容器类型,则这个命令在这个属性中添加提供的 <值>。对于单值属性,它"
+"会替换该值(和 \"set\" 一样)。\n"
"\n"
-#: ../clients/cli/connections.c:6128
+#: ../clients/cli/connections.c:6474
#, c-format
msgid ""
"change :: change current value\n"
@@ -1527,7 +1688,7 @@ msgstr ""
"\n"
"显示当前值并允许编辑它。\n"
-#: ../clients/cli/connections.c:6132
+#: ../clients/cli/connections.c:6478
#, c-format
msgid ""
"remove [<value>|<index>|<option name>] :: delete the value\n"
@@ -1546,20 +1707,20 @@ msgid ""
" nmcli bond.options> remove downdelay\n"
"\n"
msgstr ""
-"remove [<value>|<index>|<option name>] :: 删除属性值\n"
+"remove [<值>|<目录>|<选项名称>] :: 删除属性值\n"
"\n"
-"删除属性值。对于单值的属性,这会将属性设置\n"
-"回其默认值。对于 container-type 属性,这将删除\n"
-"该属性的所有值,或者您可以指定参数只删除单项\n"
-"或选项。参数可以是一个值或要删除的项的索引,\n"
-"或者是选项名称(具有命名选项的属性)。 \n"
+"移除属性值。对于单值属性,将属性设置回其默认值。对于容器类属性,这将删除该属"
+"性\n"
+"的所有值,或者您可以指定参数只删除单项或选项。参数可以是要删除项的值或索引,"
+"又\n"
+"或者是选项名称(具有命名选项的属性)。\n"
"\n"
"示例: nmcli ipv4.dns> remove 8.8.8.8\n"
-" nmcli ipv4.dns> remove 2\n"
-" nmcli bond.options> remove downdelay\n"
+" nmcli ipv4.dns> remove 2\n"
+" nmcli bond.options> remove downdelay\n"
"\n"
-#: ../clients/cli/connections.c:6143
+#: ../clients/cli/connections.c:6489
#, c-format
msgid ""
"describe :: describe property\n"
@@ -1569,10 +1730,10 @@ msgid ""
msgstr ""
"describe :: 描述属性\n"
"\n"
-"显示属性描述。您可以参阅 nm-settings(5) 手册页来查看所有的网络管理器设置和属"
-"性。\n"
+"显示属性描述。您可以参阅 nm-settings(5) 手册页来查看所有的网络管理器"
+"(NetworkManager)设置和属性。\n"
-#: ../clients/cli/connections.c:6148
+#: ../clients/cli/connections.c:6494
#, c-format
msgid ""
"print [property|setting|connection] :: print property (setting, connection) "
@@ -1581,531 +1742,532 @@ msgid ""
"Shows property value. Providing an argument you can also display values for "
"the whole setting or connection.\n"
msgstr ""
-"print [property|setting|connection] :: 输出属性 (设置、连接) 值\n"
+"print [property|setting|connection] :: 输出属性(设置、连接)值\n"
"\n"
-"显示属性。提供一项命令,您可以为全部设置或连接显示值。\n"
+"显示属性。提供参数您也可以显示整个设置或连接的值。\n"
-#: ../clients/cli/connections.c:6156
+#: ../clients/cli/connections.c:6502
#, c-format
msgid ""
"help/? [<command>] :: help for nmcli commands\n"
"\n"
msgstr ""
-"help/? [<命令>] :: nmcli 命令的帮护\n"
+"help/? [<命令>] :: nmcli 命令的帮助\n"
"\n"
-#: ../clients/cli/connections.c:6250
+#: ../clients/cli/connections.c:6596
#, c-format
msgid "Error: Connection activation failed.\n"
-msgstr "错误:激活连接失败。\n"
+msgstr "错误:连接激活失败。\n"
-#: ../clients/cli/connections.c:6345
+#: ../clients/cli/connections.c:6687
#, c-format
msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
-msgstr "错误:设置“%s”是必填的而且无法移除。\n"
+msgstr "错误:设置 \"%s\" 是必填的而且无法移除。\n"
#. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:6363
+#: ../clients/cli/connections.c:6705
#, c-format
msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
-msgstr "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
+msgstr "[ 类型:%s | 名称:%s | UUID:%s | 变动:%s | 临时:%s ]\n"
-#: ../clients/cli/connections.c:6399
+#: ../clients/cli/connections.c:6741
#, c-format
msgid "The connection is not saved. Do you really want to quit? %s"
msgstr "连接未保存。您真的要退出吗?%s"
-#: ../clients/cli/connections.c:6448
+#: ../clients/cli/connections.c:6787
#, 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 ""
-"此连接配置文件已被其它客户端移除了。您可以在主菜单输入“save”来还原它。\n"
+"此连接配置集已被其他客户端移除了。您可以在主菜单中输入 \"save\" 来还原它。\n"
-#: ../clients/cli/connections.c:6478 ../clients/cli/connections.c:6892
-#: ../clients/cli/connections.c:6950
+#: ../clients/cli/connections.c:6818 ../clients/cli/connections.c:7210
+#: ../clients/cli/connections.c:7268
#, c-format
msgid "Allowed values for '%s' property: %s\n"
-msgstr "对于“%s”属性允许的值:%s\n"
+msgstr "\"%s\" 属性允许的值:%s\n"
-#: ../clients/cli/connections.c:6481 ../clients/cli/connections.c:6895
-#: ../clients/cli/connections.c:6953
+#: ../clients/cli/connections.c:6821 ../clients/cli/connections.c:7213
+#: ../clients/cli/connections.c:7271
#, c-format
msgid "Enter '%s' value: "
-msgstr "输入“%s”值:"
+msgstr "输入 \"%s\" 值:"
-#: ../clients/cli/connections.c:6496 ../clients/cli/connections.c:6518
-#: ../clients/cli/connections.c:6899 ../clients/cli/connections.c:6958
+#: ../clients/cli/connections.c:6835 ../clients/cli/connections.c:6855
+#: ../clients/cli/connections.c:7217 ../clients/cli/connections.c:7276
#, c-format
msgid "Error: failed to set '%s' property: %s\n"
-msgstr "错误:设置“%s”属性失败:%s\n"
+msgstr "错误:设置 \"%s\" 属性失败:%s\n"
-#: ../clients/cli/connections.c:6512
+#: ../clients/cli/connections.c:6849
#, c-format
msgid "Edit '%s' value: "
-msgstr "编辑“%s”值:"
+msgstr "编辑 \"%s\" 值:"
-#: ../clients/cli/connections.c:6541 ../clients/cli/settings.c:392
+#: ../clients/cli/connections.c:6875 ../clients/cli/settings.c:394
#, c-format
msgid "Error: %s\n"
msgstr "错误:%s\n"
-#: ../clients/cli/connections.c:6547 ../clients/cli/connections.c:7053
-#: ../clients/cli/connections.c:7104
+#: ../clients/cli/connections.c:6881 ../clients/cli/connections.c:7371
+#: ../clients/cli/connections.c:7422
#, c-format
msgid "Error: failed to remove value of '%s': %s\n"
-msgstr "错误:移除“%s”的值失败:%s\n"
+msgstr "错误:移除 \"%s\" 的值失败:%s\n"
-#: ../clients/cli/connections.c:6568
+#: ../clients/cli/connections.c:6902
#, c-format
msgid "Unknown command argument: '%s'\n"
-msgstr "未知命令参数:“%s”\n"
+msgstr "未知的命令参数:\"%s\"\n"
-#: ../clients/cli/connections.c:6671
+#: ../clients/cli/connections.c:6992
#, c-format
msgid "Available settings: %s\n"
msgstr "有效设置:%s\n"
-#: ../clients/cli/connections.c:6683
+#: ../clients/cli/connections.c:7004
#, c-format
msgid "Error: invalid setting name; %s\n"
msgstr "错误:无效的设置名称;%s\n"
-#: ../clients/cli/connections.c:6700
+#: ../clients/cli/connections.c:7021
#, c-format
msgid "Available properties: %s\n"
msgstr "有效属性:%s\n"
-#: ../clients/cli/connections.c:6708
+#: ../clients/cli/connections.c:7029
#, c-format
msgid "Error: property %s\n"
msgstr "错误:属性 %s\n"
-#: ../clients/cli/connections.c:6749
+#: ../clients/cli/connections.c:7070
#, 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"
-"您还要保存吗? %s"
+"使用 \"autoconnect=yes\" 保存该连接。这样会立即激活该连接。\n"
+"您仍要保存吗? %s"
-#: ../clients/cli/connections.c:6832
+#: ../clients/cli/connections.c:7149
#, c-format
msgid "You may edit the following settings: %s\n"
msgstr "您可编辑下列设置:%s\n"
-#: ../clients/cli/connections.c:6862
+#: ../clients/cli/connections.c:7178
#, c-format
msgid ""
"The connection profile has been removed from another client. You may type "
"'save' to restore it.\n"
-msgstr "此连接配置文件已被其它客户端移除了。您可以输入“save”来还原它。\n"
+msgstr "此连接配置集已被其他客户端移除了。您可以输入 \"save\" 来还原它。\n"
-#: ../clients/cli/connections.c:6903 ../clients/cli/connections.c:7148
-#: ../clients/cli/connections.c:7180
+#: ../clients/cli/connections.c:7221 ../clients/cli/connections.c:7466
+#: ../clients/cli/connections.c:7498
#, c-format
msgid "Error: no setting selected; valid are [%s]\n"
msgstr "错误:未选择设置;有效的为 [%s]\n"
-#: ../clients/cli/connections.c:6904
+#: ../clients/cli/connections.c:7222
#, c-format
msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
-msgstr "先使用“goto <设置>”,或“set <设置>.<属性>”\n"
+msgstr "先使用 \"goto <设置>\",或 \"set <设置>.<属性>\"\n"
-#: ../clients/cli/connections.c:6919 ../clients/cli/connections.c:7080
-#: ../clients/cli/connections.c:7170
+#: ../clients/cli/connections.c:7237 ../clients/cli/connections.c:7398
+#: ../clients/cli/connections.c:7488
#, c-format
msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
-msgstr "错误:无效的设置参数“%s”;有效的为 [%s]\n"
+msgstr "错误:无效的设置参数 \"%s\";有效的为 [%s]\n"
-#: ../clients/cli/connections.c:6928
+#: ../clients/cli/connections.c:7246
#, c-format
msgid "Error: missing setting for '%s' property\n"
-msgstr "错误:缺少用于“%s”属性的设置\n"
+msgstr "错误:缺少 \"%s\" 属性的设置\n"
-#: ../clients/cli/connections.c:6935
+#: ../clients/cli/connections.c:7253
#, c-format
msgid "Error: invalid property: %s\n"
-msgstr "错误:无效属性:%s\n"
+msgstr "错误:无效的属性:%s\n"
-#: ../clients/cli/connections.c:6989
+#: ../clients/cli/connections.c:7307
#, c-format
msgid "Error: unknown setting '%s'\n"
-msgstr "错误:未知设置“%s”\n"
+msgstr "错误:未知的设置 \"%s\"\n"
-#: ../clients/cli/connections.c:7014
+#: ../clients/cli/connections.c:7332
#, c-format
msgid "You may edit the following properties: %s\n"
msgstr "您可以编辑下列属性:%s\n"
-#: ../clients/cli/connections.c:7058
+#: ../clients/cli/connections.c:7376
#, c-format
msgid "Error: no argument given; valid are [%s]\n"
msgstr "错误:未给定参数:有效的为 [%s]\n"
-#: ../clients/cli/connections.c:7077
+#: ../clients/cli/connections.c:7395
#, c-format
msgid "Setting '%s' is not present in the connection.\n"
-msgstr "设置“%s”未在连接里提供。\n"
+msgstr "设置 \"%s\" 在连接里未提供。\n"
-#: ../clients/cli/connections.c:7125
+#: ../clients/cli/connections.c:7443
#, c-format
msgid "Error: %s properties, nor it is a setting name.\n"
msgstr "错误:%s 属性,也不是设置名称。\n"
-#: ../clients/cli/connections.c:7149 ../clients/cli/connections.c:7181
+#: ../clients/cli/connections.c:7467 ../clients/cli/connections.c:7499
#, c-format
msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
-msgstr "先使用“goto <设置>”,或“describe <设置>.<属性>”\n"
+msgstr "先使用 \"goto <设置>\",或 \"describe <设置>.<属性>\"\n"
-#: ../clients/cli/connections.c:7204
+#: ../clients/cli/connections.c:7522
#, c-format
msgid "Error: invalid property: %s, neither a valid setting name.\n"
-msgstr "错误:无效属性:%s,也不是有效的设置名称。\n"
+msgstr "错误:无效的属性:%s,也不是有效的设置名称。\n"
-#: ../clients/cli/connections.c:7234
+#: ../clients/cli/connections.c:7552
#, c-format
msgid "Error: unknown setting: '%s'\n"
-msgstr "错误:未知设置:“%s”\n"
+msgstr "错误:未知的设置:\"%s\"\n"
-#: ../clients/cli/connections.c:7239
+#: ../clients/cli/connections.c:7557
#, c-format
msgid "Error: '%s' setting not present in the connection\n"
-msgstr "错误:该连接中未出现设置 '%s'\n"
+msgstr "错误:设置 \"%s\" 在连接里未提供。\n"
-#: ../clients/cli/connections.c:7270
+#: ../clients/cli/connections.c:7588
#, c-format
msgid "Error: invalid property: %s%s\n"
-msgstr "错误:无效属性:%s%s\n"
+msgstr "错误:无效的属性:%s%s\n"
-#: ../clients/cli/connections.c:7272
+#: ../clients/cli/connections.c:7590
msgid ", neither a valid setting name"
msgstr ",也不是有效的设置名称"
-#: ../clients/cli/connections.c:7288
+#: ../clients/cli/connections.c:7606
#, c-format
msgid "Invalid verify option: %s\n"
-msgstr "无效的检验选项:%s\n"
+msgstr "无效的验证选项:%s\n"
-#: ../clients/cli/connections.c:7296
+#: ../clients/cli/connections.c:7614
#, c-format
msgid "Verify setting '%s': %s\n"
-msgstr "验证设置“%s”:%s\n"
+msgstr "验证设置 \"%s\":%s\n"
-#: ../clients/cli/connections.c:7311
+#: ../clients/cli/connections.c:7629
#, c-format
msgid "Verify connection: %s\n"
msgstr "验证连接:%s\n"
-#: ../clients/cli/connections.c:7314
+#: ../clients/cli/connections.c:7632
#, c-format
msgid "The error cannot be fixed automatically.\n"
msgstr "错误无法自动修复。\n"
-#: ../clients/cli/connections.c:7331
+#: ../clients/cli/connections.c:7649
#, c-format
msgid "Error: invalid argument '%s'\n"
-msgstr "错误:无效的参数 '%s'\n"
+msgstr "错误:无效的参数 \"%s\"\n"
-#: ../clients/cli/connections.c:7363
+#: ../clients/cli/connections.c:7681
#, c-format
msgid "Error: Failed to save '%s' (%s) connection: %s\n"
-msgstr "错误:保存 '%s' (%s) 连接失败:%s\n"
+msgstr "错误:保存 \"%s\" (%s) 连接失败:%s\n"
-#: ../clients/cli/connections.c:7370
+#: ../clients/cli/connections.c:7688
#, c-format
msgid "Connection '%s' (%s) successfully saved.\n"
-msgstr "连接“%s” (%s) 已成功保存。\n"
+msgstr "连接 \"%s\" (%s) 已成功保存。\n"
-#: ../clients/cli/connections.c:7371
+#: ../clients/cli/connections.c:7689
#, c-format
msgid "Connection '%s' (%s) successfully updated.\n"
-msgstr "成功地更新了连接 '%s'(%s)。\n"
+msgstr "成功地更新了连接 \"%s\" (%s)。\n"
-#: ../clients/cli/connections.c:7403
+#: ../clients/cli/connections.c:7721
#, c-format
msgid "Error: connection verification failed: %s\n"
msgstr "错误:连接验证失败:%s。\n"
-#: ../clients/cli/connections.c:7404
+#: ../clients/cli/connections.c:7722
msgid "(unknown error)"
msgstr "(未知错误)"
-#: ../clients/cli/connections.c:7405
+#: ../clients/cli/connections.c:7723
#, c-format
msgid "You may try running 'verify fix' to fix errors.\n"
-msgstr "您可以运行 'verify fix' 来修复错误。\n"
+msgstr "您可以运行 \"verify fix\" 来修复错误。\n"
-#: ../clients/cli/connections.c:7427
+#: ../clients/cli/connections.c:7745
#, c-format
msgid "Error: connection is not saved. Type 'save' first.\n"
-msgstr "错误:连接还未保存。先输入“save”。\n"
+msgstr "错误:连接还未保存。先输入 \"save\"。\n"
-#: ../clients/cli/connections.c:7431
+#: ../clients/cli/connections.c:7749
#, c-format
msgid "Error: connection is not valid: %s\n"
msgstr "错误:连接是无效的:%s\n"
-#: ../clients/cli/connections.c:7441
+#: ../clients/cli/connections.c:7759
#, c-format
msgid "Error: Cannot activate connection: %s.\n"
msgstr "错误:无法激活连接:%s。\n"
-#: ../clients/cli/connections.c:7450
+#: ../clients/cli/connections.c:7768
#, c-format
msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
-msgstr "错误:激活 '%s' (%s) 连接失败:%s\n"
+msgstr "错误:激活 \"%s\" (%s) 连接失败:%s\n"
-#: ../clients/cli/connections.c:7456
+#: ../clients/cli/connections.c:7774
msgid "Monitoring connection activation (press any key to continue)\n"
-msgstr "正在监控连接激活(按任意键继续)\n"
+msgstr "正在监视连接激活(按任意键继续)\n"
-#: ../clients/cli/connections.c:7492
+# 具体的选项名,不需翻译,下同
+#: ../clients/cli/connections.c:7810
#, c-format
msgid "Error: status-line: %s\n"
msgstr "错误:status-line:%s\n"
-#: ../clients/cli/connections.c:7500
+#: ../clients/cli/connections.c:7818
#, c-format
msgid "Error: save-confirmation: %s\n"
msgstr "错误:save-confirmation:%s\n"
-#: ../clients/cli/connections.c:7508
+#: ../clients/cli/connections.c:7826
#, c-format
msgid "Error: show-secrets: %s\n"
-msgstr "错误:show-secrets: %s\n"
-
-#: ../clients/cli/connections.c:7517
-#, c-format
-msgid "Error: bad color: %s\n"
-msgstr "错误:错误的颜色:%s\n"
+msgstr "错误:show-secrets:%s\n"
-#: ../clients/cli/connections.c:7532
+#: ../clients/cli/connections.c:7833
#, c-format
msgid "Current nmcli configuration:\n"
msgstr "当前 nmcli 配置:\n"
-#: ../clients/cli/connections.c:7542
+#: ../clients/cli/connections.c:7841
#, c-format
msgid "Invalid configuration option '%s'; allowed [%s]\n"
-msgstr "无效的配置选项“%s”;允许 [%s]\n"
+msgstr "无效的配置选项 \"%s\";允许 [%s]\n"
-#: ../clients/cli/connections.c:7762
+#: ../clients/cli/connections.c:8059
#, c-format
-msgid "Error: only one of 'id', uuid, or 'path' can be provided."
-msgstr "错误:只能提供“id”、uuid 或“路径”之一。"
+msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided."
+msgstr "错误:只能提供 \"id\"、\"filename\"、\"uuid\" 或 \"path\" 之一。"
-#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7946
+#: ../clients/cli/connections.c:8073 ../clients/cli/connections.c:8233
#, c-format
msgid "Error: Unknown connection '%s'."
-msgstr "错误:未知连接“%s”。"
+msgstr "错误:未知连接 \"%s\"。"
-#: ../clients/cli/connections.c:7795
+#: ../clients/cli/connections.c:8089
#, c-format
msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
-msgstr "警告:正在编辑已存的连接“%s”;“type”参数已忽略\n"
+msgstr "警告:正在编辑已有的连接 \"%s\";\"type\" 参数已忽略\n"
-#: ../clients/cli/connections.c:7798
+#: ../clients/cli/connections.c:8092
#, c-format
msgid ""
"Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
-msgstr "警告:正在编辑已存的连接“%s”;“con-name”参数已忽略\n"
+msgstr "警告:正在编辑已有的连接 \"%s\";\"con-name\" 参数已忽略\n"
-#: ../clients/cli/connections.c:7820
+#: ../clients/cli/connections.c:8119
#, c-format
msgid "Valid connection types: %s\n"
-msgstr "无效的连接类型:%s\n"
+msgstr "有效的连接类型:%s\n"
-#: ../clients/cli/connections.c:7822
+#: ../clients/cli/connections.c:8121
#, c-format
msgid "Error: invalid connection type; %s\n"
msgstr "错误:无效的连接类型;%s\n"
-#: ../clients/cli/connections.c:7862
+#: ../clients/cli/connections.c:8156
#, c-format
msgid "===| nmcli interactive connection editor |==="
msgstr "===| nmcli 交互式连接编辑器 |==="
-#: ../clients/cli/connections.c:7865
+#: ../clients/cli/connections.c:8159
#, c-format
msgid "Editing existing '%s' connection: '%s'"
-msgstr "正在编辑已存的连接“%s”:“%s”"
+msgstr "正在编辑已有的连接 \"%s\":\"%s\""
-#: ../clients/cli/connections.c:7867
+#: ../clients/cli/connections.c:8161
#, c-format
msgid "Adding a new '%s' connection"
-msgstr "正在添加新的“%s”连接"
+msgstr "正在添加新的 \"%s\" 连接"
-#: ../clients/cli/connections.c:7869
+#: ../clients/cli/connections.c:8163
#, c-format
msgid "Type 'help' or '?' for available commands."
-msgstr "对于可用的命令输入“help”或“?”。"
+msgstr "输入 \"help\" 或 \"?\" 查看可用的命令。"
+
+#: ../clients/cli/connections.c:8165
+#, c-format
+msgid "Type 'print' to show all the connection properties."
+msgstr "输入 \"print\" 来显示所有的连接属性。"
-#: ../clients/cli/connections.c:7871
+#: ../clients/cli/connections.c:8167
#, c-format
msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
-msgstr "输入“describe [<设置>.<属性>]”来获得详细的属性描述。"
+msgstr "输入 \"describe [<设置>.<属性>]\" 来获得详细的属性描述。"
-#: ../clients/cli/connections.c:7906
+#: ../clients/cli/connections.c:8195
#, c-format
msgid "Error: Failed to modify connection '%s': %s"
-msgstr "错误:修改连接 '%s' 失败:%s"
+msgstr "错误:修改连接 \"%s\" 失败:%s"
-#: ../clients/cli/connections.c:7913
+#: ../clients/cli/connections.c:8201
#, c-format
msgid "Connection '%s' (%s) successfully modified.\n"
-msgstr "连接“%s”(%s) 已成功修改。\n"
+msgstr "连接 \"%s\" (%s) 已成功修改。\n"
-#: ../clients/cli/connections.c:7994
+#: ../clients/cli/connections.c:8277
#, c-format
msgid "%s (%s) cloned as %s (%s).\n"
-msgstr "%s (%s) 被克隆为 %s (%s)。\n"
+msgstr "%s (%s) 已克隆为 %s (%s)。\n"
-#: ../clients/cli/connections.c:8060
+#: ../clients/cli/connections.c:8342
msgid "New connection name: "
msgstr "新连接名称:"
-#: ../clients/cli/connections.c:8062
+#: ../clients/cli/connections.c:8344
#, c-format
msgid "Error: <new name> argument is missing."
-msgstr "错误:缺少 <new name> 参数。"
+msgstr "错误:缺少 <新名称> 参数。"
-#: ../clients/cli/connections.c:8068 ../clients/cli/connections.c:8570
+#: ../clients/cli/connections.c:8349 ../clients/cli/connections.c:8829
#, c-format
msgid "Error: unknown extra argument: '%s'."
-msgstr "错误:未知的额外参数:'%s'。"
+msgstr "错误:未知的额外参数:\"%s\"。"
-#: ../clients/cli/connections.c:8119
+#: ../clients/cli/connections.c:8394
#, c-format
msgid "Error: not all connections deleted."
msgstr "错误:未删除所有的连接。"
-#: ../clients/cli/connections.c:8120
+#: ../clients/cli/connections.c:8395
#, c-format
msgid "Error: Connection deletion failed: %s"
msgstr "错误:连接删除失败:%s"
-#: ../clients/cli/connections.c:8181 ../clients/cli/connections.c:8306
+#: ../clients/cli/connections.c:8451 ../clients/cli/connections.c:8572
#, c-format
msgid "Error: %s.\n"
msgstr "错误:%s。\n"
-#: ../clients/cli/connections.c:8182 ../clients/cli/connections.c:8307
+#: ../clients/cli/connections.c:8452 ../clients/cli/connections.c:8573
#, c-format
msgid "Error: not all connections found."
msgstr "错误:未找到所有连接。"
#. truncate trailing ", "
-#: ../clients/cli/connections.c:8225
+#: ../clients/cli/connections.c:8503
#, c-format
msgid "Error: cannot delete unknown connection(s): %s."
msgstr "错误:无法删除未知连接:%s。"
-#: ../clients/cli/connections.c:8237
+#: ../clients/cli/connections.c:8513
#, c-format
msgid "%s: connection profile changed\n"
-msgstr "%s: 连接配置集已改动\n"
+msgstr "%s:连接配置集已改动\n"
-#: ../clients/cli/connections.c:8263
+#: ../clients/cli/connections.c:8539
#, c-format
msgid "%s: connection profile created\n"
-msgstr "%s: 连接配置集已创建\n"
+msgstr "%s:连接配置集已创建\n"
-#: ../clients/cli/connections.c:8272
+#: ../clients/cli/connections.c:8548
#, c-format
msgid "%s: connection profile removed\n"
-msgstr "%s: 连接配置集已删除\n"
+msgstr "%s:连接配置集已移除\n"
-#: ../clients/cli/connections.c:8335
+#: ../clients/cli/connections.c:8610
#, c-format
msgid "Error: failed to reload connections: %s."
-msgstr "错误:重载连接失败:%s。"
+msgstr "错误:重新加载连接失败:%s。"
-#: ../clients/cli/connections.c:8368
+#: ../clients/cli/connections.c:8643
#, c-format
msgid "Error: failed to load connection: %s."
msgstr "错误:加载连接失败:%s。"
-#: ../clients/cli/connections.c:8376
+#: ../clients/cli/connections.c:8651
#, c-format
msgid "Could not load file '%s'\n"
-msgstr "无法加载文件“%s”\n"
+msgstr "无法加载文件 \"%s\"\n"
-#: ../clients/cli/connections.c:8383
+#: ../clients/cli/connections.c:8658
msgid "File to import: "
msgstr "要导入的文件:"
-#: ../clients/cli/connections.c:8414
+#: ../clients/cli/connections.c:8689
#, c-format
msgid "Error: No arguments provided."
-msgstr "错误:没有提供参数。"
+msgstr "错误:未提供参数。"
-#: ../clients/cli/connections.c:8439
+#: ../clients/cli/connections.c:8712
#, c-format
msgid "Warning: 'type' already specified, ignoring extra one.\n"
-msgstr "警告:已指定 'type',忽略额外的选项。\n"
+msgstr "警告:已指定 \"type\",忽略额外的参数。\n"
-#: ../clients/cli/connections.c:8454
+#: ../clients/cli/connections.c:8726
#, c-format
msgid "Warning: 'file' already specified, ignoring extra one.\n"
-msgstr "警告:已指定 'file',忽略额外的选项。\n"
+msgstr "警告:已指定 \"file\",忽略额外的参数。\n"
-#: ../clients/cli/connections.c:8456
+#: ../clients/cli/connections.c:8728
#, c-format
msgid "Unknown parameter: %s"
msgstr "未知参数:%s"
-#: ../clients/cli/connections.c:8468
+#: ../clients/cli/connections.c:8739
#, c-format
msgid "Error: 'type' argument is required."
-msgstr "错误:需要“type”参数。"
+msgstr "错误:需要 \"type\" 参数。"
-#: ../clients/cli/connections.c:8473
+#: ../clients/cli/connections.c:8743
#, c-format
msgid "Error: 'file' argument is required."
-msgstr "错误:需要'file' 参数。"
+msgstr "错误:需要 \"file\" 参数。"
-#: ../clients/cli/connections.c:8480
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8749
+#, c-format
msgid "Error: failed to find VPN plugin for %s."
-msgstr "错误:加载 VPN 插件失败:%s。"
+msgstr "错误:查找用于 %s 的 VPN 插件失败。"
-#: ../clients/cli/connections.c:8488 ../clients/cli/connections.c:8589
+#: ../clients/cli/connections.c:8756 ../clients/cli/connections.c:8848
#, c-format
msgid "Error: failed to load VPN plugin: %s."
msgstr "错误:加载 VPN 插件失败:%s。"
-#: ../clients/cli/connections.c:8496
+#: ../clients/cli/connections.c:8763
#, c-format
msgid "Error: failed to import '%s': %s."
-msgstr "错误:导入失败 '%s':%s。"
+msgstr "错误:导入 \"%s\" 失败失败失败失败失败失败失败失败失败失败失败:%s。"
-#: ../clients/cli/connections.c:8576
+#: ../clients/cli/connections.c:8835
msgid "Output file name: "
-msgstr "输出文件名:"
+msgstr "输出文件名称:"
-#: ../clients/cli/connections.c:8580
+#: ../clients/cli/connections.c:8839
#, c-format
msgid "Error: the connection is not VPN."
msgstr "错误:连接不是 VPN。"
-#: ../clients/cli/connections.c:8601
+#: ../clients/cli/connections.c:8861
#, c-format
msgid "Error: failed to create temporary file %s."
msgstr "错误:创建临时文件 %s 失败。"
-#: ../clients/cli/connections.c:8610
+#: ../clients/cli/connections.c:8869
#, c-format
msgid "Error: failed to export '%s': %s."
-msgstr "错误:导出 '%s' 失败:%s。"
+msgstr "错误:导出 \"%s\" 失败:%s。"
-#: ../clients/cli/connections.c:8621
+#: ../clients/cli/connections.c:8881
#, c-format
msgid "Error: failed to read temporary file '%s': %s."
-msgstr "错误:读取临时文件 '%s' 失败:%s。"
+msgstr "错误:读取临时文件 \"%s\" 失败:%s。"
#. define some prompts
#: ../clients/cli/devices.c:39
@@ -2116,7 +2278,29 @@ msgstr "接口:"
msgid "Interface(s): "
msgstr "接口:"
-#: ../clients/cli/devices.c:254
+#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1266
+msgid "(none)"
+msgstr "(无)"
+
+#: ../clients/cli/devices.c:175 ../clients/cli/devices.c:182
+msgid "(unknown)"
+msgstr "(未知)"
+
+#: ../clients/cli/devices.c:316
+#, c-format
+msgid "<invisible> | %s"
+msgstr "<不可见> | %s"
+
+#: ../clients/cli/devices.c:317
+msgid "<invisible>"
+msgstr "<不可见>"
+
+#: ../clients/cli/devices.c:418
+#, c-format
+msgid "%u Mb/s"
+msgstr "%u Mb/s"
+
+#: ../clients/cli/devices.c:672
#, c-format
msgid ""
"Usage: nmcli device { COMMAND | help }\n"
@@ -2157,8 +2341,46 @@ msgid ""
" lldp [list [ifname <ifname>]]\n"
"\n"
msgstr ""
+"用法:nmcli device { 命令 | help }\n"
+"\n"
+"命令 := { status | show | set | connect | reapply | modify | disconnect | "
+"delete | monitor | wifi | lldp }\n"
+"\n"
+" status\n"
+"\n"
+" show [<接口名>]\n"
+"\n"
+" set [ifname] <接口名> [autoconnect yes|no] [managed yes|no]\n"
+"\n"
+" connect <接口名>\n"
+"\n"
+" reapply <接口名>\n"
+"\n"
+" modify <接口名> ([+|-]<设置>.<属性> <值>)+\n"
+"\n"
+" disconnect <接口名> ...\n"
+"\n"
+" delete <接口名> ...\n"
+"\n"
+" monitor <接口名> ...\n"
+"\n"
+" wifi [list [ifname <接口名>] [bssid <BSSID>]]\n"
+"\n"
+" wifi connect <(B)SSID> [password <密码>] [wep-key-type key|phrase] [ifname "
+"<接口名>]\n"
+" [bssid <BSSID>] [name <名称>] [private yes|no] "
+"[hidden yes|no]\n"
+"\n"
+" wifi hotspot [ifname <接口名>] [con-name <名称>] [ssid <SSID>] [band a|bg] "
+"[channel <信道>] [password <密码>]\n"
+"\n"
+" wifi rescan [ifname <接口名>] [[ssid <要扫描的 SSID>] ...]\n"
+"\n"
+" lldp [list [ifname <接口名>]]\n"
+"\n"
-#: ../clients/cli/devices.c:277
+# 大写的 DEVICE、TYPE、STATE、CONNECTION 找不到具体对应的翻译位置,这是在 CLI 是显示的列表项,所以没有翻译。
+#: ../clients/cli/devices.c:695
#, c-format
msgid ""
"Usage: nmcli device status { help }\n"
@@ -2177,16 +2399,17 @@ msgid ""
msgstr ""
"用法:nmcli device status { help }\n"
"\n"
-"显示全部设备的状态。\n"
-"默认情况下,显示下列:\n"
+"显示所有设备的状态。\n"
+"默认情况下,显示下列栏目:\n"
" DEVICE - 接口名称\n"
" TYPE - 设备类型\n"
" STATE - 设备状态\n"
" CONNECTION - 设备上激活的连接(如果有的话)\n"
-"显示哪些列可以通过“--fields”全局选项改变。\n"
-"“status” 是默认命令,也就是说 “nmcli device” 会调用 “nmcli device status”。\n"
+"显示哪些栏目可以通过 \"--fields\" 全局选项改变。\"status\" 是默认命令,也就是"
+"说 \n"
+"\"nmcli device\" 会调用 \"nmcli device status\"。\n"
-#: ../clients/cli/devices.c:292
+#: ../clients/cli/devices.c:710
#, c-format
msgid ""
"Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -2197,15 +2420,15 @@ msgid ""
"The command lists details for all devices, or for a given device.\n"
"\n"
msgstr ""
-"用法:nmcli device show { ARGUMENTS | help }\n"
+"用法:nmcli device show { 参数 | help }\n"
"\n"
-"ARGUMENTS := [<ifname>]\n"
+"参数 := [<接口名>]\n"
"\n"
"显示设备详情。\n"
-"该命令列出所有设备或者给定设备详情。\n"
+"该命令列出所有设备或者给定设备的详情。\n"
"\n"
-#: ../clients/cli/devices.c:303
+#: ../clients/cli/devices.c:721
#, c-format
msgid ""
"Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -2218,17 +2441,17 @@ msgid ""
"It will also consider connections that are not set to auto-connect.\n"
"\n"
msgstr ""
-"用法:nmcli device connect { ARGUMENTS | help }\n"
+"用法:nmcli device connect { 参数 | help }\n"
"\n"
-"ARGUMENTS := <ifname>\n"
+"参数 := <接口名>\n"
"\n"
"连接该设备。\n"
-"NetworkManager 将尝试查找将激活的适当连接。\n"
-"它也将考虑哪些没有设定为 set to auto-connect 的连接。\n"
+"网络管理器(NetworkManager)将尝试查找将激活的合适连接,包括那些没有设定为自"
+"动连接的连接。\n"
"\n"
-#: ../clients/cli/devices.c:315
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:733
+#, c-format
msgid ""
"Usage: nmcli device reapply { ARGUMENTS | help }\n"
"\n"
@@ -2238,16 +2461,14 @@ msgid ""
"made since it was last applied.\n"
"\n"
msgstr ""
-"用法:nmcli device disconnect { ARGUMENTS | help }\n"
+"用法:nmcli device reapply { 参数 | help }\n"
"\n"
-"ARGUMENTS := <ifname>\n"
+"参数 := <接口名>\n"
"\n"
-"断开该设备。\n"
-"该命令断开该设备并方式其在没有用户/菜单\n"
-"互动的情况下自动激活进一步的连接。\n"
+"尝试将自上次应用以来对当前活动连接所做的更改更新到设备上。\n"
"\n"
-#: ../clients/cli/devices.c:326
+#: ../clients/cli/devices.c:744
#, c-format
msgid ""
"Usage: nmcli device modify { ARGUMENTS | --help }\n"
@@ -2268,8 +2489,24 @@ msgid ""
"nmcli dev mod em1 -ipv4.dns 1\n"
"nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
msgstr ""
+"用法:nmcli device modify { 参数 | --help }\n"
+"\n"
+"参数 := <接口名> ([+|-]<设置>.<属性> <值>)+\n"
+"\n"
+"修改设备上当前活动连接的一个或多个属性,但不用更改该连接的配置集。更改会即时"
+"生\n"
+"效。对于多值属性,您可以在属性名前插可选的 \"+\" 或 \"-\" 符号。\"+\" 符号允"
+"许附加项\n"
+"而不是是替换掉整个值。\"-\" 符号允许移除选中项而不是整个值。\n"
+"\n"
+"示例:\n"
+"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
+"nmcli dev mod em1 +ipv4.dns 8.8.4.4\n"
+"nmcli dev mod em1 -ipv4.dns 1\n"
+"nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
-#: ../clients/cli/devices.c:346
+#: ../clients/cli/devices.c:764
#, c-format
msgid ""
"Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -2281,16 +2518,15 @@ msgid ""
"further connections without user/manual intervention.\n"
"\n"
msgstr ""
-"用法:nmcli device disconnect { ARGUMENTS | help }\n"
+"用法:nmcli device disconnect { 参数 | help }\n"
"\n"
-"ARGUMENTS := <ifname>\n"
+"参数 := <接口名>\n"
"\n"
-"断开该设备。\n"
-"该命令断开该设备并防止其在没有用户/手动干预\n"
-"的情况下自动激活进一步的连接。\n"
+"断开设备的连接。\n"
+"该命令断开设备的连接并阻止其在没有用户/手动干预的情况下继续自动激活连接。\n"
"\n"
-#: ../clients/cli/devices.c:358
+#: ../clients/cli/devices.c:776
#, c-format
msgid ""
"Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -2303,16 +2539,17 @@ msgid ""
"command.\n"
"\n"
msgstr ""
-"用法:nmcli device delete { ARGUMENTS | help }\n"
+"用法:nmcli device delete { 参数 | help }\n"
"\n"
-"ARGUMENTS := <ifname> ...\n"
+"参数 := <接口名> ...\n"
"\n"
"删除软件设备。\n"
-"这个命令删除接口。它仅用于软件设备。\n"
-"(例如 Bond、Bridge 等)。硬件设备不能用这个命令来删除。\n"
+"此命令用于移除接口。它仅适用于软件设备(如绑定、网桥等)。硬件设备不能用这个"
+"命\n"
+"令来删除。\n"
"\n"
-#: ../clients/cli/devices.c:371
+#: ../clients/cli/devices.c:789
#, c-format
msgid ""
"Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -2325,17 +2562,17 @@ msgid ""
"Modify device properties.\n"
"\n"
msgstr ""
-"用法:nmcli device set { ARGUMENTS | help }\n"
+"用法:nmcli device set { 参数 | help }\n"
"\n"
-"ARGUMENTS := DEVICE { PROPERTY [ PROPERTY ... ] }\n"
-"DEVICE := [ifname] <ifname> \n"
-"PROPERTY := { autoconnect { yes | no } |\n"
-" { managed { yes | no }\n"
+"参数 := 设备 { 属性 [ 属性 ... ] }\n"
+"设备 := [ifname] <接口名> \n"
+"属性 := { autoconnect { yes | no } |\n"
+" { managed { yes | no }\n"
"\n"
"修改设备属性。\n"
"\n"
-#: ../clients/cli/devices.c:384
+#: ../clients/cli/devices.c:802
#, c-format
msgid ""
"Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -2347,16 +2584,16 @@ msgid ""
"Monitors all devices in case no interface is specified.\n"
"\n"
msgstr ""
-"用法:nmcli device monitor { ARGUMENTS | help }\n"
+"用法:nmcli device monitor { 参数 | help }\n"
"\n"
-"ARGUMENTS := [<ifname>] ...\n"
+"参数 := [<接口名>] ...\n"
"\n"
-"监控设备活动。\n"
-"每当指定的设备改变状态,这个命令将打印一行信息。\n"
-"如果没有指定接口,则监控所有设备。\n"
+"监视设备活动。\n"
+"每当指定的连接修改时,这个命令会将其打印出来。如果没有指定则监视所有的连"
+"接。\n"
"\n"
-#: ../clients/cli/devices.c:396
+#: ../clients/cli/devices.c:814
#, c-format
msgid ""
"Usage: nmcli device wifi { ARGUMENTS | help }\n"
@@ -2408,8 +2645,56 @@ msgid ""
"use 'nmcli device wifi list' for that.\n"
"\n"
msgstr ""
+"用法:nmcli device wifi { 参数 | help }\n"
+"\n"
+"在 Wi-Fi 设备上执行操作。\n"
+"\n"
+"参数 := [list [ifname <接口名>] [bssid <BSSID>]]\n"
+"\n"
+"列出可用的 Wi-Fi 接入点。\"ifname\" 和 \"bssid\" 选项可用于列出具体接口或指定"
+"的 \n"
+"BSSID 的接入点。\n"
+"\n"
+"参数 := connect <(B)SSID> [password <密码>] [wep-key-type key|phrase] "
+"[ifname <接口名>]\n"
+" [bssid <BSSID>] [name <名称>] [private yes|no] [hidden yes|"
+"no]\n"
+"\n"
+"连接到 SSID 或 BSSID 指定的 Wi-Fi 网络。此命令会新建一个连接然后在设备上激"
+"活\n"
+"它。这个命令行操作对应在图形界面客户端上点击一个 SSID。此命令总是新建一个连"
+"接,\n"
+"因此主要用于连接到新的 Wi-Fi 网络。如果所选网络已经存在连接,最好是调出已有的"
+"配\n"
+"置集合,如下命令:nmcli con up id <接口名>。注意目前只支持开放、WEP 和 WPA-"
+"PSK \n"
+"网络。IP 配置也是通过 DHCP 获取。\n"
+"\n"
+"参数 := hotspot [ifname <接口名>] [con-name <名称>] [ssid <SSID>]\n"
+" [band a|bg] [channel <信道>] [password <密码>]\n"
+"\n"
+"创建 Wi-Fi 热点。使用 \"connection down\" 或 \"device disconnect\" 来停止热"
+"点。\n"
+"热点参数可由下列可选参数控制:\n"
+"ifname - 要使用的 Wi-Fi 设备\n"
+"con-name - 创建的热点连接配置集名称\n"
+"ssid - 热点的 SSID\n"
+"band - 要使用的 Wi-Fi 频段\n"
+"channel - 要使用的 Wi-Fi 信道\n"
+"password - 热点要使用的密码\n"
+"\n"
+"参数 := rescan [ifname <接口名>] [[ssid <要扫描的 SSID>] ...]\n"
+"\n"
+"请求网络管理器(NetworkManager)立即重新扫描可以用的接入点。网络管理器会定期"
+"地扫描 \n"
+"Wi-Fi 网络,但有些情况下手动扫描可能有用。\"ssid\" 允许扫描一个指定的 SSID,"
+"这对\n"
+"隐藏了其 SSID 的接入点有用。可以给定更多的 \"ssid\" 参数。注意该命令不能显示"
+"接入\n"
+"点,可以使用 \"nmcli device wifi list\" 来显示。\n"
+"\n"
-#: ../clients/cli/devices.c:443
+#: ../clients/cli/devices.c:861
#, c-format
msgid ""
"Usage: nmcli device lldp { ARGUMENTS | help }\n"
@@ -2421,449 +2706,434 @@ msgid ""
"used to list neighbors for a particular interface.\n"
"\n"
msgstr ""
-"用法:nmcli device lldp { ARGUMENTS | help }\n"
+"用法:nmcli device lldp { 参数 | help }\n"
"\n"
-"ARGUMENTS := [list [ifname <ifname>]]\n"
+"参数 := [list [ifname <接口名>]]\n"
"\n"
-"列出通过 LLDP 发现的邻居设备。可使用 'ifname' 选项\n"
-"列出具体接口的邻居设备。\n"
+"列出通过 LLDP 发现的邻居设备。可使用 \"ifname\" 选项列出具体接口的邻居设"
+"备。\n"
"\n"
-#: ../clients/cli/devices.c:597
+#: ../clients/cli/devices.c:1015
#, c-format
msgid "Error: No interface specified."
msgstr "错误:没有指定接口。"
-#: ../clients/cli/devices.c:620
+#: ../clients/cli/devices.c:1038
#, c-format
msgid "Warning: argument '%s' is duplicated.\n"
-msgstr "警告:重复的参数 '%s'\n"
+msgstr "警告:重复的参数 \"%s\"。\n"
-#: ../clients/cli/devices.c:623
+#: ../clients/cli/devices.c:1041
#, c-format
msgid "Error: Device '%s' not found.\n"
-msgstr "错误:没有找到设备 '%s'。\n"
+msgstr "错误:没有找到设备 \"%s\"。\n"
-#: ../clients/cli/devices.c:624
+#: ../clients/cli/devices.c:1042
#, c-format
msgid "Error: not all devices found."
msgstr "错误:未找到所有设备。"
-#: ../clients/cli/devices.c:653
+#: ../clients/cli/devices.c:1071
msgid "No interface specified"
-msgstr ""
+msgstr "没有指定接口"
-#: ../clients/cli/devices.c:672
+#: ../clients/cli/devices.c:1090
#, c-format
msgid "Device '%s' not found"
-msgstr ""
+msgstr "未找到设备 \"%s\""
-#: ../clients/cli/devices.c:758 ../clients/cli/devices.c:910
-msgid "(none)"
-msgstr "(无)"
-
-#: ../clients/cli/devices.c:829
+#: ../clients/cli/devices.c:1186
#, c-format
msgid "%u MHz"
msgstr "%u MHz"
-#: ../clients/cli/devices.c:830
+#: ../clients/cli/devices.c:1187
#, c-format
msgid "%u Mbit/s"
msgstr "%u Mbit/s"
-#: ../clients/cli/devices.c:841
+#: ../clients/cli/devices.c:1198
msgid "WEP"
msgstr "WEP"
-#: ../clients/cli/devices.c:845
+#: ../clients/cli/devices.c:1202
msgid "WPA1"
msgstr "WPA1"
-#: ../clients/cli/devices.c:849
+#: ../clients/cli/devices.c:1206
msgid "WPA2"
msgstr "WPA2"
-#: ../clients/cli/devices.c:854
+#: ../clients/cli/devices.c:1211
msgid "802.1X"
msgstr "802.1X"
-#: ../clients/cli/devices.c:869
+#: ../clients/cli/devices.c:1226
msgid "Ad-Hoc"
msgstr "Ad-Hoc"
-#: ../clients/cli/devices.c:870
+#: ../clients/cli/devices.c:1227
msgid "Infra"
msgstr "红外"
-#: ../clients/cli/devices.c:871
+#: ../clients/cli/devices.c:1228
msgid "N/A"
msgstr "不可用"
-#: ../clients/cli/devices.c:1085
+#: ../clients/cli/devices.c:1423
msgid "Device details"
msgstr "设备详情"
-#: ../clients/cli/devices.c:1096
+#: ../clients/cli/devices.c:1434
#, c-format
msgid "Error: 'device show': %s"
-msgstr "错误:“device show”:%s"
+msgstr "错误:\"device show\":%s"
-#: ../clients/cli/devices.c:1161 ../clients/cli/devices.c:1164
-msgid "(unknown)"
-msgstr "(未知)"
-
-#: ../clients/cli/devices.c:1207
-#, c-format
-msgid "%u Mb/s"
-msgstr "%u Mb/s"
-
-#: ../clients/cli/devices.c:1310
-msgid "on"
-msgstr "开"
-
-#: ../clients/cli/devices.c:1310
-msgid "off"
-msgstr "关"
+#: ../clients/cli/devices.c:1732
+msgid "Status of devices"
+msgstr "设备状态"
-#: ../clients/cli/devices.c:1544
+#: ../clients/cli/devices.c:1736
#, c-format
msgid "Error: 'device status': %s"
-msgstr "错误:“dev status”: %s"
-
-#: ../clients/cli/devices.c:1558
-msgid "Status of devices"
-msgstr "设备状态"
+msgstr "错误:\"dev status\": %s"
-#: ../clients/cli/devices.c:1584 ../clients/cli/devices.c:2039
-#: ../clients/cli/devices.c:3817
+#: ../clients/cli/devices.c:1763 ../clients/cli/devices.c:2218
+#: ../clients/cli/devices.c:4100
#, c-format
msgid "Error: invalid extra argument '%s'."
-msgstr "错误:无效的额外参数“%s”。"
+msgstr "错误:无效的额外参数 \"%s\"。"
-#: ../clients/cli/devices.c:1620 ../clients/cli/general.c:555
+#: ../clients/cli/devices.c:1799 ../clients/cli/general.c:539
#, c-format
msgid "Error: Timeout %d sec expired."
-msgstr "错误:超时 %d 秒过期。"
+msgstr "错误:超时时间 %d 秒已到。"
-#: ../clients/cli/devices.c:1669
+#: ../clients/cli/devices.c:1848
#, c-format
msgid "Device '%s' successfully activated with '%s'.\n"
-msgstr "成功用 '%s' 激活了设备 '%s'。\n"
+msgstr "成功用 \"%2$s\" 激活了设备 \"%1$s\"。\n"
-#: ../clients/cli/devices.c:1675
+#: ../clients/cli/devices.c:1854
#, c-format
msgid "Error: Connection activation failed: (%d) %s.\n"
-msgstr "错误:连接激活失败:(%d)%s。\n"
+msgstr "错误:连接激活失败:(%d) %s。\n"
-#: ../clients/cli/devices.c:1711
+#: ../clients/cli/devices.c:1890
#, c-format
msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
-msgstr "错误:设定 Wi-Fi 热点失败:%s"
+msgstr "错误:建立 Wi-Fi 热点失败:%s"
-#: ../clients/cli/devices.c:1714
+#: ../clients/cli/devices.c:1893
#, c-format
msgid "Error: Failed to add/activate new connection: %s"
msgstr "错误:添加/激活新连接失败:%s"
-#: ../clients/cli/devices.c:1724
+#: ../clients/cli/devices.c:1903
#, c-format
msgid "Error: Failed to setup a Wi-Fi hotspot"
-msgstr "错误:设定 Wi-Fi 热点失败"
+msgstr "错误:建立 Wi-Fi 热点失败"
-#: ../clients/cli/devices.c:1726
+#: ../clients/cli/devices.c:1905
#, c-format
msgid "Error: Failed to add/activate new connection: Unknown error"
msgstr "错误:无法添加/激活新连接:未知错误"
-#: ../clients/cli/devices.c:1738
+#: ../clients/cli/devices.c:1917
#, c-format
msgid "Connection with UUID '%s' created and activated on device '%s'\n"
-msgstr "UUID 为“%s”的连接已创建并在设备“%s”上激活\n"
+msgstr "UUID 为 \"%s\" 的连接已创建并在设备 \"%s\" 上激活\n"
-#: ../clients/cli/devices.c:1741
+#: ../clients/cli/devices.c:1920
#, c-format
msgid "Hotspot '%s' activated on device '%s'\n"
-msgstr ""
-"设备 '%s' 上激活的热点 '%s'\n"
-"\n"
+msgstr "热点 \"%s\" 已在设备 \"%s\" 上激活\n"
-#: ../clients/cli/devices.c:1805
+#: ../clients/cli/devices.c:1984
#, c-format
msgid "Error: Device activation failed: %s"
msgstr "错误:激活设备失败:%s"
-#: ../clients/cli/devices.c:1814
+#: ../clients/cli/devices.c:1993
#, c-format
msgid "Error: Device activation failed: device was disconnected"
msgstr "错误:设备激活失败:设备已断开连接"
-#: ../clients/cli/devices.c:1829
+# 原译设备已连接。原话用来提示设备已连接过了,不能再激活另一个连接了。如果使用“已连接”会让人认为是连接成功的意思,所以改成这个。
+#: ../clients/cli/devices.c:2008
#, c-format
msgid "Device '%s' has been connected.\n"
-msgstr "设备“%s”已连接。\n"
+msgstr "设备 \"%s\" 已有连接。\n"
-#: ../clients/cli/devices.c:1870
+#: ../clients/cli/devices.c:2049
#, c-format
msgid "Error: extra argument not allowed: '%s'."
-msgstr "错误:不允许的额外参数 “%s”。"
+msgstr "错误:不允许的额外参数:\"%s\"。"
-#: ../clients/cli/devices.c:1942 ../clients/cli/devices.c:1957
-#: ../clients/cli/devices.c:2187
+#: ../clients/cli/devices.c:2121 ../clients/cli/devices.c:2136
+#: ../clients/cli/devices.c:2366
#, c-format
msgid "Device '%s' successfully disconnected.\n"
-msgstr "成功断开设备 '%s'。\n"
+msgstr "成功断开设备 \"%s\"。\n"
-#: ../clients/cli/devices.c:1945
+#: ../clients/cli/devices.c:2124
#, c-format
msgid "Device '%s' successfully removed.\n"
-msgstr "成功删除设备 '%s'。\n"
+msgstr "成功移除设备 \"%s\"。\n"
-#: ../clients/cli/devices.c:2004 ../clients/cli/devices.c:2074
-#, fuzzy, c-format
+#: ../clients/cli/devices.c:2183 ../clients/cli/devices.c:2253
+#, c-format
msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
-msgstr "错误:保存“%s”(%s) 连接失败:%s\n"
+msgstr "错误:重新应用连接到 \"%s\" (%s) 失败:%s"
-#: ../clients/cli/devices.c:2014 ../clients/cli/devices.c:2083
+#: ../clients/cli/devices.c:2193 ../clients/cli/devices.c:2262
#, c-format
msgid "Connection successfully reapplied to device '%s'.\n"
-msgstr "成功重新应用连接到设备 '%s'。\n"
+msgstr "成功重新应用连接到设备 \"%s\"。\n"
-#: ../clients/cli/devices.c:2108
+#: ../clients/cli/devices.c:2287
#, c-format
msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
-msgstr ""
+msgstr "错误:从设备 \"%s\" (%s) 读取已应用的连接失败:%s"
-#: ../clients/cli/devices.c:2172
+#: ../clients/cli/devices.c:2351
#, c-format
msgid "Error: not all devices disconnected."
-msgstr "错误:未断开所有设备。"
+msgstr "错误:未断开所有设备的连接。"
-#: ../clients/cli/devices.c:2173
+#: ../clients/cli/devices.c:2352
#, c-format
msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
-msgstr "错误:断开设备 '%s'(%s)失败:%s\n"
+msgstr "错误:断开设备 \"%s\" (%s) 的连接失败:%s\n"
-#: ../clients/cli/devices.c:2251
+#: ../clients/cli/devices.c:2430
#, c-format
msgid "Error: not all devices deleted."
msgstr "错误:未删除所有设备。"
-#: ../clients/cli/devices.c:2252
+#: ../clients/cli/devices.c:2431
#, c-format
msgid "Error: Device '%s' (%s) deletion failed: %s\n"
-msgstr "错误:删除设备 '%s'(%s)失败:%s\n"
+msgstr "错误:删除设备 \"%s\" (%s) 失败:%s\n"
-#: ../clients/cli/devices.c:2336
+#: ../clients/cli/devices.c:2515
#, c-format
msgid "Error: No property specified."
msgstr "错误:未指定属性。"
-#: ../clients/cli/devices.c:2351 ../clients/cli/devices.c:2368
-#: ../clients/cli/general.c:724 ../clients/cli/general.c:736
+#: ../clients/cli/devices.c:2530 ../clients/cli/devices.c:2547
+#: ../clients/cli/general.c:713 ../clients/cli/general.c:725
#, c-format
msgid "Error: '%s' argument is missing."
-msgstr "错误:缺少 “%s” 参数。"
+msgstr "错误:缺少 \"%s\" 参数。"
-#: ../clients/cli/devices.c:2357
+#: ../clients/cli/devices.c:2536
#, c-format
msgid "Error: 'managed': %s."
-msgstr "错误:'managed': %s。"
+msgstr "错误:\"managed\":%s。"
-#: ../clients/cli/devices.c:2374
+#: ../clients/cli/devices.c:2553
#, c-format
msgid "Error: 'autoconnect': %s."
-msgstr "错误:“autoconnect”:%s。"
+msgstr "错误:\"autoconnect\":%s。"
-#: ../clients/cli/devices.c:2382 ../clients/cli/general.c:750
+#: ../clients/cli/devices.c:2561 ../clients/cli/general.c:739
#, c-format
msgid "Error: property '%s' is not known."
-msgstr "错误:属性 '%s' 是未知的。"
+msgstr "错误:属性 \"%s\" 是未知的。"
-#: ../clients/cli/devices.c:2432
+#: ../clients/cli/devices.c:2610
#, c-format
msgid "%s: using connection '%s'\n"
msgstr ""
-"%s: 在使用连接 '%s'\n"
+"%s:正使用连接 \"%s\"\n"
"\n"
-#: ../clients/cli/devices.c:2458
+#: ../clients/cli/devices.c:2636
#, c-format
msgid "%s: device created\n"
-msgstr "%s: 设备已创建\n"
+msgstr "%s:设备已创建\n"
-#: ../clients/cli/devices.c:2465
+#: ../clients/cli/devices.c:2643
#, c-format
msgid "%s: device removed\n"
-msgstr "%s:设备已删除\n"
+msgstr "%s:设备已移除\n"
-#: ../clients/cli/devices.c:2663
+#: ../clients/cli/devices.c:2818
msgid "Wi-Fi scan list"
msgstr "Wi-Fi 扫描列表"
-#: ../clients/cli/devices.c:2712
+#: ../clients/cli/devices.c:2895
+#, c-format
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "错误:未找到 bssid 为 \"%s\" 的接入点。"
+
+#: ../clients/cli/devices.c:3085
#, c-format
msgid "Error: 'device wifi': %s"
-msgstr "错误:“device wifi”:%s"
+msgstr "错误:\"device wifi\":%s"
-#: ../clients/cli/devices.c:2724
+#: ../clients/cli/devices.c:3103
#, c-format
-msgid "Error: Device '%s' not found."
-msgstr "错误:没有找到设备“%s”。"
+msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
+msgstr "错误:无效的重新扫描参数:\"%s\" 未在 [auto, no, yes] 之中"
-#: ../clients/cli/devices.c:2745 ../clients/cli/devices.c:2831
+#: ../clients/cli/devices.c:3110
#, c-format
-msgid "Error: Access point with bssid '%s' not found."
-msgstr "错误:未找到 bssid 是“%s”的访问点。"
+msgid "Error: Device '%s' not found."
+msgstr "错误:没有找到设备 \"%s\"。"
-#: ../clients/cli/devices.c:2773
+#: ../clients/cli/devices.c:3120
#, c-format
msgid ""
"Error: Device '%s' was not recognized as a Wi-Fi device, check "
"NetworkManager Wi-Fi plugin."
msgstr ""
-"错误:设备 '%s' 不被识别为 Wi-Fi 设备,请检查 NetworkManager Wi-Fi 插件。"
+"错误:设备 \"%s\" 没有被识别为 Wi-Fi 设备,请检查网络管理器(NetworkManager)"
+"的 Wi-Fi 插件。"
-#: ../clients/cli/devices.c:2777 ../clients/cli/devices.c:3060
-#: ../clients/cli/devices.c:3495 ../clients/cli/devices.c:3654
+#: ../clients/cli/devices.c:3124 ../clients/cli/devices.c:3342
+#: ../clients/cli/devices.c:3779 ../clients/cli/devices.c:3938
#, c-format
msgid "Error: Device '%s' is not a Wi-Fi device."
-msgstr "错误:设备“%s”不是 Wi-Fi 设备。"
+msgstr "错误:设备 \"%s\" 不是 Wi-Fi 设备。"
-#: ../clients/cli/devices.c:2909
+#: ../clients/cli/devices.c:3191
msgid "SSID or BSSID: "
msgstr "SSID 或 BSSID:"
-#: ../clients/cli/devices.c:2914
+#: ../clients/cli/devices.c:3196
#, c-format
msgid "Error: SSID or BSSID are missing."
msgstr "错误:缺少 SSID/BSSID。"
-#: ../clients/cli/devices.c:2951
+#: ../clients/cli/devices.c:3233
#, c-format
msgid "Error: bssid argument value '%s' is not a valid BSSID."
-msgstr "错误:bssid 参数值“%s”为无效 BSSID。"
+msgstr "错误:bssid 参数值\"%s\"为无效 BSSID。"
-#: ../clients/cli/devices.c:2981
+#: ../clients/cli/devices.c:3263
#, c-format
msgid ""
"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
-msgstr "错误:wep-key-type 参数值“%s”无效,请使用“key”或“phrase”。"
+msgstr "错误:wep-key-type 参数值 \"%s\" 无效,请使用 \"key\" 或 \"phrase\"。"
-#: ../clients/cli/devices.c:3008 ../clients/cli/devices.c:3026
+#: ../clients/cli/devices.c:3290 ../clients/cli/devices.c:3308
#, c-format
msgid "Error: %s: %s."
msgstr "错误:%s:%s。"
-#: ../clients/cli/devices.c:3043
+#: ../clients/cli/devices.c:3325
#, c-format
msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
-msgstr "错误:要连接的 BSSID (%s) 与 bssid 参数中的(%s)不同。"
+msgstr "错误:要连接的 BSSID (%s) 与 bssid 参数 (%s) 不同。"
-#: ../clients/cli/devices.c:3049
+#: ../clients/cli/devices.c:3331
#, c-format
msgid "Error: Parameter '%s' is neither SSID nor BSSID."
-msgstr "错误:参数“%s”不是 SSID 或 BSSID。"
+msgstr "错误:参数 \"%s\" 不是 SSID 或 BSSID。"
-#: ../clients/cli/devices.c:3062 ../clients/cli/devices.c:3497
-#: ../clients/cli/devices.c:3656
+#: ../clients/cli/devices.c:3344 ../clients/cli/devices.c:3781
+#: ../clients/cli/devices.c:3940
#, c-format
msgid "Error: No Wi-Fi device found."
msgstr "错误:未发现 Wi-Fi 设备。"
-#: ../clients/cli/devices.c:3082
+#: ../clients/cli/devices.c:3364
#, c-format
msgid "Error: Failed to scan hidden SSID: %s."
msgstr "错误:扫描隐藏的 SSID 失败:%s。"
-#: ../clients/cli/devices.c:3109
+#: ../clients/cli/devices.c:3391
#, c-format
msgid "Error: No network with SSID '%s' found."
-msgstr "错误:未发现 SSID 是“%s”的网络。"
+msgstr "错误:未发现 SSID 为 \"%s\" 的网络。"
-#: ../clients/cli/devices.c:3111
+#: ../clients/cli/devices.c:3393
#, c-format
msgid "Error: No access point with BSSID '%s' found."
-msgstr "错误:未找到 BSSID 是“%s”的访问点。"
+msgstr "错误:未找到 BSSID 为 \"%s\" 的接入点。"
-#: ../clients/cli/devices.c:3153
+#: ../clients/cli/devices.c:3435
#, c-format
msgid ""
"Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
-msgstr "警告:'%s' 应该是隐藏 AP 的 SSID,但看起来像 BSSID。\n"
+msgstr "警告:\"%s\" 应该是隐藏 AP 的 SSID,但看起来像 BSSID。\n"
-#: ../clients/cli/devices.c:3167
+#: ../clients/cli/devices.c:3451
msgid "Password: "
msgstr "密码:"
-#: ../clients/cli/devices.c:3316
+#: ../clients/cli/devices.c:3600
#, c-format
msgid "'%s' is not valid WPA PSK"
-msgstr "'%s' 是无效的 WPA PSK"
+msgstr "\"%s\" 不是有效的 WPA PSK"
-#: ../clients/cli/devices.c:3333
+#: ../clients/cli/devices.c:3617
#, c-format
msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
-msgstr "'%s' 不是有效的 WEP 密钥(它应该是 5 或 13 个 ASCII 字符)"
+msgstr "\"%s\" 不是有效的 WEP 密钥(它应该是 5 或 13 个 ASCII 字符)"
-#: ../clients/cli/devices.c:3349
+#: ../clients/cli/devices.c:3633
#, c-format
msgid "Hotspot password: %s\n"
msgstr "热点密码:%s\n"
-#: ../clients/cli/devices.c:3420
+#: ../clients/cli/devices.c:3704
#, c-format
msgid "Error: ssid is too long."
msgstr "错误:SSID 太长。"
-#: ../clients/cli/devices.c:3434
+# 这里 channel/band 开头不大写,表示其是命令行选项,所以不译。下面的同理。
+#: ../clients/cli/devices.c:3718
#, c-format
msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
-msgstr "错误:band 参数值 '%s' 无效,请使用 'a' 或 'bg'。"
+msgstr "错误:band 参数值 \"%s\" 无效,请使用 \"a\" 或 \"bg\"。"
-#: ../clients/cli/devices.c:3459
+#: ../clients/cli/devices.c:3743
#, c-format
msgid "Error: Unknown parameter %s."
msgstr "错误:未知参数 %s。"
-#: ../clients/cli/devices.c:3479
+#: ../clients/cli/devices.c:3763
#, c-format
msgid "Error: channel requires band too."
-msgstr "错误:频道也需要 band。"
+msgstr "错误:channal 也需要 band。"
-#: ../clients/cli/devices.c:3484
+#: ../clients/cli/devices.c:3768
#, c-format
msgid "Error: channel '%s' not valid for band '%s'."
-msgstr "错误:band '%s' 的 channel '%s' 无效。"
+msgstr "错误:band \"%s\" 的 channel \"%s\" 无效。"
-#: ../clients/cli/devices.c:3508
+#: ../clients/cli/devices.c:3792
#, c-format
msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
-msgstr "错误:设备 '%s' 既不支持 AP 也不支持 Ad-Hoc 模式。"
+msgstr "错误:设备 \"%s\" 既不支持 AP 也不支持 Ad-Hoc 模式。"
-#: ../clients/cli/devices.c:3542
+#: ../clients/cli/devices.c:3826
#, c-format
msgid "Error: Invalid 'password': %s."
-msgstr "错误:无效 'password':%s。"
+msgstr "错误:无效的 \"password\":%s。"
-#: ../clients/cli/devices.c:3617
+#: ../clients/cli/devices.c:3901
#, c-format
msgid "Error: '%s' cannot repeat."
-msgstr "错误:'%s' 不能重复。"
+msgstr "错误:\"%s\" 不能重复。"
#. Main header name
-#: ../clients/cli/devices.c:3723
+#: ../clients/cli/devices.c:4006
msgid "Device LLDP neighbors"
msgstr "设备 LLDP 邻居"
-#: ../clients/cli/devices.c:3833
+#: ../clients/cli/devices.c:4116
#, c-format
msgid "Error: 'device lldp list': %s"
-msgstr "错误:'device lldp list':%s"
+msgstr "错误:\"device lldp list\":%s"
#: ../clients/cli/general.c:42
msgid "asleep"
-msgstr "睡眠"
+msgstr "睡眠中"
#: ../clients/cli/general.c:43
msgid "connecting"
@@ -2871,65 +3141,65 @@ msgstr "连接中"
#: ../clients/cli/general.c:44
msgid "connected (local only)"
-msgstr "已连接(仅本地)"
+msgstr "已连接(仅本地)"
#: ../clients/cli/general.c:45
msgid "connected (site only)"
-msgstr "已连接(仅站点)"
+msgstr "已连接(仅站点)"
-#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:241
+#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:270
msgid "connected"
-msgstr "连接的"
+msgstr "已连接"
#: ../clients/cli/general.c:47
msgid "disconnecting"
-msgstr "正在断开连接"
+msgstr "断开中"
-#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:227
+#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:263
msgid "disconnected"
msgstr "已断开"
-#: ../clients/cli/general.c:80
+#: ../clients/cli/general.c:83
msgid "none"
msgstr "无"
-#: ../clients/cli/general.c:81
+#: ../clients/cli/general.c:84
msgid "portal"
msgstr "入口"
-#: ../clients/cli/general.c:82
+#: ../clients/cli/general.c:85
msgid "limited"
msgstr "受限"
-#: ../clients/cli/general.c:83
+#: ../clients/cli/general.c:86
msgid "full"
msgstr "完全"
-#: ../clients/cli/general.c:154
+#: ../clients/cli/general.c:158
msgid "auth"
-msgstr "认证"
+msgstr "验证"
-#: ../clients/cli/general.c:189
+#: ../clients/cli/general.c:186
msgid "running"
msgstr "运行中"
-#: ../clients/cli/general.c:203
+#: ../clients/cli/general.c:200
msgid "starting"
-msgstr "正在启动"
+msgstr "启动中"
-#: ../clients/cli/general.c:203
+#: ../clients/cli/general.c:200
msgid "started"
-msgstr "开始时间"
+msgstr "已启动"
-#: ../clients/cli/general.c:237
+#: ../clients/cli/general.c:234
msgid "enabled"
msgstr "已启用"
-#: ../clients/cli/general.c:237
+#: ../clients/cli/general.c:234
msgid "disabled"
msgstr "已禁用"
-#: ../clients/cli/general.c:369
+#: ../clients/cli/general.c:352
#, c-format
msgid ""
"Usage: nmcli general { COMMAND | help }\n"
@@ -2945,20 +3215,20 @@ msgid ""
" logging [level <log level>] [domains <log domains>]\n"
"\n"
msgstr ""
-"用法:nmcli general { COMMAND | help }\n"
+"用法:nmcli general { 命令 | help }\n"
"\n"
-"COMMAND := { status | hostname | permissions | logging }\n"
+"命令 := { status | hostname | permissions | logging }\n"
"\n"
" status\n"
"\n"
-" hostname [<hostname>]\n"
+" hostname [<主机名>]\n"
"\n"
" permissions\n"
"\n"
-" logging [level <log level>] [domains <log domains>]\n"
+" logging [level <日志级别>] [domains <日志域>]\n"
"\n"
-#: ../clients/cli/general.c:380
+#: ../clients/cli/general.c:363
#, c-format
msgid ""
"Usage: nmcli general status { help }\n"
@@ -2970,11 +3240,11 @@ msgid ""
msgstr ""
"用法:nmcli general status { help }\n"
"\n"
-"显示 NetworkManager 的总体状态。\n"
-"“status” 是默认动作,即 “nmcli gen” 调用 “nmcli gen status”\n"
+"显示网络管理器(NetworkManager)的整体状态。\n"
+"\"status\" 是默认操作,即 \"nmcli gen\" 调用 \"nmcli gen status\"\n"
"\n"
-#: ../clients/cli/general.c:389
+#: ../clients/cli/general.c:372
#, c-format
msgid ""
"Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -2987,16 +3257,17 @@ msgid ""
"hostname.\n"
"\n"
msgstr ""
-"用法:nmcli general hostname { ARGUMENTS | help }\n"
+"用法:nmcli general hostname { 参数 | help }\n"
"\n"
-"ARGUMENTS := [<hostname>]\n"
+"参数 := [<主机名>]\n"
"\n"
-"获得或者更改持久系统主机名。\n"
-"如果没有参数,则会输出目前配置的主机名。给定主机名后,\n"
-"NetworkManager 会将其设定为新的持久系统主机名。\n"
+"获取或更改永久的系统主机名。\n"
+"如果没有参数,则会输出当前配置的主机名。给定主机名后,网络管理器"
+"(NetworkManager)会将其设为\n"
+"新的永久系统主机名。\n"
"\n"
-#: ../clients/cli/general.c:401
+#: ../clients/cli/general.c:384
#, c-format
msgid ""
"Usage: nmcli general permissions { help }\n"
@@ -3006,10 +3277,10 @@ msgid ""
msgstr ""
"用法:nmcli general permissions { help }\n"
"\n"
-"显示认证操作的调用程序权限。\n"
+"显示验证操作的调用程序权限。\n"
"\n"
-#: ../clients/cli/general.c:409
+#: ../clients/cli/general.c:392
#, c-format
msgid ""
"Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3024,17 +3295,17 @@ msgid ""
"for the list of possible logging domains.\n"
"\n"
msgstr ""
-"用法:nmcli general logging { ARGUMENTS | help }\n"
+"用法:nmcli general logging { 参数 | help }\n"
"\n"
-"ARGUMENTS := [level <log level>] [domains <log domains>]\n"
+"参数 := [level <日志级别>] [domains <日志域>]\n"
"\n"
-"获得或者更改 NetworkManager 日志等级和域。\n"
-"如果没有任何参数则显示当前日志等级和域。要\n"
-"更改日志状态,请提供等级和(/或者)域。可能的日志域\n"
-"请参看 man page。\n"
+"获取或更改网络管理器(NetworkManager)的日志级别和域。\n"
+"如果没有任何参数则显示当前日志级别和域。要更改日志状态,请提供级别和(或)"
+"域。\n"
+"可能的日志域列表请参阅手册页。\n"
"\n"
-#: ../clients/cli/general.c:422
+#: ../clients/cli/general.c:405
#, c-format
msgid ""
"Usage: nmcli networking { COMMAND | help }\n"
@@ -3048,9 +3319,9 @@ msgid ""
" connectivity [check]\n"
"\n"
msgstr ""
-"用法:nmcli networking { COMMAND | help }\n"
+"用法:nmcli networking { 命令 | help }\n"
"\n"
-"COMMAND := { [ on | off | connectivity ] }\n"
+"命令 := { [ on | off | connectivity ] }\n"
"\n"
" on\n"
"\n"
@@ -3059,7 +3330,7 @@ msgstr ""
" connectivity [check]\n"
"\n"
-#: ../clients/cli/general.c:432
+#: ../clients/cli/general.c:415
#, c-format
msgid ""
"Usage: nmcli networking on { help }\n"
@@ -3072,7 +3343,7 @@ msgstr ""
"打开联网。\n"
"\n"
-#: ../clients/cli/general.c:440
+#: ../clients/cli/general.c:423
#, c-format
msgid ""
"Usage: nmcli networking off { help }\n"
@@ -3085,7 +3356,7 @@ msgstr ""
"关闭联网。\n"
"\n"
-#: ../clients/cli/general.c:448
+#: ../clients/cli/general.c:431
#, c-format
msgid ""
"Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3097,15 +3368,15 @@ msgid ""
"connectivity.\n"
"\n"
msgstr ""
-"用法:nmcli networking connectivity { ARGUMENTS | help }\n"
+"用法:nmcli networking connectivity { 参数 | help }\n"
"\n"
-"ARGUMENTS := [check]\n"
+"参数 := [check]\n"
"\n"
-"获得网络连接性状态。\n"
-"可选的 “check” 参数可让 NetworkManager 重新检查连接性。\n"
+"获取网络连接性状态。\n"
+"可选的 \"check\" 参数可让网络管理器(NetworkManager)重新检查连接性。\n"
"\n"
-#: ../clients/cli/general.c:460
+#: ../clients/cli/general.c:443
#, c-format
msgid ""
"Usage: nmcli radio { COMMAND | help }\n"
@@ -3115,14 +3386,14 @@ msgid ""
" all | wifi | wwan [ on | off ]\n"
"\n"
msgstr ""
-"用法:nmcli radio { COMMAND | help }\n"
+"用法:nmcli radio { 命令 | help }\n"
"\n"
-"COMMAND := { all | wifi | wwan }\n"
+"命令 := { all | wifi | wwan }\n"
"\n"
" all | wifi | wwan [ on | off ]\n"
"\n"
-#: ../clients/cli/general.c:469
+#: ../clients/cli/general.c:452
#, c-format
msgid ""
"Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3132,14 +3403,14 @@ msgid ""
"Get status of all radio switches, or turn them on/off.\n"
"\n"
msgstr ""
-"用法:nmcli radio all { ARGUMENTS | help }\n"
+"用法:nmcli radio all { 参数 | help }\n"
"\n"
-"ARGUMENTS := [on | off]\n"
+"参数 := [on | off]\n"
"\n"
-"获得所有单选按钮状态,或者打开/关闭它们。\n"
+"获取所有无线电开关的状态,或者打开/关闭它们。\n"
"\n"
-#: ../clients/cli/general.c:479
+#: ../clients/cli/general.c:462
#, c-format
msgid ""
"Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3149,14 +3420,14 @@ msgid ""
"Get status of Wi-Fi radio switch, or turn it on/off.\n"
"\n"
msgstr ""
-"用法:nmcli radio wifi { ARGUMENTS | help }\n"
+"用法:nmcli radio wifi { 参数 | help }\n"
"\n"
-"ARGUMENTS := [on | off]\n"
+"参数 := [on | off]\n"
"\n"
-"获得 Wi-Fi 单选开关状态,或者打开/关闭它。\n"
+"获取 Wi-Fi 无线电开关的状态,或者打开/关闭它。\n"
"\n"
-#: ../clients/cli/general.c:489
+#: ../clients/cli/general.c:472
#, c-format
msgid ""
"Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3166,14 +3437,14 @@ msgid ""
"Get status of mobile broadband radio switch, or turn it on/off.\n"
"\n"
msgstr ""
-"用法:nmcli radio wwan { ARGUMENTS | help }\n"
+"用法:nmcli radio wwan { 参数 | help }\n"
"\n"
-"ARGUMENTS := [on | off]\n"
+"参数 := [on | off]\n"
"\n"
-"获得移动宽带单选按钮状态,或者打开/关闭它。\n"
+"获取移动宽带无线电开关的状态,或者打开/关闭它。\n"
"\n"
-#: ../clients/cli/general.c:499
+#: ../clients/cli/general.c:482
#, c-format
msgid ""
"Usage: nmcli monitor\n"
@@ -3184,184 +3455,184 @@ msgid ""
msgstr ""
"用法:nmcli monitor\n"
"\n"
-"监控 NetworkManager 的改动。\n"
-"每当 NetworkManager 出现改动时打印一行信息。\n"
+"监视网络管理器(NetworkManager)的更改。\n"
+"每当 NetworkManager 出现更改时打印一行信息。\n"
"\n"
-#: ../clients/cli/general.c:528
+#: ../clients/cli/general.c:512
msgid "NetworkManager status"
msgstr "网络管理器状态"
-#: ../clients/cli/general.c:532
+#: ../clients/cli/general.c:516
#, c-format
msgid "Error: only these fields are allowed: %s"
msgstr "错误:只允许使用这些字段:%s"
-#: ../clients/cli/general.c:582
+#: ../clients/cli/general.c:570
msgid "NetworkManager permissions"
msgstr "网络管理器权限"
# XXX: 这里考虑一下要不要翻译
# XXX: Should we translate this?
-#: ../clients/cli/general.c:586
+#: ../clients/cli/general.c:574
#, c-format
msgid "Error: 'general permissions': %s"
-msgstr "错误:“general permissions”: %s"
+msgstr "错误:\"常规权限\":%s"
-#: ../clients/cli/general.c:674
+#: ../clients/cli/general.c:663
msgid "NetworkManager logging"
-msgstr "NetworkManager 日志"
+msgstr "网络管理器日志"
-#: ../clients/cli/general.c:678
+#: ../clients/cli/general.c:667
#, c-format
msgid "Error: 'general logging': %s"
-msgstr "错误:“general logging”: %s"
+msgstr "错误:\"常规日志\":%s"
-#: ../clients/cli/general.c:760
+#: ../clients/cli/general.c:749
#, c-format
msgid "Error: failed to set logging: %s"
msgstr "错误:设置日志失败:%s"
-#: ../clients/cli/general.c:777
+#: ../clients/cli/general.c:766
#, c-format
msgid "Error: failed to set hostname: %s"
-msgstr "错误:设定主机名失败:%s"
+msgstr "错误:设置主机名失败:%s"
-#: ../clients/cli/general.c:846
+#: ../clients/cli/general.c:835
#, c-format
msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
-msgstr "错误:“--fields”值“%s”在此无效(允许的字段:%s)"
+msgstr "错误:\"--fields\" 值 \"%s\" 在此无效(允许的字段:%s)"
-#: ../clients/cli/general.c:871
+#: ../clients/cli/general.c:860
#, c-format
msgid "Error: invalid '%s' argument: '%s' (use on/off)."
-msgstr "错误:无效的“%s”参数:“%s”(使用 on/off)。"
+msgstr "错误:无效的 \"%s\" 参数:\"%s\"(使用 on/off)。"
#. no arguments -> get current state
-#: ../clients/cli/general.c:919 ../clients/cli/general.c:931
+#: ../clients/cli/general.c:908 ../clients/cli/general.c:920
msgid "Connectivity"
-msgstr "连接"
+msgstr "连接性"
-#: ../clients/cli/general.c:934
+#: ../clients/cli/general.c:923
#, c-format
msgid "Error: 'networking' command '%s' is not valid."
-msgstr "错误:“networking” 命令 “%s” 无效。"
+msgstr "错误:\"networking\" 命令 \"%s\" 无效。"
-#: ../clients/cli/general.c:948
+#: ../clients/cli/general.c:937
msgid "Networking"
-msgstr "网络"
+msgstr "联网"
#. no argument, show all radio switches
-#: ../clients/cli/general.c:983
+#: ../clients/cli/general.c:972
msgid "Radio switches"
-msgstr "无线开关"
+msgstr "无线电开关"
#. no argument, show current WiFi state
-#: ../clients/cli/general.c:1013
+#: ../clients/cli/general.c:1002
msgid "Wi-Fi radio switch"
-msgstr "Wi-Fi 无线开关"
+msgstr "Wi-Fi 无线电开关"
#. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:1040
+#: ../clients/cli/general.c:1029
msgid "WWAN radio switch"
-msgstr "WWAN 无线开关"
+msgstr "WWAN 无线电开关"
-#: ../clients/cli/general.c:1089
+#: ../clients/cli/general.c:1077
msgid "NetworkManager has started"
-msgstr "NetworkManager 已启动"
+msgstr "网络管理器已启动"
-#: ../clients/cli/general.c:1089
+#: ../clients/cli/general.c:1077
msgid "NetworkManager has stopped"
-msgstr "NetworkManager 已停止"
+msgstr "网络管理器已停止"
-#: ../clients/cli/general.c:1100
+#: ../clients/cli/general.c:1088
#, c-format
msgid "Hostname set to '%s'\n"
-msgstr "将主机名设定为 '%s'\n"
+msgstr "主机名已设为 \"%s\"\n"
-#: ../clients/cli/general.c:1115
+#: ../clients/cli/general.c:1103
#, c-format
msgid "'%s' is now the primary connection\n"
-msgstr "'%s' 现在是主连接\n"
+msgstr "\"%s\" 现在是主连接\n"
-#: ../clients/cli/general.c:1117
+#: ../clients/cli/general.c:1105
#, c-format
msgid "There's no primary connection\n"
msgstr "没有主连接\n"
-#: ../clients/cli/general.c:1129
+#: ../clients/cli/general.c:1117
#, c-format
msgid "Connectivity is now '%s'\n"
-msgstr "连接性现在是 '%s'\n"
+msgstr "连接性现在是 \"%s\"\n"
-#: ../clients/cli/general.c:1142
+#: ../clients/cli/general.c:1130
#, c-format
msgid "Networkmanager is now in the '%s' state\n"
-msgstr "NetworkManager 现在处于 '%s' 状态。\n"
+msgstr "网络管理器现在处于 \"%s\" 状态\n"
-#: ../clients/cli/general.c:1163
+#: ../clients/cli/general.c:1150
msgid "connection available"
-msgstr ""
+msgstr "连接可用"
-#: ../clients/cli/general.c:1165
+#: ../clients/cli/general.c:1152
msgid "connections available"
-msgstr ""
+msgstr "连接可用"
-#: ../clients/cli/general.c:1183
+#: ../clients/cli/general.c:1170
msgid "autoconnect"
-msgstr ""
+msgstr "自动连接"
-#: ../clients/cli/general.c:1185
+#: ../clients/cli/general.c:1172
msgid "fw missing"
-msgstr ""
+msgstr "缺失固件"
-#: ../clients/cli/general.c:1190
+#: ../clients/cli/general.c:1177
msgid "plugin missing"
-msgstr ""
+msgstr "缺失插件"
-#: ../clients/cli/general.c:1195
+#: ../clients/cli/general.c:1182
msgid "sw"
-msgstr ""
+msgstr "软件"
-#: ../clients/cli/general.c:1197
+#: ../clients/cli/general.c:1184
msgid "hw"
-msgstr ""
+msgstr "硬件"
-#: ../clients/cli/general.c:1202
+#: ../clients/cli/general.c:1189
msgid "iface"
-msgstr ""
+msgstr "接口"
-#: ../clients/cli/general.c:1205
+#: ../clients/cli/general.c:1192
msgid "port"
-msgstr ""
+msgstr "端口"
-#: ../clients/cli/general.c:1208
+#: ../clients/cli/general.c:1195
msgid "mtu"
-msgstr ""
+msgstr "mtu"
-#: ../clients/cli/general.c:1225
+#: ../clients/cli/general.c:1212
msgid "master"
-msgstr ""
+msgstr "主连接"
-#: ../clients/cli/general.c:1229 ../clients/tui/nm-editor-utils.c:241
-#: ../clients/tui/nmt-connect-connection-list.c:408
+#: ../clients/cli/general.c:1216 ../clients/tui/nm-editor-utils.c:239
+#: ../clients/tui/nmt-connect-connection-list.c:407
msgid "VPN"
-msgstr "VPN 参数"
+msgstr "VPN"
-#: ../clients/cli/general.c:1231
+#: ../clients/cli/general.c:1218
msgid "ip4 default"
-msgstr ""
+msgstr "ip4 默认"
-#: ../clients/cli/general.c:1233
+#: ../clients/cli/general.c:1220
msgid "ip6 default"
-msgstr ""
+msgstr "ip6 默认"
-#: ../clients/cli/general.c:1316
+#: ../clients/cli/general.c:1303
#, c-format
msgid "%s VPN connection"
-msgstr ""
+msgstr "%s VPN 连接"
-#: ../clients/cli/general.c:1386
+#: ../clients/cli/general.c:1371
#, c-format
msgid ""
"Use \"nmcli device show\" to get complete information about known devices "
@@ -3371,22 +3642,28 @@ msgid ""
"Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage "
"details.\n"
msgstr ""
+"使用 \"nmcli device show\" 获取关于已知设备的完整信息,以及 \n"
+"\"nmcli connection show\" 获取活动连接配置集的概述。\n"
+"\n"
+"完整的用法细节,可参考 nmcli(1) 和 nmcli-examples(5) 手册页。\n"
-#: ../clients/cli/general.c:1407
+#: ../clients/cli/general.c:1392
#, c-format
msgid "Error: 'monitor' command '%s' is not valid."
-msgstr "错误:'monitor' 命令 '%s' 无效。"
+msgstr "错误:\"monitor\" 命令 \"%s\" 无效。"
-#: ../clients/cli/general.c:1419
+#: ../clients/cli/general.c:1404
msgid "Networkmanager is not running (waiting for it)\n"
-msgstr "NetworkManager 未运行(等待中)。\n"
+msgstr "网络管理器未运行(等待中)。\n"
-#: ../clients/cli/nmcli.c:184
+#: ../clients/cli/nmcli.c:245
#, c-format
msgid ""
"Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
"\n"
"OPTIONS\n"
+" -o[verview] overview mode (hide default "
+"values)\n"
" -t[erse] terse output\n"
" -p[retty] pretty output\n"
" -m[ode] tabular|multiline output mode\n"
@@ -3414,63 +3691,111 @@ msgid ""
" m[onitor] monitor NetworkManager changes\n"
"\n"
msgstr ""
-
-#: ../clients/cli/nmcli.c:263
+"用法:nmcli [选项] OBJECT { 命令 | help }\n"
+"\n"
+"选项:\n"
+" -o[verview] 概览模式(隐藏默认值)\n"
+" -t[erse] 简洁输出\n"
+" -p[retty] 整齐输出\n"
+" -m[ode] tabular|multiline 输出模式\n"
+" -c[olors] auto|yes|no 是否在输出中使用颜色\n"
+" -f[ields] <field1,field2,...>|all|common 指定要输出的字段\n"
+" -g[et-values] <field1,field2,...>|all|common -m tabular -t -f 的快捷方"
+"式\n"
+" -e[scape] yes|no 在值中转义列分隔符\n"
+" -a[sk] 询问缺少的参数\n"
+" -s[how-secrets] 允许显示密码\n"
+" -w[ait] <秒> 为完成的操作设置超时等待时"
+"间\n"
+" -v[ersion] 显示程序版本\n"
+" -h[elp] 输出此帮助\n"
+"\n"
+"对象:\n"
+" g[eneral] 网络管理器(NetworkManager)的常规状态和操作\n"
+" n[etworking] 整体联网控制\n"
+" r[adio] 网络管理器无线电开关\n"
+" c[onnection] 网络管理器的连接\n"
+" d[evice] 由网络管理器管理的设备\n"
+" a[gent] 网络管理器的密钥(secret)代理或 polkit 代理\n"
+" m[onitor] 监视网络管理器更改\n"
+"\n"
+
+#: ../clients/cli/nmcli.c:325
#, c-format
msgid "Error: missing argument for '%s' option."
-msgstr "错误:“%s” 选项缺少参数。"
+msgstr "错误:\"%s\" 选项缺少参数。"
+
+#: ../clients/cli/nmcli.c:626
+#, c-format
+msgid "Unexpected end of file following '%s'\n"
+msgstr "\"%s\" 后更随着意外的文件尾\n"
+
+#: ../clients/cli/nmcli.c:634
+#, c-format
+msgid "Expected whitespace following '%s'\n"
+msgstr "期望 \"%s\" 后更随空白\n"
+
+#: ../clients/cli/nmcli.c:646
+#, c-format
+msgid "Expected a value for '%s'\n"
+msgstr "期望一个 \"%s\" 的值\n"
+
+#: ../clients/cli/nmcli.c:660
+#, c-format
+msgid "Expected a line break following '%s'\n"
+msgstr "期望 \"%s\" 后更随换行符\n"
-#: ../clients/cli/nmcli.c:311
+#: ../clients/cli/nmcli.c:749
#, c-format
msgid "Error: Option '--terse' is specified the second time."
-msgstr "错误:第二次指定选项 “--terse”。"
+msgstr "错误:第二次指定了选项 \"--terse\"。"
-#: ../clients/cli/nmcli.c:316
+#: ../clients/cli/nmcli.c:754
#, c-format
msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
-msgstr "错误:选项 “--terse” 与 “--pretty” 相互排斥。"
+msgstr "错误:选项 \"--terse\" 与 \"--pretty\" 相互排斥。"
-#: ../clients/cli/nmcli.c:324
+#: ../clients/cli/nmcli.c:762
#, c-format
msgid "Error: Option '--pretty' is specified the second time."
-msgstr "错误:第二次指定选项 “--pretty”。"
+msgstr "错误:第二次指定了选项 \"--pretty\"。"
-#: ../clients/cli/nmcli.c:329
+#: ../clients/cli/nmcli.c:767
#, c-format
msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
-msgstr "错误:选项 “--pretty” 与 “--terse” 相互排斥。"
+msgstr "错误:选项 \"--pretty\" 与 \"--terse\" 相互排斥。"
-#: ../clients/cli/nmcli.c:344
+#: ../clients/cli/nmcli.c:782
#, c-format
msgid "Error: '%s' is not a valid argument for '%s' option."
-msgstr ""
+msgstr "错误:\"%s\" 不是 \"%s\" 选项的有效参数。"
-#: ../clients/cli/nmcli.c:358 ../clients/cli/nmcli.c:370
+#: ../clients/cli/nmcli.c:796 ../clients/cli/nmcli.c:808
#, c-format
msgid "Error: '%s' is not valid argument for '%s' option."
-msgstr "错误:“%s” 不是 “%s” 选项的有效参数。"
+msgstr "错误:\"%s\" 不是 \"%s\" 选项的有效参数。"
-#: ../clients/cli/nmcli.c:394
+#: ../clients/cli/nmcli.c:832
#, c-format
msgid "Error: '%s' is not a valid timeout."
-msgstr ""
+msgstr "错误:\"%s\" 不是有效的超时时间。"
-#: ../clients/cli/nmcli.c:401
+#: ../clients/cli/nmcli.c:839
#, c-format
msgid "nmcli tool, version %s\n"
msgstr "nmcli 工具,版本 %s\n"
-#: ../clients/cli/nmcli.c:409
+#: ../clients/cli/nmcli.c:847
#, c-format
msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
-msgstr "错误:选项 “%s” 未知,尝试 “nmcli -help”。"
+msgstr "错误:选项 \"%s\" 未知,尝试 \"nmcli -help\"。"
-#: ../clients/cli/nmcli.c:455 ../clients/cli/nmcli.c:462
+#: ../clients/cli/nmcli.c:903 ../clients/cli/nmcli.c:910
#, c-format
-msgid "Error: nmcli terminated by signal %s (%d)\n"
-msgstr ""
+msgid "Error: nmcli terminated by signal %s (%d)"
+msgstr "错误:nmcli 被信号 %s (%d) 终止了"
-#: ../clients/cli/nmcli.c:560
+#: ../clients/cli/nmcli.c:1052
msgid "Success"
msgstr "成功"
@@ -3479,12 +3804,12 @@ msgstr "成功"
msgid "Authentication message: %s\n"
msgstr "验证消息:%s\n"
-#: ../clients/cli/polkit-agent.c:74
+#: ../clients/cli/polkit-agent.c:76
#, c-format
msgid "Authentication error: %s\n"
msgstr "验证错误:%s\n"
-#: ../clients/cli/polkit-agent.c:120
+#: ../clients/cli/polkit-agent.c:136
#, c-format
msgid "Warning: polkit agent initialization failed: %s\n"
msgstr "警告:polkit 代理初始化失败:%s\n"
@@ -3492,553 +3817,567 @@ msgstr "警告:polkit 代理初始化失败:%s\n"
#: ../clients/cli/settings.c:46
#, c-format
msgid "Do you also want to set '%s' to '%s'? [yes]: "
-msgstr "您还要将 “%s” 设定为 “%s” 吗 [yes]:"
+msgstr "您是否也要将 \"%s\" 设为 \"%s\"?[yes]:"
#: ../clients/cli/settings.c:48
#, c-format
msgid "Do you also want to clear '%s'? [yes]: "
-msgstr "您还要清除 “%s” 吗? [yes]:"
+msgstr "您是否也要清除 \"%s\"?[yes]:"
#: ../clients/cli/settings.c:224
#, c-format
msgid ""
"Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
-msgstr "警告:设置 %s.%s 为 '%s',但在 infrastructure 模式下它可能被忽略。\n"
+msgstr ""
+"警告:%s.%s 已设为 \"%s\",但在基础结构(infrastructure)模式下它可能会被忽"
+"略。\n"
#: ../clients/cli/settings.c:243
#, c-format
msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
-msgstr "警告: 设置 %s.%s 要求删除 ipv4 和 ipv6 设置\n"
+msgstr "警告: 设置 %s.%s 需要删除 ipv4 和 ipv6 设置\n"
#: ../clients/cli/settings.c:245
msgid "Do you want to remove them? [yes] "
-msgstr "您要删除它们吗?[yes]"
+msgstr "您要删除它们吗?[yes]:"
-#: ../clients/cli/settings.c:330
+#: ../clients/cli/settings.c:332
#, c-format
msgid "Warning: %s is not an UUID of any existing connection profile\n"
-msgstr "警告: %s 不是任何现有连接配置集的 UUID \n"
+msgstr "警告:%s 不是任何现有连接配置集的 UUID\n"
-#: ../clients/cli/settings.c:335 ../clients/cli/settings.c:348
+#: ../clients/cli/settings.c:337 ../clients/cli/settings.c:350
#, c-format
msgid "'%s' is not a VPN connection profile"
-msgstr "'%s' 不是一个 VPN 连接配置集"
+msgstr "\"%s\" 不是 VPN 连接配置集"
-#: ../clients/cli/settings.c:342
+#: ../clients/cli/settings.c:344
#, c-format
msgid "'%s' is not a name of any exiting profile"
-msgstr "'%s' 不是任何现有配置集的名称"
+msgstr "\"%s\" 不是任何现有配置集的名称"
-#: ../clients/cli/settings.c:386
+#: ../clients/cli/settings.c:388
#, c-format
msgid "Warning: %s\n"
-msgstr ""
+msgstr "警告:%s\n"
-#: ../clients/cli/settings.c:389
-#, fuzzy, c-format
+#: ../clients/cli/settings.c:391
+#, c-format
msgid "Info: %s\n"
-msgstr "错误:%s\n"
+msgstr "信息:%s\n"
-#: ../clients/cli/settings.c:481
+#: ../clients/cli/settings.c:484
msgid "don't know how to get the property value"
-msgstr "不知道如何获得属性值"
+msgstr "不知道如何获取属性值"
-#: ../clients/cli/settings.c:571 ../clients/cli/settings.c:613
+#: ../clients/cli/settings.c:574 ../clients/cli/settings.c:616
msgid "the property can't be changed"
-msgstr "无法更改属性"
+msgstr "无法更改该属性"
-#: ../clients/cli/settings.c:733
+#: ../clients/cli/settings.c:730
msgid "[NM property description]"
msgstr "[NM 属性描述]"
-#: ../clients/cli/settings.c:743
+#: ../clients/cli/settings.c:740
msgid "[nmcli specific description]"
-msgstr "[nmcli 具体描述]"
+msgstr "[nmcli 特定描述]"
-#: ../clients/cli/utils.c:328
+#: ../clients/cli/utils.c:319
#, c-format
msgid "Error: Argument '%s' was expected, but '%s' provided."
-msgstr "错误:需要参数 “%s” 但给出的是 “%s”。"
+msgstr "错误:需要参数 \"%s\" 但提供的是 \"%s\"。"
-#: ../clients/cli/utils.c:331
+#: ../clients/cli/utils.c:322
#, c-format
msgid "Error: Unexpected argument '%s'"
-msgstr "错误:意外参数 “%s”"
+msgstr "错误:意外参数 \"%s\""
-#: ../clients/cli/utils.c:804
-#, fuzzy, c-format
+#: ../clients/cli/utils.c:709
+#, c-format
msgid "invalid field '%s%s%s'; no such field"
-msgstr "无效字段“%s”;允许字段:%s"
+msgstr "无效字段 \"%s%s%s\";没有此类字段"
-#: ../clients/cli/utils.c:808
-#, fuzzy, c-format
+#: ../clients/cli/utils.c:713
+#, c-format
msgid "invalid field '%s%s%s'; allowed fields: [%s]"
-msgstr "无效字段“%s”;允许字段:%s"
+msgstr "无效字段 \"%s%s%s\";允许的字段:[%s]"
-#: ../clients/cli/utils.c:881
-#, fuzzy, c-format
+#: ../clients/cli/utils.c:809
+#, c-format
msgid "failure to select field"
-msgstr "无法选择指定的 APN"
+msgstr "选择字段失败"
-#: ../clients/cli/utils.c:1469
+#: ../clients/cli/utils.c:1435
#, c-format
msgid "Error reading nmcli output: %s\n"
-msgstr ""
+msgstr "读取 nmcli 输出时出错:%s\n"
-#: ../clients/cli/utils.c:1474
+#: ../clients/cli/utils.c:1440
#, c-format
msgid "Error writing nmcli output: %s\n"
-msgstr ""
+msgstr "写入 nmcli 输出时出错:%s\n"
-#: ../clients/cli/utils.c:1498
+#: ../clients/cli/utils.c:1464
#, c-format
msgid "Failed to create pager pipe: %s\n"
-msgstr ""
+msgstr "创建与子进程通讯的管道失败:%s\n"
-#: ../clients/cli/utils.c:1506
+#: ../clients/cli/utils.c:1472
#, c-format
msgid "Failed to fork pager: %s\n"
-msgstr ""
+msgstr "fork 子进程失败:%s\n"
-#: ../clients/cli/utils.c:1552 ../clients/cli/utils.c:1554
+#: ../clients/cli/utils.c:1518 ../clients/cli/utils.c:1520
#, c-format
msgid "Failed to duplicate pager pipe: %s\n"
-msgstr ""
+msgstr "复制与子进程通讯的管道失败:%s\n"
+
+#: ../clients/cli/utils.h:298 ../clients/common/nm-meta-setting-desc.c:4899
+msgid "on"
+msgstr "开"
+
+#: ../clients/cli/utils.h:298 ../clients/common/nm-meta-setting-desc.c:4901
+msgid "off"
+msgstr "关"
+
+#: ../clients/cli/utils.h:324
+#, c-format
+msgid "%lld (%s)"
+msgstr "%lld(%s)"
+
+#: ../clients/cli/utils.h:331
+#, c-format
+#| msgid "%lld (%s)"
+msgid "%lld - %s"
+msgstr "%lld — %s"
#. TRANSLATORS: the first %s is the partial value entered by
#. * the user, the second %s a list of compatible values.
#.
-#: ../clients/common/nm-client-utils.c:75
-#: ../clients/common/nm-client-utils.c:106
+#: ../clients/common/nm-client-utils.c:117
+#: ../clients/common/nm-client-utils.c:148
#, c-format
msgid "'%s' is ambiguous (%s)"
-msgstr "'%s' 含义模糊(%s)"
+msgstr "\"%s\" 不明确(%s)"
-#: ../clients/common/nm-client-utils.c:85
+#: ../clients/common/nm-client-utils.c:127
#, c-format
msgid "'%s' is not valid; use [%s] or [%s]"
-msgstr "“%s” 无效,请使用 [%s] 或者 [%s]"
+msgstr "\"%s\" 无效,请使用 [%s] 或 [%s]"
-#: ../clients/common/nm-client-utils.c:118
+#: ../clients/common/nm-client-utils.c:160
#, c-format
msgid "'%s' is not valid; use [%s], [%s] or [%s]"
-msgstr "'%s' 无效,请使用 [%s]、[%s] 或者 [%s]"
+msgstr "\"%s\" 无效,请使用 [%s]、[%s] 或 [%s]"
-#: ../clients/common/nm-client-utils.c:155
+#: ../clients/common/nm-client-utils.c:209
#, c-format
-msgid "'%s' is ambiguous (%s x %s)"
-msgstr "“%s” 含义模糊 (%s x %s)"
+msgid "'%s' is ambiguous: %s"
+msgstr "\"%s\" 不明确:%s"
-#: ../clients/common/nm-client-utils.c:167
+#: ../clients/common/nm-client-utils.c:219
#, c-format
msgid "missing name, try one of [%s]"
msgstr "缺少名称,请尝试使用 [%s] 之一。"
-#: ../clients/common/nm-client-utils.c:223
+#: ../clients/common/nm-client-utils.c:261
msgid "unmanaged"
msgstr "未托管"
-#: ../clients/common/nm-client-utils.c:225
+#: ../clients/common/nm-client-utils.c:262
msgid "unavailable"
msgstr "不可用"
-#: ../clients/common/nm-client-utils.c:229
+#: ../clients/common/nm-client-utils.c:264
msgid "connecting (prepare)"
-msgstr "连接中(准备)"
+msgstr "连接中(准备)"
-#: ../clients/common/nm-client-utils.c:231
+#: ../clients/common/nm-client-utils.c:265
msgid "connecting (configuring)"
-msgstr "连接中(配置)"
+msgstr "连接中(正在配置)"
-#: ../clients/common/nm-client-utils.c:233
+#: ../clients/common/nm-client-utils.c:266
msgid "connecting (need authentication)"
-msgstr "连接中(需要验证)"
+msgstr "连接中(需要验证)"
-#: ../clients/common/nm-client-utils.c:235
+#: ../clients/common/nm-client-utils.c:267
msgid "connecting (getting IP configuration)"
-msgstr "正在连接(正在获取 IP 配置)"
+msgstr "连接中(正在获取 IP 配置)"
-#: ../clients/common/nm-client-utils.c:237
+#: ../clients/common/nm-client-utils.c:268
msgid "connecting (checking IP connectivity)"
-msgstr "正在连接(正在检查 IP 连通性)"
+msgstr "连接中(正在检查 IP 连接性)"
-#: ../clients/common/nm-client-utils.c:239
+#: ../clients/common/nm-client-utils.c:269
msgid "connecting (starting secondary connections)"
-msgstr "正在连接(正在启用第二连接)"
+msgstr "连接中(正在启动次级连接)"
-#: ../clients/common/nm-client-utils.c:245
+#: ../clients/common/nm-client-utils.c:272
msgid "connection failed"
msgstr "连接失败"
-#: ../clients/common/nm-client-utils.c:262
+#: ../clients/common/nm-client-utils.c:280
msgid "yes (guessed)"
msgstr "是(猜测)"
-#: ../clients/common/nm-client-utils.c:264
+#: ../clients/common/nm-client-utils.c:281
msgid "no (guessed)"
msgstr "否(猜测)"
-#: ../clients/common/nm-client-utils.c:277
+#. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
+#. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
+#: ../clients/common/nm-client-utils.c:287
+#: ../clients/common/nm-client-utils.c:359 ../libnm-glib/nm-device.c:1859
+#: ../libnm/nm-device.c:1363
+msgid "Unknown"
+msgstr "未知"
+
+#: ../clients/common/nm-client-utils.c:288
msgid "No reason given"
msgstr "未给出原因"
-#: ../clients/common/nm-client-utils.c:281
+#: ../clients/common/nm-client-utils.c:290
msgid "Device is now managed"
msgstr "设备现在已托管"
-#: ../clients/common/nm-client-utils.c:283
+#: ../clients/common/nm-client-utils.c:291
msgid "Device is now unmanaged"
msgstr "设备现在未托管"
-#: ../clients/common/nm-client-utils.c:285
+#: ../clients/common/nm-client-utils.c:292
msgid "The device could not be readied for configuration"
msgstr "设备配置未就绪"
-#: ../clients/common/nm-client-utils.c:287
+#: ../clients/common/nm-client-utils.c:293
msgid ""
"IP configuration could not be reserved (no available address, timeout, etc.)"
-msgstr "IP 配置无法保留(无可用地址,超时等)"
+msgstr "IP 配置无法保留(无可用地址、超时等)"
-#: ../clients/common/nm-client-utils.c:289
+#: ../clients/common/nm-client-utils.c:294
msgid "The IP configuration is no longer valid"
msgstr "IP 配置不再有效"
-#: ../clients/common/nm-client-utils.c:291
+#: ../clients/common/nm-client-utils.c:295
msgid "Secrets were required, but not provided"
-msgstr "需要认证凭据,但未提供"
+msgstr "需要密钥,但未提供"
-#: ../clients/common/nm-client-utils.c:293
+#: ../clients/common/nm-client-utils.c:296
msgid "802.1X supplicant disconnected"
-msgstr "802.1X 客户端已断开连接"
+msgstr "802.1X 请求方已断开连接"
-#: ../clients/common/nm-client-utils.c:295
+#: ../clients/common/nm-client-utils.c:297
msgid "802.1X supplicant configuration failed"
-msgstr "802.1X 客户端配置失败"
+msgstr "802.1X 请求方配置失败"
-#: ../clients/common/nm-client-utils.c:297
+#: ../clients/common/nm-client-utils.c:298
msgid "802.1X supplicant failed"
-msgstr "802.1X 客户端失败"
+msgstr "802.1X 请求方失败"
#: ../clients/common/nm-client-utils.c:299
msgid "802.1X supplicant took too long to authenticate"
-msgstr "802.1X 客户端认证时间过长"
+msgstr "802.1X 请求方验证时间过长"
-#: ../clients/common/nm-client-utils.c:301
+#: ../clients/common/nm-client-utils.c:300
msgid "PPP service failed to start"
msgstr "PPP 服务无法启动"
-#: ../clients/common/nm-client-utils.c:303
+#: ../clients/common/nm-client-utils.c:301
msgid "PPP service disconnected"
msgstr "PPP 服务已断开连接"
# auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:305
+#: ../clients/common/nm-client-utils.c:302
msgid "PPP failed"
msgstr "PPP 失败"
-#: ../clients/common/nm-client-utils.c:307
+#: ../clients/common/nm-client-utils.c:303
msgid "DHCP client failed to start"
-msgstr "DHCP 客户端无法启动"
+msgstr "DHCP 客户端启动失败"
# auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:309
+#: ../clients/common/nm-client-utils.c:304
msgid "DHCP client error"
msgstr "DHCP 客户端错误"
-#: ../clients/common/nm-client-utils.c:311
+#: ../clients/common/nm-client-utils.c:305
msgid "DHCP client failed"
msgstr "DHCP 客户端失败"
-#: ../clients/common/nm-client-utils.c:313
+#: ../clients/common/nm-client-utils.c:306
msgid "Shared connection service failed to start"
-msgstr "共享连接服务无法启动"
+msgstr "共享连接服务启动失败"
-#: ../clients/common/nm-client-utils.c:315
+#: ../clients/common/nm-client-utils.c:307
msgid "Shared connection service failed"
msgstr "共享连接服务失败"
-#: ../clients/common/nm-client-utils.c:317
+#: ../clients/common/nm-client-utils.c:308
msgid "AutoIP service failed to start"
-msgstr "自动 IP(AutoIP) 服务无法启动"
+msgstr "自动 IP(AutoIP)服务无法启动"
-#: ../clients/common/nm-client-utils.c:319
+#: ../clients/common/nm-client-utils.c:309
msgid "AutoIP service error"
-msgstr "自动 IP(AutoIP) 服务出错"
+msgstr "自动 IP(AutoIP)服务出错"
-#: ../clients/common/nm-client-utils.c:321
+#: ../clients/common/nm-client-utils.c:310
msgid "AutoIP service failed"
-msgstr "自动 IP(AutoIP) 服务失败"
+msgstr "自动 IP(AutoIP)服务失败"
-#: ../clients/common/nm-client-utils.c:323
+#: ../clients/common/nm-client-utils.c:311
msgid "The line is busy"
-msgstr "线路忙"
+msgstr "线路正忙"
-#: ../clients/common/nm-client-utils.c:325
+#: ../clients/common/nm-client-utils.c:312
msgid "No dial tone"
msgstr "无拨号音"
-#: ../clients/common/nm-client-utils.c:327
+#: ../clients/common/nm-client-utils.c:313
msgid "No carrier could be established"
msgstr "无法建立载波"
-#: ../clients/common/nm-client-utils.c:329
+#: ../clients/common/nm-client-utils.c:314
msgid "The dialing request timed out"
msgstr "拨号请求超时"
-#: ../clients/common/nm-client-utils.c:331
+#: ../clients/common/nm-client-utils.c:315
msgid "The dialing attempt failed"
msgstr "拨号尝试失败"
-#: ../clients/common/nm-client-utils.c:333
+#: ../clients/common/nm-client-utils.c:316
msgid "Modem initialization failed"
msgstr "调制解调器初始化失败"
-#: ../clients/common/nm-client-utils.c:335
+#: ../clients/common/nm-client-utils.c:317
msgid "Failed to select the specified APN"
msgstr "无法选择指定的 APN"
-#: ../clients/common/nm-client-utils.c:337
+#: ../clients/common/nm-client-utils.c:318
msgid "Not searching for networks"
msgstr "不搜索网络"
-#: ../clients/common/nm-client-utils.c:339
+#: ../clients/common/nm-client-utils.c:319
msgid "Network registration denied"
msgstr "网络注册遭拒绝"
-#: ../clients/common/nm-client-utils.c:341
+#: ../clients/common/nm-client-utils.c:320
msgid "Network registration timed out"
msgstr "网络注册超时"
-#: ../clients/common/nm-client-utils.c:343
+#: ../clients/common/nm-client-utils.c:321
msgid "Failed to register with the requested network"
-msgstr "无法注册请求的网络"
+msgstr "注册请求的网络失败"
-#: ../clients/common/nm-client-utils.c:345
+#: ../clients/common/nm-client-utils.c:322
msgid "PIN check failed"
msgstr "PIN 检查失败"
-#: ../clients/common/nm-client-utils.c:347
+#: ../clients/common/nm-client-utils.c:323
msgid "Necessary firmware for the device may be missing"
-msgstr "该设备所需固件可能丢失"
+msgstr "该设备所需固件可能缺失"
-#: ../clients/common/nm-client-utils.c:349
+#: ../clients/common/nm-client-utils.c:324
msgid "The device was removed"
-msgstr "设备被移除"
+msgstr "设备已被移除"
-#: ../clients/common/nm-client-utils.c:351
+#: ../clients/common/nm-client-utils.c:325
msgid "NetworkManager went to sleep"
-msgstr "网络管理器挂起"
+msgstr "网络管理器已挂起"
-#: ../clients/common/nm-client-utils.c:353
+#: ../clients/common/nm-client-utils.c:326
msgid "The device's active connection disappeared"
msgstr "设备的活动连接已消失"
-#: ../clients/common/nm-client-utils.c:355
+#: ../clients/common/nm-client-utils.c:327
msgid "Device disconnected by user or client"
-msgstr "用户/客户端断开了设备连接"
+msgstr "用户或客户端断开了设备连接"
-#: ../clients/common/nm-client-utils.c:357
+#: ../clients/common/nm-client-utils.c:328
msgid "Carrier/link changed"
-msgstr "载波/连接已更改"
+msgstr "载波/链路已更改"
-#: ../clients/common/nm-client-utils.c:359
+#: ../clients/common/nm-client-utils.c:329
msgid "The device's existing connection was assumed"
msgstr "假定设备已有连接"
-#: ../clients/common/nm-client-utils.c:361
+#: ../clients/common/nm-client-utils.c:330
msgid "The supplicant is now available"
msgstr "客户端目前可用"
-#: ../clients/common/nm-client-utils.c:363
+#: ../clients/common/nm-client-utils.c:331
msgid "The modem could not be found"
msgstr "未找到调制解调器"
-#: ../clients/common/nm-client-utils.c:365
+#: ../clients/common/nm-client-utils.c:332
msgid "The Bluetooth connection failed or timed out"
msgstr "蓝牙连接失败或超时"
-#: ../clients/common/nm-client-utils.c:367
+#: ../clients/common/nm-client-utils.c:333
msgid "GSM Modem's SIM card not inserted"
msgstr "GSM 调制解调器的 SIM 卡未插入"
-#: ../clients/common/nm-client-utils.c:369
+#: ../clients/common/nm-client-utils.c:334
msgid "GSM Modem's SIM PIN required"
msgstr "GSM 调制解调器的 SIM 需要 PIN 码"
-#: ../clients/common/nm-client-utils.c:371
+#: ../clients/common/nm-client-utils.c:335
msgid "GSM Modem's SIM PUK required"
msgstr "GSM 调制解调器的 SIM 需要 PUK 码"
-#: ../clients/common/nm-client-utils.c:373
+#: ../clients/common/nm-client-utils.c:336
msgid "GSM Modem's SIM wrong"
msgstr "GSM 调制解调器的 SIM 错误"
-#: ../clients/common/nm-client-utils.c:375
+#: ../clients/common/nm-client-utils.c:337
msgid "InfiniBand device does not support connected mode"
-msgstr "高速网络连接设备不支持已连接的模式"
+msgstr "InfiniBand 设备不支持已连接的模式"
-#: ../clients/common/nm-client-utils.c:377
+#: ../clients/common/nm-client-utils.c:338
msgid "A dependency of the connection failed"
msgstr "连接的依赖关系失败"
-#: ../clients/common/nm-client-utils.c:379
+#: ../clients/common/nm-client-utils.c:339
msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
-msgstr "RFC 2684 以太网在 ADSL 网桥处出现问题"
+msgstr "ADSL 网桥上的 RFC 2684 以太网出现问题"
-#: ../clients/common/nm-client-utils.c:381
+#: ../clients/common/nm-client-utils.c:340
msgid "ModemManager is unavailable"
-msgstr "调制解调器管理器不可用"
+msgstr "ModemManager 不可用"
-#: ../clients/common/nm-client-utils.c:383
+#: ../clients/common/nm-client-utils.c:341
msgid "The Wi-Fi network could not be found"
msgstr "未找到 Wi-Fi 网络"
-#: ../clients/common/nm-client-utils.c:385
+#: ../clients/common/nm-client-utils.c:342
msgid "A secondary connection of the base connection failed"
-msgstr "基础连接的备选连接失败"
+msgstr "基础连接的次级连接失败"
-#: ../clients/common/nm-client-utils.c:387
+#: ../clients/common/nm-client-utils.c:343
msgid "DCB or FCoE setup failed"
msgstr "DCB 或 FCoE 设置失败"
-#: ../clients/common/nm-client-utils.c:389
+#: ../clients/common/nm-client-utils.c:344
msgid "teamd control failed"
msgstr "teamd 控制失败"
# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:391
+#: ../clients/common/nm-client-utils.c:345
msgid "Modem failed or no longer available"
msgstr "调制解调器出现故障或不再可用"
# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:393
+#: ../clients/common/nm-client-utils.c:346
msgid "Modem now ready and available"
-msgstr "调制解调器现在已准备好且可用"
+msgstr "调制解调器现已就绪且可用"
-#: ../clients/common/nm-client-utils.c:395
+#: ../clients/common/nm-client-utils.c:347
msgid "SIM PIN was incorrect"
msgstr "SIM PIN 不正确"
-#: ../clients/common/nm-client-utils.c:397
+#: ../clients/common/nm-client-utils.c:348
msgid "New connection activation was enqueued"
msgstr "新连接激活已排队"
-#: ../clients/common/nm-client-utils.c:399
+#: ../clients/common/nm-client-utils.c:349
msgid "The device's parent changed"
-msgstr "设备的参数已修改"
+msgstr "设备的上级已更改"
-#: ../clients/common/nm-client-utils.c:401
+#: ../clients/common/nm-client-utils.c:350
msgid "The device parent's management changed"
-msgstr "父设备的管理已修改"
+msgstr "设备的上级管理已更改"
-#: ../clients/common/nm-client-utils.c:403
+#: ../clients/common/nm-client-utils.c:351
msgid "OpenVSwitch database connection failed"
-msgstr ""
+msgstr "OpenVSwitch 数据库连接失败"
-#: ../clients/common/nm-client-utils.c:405
+#: ../clients/common/nm-client-utils.c:352
msgid "A duplicate IP address was detected"
-msgstr ""
+msgstr "检测到重复的 IP 地址"
-#. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
-#: ../clients/common/nm-client-utils.c:410
-#: ../clients/common/nm-client-utils.c:449 ../libnm-glib/nm-device.c:1860
-#: ../libnm/nm-device.c:1572
-msgid "Unknown"
-msgstr "未知"
+#: ../clients/common/nm-client-utils.c:353
+msgid "The selected IP method is not supported"
+msgstr "选中的 IP 方法未支持"
+
+#: ../clients/common/nm-client-utils.c:354
+msgid "Failed to configure SR-IOV parameters"
+msgstr "配置 SR-IOV 参数失败"
-#: ../clients/common/nm-client-utils.c:418
-#, fuzzy
+#: ../clients/common/nm-client-utils.c:360
msgid "Unknown reason"
msgstr "未知原因"
-#: ../clients/common/nm-client-utils.c:420
-#, fuzzy
+#: ../clients/common/nm-client-utils.c:361
msgid "The connection was disconnected"
-msgstr "这个连接不是一个 Bond 连接。"
+msgstr "连接已断开"
-#: ../clients/common/nm-client-utils.c:422
-#, fuzzy
+#: ../clients/common/nm-client-utils.c:362
msgid "Disconnected by user"
-msgstr "被 D-Bus 断开"
+msgstr "已被用户断开连接"
-#: ../clients/common/nm-client-utils.c:424
-#, fuzzy
+#: ../clients/common/nm-client-utils.c:363
msgid "The base network connection was interrupted"
-msgstr "基点网络连接中断"
+msgstr "基础网络连接已中断"
-#: ../clients/common/nm-client-utils.c:426
-#, fuzzy
+#: ../clients/common/nm-client-utils.c:364
msgid "The VPN service stopped unexpectedly"
msgstr "VPN 服务意外停止"
-#: ../clients/common/nm-client-utils.c:428
-#, fuzzy
+#: ../clients/common/nm-client-utils.c:365
msgid "The VPN service returned invalid configuration"
-msgstr "VPN 服务返回无效配置"
+msgstr "VPN 服务返回了无效配置"
-#: ../clients/common/nm-client-utils.c:430
-#, fuzzy
+#: ../clients/common/nm-client-utils.c:366
msgid "The connection attempt timed out"
msgstr "连接尝试超时"
-#: ../clients/common/nm-client-utils.c:432
-#, fuzzy
+#: ../clients/common/nm-client-utils.c:367
msgid "The VPN service did not start in time"
-msgstr "VPN 连接没有按时启动"
+msgstr "VPN 连接没有及时启动"
-#: ../clients/common/nm-client-utils.c:434
-#, fuzzy
+#: ../clients/common/nm-client-utils.c:368
msgid "The VPN service failed to start"
msgstr "VPN 服务启动失败"
-#: ../clients/common/nm-client-utils.c:436
-#, fuzzy
+#: ../clients/common/nm-client-utils.c:369
msgid "No valid secrets"
-msgstr "没有有效的 VPN 加密"
+msgstr "没有有效的密钥"
-#: ../clients/common/nm-client-utils.c:438
-#, fuzzy
+#: ../clients/common/nm-client-utils.c:370
msgid "Invalid secrets"
-msgstr "无效 VPN 加密"
+msgstr "无效的密钥"
-#: ../clients/common/nm-client-utils.c:440
-#, fuzzy
+#: ../clients/common/nm-client-utils.c:371
msgid "The connection was removed"
-msgstr "连接被删除"
+msgstr "连接已被移除"
-#: ../clients/common/nm-client-utils.c:442
-#, fuzzy
+#: ../clients/common/nm-client-utils.c:372
msgid "Master connection failed"
-msgstr "连接失败"
+msgstr "主连接失败"
-#: ../clients/common/nm-client-utils.c:444
-#, fuzzy
+#: ../clients/common/nm-client-utils.c:373
msgid "Could not create a software link"
-msgstr "无法创建临时文件:%s"
+msgstr "无法创建软件链路:%s"
-#: ../clients/common/nm-client-utils.c:446
-#, fuzzy
+#: ../clients/common/nm-client-utils.c:374
msgid "The device disappeared"
-msgstr "设备的活动连接已消失"
+msgstr "设备已消失"
-#: ../clients/common/nm-meta-setting-access.c:501
+#: ../clients/common/nm-meta-setting-access.c:492
#, c-format
msgid "field '%s' has to be alone"
-msgstr "字段“%s”必须是单独的"
+msgstr "字段 \"%s\" 必须是单独的"
-#: ../clients/common/nm-meta-setting-access.c:516
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-access.c:507
+#, c-format
msgid "invalid field '%s%s%s%s%s'; %s%s%s"
-msgstr "无效字段“%s”;允许字段:%s"
+msgstr "无效字段 \"%s%s%s%s%s\";%s%s%s"
-#: ../clients/common/nm-meta-setting-desc.c:100
-#: ../clients/common/nm-meta-setting-desc.c:156
+#: ../clients/common/nm-meta-setting-desc.c:99
+#: ../clients/common/nm-meta-setting-desc.c:161
#, c-format
msgid "invalid prefix '%s'; <1-%d> allowed"
-msgstr "无效前缀 '%s':允许的范围是 <1-%d>"
+msgstr "无效前缀 \"%s\":允许的范围是 <1-%d>"
-#: ../clients/common/nm-meta-setting-desc.c:108
+#: ../clients/common/nm-meta-setting-desc.c:107
#, c-format
msgid "invalid IP address: %s"
msgstr "无效的 IP 地址:%s"
@@ -4048,265 +4387,240 @@ msgid ""
"The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
"ip[/prefix] ...]'"
msgstr ""
+"有效语法为:\"ip[/prefix] [next-hop] [metric] [attribute=val]... [,ip[/"
+"prefix] ...]\""
-#: ../clients/common/nm-meta-setting-desc.c:167
+#: ../clients/common/nm-meta-setting-desc.c:172
#, c-format
msgid "the next hop ('%s') must be first"
-msgstr ""
+msgstr "下一跳(\"%s\")必须在首位"
-#: ../clients/common/nm-meta-setting-desc.c:173
+#: ../clients/common/nm-meta-setting-desc.c:178
#, c-format
msgid "the metric ('%s') must be before attributes"
-msgstr ""
+msgstr "跃点数(\"%s\")必需在属性前"
-#: ../clients/common/nm-meta-setting-desc.c:213
+#: ../clients/common/nm-meta-setting-desc.c:218
#, c-format
msgid "invalid route: %s. %s"
-msgstr ""
+msgstr "无效路由:%s。%s"
-#: ../clients/common/nm-meta-setting-desc.c:225
+#: ../clients/common/nm-meta-setting-desc.c:230
msgid "default route cannot be added (NetworkManager handles it by itself)"
-msgstr "无法添加默认的路由(NetworkManager 自己进行处理)"
+msgstr "无法添加默认路由(网络管理器自己进行处理)"
-#: ../clients/common/nm-meta-setting-desc.c:424
+#: ../clients/common/nm-meta-setting-desc.c:429
#, c-format
msgid "invalid priority map '%s'"
-msgstr "无效的优先级映射“%s”"
+msgstr "无效的优先级映射 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:431
-#: ../clients/common/nm-meta-setting-desc.c:437
+#: ../clients/common/nm-meta-setting-desc.c:436
+#: ../clients/common/nm-meta-setting-desc.c:442
#, c-format
msgid "priority '%s' is not valid (<0-%ld>)"
-msgstr "优先级“%s”无效 (<0-%ld>)"
+msgstr "优先级 \"%s\" 无效(<0-%ld>)"
-#: ../clients/common/nm-meta-setting-desc.c:489
+#: ../clients/common/nm-meta-setting-desc.c:494
#, c-format
msgid "cannot read pac-script from file '%s'"
-msgstr "无法从文件“%s”读取 PAC 脚本"
+msgstr "无法从文件 \"%s\" 读取 PAC 脚本"
-#: ../clients/common/nm-meta-setting-desc.c:496
+#: ../clients/common/nm-meta-setting-desc.c:501
#, c-format
msgid "file '%s' contains non-valid utf-8"
-msgstr "文件“%s”包含无效的 utf-8"
+msgstr "文件 \"%s\" 包含无效的 utf-8"
-#: ../clients/common/nm-meta-setting-desc.c:509
+#: ../clients/common/nm-meta-setting-desc.c:514
#, c-format
msgid "'%s' does not contain a valid PAC Script"
-msgstr "“%s”没有包含有效的 PAC 脚本"
+msgstr "\"%s\" 没有包含有效的 PAC 脚本"
-#: ../clients/common/nm-meta-setting-desc.c:512
+#: ../clients/common/nm-meta-setting-desc.c:517
#, c-format
msgid "Not a valid PAC Script"
msgstr "不是有效的 PAC 脚本"
-#: ../clients/common/nm-meta-setting-desc.c:566
+#: ../clients/common/nm-meta-setting-desc.c:571
#, c-format
msgid "cannot read team config from file '%s'"
-msgstr "无法从文件“%s”读取分组配置"
+msgstr "无法从文件 \"%s\" 读取组合(team)配置"
-#: ../clients/common/nm-meta-setting-desc.c:573
+#: ../clients/common/nm-meta-setting-desc.c:578
#, c-format
msgid "team config file '%s' contains non-valid utf-8"
-msgstr ""
+msgstr "组合(team)配置文件 \"%s\" 包含无效的 utf-8"
-#: ../clients/common/nm-meta-setting-desc.c:585
+#: ../clients/common/nm-meta-setting-desc.c:590
#, c-format
msgid "'%s' does not contain a valid team configuration"
-msgstr ""
+msgstr "\"%s\" 没有包含有效的组合(team)配置"
-#: ../clients/common/nm-meta-setting-desc.c:588
+#: ../clients/common/nm-meta-setting-desc.c:593
#, c-format
msgid "team configuration must be a JSON object"
-msgstr ""
+msgstr "组合(team)配置必须为 JSON 目标"
-#: ../clients/common/nm-meta-setting-desc.c:682
+#: ../clients/common/nm-meta-setting-desc.c:714
#: ../clients/tui/nmt-mtu-entry.c:84
msgid "(default)"
msgstr "(默认)"
-#: ../clients/common/nm-meta-setting-desc.c:797
+#: ../clients/common/nm-meta-setting-desc.c:855
msgid "auto"
msgstr "自动"
-#: ../clients/common/nm-meta-setting-desc.c:945
+#: ../clients/common/nm-meta-setting-desc.c:1007
#, c-format
msgid "%s (%s)"
-msgstr ""
+msgstr "%s(%s)"
-#: ../clients/common/nm-meta-setting-desc.c:1069
+#: ../clients/common/nm-meta-setting-desc.c:1131
#, c-format
msgid "'%s' is out of range [%lli, %lli]"
-msgstr ""
+msgstr "\"%s\" 超出范围 [%lli, %lli]"
-#: ../clients/common/nm-meta-setting-desc.c:1075
+#: ../clients/common/nm-meta-setting-desc.c:1137
#, c-format
msgid "'%s' is not a valid number"
-msgstr ""
+msgstr "\"%s\" 不是有效的数字"
-#: ../clients/common/nm-meta-setting-desc.c:1125
+#: ../clients/common/nm-meta-setting-desc.c:1187
#, c-format
msgid "'%s' is out of range [0, %u]"
-msgstr ""
+msgstr "\"%s\" 超出范围 [0, %u]"
-#: ../clients/common/nm-meta-setting-desc.c:1162
+#: ../clients/common/nm-meta-setting-desc.c:1230
#, c-format
msgid "'%s' is not a valid Ethernet MAC"
-msgstr "“%s”不是有效的以太网 MAC"
+msgstr "\"%s\" 不是有效的以太网 MAC"
-#: ../clients/common/nm-meta-setting-desc.c:1181
+#: ../clients/common/nm-meta-setting-desc.c:1334
#, c-format
-msgid "'%s' is not a valid flag number; use <0-%d>"
-msgstr "'%s' 是无效的标记数字,请使用 <0-%d>。"
-
-#: ../clients/common/nm-meta-setting-desc.c:1195
-#, fuzzy, c-format
-msgid "'%s' sum is higher than all flags => all flags set"
-msgstr "警告:'%s' 总计高于 all flags => all flags 集合\n"
-
-#: ../clients/common/nm-meta-setting-desc.c:1299
-#, fuzzy, c-format
msgid "invalid option '%s', use a combination of [%s]"
-msgstr "无效选项 '%s',请使用 [%s] 中的一个。"
+msgstr "无效选项 \"%s\",请使用 [%s] 的组合"
-#: ../clients/common/nm-meta-setting-desc.c:1304
-#: ../libnm-core/nm-keyfile-reader.c:623
+#: ../clients/common/nm-meta-setting-desc.c:1339 ../libnm-core/nm-keyfile.c:770
#, c-format
msgid "invalid option '%s', use one of [%s]"
-msgstr "无效选项 '%s',请使用 [%s] 中的一个。"
+msgstr "无效选项 \"%s\",请使用 [%s] 中的一个。"
-#: ../clients/common/nm-meta-setting-desc.c:1427
+#: ../clients/common/nm-meta-setting-desc.c:1458
#, c-format
msgid "%d (key)"
-msgstr "%d (密钥)"
+msgstr "%d(密钥)"
-#: ../clients/common/nm-meta-setting-desc.c:1429
+#: ../clients/common/nm-meta-setting-desc.c:1460
#, c-format
msgid "%d (passphrase)"
-msgstr "%d (密码短语)"
+msgstr "%d(密码)"
-#: ../clients/common/nm-meta-setting-desc.c:1432
-#: ../clients/common/nm-meta-setting-desc.c:1521
+#: ../clients/common/nm-meta-setting-desc.c:1463
#, c-format
msgid "%d (unknown)"
-msgstr "%d (未知)"
+msgstr "%d(未知)"
-#: ../clients/common/nm-meta-setting-desc.c:1464
+#: ../clients/common/nm-meta-setting-desc.c:1495
msgid "0 (NONE)"
-msgstr "0 (无)"
+msgstr "0(无)"
-#: ../clients/common/nm-meta-setting-desc.c:1470
+#: ../clients/common/nm-meta-setting-desc.c:1501
msgid "REORDER_HEADERS, "
msgstr "记录头、"
-#: ../clients/common/nm-meta-setting-desc.c:1472
+#: ../clients/common/nm-meta-setting-desc.c:1503
msgid "GVRP, "
msgstr "GVRP、"
-#: ../clients/common/nm-meta-setting-desc.c:1474
+#: ../clients/common/nm-meta-setting-desc.c:1505
msgid "LOOSE_BINDING, "
-msgstr "LOOSE_BINDING, "
+msgstr "松散绑定、"
-#: ../clients/common/nm-meta-setting-desc.c:1476
+#: ../clients/common/nm-meta-setting-desc.c:1507
msgid "MVRP, "
-msgstr "MVRP, "
+msgstr "MVRP、"
-#: ../clients/common/nm-meta-setting-desc.c:1515
-#, c-format
-msgid "%d (disabled)"
-msgstr "%d (已禁用)"
-
-#: ../clients/common/nm-meta-setting-desc.c:1517
-#, c-format
-msgid "%d (enabled, prefer public IP)"
-msgstr "%d (已启用,首选公共 IP)"
-
-#: ../clients/common/nm-meta-setting-desc.c:1519
-#, c-format
-msgid "%d (enabled, prefer temporary IP)"
-msgstr "%d (已启用,首选临时 IP)"
-
-#: ../clients/common/nm-meta-setting-desc.c:1534
+#: ../clients/common/nm-meta-setting-desc.c:1547
msgid "0 (none)"
-msgstr "0 (无)"
+msgstr "0(无)"
-#: ../clients/common/nm-meta-setting-desc.c:1540
+#: ../clients/common/nm-meta-setting-desc.c:1553
msgid "agent-owned, "
msgstr "为代理拥有、"
-#: ../clients/common/nm-meta-setting-desc.c:1542
+#: ../clients/common/nm-meta-setting-desc.c:1555
msgid "not saved, "
msgstr "未保存、"
-#: ../clients/common/nm-meta-setting-desc.c:1544
+#: ../clients/common/nm-meta-setting-desc.c:1557
msgid "not required, "
-msgstr "不必须、"
+msgstr "不必需、"
-#: ../clients/common/nm-meta-setting-desc.c:1606
+#: ../clients/common/nm-meta-setting-desc.c:1622
#, c-format
msgid "'%s' is not valid; use <option>=<value>"
-msgstr "“%s” 无效,请使用 <option>=<value>"
+msgstr "\"%s\" 无效;请使用 <选项>=<值>"
-#: ../clients/common/nm-meta-setting-desc.c:1648
+#: ../clients/common/nm-meta-setting-desc.c:1661
msgid "no item to remove"
-msgstr "没有要删除的项"
+msgstr "没有要移除的项"
-#: ../clients/common/nm-meta-setting-desc.c:1652
+#: ../clients/common/nm-meta-setting-desc.c:1665
#, c-format
msgid "index '%d' is not in range <0-%d>"
-msgstr "索引“%d”超出了范围 <0-%d>"
+msgstr "索引 \"%d\" 超出了范围 <0-%d>"
-#: ../clients/common/nm-meta-setting-desc.c:1667
+#: ../clients/common/nm-meta-setting-desc.c:1680
#, c-format
msgid "invalid option '%s'"
-msgstr "无效选项“%s”"
+msgstr "无效选项 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:1669
+#: ../clients/common/nm-meta-setting-desc.c:1682
msgid "missing option"
msgstr "缺少选项"
-#: ../clients/common/nm-meta-setting-desc.c:1693
+#: ../clients/common/nm-meta-setting-desc.c:1706
#, c-format
msgid "'%s' is not a valid MAC"
-msgstr "“%s”不是有效的 MAC 地址"
+msgstr "\"%s\" 不是有效的 MAC"
-#: ../clients/common/nm-meta-setting-desc.c:1723
-#: ../clients/common/nm-meta-setting-desc.c:1819
-#: ../clients/common/nm-meta-setting-desc.c:4667
+#: ../clients/common/nm-meta-setting-desc.c:1733
+#: ../clients/common/nm-meta-setting-desc.c:1830
+#: ../clients/common/nm-meta-setting-desc.c:4805
#, c-format
msgid "'%s' is not valid"
-msgstr "“%s” 无效"
+msgstr "\"%s\" 无效"
-#: ../clients/common/nm-meta-setting-desc.c:1763
+#: ../clients/common/nm-meta-setting-desc.c:1774
#, c-format
msgid "'%u' flags are not valid; use combination of %s"
-msgstr "'%u' 标记无效,请使用 %s 组合"
+msgstr "\"%u\" 标记无效;请使用 %s 的组合"
-#: ../clients/common/nm-meta-setting-desc.c:1799
+#: ../clients/common/nm-meta-setting-desc.c:1810
#, c-format
msgid "'%s' is not a valid number (or out of range)"
-msgstr "“%s”不是有效的值(或超出范围)"
+msgstr "\"%s\" 不是有效的数字(或超出范围)"
-#: ../clients/common/nm-meta-setting-desc.c:1919
+#: ../clients/common/nm-meta-setting-desc.c:1929
#, c-format
msgid "'%s' is not a valid hex character"
-msgstr "“%s” 不是有效十六进制字符串"
+msgstr "\"%s\" 不是有效十六进制字符"
-#: ../clients/common/nm-meta-setting-desc.c:2199
+#: ../clients/common/nm-meta-setting-desc.c:2218
#, c-format
msgid "the property doesn't contain EAP method '%s'"
-msgstr "属性不能包含 EAP 方法 '%s'"
+msgstr "属性没有包含 EAP 方法 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:2222
+#: ../clients/common/nm-meta-setting-desc.c:2241
#, c-format
msgid "the property doesn't contain alternative subject match '%s'"
-msgstr "属性没有包含匹配 '%s' 的替代主体"
+msgstr "属性没有包含符合 \"%s\" 的替换者"
-#: ../clients/common/nm-meta-setting-desc.c:2248
+#: ../clients/common/nm-meta-setting-desc.c:2267
#, c-format
msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
-msgstr "属性没有包含匹配 '%s' 的 \"phase2\" 替代主体"
+msgstr "属性没有包含符合 \"%s\" 的 \"phase2\" 替换者"
-#: ../clients/common/nm-meta-setting-desc.c:2369
+#: ../clients/common/nm-meta-setting-desc.c:2389
#, c-format
msgid ""
"Enter a list of bonding options formatted as:\n"
@@ -4323,10 +4637,10 @@ msgid ""
"\n"
"Example: mode=2,miimon=120\n"
msgstr ""
-"输入绑定选项列表,格式为:\n"
-" option = <value>, option = <value>,... \n"
-"有效选项为: %s\n"
-"“mode” 可作为名称或者数字提供:\n"
+"输入绑定(bonding)选项列表,格式为:\n"
+" option = <值>, option = <值>,... \n"
+"有效选项为:%s\n"
+"\"mode\" 可以由名称或者数字提供:\n"
"balance-rr = 0\n"
"active-backup = 1\n"
"balance-xor = 2\n"
@@ -4344,238 +4658,243 @@ msgstr ""
#. * 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/common/nm-meta-setting-desc.c:2429
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:2452
+#, c-format
msgid "Can not change the connection type"
-msgstr "未知/未处理的蓝牙连接类型"
+msgstr "无法更改连接类型"
-#: ../clients/common/nm-meta-setting-desc.c:2539
+#: ../clients/common/nm-meta-setting-desc.c:2555
#, c-format
msgid "the property doesn't contain permission '%s'"
-msgstr "属性没有包含权限 '%s'"
+msgstr "属性没有包含权限 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:2560
+#: ../clients/common/nm-meta-setting-desc.c:2576
#, c-format
msgid "'%s' is not valid master; use ifname or connection UUID"
-msgstr "“%s” 不是有效主接口;使用 ifname 或者连接 UUID"
+msgstr "\"%s\" 不是有效的主连接;使用接口名或连接的 UUID"
-#: ../clients/common/nm-meta-setting-desc.c:2659
+#: ../clients/common/nm-meta-setting-desc.c:2673
#, c-format
msgid "the value '%s' is not a valid UUID"
-msgstr "'%s' 值不是有效的 UUID"
+msgstr "值 \"%s\" 不是有效的 UUID"
-#: ../clients/common/nm-meta-setting-desc.c:2666
+#: ../clients/common/nm-meta-setting-desc.c:2680
#, c-format
msgid "the property doesn't contain UUID '%s'"
-msgstr "属性没有包含 UUID '%s'"
+msgstr "属性没有包含 UUID \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:2733
+#: ../clients/common/nm-meta-setting-desc.c:2749
msgid "0 (disabled)"
msgstr "0(禁用)"
-#: ../clients/common/nm-meta-setting-desc.c:2739
+#: ../clients/common/nm-meta-setting-desc.c:2755
msgid "enabled, "
-msgstr "已启用、"
+msgstr "启用、"
-#: ../clients/common/nm-meta-setting-desc.c:2741
+#: ../clients/common/nm-meta-setting-desc.c:2757
msgid "advertise, "
-msgstr "广告,"
+msgstr "通告、"
-#: ../clients/common/nm-meta-setting-desc.c:2743
+#: ../clients/common/nm-meta-setting-desc.c:2759
msgid "willing, "
-msgstr "willing, "
+msgstr "愿意、"
-#: ../clients/common/nm-meta-setting-desc.c:2863
+#: ../clients/common/nm-meta-setting-desc.c:2881
#, c-format
msgid "'%s' is not a valid DCB flag"
-msgstr "“%s” 不是有效 DCB 标签"
+msgstr "\"%s\" 不是有效的 DCB 标记"
-#: ../clients/common/nm-meta-setting-desc.c:2893
+#: ../clients/common/nm-meta-setting-desc.c:2910
msgid "must contain 8 comma-separated numbers"
-msgstr "必须包含 8 个用逗号分开的数字"
+msgstr "必须包含 8 个用逗号分隔的数字"
-#: ../clients/common/nm-meta-setting-desc.c:2909
+#: ../clients/common/nm-meta-setting-desc.c:2926
#, c-format
msgid "'%s' not a number between 0 and %u (inclusive) or %u"
-msgstr "“%s” 不是 0 和 %u (包含该数字) 或者 %u 之间的数字"
+msgstr "\"%s\" 不是 0 和 %u(包括)之间的数字或是 %u"
-#: ../clients/common/nm-meta-setting-desc.c:2912
+#: ../clients/common/nm-meta-setting-desc.c:2929
#, c-format
msgid "'%s' not a number between 0 and %u (inclusive)"
-msgstr "“%s” 不是 0 和 %u (包含该数字) 之间的数字"
+msgstr "\"%s\" 不是 0 和 %u(包括)之间的数字"
-#: ../clients/common/nm-meta-setting-desc.c:2933
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:2950
+#, c-format
msgid "changes will have no effect until '%s' includes 1 (enabled)"
-msgstr ""
-"警告:除非 “%s” 包括 1 (启用),否则更改无法生效。\n"
-"\n"
+msgstr "除非 \"%s\" 包含 1(启用),否则更改无法生效"
-#: ../clients/common/nm-meta-setting-desc.c:2988
+#: ../clients/common/nm-meta-setting-desc.c:3005
#, c-format
msgid "bandwidth percentages must total 100%%"
-msgstr "贷款百分比必须为 100%%"
+msgstr "带宽百分比总和必须为 100%%"
-#: ../clients/common/nm-meta-setting-desc.c:3061
-#: ../clients/common/nm-meta-setting-desc.c:3067
+#: ../clients/common/nm-meta-setting-desc.c:3078
+#: ../clients/common/nm-meta-setting-desc.c:3084
msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
-msgstr "SIM 操作员 ID 必须为 5 或 6 个数字的 MCCMNC 代码"
+msgstr "SIM 运营商 ID 必须为 5 或 6 个数字的 MCCMNC 代码"
-#: ../clients/common/nm-meta-setting-desc.c:3091
+#: ../clients/common/nm-meta-setting-desc.c:3108
#, c-format
msgid "'%s' is not a valid IBoIP P_Key"
-msgstr "“%s”不是有效的 IBoIP P_Key"
+msgstr "\"%s\" 不是有效的 IBoIP P_Key"
-#: ../clients/common/nm-meta-setting-desc.c:3114
+#: ../clients/common/nm-meta-setting-desc.c:3131
msgid "default"
msgstr "默认"
-#: ../clients/common/nm-meta-setting-desc.c:3248
-#: ../clients/common/nm-meta-setting-desc.c:3267
+#: ../clients/common/nm-meta-setting-desc.c:3270
+#: ../clients/common/nm-meta-setting-desc.c:3287
#, c-format
msgid "invalid IPv4 address '%s'"
-msgstr "无效的 IPv4 地址“%s”"
+msgstr "无效的 IPv4 地址\"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:3273
-#: ../clients/common/nm-meta-setting-desc.c:3527
+#: ../clients/common/nm-meta-setting-desc.c:3293
+#: ../clients/common/nm-meta-setting-desc.c:3537
#, c-format
msgid "the property doesn't contain DNS server '%s'"
-msgstr "属性没有包含 DNS 服务器 '%s'"
+msgstr "属性没有包含 DNS 服务器 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:3313
-#: ../clients/common/nm-meta-setting-desc.c:3567
+#: ../clients/common/nm-meta-setting-desc.c:3331
+#: ../clients/common/nm-meta-setting-desc.c:3575
#, c-format
msgid "the property doesn't contain DNS search domain '%s'"
-msgstr "属性没有包含 DNS 搜索域 '%s'"
+msgstr "属性没有包含 DNS 搜索域 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:3350
-#: ../clients/common/nm-meta-setting-desc.c:3604
+#: ../clients/common/nm-meta-setting-desc.c:3368
+#: ../clients/common/nm-meta-setting-desc.c:3612
#, c-format
msgid "the property doesn't contain DNS option '%s'"
-msgstr "属性没有包含 DNS 选项 '%s'"
+msgstr "属性没有包含 DNS 选项 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:3393
-#: ../clients/common/nm-meta-setting-desc.c:3653
+#: ../clients/common/nm-meta-setting-desc.c:3411
+#: ../clients/common/nm-meta-setting-desc.c:3661
#, c-format
msgid "the property doesn't contain IP address '%s'"
-msgstr "属性没有包含 IP 地址 '%s'"
+msgstr "属性没有包含 IP 地址 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:3413
-#: ../clients/common/nm-meta-setting-desc.c:3672
+#: ../clients/common/nm-meta-setting-desc.c:3431
+#: ../clients/common/nm-meta-setting-desc.c:3680
#, c-format
msgid "invalid gateway address '%s'"
-msgstr "无效网关地址 '%s'"
+msgstr "无效的网关地址 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:3452
-#: ../clients/common/nm-meta-setting-desc.c:3713
+#: ../clients/common/nm-meta-setting-desc.c:3470
+#: ../clients/common/nm-meta-setting-desc.c:3721
#, c-format
msgid "the property doesn't contain route '%s'"
-msgstr "属性没有包含路由 '%s'"
+msgstr "属性没有包含路由 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:3502
-#: ../clients/common/nm-meta-setting-desc.c:3521
+#: ../clients/common/nm-meta-setting-desc.c:3514
+#: ../clients/common/nm-meta-setting-desc.c:3531
#, c-format
msgid "invalid IPv6 address '%s'"
-msgstr "无效的 IPv6 地址“%s”"
-
-#: ../clients/common/nm-meta-setting-desc.c:3731
-#: ../libnm-core/nm-setting-gsm.c:381 ../libnm-util/nm-setting-gsm.c:364
-#, c-format
-msgid "'%s' is not a number"
-msgstr "“%s”不是一个数字"
+msgstr "无效的 IPv6 地址 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:3738
+#: ../clients/common/nm-meta-setting-desc.c:3783
#, c-format
-msgid "'%s' is not valid; use 0, 1, or 2"
-msgstr "“%s” 无效,请使用 0、1 或者 2。"
+msgid "the property doesn't contain interface name '%s'"
+msgstr "属性没有包含接口名 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:3772
+#: ../clients/common/nm-meta-setting-desc.c:3820
#, c-format
msgid "'%s' is not a valid channel; use <1-13>"
-msgstr "“%s”不是有效的信道;请使用 <1-13>"
+msgstr "\"%s\" 不是有效的信道;请使用 <1-13>"
+
+#: ../clients/common/nm-meta-setting-desc.c:3912
+msgid "The valid syntax is: vf [attribute=value]... [,vf [attribute=value]...]"
+msgstr "有效语法为:\"vf [attribute=value]... [,vf [attribute=value]...]\""
-#: ../clients/common/nm-meta-setting-desc.c:3832
+#: ../clients/common/nm-meta-setting-desc.c:3934
msgid ""
"The valid syntax is: '[root | parent <handle>] [handle <handle>] <qdisc>'"
msgstr ""
+"有效语法为:\"[root | parent <句柄>] [handle <句柄>] <排队规则(qdisc)>\""
-#: ../clients/common/nm-meta-setting-desc.c:3855
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:3958
+#, c-format
+msgid "the property doesn't contain vf with index %u"
+msgstr "属性没有包含索引为 %u 的虚拟功能(vf)"
+
+#: ../clients/common/nm-meta-setting-desc.c:3985
+#, c-format
msgid "the property doesn't contain qdisc '%s'"
-msgstr "属性没有包含 UUID '%s'"
+msgstr "属性没有包含排队规则(qdisc) \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:3908
+#: ../clients/common/nm-meta-setting-desc.c:4039
msgid ""
"The valid syntax is: '[root | parent <handle>] [handle <handle>] <tfilter>'"
msgstr ""
+"有效语法为:\"[root | parent <处理模块>] [handle <处理模块>] <流量过滤器"
+"(tfilter)>\""
-#: ../clients/common/nm-meta-setting-desc.c:3931
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4062
+#, c-format
msgid "the property doesn't contain tfilter '%s'"
-msgstr "属性没有包含路由 '%s'"
+msgstr "属性没有包含流量过滤器(tfilter)\"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:3992
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4129
+#, c-format
msgid "the property doesn't contain string '%s'"
-msgstr "属性没有包含映射 '%s'"
+msgstr "属性没有包含字符串 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:4065
-#: ../clients/common/nm-meta-setting-desc.c:4137
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4204
+#: ../clients/common/nm-meta-setting-desc.c:4278
+#, c-format
msgid "the property doesn't contain link watcher '%s'"
-msgstr "属性没有包含路由 '%s'"
+msgstr "属性没有包含链路监视器 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:4228
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4384
+#, c-format
msgid "only one mapping at a time is supported; taking the first one (%s)"
-msgstr "警告:不支持一次只映射一次;使用第一个(%s)\n"
+msgstr "警告:一次只支持映射一个;使用第一个(%s)"
-#: ../clients/common/nm-meta-setting-desc.c:4236
+#: ../clients/common/nm-meta-setting-desc.c:4392
#, c-format
msgid "the property doesn't contain mapping '%s'"
-msgstr "属性没有包含映射 '%s'"
+msgstr "属性没有包含映射 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:4244
+#: ../clients/common/nm-meta-setting-desc.c:4400
msgid "no priority to remove"
-msgstr "未删除任何优先级"
+msgstr "没有要删除的优先级"
-#: ../clients/common/nm-meta-setting-desc.c:4248
+#: ../clients/common/nm-meta-setting-desc.c:4404
#, c-format
msgid "index '%d' is not in the range of <0-%d>"
-msgstr "索引“%d”超出了范围 <0-%d>"
+msgstr "索引 \"%d\" 超出了范围 <0-%d>"
-#: ../clients/common/nm-meta-setting-desc.c:4317
+#: ../clients/common/nm-meta-setting-desc.c:4473
#, c-format
msgid "'%s' cannot be empty"
-msgstr "'%s' 不能为空"
+msgstr "\"%s\" 不能为空"
-#: ../clients/common/nm-meta-setting-desc.c:4356
-#: ../clients/common/nm-meta-setting-desc.c:4489
-#: ../libnm-core/nm-setting-wired.c:664 ../libnm-core/nm-setting-wireless.c:857
-#: ../libnm-core/nm-setting-wireless.c:869 ../libnm-util/nm-setting-wired.c:646
-#: ../libnm-util/nm-setting-wireless.c:859
-#: ../libnm-util/nm-setting-wireless.c:873
+#: ../clients/common/nm-meta-setting-desc.c:4512
+#: ../clients/common/nm-meta-setting-desc.c:4643
+#: ../libnm-core/nm-setting-sriov.c:446 ../libnm-core/nm-setting-wired.c:662
+#: ../libnm-core/nm-setting-wireless.c:857
+#: ../libnm-core/nm-setting-wireless.c:869 ../libnm-util/nm-setting-wired.c:645
+#: ../libnm-util/nm-setting-wireless.c:858
+#: ../libnm-util/nm-setting-wireless.c:872
#, c-format
msgid "'%s' is not a valid MAC address"
-msgstr "“%s”不是有效的 MAC 地址"
+msgstr "\"%s\" 不是有效的 MAC 地址"
-#: ../clients/common/nm-meta-setting-desc.c:4362
-#: ../clients/common/nm-meta-setting-desc.c:4495
+#: ../clients/common/nm-meta-setting-desc.c:4518
+#: ../clients/common/nm-meta-setting-desc.c:4649
#, c-format
msgid "the property doesn't contain MAC address '%s'"
-msgstr "属性没有包含 MAC 地址 '%s'"
+msgstr "属性没有包含 MAC 地址 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:4380
+#: ../clients/common/nm-meta-setting-desc.c:4536
#, c-format
msgid "'%s' is not valid; 2 or 3 strings should be provided"
-msgstr "'%s' 无效;应提供两至三个字符串。"
+msgstr "\"%s\" 无效;应提供两至三个字符串"
-#: ../clients/common/nm-meta-setting-desc.c:4396
+#: ../clients/common/nm-meta-setting-desc.c:4550
#, c-format
msgid "'%s' string value should consist of 1 - 199 characters"
-msgstr "'%s' 字符串值应该由 1 - 199 个字符组成"
+msgstr "\"%s\" 字符串值应该由 1~199 个字符组成"
-#: ../clients/common/nm-meta-setting-desc.c:4428
+#: ../clients/common/nm-meta-setting-desc.c:4582
#, c-format
msgid ""
"Enter a list of S/390 options formatted as:\n"
@@ -4583,95 +4902,98 @@ msgid ""
"Valid options are: %s\n"
msgstr ""
"输入 S/390 选项列表,格式为:\n"
-" option = <value>, option = <value>,... \n"
+" option = <值>, option = <值>,... \n"
"有效选项为:%s\n"
-#: ../clients/common/nm-meta-setting-desc.c:4462
+#: ../clients/common/nm-meta-setting-desc.c:4616
#, c-format
msgid "'%s' is not a valid channel"
-msgstr "“%s” 是无效的通道"
+msgstr "\"%s\" 不是有效的信道"
-#: ../clients/common/nm-meta-setting-desc.c:4468
+#: ../clients/common/nm-meta-setting-desc.c:4622
#, c-format
msgid "'%ld' is not a valid channel"
-msgstr "“%ld”不是有效频道"
+msgstr "\"%ld\" 不是有效的信道"
-#: ../clients/common/nm-meta-setting-desc.c:4567
-#: ../clients/common/nm-meta-setting-desc.c:4603
-#: ../clients/common/nm-meta-setting-desc.c:4639
+#: ../clients/common/nm-meta-setting-desc.c:4705
+#: ../clients/common/nm-meta-setting-desc.c:4741
+#: ../clients/common/nm-meta-setting-desc.c:4777
#, c-format
msgid "the property doesn't contain protocol '%s'"
-msgstr "属性没有包含协议 '%s'"
+msgstr "属性没有包含协议 \"%s\""
-#: ../clients/common/nm-meta-setting-desc.c:4676
+#: ../clients/common/nm-meta-setting-desc.c:4814
#, c-format
msgid ""
"'%s' not compatible with %s '%s', please change the key or set the right %s "
"first."
-msgstr "'%s' 和 %s '%s' 不兼容,请先修改密钥或设置正确的 %s。"
+msgstr "\"%s\" 和 %s \"%s\" 不兼容,请先修改密钥或设置正确的 %s。"
-#: ../clients/common/nm-meta-setting-desc.c:4686
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4824
+#, c-format
msgid "WEP key is guessed to be of '%s'"
-msgstr "猜测 WEP 密钥为 “%s”\n"
+msgstr "猜测 WEP 密钥为 \"%s\" 类型"
-#: ../clients/common/nm-meta-setting-desc.c:4691
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4829
+#, c-format
msgid "WEP key index set to '%d'"
-msgstr ""
-"设置 WEP 密钥为 '%d'\n"
-"\n"
+msgstr "WEP 密钥索引已设为 \"%d\""
-#: ../clients/common/nm-meta-setting-desc.c:4730
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4868
+#, c-format
msgid "'%s' is not compatible with '%s' type, please change or delete the key."
-msgstr "警告:'%s' 和 '%s' 类型不兼容,请修改或删除密钥。\n"
+msgstr "\"%s\" 和 \"%s\" 类型不兼容,请修改或删除密钥。"
-#: ../clients/common/nm-meta-setting-desc.c:4740
+#: ../clients/common/nm-meta-setting-desc.c:4878
#, c-format
msgid "'%s' is not a valid PSK"
-msgstr "“%s” 是无效 PSK"
+msgstr "\"%s\" 不是有效的 PSK"
+
+#: ../clients/common/nm-meta-setting-desc.c:4930
+#, c-format
+msgid "'%s' is not valid; use 'on', 'off', or 'ignore'"
+msgstr "\"%s\" 无效;请使用 \"on\"、\"off\" 或 \"ignore\""
-#: ../clients/common/nm-meta-setting-desc.c:4772
+#: ../clients/common/nm-meta-setting-desc.c:4989
msgid "Bonding primary interface [none]"
msgstr "绑定主要接口 [无]"
#. this is a virtual property, only needed during "ask" mode.
-#: ../clients/common/nm-meta-setting-desc.c:4779
+#: ../clients/common/nm-meta-setting-desc.c:4996
msgid "Bonding monitoring mode"
msgstr "绑定监控模式"
# https://www.centos.org/docs/5/html/5.1/Deployment_Guide/s3-modules-bonding-directives.html
# 链接有下面几个术语的定义,不过应该不用翻译,作为参考。
-#: ../clients/common/nm-meta-setting-desc.c:4788
+#: ../clients/common/nm-meta-setting-desc.c:5005
msgid "Bonding miimon [100]"
msgstr "绑定 miimon [100]"
-#: ../clients/common/nm-meta-setting-desc.c:4796
+#: ../clients/common/nm-meta-setting-desc.c:5013
msgid "Bonding downdelay [0]"
msgstr "绑定 downdelay [0]"
-#: ../clients/common/nm-meta-setting-desc.c:4804
+#: ../clients/common/nm-meta-setting-desc.c:5021
msgid "Bonding updelay [0]"
msgstr "绑定 updelay [0]"
-#: ../clients/common/nm-meta-setting-desc.c:4812
+#: ../clients/common/nm-meta-setting-desc.c:5029
msgid "Bonding arp-interval [0]"
msgstr "绑定 arp-interval [0]"
-#: ../clients/common/nm-meta-setting-desc.c:4820
+#: ../clients/common/nm-meta-setting-desc.c:5037
msgid "Bonding arp-ip-target [none]"
msgstr "绑定 arp-ip-target [none]"
-#: ../clients/common/nm-meta-setting-desc.c:4828
+#: ../clients/common/nm-meta-setting-desc.c:5045
msgid "LACP rate ('slow' or 'fast') [slow]"
-msgstr "LACP 速率(“slow”或“fast”)[slow]"
+msgstr "LACP 速率(\"slow\" 或 \"fast\")[slow]"
#. macro that returns @func as const (gboolean(*)(NMSetting*)) type, but checks
#. * that the actual type is (gboolean(*)(type *)).
#. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
#. * that the actual type is (guint32(*)(type *)).
-#: ../clients/common/nm-meta-setting-desc.c:4940
+#: ../clients/common/nm-meta-setting-desc.c:5164
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 "
@@ -4688,7 +5010,7 @@ msgstr ""
"\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
" set team.config /etc/my-team.conf\n"
-#: ../clients/common/nm-meta-setting-desc.c:4948
+#: ../clients/common/nm-meta-setting-desc.c:5172
msgid ""
"Enter a list of link watchers formatted as dictionaries where the keys are "
"teamd properties. Dictionary pairs are in the form: key=value and pairs are "
@@ -4705,16 +5027,37 @@ msgid ""
"\n"
"Properties available for the 'arp_ping' include all the ones for 'nsna_ping' "
"and:\n"
-" 'source-host', 'validate-active', 'validate-inactive', 'send-always'.\n"
+" 'source-host'*, 'validate-active', 'validate-inactive', 'send-always'.\n"
"\n"
"Properties flagged with a '*' are mandatory.\n"
"\n"
"Example:\n"
-" name=arp_ping,source-host=172.16.1.1,target-host=172.16.1.254; "
-"name=ethtool,delay-up=3\n"
+" name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
+"name=ethtool delay-up=3\n"
msgstr ""
+"输入链路监视器列表,其格式为键值是 teamd 属性的字典。字典对的形式为:键=值,"
+"且字典对以空格 \" \" 分隔。字典间以 \",\" 分隔。\n"
+"在字典里允许或需要的键根据链路监视器的类型改变,而所有链路监视器的唯一共同属"
+"性是 \"name\"*,其定义了指定的链路监视器。\n"
+"\n"
+"适用于 \"ethtool\" 链路监视器的属性有:\n"
+" \"delay-up\"、\"delay-down\"\n"
+"\n"
+"适用于 \"nsna_ping\" 链路监视器的属性有:\n"
+" \"init-wait\"、\"interval\"、\"missed-max\"、\"target-host\"*\n"
+"\n"
+"适用于 \"arp_ping\" 链路监视器的属性除了包含 \"nsna_ping\" 下的所有属性还"
+"有:\n"
+" \"source-host\"*、\"validate-active\"、\"validate-inactive\"、\"send-always"
+"\"。\n"
+"\n"
+"带有 \"*\" 标记的属性为必填的。\n"
+"\n"
+"示例:\n"
+" name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
+"name=ethtool delay-up=3\n"
-#: ../clients/common/nm-meta-setting-desc.c:4999
+#: ../clients/common/nm-meta-setting-desc.c:5222
msgid ""
"Enter file path to CA certificate (optionally prefixed with file://).\n"
" [file://]<file path>\n"
@@ -4722,11 +5065,11 @@ msgid ""
"Example: /home/cimrman/cacert.crt\n"
msgstr ""
"输入 CA 证书的文件路径(前缀可选择 file://)。\n"
-" [file://]<file path>\n"
-"请注意,nmcli 不支持将证书指定为原始 blob 数据。\n"
+" [file://]<文件路径>\n"
+"请注意,nmcli 不支持将证书指定为原始比特块(blob)数据。\n"
"示例:/home/cimrman/cacert.crt\n"
-#: ../clients/common/nm-meta-setting-desc.c:5033
+#: ../clients/common/nm-meta-setting-desc.c:5256
msgid ""
"Enter file path to client certificate (optionally prefixed with file://).\n"
" [file://]<file path>\n"
@@ -4734,11 +5077,11 @@ msgid ""
"Example: /home/cimrman/jara.crt\n"
msgstr ""
"输入客户证书的文件路径(前缀可选择 file://)。\n"
-" [file://]<file path>\n"
-"请注意,nmcli 不支持将证书指定为原始 blob 数据。\n"
+" [file://]<文件路径>\n"
+"请注意,nmcli 不支持将证书指定为原始比特块(blob)数据。\n"
"示例:/home/cimrman/jara.crt\n"
-#: ../clients/common/nm-meta-setting-desc.c:5090
+#: ../clients/common/nm-meta-setting-desc.c:5313
msgid ""
"Enter file path to CA certificate for inner authentication (optionally "
"prefixed\n"
@@ -4748,11 +5091,11 @@ msgid ""
"Example: /home/cimrman/ca-zweite-phase.crt\n"
msgstr ""
"输入内部验证的 CA 证书的文件路径(前缀可选择 file://)。\n"
-" [file://]<file path>\n"
-"请注意,nmcli 不支持将证书指定为原始 blob 数据。\n"
+" [file://]<文件路径>\n"
+"请注意,nmcli 不支持将证书指定为原始比特块(blob)数据。\n"
"示例:/home/cimrman/ca-zweite-phase.crt\n"
-#: ../clients/common/nm-meta-setting-desc.c:5125
+#: ../clients/common/nm-meta-setting-desc.c:5348
msgid ""
"Enter file path to client certificate for inner authentication (optionally "
"prefixed\n"
@@ -4762,11 +5105,11 @@ msgid ""
"Example: /home/cimrman/jara-zweite-phase.crt\n"
msgstr ""
"输入内部验证的客户证书的文件路径(前缀可选择 file://)。\n"
-" [file://]<file path>\n"
-"请注意,nmcli 不支持将证书指定为原始 blob 数据。\n"
+" [file://]<文件路径>\n"
+"请注意,nmcli 不支持将证书指定为原始比特块(blob)数据。\n"
"示例:/home/cimrman/jara-zweite-phase.crt\n"
-#: ../clients/common/nm-meta-setting-desc.c:5152
+#: ../clients/common/nm-meta-setting-desc.c:5375
msgid ""
"Enter bytes as a list of hexadecimal values.\n"
"Two formats are accepted:\n"
@@ -4785,10 +5128,10 @@ msgstr ""
"头)。\n"
"\n"
"例如:ab0455a6ea3a74C2\n"
-" ab 4 55 0xa6 ea 3a 74 C2\n"
+" ab 4 55 0xa6 ea 3a 74 C2\n"
-#: ../clients/common/nm-meta-setting-desc.c:5169
-#: ../clients/common/nm-meta-setting-desc.c:5187
+#: ../clients/common/nm-meta-setting-desc.c:5392
+#: ../clients/common/nm-meta-setting-desc.c:5410
msgid ""
"Enter path to a private key and the key password (if not set yet):\n"
" [file://]<file path> [<password>]\n"
@@ -4796,88 +5139,88 @@ msgid ""
"Example: /home/cimrman/jara-priv-key Dardanely\n"
msgstr ""
"输入私有密钥和密钥密码的路径(如果还没有设置):\n"
-" [file://]<file path> [<password>]\n"
-"请注意,nmcli 不支持将私有密钥指定为原始 blob 数据。\n"
+" [file://]<文件路径> [<密码>]\n"
+"请注意,nmcli 不支持将私有密钥指定为原始比特块(blob)数据。\n"
"示例:/home/cimrman/jara-priv-key Dardanely\n"
-#: ../clients/common/nm-meta-setting-desc.c:5226
-#: ../clients/common/nm-secret-agent-simple.c:234
-#: ../clients/common/nm-secret-agent-simple.c:332
+#: ../clients/common/nm-meta-setting-desc.c:5449
+#: ../clients/common/nm-secret-agent-simple.c:249
+#: ../clients/common/nm-secret-agent-simple.c:347
#: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
msgid "Username"
msgstr "用户名"
-#: ../clients/common/nm-meta-setting-desc.c:5232
-#: ../clients/common/nm-meta-setting-desc.c:5416
-#: ../clients/common/nm-meta-setting-desc.c:5699
-#: ../clients/common/nm-meta-setting-desc.c:6323
+#: ../clients/common/nm-meta-setting-desc.c:5455
+#: ../clients/common/nm-meta-setting-desc.c:5639
+#: ../clients/common/nm-meta-setting-desc.c:6004
+#: ../clients/common/nm-meta-setting-desc.c:6664
msgid "Password [none]"
msgstr "密码 [无]"
-#: ../clients/common/nm-meta-setting-desc.c:5278
+#: ../clients/common/nm-meta-setting-desc.c:5501
msgid "Bluetooth device address"
msgstr "蓝牙设备地址"
-#: ../clients/common/nm-meta-setting-desc.c:5323
-#: ../clients/common/nm-meta-setting-desc.c:5753
-#: ../clients/common/nm-meta-setting-desc.c:7030
-#: ../clients/common/nm-meta-setting-desc.c:7068
-#: ../clients/common/nm-meta-setting-desc.c:7205
+#: ../clients/common/nm-meta-setting-desc.c:5546
+#: ../clients/common/nm-meta-setting-desc.c:6058
+#: ../clients/common/nm-meta-setting-desc.c:7391
+#: ../clients/common/nm-meta-setting-desc.c:7429
+#: ../clients/common/nm-meta-setting-desc.c:7566
+#: ../clients/common/nm-meta-setting-desc.c:7784
msgid "MAC [none]"
msgstr "MAC [无]"
-#: ../clients/common/nm-meta-setting-desc.c:5329
+#: ../clients/common/nm-meta-setting-desc.c:5552
msgid "Enable STP [no]"
msgstr "启用 STP [否]"
-#: ../clients/common/nm-meta-setting-desc.c:5335
+#: ../clients/common/nm-meta-setting-desc.c:5558
msgid "STP priority [32768]"
msgstr "STP 优先级 [32768]"
-#: ../clients/common/nm-meta-setting-desc.c:5341
+#: ../clients/common/nm-meta-setting-desc.c:5564
msgid "Forward delay [15]"
msgstr "转发延时 [15]"
-#: ../clients/common/nm-meta-setting-desc.c:5347
-#, fuzzy
+#: ../clients/common/nm-meta-setting-desc.c:5570
msgid "Hello time [2]"
-msgstr "问候时间 [2]"
+msgstr "呼叫时间 [2]"
-#: ../clients/common/nm-meta-setting-desc.c:5353
+#: ../clients/common/nm-meta-setting-desc.c:5576
msgid "Max age [20]"
msgstr "最大寿命 [20]"
-#: ../clients/common/nm-meta-setting-desc.c:5359
+#: ../clients/common/nm-meta-setting-desc.c:5582
msgid "MAC address ageing time [300]"
msgstr "MAC 地址老化时间 [300]"
-#: ../clients/common/nm-meta-setting-desc.c:5365
+#: ../clients/common/nm-meta-setting-desc.c:5588
msgid "Group forward mask [0]"
-msgstr ""
+msgstr "组前向掩码 [0]"
-#: ../clients/common/nm-meta-setting-desc.c:5371
+#: ../clients/common/nm-meta-setting-desc.c:5594
msgid "Enable IGMP snooping [no]"
-msgstr ""
+msgstr "启用 IGMP 监听 [否]"
-#: ../clients/common/nm-meta-setting-desc.c:5383
+#: ../clients/common/nm-meta-setting-desc.c:5606
msgid "Bridge port priority [32]"
-msgstr "桥接端口优先级 [32]"
+msgstr "网桥端口优先级 [32]"
-#: ../clients/common/nm-meta-setting-desc.c:5389
+#: ../clients/common/nm-meta-setting-desc.c:5612
msgid "Bridge port STP path cost [100]"
-msgstr "桥接端口 STP 路径开销 [100]"
+msgstr "网桥端口 STP 路径开销 [100]"
-#: ../clients/common/nm-meta-setting-desc.c:5395
+#: ../clients/common/nm-meta-setting-desc.c:5618
msgid "Hairpin [no]"
msgstr "Hairpin [否]"
-#: ../clients/common/nm-meta-setting-desc.c:5410
-#: ../clients/common/nm-meta-setting-desc.c:5693
-#: ../clients/common/nm-meta-setting-desc.c:6920
+#: ../clients/common/nm-meta-setting-desc.c:5633
+#: ../clients/common/nm-meta-setting-desc.c:5998
+#: ../clients/common/nm-meta-setting-desc.c:7281
msgid "Username [none]"
msgstr "用户名 [无]"
-#: ../clients/common/nm-meta-setting-desc.c:5505
+#: ../clients/common/nm-meta-setting-desc.c:5736
msgid ""
"Enter a list of user permissions. This is a list of user names formatted "
"as:\n"
@@ -4887,12 +5230,12 @@ msgid ""
"Example: alice bob charlie\n"
msgstr ""
"输入用户权限列表。这个列表的用户名格式为:\n"
-" [user:]<user name 1>, [user:]<user name 2>,... \n"
+" [user:]<用户名 1>, [user:]<用户名 2>,... \n"
"使用逗号或者空格将名称分开。\n"
"\n"
"例如:alice bob charlie\n"
-#: ../clients/common/nm-meta-setting-desc.c:5547
+#: ../clients/common/nm-meta-setting-desc.c:5778
msgid ""
"Enter secondary connections that should be activated when this connection "
"is\n"
@@ -4904,14 +5247,15 @@ msgid ""
"\n"
"Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
msgstr ""
-"输入当这个连接激活时应该被激活的二级连接。连接可用\n"
-"UUID 或 ID(名称)指定。nmcli 将名称透明的转换为 UUID。\n"
-"请注意,目前 NetworkManager 只支持将 VPN 作为二级连接。\n"
-"这些项可用逗号或空格隔开。\n"
+"输入当这个连接激活时应该被激活的次级连接。连接可用 UUID 或 ID(名称)指定。"
+"nmcli\n"
+"自动将名称地转换为 UUID。请注意,目前网络管理器(NetworkManager)只支持将 "
+"VPN 作为次级连接。\n"
+"这些输入项可用逗号或空格隔开。\n"
"\n"
"示例:private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
-#: ../clients/common/nm-meta-setting-desc.c:5564
+#: ../clients/common/nm-meta-setting-desc.c:5795
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"
@@ -4921,29 +5265,29 @@ msgid ""
msgstr ""
"输入的值表示连接是否有数据配额、使用成本或其他限制。\n"
"可接受的选项是:\n"
-"'true','yes','on',设置连接为可度量的\n"
-"'false','no','off',设置连接为不可度量的\n"
-"'unknown', 让 NetworkManager 使用一些启发式算法选择值\n"
+"\"true\"、\"yes\"、\"on\",设置连接为计算流量的\n"
+"\"false\"、\"no\"、\"off\",设置连接为不计流量的\n"
+"\"unknown\",让网络管理器(NetworkManager)使用一些启发式算法来选择值\n"
-#: ../clients/common/nm-meta-setting-desc.c:5710
+#: ../clients/common/nm-meta-setting-desc.c:6015
msgid "APN"
msgstr "APN"
-#: ../clients/common/nm-meta-setting-desc.c:5762
-#: ../clients/common/nm-meta-setting-desc.c:7093
-#: ../clients/common/nm-meta-setting-desc.c:7239
+#: ../clients/common/nm-meta-setting-desc.c:6067
+#: ../clients/common/nm-meta-setting-desc.c:7454
+#: ../clients/common/nm-meta-setting-desc.c:7600
msgid "MTU [auto]"
msgstr "MTU [自动]"
-#: ../clients/common/nm-meta-setting-desc.c:5781
+#: ../clients/common/nm-meta-setting-desc.c:6086
msgid "P_KEY [none]"
msgstr "P_KEY [无]"
-#: ../clients/common/nm-meta-setting-desc.c:5790
+#: ../clients/common/nm-meta-setting-desc.c:6095
msgid "Parent interface [none]"
msgstr "上级接口 [无]"
-#: ../clients/common/nm-meta-setting-desc.c:5813
+#: ../clients/common/nm-meta-setting-desc.c:6118
msgid ""
"Enter a list of IPv4 addresses of DNS servers.\n"
"\n"
@@ -4953,11 +5297,11 @@ msgstr ""
"\n"
"示例:8.8.8.8, 8.8.4.4\n"
-#: ../clients/common/nm-meta-setting-desc.c:5845
+#: ../clients/common/nm-meta-setting-desc.c:6150
msgid "IPv4 address (IP[/plen]) [none]"
-msgstr "IPv4 地址 (IP[/plen]) [无]"
+msgstr "IPv4 地址(IP[/plen])[无]"
-#: ../clients/common/nm-meta-setting-desc.c:5847
+#: ../clients/common/nm-meta-setting-desc.c:6152
msgid ""
"Enter a list of IPv4 addresses formatted as:\n"
" ip[/prefix], ip[/prefix],...\n"
@@ -4971,11 +5315,11 @@ msgstr ""
"\n"
"示例:192.168.1.5/24, 10.0.0.11/24\n"
-#: ../clients/common/nm-meta-setting-desc.c:5860
+#: ../clients/common/nm-meta-setting-desc.c:6165
msgid "IPv4 gateway [none]"
msgstr "IPv4 网关 [无]"
-#: ../clients/common/nm-meta-setting-desc.c:5868
+#: ../clients/common/nm-meta-setting-desc.c:6173
msgid ""
"Enter a list of IPv4 routes formatted as:\n"
" ip[/prefix] [next-hop] [metric],...\n"
@@ -4991,12 +5335,12 @@ msgstr ""
" ip[/prefix] [next-hop] [metric],...\n"
"缺少前缀则默认为 32。\n"
"缺少 next-hop 则默认为 0.0.0.0。\n"
-"缺少度量衡则使用默认值(NM/kernel 将设置默认值)。\n"
+"缺少跃点数则使用默认值(NM/kernel 将设置默认值)。\n"
"\n"
"示例:192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
-" 10.1.2.0/24\n"
+" 10.1.2.0/24\n"
-#: ../clients/common/nm-meta-setting-desc.c:5970
+#: ../clients/common/nm-meta-setting-desc.c:6275
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 "
@@ -5007,18 +5351,18 @@ 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/common/nm-meta-setting-desc.c:6008
+#: ../clients/common/nm-meta-setting-desc.c:6313
msgid "IPv6 address (IP[/plen]) [none]"
-msgstr "IPv6 地址 (IP[/plen]) [无]"
+msgstr "IPv6 地址(IP[/plen])[无]"
-#: ../clients/common/nm-meta-setting-desc.c:6010
+#: ../clients/common/nm-meta-setting-desc.c:6315
msgid ""
"Enter a list of IPv6 addresses formatted as:\n"
" ip[/prefix], ip[/prefix],...\n"
@@ -5032,11 +5376,11 @@ msgstr ""
"\n"
"示例:2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
-#: ../clients/common/nm-meta-setting-desc.c:6023
+#: ../clients/common/nm-meta-setting-desc.c:6328
msgid "IPv6 gateway [none]"
msgstr "IPv6 网关 [无]"
-#: ../clients/common/nm-meta-setting-desc.c:6031
+#: ../clients/common/nm-meta-setting-desc.c:6336
msgid ""
"Enter a list of IPv6 routes formatted as:\n"
" ip[/prefix] [next-hop] [metric],...\n"
@@ -5052,370 +5396,395 @@ msgstr ""
"输入 IPv6 路由列表,格式为:\n"
" ip[/prefix] [next-hop] [metric],...\n"
"缺少前缀则默认为 128。\n"
-"缺少 next-hop 则默认为 \"::\"。\n"
-"缺少度量衡则使用默认值(NM/kernel 将设置默认值)。\n"
+"缺少 next-hop 则默认为 \"::\"。\n"
+"缺少跃点数则使用默认值(NM/kernel 将设置默认值)。\n"
"\n"
"示例:2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:"
"beef::3 2\n"
-" abbe::/64 55\n"
+" abbe::/64 55\n"
-#: ../clients/common/nm-meta-setting-desc.c:6124
-#: ../clients/common/nm-meta-setting-desc.c:6953
+#: ../clients/common/nm-meta-setting-desc.c:6441
+#: ../clients/common/nm-meta-setting-desc.c:7314
msgid "Parent device [none]"
msgstr "上级设备 [无]"
-#: ../clients/common/nm-meta-setting-desc.c:6130
+#: ../clients/common/nm-meta-setting-desc.c:6447
msgid "Local endpoint [none]"
-msgstr "本地端点 (endpoint) [无]"
+msgstr "本地端点 [无]"
-#: ../clients/common/nm-meta-setting-desc.c:6137
-#: ../clients/common/nm-meta-setting-desc.c:6973
+#: ../clients/common/nm-meta-setting-desc.c:6454
+#: ../clients/common/nm-meta-setting-desc.c:7334
msgid "Remote"
msgstr "远程"
-#: ../clients/common/nm-meta-setting-desc.c:6174
+#: ../clients/common/nm-meta-setting-desc.c:6499
msgid "MACsec parent device or connection UUID"
-msgstr ""
+msgstr "MACsec 上级设备或连接 UUID"
-#: ../clients/common/nm-meta-setting-desc.c:6195
+#: ../clients/common/nm-meta-setting-desc.c:6520
msgid "Enable encryption [yes]"
-msgstr ""
+msgstr "启用加密 [是]"
-#: ../clients/common/nm-meta-setting-desc.c:6201
-#: ../clients/common/nm-secret-agent-simple.c:523
+#: ../clients/common/nm-meta-setting-desc.c:6526
+#: ../clients/common/nm-secret-agent-simple.c:534
msgid "MKA CAK"
-msgstr ""
+msgstr "MKA CAK"
-#: ../clients/common/nm-meta-setting-desc.c:6211
+#: ../clients/common/nm-meta-setting-desc.c:6536
msgid "MKA_CKN"
-msgstr ""
+msgstr "MKA_CKN"
-#: ../clients/common/nm-meta-setting-desc.c:6217
+#: ../clients/common/nm-meta-setting-desc.c:6542
msgid "SCI port [1]"
-msgstr ""
+msgstr "SCI 端口 [1]"
-#: ../clients/common/nm-meta-setting-desc.c:6240
+#: ../clients/common/nm-meta-setting-desc.c:6568
msgid "MACVLAN parent device or connection UUID"
msgstr "MACVLAN 上级设备或连接 UUID"
-#: ../clients/common/nm-meta-setting-desc.c:6261
+#: ../clients/common/nm-meta-setting-desc.c:6589
msgid "Tap [no]"
-msgstr ""
+msgstr "Tap [否]"
-#: ../clients/common/nm-meta-setting-desc.c:6274
-#: ../clients/common/nm-meta-setting-desc.c:7160
+#: ../clients/common/nm-meta-setting-desc.c:6615
+#: ../clients/common/nm-meta-setting-desc.c:7521
#: ../clients/tui/nmt-page-wifi.c:224
msgid "SSID"
msgstr "SSID"
-#: ../clients/common/nm-meta-setting-desc.c:6283
+#: ../clients/common/nm-meta-setting-desc.c:6624
msgid "OLPC Mesh channel [1]"
-msgstr "OLPC Mesh 频道 [1]"
+msgstr "OLPC Mesh 信道 [1]"
-#: ../clients/common/nm-meta-setting-desc.c:6292
+#: ../clients/common/nm-meta-setting-desc.c:6633
msgid "DHCP anycast MAC address [none]"
msgstr "DHCP 任意广播 MAC 地址 [无]"
-#: ../clients/common/nm-meta-setting-desc.c:6304
+#: ../clients/common/nm-meta-setting-desc.c:6645
msgid "PPPoE parent device"
-msgstr ""
+msgstr "PPPoE 上级设备"
-#: ../clients/common/nm-meta-setting-desc.c:6310
+#: ../clients/common/nm-meta-setting-desc.c:6651
msgid "Service [none]"
msgstr "服务 [无]"
-#: ../clients/common/nm-meta-setting-desc.c:6317
+#: ../clients/common/nm-meta-setting-desc.c:6658
msgid "PPPoE username"
msgstr "PPPoE 用户名"
-#: ../clients/common/nm-meta-setting-desc.c:6491
-#, fuzzy
+#: ../clients/common/nm-meta-setting-desc.c:6832
msgid "Browser only [no]"
-msgstr "仅浏览器"
+msgstr "仅浏览器 [否]"
-#: ../clients/common/nm-meta-setting-desc.c:6497
-#, fuzzy
+#: ../clients/common/nm-meta-setting-desc.c:6838
msgid "PAC URL"
-msgstr "PAC Url"
+msgstr "PAC URL"
-#: ../clients/common/nm-meta-setting-desc.c:6503
-#, fuzzy
+#: ../clients/common/nm-meta-setting-desc.c:6844
msgid "PAC script"
msgstr "PAC 脚本"
-#: ../clients/common/nm-meta-setting-desc.c:6538
-#: ../clients/common/nm-meta-setting-desc.c:6686
+#: ../clients/common/nm-meta-setting-desc.c:6879
+#: ../clients/common/nm-meta-setting-desc.c:7028
msgid "Team JSON configuration [none]"
-msgstr "群组 JSON 配置 [无]:"
+msgstr "组合 JSON 配置 [无]"
-#: ../clients/common/nm-meta-setting-desc.c:6823
+#: ../clients/common/nm-meta-setting-desc.c:7184
msgid "User ID [none]"
msgstr "用户 ID [无]"
-#: ../clients/common/nm-meta-setting-desc.c:6829
-#, fuzzy
+#: ../clients/common/nm-meta-setting-desc.c:7190
msgid "Group ID [none]"
-msgstr "群组 ID [无]"
+msgstr "分组 ID [无]"
-#: ../clients/common/nm-meta-setting-desc.c:6835
+#: ../clients/common/nm-meta-setting-desc.c:7196
msgid "Enable PI [no]"
msgstr "启用 PI [否]"
-#: ../clients/common/nm-meta-setting-desc.c:6841
+#: ../clients/common/nm-meta-setting-desc.c:7202
msgid "Enable VNET header [no]"
msgstr "启用 VNET 首部 [否]"
-#: ../clients/common/nm-meta-setting-desc.c:6847
+#: ../clients/common/nm-meta-setting-desc.c:7208
msgid "Enable multi queue [no]"
msgstr "启用多队列 [否]"
-#: ../clients/common/nm-meta-setting-desc.c:6860
+#: ../clients/common/nm-meta-setting-desc.c:7221
msgid "VLAN parent device or connection UUID"
msgstr "VLAN 上级设备或连接 UUID"
-#: ../clients/common/nm-meta-setting-desc.c:6867
+#: ../clients/common/nm-meta-setting-desc.c:7228
msgid "VLAN ID (<0-4094>)"
msgstr "VLAN ID <0-4095>"
-#: ../clients/common/nm-meta-setting-desc.c:6873
+#: ../clients/common/nm-meta-setting-desc.c:7234
msgid "VLAN flags (<0-7>) [none]"
-msgstr "VLAN 标志 (<0-7>) [无]"
+msgstr "VLAN 标记(<0-7>)[无]"
-#: ../clients/common/nm-meta-setting-desc.c:6882
+#: ../clients/common/nm-meta-setting-desc.c:7243
msgid "Ingress priority maps [none]"
msgstr "入口优先级映射 [无]"
-#: ../clients/common/nm-meta-setting-desc.c:6892
+#: ../clients/common/nm-meta-setting-desc.c:7253
msgid "Egress priority maps [none]"
msgstr "出口优先级映射 [无]"
-#: ../clients/common/nm-meta-setting-desc.c:6960
+#: ../clients/common/nm-meta-setting-desc.c:7321
msgid "VXLAN ID"
msgstr "VXLAN ID"
-#: ../clients/common/nm-meta-setting-desc.c:6966
+#: ../clients/common/nm-meta-setting-desc.c:7327
msgid "Local address [none]"
msgstr "本地地址 [无]"
-#: ../clients/common/nm-meta-setting-desc.c:6979
+#: ../clients/common/nm-meta-setting-desc.c:7340
msgid "Minimum source port [0]"
msgstr "最小来源端口 [0]"
-#: ../clients/common/nm-meta-setting-desc.c:6985
+#: ../clients/common/nm-meta-setting-desc.c:7346
msgid "Maximum source port [0]"
msgstr "最大来源端口 [0]"
-#: ../clients/common/nm-meta-setting-desc.c:6991
+#: ../clients/common/nm-meta-setting-desc.c:7352
msgid "Destination port [8472]"
msgstr "目标端口 [8472]"
-#: ../clients/common/nm-meta-setting-desc.c:7037
+#: ../clients/common/nm-meta-setting-desc.c:7398
msgid "WiMAX NSP name"
msgstr "WiMAX NSP 名称"
-#: ../clients/common/nm-meta-setting-desc.c:7074
-#: ../clients/common/nm-meta-setting-desc.c:7210
+#: ../clients/common/nm-meta-setting-desc.c:7435
+#: ../clients/common/nm-meta-setting-desc.c:7571
msgid "Cloned MAC [none]"
msgstr "克隆的 MAC 地址 [无]"
-#: ../clients/common/nm-meta-setting-desc.c:7101
+#: ../clients/common/nm-meta-setting-desc.c:7462
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"
+"输入子通道列表(用逗号或者空格分开)。\n"
"\n"
"示例:0.0.0e20 0.0.0e21 0.0.0e22\n"
-#: ../clients/common/nm-meta-setting-desc.c:7355
+#: ../clients/common/nm-meta-setting-desc.c:7730
msgid ""
"Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
"and 2 or passphrase.\n"
msgstr ""
-"输入 WEP 密钥类型。可接受的值为:0 或者 unknown, 1 或者 key, 以及 2 或者 "
+"输入 WEP 密钥类型。可接受的值为:0 或者 unknown、1 或者 key, 以及 2 或者 "
"passphrase。\n"
+#: ../clients/common/nm-meta-setting-desc.c:7792
+msgid "Short address (<0x0000-0xffff>)"
+msgstr "短地址(<0x0000-0xffff>)"
+
+#: ../clients/common/nm-meta-setting-desc.c:7808
+msgid "PAN Identifier (<0x0000-0xffff>)"
+msgstr "PAN 标识符(<0x0000-0xffff>)"
+
+#: ../clients/common/nm-meta-setting-desc.c:7830
+msgid "IEEE 802.15.4 (WPAN) parent device or connection UUID"
+msgstr "IEEE 802.15.4(WPAN)上级设备或连接的 UUID"
+
#. ***************************************************************************
-#: ../clients/common/nm-meta-setting-desc.c:7515
+#: ../clients/common/nm-meta-setting-desc.c:7957
msgid "802-1x settings"
-msgstr ""
+msgstr "802-1x 设置"
-#: ../clients/common/nm-meta-setting-desc.c:7516
-#: ../src/devices/adsl/nm-device-adsl.c:137
+#: ../clients/common/nm-meta-setting-desc.c:7958
+#: ../src/devices/adsl/nm-device-adsl.c:133
msgid "ADSL connection"
msgstr "ADSL 连接"
-#: ../clients/common/nm-meta-setting-desc.c:7517
+#: ../clients/common/nm-meta-setting-desc.c:7959
msgid "bluetooth connection"
msgstr "蓝牙连接"
-#: ../clients/common/nm-meta-setting-desc.c:7518
-#, fuzzy
+#: ../clients/common/nm-meta-setting-desc.c:7960
msgid "Bond device"
-msgstr "以太网设备"
+msgstr "绑定设备"
-#: ../clients/common/nm-meta-setting-desc.c:7519
+#: ../clients/common/nm-meta-setting-desc.c:7961
msgid "Bridge device"
-msgstr "桥接设备"
+msgstr "网桥设备"
-#: ../clients/common/nm-meta-setting-desc.c:7520
+#: ../clients/common/nm-meta-setting-desc.c:7962
msgid "Bridge port"
-msgstr "桥接端口"
+msgstr "网桥端口"
-#: ../clients/common/nm-meta-setting-desc.c:7521
+#: ../clients/common/nm-meta-setting-desc.c:7963
msgid "CDMA mobile broadband connection"
msgstr "CDMA 移动宽带连接"
-#: ../clients/common/nm-meta-setting-desc.c:7522
+#: ../clients/common/nm-meta-setting-desc.c:7964
msgid "General settings"
-msgstr ""
+msgstr "常规设置"
-#: ../clients/common/nm-meta-setting-desc.c:7523
+#: ../clients/common/nm-meta-setting-desc.c:7965
msgid "DCB settings"
-msgstr ""
+msgstr "DCB 设置"
-#: ../clients/common/nm-meta-setting-desc.c:7524
+#: ../clients/common/nm-meta-setting-desc.c:7966
msgid "Dummy settings"
-msgstr ""
+msgstr "虚拟设置"
+
+#: ../clients/common/nm-meta-setting-desc.c:7967
+msgid "Ethtool settings"
+msgstr "Ethtool 设置"
-#: ../clients/common/nm-meta-setting-desc.c:7525
+#: ../clients/common/nm-meta-setting-desc.c:7968
msgid "Generic settings"
-msgstr ""
+msgstr "通用设置"
-#: ../clients/common/nm-meta-setting-desc.c:7526
+#: ../clients/common/nm-meta-setting-desc.c:7969
msgid "GSM mobile broadband connection"
msgstr "GSM 移动宽带连接"
-#: ../clients/common/nm-meta-setting-desc.c:7527
-#: ../src/devices/nm-device-infiniband.c:192
+#: ../clients/common/nm-meta-setting-desc.c:7970
+#: ../src/devices/nm-device-infiniband.c:170
msgid "InfiniBand connection"
msgstr "InfiniBand 连接"
-#: ../clients/common/nm-meta-setting-desc.c:7528
+#: ../clients/common/nm-meta-setting-desc.c:7971
msgid "IPv4 protocol"
msgstr "IPv4 协议"
-#: ../clients/common/nm-meta-setting-desc.c:7529
+#: ../clients/common/nm-meta-setting-desc.c:7972
msgid "IPv6 protocol"
msgstr "IPv6 协议"
-#: ../clients/common/nm-meta-setting-desc.c:7530
+#: ../clients/common/nm-meta-setting-desc.c:7973
msgid "IP-tunnel settings"
-msgstr ""
+msgstr "IP 隧道设置"
-#: ../clients/common/nm-meta-setting-desc.c:7531
+#: ../clients/common/nm-meta-setting-desc.c:7974
msgid "MACsec connection"
msgstr "MACsec 连接"
-#: ../clients/common/nm-meta-setting-desc.c:7532
+#: ../clients/common/nm-meta-setting-desc.c:7975
msgid "macvlan connection"
msgstr "macvlan 连接"
-#: ../clients/common/nm-meta-setting-desc.c:7533
+#: ../clients/common/nm-meta-setting-desc.c:7976
+msgid "Match"
+msgstr "匹配"
+
+#: ../clients/common/nm-meta-setting-desc.c:7977
msgid "OLPC Mesh connection"
msgstr "OLPC Mesh 连接"
-#: ../clients/common/nm-meta-setting-desc.c:7534
+#: ../clients/common/nm-meta-setting-desc.c:7978
msgid "OpenVSwitch bridge settings"
-msgstr ""
+msgstr "OpenVSwitch 网桥设置"
-#: ../clients/common/nm-meta-setting-desc.c:7535
+#: ../clients/common/nm-meta-setting-desc.c:7979
msgid "OpenVSwitch interface settings"
-msgstr ""
+msgstr "OpenVSwitch 接口设置"
-#: ../clients/common/nm-meta-setting-desc.c:7536
+#: ../clients/common/nm-meta-setting-desc.c:7980
msgid "OpenVSwitch patch interface settings"
-msgstr ""
+msgstr "OpenVSwitch 插线接口设置"
-#: ../clients/common/nm-meta-setting-desc.c:7537
+#: ../clients/common/nm-meta-setting-desc.c:7981
msgid "OpenVSwitch port settings"
-msgstr ""
+msgstr "OpenVSwitch 端口设置"
-#: ../clients/common/nm-meta-setting-desc.c:7538
+#: ../clients/common/nm-meta-setting-desc.c:7982
msgid "PPP settings"
-msgstr ""
+msgstr "PPP 设置"
-#: ../clients/common/nm-meta-setting-desc.c:7539
+#: ../clients/common/nm-meta-setting-desc.c:7983
msgid "PPPoE"
msgstr "PPPoE"
-#: ../clients/common/nm-meta-setting-desc.c:7540
+#: ../clients/common/nm-meta-setting-desc.c:7984
msgid "Proxy"
msgstr "代理"
-#: ../clients/common/nm-meta-setting-desc.c:7541
+#: ../clients/common/nm-meta-setting-desc.c:7985
msgid "Serial settings"
-msgstr ""
+msgstr "串行设置"
-#: ../clients/common/nm-meta-setting-desc.c:7542
+#: ../clients/common/nm-meta-setting-desc.c:7986
+#| msgid "802-1x settings"
+msgid "SR-IOV settings"
+msgstr "SR-IOV 设置"
+
+#: ../clients/common/nm-meta-setting-desc.c:7987
msgid "Traffic controls"
-msgstr ""
+msgstr "流量控制"
-#: ../clients/common/nm-meta-setting-desc.c:7543
-#, fuzzy
+#: ../clients/common/nm-meta-setting-desc.c:7988
msgid "Team device"
-msgstr "TUN 设备模式"
+msgstr "组合设备"
-#: ../clients/common/nm-meta-setting-desc.c:7544
-#, fuzzy
+#: ../clients/common/nm-meta-setting-desc.c:7989
msgid "Team port"
-msgstr "组队"
+msgstr "组合端口"
-#: ../clients/common/nm-meta-setting-desc.c:7545
+#: ../clients/common/nm-meta-setting-desc.c:7990
msgid "Tun device"
msgstr "Tun 设备"
-#: ../clients/common/nm-meta-setting-desc.c:7546
+#: ../clients/common/nm-meta-setting-desc.c:7991
msgid "User settings"
-msgstr ""
+msgstr "用户设置"
-#: ../clients/common/nm-meta-setting-desc.c:7547
-#: ../src/devices/nm-device-vlan.c:394
+#: ../clients/common/nm-meta-setting-desc.c:7992
+#: ../src/devices/nm-device-vlan.c:400
msgid "VLAN connection"
msgstr "VLAN 连接"
-#: ../clients/common/nm-meta-setting-desc.c:7548 ../src/nm-manager.c:4277
+#: ../clients/common/nm-meta-setting-desc.c:7993 ../src/nm-manager.c:5126
msgid "VPN connection"
msgstr "VPN 连接"
-#: ../clients/common/nm-meta-setting-desc.c:7549
-#: ../src/devices/nm-device-vxlan.c:331
+#: ../clients/common/nm-meta-setting-desc.c:7994
+#: ../src/devices/nm-device-vxlan.c:370
msgid "VXLAN connection"
msgstr "VXLAN 连接"
-#: ../clients/common/nm-meta-setting-desc.c:7550
+#: ../clients/common/nm-meta-setting-desc.c:7995
msgid "WiMAX connection"
msgstr "WiMAX 连接"
-#: ../clients/common/nm-meta-setting-desc.c:7551
+#: ../clients/common/nm-meta-setting-desc.c:7996
msgid "Wired Ethernet"
msgstr "有线以太网"
-#: ../clients/common/nm-meta-setting-desc.c:7552
+#: ../clients/common/nm-meta-setting-desc.c:7997
msgid "Wi-Fi connection"
msgstr "Wi-Fi 连接"
-#: ../clients/common/nm-meta-setting-desc.c:7553
+#: ../clients/common/nm-meta-setting-desc.c:7998
msgid "Wi-Fi security settings"
-msgstr ""
+msgstr "Wi-Fi 安全设置"
-#: ../clients/common/nm-meta-setting-desc.c:7870
-#, fuzzy
+#: ../clients/common/nm-meta-setting-desc.c:7999
+msgid "WPAN settings"
+msgstr "WPAN 设置"
+
+#: ../clients/common/nm-meta-setting-desc.c:8000
+msgid "6LOWPAN settings"
+msgstr "6LOWPAN 设置"
+
+#: ../clients/common/nm-meta-setting-desc.c:8351
msgid "name"
-msgstr "用户名"
+msgstr "名称"
-#: ../clients/common/nm-polkit-listener.c:212
+#: ../clients/common/nm-polkit-listener.c:239
msgid "An authentication session is already underway."
msgstr "验证会话已在进行。"
-#: ../clients/common/nm-secret-agent-simple.c:240
-#: ../clients/common/nm-secret-agent-simple.c:280
-#: ../clients/common/nm-secret-agent-simple.c:308
-#: ../clients/common/nm-secret-agent-simple.c:344
-#: ../clients/common/nm-secret-agent-simple.c:508
-#: ../clients/common/nm-secret-agent-simple.c:540
-#: ../clients/common/nm-secret-agent-simple.c:562
+#: ../clients/common/nm-secret-agent-simple.c:255
+#: ../clients/common/nm-secret-agent-simple.c:295
+#: ../clients/common/nm-secret-agent-simple.c:323
+#: ../clients/common/nm-secret-agent-simple.c:359
+#: ../clients/common/nm-secret-agent-simple.c:519
+#: ../clients/common/nm-secret-agent-simple.c:551
+#: ../clients/common/nm-secret-agent-simple.c:573
#: ../clients/common/nm-vpn-helpers.c:119
#: ../clients/common/nm-vpn-helpers.c:123
#: ../clients/common/nm-vpn-helpers.c:129
@@ -5425,121 +5794,120 @@ msgstr "验证会话已在进行。"
msgid "Password"
msgstr "密码"
-#: ../clients/common/nm-secret-agent-simple.c:250
+#: ../clients/common/nm-secret-agent-simple.c:265
msgid "Identity"
msgstr "身份"
-#: ../clients/common/nm-secret-agent-simple.c:256
+#: ../clients/common/nm-secret-agent-simple.c:271
msgid "Private key password"
msgstr "私钥密码"
-#: ../clients/common/nm-secret-agent-simple.c:295
+#: ../clients/common/nm-secret-agent-simple.c:310
#: ../clients/tui/nmt-page-wifi.c:289
msgid "Key"
msgstr "密钥"
-#: ../clients/common/nm-secret-agent-simple.c:338
+#: ../clients/common/nm-secret-agent-simple.c:353
#: ../clients/tui/nmt-page-dsl.c:78
msgid "Service"
msgstr "服务"
-#: ../clients/common/nm-secret-agent-simple.c:469
+#: ../clients/common/nm-secret-agent-simple.c:484
msgid "Authentication required by wireless network"
-msgstr "无线网络要求身份认证"
+msgstr "无线网络要求身份验证"
-#: ../clients/common/nm-secret-agent-simple.c:470
+#: ../clients/common/nm-secret-agent-simple.c:485
#, c-format
msgid ""
"Passwords or encryption keys are required to access the wireless network "
"'%s'."
-msgstr "需要密码或密钥来访问无效网络“%s”。"
+msgstr "需要密码或密钥来访问无线网络 \"%s\"。"
-#: ../clients/common/nm-secret-agent-simple.c:478
+#: ../clients/common/nm-secret-agent-simple.c:489
msgid "Wired 802.1X authentication"
-msgstr "有线 802.1X 认证"
+msgstr "有线 802.1X 身份验证"
-#: ../clients/common/nm-secret-agent-simple.c:479
+#: ../clients/common/nm-secret-agent-simple.c:490
#, c-format
msgid "Secrets are required to access the wired network '%s'"
-msgstr ""
+msgstr "需要密钥来访问有线网络 \"%s\"。"
-#: ../clients/common/nm-secret-agent-simple.c:484
+#: ../clients/common/nm-secret-agent-simple.c:495
msgid "DSL authentication"
-msgstr "DSL 认证"
+msgstr "DSL 身份验证"
-#: ../clients/common/nm-secret-agent-simple.c:485
+#: ../clients/common/nm-secret-agent-simple.c:496
#, c-format
msgid "Secrets are required for the DSL connection '%s'"
-msgstr ""
+msgstr "DSL 连接 \"%s\" 需要密钥。"
-#: ../clients/common/nm-secret-agent-simple.c:493
+#: ../clients/common/nm-secret-agent-simple.c:504
msgid "PIN code required"
msgstr "需要 PIN 码"
-#: ../clients/common/nm-secret-agent-simple.c:494
+#: ../clients/common/nm-secret-agent-simple.c:505
msgid "PIN code is needed for the mobile broadband device"
msgstr "移动宽带设备需要 PIN 码"
-#: ../clients/common/nm-secret-agent-simple.c:497
+#: ../clients/common/nm-secret-agent-simple.c:508
msgid "PIN"
msgstr "PIN"
-#: ../clients/common/nm-secret-agent-simple.c:503
-#: ../clients/common/nm-secret-agent-simple.c:535
-#: ../clients/common/nm-secret-agent-simple.c:557
+#: ../clients/common/nm-secret-agent-simple.c:514
+#: ../clients/common/nm-secret-agent-simple.c:546
+#: ../clients/common/nm-secret-agent-simple.c:568
msgid "Mobile broadband network password"
msgstr "移动宽带网络密码"
-#: ../clients/common/nm-secret-agent-simple.c:504
-#: ../clients/common/nm-secret-agent-simple.c:536
-#: ../clients/common/nm-secret-agent-simple.c:558
-#: ../clients/common/nm-secret-agent-simple.c:579
+#: ../clients/common/nm-secret-agent-simple.c:515
+#: ../clients/common/nm-secret-agent-simple.c:547
+#: ../clients/common/nm-secret-agent-simple.c:569
+#: ../clients/common/nm-secret-agent-simple.c:586
#, c-format
msgid "A password is required to connect to '%s'."
-msgstr "需要密码来连接到“%s”。"
+msgstr "需要密码来连接到 \"%s\"。"
-#: ../clients/common/nm-secret-agent-simple.c:517
+#: ../clients/common/nm-secret-agent-simple.c:528
#, c-format
msgid "Secrets are required to access the MACsec network '%s'"
-msgstr ""
+msgstr "需要密钥来访问 MACsec 网络 \"%s\"。"
-#: ../clients/common/nm-secret-agent-simple.c:521
+#: ../clients/common/nm-secret-agent-simple.c:532
msgid "MACsec PSK authentication"
-msgstr ""
+msgstr "MACsec PSK 身份验证"
-#: ../clients/common/nm-secret-agent-simple.c:529
+#: ../clients/common/nm-secret-agent-simple.c:540
msgid "MACsec EAP authentication"
-msgstr ""
+msgstr "MACsec EAP 身份验证"
-#: ../clients/common/nm-secret-agent-simple.c:574
+#: ../clients/common/nm-secret-agent-simple.c:581
msgid "VPN password required"
-msgstr "要求 VPN 密码"
+msgstr "需要 VPN 密码"
#: ../clients/common/nm-vpn-helpers.c:48
#, c-format
msgid "unknown VPN plugin \"%s\""
-msgstr "未知的 VPN 插件“%s”"
+msgstr "未知的 VPN 插件 \"%s\""
#: ../clients/common/nm-vpn-helpers.c:59
#, c-format
msgid "cannot load legacy-only VPN plugin \"%s\" for \"%s\""
-msgstr ""
+msgstr "无法为 \"%2$s\" 加载旧版限定的 VPN 插件 \"%1$s\""
#: ../clients/common/nm-vpn-helpers.c:64
#, c-format
msgid ""
"cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
-msgstr ""
+msgstr "由于缺少 \"%2$s\",无法加载 VPN 插件 \"%1$s\"。缺少客户端插件?"
#: ../clients/common/nm-vpn-helpers.c:69
-#, fuzzy, c-format
+#, c-format
msgid "failed to load VPN plugin \"%s\": %s"
-msgstr "错误:加载 VPN 插件失败:%s。"
+msgstr "加载 VPN 插件 \"%s\" 失败:%s"
#: ../clients/common/nm-vpn-helpers.c:124
-#, fuzzy
msgid "Certificate password"
-msgstr "私钥密码"
+msgstr "证书密码"
#: ../clients/common/nm-vpn-helpers.c:125
msgid "HTTP proxy password"
@@ -5561,70 +5929,34 @@ msgstr "Cookie"
#: ../clients/common/nm-vpn-helpers.c:141
msgid "Gateway certificate hash"
-msgstr "网关证书哈希"
+msgstr "网关证书散列"
#. Generated file. Do not edit.
-#: ../clients/common/settings-docs.c.in:3
-msgid "Channel on which the mesh network to join is located."
+#: ../clients/common/settings-docs.h.in:3
+msgid ""
+"If given, specifies the parent interface name or parent connection UUID from "
+"which this 6LowPAN interface should be created."
msgstr ""
+"如果给定了,其指定 6LowPAN 接口应被创建在上级接口名称或上级连接的 UUID。"
+
+#: ../clients/common/settings-docs.h.in:4
+msgid "Channel on which the mesh network to join is located."
+msgstr "已位于要加入的 Mesh 网络信道。"
-#: ../clients/common/settings-docs.c.in:4
+#: ../clients/common/settings-docs.h.in:5
msgid ""
"Anycast DHCP MAC address used when requesting an IP address via DHCP. The "
"specific anycast address used determines which DHCP server class answers the "
"request."
msgstr ""
+"通过 DHCP 请求 IP 时使用的任意广播 DHCP MAC 地址。使用的指定任播地址决定了哪"
+"个 DHCP 服务器来回复请求。"
-#: ../clients/common/settings-docs.c.in:5
-#: ../clients/common/settings-docs.c.in:18
-#: ../clients/common/settings-docs.c.in:30
-#: ../clients/common/settings-docs.c.in:57
-#: ../clients/common/settings-docs.c.in:96
-#: ../clients/common/settings-docs.c.in:105
-#: ../clients/common/settings-docs.c.in:113
-#: ../clients/common/settings-docs.c.in:115
-#: ../clients/common/settings-docs.c.in:124
-#: ../clients/common/settings-docs.c.in:128
-#: ../clients/common/settings-docs.c.in:132
-#: ../clients/common/settings-docs.c.in:148
-#: ../clients/common/settings-docs.c.in:165
-#: ../clients/common/settings-docs.c.in:174
-#: ../clients/common/settings-docs.c.in:175
-#: ../clients/common/settings-docs.c.in:180
-#: ../clients/common/settings-docs.c.in:192
-#: ../clients/common/settings-docs.c.in:202
-#: ../clients/common/settings-docs.c.in:225
-#: ../clients/common/settings-docs.c.in:246
-#: ../clients/common/settings-docs.c.in:257
-#: ../clients/common/settings-docs.c.in:262
-#: ../clients/common/settings-docs.c.in:268
-#: ../clients/common/settings-docs.c.in:271
-#: ../clients/common/settings-docs.c.in:273
-#: ../clients/common/settings-docs.c.in:279
-#: ../clients/common/settings-docs.c.in:289
-#: ../clients/common/settings-docs.c.in:301
-#: ../clients/common/settings-docs.c.in:309
-#: ../clients/common/settings-docs.c.in:314
-#: ../clients/common/settings-docs.c.in:318
-#: ../clients/common/settings-docs.c.in:325
-#: ../clients/common/settings-docs.c.in:342
-#: ../clients/common/settings-docs.c.in:349
-#: ../clients/common/settings-docs.c.in:354
-#: ../clients/common/settings-docs.c.in:359
-#: ../clients/common/settings-docs.c.in:362
-#: ../clients/common/settings-docs.c.in:376
-#: ../clients/common/settings-docs.c.in:386
-msgid ""
-"The setting's name, which uniquely identifies the setting within the "
-"connection. Each setting type has a name unique to that type, for example "
-"\"ppp\" or \"wireless\" or \"wired\"."
-msgstr ""
-
-#: ../clients/common/settings-docs.c.in:6
+#: ../clients/common/settings-docs.h.in:6
msgid "SSID of the mesh network to join."
-msgstr ""
+msgstr "要加入的 mesh 网络的 SSID。"
-#: ../clients/common/settings-docs.c.in:7
+#: ../clients/common/settings-docs.h.in:7
msgid ""
"802.11 frequency band of the network. One of \"a\" for 5GHz 802.11a or \"bg"
"\" for 2.4GHz 802.11. This will lock associations to the Wi-Fi network to "
@@ -5633,24 +5965,32 @@ msgid ""
"compatible. This setting depends on specific driver capability and may not "
"work with all drivers."
msgstr ""
+"网络的 802.11 频段。一个 \"a\" 代表 5GHz 802.11a 或 \"bg\" 代表 2.4GHz "
+"802.11。这将锁定关联的 Wi-Fi 网络到特定的频段,比如指定了 \"a\",设备就不会关"
+"联在 2.4GHz 内的相同网络,不管网络设置是否兼容。此设置取决于具体驱动的功能,"
+"且可能不是全部的驱动都有效。"
-#: ../clients/common/settings-docs.c.in:8
+#: ../clients/common/settings-docs.h.in:8
msgid ""
"If specified, directs the device to only associate with the given access "
"point. This capability is highly driver dependent and not supported by all "
"devices. Note: this property does not control the BSSID used when creating "
"an Ad-Hoc network and is unlikely to in the future."
msgstr ""
+"如果指定了,则指定设备只关联给定的接入点。此功能依赖于驱动,并非所有设备都支"
+"持。注意:此属性不会控制创建 Ad-Hoc 网络时使用的 BSSID,将来也不会。"
-#: ../clients/common/settings-docs.c.in:9
+#: ../clients/common/settings-docs.h.in:9
msgid ""
"Wireless channel to use for the Wi-Fi connection. The device will only join "
"(or create for Ad-Hoc networks) a Wi-Fi network on the specified channel. "
"Because channel numbers overlap between bands, this property also requires "
"the \"band\" property to be set."
msgstr ""
+"用于 Wi-Fi 连接的无线信道。设备将只在指定的信道上加入(或创建 Ad-Hoc 网络)"
+"Wi-Fi 网络。因为信道号码在不同频段间重复,此属性也需要设定 \"band\" 属性。"
-#: ../clients/common/settings-docs.c.in:10
+#: ../clients/common/settings-docs.h.in:10
msgid ""
"If specified, request that the device use this MAC address instead. This is "
"known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
@@ -5665,9 +6005,17 @@ msgid ""
"different default value). On D-Bus, this field is expressed as \"assigned-"
"mac-address\" or the deprecated \"cloned-mac-address\"."
msgstr ""
+"如指定了,则请求该设备使用此 MAC 地址来代替。这个可被称为 MAC 克隆或欺骗。除"
+"了明确地指定 MAC 地址,也支持 \"preserve\"、\"permanent\"、\"random\" 和 "
+"\"stable\" 等特殊值。\"preserve\" 表示激活时不动 MAC 地址。\"permanent\" 使用"
+"设备的永久硬件地址。\"random\" 则在每个连接上创建随机的 MAC 地址。\"stable\" "
+"则根据 connection.stable-id 和机器相关密钥创建散列的 MAC 地址。如未指定,该值"
+"可被全局默认值覆盖,参见 NetworkManager.conf 的手册。如还未指定,它就默认为 "
+"\"preserve\"(旧版 NetworkManager 可能使用不同的默认值)。在 D-Bus 上, 此字段"
+"表示为 \"assigned-mac-address\" 或已弃用的 \"cloned-mac-address\"。"
-#: ../clients/common/settings-docs.c.in:11
-#: ../clients/common/settings-docs.c.in:92
+#: ../clients/common/settings-docs.h.in:11
+#: ../clients/common/settings-docs.h.in:91
msgid ""
"With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all "
"bits of the MAC address are scrambled and a locally-administered, unicast "
@@ -5693,31 +6041,55 @@ msgid ""
"create a fully scrambled MAC address, randomly locally or globally "
"administered."
msgstr ""
-
-#: ../clients/common/settings-docs.c.in:12
+"\"cloned-mac-address\" 设置为 \"random\" 或 \"stable\" 时,按默认 MAC 地址的"
+"所有位都被扰乱,并创建一个本地管理的单播 MAC 地址。 此属性允许指定某些位为固"
+"定的。请注意,第一个 MAC 地址的最低有效位始终未被设置以创建单播MAC地址。如果"
+"属性为 NULL,它可以被默认的连接设置覆盖。如果该值还是 NULL 或为空字符串,默认"
+"值就为创建一个本地管理的单播 MAC 地址。如果该值包含一个 MAC 地址,此地址用作"
+"掩码。掩码的设置位将以设备的当前 MAC 地址填充,而未设置位将随机化。设为 \"FE:"
+"FF:FF:00:00:00\" 表示保留当前 MAC 地址的 OUI 且使用 \"random\" 或 \"stable\" "
+"算法只随机最低三位。如果该值在掩码后包含一个附加的 MAC 地址,使用此地址来代替"
+"当前的 MAC 地址去填充那些不应该随机的位。示例,值 \"FE:FF:FF:00:00:00 68:"
+"F7:28:00:00:00\" 将设定 MAC 地址的 OUI 为 68:F7:28,而更低位随机化。值 "
+"\"02:00:00:00:00:00 00:00:00:00:00:00\" 将创建完全扰乱的全局管理烧录的 MAC 地"
+"址。如果值包含多个附加 MAC 地址,就随机选择其中一个。示"
+"例,\"02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00\" 将创建完全扰乱"
+"的 MAC 地址,随机地选择本地或全局管理。"
+
+#: ../clients/common/settings-docs.h.in:12
msgid ""
"If TRUE, indicates this network is a non-broadcasting network that hides its "
"SSID. In this case various workarounds may take place, such as probe-"
"scanning the SSID for more reliable network discovery. However, these "
"workarounds expose inherent insecurities with hidden SSID networks, and thus "
-"hidden SSID networks should be used with caution."
+"hidden SSID networks should be used with caution. Note that marking the "
+"network as hidden may be a privacy issue for you, as the explicit probe-"
+"scans may be distinctly recognizable on the air."
msgstr ""
+"如为 TRUE,表明此网络是个隐藏了它 SSID 的非广播网络。这种情况下,可以采用多种"
+"解决方法,比如探测扫描 SSID 以获得更可靠的网络发现。但是,这些解决方法也暴露"
+"了隐藏 SSID 网络的固有的不安全性,因此应该谨慎地使用隐藏 SSID 网络。注意标记"
+"网络为隐藏对于你可能是个隐私问题,因为明确的探测扫描在空中可能被清晰地识别。"
-#: ../clients/common/settings-docs.c.in:13
+#: ../clients/common/settings-docs.h.in:13
msgid ""
"If specified, this connection will only apply to the Wi-Fi device whose "
"permanent MAC address matches. This property does not change the MAC address "
"of the device (i.e. MAC spoofing)."
msgstr ""
+"如指定了,此连接将只应用到符合永久 MAC 地址的 Wi-Fi 设备。此属性不会改变设备"
+"的 MAC 地址(例如 MAC 欺骗)。"
-#: ../clients/common/settings-docs.c.in:14
+#: ../clients/common/settings-docs.h.in:14
msgid ""
"A list of permanent MAC addresses of Wi-Fi devices to which this connection "
"should never apply. Each MAC address should be given in the standard hex-"
"digits-and-colons notation (eg \"00:11:22:33:44:55\")."
msgstr ""
+"Wi-Fi 设备的永久 MAC 地址列表,其地址此连接应该从不应用。每个 MAC 地址应给定"
+"为标准的十六进制数字和冒号的表示法(比如 \"00:11:22:33:44:55\")。"
-#: ../clients/common/settings-docs.c.in:15
+#: ../clients/common/settings-docs.h.in:15
msgid ""
"One of NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (never randomize unless the "
"user has set a global default to randomize and the supplicant supports "
@@ -5726,21 +6098,28 @@ msgid ""
"the MAC address). This property is deprecated for 'cloned-mac-address'. "
"Deprecated: 1"
msgstr ""
+"NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0)(从不随机化,除非用户设定了全局默认"
+"随机且请求方支持随机化)、NM_SETTING_MAC_RANDOMIZATION_NEVER (1)(从不随机化 "
+"MAC 地址)或 NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2)(总是随机化 MAC 地址)之"
+"一。此属性已为 \"cloned-mac-address\" 所弃用。已弃用:1"
-#: ../clients/common/settings-docs.c.in:16
+#: ../clients/common/settings-docs.h.in:16
msgid ""
"Wi-Fi network mode; one of \"infrastructure\", \"adhoc\" or \"ap\". If "
"blank, infrastructure is assumed."
msgstr ""
+"Wi-Fi 网络模式;\"infrastructure\"、\"adhoc\" 或 \"ap\" 之一。如果留空,假定"
+"为 infrastructure。"
-#: ../clients/common/settings-docs.c.in:17
-#: ../clients/common/settings-docs.c.in:95
+#: ../clients/common/settings-docs.h.in:17
+#: ../clients/common/settings-docs.h.in:94
msgid ""
"If non-zero, only transmit packets of the specified size or smaller, "
"breaking larger packets up into multiple Ethernet frames."
msgstr ""
+"如果非零,只传输指定大小或更小的数据包,将较大的数据包分成多个以太网帧。"
-#: ../clients/common/settings-docs.c.in:19
+#: ../clients/common/settings-docs.h.in:18
msgid ""
"One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi-Fi power "
"saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi-Fi power "
@@ -5748,16 +6127,23 @@ msgid ""
"configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the "
"globally configured value). All other values are reserved."
msgstr ""
+"NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2)(禁用 Wi-Fi 的节能模式)、 "
+"NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3)(启用 Wi-Fi 的节能模式)、 "
+"NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1)(不改变当前配置)或 "
+"NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0)(使用全局配置值)之一。所有其他值都"
+"保留。"
-#: ../clients/common/settings-docs.c.in:20
+#: ../clients/common/settings-docs.h.in:19
msgid ""
"If non-zero, directs the device to only use the specified bitrate for "
"communication with the access point. Units are in Kb/s, ie 5500 = 5.5 Mbit/"
"s. This property is highly driver dependent and not all devices support "
"setting a static bitrate."
msgstr ""
+"如果非零,指示设备仅使用指定的比特率与接入点进行通信。单位为 Kb/s,示例 "
+"5500=5.5 Mbit/s。此属性依赖于驱动,并非所有设备都支持设置静态比特率。"
-#: ../clients/common/settings-docs.c.in:21
+#: ../clients/common/settings-docs.h.in:20
msgid ""
"A list of BSSIDs (each BSSID formatted as a MAC address like "
"\"00:11:22:33:44:55\") that have been detected as part of the Wi-Fi "
@@ -5765,19 +6151,53 @@ msgid ""
"property is only meant for reading and reflects the BSSID list of "
"NetworkManager. The changes you make to this property will not be preserved."
msgstr ""
+"检测为 Wi-Fi 网络一部分的 BSSID 列表(每个 BSSID 格式化为如 "
+"\"00:11:22:33:44:55\" 的 MAC 地址)。网络管理器(NetworkManager)会内部追踪先"
+"前见过的 BSSID。此属性仅用于读取和显示网络管理器的 BSSID 列表。您对此属性所作"
+"的更改不会保留。"
-#: ../clients/common/settings-docs.c.in:22
+#: ../clients/common/settings-docs.h.in:21
msgid "SSID of the Wi-Fi network. Must be specified."
-msgstr ""
+msgstr "Wi-Fi 网络的 SSID。必须指定。"
-#: ../clients/common/settings-docs.c.in:23
+#: ../clients/common/settings-docs.h.in:22
msgid ""
"If non-zero, directs the device to use the specified transmit power. Units "
"are dBm. This property is highly driver dependent and not all devices "
"support setting a static transmit power."
msgstr ""
-
-#: ../clients/common/settings-docs.c.in:24
+"如果非零,指示设备使用指定的传输功率。单位为 dBm。此属性依赖于驱动,并非所有"
+"设备都支持设置静态的传输功率。"
+
+#: ../clients/common/settings-docs.h.in:23
+msgid ""
+"The NMSettingWirelessWakeOnWLan options to enable. Not all devices support "
+"all options. May be any combination of NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY "
+"(0x2), NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (0x20), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (0x40), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (0x100) or the special values "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1) (to use global settings) and "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (to disable management of "
+"Wake-on-LAN in NetworkManager)."
+msgstr ""
+"启用 NMSettingWiredWakeOnWLan 的选项。并非全部设备都支持所有选项。可以是以下"
+"选项的任意组合:NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY (0x2)、"
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4)、"
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8)、"
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10)、"
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (0x20)、"
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (0x40)、"
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80)、"
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (0x100) 或特殊值 "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1)(使用全局默认值)和 "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000)(在网络管理器"
+"(NetworkManager)中禁用 WLAN 唤醒的管理)。"
+
+#: ../clients/common/settings-docs.h.in:24
msgid ""
"When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the "
"802.11 authentication algorithm required by the AP here. One of \"open\" "
@@ -5785,48 +6205,84 @@ msgid ""
"When using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") "
"the \"leap-username\" and \"leap-password\" properties must be specified."
msgstr ""
-
-#: ../clients/common/settings-docs.c.in:25
+"当时使用 WEP 时(示例,key-mgmt = \"none\" 或 \"ieee8021x\")表示接入点这里需"
+"要 802.11 验证算法。其中的 \"open\" 用于开放系统(Open System),\"shared\" "
+"用于共享密钥,而 \"leap\" 用于思科 LEAP。当使用思科 LEAP(示例,key-mgmt = "
+"\"ieee8021x\" 和 auth-alg = \"leap\")时,必须指定 \"leap-username\" 和 "
+"\"leap-password\" 属性。"
+
+#: ../clients/common/settings-docs.h.in:25
+msgid ""
+"Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for the "
+"connection. One of NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (use "
+"global default value), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) "
+"(disable FILS), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (enable FILS "
+"if the supplicant and the access point support it) or "
+"NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (enable FILS and fail if not "
+"supported). When set to NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) and "
+"no global default is set, FILS will be optionally enabled."
+msgstr ""
+"指示链路是否为连接启用快速初始链路设置(FILS/802.11ai)。"
+"NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0)(使用全局默认值)、 "
+"NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1)(禁用 FILS)、 "
+"NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2)(如果请求方和接入点支持 FILS "
+"就启用)或 NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3)(启用 FILS,不支持"
+"就失败)之一。当设定为 NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) 时且未设"
+"定全局默认值,FILS 将被选择启用。"
+
+#: ../clients/common/settings-docs.h.in:26
msgid ""
"A list of group/broadcast encryption algorithms which prevents connections "
"to Wi-Fi networks that do not utilize one of the algorithms in the list. "
"For maximum compatibility leave this property empty. Each list element may "
"be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\"."
msgstr ""
+"组/广播加密算法列表,用来阻止连接到那些不使用列表中算法的 Wi-Fi 网络。为了最"
+"好的兼容性,可以让此属性留空。每个列表元素可以为 "
+"\"wep40\"、\"wep104\"、\"tkip\" 或 \"ccmp\" 中的一个。"
-#: ../clients/common/settings-docs.c.in:26
+#: ../clients/common/settings-docs.h.in:27
msgid ""
"Key management used for the connection. One of \"none\" (WEP), \"ieee8021x"
"\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure "
"WPA-PSK), or \"wpa-eap\" (WPA-Enterprise). This property must be set for "
"any Wi-Fi connection that uses security."
msgstr ""
+"用于连接的密钥管理。\"none\"(WEP)、\"ieee8021x\"(动态 WEP)、\"wpa-none"
+"\"(Ad-Hoc WPA-PSK)、\"wpa-psk\"(基础结构 WPA-PSK)或 \"wpa-eap\"(WPA 企"
+"业)之一。对于使用安全保护的任何 Wi-Fi 连接,此属性必须设定。"
-#: ../clients/common/settings-docs.c.in:27
+#: ../clients/common/settings-docs.h.in:28
msgid ""
"The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
"and auth-alg = \"leap\")."
msgstr ""
+"传统 LEAP 连接的登录密码(示例,key-mgmt = \"ieee8021x\" 和 auth-alg = \"leap"
+"\")。"
-#: ../clients/common/settings-docs.c.in:28
+#: ../clients/common/settings-docs.h.in:29
msgid "Flags indicating how to handle the \"leap-password\" property."
-msgstr ""
+msgstr "指示如何处理 \"leap-password\" 属性的标志。"
-#: ../clients/common/settings-docs.c.in:29
+#: ../clients/common/settings-docs.h.in:30
msgid ""
"The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
"and auth-alg = \"leap\")."
msgstr ""
+"传统 LEAP 连接的登录用户名(示例,key-mgmt = \"ieee8021x\" 和 auth-alg = "
+"\"leap\")。"
-#: ../clients/common/settings-docs.c.in:31
+#: ../clients/common/settings-docs.h.in:31
msgid ""
"A list of pairwise encryption algorithms which prevents connections to Wi-Fi "
"networks that do not utilize one of the algorithms in the list. For maximum "
"compatibility leave this property empty. Each list element may be one of "
"\"tkip\" or \"ccmp\"."
msgstr ""
+"成对加密算法列表,用来阻止连接到那些不使用列表中算法的 Wi-Fi 网络。为了最好的"
+"兼容性,可以让此属性留空。每个列表元素可以为 \"tkip\" 或 \"ccmp\" 中的一个。"
-#: ../clients/common/settings-docs.c.in:32
+#: ../clients/common/settings-docs.h.in:32
msgid ""
"Indicates whether Protected Management Frames (802.11w) must be enabled for "
"the connection. One of NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (use "
@@ -5837,15 +6293,24 @@ msgid ""
"supported). When set to NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) and no "
"global default is set, PMF will be optionally enabled."
msgstr ""
+"指示是否必须为连接启用受保护的管理帧(PMF/802.11w)。"
+"NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0)(使用全局默认值)、 "
+"NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1)(禁用 PMF)、 "
+"NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2)(如果请求方和接入点支持 PMF 就"
+"启用)或 NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3)(启用 PMF,不支持就失"
+"败)之一。当设定为 NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) 时且未设定全"
+"局默认值,PMF 将被选择启用。"
-#: ../clients/common/settings-docs.c.in:33
+#: ../clients/common/settings-docs.h.in:33
msgid ""
"List of strings specifying the allowed WPA protocol versions to use. Each "
"element may be one \"wpa\" (allow WPA) or \"rsn\" (allow WPA2/RSN). If not "
"specified, both WPA and RSN connections are allowed."
msgstr ""
+"字符串列表,指定允许使用的 WPA 协议版本。每个元素可以为 \"wpa\"(允许 WPA)"
+"或 \"rsn\"(允许 WPA2/RSN)中的一个。如果未指定,WPA 和 RSN 连接都允许。"
-#: ../clients/common/settings-docs.c.in:34
+#: ../clients/common/settings-docs.h.in:34
msgid ""
"Pre-Shared-Key for WPA networks. If the key is 64-characters long, it must "
"contain only hexadecimal characters and is interpreted as a hexadecimal WPA "
@@ -5854,18 +6319,24 @@ msgid ""
"and is hashed to derive the actual WPA-PSK used when connecting to the Wi-Fi "
"network."
msgstr ""
+"用于 WPA 网络的预共享密钥。如果密钥时 64 字符长,它必须只能包含十六进制的字"
+"符,并且被解释为十六进制的 WPA 密钥。否则,该密钥必须在 8 到 63 ASCII 字符之"
+"间(如 802.11i 标准所规定)并被解释为 WPA 密码;而且当连接到 Wi-Fi 网络时,该"
+"密钥被散列以衍生实际的 WPA-PSK。"
-#: ../clients/common/settings-docs.c.in:35
+#: ../clients/common/settings-docs.h.in:35
msgid "Flags indicating how to handle the \"psk\" property."
-msgstr ""
+msgstr "指示如何处理 \"psk\" 属性的标志。"
-#: ../clients/common/settings-docs.c.in:36
+#: ../clients/common/settings-docs.h.in:36
msgid ""
"Flags indicating how to handle the \"wep-key0\", \"wep-key1\", \"wep-key2\", "
"and \"wep-key3\" properties."
msgstr ""
+"指示如何处理 \"wep-key0\"、\"wep-key1\"、\"wep-key2\" 和 \"wep-key3\" 属性的"
+"标志。"
-#: ../clients/common/settings-docs.c.in:37
+#: ../clients/common/settings-docs.h.in:37
msgid ""
"Controls the interpretation of WEP keys. Allowed values are "
"NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-"
@@ -5874,40 +6345,55 @@ msgid ""
"a string and will be hashed using the de-facto MD5 method to derive the "
"actual WEP key."
msgstr ""
+"控制 WEP 密钥的转义。允许的值有 NM_WEP_KEY_TYPE_KEY (1),此情况下密钥要么是 "
+"10 或 26 个字符长度的十六进制字符串,要么是 5 或 13 个字符长度的 ASCII 密码;"
+"还有 NM_WEP_KEY_TYPE_PASSPHRASE (2),此情况下密码以字符串提供,并使用事实上"
+"的 MD5 方法散列以衍生实际的 WEP 密钥。"
-#: ../clients/common/settings-docs.c.in:38
+#: ../clients/common/settings-docs.h.in:38
msgid ""
"Index 0 WEP key. This is the WEP key used in most networks. See the \"wep-"
"key-type\" property for a description of how this key is interpreted."
msgstr ""
+"索引 0 WEP 密钥。这个是在大多数网络下使用的 WEP 密钥。参见 \"wep-key-type\" "
+"属性获取解释该密钥的描述。"
-#: ../clients/common/settings-docs.c.in:39
+#: ../clients/common/settings-docs.h.in:39
msgid ""
"Index 1 WEP key. This WEP index is not used by most networks. See the "
"\"wep-key-type\" property for a description of how this key is interpreted."
msgstr ""
+"索引 1 WEP 密钥。此 WEP 索引不在大多数网络下使用。参见 \"wep-key-type\" 属性"
+"获取解释该密钥的描述。"
-#: ../clients/common/settings-docs.c.in:40
+#: ../clients/common/settings-docs.h.in:40
msgid ""
"Index 2 WEP key. This WEP index is not used by most networks. See the "
"\"wep-key-type\" property for a description of how this key is interpreted."
msgstr ""
+"索引 2 WEP 密钥。此 WEP 索引不在大多数网络下使用。参见 \"wep-key-type\" 属性"
+"获取解释该密钥的描述。"
-#: ../clients/common/settings-docs.c.in:41
+#: ../clients/common/settings-docs.h.in:41
msgid ""
"Index 3 WEP key. This WEP index is not used by most networks. See the "
"\"wep-key-type\" property for a description of how this key is interpreted."
msgstr ""
+"索引 3 WEP 密钥。此 WEP 索引不在大多数网络下使用。参见 \"wep-key-type\" 属性"
+"获取解释该密钥的描述。"
-#: ../clients/common/settings-docs.c.in:42
+#: ../clients/common/settings-docs.h.in:42
msgid ""
"When static WEP is used (ie, key-mgmt = \"none\") and a non-default WEP key "
"index is used by the AP, put that WEP key index here. Valid values are 0 "
"(default key) through 3. Note that some consumer access points (like the "
"Linksys WRT54G) number the keys 1 - 4."
msgstr ""
+"当使用静态 WEP 时(例如 key-mgmt = \"none\")并且接入点使用非默认的 WEP 密钥"
+"索引,在这里设置该 WEP 密钥索引。有效值从 0(默认密钥)到 3。注意有些用户接入"
+"点(如 Linksys WRT54G)编号密钥为 1~4。"
-#: ../clients/common/settings-docs.c.in:43
+#: ../clients/common/settings-docs.h.in:43
msgid ""
"Flags indicating which mode of WPS is to be used if any. There's little "
"point in changing the default setting as NetworkManager will automatically "
@@ -5915,28 +6401,36 @@ msgid ""
"Point capabilities. WPS can be disabled by setting this property to a value "
"of 1."
msgstr ""
+"指示使用哪种 WPS 模式(如果可用)的标志。由于网络管理器(NetworkManager)会自"
+"动从接入点功能确定启动 WPS 注册是否可行,因此改变默认设置几乎没有意义。可以通"
+"过设置此属性值为 1 来禁用 WPS。"
-#: ../clients/common/settings-docs.c.in:44
+#: ../clients/common/settings-docs.h.in:44
msgid ""
"List of strings to be matched against the altSubjectName of the certificate "
"presented by the authentication server. If the list is empty, no "
"verification of the server certificate's altSubjectName is performed."
msgstr ""
+"字符串列表,将与验证服务器所提供证书里的 altSubjectName 匹配。如果列表为空,"
+"不执行服务器证书的 altSubjectName 验证。"
-#: ../clients/common/settings-docs.c.in:45
+#: ../clients/common/settings-docs.h.in:45
msgid ""
"Anonymous identity string for EAP authentication methods. Used as the "
"unencrypted identity with EAP types that support different tunneled identity "
"like EAP-TTLS."
msgstr ""
+"用于 EAP 验证方法的匿名标识字符串。用作支持不同隧道标识如 EAP-TTLS 的 EAP 类"
+"型的未加密标识。"
-#: ../clients/common/settings-docs.c.in:46
+#: ../clients/common/settings-docs.h.in:46
msgid ""
"A timeout for the authentication. Zero means the global default; if the "
"global default is not set, the authentication timeout is 25 seconds."
msgstr ""
+"身份验证的超时时间。零代表全局默认;如果全局默认未设定,验证超时为 25 秒。"
-#: ../clients/common/settings-docs.c.in:47
+#: ../clients/common/settings-docs.h.in:47
msgid ""
"Contains the CA certificate if used by the EAP method specified in the \"eap"
"\" property. Certificate data is specified using a \"scheme\"; two are "
@@ -5948,26 +6442,36 @@ msgid ""
"property can be unset even if the EAP method supports CA certificates, but "
"this allows man-in-the-middle attacks and is NOT recommended."
msgstr ""
+"包含 \"eap\" 属性指定的 EAP 方法所使用的 CA 证书,如果其使用了。证书数据用 "
+"\"scheme\" 指定;当前支持两种方案:比特块(blob)和路径。当使用比特块方案"
+"(与 NM 0.7.x 后向兼容)时,此属性应设定为证书的 DER 编码数据。当使用路径方案"
+"时,此属性应设定为证书的完整 UTF-8 编码路径,以字符串 \"file://\" 为前缀并以"
+"终止 NUL 字节结束。此属性可不设定,即使 EAP 方法支持 CA 证书,但这将允许中间"
+"人攻击因此不推荐。"
-#: ../clients/common/settings-docs.c.in:48
+#: ../clients/common/settings-docs.h.in:48
msgid ""
"The password used to access the CA certificate stored in \"ca-cert\" "
"property. Only makes sense if the certificate is stored on a PKCS#11 token "
"that requires a login."
msgstr ""
+"用于访问 \"ca-cert\" 存储的 CA 证书的密码。只在 PKCS#11 令牌里存储的证书需要"
+"登录时有意义。"
-#: ../clients/common/settings-docs.c.in:49
+#: ../clients/common/settings-docs.h.in:49
msgid "Flags indicating how to handle the \"ca-cert-password\" property."
-msgstr ""
+msgstr "指示如何处理 \"ca-cert-password\" 属性的标志。"
-#: ../clients/common/settings-docs.c.in:50
+#: ../clients/common/settings-docs.h.in:50
msgid ""
"UTF-8 encoded path to a directory containing PEM or DER formatted "
"certificates to be added to the verification chain in addition to the "
"certificate specified in the \"ca-cert\" property."
msgstr ""
+"指向包含 PEM 或 DER 格式化证书目录的 UTF-8 编码路径,该证书将同 \"ca-cert\" "
+"属性里的指定证书一起添加到验证链。"
-#: ../clients/common/settings-docs.c.in:51
+#: ../clients/common/settings-docs.h.in:51
msgid ""
"Contains the client certificate if used by the EAP method specified in the "
"\"eap\" property. Certificate data is specified using a \"scheme\"; two are "
@@ -5977,19 +6481,26 @@ msgid ""
"should be set to the full UTF-8 encoded path of the certificate, prefixed "
"with the string \"file://\" and ending with a terminating NUL byte."
msgstr ""
+"包含 \"eap\" 属性指定的 EAP 方法所使用的客户端证书,如果其使用了。证书数据用 "
+"\"scheme\" 指定;当前支持两种方案:比特块(blob)和路径。当使用比特块方案"
+"(与 NM 0.7.x 后向兼容)时,此属性应设定为证书的 DER 编码数据。当使用路径方案"
+"时,此属性应设定为证书的完整 UTF-8 编码路径,以字符串 \"file://\" 为前缀并以"
+"终止 NUL 字节结束。"
-#: ../clients/common/settings-docs.c.in:52
+#: ../clients/common/settings-docs.h.in:52
msgid ""
"The password used to access the client certificate stored in \"client-cert\" "
"property. Only makes sense if the certificate is stored on a PKCS#11 token "
"that requires a login."
msgstr ""
+"用于访问 \"client-cert\" 属性里存储的客户端证书的密码。只在 PKCS#11 令牌里存"
+"储的证书需要登录时有意义。"
-#: ../clients/common/settings-docs.c.in:53
+#: ../clients/common/settings-docs.h.in:53
msgid "Flags indicating how to handle the \"client-cert-password\" property."
-msgstr ""
+msgstr "指示如何处理 \"client-cert-password\" 属性的标志。"
-#: ../clients/common/settings-docs.c.in:54
+#: ../clients/common/settings-docs.h.in:54
msgid ""
"Constraint for server domain name. If set, this FQDN is used as a suffix "
"match requirement for dNSName element(s) of the certificate presented by the "
@@ -5997,8 +6508,11 @@ msgid ""
"met. If no dNSName values are present, this constraint is matched against "
"SubjectName CN using same suffix match comparison."
msgstr ""
+"服务器域名的约束。如果设定,此其 FQDN 用作后缀以匹配验证服务器所提供证书的 "
+"dNSName 元素需求。如果找到了匹配的 dNSName,此约束被满足。如果未提供 dNSName "
+"值,此约束用来匹配使用同个后缀匹配对比的 SubjectName CN。"
-#: ../clients/common/settings-docs.c.in:55
+#: ../clients/common/settings-docs.h.in:55
msgid ""
"The allowed EAP method to be used when authenticating to the network with "
"802.1x. Valid methods are: \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", "
@@ -6006,45 +6520,53 @@ msgid ""
"the properties of this setting; refer to wpa_supplicant documentation for "
"the allowed combinations."
msgstr ""
+"当验证到 802.1x 网络时,所允许使用的 EAP 方法。有效方法有:\"leap"
+"\"、\"md5\"、\"tls\"、\"peap\"、\"ttls\"、\"pwd\" 和 \"fast\"。每种方法需要使"
+"用此设置属性的不同配置;请参考 wpa_supplicant 文档以获取允许的组合。"
-#: ../clients/common/settings-docs.c.in:56
+#: ../clients/common/settings-docs.h.in:56
msgid ""
"Identity string for EAP authentication methods. Often the user's user or "
"login name."
-msgstr ""
+msgstr "用于 EAP 验证方法的标识字符串。通常是用户的用户名或登录名。"
-#: ../clients/common/settings-docs.c.in:58
+#: ../clients/common/settings-docs.h.in:57
msgid "UTF-8 encoded file path containing PAC for EAP-FAST."
-msgstr ""
+msgstr "UTF-8 编码的文件路径,包含用于 EAP-FAST 的 PAC。"
-#: ../clients/common/settings-docs.c.in:59
+#: ../clients/common/settings-docs.h.in:58
msgid ""
"UTF-8 encoded password used for EAP authentication methods. If both the "
"\"password\" property and the \"password-raw\" property are specified, "
"\"password\" is preferred."
msgstr ""
+"用于 EAP 验证方法的 UTF-8 编码密码。如果 \"password\" 属性和 \"password-raw"
+"\" 属性都指定了,首选 \"password\"。"
-#: ../clients/common/settings-docs.c.in:60
-#: ../clients/common/settings-docs.c.in:107
-#: ../clients/common/settings-docs.c.in:135
-#: ../clients/common/settings-docs.c.in:184
-#: ../clients/common/settings-docs.c.in:304
+#: ../clients/common/settings-docs.h.in:59
+#: ../clients/common/settings-docs.h.in:104
+#: ../clients/common/settings-docs.h.in:127
+#: ../clients/common/settings-docs.h.in:173
+#: ../clients/common/settings-docs.h.in:285
msgid "Flags indicating how to handle the \"password\" property."
-msgstr ""
+msgstr "指示如何处理 \"password\" 属性的标志。"
-#: ../clients/common/settings-docs.c.in:61
+#: ../clients/common/settings-docs.h.in:60
msgid ""
"Password used for EAP authentication methods, given as a byte array to allow "
"passwords in other encodings than UTF-8 to be used. If both the \"password\" "
"property and the \"password-raw\" property are specified, \"password\" is "
"preferred."
msgstr ""
+"用于 EAP 验证方法的密码,以字节数组给定以允许其他不是 UTF-8 编码的密码能够使"
+"用。如果 \"password\" 属性和 \"password-raw\" 属性都指定了,首选 \"password"
+"\"。"
-#: ../clients/common/settings-docs.c.in:62
+#: ../clients/common/settings-docs.h.in:61
msgid "Flags indicating how to handle the \"password-raw\" property."
-msgstr ""
+msgstr "指示如何处理 \"password-raw\" 属性的标志。"
-#: ../clients/common/settings-docs.c.in:63
+#: ../clients/common/settings-docs.h.in:62
msgid ""
"Specifies authentication flags to use in \"phase 1\" outer authentication "
"using NMSetting8021xAuthFlags options. The individual TLS versions can be "
@@ -6053,8 +6575,12 @@ msgid ""
"tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more "
"details."
msgstr ""
+"指定 NMSetting8021xAuthFlags 选项使用的 \"phase 1\" 外部验证所要用的验证标"
+"识。可以明确地禁用个别 TLS 版本。如果未设定确切的 TLS 禁用标识,将由请求方决"
+"定允许还是禁止它。TLS 选项映射到 tls_disable_tlsv1_x 设置。详情请见 "
+"wpa_supplicant 文档。"
-#: ../clients/common/settings-docs.c.in:64
+#: ../clients/common/settings-docs.h.in:63
msgid ""
"Enables or disables in-line provisioning of EAP-FAST credentials when FAST "
"is specified as the EAP method in the \"eap\" property. Recognized values "
@@ -6063,16 +6589,22 @@ msgid ""
"authenticated and unauthenticated provisioning). See the wpa_supplicant "
"documentation for more details."
msgstr ""
+"当 \"eap\" 属性里的 EAP 方法指定为 FAST 时,启用或禁用 EAP-FAST 凭据的行内设"
+"置。可识别的值有 \"0\"(禁用)、\"1\"(允许未验证的设置)、\"2\"(允许验证的"
+"设置)和 \"3\"(验证和未验证的设置都允许)。详情请见 wpa_supplicant 文档。"
-#: ../clients/common/settings-docs.c.in:65
+#: ../clients/common/settings-docs.h.in:64
msgid ""
"Forces use of the new PEAP label during key derivation. Some RADIUS servers "
"may require forcing the new PEAP label to interoperate with PEAPv1. Set to "
"\"1\" to force use of the new PEAP label. See the wpa_supplicant "
"documentation for more details."
msgstr ""
+"强制在衍生密钥时使用新的 PEAP 标签。有些 RADIUS 服务器可能需要强制使用新的 "
+"PEAP 标签以与 PEAPv1 互操作。设为 \"1\" 以强制使用新的 PEAP 标签。详情请见 "
+"wpa_supplicant 文档。"
-#: ../clients/common/settings-docs.c.in:66
+#: ../clients/common/settings-docs.h.in:65
msgid ""
"Forces which PEAP version is used when PEAP is set as the EAP method in the "
"\"eap\" property. When unset, the version reported by the server will be "
@@ -6080,16 +6612,22 @@ msgid ""
"the client to use a particular PEAP version. To do so, this property may be "
"set to \"0\" or \"1\" to force that specific PEAP version."
msgstr ""
+"当 \"eap\" 属性里的 EAP 方法指定为 PEAP 时,强制所使用的 PEAP 版本。未设定"
+"时,将使用服务器报告的版本。有时使用旧的 RADIUS 服务器时,强制客户端使用特定"
+"的 PEAP 版本时必须的。要这么做,此属性可以设为 \"0\" 或 \"1\" 以强制所指定的 "
+"PEAP 版本。"
-#: ../clients/common/settings-docs.c.in:67
+#: ../clients/common/settings-docs.h.in:66
msgid ""
"List of strings to be matched against the altSubjectName of the certificate "
"presented by the authentication server during the inner \"phase 2\" "
"authentication. If the list is empty, no verification of the server "
"certificate's altSubjectName is performed."
msgstr ""
+"字符串列表,在 \"phase 2\" 验证期间将与验证服务器所提供证书里的 "
+"altSubjectName 匹配。如果列表为空,不执行服务器证书的 altSubjectName 验证。"
-#: ../clients/common/settings-docs.c.in:68
+#: ../clients/common/settings-docs.h.in:67
msgid ""
"Specifies the allowed \"phase 2\" inner non-EAP authentication methods when "
"an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -6098,8 +6636,12 @@ msgid ""
"\"phase 2\" inner method requires specific parameters for successful "
"authentication; see the wpa_supplicant documentation for more details."
msgstr ""
+"当 \"eap\" 属性指定了使用内部 TLS 隧道的 EAP 方法时,指定其允许的 \"phase "
+"2\" 内部非 EAP 验证方法。可识别的非 EAP \"phase 2\" 方法有 \"pap\"、\"chap"
+"\"、\"mschap\"、\"mschapv2\"、\"gtc\"、\"otp\"、\"md5\" 和 \"tls\"。要成功验"
+"证,每个 \"phase 2\" 内部方法都需要特定的参数;详情请见 wpa_supplicant 文档。"
-#: ../clients/common/settings-docs.c.in:69
+#: ../clients/common/settings-docs.h.in:68
msgid ""
"Specifies the allowed \"phase 2\" inner EAP-based authentication methods "
"when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -6108,8 +6650,12 @@ msgid ""
"requires specific parameters for successful authentication; see the "
"wpa_supplicant documentation for more details."
msgstr ""
+"当 \"eap\" 属性指定了使用内部 TLS 隧道的 EAP 方法时,指定其允许的 \"phase "
+"2\" 内部基于 EAP 的验证方法。可识别的基于 EAP 的 \"phase 2\" 方法有 \"md5\", "
+"\"mschapv2\", \"otp\", \"gtc\", and \"tls\"。要成功验证,每个 \"phase 2\" 内"
+"部方法都需要特定的参数;详情请见 wpa_supplicant 文档。"
-#: ../clients/common/settings-docs.c.in:70
+#: ../clients/common/settings-docs.h.in:69
msgid ""
"Contains the \"phase 2\" CA certificate if used by the EAP method specified "
"in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is "
@@ -6122,27 +6668,37 @@ msgid ""
"method supports CA certificates, but this allows man-in-the-middle attacks "
"and is NOT recommended."
msgstr ""
+"包含 \"phase2-auth\" 或 \"phase2-autheap\" 属性指定的 EAP 方法所使用的 "
+"\"phase 2\" CA 证书,如果其使用了。证书数据用 \"scheme\" 指定;当前支持两种方"
+"案:比特块(blob)和路径。当使用比特块方案(与 NM 0.7.x 后向兼容)时,此属性"
+"应设定为证书的 DER 编码数据。当使用路径方案时,此属性应设定为证书的完整 "
+"UTF-8 编码路径,以字符串 \"file://\" 为前缀并以终止 NUL 字节结束。此属性可不"
+"设定,即使 EAP 方法支持 CA 证书,但这将允许中间人攻击因此不推荐。"
-#: ../clients/common/settings-docs.c.in:71
+#: ../clients/common/settings-docs.h.in:70
msgid ""
"The password used to access the \"phase2\" CA certificate stored in \"phase2-"
"ca-cert\" property. Only makes sense if the certificate is stored on a "
"PKCS#11 token that requires a login."
msgstr ""
+"用于访问 \"phase2-ca-cert\" 属性里存储的 \"phase2\" CA 证书的密码。只在 "
+"PKCS#11 令牌里存储的证书需要登录时有意义。"
-#: ../clients/common/settings-docs.c.in:72
+#: ../clients/common/settings-docs.h.in:71
msgid ""
"Flags indicating how to handle the \"phase2-ca-cert-password\" property."
-msgstr ""
+msgstr "指示如何处理 \"phase2-ca-cert-password\" 属性的标志。"
-#: ../clients/common/settings-docs.c.in:73
+#: ../clients/common/settings-docs.h.in:72
msgid ""
"UTF-8 encoded path to a directory containing PEM or DER formatted "
"certificates to be added to the verification chain in addition to the "
"certificate specified in the \"phase2-ca-cert\" property."
msgstr ""
+"指向包含 PEM 或 DER 格式化证书目录的 UTF-8 编码路径,该证书将同 \"phase2-ca-"
+"cert\" 属性里的指定证书一起添加到验证链。"
-#: ../clients/common/settings-docs.c.in:74
+#: ../clients/common/settings-docs.h.in:73
msgid ""
"Contains the \"phase 2\" client certificate if used by the EAP method "
"specified in the \"phase2-auth\" or \"phase2-autheap\" properties. "
@@ -6155,20 +6711,28 @@ msgid ""
"unset even if the EAP method supports CA certificates, but this allows man-"
"in-the-middle attacks and is NOT recommended."
msgstr ""
+"包含 \"phase2-auth\" 或 \"phase2-autheap\" 属性指定的 EAP 方法所使用的 "
+"\"phase 2\" 客户端证书,如果其使用了。证书数据用 \"scheme\" 指定;当前支持两"
+"种方案:比特块(blob)和路径。当使用比特块方案(与 NM 0.7.x 后向兼容)时,此"
+"属性应设定为证书的 DER 编码数据。当使用路径方案时,此属性应设定为证书的完整 "
+"UTF-8 编码路径,以字符串 \"file://\" 为前缀并以终止 NUL 字节结束。此属性可不"
+"设定,即使 EAP 方法支持 CA 证书,但这将允许中间人攻击因此不推荐。"
-#: ../clients/common/settings-docs.c.in:75
+#: ../clients/common/settings-docs.h.in:74
msgid ""
"The password used to access the \"phase2\" client certificate stored in "
"\"phase2-client-cert\" property. Only makes sense if the certificate is "
"stored on a PKCS#11 token that requires a login."
msgstr ""
+"用于访问 \"phase2-client-cert\" 属性里存储的 \"phase2\" 客户端证书的密码。只"
+"在 PKCS#11 令牌里存储的证书需要登录时有意义。"
-#: ../clients/common/settings-docs.c.in:76
+#: ../clients/common/settings-docs.h.in:75
msgid ""
"Flags indicating how to handle the \"phase2-client-cert-password\" property."
-msgstr ""
+msgstr "指示如何处理 \"phase2-client-cert-password\" 属性的标志。"
-#: ../clients/common/settings-docs.c.in:77
+#: ../clients/common/settings-docs.h.in:76
msgid ""
"Constraint for server domain name. If set, this FQDN is used as a suffix "
"match requirement for dNSName element(s) of the certificate presented by the "
@@ -6177,8 +6741,12 @@ msgid ""
"present, this constraint is matched against SubjectName CN using same suffix "
"match comparison."
msgstr ""
+"服务器域名的约束。如果设定,在内部 \"phase 2\" 验证期间,此 FQDN 用作后缀以匹"
+"配验证服务器所提供证书的 dNSName 元素需求。如果找到了匹配的 dNSName,此约束被"
+"满足。如果未提供 dNSName 值,此约束用来匹配使用同个后缀匹配对比的 "
+"SubjectName CN。"
-#: ../clients/common/settings-docs.c.in:78
+#: ../clients/common/settings-docs.h.in:77
msgid ""
"Contains the \"phase 2\" inner private key when the \"phase2-auth\" or "
"\"phase2-autheap\" property is set to \"tls\". Key data is specified using a "
@@ -6196,20 +6764,32 @@ msgid ""
"\"phase2-private-key-password\" property must be set to the password used to "
"decode the PKCS#12 private key and certificate."
msgstr ""
+"包含如果 \"phase2-auth\" 或 \"phase2-autheap\" 属性设为 \"tls\" 时的 \"phase "
+"2\" 内部私钥。密钥数据用 \"scheme\" 指定;当前支持两种方案:比特块(blob)和"
+"路径。当使用比特块方案时,此属性应设定为私钥加密过的 PEM 编码数据。当使用路径"
+"方案时,此属性应设定为私钥的完整 UTF-8 编码路径,以字符串 \"file://\" 为前缀"
+"并以终止 NUL 字节结束。当使用 PKCS#12 格式私钥和比特块方案时,此属性应设为 "
+"PKCS#12 数据且 \"phase2-private-key-password\" 属性必须设为用于解密 PKCS#12 "
+"证书和私钥的密码。当使用 PKCS#12 文件和路径方案时,此属性应设为私钥的完整 "
+"UTF-8 编码路径,以字符串 \"file://\" 为前缀并以终止 NUL 字节结束;而与 blob "
+"方案同用时,\"phase2-private-key-password\" 属性必须设为用于解码 PKCS#12 私钥"
+"和证书的密码。"
-#: ../clients/common/settings-docs.c.in:79
+#: ../clients/common/settings-docs.h.in:78
msgid ""
"The password used to decrypt the \"phase 2\" private key specified in the "
"\"phase2-private-key\" property when the private key either uses the path "
"scheme, or is a PKCS#12 format key."
msgstr ""
+"当私钥使用路径方案或为 PKCS#12 格式时,解密 \"phase2-private-key\" 属性指定"
+"的 \"phase 2\" 私钥所使用的密码。"
-#: ../clients/common/settings-docs.c.in:80
+#: ../clients/common/settings-docs.h.in:79
msgid ""
"Flags indicating how to handle the \"phase2-private-key-password\" property."
-msgstr ""
+msgstr "指示如何处理 \"phase2-private-key-password\" 属性的标志。"
-#: ../clients/common/settings-docs.c.in:81
+#: ../clients/common/settings-docs.h.in:80
msgid ""
"Substring to be matched against the subject of the certificate presented by "
"the authentication server during the inner \"phase 2\" authentication. When "
@@ -6217,17 +6797,20 @@ msgid ""
"performed. This property provides little security, if any, and its use is "
"deprecated in favor of NMSetting8021x:phase2-domain-suffix-match."
msgstr ""
+"主题字符串,在 \"phase 2\" 验证期间将与验证服务器所提供证书的主题匹配。如果未"
+"设,不执行服务器证书的主题验证。就算设定了此属性也提供不了多少安全性,而且它"
+"的使用已废弃,取代的是 NMSetting8021x:phase2-domain-suffix-match。"
-#: ../clients/common/settings-docs.c.in:82
+#: ../clients/common/settings-docs.h.in:81
msgid "PIN used for EAP authentication methods."
-msgstr ""
+msgstr "用于 EAP 验证方法的 PIN。"
-#: ../clients/common/settings-docs.c.in:83
-#: ../clients/common/settings-docs.c.in:186
+#: ../clients/common/settings-docs.h.in:82
+#: ../clients/common/settings-docs.h.in:175
msgid "Flags indicating how to handle the \"pin\" property."
-msgstr ""
+msgstr "指示如何处理 \"pin\" 属性的标志。"
-#: ../clients/common/settings-docs.c.in:84
+#: ../clients/common/settings-docs.h.in:83
msgid ""
"Contains the private key when the \"eap\" property is set to \"tls\". Key "
"data is specified using a \"scheme\"; two are currently supported: blob and "
@@ -6248,19 +6831,32 @@ msgid ""
"users. Private keys should always be encrypted with a private key password "
"to prevent unauthorized access to unencrypted private key data."
msgstr ""
+"包含如果 \"eap\" 属性设为 \"tls\" 时的私钥。私钥数据用 \"scheme\" 指定;当前"
+"支持两种方案:比特块(blob)和路径。当使用比特块方案时,此属性应设为私钥加密"
+"过的 PEM 编码数据。当使用路径方案时,此属性应设定为私钥的完整 UTF-8 编码路"
+"径,以字符串 \"file://\" 为前缀并以终止 NUL 字节结束。当使用 PKCS#12 格式私钥"
+"和比特块方案时,此属性应设为 PKCS#12 数据且 \"private-key-password\" 属性必须"
+"设为用于解密 PKCS#12 证书和私钥的密码。当使用 PKCS#12 文件和路径方案时,此属"
+"性应设为私钥的完整 UTF-8 编码路径,以字符串 \"file://\" 为前缀并以终止 NUL 字"
+"节结束;而与比特块方案同用时,\"private-key-password\" 属性必须设为用于解码 "
+"PKCS#12 私钥和证书的密码。警告:\"private-key\" 不是 \"secret\" 属性,因此使"
+"用比特块方案时未加密的私钥数据可能会被非特权用户读取。私钥总是应该用私钥密码"
+"加密以阻止对未加密私钥数据的未授权访问。"
-#: ../clients/common/settings-docs.c.in:85
+#: ../clients/common/settings-docs.h.in:84
msgid ""
"The password used to decrypt the private key specified in the \"private-key"
"\" property when the private key either uses the path scheme, or if the "
"private key is a PKCS#12 format key."
msgstr ""
+"当私钥使用路径方案或为 PKCS#12 格式时,解密 \"private-key\" 属性指定私钥所使"
+"用的密码。"
-#: ../clients/common/settings-docs.c.in:86
+#: ../clients/common/settings-docs.h.in:85
msgid "Flags indicating how to handle the \"private-key-password\" property."
-msgstr ""
+msgstr "指示如何处理 \"private-key-password\" 属性的标志。"
-#: ../clients/common/settings-docs.c.in:87
+#: ../clients/common/settings-docs.h.in:86
msgid ""
"Substring to be matched against the subject of the certificate presented by "
"the authentication server. When unset, no verification of the authentication "
@@ -6268,8 +6864,11 @@ msgid ""
"security, if any, and its use is deprecated in favor of NMSetting8021x:"
"domain-suffix-match."
msgstr ""
+"主题字符串,将与验证服务器所提供证书的主题匹配。如果未设,不执行服务器证书的"
+"主题验证。就算设定了此属性也提供不了多少安全性,而且它的使用已废弃,取代的是 "
+"NMSetting8021x:domain-suffix-match。"
-#: ../clients/common/settings-docs.c.in:88
+#: ../clients/common/settings-docs.h.in:87
msgid ""
"When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using "
"the system CA directory specified at configure time with the --system-ca-"
@@ -6280,15 +6879,28 @@ msgid ""
"\"ca-cert\" and \"phase2-ca-cert\" properties instead (sets ca_cert/ca_cert2 "
"options for wpa_supplicant)."
msgstr ""
+"设为 TRUE 时,覆盖掉 \"ca-path\" 和 \"phase2-ca-path\" 属性,换成使用配置时 "
+"--system-ca-path 指定的系统 CA 目录。该目录中的证书同 \"ca-cert\" 和 "
+"\"phase2-ca-cert\" 属性指定的任何证书一起加入到验证链。如果以 --system-ca-"
+"path 提供的路径不是文件名(捆绑或受信任 CA 证书),它会变成覆盖 \"ca-cert\" "
+"和 \"phase2-ca-cert\" 属性(为 wpa_supplicant 设定 ca_cert/ca_cert2 选项)。"
-#: ../clients/common/settings-docs.c.in:89
+#: ../clients/common/settings-docs.h.in:88
msgid ""
-"If TRUE, enforce auto-negotiation of port speed and duplex mode. If FALSE, "
-"\"speed\" and \"duplex\" properties should be both set or link configuration "
-"will be skipped."
+"When TRUE, enforce auto-negotiation of speed and duplex mode. If \"speed\" "
+"and \"duplex\" properties are both specified, only that single mode will be "
+"advertised and accepted during the link auto-negotiation process: this works "
+"only for BASE-T 802.3 specifications and is useful for enforcing gigabits "
+"modes, as in these cases link negotiation is mandatory. When FALSE, \"speed"
+"\" and \"duplex\" properties should be both set or link configuration will "
+"be skipped."
msgstr ""
+"为 TRUE 时,强制速度和双工模式的自动协商。如果 \"speed\" 和 \"duplex\" 属性都"
+"指定了,只有那一个模式会在链路自动协商过程中被通告和接受:这只对 BASE-T "
+"802.3 规范有效并用于强制吉比特模式,因为在这些情况下链路协商时强制性的。为 "
+"FALSE 时,\"speed\" 和 \"duplex\" 属性应该都设置,否则链路配置将被忽略。"
-#: ../clients/common/settings-docs.c.in:90
+#: ../clients/common/settings-docs.h.in:89
msgid ""
"If specified, request that the device use this MAC address instead. This is "
"known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
@@ -6304,52 +6916,87 @@ msgid ""
"D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated "
"\"cloned-mac-address\"."
msgstr ""
-
-#: ../clients/common/settings-docs.c.in:91
-msgid ""
-"Can be specified only when \"auto-negotiate\" is \"off\". In that case, "
-"statically configures the device to use that specified duplex mode, either "
-"\"half\" or \"full\". Must be set together with the \"speed\" property if "
-"specified. Before specifying a duplex mode be sure your device supports it."
-msgstr ""
-
-#: ../clients/common/settings-docs.c.in:93
+"如果指定了,则请求设备改成使用此 MAC 地址。这被称为 MAC 克隆或欺骗。除了明确"
+"地指定个 MAC 地址,也支持特殊值 \"preserve\"、\"permanent\"、\"random\" 和 "
+"\"stable\"。\"preserve\" 表示激活时不动 MAC 地址。\"permanent\" 表示如果设备"
+"有永久硬件地址则使用(否则视为 \"preserve\")。\"random\" 会在每次连接时创建"
+"个随机的 MAC 地址。\"stable\" 根据 connection.stable-id 和机器相关的密钥创建"
+"个散列的 MAC 地址。如果未指定,其值可被全局默认值覆盖,参阅 NetworkManager."
+"conf 手册。如仍未指定,它将默认为 \"preserve\"(旧版 NetworkManager 可能使用"
+"不同的默认值)。在 D-Bus 上,此字段表示为 \"assigned-mac-address\" 或已弃用"
+"的 \"cloned-mac-address\"。"
+
+#: ../clients/common/settings-docs.h.in:90
+msgid ""
+"When a value is set, either \"half\" or \"full\", configures the device to "
+"use the specified duplex mode. If \"auto-negotiate\" is \"yes\" the "
+"specified duplex mode will be the only one advertised during link "
+"negotiation: this works only for BASE-T 802.3 specifications and is useful "
+"for enforcing gigabits modes, as in these cases link negotiation is "
+"mandatory. If the value is unset (the default), the link configuration will "
+"be either skipped (if \"auto-negotiate\" is \"no\", the default) or will be "
+"auto-negotiated (if \"auto-negotiate\" is \"yes\") and the local device will "
+"advertise all the supported duplex modes. Must be set together with the "
+"\"speed\" property if specified. Before specifying a duplex mode be sure "
+"your device supports it."
+msgstr ""
+"设定值时,\"half\" 和 \"full\" 二选一,配置设备要使用的指定双工模式。如果 "
+"\"auto-negotiate\" 为 \"yes\",只有指定的模式会在链路自动协商过程中被通告:这"
+"只对 BASE-T 802.3 规范有效并用于强制吉比特模式,因为在这些情况下链路协商时强"
+"制性的。如果值未设定(默认值),链路配置要么将被忽略(如果 \"auto-negotiate"
+"\" 为 \"no\",默认值)要么将被自动协商(如果 \"auto-negotiate\" 为 \"yes"
+"\"),并且本地设备将通告所有支持的双工模式。如果指定,必须与 \"speed\" 属性一"
+"块设定。在指定双工模式前请确保您的设备支持。"
+
+#: ../clients/common/settings-docs.h.in:92
msgid ""
"If specified, this connection will only apply to the Ethernet device whose "
"permanent MAC address matches. This property does not change the MAC address "
"of the device (i.e. MAC spoofing)."
msgstr ""
+"如果指定了,此连接将只应用到其永久 MAC 地址匹配的以太网设备。此属性不会改变设"
+"备的 MAC 地址(例如 MAC 欺骗)。"
-#: ../clients/common/settings-docs.c.in:94
+#: ../clients/common/settings-docs.h.in:93
msgid ""
"If specified, this connection will never apply to the Ethernet device whose "
"permanent MAC address matches an address in the list. Each MAC address is "
"in the standard hex-digits-and-colons notation (00:11:22:33:44:55)."
msgstr ""
+"如果指定了,此连接将从不应用到其永久 MAC 地址与列表里的地址匹配的以太网设备。"
+"每个 MAC 地址采用标准的十六进制数字和冒号标记(00:11:22:33:44:55)。"
-#: ../clients/common/settings-docs.c.in:97
+#: ../clients/common/settings-docs.h.in:95
msgid ""
"Specific port type to use if the device supports multiple attachment "
"methods. One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), "
"\"bnc\" (Thin Ethernet) or \"mii\" (Media Independent Interface). If the "
"device supports only one port type, this setting is ignored."
msgstr ""
+"如果设备支持多个连接方法,指定其使用的端口类型。\"tp\"(双绞线)、\"aui\"(连"
+"接单元接口)、\"bnc\"(细以太网)或 \"mii\"(介质无关接口)之一。如果设备只支"
+"持一个端口类型,忽略此设置。"
-#: ../clients/common/settings-docs.c.in:98
+#: ../clients/common/settings-docs.h.in:96
msgid ""
"s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing "
"the different types of virtual network devices available on s390 systems."
msgstr ""
+"s390 网络设备类型;\"qeth\"、\"lcs\" 或 \"ctc\" 之一,代表 s390 系统上可用的"
+"不同虚拟网络设备。"
-#: ../clients/common/settings-docs.c.in:99
+#: ../clients/common/settings-docs.h.in:97
msgid ""
"Dictionary of key/value pairs of s390-specific device options. Both keys "
"and values must be strings. Allowed keys include \"portno\", \"layer2\", "
"\"portname\", \"protocol\", among others. Key names must contain only "
"alphanumeric characters (ie, [a-zA-Z0-9])."
msgstr ""
+"s390 特定设备的键值对字典。键和值都必须为字符串。允许的值包括 \"portno"
+"\"、\"layer2\"、\"portname\"、\"protocol\" 等等。键名必须只能包含字母数字字符"
+"(例如 [a-zA-Z0-9])。"
-#: ../clients/common/settings-docs.c.in:100
+#: ../clients/common/settings-docs.h.in:98
msgid ""
"Identifies specific subchannels that this network device uses for "
"communication with z/VM or s390 host. Like the \"mac-address\" property for "
@@ -6358,17 +7005,34 @@ msgid ""
"contain exactly 3 strings, and each string may only be composed of "
"hexadecimal characters and the period (.) character."
msgstr ""
-
-#: ../clients/common/settings-docs.c.in:101
-msgid ""
-"Can be set to a value greater than zero only when \"auto-negotiate\" is \"off"
-"\". In that case, statically configures the device to use that specified "
-"speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex"
-"\" property when non-zero. Before specifying a speed value be sure your "
-"device supports it."
-msgstr ""
-
-#: ../clients/common/settings-docs.c.in:102
+"指定此网络设备与 z/VM 或 s390 主机通信使用的子通道的标识符。如 \"mac-address"
+"\" 用于非 z/VM 设备,此属性可用来确保此连接只应用到使用这些子通道的网络设备。"
+"列表应该包含 3 个字符串,且每个字符串只能由十六进制字符和半角句号(.)字符组"
+"成。"
+
+#: ../clients/common/settings-docs.h.in:99
+msgid ""
+"When a value grater than 0 is set, configures the device to use the "
+"specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will "
+"be the only one advertised during link negotiation: this works only for BASE-"
+"T 802.3 specifications and is useful for enforcing gigabit speeds, as in "
+"this case link negotiation is mandatory. If the value is unset (0, the "
+"default), the link configuration will be either skipped (if \"auto-negotiate"
+"\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" "
+"is \"yes\") and the local device will advertise all the supported speeds. In "
+"Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex\" "
+"property when non-zero. Before specifying a speed value be sure your device "
+"supports it."
+msgstr ""
+"当设定为大于 0 的值时,配置此设备使用指定的速度。如果 \"auto-negotiate\" 为 "
+"\"yes\",只有指定的速度会在链路自动协商过程中被通告:这只对 BASE-T 802.3 规范"
+"有效并用于强制吉比特模式,因为在这些情况下链路协商时强制性的。如果值未设定"
+"(0,默认值),链路配置要么将被忽略(如果 \"auto-negotiate\" 为 \"no\",默认"
+"值)要么将被自动协商(如果 \"auto-negotiate\" 为 \"yes\"),并且本地设备将通"
+"告所有支持的双工模式。单位为 Mbit/s,例如 100 == 100Mbit/s。如果非零,必须与 "
+"\"duplex\" 属性一块设定。在指定速度值前请确保您的设备支持。"
+
+#: ../clients/common/settings-docs.h.in:100
msgid ""
"The NMSettingWiredWakeOnLan options to enable. Not all devices support all "
"options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), "
@@ -6380,64 +7044,79 @@ msgid ""
"use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to "
"disable management of Wake-on-LAN in NetworkManager)."
msgstr ""
+"启用 NMSettingWiredWakeOnLan 的选项。并非全部设备都支持所有选项。可以是以下选"
+"项的任意组合:NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2)、"
+"NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4)、"
+"NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8)、"
+"NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10)、"
+"NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20)、NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC "
+"(0x40) 或特殊值 NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1)(使用全局设置)和 "
+"NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000)(在网络管理器(NetworkManager)"
+"里禁用 LAN 唤醒的管理)。"
-#: ../clients/common/settings-docs.c.in:103
+#: ../clients/common/settings-docs.h.in:101
msgid ""
"If specified, the password used with magic-packet-based Wake-on-LAN, "
"represented as an Ethernet MAC address. If NULL, no password will be "
"required."
msgstr ""
+"如果指定了,其为基于幻数据包的 LAN 唤醒所使用的密码,表示为以太网 MAC 地址。"
+"如果为 NULL,将不需要密码。"
-#: ../clients/common/settings-docs.c.in:104
+#: ../clients/common/settings-docs.h.in:102
msgid "Encapsulation of ADSL connection. Can be \"vcmux\" or \"llc\"."
-msgstr ""
+msgstr "ADSL 连接的封装。可以是 \"vcmux\" 或 \"llc\"。"
-#: ../clients/common/settings-docs.c.in:106
+#: ../clients/common/settings-docs.h.in:103
msgid "Password used to authenticate with the ADSL service."
-msgstr ""
+msgstr "用于 ADSL 服务验证的密码。"
-#: ../clients/common/settings-docs.c.in:108
+#: ../clients/common/settings-docs.h.in:105
msgid "ADSL connection protocol. Can be \"pppoa\", \"pppoe\" or \"ipoatm\"."
-msgstr ""
+msgstr "ADSL 连接协议。可为 \"pppoa\"、\"pppoe\" 或 \"ipoatm\"。"
-#: ../clients/common/settings-docs.c.in:109
+#: ../clients/common/settings-docs.h.in:106
msgid "Username used to authenticate with the ADSL service."
-msgstr ""
+msgstr "用于 ADSL 服务验证的用户名。"
-#: ../clients/common/settings-docs.c.in:110
+#: ../clients/common/settings-docs.h.in:107
msgid "VCI of ADSL connection"
-msgstr ""
+msgstr "ADSL 连接的 VCI"
-#: ../clients/common/settings-docs.c.in:111
+#: ../clients/common/settings-docs.h.in:108
msgid "VPI of ADSL connection"
-msgstr ""
+msgstr "ADSL 连接的 VPI"
-#: ../clients/common/settings-docs.c.in:112
+#: ../clients/common/settings-docs.h.in:109
msgid "The Bluetooth address of the device."
-msgstr ""
+msgstr "设备的蓝牙地址。"
-#: ../clients/common/settings-docs.c.in:114
+#: ../clients/common/settings-docs.h.in:110
msgid ""
"Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal "
"Area Networking connections to devices supporting the NAP profile."
msgstr ""
+"拨号网络连接时使用 \"dun\",或者支持 NAP 配置集设备的个人区域网络连接时使用 "
+"\"panu\"。"
-#: ../clients/common/settings-docs.c.in:116
+#: ../clients/common/settings-docs.h.in:111
msgid ""
"Dictionary of key/value pairs of bonding options. Both keys and values must "
"be strings. Option names must contain only alphanumeric characters (ie, [a-"
"zA-Z0-9])."
msgstr ""
+"绑定(bonding)选项的键/值对目录。键和值都必须为字符串。选项名必须只能包含字"
+"母数字字符(示例 [a-zA-Z0-9])。"
-#: ../clients/common/settings-docs.c.in:117
+#: ../clients/common/settings-docs.h.in:112
msgid "The Ethernet MAC address aging time, in seconds."
-msgstr ""
+msgstr "以太网 MAC 地址的老化时间,以秒计。"
-#: ../clients/common/settings-docs.c.in:118
+#: ../clients/common/settings-docs.h.in:113
msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds."
-msgstr ""
+msgstr "生成树协议(STP)转发延迟,以秒计。"
-#: ../clients/common/settings-docs.c.in:119
+#: ../clients/common/settings-docs.h.in:114
msgid ""
"A mask of group addresses to forward. Usually, group addresses in the range "
"from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to "
@@ -6445,12 +7124,16 @@ msgid ""
"address in that range that must be forwarded. The mask can't have bits 0, 1 "
"or 2 set because they are used for STP, MAC pause frames and LACP."
msgstr ""
+"要转发的组地址掩码。通常,范围在 01:80:C2:00:00:00 到 01:80:C2:00:00:0F 内的"
+"组地址根据标准不转发。此属性是个 16 位的掩码,每个对应于一个组地址,组地址范"
+"围内的地址必须被转发。掩码不能设定了位 0、1 或 2,因为它们用于 STP、MAC 暂停"
+"帧和 LACP。"
-#: ../clients/common/settings-docs.c.in:120
+#: ../clients/common/settings-docs.h.in:115
msgid "The Spanning Tree Protocol (STP) hello time, in seconds."
-msgstr ""
+msgstr "生成树协议(STP)呼叫时间,以秒计。"
-#: ../clients/common/settings-docs.c.in:121
+#: ../clients/common/settings-docs.h.in:116
msgid ""
"If specified, the MAC address of bridge. When creating a new bridge, this "
"MAC address will be set. If this field is left unspecified, the \"ethernet."
@@ -6459,100 +7142,123 @@ msgid ""
"the MAC address of the bridge later while activating the bridge. Hence, this "
"property is deprecated. Deprecated: 1"
msgstr ""
+"如果指定了,其为网桥的 MAC 地址。当创建新网桥时,将设定此 MAC 地址。如果不指"
+"定此字段,换成引用 \"ethernet.cloned-mac-address\" 来生成初始 MAC 地址。注意"
+"设置 \"ethernet.cloned-mac-address\" 怎样都会在之后激活网桥时覆盖网桥的 MAC "
+"地址。因此,此属性被弃用。已弃用:1"
-#: ../clients/common/settings-docs.c.in:122
+#: ../clients/common/settings-docs.h.in:117
msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
-msgstr ""
+msgstr "生成树协议(STP)最大消息寿命,以秒计。"
-#: ../clients/common/settings-docs.c.in:123
+#: ../clients/common/settings-docs.h.in:118
msgid ""
"Controls whether IGMP snooping is enabled for this bridge. Note that if "
"snooping was automatically disabled due to hash collisions, the system may "
"refuse to enable the feature until the collisions are resolved."
msgstr ""
+"控制是否为此网桥启用 IGMP 监听。注意如果散列冲突监听会被自动禁用,系统可能拒"
+"绝启用该功能直到冲突解决。"
-#: ../clients/common/settings-docs.c.in:125
+#: ../clients/common/settings-docs.h.in:119
msgid ""
"Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower "
"values are \"better\"; the lowest priority bridge will be elected the root "
"bridge."
msgstr ""
+"设定此网桥的生成树协议(STP)优先级。值越小优先级越高;最高优先级(值最低)的"
+"网桥将选为根桥。"
-#: ../clients/common/settings-docs.c.in:126
+#: ../clients/common/settings-docs.h.in:120
msgid ""
"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
-msgstr ""
+msgstr "控制是否为此网桥启用生成树协议(STP)。"
-#: ../clients/common/settings-docs.c.in:127
+#: ../clients/common/settings-docs.h.in:121
msgid ""
"Enables or disables \"hairpin mode\" for the port, which allows frames to be "
"sent back out through the port the frame was received on."
-msgstr ""
+msgstr "启用或禁用端口的 \"hairpin mode\",其允许从接收帧的端口发回帧。"
-#: ../clients/common/settings-docs.c.in:129
+#: ../clients/common/settings-docs.h.in:122
msgid ""
"The Spanning Tree Protocol (STP) port cost for destinations via this port."
-msgstr ""
+msgstr "通过此端口的目标的生成树协议(STP)端口开销。"
-#: ../clients/common/settings-docs.c.in:130
+#: ../clients/common/settings-docs.h.in:123
msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
-msgstr ""
+msgstr "此网桥端口的生成树协议(STP)优先级。"
-#: ../clients/common/settings-docs.c.in:131
-#: ../clients/common/settings-docs.c.in:179
-#: ../clients/common/settings-docs.c.in:191
+#: ../clients/common/settings-docs.h.in:124
+#: ../clients/common/settings-docs.h.in:169
+#: ../clients/common/settings-docs.h.in:180
msgid ""
"If non-zero, only transmit packets of the specified size or smaller, "
"breaking larger packets up into multiple frames."
-msgstr ""
+msgstr "如果非零,只传输指定大小或更小的数据包,将较大的数据包分成多个帧。"
-#: ../clients/common/settings-docs.c.in:133
+#: ../clients/common/settings-docs.h.in:125
msgid ""
"The number to dial to establish the connection to the CDMA-based mobile "
"broadband network, if any. If not specified, the default number (#777) is "
"used when required."
msgstr ""
+"建立基于 CDMA 移动宽带网络连接的拨号号码,如果有的话。如未指定,需要时默认使"
+"用号码(#777)。"
-#: ../clients/common/settings-docs.c.in:134
-#: ../clients/common/settings-docs.c.in:183
+#: ../clients/common/settings-docs.h.in:126
+#: ../clients/common/settings-docs.h.in:172
msgid ""
"The password used to authenticate with the network, if required. Many "
"providers do not require a password, or accept any password. But if a "
"password is required, it is specified here."
msgstr ""
+"用于与网络验证的密码,如果需要。很多运营商不需要密码,或是接受任何密码。但是"
+"如果需要密码,可在这里指定。"
-#: ../clients/common/settings-docs.c.in:136
-#: ../clients/common/settings-docs.c.in:189
+#: ../clients/common/settings-docs.h.in:128
+#: ../clients/common/settings-docs.h.in:178
msgid ""
"The username used to authenticate with the network, if required. Many "
"providers do not require a username, or accept any username. But if a "
"username is required, it is specified here."
msgstr ""
+"用于与网络验证的用户名,如果需要。很多运营商不需要用户名,或是接受任何用户"
+"名。但是如果需要用户名,可在这里指定。"
-#: ../clients/common/settings-docs.c.in:137
+#: ../clients/common/settings-docs.h.in:129
msgid ""
"The number of retries for the authentication. Zero means to try "
"indefinitely; -1 means to use a global default. If the global default is not "
"set, the authentication retries for 3 times before failing the connection. "
"Currently this only applies to 802-1x authentication."
msgstr ""
+"验证的重试次数。零代表无限次数;-1 代表使用全局默认值。如果全局默认值未设定,"
+"允许连接失败前验证重试 3 次。当前此属性只应用到 802.1x 验证。"
-#: ../clients/common/settings-docs.c.in:138
+#: ../clients/common/settings-docs.h.in:130
msgid ""
"Whether or not the connection should be automatically connected by "
"NetworkManager when the resources for the connection are available. TRUE to "
"automatically activate the connection, FALSE to require manual intervention "
-"to activate the connection."
+"to activate the connection. Note that autoconnect is not implemented for VPN "
+"profiles. See \"secondaries\" as an alternative to automatically connect VPN "
+"profiles."
msgstr ""
+"当连接资源可用时,网络管理器(NetworkManager)是否自动连接。TRUE 为自动激活连"
+"接,FALSE 为请求手动介入来激活连接。注意自动连接未实现于 VPN 配置集。要自动连"
+"接 VPN 配置集请参阅作为备用方法的 \"secondaries\"。"
-#: ../clients/common/settings-docs.c.in:139
+#: ../clients/common/settings-docs.h.in:131
msgid ""
"The autoconnect priority. If the connection is set to autoconnect, "
"connections with higher priority will be preferred. Defaults to 0. The "
"higher number means higher priority."
msgstr ""
+"自动连接优先级。如果连接设为自动连接时,首选高优先级的连接。默认为 0。数值越"
+"高优先级越高。"
-#: ../clients/common/settings-docs.c.in:140
+#: ../clients/common/settings-docs.h.in:132
msgid ""
"The number of times a connection should be tried when autoactivating before "
"giving up. Zero means forever, -1 means the global default (4 times if not "
@@ -6560,31 +7266,41 @@ msgid ""
"blocking autoconnect. Note that after a timeout, NetworkManager will try to "
"autoconnect again."
msgstr ""
+"自动激活放弃前连接应该尝试的次数。零表示从不,-1 表示全局默认值(未被覆盖时"
+"为 4 次)。设定此属性为 1 表示阻止自动连接前只尝试一次激活。注意一段超时时间"
+"后,网络管理器(NetworkManager)将重新尝试自动连接。"
-#: ../clients/common/settings-docs.c.in:141
+#: ../clients/common/settings-docs.h.in:133
msgid ""
"Whether or not slaves of this connection should be automatically brought up "
"when NetworkManager activates this connection. This only has a real effect "
-"for master connections. The permitted values are: 0: leave slave connections "
-"untouched, 1: activate all the slave connections with this connection, -1: "
-"default. If -1 (default) is set, global connection.autoconnect-slaves is "
-"read to determine the real value. If it is default as well, this fallbacks "
-"to 0."
+"for master connections. The properties \"autoconnect\", \"autoconnect-"
+"priority\" and \"autoconnect-retries\" are unrelated to this setting. The "
+"permitted values are: 0: leave slave connections untouched, 1: activate all "
+"the slave connections with this connection, -1: default. If -1 (default) is "
+"set, global connection.autoconnect-slaves is read to determine the real "
+"value. If it is default as well, this fallbacks to 0."
msgstr ""
+"NetworkManger 激活此连接时,是否自动启动此连接的从连接。这只对主连接有实际效"
+"果。属性 \"autoconnect\"、\"autoconnect-priority\" 和 \"autoconnect-retries"
+"\" 跟此设置无关。允许的值有:0:保持从连接不变;1:激活此连接的所有从连"
+"接;-1:默认。如果设为 -1(默认)时,读取全局 connection.autoconnect-slaves "
+"以确定实际值。如果它也是默认的,此设置回落到 0。"
-#: ../clients/common/settings-docs.c.in:142
+#: ../clients/common/settings-docs.h.in:134
msgid ""
"If greater than zero, delay success of IP addressing until either the "
"timeout is reached, or an IP gateway replies to a ping."
msgstr ""
+"如果大于零,推迟 IP 寻址的成功,直到到达超时时间或 IP 网关应答了 ping。"
-#: ../clients/common/settings-docs.c.in:143
+#: ../clients/common/settings-docs.h.in:135
msgid ""
"A human readable unique identifier for the connection, like \"Work Wi-Fi\" "
"or \"T-Mobile 3G\"."
-msgstr ""
+msgstr "用户可读的连接的唯一标识符,如 \"工作 Wi-Fi\" 或 \"运营商 4G\"。"
-#: ../clients/common/settings-docs.c.in:144
+#: ../clients/common/settings-docs.h.in:136
msgid ""
"The name of the network interface this connection is bound to. If not set, "
"then the connection can be attached to any interface of the appropriate type "
@@ -6596,22 +7312,48 @@ msgid ""
"names change or are reordered the connection may be applied to the wrong "
"interface."
msgstr ""
+"此连接绑定的网络接口名称。如果未设定,此连接可以连接到任何合适类型的接口(受"
+"其他设置的限制)。对于软件设备,此值指定创建设备的名称。对于其接口名无法很容"
+"易固定的连接类型(例如 移动宽带或 USB 以太网),不应使用此属性。设置此属性会"
+"限制连接可以使用的接口,而且当接口名改变或重新排序了,连接可能会应用到错误的"
+"接口。"
-#: ../clients/common/settings-docs.c.in:145
+#: ../clients/common/settings-docs.h.in:137
msgid "Whether LLDP is enabled for the connection."
-msgstr ""
+msgstr "是否为连接启用 LLDP。"
-#: ../clients/common/settings-docs.c.in:146
+#: ../clients/common/settings-docs.h.in:138
msgid "Interface name of the master device or UUID of the master connection."
+msgstr "主设备的接口名或 UUID 或主连接。"
+
+#: ../clients/common/settings-docs.h.in:139
+msgid ""
+"Whether mDNS is enabled for the connection. The permitted values are: yes: "
+"register hostname and resolving for the connection, no: disable mDNS for the "
+"interface, resolve: do not register hostname but allow resolving of mDNS "
+"host names. When updating this property on a currently activated connection, "
+"the change takes effect immediately. This feature requires a plugin which "
+"supports mDNS. One such plugin is dns-systemd-resolved."
msgstr ""
+"是否为此连接启用 mDNS。允许的值有:yes,注册主机名并解析连接;no,禁用接口的 "
+"mDNS;resolve,不要注册主机名但允许 mDNS 主机名的解析。当在当前激活的连接上更"
+"新此属性时,更改立即生效。此功能需要支持 mDNS 的插件。一个这样的插件是 dns-"
+"systemd-resolved。"
-#: ../clients/common/settings-docs.c.in:147
+#: ../clients/common/settings-docs.h.in:140
msgid ""
"Whether the connection is metered. When updating this property on a "
"currently activated connection, the change takes effect immediately."
+msgstr "连接是否按流量计费。当在当前激活的连接上更新此属性时,更改立即生效。"
+
+#: ../clients/common/settings-docs.h.in:141
+msgid ""
+"Specifies whether the profile can be active multiple times at a particular "
+"moment. The value is of type NMConnectionMultiConnect."
msgstr ""
+"指定配置集是否能在指定时刻激活多次。该值为 NMConnectionMultiConnect 类型。"
-#: ../clients/common/settings-docs.c.in:149
+#: ../clients/common/settings-docs.h.in:142
msgid ""
"An array of strings defining what access a given user has to this "
"connection. If this is NULL or empty, all users are allowed to access this "
@@ -6625,50 +7367,85 @@ msgid ""
"present must be ignored and is reserved for future use. All of [type], "
"[id], and [reserved] must be valid UTF-8."
msgstr ""
+"字符串数组,用于定义给定用户对此连接的访问权。如果此属性为 NULL 或空,允许所"
+"有用户访问此连接;否则只允许在此列表中的用户。当此属性非空时,只有当指定用户"
+"之一登录到活动会话时,连接被激活。每个条目的形式为 \"[类型]:[ID]:[已保留]\";"
+"例如 \"user:dcbw:blah\"。此时,只允许用户 \"user\" [类型]。其他任何值被忽略并"
+"保留为将来使用。[ID] 是此权限引用的用户名,不能包含冒号 \":\" 字符。存在的任"
+"何 [已保留] 信息都必须被忽略并保留为将来使用。所有的 [类型]、[ID] 和 [已保"
+"留] 都必须为有效的 UTF-8。"
-#: ../clients/common/settings-docs.c.in:150
+#: ../clients/common/settings-docs.h.in:143
msgid ""
"FALSE if the connection can be modified using the provided settings "
"service's D-Bus interface with the right privileges, or TRUE if the "
"connection is read-only and cannot be modified."
msgstr ""
+"如果连接可以用提供设置服务的 D-Bus 接口以正确的权限来修改,为 FALSE;如果连接"
+"为只读且无法修改,为 TRUE。"
-#: ../clients/common/settings-docs.c.in:151
+#: ../clients/common/settings-docs.h.in:144
msgid ""
"List of connection UUIDs that should be activated when the base connection "
"itself is activated. Currently only VPN connections are supported."
-msgstr ""
+msgstr "当基础连接本身激活时应一块激活的连接 UUID 列表。当前只支持 VPN 连接。"
-#: ../clients/common/settings-docs.c.in:152
+#: ../clients/common/settings-docs.h.in:145
msgid ""
"Setting name of the device type of this slave's master connection (eg, \"bond"
"\"), or NULL if this connection is not a slave."
msgstr ""
+"此从连接的主连接设备类型的设置名称(例如 \"bond\"),或者为 NULL 如果此连接不"
+"是从连接。"
-#: ../clients/common/settings-docs.c.in:153
+#: ../clients/common/settings-docs.h.in:146
msgid ""
-"Token to generate stable IDs for the connection. The stable-id is used for "
+"This represents the identity of the connection used for various purposes. It "
+"allows to configure multiple profiles to share the identity. Also, the "
+"stable-id can contain placeholders that are substituted dynamically and "
+"deterministically depending on the context. The stable-id is used for "
"generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-"
"privacy. It is also used to seed the generated cloned MAC address for "
-"ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. Note "
-"that also the interface name of the activating connection and a per-host "
-"secret key is included into the address generation so that the same stable-"
-"id on different hosts/devices yields different addresses. If the value is "
-"unset, an ID unique for the connection is used. Specifying a stable-id "
-"allows multiple connections to generate the same addresses. Another use is "
-"to generate IDs at runtime via dynamic substitutions. The '$' character is "
+"ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is "
+"also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to "
+"derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that "
+"depending on the context where it is used, other parameters are also seeded "
+"into the generation algorithm. For example, a per-host key is commonly also "
+"included, so that different systems end up generating different IDs. Or with "
+"ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so "
+"that different interfaces yield different addresses. The '$' character is "
"treated special to perform dynamic substitutions at runtime. Currently "
-"supported are \"${CONNECTION}\", \"${BOOT}\", \"${RANDOM}\". These "
-"effectively create unique IDs per-connection, per-boot, or every time. Any "
-"unrecognized patterns following '$' are treated verbatim, however are "
-"reserved for future use. You are thus advised to avoid '$' or escape it as "
-"\"$$\". For example, set it to \"${CONNECTION}/${BOOT}\" to create a unique "
-"id for this connection that changes with every reboot. Note that two "
-"connections only use the same effective id if their stable-id is also "
-"identical before performing dynamic substitutions."
-msgstr ""
-
-#: ../clients/common/settings-docs.c.in:154
+"supported are \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". "
+"These effectively create unique IDs per-connection, per-device, per-boot, or "
+"every time. Note that \"${DEVICE}\" corresponds the the interface name of "
+"the device. Any unrecognized patterns following '$' are treated verbatim, "
+"however are reserved for future use. You are thus advised to avoid '$' or "
+"escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-"
+"${DEVICE}\" to create a unique id for this connection that changes with "
+"every reboot and differs depending on the interface where the profile "
+"activates. If the value is unset, a global connection default is consulted. "
+"If the value is still unset, the default is similar to \"${CONNECTION}\" and "
+"uses a unique, fixed ID for the connection."
+msgstr ""
+"此属性表示用于多个目的的连接标识符。它允许通过配置多个配置集来共享标识符。同"
+"时,stable-id 可以包含根据上下文,动态和确定地替换的占位符。stable-id 用来与 "
+"ipv6.addr-gen-mode=stable-privacy 共用时生成 IPv6 稳定私有地址。它也可以用来"
+"为 ethernet.cloned-mac-address=stable 和 wifi.cloned-mac-address=stable 生成"
+"的克隆 MAC 地址做种。它还能与 ipv4.dhcp-client-id=stable 共用时当作 DHCP 客户"
+"端标识符,与 ipv6.dhcp-duid=stable-[llt,ll,uuid] 共用时用于衍生 DHCP DUID。注"
+"意,取决于它使用的上下文,其他参数也可以当作生成算法的种子。示例,一般包括每"
+"个主机自己的密钥,这样不同的系统可以生成不同的 ID。或者与 ipv6.addr-gen-"
+"mode=stable-privacy 共用时,也包括设备的名称,这样不同的接口可以产出不同的地"
+"址。\"$\" 字符被特别对待以在运行时执行动态替换。当前支持的有 "
+"\"${CONNECTION}\"、\"${BOOT}\" 和 \"${RANDOM}\"。这些字符串可以有效地为每个连"
+"接、每次启动或每一次都创建唯一的 ID。注意 \"${DEVICE}\" 对应于设备的接口"
+"名。\"$\" 后跟随任何未识别的样式都视作原字符串,但也被保留为将来使用。因此建"
+"议您避免使用 \"$\" 或将其转义为 \"$$\"。示例,设定为 \"${CONNECTION}/"
+"${BOOT}\" 将为此连接创建一个唯一 ID ,该 ID 每次启动都改变而且根据配置激活的"
+"接口区别开来。如果值未设定,将查询全局连接默认值。如果值仍未设定,则默认为跟 "
+"\"${CONNECTION}\" 相同并为连接使用唯一的固定 ID。"
+
+#: ../clients/common/settings-docs.h.in:147
msgid ""
"The time, in seconds since the Unix Epoch, that the connection was last "
"_successfully_ fully activated. NetworkManager updates the connection "
@@ -6676,8 +7453,11 @@ msgid ""
"active connection has the latest timestamp. The property is only meant for "
"reading (changes to this property will not be preserved)."
msgstr ""
+"连接上次完全激活的时间,以秒计算和 Unix 时间表示。当连接激活时网络管理器"
+"(NetworkManager)会定期更新连接的时间戳以确保活动连接有最新的时间戳。该用来"
+"读取(此属性的更改不被保留)。"
-#: ../clients/common/settings-docs.c.in:155
+#: ../clients/common/settings-docs.h.in:148
msgid ""
"Base type of the connection. For hardware-dependent connections, should "
"contain the setting name of the hardware-type specific setting (ie, \"802-3-"
@@ -6685,8 +7465,12 @@ msgid ""
"hardware dependent connections like VPN or otherwise, should contain the "
"setting name of that setting type (ie, \"vpn\" or \"bridge\", etc)."
msgstr ""
+"连接的基础类型。对于硬件相关的连接,应包含硬件类型特定设置的设置名称(例如 "
+"\"802-3-ethernet\" 或 \"802-11-wireless\" 或 \"bluetooth\",等等),而对于非"
+"硬件相关的连接如 VPN 或其他的,应包含该设置类型的设置名称(例如 \"vpn\" 或 "
+"\"bridge\",等等)。"
-#: ../clients/common/settings-docs.c.in:156
+#: ../clients/common/settings-docs.h.in:149
msgid ""
"A universally unique identifier for the connection, for example generated "
"with libuuid. It should be assigned when the connection is created, and "
@@ -6697,8 +7481,13 @@ msgid ""
"UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, "
"contains only hexadecimal characters and \"-\")."
msgstr ""
+"用于连接的全局唯一标识符,例如以 libuuid 生成。它应该在连接创建时分配,并且只"
+"要连接仍应用到同个网络就不改变。例如,当 \"id\" 属性或 NMSettingIP4Config 更"
+"改时它不应改变;但当 Wi-Fi SSID、移动宽带网络运营商或 \"type\" 属性改变时它可"
+"能需要重新创建。UUIS 必须为如 \"2815492f-7e56-435e-b2e9-246bd7cdc664\" 的格式"
+"(示例,只包含十六进制和 \"-\")。"
-#: ../clients/common/settings-docs.c.in:157
+#: ../clients/common/settings-docs.h.in:150
msgid ""
"The trust level of a the connection. Free form case-insensitive string (for "
"example \"Home\", \"Work\", \"Public\"). NULL or unspecified zone means the "
@@ -6706,54 +7495,72 @@ msgid ""
"When updating this property on a currently activated connection, the change "
"takes effect immediately."
msgstr ""
+"连接的信任级别。格式自由、不区分大小写的字符串(例如 \"Home\"、\"工作\"、\"公"
+"共\")。NULL 或为指定区域表示连接将放置到防火墙定义的默认区域。当在当前激活的"
+"连接上更新此属性时,更改立即生效。"
-#: ../clients/common/settings-docs.c.in:158
+#: ../clients/common/settings-docs.h.in:151
msgid ""
"Specifies the NMSettingDcbFlags for the DCB FCoE application. Flags may be "
"any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
"NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
msgstr ""
+"指定 DCB FCoE 应用程序的 NMSettingDcbFlags。标志可以是 "
+"NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 "
+"NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。"
-#: ../clients/common/settings-docs.c.in:159
+#: ../clients/common/settings-docs.h.in:152
msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
-msgstr ""
+msgstr "FCoE 控制器模式;为 \"fabric\"(默认)或 \"vn2vn\"。"
-#: ../clients/common/settings-docs.c.in:160
+#: ../clients/common/settings-docs.h.in:153
msgid ""
"The highest User Priority (0 - 7) which FCoE frames should use, or -1 for "
"default priority. Only used when the \"app-fcoe-flags\" property includes "
"the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
msgstr ""
+"FCoE 帧应使用的最高用户优先级(0~7),或 -1 代表默认优先级。只当 \"app-fcoe-"
+"flags\" 属性包含 NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
-#: ../clients/common/settings-docs.c.in:161
+#: ../clients/common/settings-docs.h.in:154
msgid ""
"Specifies the NMSettingDcbFlags for the DCB FIP application. Flags may be "
"any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
"NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
msgstr ""
+"指定 DCB FIP 应用程序的 NMSettingDcbFlags。标志可以是 "
+"NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 "
+"NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。"
-#: ../clients/common/settings-docs.c.in:162
+#: ../clients/common/settings-docs.h.in:155
msgid ""
"The highest User Priority (0 - 7) which FIP frames should use, or -1 for "
"default priority. Only used when the \"app-fip-flags\" property includes "
"the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
msgstr ""
+"FIP 帧应使用的最高用户优先级(0~7),或 -1 代表默认优先级。只当 \"app-fip-"
+"flags\" 属性包含 NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
-#: ../clients/common/settings-docs.c.in:163
+#: ../clients/common/settings-docs.h.in:156
msgid ""
"Specifies the NMSettingDcbFlags for the DCB iSCSI application. Flags may be "
"any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
"NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
msgstr ""
+"指定 DCB iSCSI 应用程序的 NMSettingDcbFlags。标志可以是 "
+"NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 "
+"NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。"
-#: ../clients/common/settings-docs.c.in:164
+#: ../clients/common/settings-docs.h.in:157
msgid ""
"The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for "
"default priority. Only used when the \"app-iscsi-flags\" property includes "
"the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
msgstr ""
+"iSCSI 帧应使用的最高用户优先级(0~7),或 -1 代表默认优先级。只当 \"app-"
+"iscsi-flags\" 属性包含 NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
-#: ../clients/common/settings-docs.c.in:166
+#: ../clients/common/settings-docs.h.in:158
msgid ""
"An array of 8 uint values, where the array index corresponds to the User "
"Priority (0 - 7) and the value indicates the percentage of bandwidth of the "
@@ -6761,58 +7568,77 @@ msgid ""
"percentages for priorities which belong to the same group must total 100 "
"percents."
msgstr ""
+"8 个无符号整数值组成的数组,其数组索引对应于用户优先级(0~7)而其值指示优先"
+"级可使用的优先级指定组的带宽百分比。属于同个组的所有优先级百分比总和必须为 "
+"100%。"
-#: ../clients/common/settings-docs.c.in:167
+#: ../clients/common/settings-docs.h.in:159
msgid ""
"An array of 8 boolean values, where the array index corresponds to the User "
"Priority (0 - 7) and the value indicates whether or not the corresponding "
"priority should transmit priority pause."
msgstr ""
+"8 个布尔值组成的数组,其数组索引对应于用户优先级(0~7)而其值指示对应优先级"
+"是否应该传输优先级暂停。"
-#: ../clients/common/settings-docs.c.in:168
+#: ../clients/common/settings-docs.h.in:160
msgid ""
"Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
"may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
"NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
msgstr ""
+"指定 DCB 优先级流量控制(PFC)的 NMSettingDcbFlags。标志可以是 "
+"NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 "
+"NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。"
-#: ../clients/common/settings-docs.c.in:169
+#: ../clients/common/settings-docs.h.in:161
msgid ""
"An array of 8 uint values, where the array index corresponds to the Priority "
"Group ID (0 - 7) and the value indicates the percentage of link bandwidth "
"allocated to that group. Allowed values are 0 - 100, and the sum of all "
"values must total 100 percents."
msgstr ""
+"8 个无符号整数值组成的数组,其数组索引对应于用户优先级(0~7)而其值指示分配"
+"到该组的链路带宽百分比。允许的值为 0~100,且所有值的总和必须为 100%。"
-#: ../clients/common/settings-docs.c.in:170
+#: ../clients/common/settings-docs.h.in:162
msgid ""
"Specifies the NMSettingDcbFlags for DCB Priority Groups. Flags may be any "
"combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
"NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
msgstr ""
+"指定 DCB 优先级组的 NMSettingDcbFlags。标志可以是 NM_SETTING_DCB_FLAG_ENABLE "
+"(0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING "
+"(0x4) 的任意组合。"
-#: ../clients/common/settings-docs.c.in:171
+#: ../clients/common/settings-docs.h.in:163
msgid ""
"An array of 8 uint values, where the array index corresponds to the User "
"Priority (0 - 7) and the value indicates the Priority Group ID. Allowed "
"Priority Group ID values are 0 - 7 or 15 for the unrestricted group."
msgstr ""
+"8 个无符号整数值组成的数组,其数组索引对应于用户优先级(0~7)而其值指示优先"
+"级组 ID。允许的优先级组 ID 值为 0~7,或 15 表示无限制组。"
-#: ../clients/common/settings-docs.c.in:172
+#: ../clients/common/settings-docs.h.in:164
msgid ""
"An array of 8 boolean values, where the array index corresponds to the User "
"Priority (0 - 7) and the value indicates whether or not the priority may use "
"all of the bandwidth allocated to its assigned group."
msgstr ""
+"8 个布尔值组成的数组,其数组索引对应于用户优先级(0~7)而其值指示优先级是否"
+"可以使用分配到它指定组的全部带宽。"
-#: ../clients/common/settings-docs.c.in:173
+#: ../clients/common/settings-docs.h.in:165
msgid ""
"An array of 8 uint values, where the array index corresponds to the User "
"Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which "
"the priority is mapped."
msgstr ""
+"8 个无符号整数值组成的数组,其数组索引对应于用户优先级(0~7)而其值指示该优"
+"先级映射的流量等级(0~7)。"
-#: ../clients/common/settings-docs.c.in:176
+#: ../clients/common/settings-docs.h.in:166
msgid ""
"The GPRS Access Point Name specifying the APN used when establishing a data "
"session with the GSM-based network. The APN often determines how the user "
@@ -6822,21 +7648,27 @@ msgid ""
"only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section "
"14.9."
msgstr ""
+"当与基于 GSM 网络建立数据会话时指定使用的 APN 的 GPRS 接入点名称。APN 通常确"
+"定了用户如何为他们的网络使用付费,和用户能否访问互联网或只是运营商特定的封闭"
+"平台,因此为用户的移动带宽套餐使用正确的 APN 很重要。根据 GSM 03.60 章节 "
+"14.9,APN 只能由字符 a~z、0~9、. 和 - 组成。"
-#: ../clients/common/settings-docs.c.in:177
+#: ../clients/common/settings-docs.h.in:167
msgid ""
"The device unique identifier (as given by the WWAN management service) which "
"this connection applies to. If given, the connection will only apply to the "
"specified device."
msgstr ""
+"此连接要应用的设备唯一标识符(由 WWAN 管理服务给定)。如果给定了,连接将只应"
+"用到指定的设备。"
-#: ../clients/common/settings-docs.c.in:178
+#: ../clients/common/settings-docs.h.in:168
msgid ""
"When TRUE, only connections to the home network will be allowed. Connections "
"to roaming networks will not be made."
-msgstr ""
+msgstr "为 TRUE 时,将只允许连接到本地网络,不会连接到漫游网络。"
-#: ../clients/common/settings-docs.c.in:181
+#: ../clients/common/settings-docs.h.in:170
msgid ""
"The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
"registration. If the Network ID is specified, NetworkManager will attempt "
@@ -6844,152 +7676,200 @@ msgid ""
"used to ensure that the device does not roam when direct roaming control of "
"the device is not otherwise possible."
msgstr ""
+"要强制指定网络注册的网络 ID(GSM LAI 格式,如 MCC-MNC)。如果指定了网络 ID,"
+"网络管理器(NetworkManager)将尝试强制设备只在指定的网络注册。当设备不能直接"
+"控制漫游时,这可以用于确保设备不漫游。"
-#: ../clients/common/settings-docs.c.in:182
+#: ../clients/common/settings-docs.h.in:171
msgid ""
"Number to dial when establishing a PPP data session with the GSM-based "
"mobile broadband network. Many modems do not require PPP for connections to "
"the mobile network and thus this property should be left blank, which allows "
"NetworkManager to select the appropriate settings automatically."
msgstr ""
+"当与基于 GSM 移动宽带网络建立 PPP 数据会话时要拨打的号码。很多调制解调器不需"
+"要 PPP 来连接到移动网络,这种情况下该属性应留空,以允许网络管理器"
+"(NetworkManager)自动选择合适的设置。"
-#: ../clients/common/settings-docs.c.in:185
+#: ../clients/common/settings-docs.h.in:174
msgid ""
"If the SIM is locked with a PIN it must be unlocked before any other "
"operations are requested. Specify the PIN here to allow operation of the "
"device."
msgstr ""
+"如果 SIM 被 PIN 锁住了,在请求任何其他操作前必须解锁。在这里指定 PIN 以允许设"
+"备的操作。"
-#: ../clients/common/settings-docs.c.in:187
+#: ../clients/common/settings-docs.h.in:176
msgid ""
"The SIM card unique identifier (as given by the WWAN management service) "
"which this connection applies to. If given, the connection will apply to "
"any device also allowed by \"device-id\" which contains a SIM card matching "
"the given identifier."
msgstr ""
+"此连接应用的 SIM 卡的唯一标识符(由 WWAN 管理服务给定)。如果给定了,此连接将"
+"应用到包含匹配给定标识符 SIM 卡的 \"device-id\" 所允许的任何设备。"
-#: ../clients/common/settings-docs.c.in:188
+#: ../clients/common/settings-docs.h.in:177
msgid ""
"A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
"mobile network operator which this connection applies to. If given, the "
"connection will apply to any device also allowed by \"device-id\" and \"sim-"
"id\" which contains a SIM card provisioned by the given operator."
msgstr ""
+"一个如 \"310260\" 或 \"21601\" 的 MCC/MNC 字符串,用来鉴定此连接应用到的指定"
+"移动网络运营商。如果给定了,连接将应用到包含给定运营商提供 SIM 卡的 \"device-"
+"id\" 和 \"sim-id\" 所允许的任何设备。"
-#: ../clients/common/settings-docs.c.in:190
+#: ../clients/common/settings-docs.h.in:179
msgid ""
"If specified, this connection will only apply to the IPoIB device whose "
"permanent MAC address matches. This property does not change the MAC address "
"of the device (i.e. MAC spoofing)."
msgstr ""
+"如指定了,此连接将只应用到符合永久 MAC 地址的 IPoIB 设备。此属性不会改变设备"
+"的 MAC 地址(例如 MAC 欺骗)。"
-#: ../clients/common/settings-docs.c.in:193
+#: ../clients/common/settings-docs.h.in:181
msgid ""
"The InfiniBand P_Key to use for this device. A value of -1 means to use the "
"default P_Key (aka \"the P_Key at index 0\"). Otherwise it is a 16-bit "
"unsigned integer, whose high bit is set if it is a \"full membership\" P_Key."
msgstr ""
+"用于此设备的 InfiniBand P_Key。值 -1 代表使用默认的 P_Key(又名 \"索引 0 的 "
+"P_Key\")。否则它是个 16 位无符号整数,其高位已设定如果它是个 \"正式会员\" "
+"P_Key。"
-#: ../clients/common/settings-docs.c.in:194
+#: ../clients/common/settings-docs.h.in:182
msgid ""
"The interface name of the parent device of this device. Normally NULL, but "
"if the \"p_key\" property is set, then you must specify the base device by "
"setting either this property or \"mac-address\"."
msgstr ""
+"此设备的上级设备的接口名称。一般是 NULL,但如果 \"p_key\" 已设定,您必须通过"
+"设置此属性或 \"mac-address\" 来指定基础设备。"
-#: ../clients/common/settings-docs.c.in:195
+#: ../clients/common/settings-docs.h.in:183
msgid ""
"The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
msgstr ""
+"IP-over-InfiniBand 传输模式。要么为 \"datagram\" 要么为 \"connected\"。"
-#: ../clients/common/settings-docs.c.in:196
+#: ../clients/common/settings-docs.h.in:184
msgid ""
"How many additional levels of encapsulation are permitted to be prepended to "
"packets. This property applies only to IPv6 tunnels."
+msgstr "允许多少个附加的封装等级预置到数据包。此属性值只应用到 IPv6 隧道。"
+
+#: ../clients/common/settings-docs.h.in:185
+msgid ""
+"Tunnel flags. Currently the following values are supported: "
+"NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
+"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), "
+"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), "
+"NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY "
+"(0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only "
+"for IPv6 tunnels."
msgstr ""
+"隧道标志。当前支持下列值:NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1)、"
+"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2)、"
+"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4)、"
+"NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8)、NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY "
+"(0x10)、NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20)。它们只对 IPv6 隧道有"
+"效。"
-#: ../clients/common/settings-docs.c.in:197
+#: ../clients/common/settings-docs.h.in:186
msgid ""
"The flow label to assign to tunnel packets. This property applies only to "
"IPv6 tunnels."
-msgstr ""
+msgstr "要分配到隧道数据包的流量标签。此属性只应用到 IPv6 隧道。"
-#: ../clients/common/settings-docs.c.in:198
+#: ../clients/common/settings-docs.h.in:187
msgid ""
"The key used for tunnel input packets; the property is valid only for "
"certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
msgstr ""
+"用于隧道输入数据包的密钥。该属性值对某些隧道模式有效(GRE、IP6GRE)。如果留空"
+"则不使用密钥。"
-#: ../clients/common/settings-docs.c.in:199
+#: ../clients/common/settings-docs.h.in:188
msgid ""
"The local endpoint of the tunnel; the value can be empty, otherwise it must "
"contain an IPv4 or IPv6 address."
-msgstr ""
+msgstr "隧道的本地端点。值可以为空,否则它必须包含一个 IPv4 或 IPv6 地址。"
-#: ../clients/common/settings-docs.c.in:200
+#: ../clients/common/settings-docs.h.in:189
msgid ""
"The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
"NM_IP_TUNNEL_MODE_GRE (2)."
msgstr ""
+"隧道模式,例如 NM_IP_TUNNEL_MODE_IPIP (1) 或 NM_IP_TUNNEL_MODE_GRE (2)。"
-#: ../clients/common/settings-docs.c.in:201
+#: ../clients/common/settings-docs.h.in:190
msgid ""
"If non-zero, only transmit packets of the specified size or smaller, "
"breaking larger packets up into multiple fragments."
-msgstr ""
+msgstr "如果非零,只传输指定大小或更小的数据包,将较大的数据包分成多个帧。"
-#: ../clients/common/settings-docs.c.in:203
+#: ../clients/common/settings-docs.h.in:191
msgid ""
"The key used for tunnel output packets; the property is valid only for "
"certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
msgstr ""
+"用于隧道输出数据包的密钥。该属性值对某些隧道模式有效(GRE、IP6GRE)。如果留空"
+"则不使用密钥。"
-#: ../clients/common/settings-docs.c.in:204
+#: ../clients/common/settings-docs.h.in:192
msgid ""
"If given, specifies the parent interface name or parent connection UUID the "
"new device will be bound to so that tunneled packets will only be routed via "
"that interface."
msgstr ""
+"如果给定了,指定新设备将绑定到的上级接口名或上级连接 UUID,以让隧道的数据包只"
+"能通过该接口进行路由。"
-#: ../clients/common/settings-docs.c.in:205
+#: ../clients/common/settings-docs.h.in:193
msgid "Whether to enable Path MTU Discovery on this tunnel."
-msgstr ""
+msgstr "是否在此隧道启用路径 MTU 发现。"
-#: ../clients/common/settings-docs.c.in:206
+#: ../clients/common/settings-docs.h.in:194
msgid ""
"The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
"address."
-msgstr ""
+msgstr "隧道的远程端点;值必须包含一个 IPv4 或 IPv6 地址。"
-#: ../clients/common/settings-docs.c.in:207
+#: ../clients/common/settings-docs.h.in:195
msgid ""
"The type of service (IPv4) or traffic class (IPv6) field to be set on "
"tunneled packets."
-msgstr ""
+msgstr "设定在隧道数据包上的服务类型(IPv4)或流量等级(IPv6)字段。"
-#: ../clients/common/settings-docs.c.in:208
+#: ../clients/common/settings-docs.h.in:196
msgid ""
"The TTL to assign to tunneled packets. 0 is a special value meaning that "
"packets inherit the TTL value."
-msgstr ""
+msgstr "分配到隧道数据包的 TTL。0 为特殊值,表示数据包继承 TTL 值。"
-#: ../clients/common/settings-docs.c.in:209
-#: ../clients/common/settings-docs.c.in:231
+#: ../clients/common/settings-docs.h.in:197
+#: ../clients/common/settings-docs.h.in:218
msgid "Array of IP addresses."
-msgstr ""
+msgstr "IP 地址数组。"
-#: ../clients/common/settings-docs.c.in:210
-#: ../clients/common/settings-docs.c.in:232
+#: ../clients/common/settings-docs.h.in:198
+#: ../clients/common/settings-docs.h.in:219
msgid ""
"Timeout in milliseconds used to check for the presence of duplicate IP "
"addresses on the network. If an address conflict is detected, the "
"activation will fail. A zero value means that no duplicate address "
"detection is performed, -1 means the default value (either configuration "
-"ipvx.dad-timeout override or 3 seconds). A value greater than zero is a "
-"timeout in milliseconds."
+"ipvx.dad-timeout override or zero). A value greater than zero is a timeout "
+"in milliseconds. The property is currently implemented only for IPv4."
msgstr ""
+"用于检查网络中是否存在重复 IP 地址的超时时间。如果检测到了冲突,激活将失败。"
+"零值表示不执行重复 IP 检查,-1 表示默认值(配置 ipvx.dad-timeout 覆盖或 3 "
+"秒)。大于零的值为以毫秒计算的超时时间。该属性当前只实现于 IPv4。"
-#: ../clients/common/settings-docs.c.in:211
+#: ../clients/common/settings-docs.h.in:199
msgid ""
"A string sent to the DHCP server to identify the local machine which the "
"DHCP server may use to customize the DHCP lease and options. When the "
@@ -6998,26 +7878,47 @@ msgid ""
"RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e."
"g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a "
"MAC address). If the property is not a hex string it is considered as a non-"
-"hardware-address client ID and the 'type' field is set to 0."
-msgstr ""
-
-#: ../clients/common/settings-docs.c.in:212
+"hardware-address client ID and the 'type' field is set to 0. The special "
+"values \"mac\" and \"perm-mac\" are supported, which use the current or "
+"permanent MAC address of the device to generate a client identifier with "
+"type ethernet (01). Currently, these options only work for ethernet type of "
+"links. The special value \"stable\" is supported to generate a type 0 client "
+"identifier based on the stable-id (see connection.stable-id) and a per-host "
+"key. If unset, a globally configured default is used. If still unset, the "
+"client-id from the last lease is reused."
+msgstr ""
+"发送到 DHCP 服务器的字符串,用以确定 DHCP 服务器可能用于自定义 DHCP 租约和选"
+"项的本地机器。当属性值为十六进制字符串时,将其解读为二进制的客户端 ID,这种情"
+"况下根据 RFC 2132 章节 9.14 首字节被认为是 \"type\" 字段而剩下的字节可为一个"
+"硬件地址(例如 \"01:xx:xx:xx:xx:xx:xx\" 中 1 是以太网 ARP 类型而其余的是个 "
+"MAC 地址)。如果属性不是十六进制字符串,它被视作非硬件地址客户端 ID 且 \"type"
+"\" 字段被设为 0。支持特殊值 \"mac\" 和 \"perm-mac\",其使用设备的当前或永久 "
+"MAC 地址来生成类型为以太网类型 (01) 的客户端标识符。当前这些选项仅适用于以太"
+"网类型的链路。支持特殊值 \"stable\" 基于 stable-id 和每个主机的密钥生成一个类"
+"型 0 的客户端标识符(参见 connection.stable-id)。如果未设,使用全局默认值。"
+"如果仍未设定,重新使用来自上个租约的 client-id。"
+
+#: ../clients/common/settings-docs.h.in:200
msgid ""
"If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will "
"be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
"hostname\" are mutually exclusive and cannot be set at the same time."
msgstr ""
+"如果 \"dhcp-send-hostname\" 属性为 TRUE,当获取租约时指定的 FQDN 将被发送到 "
+"DHCP 服务器。此属性与 \"dhcp-hostname\" 相互排斥而且无法被同时设定。"
-#: ../clients/common/settings-docs.c.in:213
-#: ../clients/common/settings-docs.c.in:233
+#: ../clients/common/settings-docs.h.in:201
+#: ../clients/common/settings-docs.h.in:221
msgid ""
"If the \"dhcp-send-hostname\" property is TRUE, then the specified name will "
"be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
"fqdn\" are mutually exclusive and cannot be set at the same time."
msgstr ""
+"如果 \"dhcp-send-hostname\" 属性为 TRUE,当获取租约时指定的名称将被发送到 "
+"DHCP 服务器。此属性与 \"dhcp-fqdn\" 相互排斥而且无法被同时设定。"
-#: ../clients/common/settings-docs.c.in:214
-#: ../clients/common/settings-docs.c.in:234
+#: ../clients/common/settings-docs.h.in:202
+#: ../clients/common/settings-docs.h.in:222
msgid ""
"If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some "
"DHCP servers use this hostname to update DNS databases, essentially "
@@ -7025,75 +7926,112 @@ msgid ""
"property is NULL and this property is TRUE, the current persistent hostname "
"of the computer is sent."
msgstr ""
+"如果为 TRUE,当获取租约时发送主机名到 DHCP 服务器。有些 DHCP 服务器使用这个主"
+"机名来更新 DNS 数据库,实质上为计算机提供了个静态的主机名。如果 \"dhcp-"
+"hostname\" 属性为 NULL 且此属性为 TRUE,以计算机的当前永久主机。"
-#: ../clients/common/settings-docs.c.in:215
-#: ../clients/common/settings-docs.c.in:235
+#: ../clients/common/settings-docs.h.in:203
+#: ../clients/common/settings-docs.h.in:223
msgid "A timeout for a DHCP transaction in seconds."
-msgstr ""
+msgstr "DHCP 事务的超时时间,以秒计。"
-#: ../clients/common/settings-docs.c.in:216
-#: ../clients/common/settings-docs.c.in:236
+#: ../clients/common/settings-docs.h.in:204
+#: ../clients/common/settings-docs.h.in:224
msgid "Array of IP addresses of DNS servers."
-msgstr ""
+msgstr "DNS 服务器的 IP 地址数组。"
-#: ../clients/common/settings-docs.c.in:217
-#: ../clients/common/settings-docs.c.in:237
+#: ../clients/common/settings-docs.h.in:205
+#: ../clients/common/settings-docs.h.in:225
msgid ""
"Array of DNS options as described in man 5 resolv.conf. NULL means that the "
"options are unset and left at the default. In this case NetworkManager will "
"use default options. This is distinct from an empty list of properties."
msgstr ""
+"在 man 5 resolv.conf 中描述的 DNS 选项数组。NULL 代表选项未设定并保留默认值。"
+"此情况下网络管理器(NetworkManager)将使用默认选项。这跟空列表的属性不同。"
-#: ../clients/common/settings-docs.c.in:218
-#: ../clients/common/settings-docs.c.in:238
+#: ../clients/common/settings-docs.h.in:206
+#: ../clients/common/settings-docs.h.in:226
msgid ""
-"Intra-connection DNS priority. The relative priority to be used when "
-"determining the order of DNS servers in resolv.conf. A lower value means "
-"that servers will be on top of the file. Zero selects the default value, "
-"which is 50 for VPNs and 100 for other connections. Note that the priority "
-"is to order DNS settings for multiple active connections. It does not "
-"disambiguate multiple DNS servers within the same connection profile. For "
-"that, just specify the DNS servers in the desired order. When multiple "
+"DNS servers priority. The relative priority for DNS servers specified by "
+"this setting. A lower value is better (higher priority). Zero selects the "
+"default value, which is 50 for VPNs and 100 for other connections. Note that "
+"the priority is to order DNS settings for multiple active connections. It "
+"does not disambiguate multiple DNS servers within the same connection "
+"profile. When using dns=default, servers with higher priority will be on top "
+"of resolv.conf. To prioritize a given server over another one within the "
+"same connection, just specify them in the desired order. When multiple "
"devices have configurations with the same priority, the one with an active "
-"default route will be preferred. Note that when using dns=dnsmasq the order "
-"is meaningless since dnsmasq forwards queries to all known servers at the "
-"same time. Negative values have the special effect of excluding other "
-"configurations with a greater priority value; so in presence of at least a "
-"negative priority, only DNS servers from connections with the lowest "
-"priority value will be used."
-msgstr ""
-
-#: ../clients/common/settings-docs.c.in:219
-#: ../clients/common/settings-docs.c.in:239
-msgid "Array of DNS search domains."
-msgstr ""
-
-#: ../clients/common/settings-docs.c.in:220
-#: ../clients/common/settings-docs.c.in:240
+"default route will be preferred. Negative values have the special effect of "
+"excluding other configurations with a greater priority value; so in presence "
+"of at least a negative priority, only DNS servers from connections with the "
+"lowest priority value will be used. When using a DNS resolver that supports "
+"split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to "
+"query domains in its search list. Queries for domains not present in any "
+"search list are routed through connections having the '~.' special wildcard "
+"domain, which is added automatically to connections with the default route "
+"(or can be added manually). When multiple connections specify the same "
+"domain, the one with the highest priority (lowest numerical value) wins. If "
+"a connection specifies a domain which is subdomain of another domain with a "
+"negative DNS priority value, the subdomain is ignored."
+msgstr ""
+"DNS 服务器优先级。此设置指定 DNS 服务器的相关优先级。值越低优先级越高。零代表"
+"默认值,即 50 用于 VPN 和 100 用于其他连接。注意此优先级用于为多个活动连接排"
+"序 DNS 设置。它不是对同个连接配置集中的多个 DNS 服务器进行明确选择。当使用 "
+"dns=default 时,更高优先级的服务器将在 resolv.conf 里的更顶部。要让给定服务器"
+"优先于同连接内的另一服务器,只要以期望的顺序指定它们就行。当多个设备配置了同"
+"样的优先级,将优先选择活动默认路由的那一个。注意当使用 dns=dnsmasq 时,此顺序"
+"无意义因为 dnsmasq 同时转发查询到所有已知服务器。负值具有排除其他拥有更高优先"
+"级值的配置的特殊效果;所以存在至少一个负值优先级的情况下,只使用具有最低优先"
+"级值的连接的 DNS 服务器。当使用支持拆分 DNS 为 dns=dnsmasq 或 dns=systemd-"
+"resolved 的 DNS 解析器时,每个连接用于查询它搜索列表中的域。未在任何搜索列表"
+"中的域查询会由具有 \"~.\" 特殊通配符的域进行路由,被自动以默认路由添加到连接"
+"(或可以手动添加)。当多个连接指定了同个域时,拥有最高权限(最低的数值)的那"
+"个连接将获选。如果连接指定了个域,其为具有负 DNS 优先级值的另一域的子域,那这"
+"个子域会被忽略。"
+
+#: ../clients/common/settings-docs.h.in:207
+#: ../clients/common/settings-docs.h.in:227
+msgid ""
+"Array of DNS search domains. Domains starting with a tilde ('~') are "
+"considered 'routing' domains and are used only to decide the interface over "
+"which a query must be forwarded; they are not used to complete unqualified "
+"host names."
+msgstr ""
+"DNS 搜索域的数组。域以半角波浪号(\"~\")开头的视为 \"路由\" 域并只用于确定查"
+"询必须转发的接口;它们不用于完全未限定的主机名。"
+
+#: ../clients/common/settings-docs.h.in:208
+#: ../clients/common/settings-docs.h.in:228
msgid ""
"The gateway associated with this configuration. This is only meaningful if "
"\"addresses\" is also set."
-msgstr ""
+msgstr "与此配置关联的网关。这只在 \"addresses\" 也设定的时候有意义。"
-#: ../clients/common/settings-docs.c.in:221
-#: ../clients/common/settings-docs.c.in:241
+#: ../clients/common/settings-docs.h.in:209
+#: ../clients/common/settings-docs.h.in:229
msgid ""
"When \"method\" is set to \"auto\" and this property to TRUE, automatically "
"configured nameservers and search domains are ignored and only nameservers "
"and search domains specified in the \"dns\" and \"dns-search\" properties, "
"if any, are used."
msgstr ""
+"当 \"method\" 设为 \"auto\" 且此属性为 TRUE 时,自动配置的名称服务器和搜索域"
+"被忽略且只有 \"dns\" 和 \"dns-search\" 属性中指定的名称服务器和搜索域被使用,"
+"如果有的话。"
-#: ../clients/common/settings-docs.c.in:222
-#: ../clients/common/settings-docs.c.in:242
+#: ../clients/common/settings-docs.h.in:210
+#: ../clients/common/settings-docs.h.in:230
msgid ""
"When \"method\" is set to \"auto\" and this property to TRUE, automatically "
"configured routes are ignored and only routes specified in the \"routes\" "
"property, if any, are used."
msgstr ""
+"当 \"method\" 设为 \"auto\" 且此属性为 TRUE 时,自动配置的路由被忽略且只有 "
+"\"routes\" 属性中指定的路由被使用,如果有的话。"
-#: ../clients/common/settings-docs.c.in:223
-#: ../clients/common/settings-docs.c.in:244
+#: ../clients/common/settings-docs.h.in:211
+#: ../clients/common/settings-docs.h.in:232
msgid ""
"If TRUE, allow overall network configuration to proceed even if the "
"configuration specified by this property times out. Note that at least one "
@@ -7102,9 +8040,13 @@ msgid ""
"the NMSettingIP4Config allows the overall network configuration to succeed "
"if IPv4 configuration fails but IPv6 configuration completes successfully."
msgstr ""
+"如果为 TURE,允许进行整体网络配置不管此属性指定的配置是否超时。注意至少要有一"
+"个 IP 配置成功不然整体网络配置仍将失败。示例,在纯 IPv6 网络,在 "
+"NMSettingIP4Config 设置此属性为 TRUE 时允许整体网络配置在 IPv4 配置失败但 "
+"IPv6 配置成功完成时成功。"
-#: ../clients/common/settings-docs.c.in:224
-#: ../clients/common/settings-docs.c.in:245
+#: ../clients/common/settings-docs.h.in:212
+#: ../clients/common/settings-docs.h.in:233
msgid ""
"IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
"support \"auto\", \"manual\", and \"link-local\". See the subclass-specific "
@@ -7117,16 +8059,25 @@ msgid ""
"subnet can be configured by adding one manual IPv4 address or otherwise "
"10.42.x.0/24 is chosen."
msgstr ""
+"IP 配置方法。NMSettingIP4Config 和 NMSettingIP6Config 都支持 \"auto"
+"\"、\"manual\" 和 \"link-local\"。其他值请查看子类特定的文档。通常,对于 "
+"\"auto\" 方法,诸如 \"dns\" 和 \"routes\" 之类的属性指定添加到从自动配置返回"
+"信息的信息。\"ignore-auto-routes\" 和 \"ignore-auto-dns\" 属性会修改此行为。"
+"对于没有上游网络的方法,比如 \"shared\" 或 \"link-local\",这些属性必须为空。"
+"对于 IPv4 方法 \"shared\",配置 IP 子网可通过添加一个手动的 IPv4 地址或是选"
+"择 10.42.x.0/24 完成。"
-#: ../clients/common/settings-docs.c.in:226
-#: ../clients/common/settings-docs.c.in:247
+#: ../clients/common/settings-docs.h.in:213
+#: ../clients/common/settings-docs.h.in:234
msgid ""
"If TRUE, this connection will never be the default connection for this IP "
"type, meaning it will never be assigned the default route by NetworkManager."
msgstr ""
+"如果为 TRUE,此连接将永不成为此 IP 类型的默认连接,这表示网络管理器"
+"(NetworkManager)永远不会为其分配默认路由。"
-#: ../clients/common/settings-docs.c.in:227
-#: ../clients/common/settings-docs.c.in:248
+#: ../clients/common/settings-docs.h.in:214
+#: ../clients/common/settings-docs.h.in:235
msgid ""
"The default metric for routes that don't explicitly specify a metric. The "
"default value -1 means that the metric is chosen automatically based on the "
@@ -7136,9 +8087,13 @@ msgid ""
"it to 1024 (user default). Hence, setting this property to zero effectively "
"mean setting it to 1024. For IPv4, zero is a regular value for the metric."
msgstr ""
+"用于没有明确指定跃点的路由器的默认跃点。默认值 -1 表示根据设备类型自动选择跃"
+"点。该跃点应用到自动路由、没有明确跃点设置的手动(静态)路由、地址前缀路由和"
+"默认路由。注意对于 IPv6,内核接受零值(0)但会将其转为 1024(用户默认)。因"
+"此,设置此属性为零等于设置它为 1024。对于 IPv4,零是跃点的常规值。"
-#: ../clients/common/settings-docs.c.in:228
-#: ../clients/common/settings-docs.c.in:249
+#: ../clients/common/settings-docs.h.in:215
+#: ../clients/common/settings-docs.h.in:236
msgid ""
"Enable policy routing (source routing) and set the routing table used when "
"adding routes. This affects all routes, including device-routes, IPv4LL, "
@@ -7154,13 +8109,20 @@ msgid ""
"This is to preserve backward compatibility for users who manage routing "
"tables outside of NetworkManager."
msgstr ""
+"启用策略路由(源路由)并在添加路由时设定路由表。此属性影响所有的路由器,包括"
+"设备路由、IPv4LL、DHCP、SLAAC、默认路由和静态路由。但请注意静态路由可以通过明"
+"确地指定非零的路由表来自己覆盖掉设置。如果表设置保留为零,它有权被全局配置覆"
+"盖。如果在应用全局配置值后属性仍为零,对此连接的地址族禁用策略路由。禁用策略"
+"路由意味着网络管理器(NetworkManager)将添加所有路由到主表(除了明确配置了不"
+"同路由表的静态路由)。另外,网络管理器将不会从表中删除任何外部路由,除了主路"
+"由。这是为了给用网络管理器之外工具管理路由表的用户保持后向兼容性。"
-#: ../clients/common/settings-docs.c.in:229
-#: ../clients/common/settings-docs.c.in:250
+#: ../clients/common/settings-docs.h.in:216
+#: ../clients/common/settings-docs.h.in:237
msgid "Array of IP routes."
-msgstr ""
+msgstr "IP 路由数组。"
-#: ../clients/common/settings-docs.c.in:230
+#: ../clients/common/settings-docs.h.in:217
msgid ""
"Configure method for creating the address for use with RFC4862 IPv6 "
"Stateless Address Autoconfiguration. The permitted values are: "
@@ -7181,8 +8143,61 @@ msgid ""
"Privacy Extensions as configured by \"ip6-privacy\" property and it does not "
"affect the temporary addresses configured with this option."
msgstr ""
-
-#: ../clients/common/settings-docs.c.in:243
+"创建用于 RFC4862 IPv6 无状态地址自动配置的地址的配置方法。允许的值有:"
+"NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) 或 "
+"NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1)。如果属性设为 EUI64,"
+"地址将使用衍生自硬件地址的接口令牌来生成。这会让地址的主机部分保持不变,使得"
+"在地址变化时能够追踪主机的存在。接口硬件被替换时地址改变。stable-privacy 值启"
+"用主机特定密钥的加密安全散列,随同连接的 stable-id 和由 RFC7217 指定的网络地"
+"址一起使用。这使得可以利用地址追踪主机的存在,且在网络接口硬件被替换时能保持"
+"地址固定。在 D-Bus 上,没有 addr-gen-mode 设置等于启用 stable-privacy。对于密"
+"钥文件,磁盘上没有设置则表示 EUI6,因此属性在从旧版本升级时不会改变。注意此设"
+"置与由 \"ip6-privacy\" 配置的隐私扩展不同,而且它不会影响此选项配置的临时地"
+"址。"
+
+#: ../clients/common/settings-docs.h.in:220
+msgid ""
+"A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp "
+"client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried "
+"in the Client Identifier option. If the property is a hex string ('aa:bb:"
+"cc') it is interpreted as a binary DUID and filled as an opaque value in the "
+"Client Identifier option. The special value \"lease\" will retrieve the DUID "
+"previously used from the lease file belonging to the connection. If no DUID "
+"is found and \"dhclient\" is the configured dhcp client, the DUID is "
+"searched in the system-wide dhclient lease file. If still no DUID is found, "
+"or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) "
+"will be generated based on the machine-id. The special values \"llt\" and "
+"\"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the "
+"current MAC address of the device. In order to try providing a stable DUID-"
+"LLT, the time field will contain a constant timestamp that is used globally "
+"(for all profiles) and persisted to disk. The special values \"stable-llt\", "
+"\"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding "
+"type, derived from the connection's stable-id and a per-host unique key. So, "
+"the link-layer address of \"stable-ll\" and \"stable-llt\" will be a "
+"generated address derived from the stable id. The DUID-LLT time value in the "
+"\"stable-llt\" option will be picked among a static timespan of three years "
+"(the upper bound of the interval is the same constant timestamp used in \"llt"
+"\"). When the property is unset, the global value provided for \"ipv6.dhcp-"
+"duid\" is used. If no global value is provided, the default \"lease\" value "
+"is assumed."
+msgstr ""
+"包含 DHCPv6 唯一标识符(DUID)的字符串,用于 dhcp 客户端鉴定它自己到 DHCPv6 "
+"服务器(RFC 3315)。DUID 携带在客户端标识符选项中。如果属性为十六进制的字符串"
+"(\"aa:bb:cc\"),它被解读为二进制 DUID 并在客户端标识符选项中以不透明值填"
+"充。特殊值 \"lease\" 将重试连接所属租约文件上次使用的 DUID。如果为找到且 "
+"\"dhclient\" 为配置的 dhcp 客户端,DUID 将在系统范围的 dhclient 租约文件中搜"
+"索。如果仍为找到 DUID 或使用了其他 dhcp 客户端,将基于 machine-id 生成全局和"
+"永久的 DUID-UUID(RFC 6355)。特殊值 \"llt\" 和 \"ll\" 将基于设备的当前 MAC "
+"地址生成 LLT 或 LL 类型的 DUID(参阅 RFC 3315)。为了试着提供稳定的 DUID-"
+"LLT,时间字段将包含固定时间戳,用于全局(的所有配置集)且保留到磁盘上。特殊"
+"值 \"stable-llt\"、\"stable-ll\" 和 \"stable-uuid\" 将生成相应类型的 DUID,衍"
+"生自连接的 stable-id 和每个主机的唯一密钥。因此,\"stable-ll\" 和 \"stable-"
+"llt\" 的链路层地址将是衍生自稳定 id 的生成地址。\"stable-llt\" 选项中的 DUID-"
+"LLT 时间值将在静态的三年时间跨度中选择(区间的上限与用在 \"llt\" 中的固定时间"
+"戳相同)。当属性未设定时,使用 \"ipv6.dhcp-duid\" 提供的全局值。如果未提供全"
+"局值,认定为默认的 \"lease\" 值。"
+
+#: ../clients/common/settings-docs.h.in:231
msgid ""
"Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If "
"enabled, it makes the kernel generate a temporary IPv6 address in addition "
@@ -7198,316 +8213,419 @@ msgid ""
"\"stable-privacy\" setting as another way of avoiding host tracking with "
"IPv6 addresses."
msgstr ""
+"配置 SLAAC 的 IPv6 隐私扩展,描述于 RFC4941。如果启用,它让内核通过修改 "
+"EUI-64 生成临时的 IPv6 地址附加到从 MAC 地址生成的公共地址上。此可以增强隐私"
+"性,但另一方面也可能在有些应用程序上引起问题。允许的值有:-1,未知;0:禁用;"
+"1:启用(首选公共地址);2:启用(首选临时地址)。把单个连接的设置设为 "
+"\"-1\" 表示其回落到全局配置 \"ipv6.ip6-privacy\"。如果全局配置也为配置或设为 "
+"\"-1\",回落到读取 \"/proc/sys/net/ipv6/conf/default/use_tempaddr\" 的值。注"
+"意此设置与固定隐私地址不同,后者可通过 \"addr-gen-mode\" 属性的 \"stable-"
+"privacy\" 设置启用,可作为避免 IPv6 地址追踪的另一种方法。"
-#: ../clients/common/settings-docs.c.in:251
+#: ../clients/common/settings-docs.h.in:238
msgid ""
"Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
"tokenized interface identifiers. Useful with eui64 addr-gen-mode."
msgstr ""
+"配置用于 draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 令牌化接口标识符"
+"的令牌。对 eui64 addr-gen-mode 有用。"
-#: ../clients/common/settings-docs.c.in:252
+#: ../clients/common/settings-docs.h.in:239
msgid "Whether the transmitted traffic must be encrypted."
-msgstr ""
+msgstr "是否加密传输的流量。"
-#: ../clients/common/settings-docs.c.in:253
+#: ../clients/common/settings-docs.h.in:240
msgid ""
"The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
-msgstr ""
+msgstr "用于 MACsec 密钥协商的预共享 CAK。"
-#: ../clients/common/settings-docs.c.in:254
+#: ../clients/common/settings-docs.h.in:241
msgid "Flags indicating how to handle the \"mka-cak\" property."
-msgstr ""
+msgstr "指示如何处理 \"mka-cak\" 属性的标志。"
-#: ../clients/common/settings-docs.c.in:255
+#: ../clients/common/settings-docs.h.in:242
msgid ""
"The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
"Agreement."
-msgstr ""
+msgstr "用于 MACsec 密钥协商的预共享 CKN(连接关联密钥名称)。"
-#: ../clients/common/settings-docs.c.in:256
+#: ../clients/common/settings-docs.h.in:243
msgid ""
"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
"Agreement) is obtained."
-msgstr ""
+msgstr "指定如何获取用于 MKA(MACsec 密钥协商)的 CAK(连接关联密钥)。"
-#: ../clients/common/settings-docs.c.in:258
+#: ../clients/common/settings-docs.h.in:244
msgid ""
"If given, specifies the parent interface name or parent connection UUID from "
"which this MACSEC interface should be created. If this property is not "
"specified, the connection must contain an \"802-3-ethernet\" setting with a "
"\"mac-address\" property."
msgstr ""
+"如果给定了,其指定从此 MACSEC 接口应该创建自的上级接口名称或上级连接的 UUID。"
+"如果此属性未指定,该连接必须包含具有 \"mac-address\" 属性的 \"802-3-ethernet"
+"\" 设置。"
-#: ../clients/common/settings-docs.c.in:259
+#: ../clients/common/settings-docs.h.in:245
msgid ""
"The port component of the SCI (Secure Channel Identifier), between 1 and "
"65534."
-msgstr ""
+msgstr "SCI(安全信道标识符)的端口组件,介于 1 和 65534 之间。"
-#: ../clients/common/settings-docs.c.in:260
+#: ../clients/common/settings-docs.h.in:246
+msgid ""
+"Specifies whether the SCI (Secure Channel Identifier) is included in every "
+"packet."
+msgstr "指定 SCI(安全信道标识符)是否包括在每个数据包中。"
+
+#: ../clients/common/settings-docs.h.in:247
msgid "Specifies the validation mode for incoming frames."
-msgstr ""
+msgstr "指定传入帧的验证模式。"
-#: ../clients/common/settings-docs.c.in:261
+#: ../clients/common/settings-docs.h.in:248
msgid ""
"The macvlan mode, which specifies the communication mechanism between "
"multiple macvlans on the same lower device."
-msgstr ""
+msgstr "macvlan 模式,它指定了同一低层设备上的多个 macvlans 之间的通信机制。"
-#: ../clients/common/settings-docs.c.in:263
+#: ../clients/common/settings-docs.h.in:249
msgid ""
"If given, specifies the parent interface name or parent connection UUID from "
"which this MAC-VLAN interface should be created. If this property is not "
"specified, the connection must contain an \"802-3-ethernet\" setting with a "
"\"mac-address\" property."
msgstr ""
+"如果给定了,其指定从此 MAC-VLAN 接口应该创建自的上级接口名称或上级连接的 "
+"UUID。如果此属性未指定,该连接必须包含具有 \"mac-address\" 属性的 \"802-3-"
+"ethernet\" 设置。"
-#: ../clients/common/settings-docs.c.in:264
+#: ../clients/common/settings-docs.h.in:250
msgid "Whether the interface should be put in promiscuous mode."
-msgstr ""
+msgstr "是否应将接口置于混杂模式。"
-#: ../clients/common/settings-docs.c.in:265
+#: ../clients/common/settings-docs.h.in:251
msgid "Whether the interface should be a MACVTAP."
+msgstr "接口是否应为 MACVTAP。"
+
+#: ../clients/common/settings-docs.h.in:252
+msgid ""
+"A list of interface names to match. Each element is a shell wildcard "
+"pattern. When an element is prefixed with exclamation mark (!) the "
+"condition is inverted. A candidate interface name is considered matching "
+"when both these conditions are satisfied: (a) any of the elements not "
+"prefixed with '!' matches or there aren't such elements; (b) none of the "
+"elements prefixed with '!' match."
msgstr ""
+"要匹配的接口名列表。每个元素都为 shell 通配符模式。当元素以感叹号(!)为前缀"
+"时,条件反转。当满足下列条件时,视为匹配的候选接口名:(a) 未前插 \"!\" 的任意"
+"元素匹配或不存此类元素;(b) 无前插 \"!\" 的元素匹配。"
-#: ../clients/common/settings-docs.c.in:266
+#: ../clients/common/settings-docs.h.in:253
msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
-msgstr ""
+msgstr "网桥失败模式。\"secure\"、\"standalone\" 之一或留空。"
-#: ../clients/common/settings-docs.c.in:267
+#: ../clients/common/settings-docs.h.in:254
msgid "Enable or disable multicast snooping."
-msgstr ""
+msgstr "启用或禁用多播监听。"
-#: ../clients/common/settings-docs.c.in:269
+#: ../clients/common/settings-docs.h.in:255
msgid "Enable or disable RSTP."
-msgstr ""
+msgstr "启用或禁用 RSTP。"
-#: ../clients/common/settings-docs.c.in:270
+#: ../clients/common/settings-docs.h.in:256
msgid "Enable or disable STP."
-msgstr ""
+msgstr "启用或禁用 STP。"
-#: ../clients/common/settings-docs.c.in:272
+#: ../clients/common/settings-docs.h.in:257
msgid "The interface type. Either \"internal\", or empty."
-msgstr ""
+msgstr "接口类型。要么为 \"internal\",要么留空。"
-#: ../clients/common/settings-docs.c.in:274
+#: ../clients/common/settings-docs.h.in:258
msgid ""
-"Specifies the unicast destination IP address of a remote OpenVSwitch bridge "
+"Specifies the unicast destination IP address of a remote Open vSwitch bridge "
"port to connect to."
-msgstr ""
+msgstr "指定要连接的远程 Open vSwitch 网桥端口的单播目标 IP 地址。"
-#: ../clients/common/settings-docs.c.in:275
+#: ../clients/common/settings-docs.h.in:259
msgid "The time port must be inactive in order to be considered down."
-msgstr ""
+msgstr "端口被视为关闭所需停用的时间。"
-#: ../clients/common/settings-docs.c.in:276
+#: ../clients/common/settings-docs.h.in:260
msgid ""
"Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
msgstr ""
+"绑定(Bonding)模式。\"active-backup\"、\"balance-slb\" 或 \"balance-tcp\" 之"
+"一。"
-#: ../clients/common/settings-docs.c.in:277
+#: ../clients/common/settings-docs.h.in:261
msgid "The time port must be active before it starts forwarding traffic."
-msgstr ""
+msgstr "端口开始流量转发所需激活的时间。"
-#: ../clients/common/settings-docs.c.in:278
+#: ../clients/common/settings-docs.h.in:262
msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
-msgstr ""
+msgstr "LACP 模式。\"active\"、\"off\" 或 \"passive\" 之一。"
-#: ../clients/common/settings-docs.c.in:280
+#: ../clients/common/settings-docs.h.in:263
msgid "The VLAN tag in the range 0-4095."
-msgstr ""
+msgstr "VLAN 标记在 0~4095 范围内。"
-#: ../clients/common/settings-docs.c.in:281
+#: ../clients/common/settings-docs.h.in:264
msgid ""
"The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
"\"trunk\" or unset."
msgstr ""
+"VLAN 模式。\"access\"、\"native-tagged\"、\"native-untagged\"、\"trunk\" 之一"
+"或不设定。"
-#: ../clients/common/settings-docs.c.in:282
+#: ../clients/common/settings-docs.h.in:265
msgid ""
"If non-zero, instruct pppd to set the serial port to the specified "
"baudrate. This value should normally be left as 0 to automatically choose "
"the speed."
msgstr ""
+"如果非零,指示 pppd 设定串口到指定的波特率。要自动选择速度时此值通常保留为 "
+"0。"
-#: ../clients/common/settings-docs.c.in:283
+#: ../clients/common/settings-docs.h.in:266
msgid ""
"If TRUE, specify that pppd should set the serial port to use hardware flow "
"control with RTS and CTS signals. This value should normally be set to "
"FALSE."
msgstr ""
+"如果为 TRUE,指定 pppd 应设定串口以使用通过 RTS 和 CTS 信号的硬件流量控制。此"
+"值通常应设为 FALSE。"
-#: ../clients/common/settings-docs.c.in:284
+#: ../clients/common/settings-docs.h.in:267
msgid ""
"If non-zero, instruct pppd to presume the connection to the peer has failed "
"if the specified number of LCP echo-requests go unanswered by the peer. The "
"\"lcp-echo-interval\" property must also be set to a non-zero value if this "
"property is used."
msgstr ""
+"如果非零,指示如果指定的 LCP 回响请求号码未被节点回应时 pppd 就认定到节点的连"
+"接失败了。如果要使用此属性,\"lcp-echo-interval\" 属性也必须设为非零值。"
-#: ../clients/common/settings-docs.c.in:285
+#: ../clients/common/settings-docs.h.in:268
msgid ""
"If non-zero, instruct pppd to send an LCP echo-request frame to the peer "
"every n seconds (where n is the specified value). Note that some PPP peers "
"will respond to echo requests and some will not, and it is not possible to "
"autodetect this."
msgstr ""
+"如果非零,指示 pppd 每几秒发送一个 LCP 回响请求帧到节点(几秒为该属性指定)。"
+"注意有些 PPP 节点将响应回响请求而有些不会,并且无法自动检测此行为。"
-#: ../clients/common/settings-docs.c.in:286
+#: ../clients/common/settings-docs.h.in:269
msgid ""
"If TRUE, stateful MPPE is used. See pppd documentation for more information "
"on stateful MPPE."
msgstr ""
+"如果为 TRUE,使用有状态 MPPE。关于有状态 MPPPE 的更多信息请查看 pppd 文档。"
-#: ../clients/common/settings-docs.c.in:287
+#: ../clients/common/settings-docs.h.in:270
msgid ""
"If non-zero, instruct pppd to request that the peer send packets no larger "
"than the specified size. If non-zero, the MRU should be between 128 and "
"16384."
msgstr ""
+"如果非零,指示 pppd 请求节点发送的数据包不要超过指定的大小。如果非零,MRU 应"
+"在 128 和 16384 之间。"
-#: ../clients/common/settings-docs.c.in:288
+#: ../clients/common/settings-docs.h.in:271
msgid ""
"If non-zero, instruct pppd to send packets no larger than the specified size."
-msgstr ""
+msgstr "如果非零,指示 pppd 不要发送超过指定大小的数据包。"
-#: ../clients/common/settings-docs.c.in:290
+#: ../clients/common/settings-docs.h.in:272
msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
-msgstr ""
+msgstr "如果为 TRUE,将不请求压缩 Van Jacobsen TCP 首部。"
-#: ../clients/common/settings-docs.c.in:291
+#: ../clients/common/settings-docs.h.in:273
msgid ""
"If TRUE, do not require the other side (usually the PPP server) to "
"authenticate itself to the client. If FALSE, require authentication from "
"the remote side. In almost all cases, this should be TRUE."
msgstr ""
+"如果为 TRUE,不需要其他方(通常是 PPP 服务器)验证自己到客户端。如果为 "
+"FALSE,需要来自远端的验证。在大多数情况下,此属性应为 TRUE。"
-#: ../clients/common/settings-docs.c.in:292
+#: ../clients/common/settings-docs.h.in:274
msgid "If TRUE, BSD compression will not be requested."
-msgstr ""
+msgstr "如果为 TURE,将不会请求 BSD 压缩。"
-#: ../clients/common/settings-docs.c.in:293
+#: ../clients/common/settings-docs.h.in:275
msgid "If TRUE, \"deflate\" compression will not be requested."
-msgstr ""
+msgstr "如果为 TURE,将不会请求 \"deflate\" 压缩。"
-#: ../clients/common/settings-docs.c.in:294
+#: ../clients/common/settings-docs.h.in:276
msgid "If TRUE, the CHAP authentication method will not be used."
-msgstr ""
+msgstr "如果为 TRUE,将不会使用 CHAP 验证方法。"
-#: ../clients/common/settings-docs.c.in:295
+#: ../clients/common/settings-docs.h.in:277
msgid "If TRUE, the EAP authentication method will not be used."
-msgstr ""
+msgstr "如果为 TRUE,将不会使用 EAP 验证方法。"
-#: ../clients/common/settings-docs.c.in:296
+#: ../clients/common/settings-docs.h.in:278
msgid "If TRUE, the MSCHAP authentication method will not be used."
-msgstr ""
+msgstr "如果为 TRUE,将不会使用 MSCHAP 验证方法。"
-#: ../clients/common/settings-docs.c.in:297
+#: ../clients/common/settings-docs.h.in:279
msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
-msgstr ""
+msgstr "如果为 TRUE,将不会使用 MSCHAPv2 验证方法。"
-#: ../clients/common/settings-docs.c.in:298
+#: ../clients/common/settings-docs.h.in:280
msgid "If TRUE, the PAP authentication method will not be used."
-msgstr ""
+msgstr "如果为 TRUE,将不会使用 PAP 验证方法。"
-#: ../clients/common/settings-docs.c.in:299
+#: ../clients/common/settings-docs.h.in:281
msgid ""
"If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the "
"PPP session. If either 64-bit or 128-bit MPPE is not available the session "
"will fail. Note that MPPE is not used on mobile broadband connections."
msgstr ""
+"如果为 TRUE,PPP 会话将需要 MPPE(微软点对点加密)。如果 64 位或 128 位的 "
+"MPPE 都不可用,会话将失败。注意 MPPE 不用在移动宽带连接。"
-#: ../clients/common/settings-docs.c.in:300
+#: ../clients/common/settings-docs.h.in:282
msgid ""
"If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required "
"for the PPP session, and the \"require-mppe\" property must also be set to "
"TRUE. If 128-bit MPPE is not available the session will fail."
msgstr ""
+"如果为 TRUE,PPP 会话将需要 MPPE(微软点对点加密)且 \"require-mppe\" 也必须"
+"设为 TRUE。如果 128 位的 MPPE 不可用,会话将失败。"
-#: ../clients/common/settings-docs.c.in:302
+#: ../clients/common/settings-docs.h.in:283
msgid ""
"If given, specifies the parent interface name on which this PPPoE connection "
"should be created. If this property is not specified, the connection is "
"activated on the interface specified in \"interface-name\" of "
"NMSettingConnection."
msgstr ""
+"如果给定了,指定此 PPPoE 连接应被创建在的上级接口名。如果此属性未指定,连接将"
+"激活到 NMSettingConnection 的 \"interface-name\" 所指定的接口。"
-#: ../clients/common/settings-docs.c.in:303
+#: ../clients/common/settings-docs.h.in:284
msgid "Password used to authenticate with the PPPoE service."
-msgstr ""
+msgstr "用于 PPPoE 服务验证的密码。"
-#: ../clients/common/settings-docs.c.in:305
+#: ../clients/common/settings-docs.h.in:286
msgid ""
"If specified, instruct PPPoE to only initiate sessions with access "
"concentrators that provide the specified service. For most providers, this "
"should be left blank. It is only required if there are multiple access "
"concentrators or a specific service is known to be required."
msgstr ""
+"如果指定了,指示 PPPoE 只启动与提供了指定服务的集线器的会话。对于大多数运营"
+"商,此属性应留空。如果有多个集线器存在或者特定服务需要时,此属性才需要设定。"
-#: ../clients/common/settings-docs.c.in:306
+#: ../clients/common/settings-docs.h.in:287
msgid "Username used to authenticate with the PPPoE service."
-msgstr ""
+msgstr "用于 PPPoE 服务验证的用户名。"
-#: ../clients/common/settings-docs.c.in:307
+#: ../clients/common/settings-docs.h.in:288
msgid "Whether the proxy configuration is for browser only."
-msgstr ""
+msgstr "代理配置是否只用于浏览器。"
-#: ../clients/common/settings-docs.c.in:308
+#: ../clients/common/settings-docs.h.in:289
msgid ""
"Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)"
-msgstr ""
+msgstr "代理配置的方法,默认为 NM_SETTING_PROXY_METHOD_NONE (0)"
-#: ../clients/common/settings-docs.c.in:310
+#: ../clients/common/settings-docs.h.in:290
msgid "PAC script for the connection."
-msgstr ""
+msgstr "用于连接的 PAC 脚本。"
-#: ../clients/common/settings-docs.c.in:311
+#: ../clients/common/settings-docs.h.in:291
msgid "PAC URL for obtaining PAC file."
-msgstr ""
+msgstr "用户获取 PAC 文件的 PAC URL。"
-#: ../clients/common/settings-docs.c.in:312
+#: ../clients/common/settings-docs.h.in:292
msgid ""
"Speed to use for communication over the serial port. Note that this value "
"usually has no effect for mobile broadband modems as they generally ignore "
"speed settings and use the highest available speed."
msgstr ""
+"通过串口通信使用的速度。注意该值一般对移动宽带调制解调器没有效果,因为它们通"
+"常忽略速度设置并使用最高的可用速度。"
-#: ../clients/common/settings-docs.c.in:313
+#: ../clients/common/settings-docs.h.in:293
msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
-msgstr ""
+msgstr "串口通信的字节宽度。以 \"8n1\" 中的 8 为例。"
-#: ../clients/common/settings-docs.c.in:315
+#: ../clients/common/settings-docs.h.in:294
msgid "Parity setting of the serial port."
-msgstr ""
+msgstr "串口的奇偶校验设置。"
-#: ../clients/common/settings-docs.c.in:316
+#: ../clients/common/settings-docs.h.in:295
msgid "Time to delay between each byte sent to the modem, in microseconds."
-msgstr ""
+msgstr "每次发送字节到调制解调器的延迟时间,以微秒计。"
-#: ../clients/common/settings-docs.c.in:317
+#: ../clients/common/settings-docs.h.in:296
msgid ""
"Number of stop bits for communication on the serial port. Either 1 or 2. "
"The 1 in \"8n1\" for example."
-msgstr ""
-
-#: ../clients/common/settings-docs.c.in:319
-msgid "Array of TC queuening disciplines."
-msgstr ""
-
-#: ../clients/common/settings-docs.c.in:320
+msgstr "用在串口通信的停止位数量。要么是 1 要么是 2。以 \"8n1\" 中的 1 为例。"
+
+#: ../clients/common/settings-docs.h.in:297
+msgid ""
+"Whether to autoprobe virtual functions by a compatible driver. If set to "
+"NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver "
+"and if this succeeds a new network interface will be instantiated for each "
+"VF. If set to NM_TERNARY_FALSE (0), VFs will not be claimed and no network "
+"interfaces will be created for them. When set to NM_TERNARY_DEFAULT (-1), "
+"the global default is used; in case the global default is unspecified it is "
+"assumed to be NM_TERNARY_TRUE (1)."
+msgstr ""
+"是否通过兼容的驱动程序自动探测虚拟功能(virtual function)。如果设为 "
+"NM_TERNARY_TRUE (1),内核将尝试绑定虚拟功能到兼容的驱动,而且如果成功,每个虚"
+"拟功能都将实例化一个新的网络接口。如果设为 NM_TERNARY_FALSE (0),虚拟功能将不"
+"被声明且不会为它们创建网络接口。当设为 NM_TERNARY_DEFAULT (-1) 时,使用全局默"
+"认值;全局默认未指定的情况下则假定为 NM_TERNARY_TRUE (1)。"
+
+#: ../clients/common/settings-docs.h.in:298
+msgid "The total number of virtual functions to create."
+msgstr "要创建的虚拟功能总数。"
+
+#: ../clients/common/settings-docs.h.in:299
+msgid ""
+"Array of virtual function descriptors. Each VF descriptor is a dictionary "
+"mapping attribute names to GVariant values. The 'index' entry is mandatory "
+"for each VF. When represented as string a VF is in the form: \"INDEX "
+"[ATTR=VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-"
+"check=true\". The \"vlans\" attribute is represented as a semicolor-"
+"separated list of VLAN descriptors, where each descriptor has the form \"ID[."
+"PRIORITY[.PROTO]]\". PROTO can be either 'q' for 802.1Q (the default) or "
+"'ad' for 802.1ad."
+msgstr ""
+"虚拟功能描述符阵列。每个虚拟功能描述符是个映射属性名到 GVariant 值的字"
+"典。\"index\" 条目为每个虚拟功能的必填项。当表示为字符串时,虚拟功能的格式"
+"为:\"INDEX [ATTR=VALUE[ ATTR=VALUE]...]\"。例如:\"2 mac=00:11:22:33:44:55 "
+"spoof-check=true\"。\"vlans\" 属性表示为分号分隔的 VLAN 描述符列表,其中每个"
+"描述符的格式为 \"ID[.PRIORITY[.PROTO]]\"。PROTO 可以是用于 802.1Q(默认)的 "
+"\"q\" 或用于 802.1ad 的 \"ad\"。"
+
+#: ../clients/common/settings-docs.h.in:300
+msgid "Array of TC queueing disciplines."
+msgstr "TC 排队规则阵列。"
+
+#: ../clients/common/settings-docs.h.in:301
msgid "Array of TC traffic filters."
-msgstr ""
+msgstr "TC 流量过滤器阵列。"
-#: ../clients/common/settings-docs.c.in:321
+#: ../clients/common/settings-docs.h.in:302
msgid ""
"The JSON configuration for the team network interface. The property should "
"contain raw JSON configuration data suitable for teamd, because the value is "
"passed directly to teamd. If not specified, the default configuration is "
"used. See man teamd.conf for the format details."
msgstr ""
+"组合(team)网络接口的 JSON 配置。此属性应包含适用于 teamd 的原始 JSON 配置,"
+"因为该值直接传递给 teamd。如果未指定则使用默认的配置。格式详情请参阅 teamd."
+"conf 手册。"
-#: ../clients/common/settings-docs.c.in:322
-#: ../clients/common/settings-docs.c.in:341
+#: ../clients/common/settings-docs.h.in:303
+#: ../clients/common/settings-docs.h.in:321
msgid ""
"Link watchers configuration for the connection: each link watcher is defined "
"by a dictionary, whose keys depend upon the selected link watcher. Available "
@@ -7518,149 +8636,175 @@ msgid ""
"'validate-active', 'validate-incative', 'send-always'. See teamd.conf man "
"for more details."
msgstr ""
+"连接的链路监视器配置:每个链路监视器都由一个目录定义,其密钥取决于所选的链路"
+"监视器。可用的链路监视器有 \"ethtool\"、\"nsna_ping\" 和 \"arp_ping\",并且在"
+"目录中以密钥 \"name\" 指定。可用的密钥有: ethtool:\"delay-up\"、\"delay-"
+"down\"、\"init-wait\";nsna_ping:\"init-wait\"、\"interval\"、\"missed-max"
+"\"、\"target-host\";arp_ping:包括 nsna_ping 中的和 \"source-host"
+"\"、\"validate-active\"、\"validate-incative\"、\"send-always\"。"
-#: ../clients/common/settings-docs.c.in:323
+#: ../clients/common/settings-docs.h.in:304
msgid "Corresponds to the teamd mcast_rejoin.count."
-msgstr ""
+msgstr "对应于 teamd mcast_rejoin.count。"
-#: ../clients/common/settings-docs.c.in:324
+#: ../clients/common/settings-docs.h.in:305
msgid "Corresponds to the teamd mcast_rejoin.interval."
-msgstr ""
+msgstr "对应于 teamd mcast_rejoin.interval。"
-#: ../clients/common/settings-docs.c.in:326
+#: ../clients/common/settings-docs.h.in:306
msgid "Corresponds to the teamd notify_peers.count."
-msgstr ""
+msgstr "对应于 teamd notify_peers.count。"
-#: ../clients/common/settings-docs.c.in:327
+#: ../clients/common/settings-docs.h.in:307
msgid "Corresponds to the teamd notify_peers.interval."
-msgstr ""
+msgstr "对应于 teamd notify_peers.interval。"
-#: ../clients/common/settings-docs.c.in:328
+#: ../clients/common/settings-docs.h.in:308
msgid ""
"Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
-"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\"."
+"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". When "
+"setting the runner, all the properties specific to the runner will be reset "
+"to the default value; all the properties specific to other runners will be "
+"set to an empty value (or if not possible to a default value)."
msgstr ""
+"对应于 teamd runner.name。允许的值有:\"roundrobin\"、\"broadcast"
+"\"、\"activebackup\"、\"loadbalance\"、\"lacp\" 和 \"random\"。设置运行程序"
+"时,所有指定到运行程序的属性都将充值为默认值;所有指定到其他运行程序的属性都"
+"将设为空值(或者不可能时设为默认值)。"
-#: ../clients/common/settings-docs.c.in:329
+#: ../clients/common/settings-docs.h.in:309
msgid "Corresponds to the teamd runner.active."
-msgstr ""
+msgstr "对应于 teamd runner.active。"
-#: ../clients/common/settings-docs.c.in:330
+#: ../clients/common/settings-docs.h.in:310
msgid "Corresponds to the teamd runner.agg_select_policy."
-msgstr ""
+msgstr "对应于 teamd runner.agg_select_policy。"
-#: ../clients/common/settings-docs.c.in:331
+#: ../clients/common/settings-docs.h.in:311
msgid "Corresponds to the teamd runner.fast_rate."
-msgstr ""
+msgstr "对应于 teamd runner.fast_rate。"
-#: ../clients/common/settings-docs.c.in:332
+#: ../clients/common/settings-docs.h.in:312
msgid "Corresponds to the teamd runner.hwaddr_policy."
-msgstr ""
+msgstr "对应于 teamd runner.hwaddr_policy。"
-#: ../clients/common/settings-docs.c.in:333
+#: ../clients/common/settings-docs.h.in:313
msgid "Corresponds to the teamd runner.min_ports."
-msgstr ""
+msgstr "对应于 teamd runner.min_ports。"
-#: ../clients/common/settings-docs.c.in:334
+#: ../clients/common/settings-docs.h.in:314
msgid "Corresponds to the teamd runner.sys_prio."
-msgstr ""
+msgstr "对应于 teamd runner.sys_prio。"
-#: ../clients/common/settings-docs.c.in:335
+#: ../clients/common/settings-docs.h.in:315
msgid "Corresponds to the teamd runner.tx_balancer.name."
-msgstr ""
+msgstr "对应于 teamd runner.tx_balancer.name。"
-#: ../clients/common/settings-docs.c.in:336
+#: ../clients/common/settings-docs.h.in:316
msgid "Corresponds to the teamd runner.tx_balancer.interval."
-msgstr ""
+msgstr "对应于 teamd runner.tx_balancer.interval。"
-#: ../clients/common/settings-docs.c.in:337
+#: ../clients/common/settings-docs.h.in:317
msgid "Corresponds to the teamd runner.tx_hash."
-msgstr ""
+msgstr "对应于 teamd runner.tx_hash。"
-#: ../clients/common/settings-docs.c.in:338
+#: ../clients/common/settings-docs.h.in:318
msgid ""
"The JSON configuration for the team port. The property should contain raw "
"JSON configuration data suitable for teamd, because the value is passed "
"directly to teamd. If not specified, the default configuration is used. See "
"man teamd.conf for the format details."
msgstr ""
+"组合(team)接口的 JSON 配置。此属性应包含适用于 teamd 的原始 JSON 配置,因为"
+"该值直接传递给 teamd。如果未指定则使用默认的配置。格式详情请参阅 teamd.conf "
+"手册。"
-#: ../clients/common/settings-docs.c.in:339
+#: ../clients/common/settings-docs.h.in:319
msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
-msgstr ""
+msgstr "对应于 teamd ports.PORTIFNAME.lacp_key。"
-#: ../clients/common/settings-docs.c.in:340
+#: ../clients/common/settings-docs.h.in:320
msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
-msgstr ""
+msgstr "对应于 teamd ports.PORTIFNAME.lacp_prio。"
-#: ../clients/common/settings-docs.c.in:343
+#: ../clients/common/settings-docs.h.in:322
msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
-msgstr ""
+msgstr "对应于 teamd ports.PORTIFNAME.prio。"
-#: ../clients/common/settings-docs.c.in:344
+#: ../clients/common/settings-docs.h.in:323
msgid ""
"Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
"parameter is skipped from the json config."
msgstr ""
+"对应于 teamd ports.PORTIFNAME.queue_id。设定为 -1 时表示参数从 json 配置忽"
+"略。"
-#: ../clients/common/settings-docs.c.in:345
+#: ../clients/common/settings-docs.h.in:324
msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
-msgstr ""
+msgstr "对应于 teamd ports.PORTIFNAME.sticky。"
-#: ../clients/common/settings-docs.c.in:346
+#: ../clients/common/settings-docs.h.in:325
msgid ""
"The group ID which will own the device. If set to NULL everyone will be able "
"to use the device."
-msgstr ""
+msgstr "将拥有设备的组 ID。如果设为 NULL 则每个人都能使用设备。"
-#: ../clients/common/settings-docs.c.in:347
+#: ../clients/common/settings-docs.h.in:326
msgid ""
"The operating mode of the virtual device. Allowed values are "
"NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
"NM_SETTING_TUN_MODE_TAP (2) to create an Ethernet-like layer 2 one."
msgstr ""
+"虚拟设备的操作模式。允许值有 NM_SETTING_TUN_MODE_TUN (1) 以创建第三层设备和 "
+"NM_SETTING_TUN_MODE_TAP (2) 以创建类以太网的第二层设备。"
-#: ../clients/common/settings-docs.c.in:348
+#: ../clients/common/settings-docs.h.in:327
msgid ""
"If the property is set to TRUE, the interface will support multiple file "
"descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
"the interface will only support a single queue."
msgstr ""
+"如果属性设为 TRUE,接口将支持多个文件描述符(队列)以并行化数据包的发送和接"
+"收,接口将只支持单个队列。"
-#: ../clients/common/settings-docs.c.in:350
+#: ../clients/common/settings-docs.h.in:328
msgid ""
"The user ID which will own the device. If set to NULL everyone will be able "
"to use the device."
-msgstr ""
+msgstr "将拥有设备的用户 ID。如果设为 NULL 则每个人都能使用设备。"
-#: ../clients/common/settings-docs.c.in:351
+#: ../clients/common/settings-docs.h.in:329
msgid ""
"If TRUE the interface will prepend a 4 byte header describing the physical "
"interface to the packets."
-msgstr ""
+msgstr "如果为 TRUE,接口将前置一个描述到数据包的物理接口的 4 字节首部。"
-#: ../clients/common/settings-docs.c.in:352
+#: ../clients/common/settings-docs.h.in:330
msgid ""
"If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
"header."
-msgstr ""
+msgstr "如果为 TRUE,隧道数据包的 IFF_VNET_HDR 将包含一个 virtio 网络首部。"
-#: ../clients/common/settings-docs.c.in:353
+#: ../clients/common/settings-docs.h.in:331
msgid ""
"A dictionary of key/value pairs with user data. This data is ignored by "
"NetworkManager and can be used at the users discretion. The keys only "
"support a strict ascii format, but the values can be arbitrary UTF8 strings "
"up to a certain length."
msgstr ""
+"包含用户数据的键/值对字典。此数据被网络管理器(NetworkManager)忽略且可被用户"
+"随意使用。键只支持严格的 ASCII 格式,但是值可以为长度有限的任意 UTF8 字符串。"
-#: ../clients/common/settings-docs.c.in:355
+#: ../clients/common/settings-docs.h.in:332
msgid ""
"For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p "
"priorities. The mapping is given in the format \"from:to\" where both \"from"
"\" and \"to\" are unsigned integers, ie \"7:3\"."
msgstr ""
+"用于传出的数据包,从 Linux SKB 优先级到 802.1p 优先级的映射列表。映射以 \"从:"
+"到\" 的格式给定,其中 \"从\" 和 \"到\" 都是无符号整数,如 \"7:3\"。"
-#: ../clients/common/settings-docs.c.in:356
+#: ../clients/common/settings-docs.h.in:333
msgid ""
"One or more flags which control the behavior and features of the VLAN "
"interface. Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of "
@@ -7672,62 +8816,83 @@ msgid ""
"compatibility, the default-value in the D-Bus API continues to be 0 and a "
"missing property on D-Bus is still considered as 0."
msgstr ""
+"控制 VLAN 接口的行为和功能的一个或多个标志。标识包含 "
+"NM_VLAN_FLAG_REORDER_HEADERS (0x1)(重新排序输出数据包首部)、"
+"NM_VLAN_FLAG_GVRP (0x2)(使用 GVRP 协议)、NM_VLAN_FLAG_LOOSE_BINDING (0x4)"
+"(接口到它主设备运行状态的松散绑定)和 NM_VLAN_FLAG_MVRP (0x8)(使用 MVRP 协"
+"议)。此属性的默认值为 NM_VLAN_FLAG_REORDER_HEADERS,但它以前是 0。为了保持后"
+"向兼容性,D-Bus API 里的默认值继续为 0 而且 D-Bus 上缺少属性时仍视为 0。"
-#: ../clients/common/settings-docs.c.in:357
+#: ../clients/common/settings-docs.h.in:334
msgid ""
"The VLAN identifier that the interface created by this connection should be "
"assigned. The valid range is from 0 to 4094, without the reserved id 4095."
msgstr ""
+"由此连接创建的接口应该分配的 VLAN 标识符。有效范围为从 0 到 4094,不包括保留"
+"的 ID 4095。"
-#: ../clients/common/settings-docs.c.in:358
+#: ../clients/common/settings-docs.h.in:335
msgid ""
"For incoming packets, a list of mappings from 802.1p priorities to Linux SKB "
"priorities. The mapping is given in the format \"from:to\" where both \"from"
"\" and \"to\" are unsigned integers, ie \"7:3\"."
msgstr ""
+"用于传入的数据包,从 802.1p 优先级到 Linux SKB 优先级的映射列表。映射以 \"从:"
+"到\" 的格式给定,其中 \"从\" 和 \"到\" 都是无符号整数,如 \"7:3\"。"
-#: ../clients/common/settings-docs.c.in:360
+#: ../clients/common/settings-docs.h.in:336
msgid ""
"If given, specifies the parent interface name or parent connection UUID from "
"which this VLAN interface should be created. If this property is not "
"specified, the connection must contain an \"802-3-ethernet\" setting with a "
"\"mac-address\" property."
msgstr ""
+"如果给定了,其指定从此 VLAN 接口应该创建自的上级接口名称或上级连接的 UUID。如"
+"果此属性未指定,该连接必须包含具有 \"mac-address\" 属性的 \"802-3-ethernet\" "
+"设置。"
-#: ../clients/common/settings-docs.c.in:361
+#: ../clients/common/settings-docs.h.in:337
msgid ""
"Dictionary of key/value pairs of VPN plugin specific data. Both keys and "
"values must be strings."
-msgstr ""
+msgstr "VPN 插件特定数据的键/值对字典。键和值都必须为字符串。"
-#: ../clients/common/settings-docs.c.in:363
+#: ../clients/common/settings-docs.h.in:338
msgid ""
"If the VPN service supports persistence, and this property is TRUE, the VPN "
"will attempt to stay connected across link changes and outages, until "
"explicitly disconnected."
msgstr ""
+"如果 VPN 服务支持持久连接,并且此属性为 TRUE,VPN 将尝试在链路更改和中断的整"
+"个期间都保持连接,直到手动断开连接。"
-#: ../clients/common/settings-docs.c.in:364
+#: ../clients/common/settings-docs.h.in:339
msgid ""
"Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
"or private keys. Both keys and values must be strings."
msgstr ""
+"VPN 插件指定如密码或密钥的密钥(secret)的键/值对字典。键和值都必须为字符串。"
-#: ../clients/common/settings-docs.c.in:365
+#: ../clients/common/settings-docs.h.in:340
msgid ""
"D-Bus service name of the VPN plugin that this setting uses to connect to "
"its network. i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin."
msgstr ""
+"此连接用于连接到它网络的 VPN 插件的 D-Bus 服务名。例如 org.freedesktop."
+"NetworkManager.vpnc 用于 vpnc 插件。"
-#: ../clients/common/settings-docs.c.in:366
+#: ../clients/common/settings-docs.h.in:341
msgid ""
"Timeout for the VPN service to establish the connection. Some services may "
"take quite a long time to connect. Value of 0 means a default timeout, which "
"is 60 seconds (unless overridden by vpn.timeout in configuration file). "
"Values greater than zero mean timeout in seconds."
msgstr ""
+"VPN 服务建立连接的超时时间。有些服务可能需要很多时间才能连接。值 0 表示默认的"
+"超时,即 60 秒(除非被配置文件中的 vpn.timeout 覆盖)。大于零的值表示以秒计算"
+"的超时时间。"
-#: ../clients/common/settings-docs.c.in:367
+#: ../clients/common/settings-docs.h.in:342
msgid ""
"If the VPN connection requires a user name for authentication, that name "
"should be provided here. If the connection is available to more than one "
@@ -7736,144 +8901,167 @@ msgid ""
"automatically supply the username of the user which requested the VPN "
"connection."
msgstr ""
+"如果 VPN 连接需要用户名用于验证,应在这里提供。如果连接可用于多个用户,且 "
+"VPN 需要每个用户提供个不同的名称,那么让此属性留空。如果此属性留空,网络管理"
+"器(NetworkManager)将自动提供 VPN 连接所需要用户的用户名。"
-#: ../clients/common/settings-docs.c.in:368
+#: ../clients/common/settings-docs.h.in:343
msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
-msgstr ""
+msgstr "指定内核已获知 FDB 条目的生存期,以秒计。"
-#: ../clients/common/settings-docs.c.in:369
+#: ../clients/common/settings-docs.h.in:344
msgid ""
"Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
"endpoint."
-msgstr ""
+msgstr "指定连接到远程 VXLAN 隧道端点的 UDP 目标端口。"
-#: ../clients/common/settings-docs.c.in:370
+#: ../clients/common/settings-docs.h.in:345
msgid ""
"Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
-msgstr ""
+msgstr "指定要使用的 VXLAN 网络标识符(或 VXLAN 分段标识符)。"
-#: ../clients/common/settings-docs.c.in:371
+#: ../clients/common/settings-docs.h.in:346
msgid "Specifies whether netlink LL ADDR miss notifications are generated."
-msgstr ""
+msgstr "指定是否生成网络链路 LL ADDR 未命中通知。"
-#: ../clients/common/settings-docs.c.in:372
+#: ../clients/common/settings-docs.h.in:347
msgid "Specifies whether netlink IP ADDR miss notifications are generated."
-msgstr ""
+msgstr "指定是否生成网络链路 IP ADDR 未命中通知。"
-#: ../clients/common/settings-docs.c.in:373
+#: ../clients/common/settings-docs.h.in:348
msgid ""
"Specifies whether unknown source link layer addresses and IP addresses are "
"entered into the VXLAN device forwarding database."
-msgstr ""
+msgstr "指定是否让未知来源的链路层地址和 IP 地址输入进 VXLAN 设备转发数据库。"
-#: ../clients/common/settings-docs.c.in:374
+#: ../clients/common/settings-docs.h.in:349
msgid ""
"Specifies the maximum number of FDB entries. A value of zero means that the "
"kernel will store unlimited entries."
-msgstr ""
+msgstr "指定 FDB 条目的最大数量。零值表示允许内核存储不限量的条目。"
-#: ../clients/common/settings-docs.c.in:375
+#: ../clients/common/settings-docs.h.in:350
msgid "If given, specifies the source IP address to use in outgoing packets."
-msgstr ""
+msgstr "如果给定,指定要在传出数据包使用的来源 IP 地址。"
-#: ../clients/common/settings-docs.c.in:377
+#: ../clients/common/settings-docs.h.in:351
msgid ""
"If given, specifies the parent interface name or parent connection UUID."
-msgstr ""
+msgstr "如果给定了,其指定上级接口名称或上级连接的 UUID。"
-#: ../clients/common/settings-docs.c.in:378
+#: ../clients/common/settings-docs.h.in:352
msgid "Specifies whether ARP proxy is turned on."
-msgstr ""
+msgstr "指定是否打开 ARP 代理。"
-#: ../clients/common/settings-docs.c.in:379
+#: ../clients/common/settings-docs.h.in:353
msgid ""
"Specifies the unicast destination IP address to use in outgoing packets when "
"the destination link layer address is not known in the VXLAN device "
"forwarding database, or the multicast IP address to join."
msgstr ""
+"指定当目标链路层地址在 VXLAN 设备转发数据库中未知时要在传出数据包中使用的单播"
+"目标 IP 地址,或者要加入的多播 IP 地址。"
-#: ../clients/common/settings-docs.c.in:380
+#: ../clients/common/settings-docs.h.in:354
msgid "Specifies whether route short circuit is turned on."
-msgstr ""
+msgstr "指定是否打开路由短路。"
-#: ../clients/common/settings-docs.c.in:381
+#: ../clients/common/settings-docs.h.in:355
msgid ""
"Specifies the maximum UDP source port to communicate to the remote VXLAN "
"tunnel endpoint."
-msgstr ""
+msgstr "指定连接到远程 VXLAN 隧道端点的最大 UDP 来源端口。"
-#: ../clients/common/settings-docs.c.in:382
+#: ../clients/common/settings-docs.h.in:356
msgid ""
"Specifies the minimum UDP source port to communicate to the remote VXLAN "
"tunnel endpoint."
-msgstr ""
+msgstr "指定连接到远程 VXLAN 隧道端点的最小 UDP 来源端口。"
-#: ../clients/common/settings-docs.c.in:383
+#: ../clients/common/settings-docs.h.in:357
msgid "Specifies the TOS value to use in outgoing packets."
-msgstr ""
+msgstr "指定要在传出数据包使用的 TOS 值。"
-#: ../clients/common/settings-docs.c.in:384
+#: ../clients/common/settings-docs.h.in:358
msgid "Specifies the time-to-live value to use in outgoing packets."
-msgstr ""
+msgstr "指定要在传出数据包使用的存活时间值。"
-#: ../clients/common/settings-docs.c.in:385
+#: ../clients/common/settings-docs.h.in:359
msgid ""
"If specified, this connection will only apply to the WiMAX device whose MAC "
"address matches. This property does not change the MAC address of the device "
"(known as MAC spoofing). Deprecated: 1"
msgstr ""
+"如指定了,此连接将只应用到其 MAC 地址符合的 WiMAX 设备。此属性不会改变设备的 "
+"MAC 地址(又名 MAC 欺骗)。已弃用:1"
-#: ../clients/common/settings-docs.c.in:387
+#: ../clients/common/settings-docs.h.in:360
msgid ""
"Network Service Provider (NSP) name of the WiMAX network this connection "
"should use. Deprecated: 1"
+msgstr "此连接应使用的 WiMAX 网络服务提供商(NSP)的名称。已弃用:1"
+
+#: ../clients/common/settings-docs.h.in:361
+msgid ""
+"If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
+"MAC layer device whose permanent MAC address matches."
msgstr ""
+"如果指定了,此连接将只应用到其永久 MAC 地址匹配的 IEEE 802.15.4 (WPAN) MAC 层"
+"设备。"
+
+#: ../clients/common/settings-docs.h.in:362
+msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
+msgstr "IEEE 802.15.4 个人区域网络(PAN)标识符。"
-#: ../clients/nm-online.c:91
+#: ../clients/common/settings-docs.h.in:363
+msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
+msgstr "在受限环境中使用的短 IEEE 802.15.4 地址。"
+
+#: ../clients/nm-online.c:90
msgid "Connecting"
msgstr "正在连接"
-#: ../clients/nm-online.c:189
-#, fuzzy, c-format
+#: ../clients/nm-online.c:206
+#, c-format
msgid "Error: timeout creating NMClient object\n"
-msgstr "错误:无法创建 NMClient 对象:%s。"
+msgstr "错误:创建 NMClient 对象时超时\n"
-#: ../clients/nm-online.c:209
-#, fuzzy, c-format
+#: ../clients/nm-online.c:226
+#, c-format
msgid "Error: Could not create NMClient object: %s\n"
-msgstr "错误:无法创建 NMClient 对象:%s。"
+msgstr "错误:无法创建 NMClient 对象:%s\n"
-#: ../clients/nm-online.c:235
+#: ../clients/nm-online.c:252
msgid ""
"Time to wait for a connection, in seconds (without the option, default value "
"is 30)"
-msgstr "等待连接时间,以秒计(没有该选项时,默认为 30)"
+msgstr "等待连接时间,以秒计(没有该选项时,默认为 30)"
-#: ../clients/nm-online.c:236
+#: ../clients/nm-online.c:253
msgid "Exit immediately if NetworkManager is not running or connecting"
-msgstr "如果 NetworkManager 未运行或连接则立即退出"
+msgstr "如果网络管理器未运行或连接则立即退出"
-#: ../clients/nm-online.c:237
+#: ../clients/nm-online.c:254
msgid "Don't print anything"
msgstr "不输出任何结果"
-#: ../clients/nm-online.c:238
+#: ../clients/nm-online.c:255
msgid "Wait for NetworkManager startup instead of a connection"
-msgstr "等待 NetworkManager 启动而不是连接"
+msgstr "等待网络管理器启动而不是连接"
-#: ../clients/nm-online.c:260
+#: ../clients/nm-online.c:275
msgid ""
"Waits for NetworkManager to finish activating startup network connections."
-msgstr "等待 NetworkManager 完成激活启动网络连接。"
+msgstr "等待网络管理完成激活启动网络连接。"
-#: ../clients/nm-online.c:267 ../clients/nm-online.c:273
+#: ../clients/nm-online.c:282 ../clients/nm-online.c:288
msgid "Invalid option. Please use --help to see a list of valid options."
msgstr "无效选项。请使用 --help 查看有效选项列表。"
-#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:430
+#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:429
#: ../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:134
msgid "OK"
msgstr "确定"
@@ -7883,137 +9071,127 @@ msgstr "确定"
msgid "Could not create temporary file: %s"
msgstr "无法创建临时文件:%s"
-#: ../clients/tui/newt/nmt-newt-utils.c:365
+#: ../clients/tui/newt/nmt-newt-utils.c:363
#, c-format
msgid "Editor failed: %s"
msgstr "编辑器失败:%s"
-#: ../clients/tui/newt/nmt-newt-utils.c:373
-#, c-format
-msgid "Editor failed with status %d"
-msgstr "编辑器失败,状态码:%d"
-
-#: ../clients/tui/newt/nmt-newt-utils.c:375
-#, c-format
-msgid "Editor failed with signal %d"
-msgstr "编辑器失败,信号 %d"
-
-#: ../clients/tui/newt/nmt-newt-utils.c:379
+#: ../clients/tui/newt/nmt-newt-utils.c:369
#, c-format
msgid "Could not re-read file: %s"
msgstr "无法重新读取文件:%s"
-#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1821
-#: ../libnm/nm-device.c:1521
+#: ../clients/tui/nm-editor-utils.c:144 ../libnm-glib/nm-device.c:1820
+#: ../libnm/nm-device.c:1306
msgid "Ethernet"
msgstr "以太网"
-#: ../clients/tui/nm-editor-utils.c:150
+#: ../clients/tui/nm-editor-utils.c:148
#, c-format
msgid "Ethernet connection %d"
msgstr "以太网连接 %d"
-#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1823
-#: ../libnm/nm-device.c:1523
+#: ../clients/tui/nm-editor-utils.c:152 ../libnm-glib/nm-device.c:1822
+#: ../libnm/nm-device.c:1308
msgid "Wi-Fi"
-msgstr "Wi-Fi 参数"
+msgstr "Wi-Fi"
-#: ../clients/tui/nm-editor-utils.c:158
+#: ../clients/tui/nm-editor-utils.c:156
#, c-format
msgid "Wi-Fi connection %d"
msgstr "Wi-Fi 连接 %d"
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:2114
-#: ../libnm-glib/nm-device.c:1833 ../libnm/nm-device.c:1539
+#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2268
+#: ../libnm-glib/nm-device.c:1832 ../libnm/nm-device.c:1324
msgid "InfiniBand"
-msgstr "InfiniBand 参数"
+msgstr "InfiniBand"
-#: ../clients/tui/nm-editor-utils.c:167
+#: ../clients/tui/nm-editor-utils.c:165
#, c-format
msgid "InfiniBand connection %d"
-msgstr "高速网络连接 %d"
+msgstr "InfiniBand 连接 %d"
-#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1831
-#: ../libnm/nm-device.c:1537
+#: ../clients/tui/nm-editor-utils.c:170 ../libnm-glib/nm-device.c:1830
+#: ../libnm/nm-device.c:1322
msgid "Mobile Broadband"
msgstr "移动宽带"
-#: ../clients/tui/nm-editor-utils.c:175
+#: ../clients/tui/nm-editor-utils.c:173
#, c-format
msgid "Mobile broadband connection %d"
msgstr "移动宽带连接 %d"
-#: ../clients/tui/nm-editor-utils.c:181 ../clients/tui/nmt-page-dsl.c:62
+#: ../clients/tui/nm-editor-utils.c:179 ../clients/tui/nmt-page-dsl.c:62
msgid "DSL"
msgstr "DSL"
-#: ../clients/tui/nm-editor-utils.c:185
+#: ../clients/tui/nm-editor-utils.c:183
#, c-format
msgid "DSL connection %d"
msgstr "DSL 连接 %d"
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:2106
-#: ../libnm-glib/nm-device.c:1835 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1541
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4563
+#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2260
+#: ../libnm-glib/nm-device.c:1834 ../libnm-util/nm-connection.c:1623
+#: ../libnm/nm-device.c:1326
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4732
msgid "Bond"
msgstr "绑定"
-#: ../clients/tui/nm-editor-utils.c:194
+#: ../clients/tui/nm-editor-utils.c:192
#, c-format
msgid "Bond connection %d"
msgstr "绑定连接 %d"
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:2110
-#: ../libnm-glib/nm-device.c:1839 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1545
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4899
+#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2264
+#: ../libnm-glib/nm-device.c:1838 ../libnm-util/nm-connection.c:1627
+#: ../libnm/nm-device.c:1330
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5068
msgid "Bridge"
-msgstr "桥接"
+msgstr "网桥"
-#: ../clients/tui/nm-editor-utils.c:204
+#: ../clients/tui/nm-editor-utils.c:202
#, c-format
msgid "Bridge connection %d"
-msgstr "桥式连接 %d"
+msgstr "网桥连接 %d"
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:2108
-#: ../libnm-glib/nm-device.c:1837 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1543
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4666
+#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2262
+#: ../libnm-glib/nm-device.c:1836 ../libnm-util/nm-connection.c:1625
+#: ../libnm/nm-device.c:1328
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4835
msgid "Team"
-msgstr "组队"
+msgstr "组合"
-#: ../clients/tui/nm-editor-utils.c:213
+#: ../clients/tui/nm-editor-utils.c:211
#, c-format
msgid "Team connection %d"
-msgstr "组队连接 %d"
+msgstr "组合连接 %d"
-#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:82
-#: ../libnm-core/nm-connection.c:2112 ../libnm-glib/nm-device.c:1841
-#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1547
+#: ../clients/tui/nm-editor-utils.c:215 ../clients/tui/nmt-page-vlan.c:82
+#: ../libnm-core/nm-connection.c:2266 ../libnm-glib/nm-device.c:1840
+#: ../libnm-util/nm-connection.c:1629 ../libnm/nm-device.c:1332
msgid "VLAN"
-msgstr "VLAN 参数"
+msgstr "VLAN"
-#: ../clients/tui/nm-editor-utils.c:221
+#: ../clients/tui/nm-editor-utils.c:219
#, c-format
msgid "VLAN connection %d"
msgstr "VLAN 连接 %d"
-#: ../clients/tui/nm-editor-utils.c:225 ../clients/tui/nmt-page-ip-tunnel.c:136
+#: ../clients/tui/nm-editor-utils.c:223 ../clients/tui/nmt-page-ip-tunnel.c:136
msgid "IP tunnel"
-msgstr ""
+msgstr "IP 隧道"
-#: ../clients/tui/nm-editor-utils.c:229
+#: ../clients/tui/nm-editor-utils.c:227
#, c-format
msgid "IP tunnel connection %d"
-msgstr ""
+msgstr "IP 隧道连接 %d"
-#: ../clients/tui/nm-editor-utils.c:244
+#: ../clients/tui/nm-editor-utils.c:242
#, c-format
msgid "VPN connection %d"
msgstr "VPN 连接 %d"
-#: ../clients/tui/nmt-device-entry.c:370
+#: ../clients/tui/nmt-device-entry.c:368
msgid "Select..."
msgstr "选择..."
@@ -8028,7 +9206,7 @@ msgid "Edit..."
msgstr "编辑..."
#: ../clients/tui/nmt-edit-connection-list.c:116
-#: ../clients/tui/nmtui-edit.c:531
+#: ../clients/tui/nmtui-edit.c:529
msgid "Delete"
msgstr "删除"
@@ -8043,51 +9221,51 @@ msgstr "显示"
#: ../clients/tui/nmt-editor.c:98
#, c-format
msgid "Could not create editor for connection '%s' of type '%s'."
-msgstr "无法为类型 '%s' 的连接 '%s'创建编辑器。"
+msgstr "无法为类型 \"%s\" 的连接 \"%s\" 创建编辑器。"
#: ../clients/tui/nmt-editor.c:102
#, c-format
msgid "Could not create editor for invalid connection '%s'."
-msgstr "无法为无效的连接“%s”创建编辑器。"
+msgstr "无法为无效的连接 \"%s\" 创建编辑器。"
#: ../clients/tui/nmt-editor.c:112
msgid "Edit Connection"
msgstr "编辑连接"
-#: ../clients/tui/nmt-editor.c:174
+#: ../clients/tui/nmt-editor.c:173
#, c-format
msgid "Unable to save connection: %s"
msgstr "无法保存连接:%s"
-#: ../clients/tui/nmt-editor.c:188
+#: ../clients/tui/nmt-editor.c:187
#, c-format
msgid "Unable to add new connection: %s"
msgstr "无法添加新连接:%s"
-#: ../clients/tui/nmt-editor.c:333
+#: ../clients/tui/nmt-editor.c:332
msgid "Profile name"
-msgstr "配置名称"
+msgstr "配置集名称"
-#: ../clients/tui/nmt-editor.c:344
+#: ../clients/tui/nmt-editor.c:343
msgid "Ethernet device"
-msgstr "以太设备"
+msgstr "以太网设备"
-#: ../clients/tui/nmt-editor.c:346
+#: ../clients/tui/nmt-editor.c:345
msgid "Device"
msgstr "设备"
#. And finally the bottom widgets
-#: ../clients/tui/nmt-editor.c:406
+#: ../clients/tui/nmt-editor.c:405
msgid "Automatically connect"
msgstr "自动连接"
-#: ../clients/tui/nmt-editor.c:412
+#: ../clients/tui/nmt-editor.c:411
msgid "Available to all users"
msgstr "对所有用户有效"
-#: ../clients/tui/nmt-editor.c:427 ../clients/tui/nmt-password-dialog.c:171
-#: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:222
-#: ../clients/tui/nmtui-edit.c:530 ../clients/tui/nmtui-hostname.c:67
+#: ../clients/tui/nmt-editor.c:426 ../clients/tui/nmt-password-dialog.c:171
+#: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:220
+#: ../clients/tui/nmtui-edit.c:528 ../clients/tui/nmtui-hostname.c:67
msgid "Cancel"
msgstr "取消"
@@ -8117,11 +9295,11 @@ msgstr "802.3ad"
#: ../clients/tui/nmt-page-bond.c:90
msgid "Adaptive Transmit Load Balancing (tlb)"
-msgstr "自适应传输负载均衡 (tlb)"
+msgstr "自适应传输负载均衡(tlb)"
#: ../clients/tui/nmt-page-bond.c:91
msgid "Adaptive Load Balancing (alb)"
-msgstr "自适应负载均衡 (alb)"
+msgstr "自适应负载均衡(alb)"
#: ../clients/tui/nmt-page-bond.c:97
msgid "MII (recommended)"
@@ -8133,7 +9311,7 @@ msgstr "ARP"
#: ../clients/tui/nmt-page-bond.c:359
msgid "BOND"
-msgstr "BOND"
+msgstr "绑定"
#: ../clients/tui/nmt-page-bond.c:363 ../clients/tui/nmt-page-bridge.c:85
#: ../clients/tui/nmt-page-team.c:152
@@ -8151,7 +9329,7 @@ msgstr "主机"
#: ../clients/tui/nmt-page-bond.c:387
msgid "Link monitoring"
-msgstr "链路监控"
+msgstr "链路监测"
#: ../clients/tui/nmt-page-bond.c:393 ../clients/tui/nmt-page-bond.c:400
#: ../clients/tui/nmt-page-bond.c:407 ../clients/tui/nmt-page-bond.c:414
@@ -8165,11 +9343,11 @@ msgstr "监控频率"
#: ../clients/tui/nmt-page-bond.c:401
msgid "Link up delay"
-msgstr "链接建立延时"
+msgstr "链路开启延时"
#: ../clients/tui/nmt-page-bond.c:408
msgid "Link down delay"
-msgstr "链接断开延时"
+msgstr "链路关闭延时"
#: ../clients/tui/nmt-page-bond.c:421
msgid "ARP targets"
@@ -8178,11 +9356,11 @@ msgstr "ARP 目标"
#: ../clients/tui/nmt-page-bond.c:428 ../clients/tui/nmt-page-ethernet.c:77
#: ../clients/tui/nmt-page-vlan.c:110 ../clients/tui/nmt-page-wifi.c:364
msgid "Cloned MAC address"
-msgstr "复制的 MAC 地址"
+msgstr "克隆的 MAC 地址"
#: ../clients/tui/nmt-page-bridge-port.c:60
msgid "BRIDGE PORT"
-msgstr "桥接端口"
+msgstr "网桥端口"
#: ../clients/tui/nmt-page-bridge-port.c:67
#: ../clients/tui/nmt-page-bridge.c:118
@@ -8199,7 +9377,7 @@ msgstr "Hairpin 模式"
#: ../clients/tui/nmt-page-bridge.c:81
msgid "BRIDGE"
-msgstr "桥接"
+msgstr "网桥"
#: ../clients/tui/nmt-page-bridge.c:96 ../clients/tui/nmt-page-bridge.c:127
#: ../clients/tui/nmt-page-bridge.c:137 ../clients/tui/nmt-page-bridge.c:147
@@ -8212,11 +9390,11 @@ msgstr "老化时间"
#: ../clients/tui/nmt-page-bridge.c:99
msgid "Enable IGMP snooping"
-msgstr "启用 IGMP snooping"
+msgstr "启用 IGMP 监听"
#: ../clients/tui/nmt-page-bridge.c:105
msgid "Enable STP (Spanning Tree Protocol)"
-msgstr "启用 STP(跨树协议)"
+msgstr "启用 STP(生成树协议)"
#: ../clients/tui/nmt-page-bridge.c:128
msgid "Forward delay"
@@ -8232,7 +9410,7 @@ msgstr "最大寿命"
#: ../clients/tui/nmt-page-bridge.c:154
msgid "Group forward mask"
-msgstr ""
+msgstr "组前向掩码"
#: ../clients/tui/nmt-page-ethernet.c:70
msgid "ETHERNET"
@@ -8263,7 +9441,7 @@ msgstr "传输模式"
#: ../clients/tui/nmt-page-ip4.c:38
msgid "Disabled"
-msgstr "已禁用"
+msgstr "禁用"
#: ../clients/tui/nmt-page-ip4.c:39 ../clients/tui/nmt-page-ip6.c:39
msgid "Automatic"
@@ -8289,7 +9467,7 @@ msgstr "(没有自定义路由)"
#, c-format
msgid "One custom route"
msgid_plural "%d custom routes"
-msgstr[0] "%d一个自定义路线"
+msgstr[0] "%d 个自定义路由"
#: ../clients/tui/nmt-page-ip4.c:128
msgid "IPv4 CONFIGURATION"
@@ -8321,11 +9499,11 @@ msgstr "忽略自动获取的路由"
#: ../clients/tui/nmt-page-ip4.c:185 ../clients/tui/nmt-page-ip6.c:183
msgid "Ignore automatically obtained DNS parameters"
-msgstr ""
+msgstr "忽略自动获取的 DNS 参数"
#: ../clients/tui/nmt-page-ip4.c:193
msgid "Require IPv4 addressing for this connection"
-msgstr "需要 IPv4 地址完成这个连接"
+msgstr "需要 IPv4 地址来完成这个连接"
#: ../clients/tui/nmt-page-ip6.c:38
msgid "Ignore"
@@ -8333,7 +9511,7 @@ msgstr "忽略"
#: ../clients/tui/nmt-page-ip6.c:40
msgid "Automatic (DHCP-only)"
-msgstr "自动(仅 DHCP)"
+msgstr "自动(仅 DHCP)"
#: ../clients/tui/nmt-page-ip6.c:128
msgid "IPv6 CONFIGURATION"
@@ -8341,44 +9519,44 @@ msgstr "IPv6 配置"
#: ../clients/tui/nmt-page-ip6.c:191
msgid "Require IPv6 addressing for this connection"
-msgstr "需要 IPv6 地址完成这个连接"
+msgstr "需要 IPv6 地址来完成这个连接"
#. The order must match the NM_IP_TUNNEL_MODE_* enum
#: ../clients/tui/nmt-page-ip-tunnel.c:78
msgid "IPIP"
-msgstr ""
+msgstr "IPIP"
#: ../clients/tui/nmt-page-ip-tunnel.c:79
msgid "GRE"
-msgstr ""
+msgstr "GRE"
#: ../clients/tui/nmt-page-ip-tunnel.c:80
msgid "SIT"
-msgstr ""
+msgstr "SIT"
#: ../clients/tui/nmt-page-ip-tunnel.c:81
msgid "ISATAP"
-msgstr ""
+msgstr "ISATAP"
#: ../clients/tui/nmt-page-ip-tunnel.c:82
msgid "VTI"
-msgstr ""
+msgstr "VTI"
#: ../clients/tui/nmt-page-ip-tunnel.c:83
msgid "IP6IP6"
-msgstr ""
+msgstr "IP6IP6"
#: ../clients/tui/nmt-page-ip-tunnel.c:84
msgid "IPIP6"
-msgstr ""
+msgstr "IPIP6"
#: ../clients/tui/nmt-page-ip-tunnel.c:85
msgid "IP6GRE"
-msgstr ""
+msgstr "IP6GRE"
#: ../clients/tui/nmt-page-ip-tunnel.c:86
msgid "VTI6"
-msgstr ""
+msgstr "VTI6"
#: ../clients/tui/nmt-page-ip-tunnel.c:150 ../clients/tui/nmt-page-vlan.c:87
msgid "Parent"
@@ -8386,19 +9564,19 @@ msgstr "上级"
#: ../clients/tui/nmt-page-ip-tunnel.c:157
msgid "Local IP"
-msgstr ""
+msgstr "本地 IP"
#: ../clients/tui/nmt-page-ip-tunnel.c:163
msgid "Remote IP"
-msgstr ""
+msgstr "远程 IP"
#: ../clients/tui/nmt-page-ip-tunnel.c:169
msgid "Input key"
-msgstr ""
+msgstr "输入密钥"
#: ../clients/tui/nmt-page-ip-tunnel.c:176
msgid "Output key"
-msgstr ""
+msgstr "输出密钥"
#: ../clients/tui/nmt-page-ppp.c:131
msgid "PPP CONFIGURATION"
@@ -8430,7 +9608,7 @@ msgstr "MSCHAP"
#: ../clients/tui/nmt-page-ppp.c:195
msgid "Use point-to-point encryption (MPPE)"
-msgstr "使用点到点加密 (MPPE)"
+msgstr "使用点到点加密(MPPE)"
#: ../clients/tui/nmt-page-ppp.c:207
msgid "Require 128-bit encryption"
@@ -8438,7 +9616,7 @@ msgstr "需要 128 位加密"
#: ../clients/tui/nmt-page-ppp.c:217
msgid "Use stateful MPPE"
-msgstr "使用带有状态的 MPPE"
+msgstr "使用有状态 MPPE"
#: ../clients/tui/nmt-page-ppp.c:229
msgid "Allow BSD data compression"
@@ -8450,7 +9628,7 @@ msgstr "允许 Deflate 数据压缩"
#: ../clients/tui/nmt-page-ppp.c:245
msgid "Use TCP header compression"
-msgstr "使用 TCP 头压缩"
+msgstr "使用 TCP 首部压缩"
#: ../clients/tui/nmt-page-ppp.c:255
msgid "Send PPP echo packets"
@@ -8458,7 +9636,7 @@ msgstr "发送 PPP 回响数据包"
#: ../clients/tui/nmt-page-team-port.c:92
msgid "TEAM PORT"
-msgstr "群组端口"
+msgstr "组合端口"
#: ../clients/tui/nmt-page-team-port.c:99 ../clients/tui/nmt-page-team.c:163
msgid "JSON configuration"
@@ -8466,7 +9644,7 @@ msgstr "JSON 配置"
#: ../clients/tui/nmt-page-team.c:145
msgid "TEAM"
-msgstr "群组"
+msgstr "组合"
#: ../clients/tui/nmt-page-vlan.c:102
msgid "VLAN id"
@@ -8515,7 +9693,7 @@ msgstr "WPA & WPA2 企业"
#: ../clients/tui/nmt-page-wifi.c:83
msgid "WEP 40/128-bit Key (Hex or ASCII)"
-msgstr "WEP 40/128 位密钥(Hex 或者 ASCII)"
+msgstr "WEP 40/128 位密钥(Hex 或者 ASCII)"
#: ../clients/tui/nmt-page-wifi.c:84
msgid "WEP 128-bit Passphrase"
@@ -8523,7 +9701,7 @@ msgstr "WEP 128位 密码"
#: ../clients/tui/nmt-page-wifi.c:85
msgid "Dynamic WEP (802.1x)"
-msgstr "动态 WEP (802.1x)"
+msgstr "动态 WEP(802.1x)"
#: ../clients/tui/nmt-page-wifi.c:86
msgid "LEAP"
@@ -8573,7 +9751,7 @@ msgstr "安全性"
#. FIXME
#: ../clients/tui/nmt-page-wifi.c:282
msgid "(No support for wpa-enterprise yet...)"
-msgstr "(还未支持 wpa-enterprise…)"
+msgstr "(还未支持 WPA 企业...)"
#: ../clients/tui/nmt-page-wifi.c:292 ../clients/tui/nmt-page-wifi.c:311
msgid "WEP index"
@@ -8581,13 +9759,13 @@ msgstr "WEP 索引"
#: ../clients/tui/nmt-page-wifi.c:300 ../clients/tui/nmt-page-wifi.c:319
msgid "Authentication"
-msgstr "认证"
+msgstr "验证"
#. "dynamic-wep"
#. FIXME
#: ../clients/tui/nmt-page-wifi.c:325
msgid "(No support for dynamic-wep yet...)"
-msgstr "(尚未支持动态-wep ...)"
+msgstr "(还未支持动态 WEP...)"
#: ../clients/tui/nmt-page-wifi.c:358
msgid "BSSID"
@@ -8601,29 +9779,29 @@ msgstr "每次都询问这个密码"
msgid "Show password"
msgstr "显示密码"
-#: ../clients/tui/nmt-route-table.c:191
+#: ../clients/tui/nmt-route-table.c:187
msgid "Destination"
msgstr "目标"
-#: ../clients/tui/nmt-route-table.c:191
+#: ../clients/tui/nmt-route-table.c:187
msgid "Prefix"
msgstr "前缀"
-#: ../clients/tui/nmt-route-table.c:200
+#: ../clients/tui/nmt-route-table.c:196
msgid "Next Hop"
-msgstr "下一步 Hop"
+msgstr "下一个跃点"
-#: ../clients/tui/nmt-route-table.c:208
+#: ../clients/tui/nmt-route-table.c:204
msgid "Metric"
-msgstr "权重"
+msgstr "跃点数"
-#: ../clients/tui/nmt-route-table.c:228
+#: ../clients/tui/nmt-route-table.c:224
msgid "No custom routes are defined."
-msgstr "未定义自定义路线。"
+msgstr "未定义自定义陆游。"
-#: ../clients/tui/nmt-slave-list.c:136
+#: ../clients/tui/nmt-slave-list.c:134
msgid "Select the type of slave connection you wish to add."
-msgstr "选择您要添加的辅助连接类型。"
+msgstr "选择您要添加的从连接类型。"
#: ../clients/tui/nmt-widget-list.c:139
msgid "Add..."
@@ -8657,11 +9835,11 @@ msgstr "openconnect 失败,信号为 %d"
#: ../clients/tui/nmtui-connect.c:183
#, c-format
msgid "Activation failed: %s"
-msgstr ""
+msgstr "激活失败:%s"
#: ../clients/tui/nmtui-connect.c:254
msgid "Connecting..."
-msgstr "正在连接…"
+msgstr "正在连接..."
#: ../clients/tui/nmtui-connect.c:292 ../clients/tui/nmtui-connect.c:329
#, c-format
@@ -8674,35 +9852,35 @@ msgstr "激活"
#: ../clients/tui/nmtui-connect.c:393
msgid "Deactivate"
-msgstr "禁用"
+msgstr "停用"
-#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:130
+#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:118
+#: ../clients/tui/nmtui.c:128
msgid "Quit"
msgstr "退出"
-#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:120
+#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:118
msgid "Back"
msgstr "返回"
#: ../clients/tui/nmtui-connect.c:468
#, c-format
msgid "No such connection '%s'"
-msgstr "无此连接“%s”"
+msgstr "无此连接 \"%s\""
#: ../clients/tui/nmtui-connect.c:470
msgid "Connection is already active"
msgstr "连接已经激活"
-#: ../clients/tui/nmtui-edit.c:230
+#: ../clients/tui/nmtui-edit.c:228
msgid "Create"
msgstr "创建"
-#: ../clients/tui/nmtui-edit.c:372
+#: ../clients/tui/nmtui-edit.c:370
msgid "Select the type of connection you wish to create."
-msgstr "选择您要创建的辅助连接类型。"
+msgstr "选择您要创建的连接类型。"
-#: ../clients/tui/nmtui-edit.c:380
+#: ../clients/tui/nmtui-edit.c:378
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."
@@ -8710,24 +9888,24 @@ msgstr ""
"如果您想创建一个 VPN 但列表中没有您想要创建的 VPN 类型,这很可能是您没有安装"
"正确的 VPN 插件。"
-#: ../clients/tui/nmtui-edit.c:416 ../clients/tui/nmtui-edit.c:432
+#: ../clients/tui/nmtui-edit.c:414 ../clients/tui/nmtui-edit.c:430
msgid "New Connection"
msgstr "新建连接"
-#: ../clients/tui/nmtui-edit.c:471
+#: ../clients/tui/nmtui-edit.c:469
#, c-format
msgid "Unable to delete connection: %s"
msgstr "无法删除连接:%s"
-#: ../clients/tui/nmtui-edit.c:510
+#: ../clients/tui/nmtui-edit.c:508
#, c-format
msgid "Could not delete connection '%s': %s"
-msgstr "无法删除连接 '%s': %s"
+msgstr "无法删除连接 \"%s\":%s"
-#: ../clients/tui/nmtui-edit.c:532
+#: ../clients/tui/nmtui-edit.c:530
#, c-format
msgid "Are you sure you want to delete the connection '%s'?"
-msgstr "您确定要删除连接 “%s” 吗?"
+msgstr "您确定要删除连接 \"%s\" 吗?"
#: ../clients/tui/nmtui-hostname.c:45
msgid "Set Hostname"
@@ -8741,156 +9919,156 @@ msgstr "主机名"
#: ../clients/tui/nmtui-hostname.c:116
#, c-format
msgid "Set hostname to '%s'"
-msgstr "主机名已设为“%s”"
+msgstr "主机名已设为 \"%s\""
#: ../clients/tui/nmtui-hostname.c:118
#, c-format
msgid "Unable to set hostname: %s"
msgstr "无法设置主机名:%s"
-#: ../clients/tui/nmtui.c:53 ../clients/tui/nmtui.c:56
+#: ../clients/tui/nmtui.c:51 ../clients/tui/nmtui.c:54
msgid "connection"
msgstr "连接"
-#: ../clients/tui/nmtui.c:54
+#: ../clients/tui/nmtui.c:52
msgid "Edit a connection"
msgstr "编辑连接"
-#: ../clients/tui/nmtui.c:57
+#: ../clients/tui/nmtui.c:55
msgid "Activate a connection"
msgstr "启用连接"
-#: ../clients/tui/nmtui.c:59
+#: ../clients/tui/nmtui.c:57
msgid "new hostname"
msgstr "新主机名"
-#: ../clients/tui/nmtui.c:60
+#: ../clients/tui/nmtui.c:58
msgid "Set system hostname"
msgstr "设置系统主机名"
-#: ../clients/tui/nmtui.c:104
+#: ../clients/tui/nmtui.c:102
msgid "NetworkManager TUI"
-msgstr "网络管理器 TUI"
+msgstr "网络管理器文本用户界面"
-#: ../clients/tui/nmtui.c:112
+#: ../clients/tui/nmtui.c:110
msgid "Please select an option"
msgstr "请选择选项"
-#: ../clients/tui/nmtui.c:160
+#: ../clients/tui/nmtui.c:158
msgid "Usage"
msgstr "用法"
-#: ../clients/tui/nmtui.c:241
+#: ../clients/tui/nmtui.c:239
msgid "Could not parse arguments"
msgstr "无法解析参数"
-#: ../clients/tui/nmtui.c:251
+#: ../clients/tui/nmtui.c:249
#, c-format
msgid "Could not contact NetworkManager: %s.\n"
-msgstr "无法联系 NetworkManager:%s\n"
+msgstr "无法联系网络管理器:%s\n"
-#: ../clients/tui/nmtui.c:256
+#: ../clients/tui/nmtui.c:254
msgid "NetworkManager is not running."
-msgstr "网络管理器未运行。"
+msgstr "NetworkManaer 未运行。"
-#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:131
+#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:130
#, c-format
msgid "PEM key file had no end tag '%s'."
-msgstr "PEM 密钥文件没有结束标记“%s”。"
+msgstr "PEM 密钥文件没有结束标记 \"%s\"。"
-#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:144
+#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:143
#, c-format
msgid "Doesn't look like a PEM private key file."
msgstr "不像是一个 PEM 私钥文件。"
-#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:161
+#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:160
#, c-format
msgid "Malformed PEM file: Proc-Type was not first tag."
msgstr "错误的 PEM 文件格式:Proc-Type 不是第一个标记。"
-#: ../libnm-core/crypto.c:156 ../libnm-util/crypto.c:169
+#: ../libnm-core/crypto.c:156 ../libnm-util/crypto.c:168
#, c-format
msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
-msgstr "错误的 PEM 文件格式:未知的 Proc-Type 标记“%s”。"
+msgstr "错误的 PEM 文件格式:未知的 Proc-Type 标记 \"%s\"。"
-#: ../libnm-core/crypto.c:166 ../libnm-util/crypto.c:179
+#: ../libnm-core/crypto.c:172 ../libnm-util/crypto.c:178
#, c-format
msgid "Malformed PEM file: DEK-Info was not the second tag."
msgstr "错误的 PEM 文件格式:DEK-Info 不是第二个标记。"
-#: ../libnm-core/crypto.c:177 ../libnm-util/crypto.c:190
+#: ../libnm-core/crypto.c:183 ../libnm-util/crypto.c:189
#, c-format
msgid "Malformed PEM file: no IV found in DEK-Info tag."
-msgstr "错误的 PEM 文件格式:没有在 DEK-Info 标签找到初始向量。"
+msgstr "错误的 PEM 文件格式:没有在 DEK-Info 标记找到初始向量。"
-#: ../libnm-core/crypto.c:184 ../libnm-util/crypto.c:197
+#: ../libnm-core/crypto.c:190 ../libnm-util/crypto.c:196
#, c-format
msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
msgstr "错误的 PEM 文件格式:DEK-Info 标签中的初始向量格式无效。"
-#: ../libnm-core/crypto.c:199 ../libnm-util/crypto.c:212
+#: ../libnm-core/crypto.c:205 ../libnm-util/crypto.c:211
#, c-format
msgid "Malformed PEM file: unknown private key cipher '%s'."
-msgstr "对 PEM 文件进行操作:未知专用密钥 “%s”。"
+msgstr "错误的 PEM 文件格式:未知的私钥密码 \"%s\"。"
-#: ../libnm-core/crypto.c:218 ../libnm-util/crypto.c:231
+#: ../libnm-core/crypto.c:224 ../libnm-util/crypto.c:230
#, c-format
msgid "Could not decode private key."
msgstr "无法解码私钥。"
-#: ../libnm-core/crypto.c:272 ../libnm-util/crypto.c:283
+#: ../libnm-core/crypto.c:278 ../libnm-util/crypto.c:282
msgid "Failed to find expected PKCS#8 start tag."
-msgstr "无法找到 PKCS#8 起始标记。"
+msgstr "无法找到预期的 PKCS#8 起始标记。"
-#: ../libnm-core/crypto.c:280 ../libnm-util/crypto.c:291
+#: ../libnm-core/crypto.c:286 ../libnm-util/crypto.c:290
#, c-format
msgid "Failed to find expected PKCS#8 end tag '%s'."
-msgstr "无法找到 PKCS#8 结束标记“%s”。"
+msgstr "无法找到预期的 PKCS#8 结束标记\"%s\"。"
-#: ../libnm-core/crypto.c:299 ../libnm-util/crypto.c:310
+#: ../libnm-core/crypto.c:305 ../libnm-util/crypto.c:309
msgid "Failed to decode PKCS#8 private key."
msgstr "无法解码 PKCS#8 私钥。"
-#: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:352
+#: ../libnm-core/crypto.c:347 ../libnm-util/crypto.c:351
#, c-format
msgid "IV must be an even number of bytes in length."
msgstr "初始向量长度必须是偶数字节。"
-#: ../libnm-core/crypto.c:355 ../libnm-util/crypto.c:366
+#: ../libnm-core/crypto.c:361 ../libnm-util/crypto.c:365
#, c-format
msgid "IV contains non-hexadecimal digits."
msgstr "初始向量中包含非十六进制数字。"
-#: ../libnm-core/crypto.c:395 ../libnm-core/crypto_gnutls.c:91
-#: ../libnm-core/crypto_gnutls.c:197 ../libnm-core/crypto_nss.c:112
-#: ../libnm-core/crypto_nss.c:277 ../libnm-util/crypto.c:406
-#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:256
+#: ../libnm-core/crypto.c:405 ../libnm-core/crypto_gnutls.c:97
+#: ../libnm-core/crypto_gnutls.c:207 ../libnm-core/crypto_nss.c:114
+#: ../libnm-core/crypto_nss.c:282 ../libnm-util/crypto.c:405
+#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:253
#: ../libnm-util/crypto_nss.c:162 ../libnm-util/crypto_nss.c:323
#, c-format
msgid "Private key cipher '%s' was unknown."
-msgstr "未知专用密钥密码“%s”。"
+msgstr "未知的私钥密码 \"%s\"。"
-#: ../libnm-core/crypto.c:494 ../libnm-util/crypto.c:516
+#: ../libnm-core/crypto.c:504 ../libnm-util/crypto.c:515
#, c-format
msgid "Unable to determine private key type."
msgstr "无法确定私钥类型。"
-#: ../libnm-core/crypto.c:502
+#: ../libnm-core/crypto.c:512
#, c-format
msgid "Password provided, but key was not encrypted."
msgstr "已提供密码,但密钥没有加密。"
-#: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:571
+#: ../libnm-core/crypto.c:565 ../libnm-util/crypto.c:570
#, c-format
msgid "PEM certificate had no start tag '%s'."
-msgstr "PEM 证书没有起始标记“%s”。"
+msgstr "PEM 证书没有起始标记 \"%s\"。"
-#: ../libnm-core/crypto.c:564 ../libnm-util/crypto.c:580
+#: ../libnm-core/crypto.c:574 ../libnm-util/crypto.c:579
#, c-format
msgid "PEM certificate had no end tag '%s'."
-msgstr "PEM 证书没有结束标记“%s”。"
+msgstr "PEM 证书没有结束标记 \"%s\"。"
-#: ../libnm-core/crypto.c:582 ../libnm-util/crypto.c:598
+#: ../libnm-core/crypto.c:592 ../libnm-util/crypto.c:597
#, c-format
msgid "Failed to decode certificate."
msgstr "无法解码证书。"
@@ -8899,74 +10077,74 @@ msgstr "无法解码证书。"
msgid "Failed to initialize the crypto engine."
msgstr "初始化加密引擎失败。"
-#: ../libnm-core/crypto_gnutls.c:99 ../libnm-util/crypto_gnutls.c:159
+#: ../libnm-core/crypto_gnutls.c:105 ../libnm-util/crypto_gnutls.c:159
#, c-format
msgid "Invalid IV length (must be at least %zd)."
-msgstr "无效初始向量长度(至少为为 %zd)。"
+msgstr "无效的初始向量长度(至少为 %zd)。"
-#: ../libnm-core/crypto_gnutls.c:115 ../libnm-util/crypto_gnutls.c:175
+#: ../libnm-core/crypto_gnutls.c:121 ../libnm-util/crypto_gnutls.c:175
#, c-format
msgid "Failed to initialize the decryption cipher context: %s (%s)"
-msgstr "初始化解密计算内容失败:%s (%s)。"
+msgstr "初始化解密计算内容失败:%s(%s)"
-#: ../libnm-core/crypto_gnutls.c:124 ../libnm-util/crypto_gnutls.c:184
+#: ../libnm-core/crypto_gnutls.c:130 ../libnm-util/crypto_gnutls.c:184
#, c-format
msgid "Failed to decrypt the private key: %s (%s)"
-msgstr "解密私钥失败:%s (%s)"
+msgstr "解密私钥失败:%s(%s)"
-#: ../libnm-core/crypto_gnutls.c:134 ../libnm-core/crypto_nss.c:202
+#: ../libnm-core/crypto_gnutls.c:140 ../libnm-core/crypto_nss.c:204
#: ../libnm-util/crypto_gnutls.c:194 ../libnm-util/crypto_nss.c:252
#, c-format
msgid "Failed to decrypt the private key: unexpected padding length."
msgstr "解密私钥失败:意外的填充长度。"
-#: ../libnm-core/crypto_gnutls.c:145 ../libnm-core/crypto_nss.c:213
+#: ../libnm-core/crypto_gnutls.c:151 ../libnm-core/crypto_nss.c:215
#: ../libnm-util/crypto_gnutls.c:205 ../libnm-util/crypto_nss.c:263
#, c-format
msgid "Failed to decrypt the private key."
msgstr "解密私钥失败。"
-#: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283
+#: ../libnm-core/crypto_gnutls.c:234 ../libnm-util/crypto_gnutls.c:280
#, c-format
msgid "Failed to initialize the encryption cipher context: %s (%s)"
-msgstr "初始化加密计算内容失败:%s (%s)。"
+msgstr "初始化加密计算内容失败:%s(%s)"
-#: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292
+#: ../libnm-core/crypto_gnutls.c:243 ../libnm-util/crypto_gnutls.c:289
#, c-format
msgid "Failed to encrypt the data: %s (%s)"
-msgstr "加密数据失败:%s (%s)。"
+msgstr "加密数据失败:%s(%s)"
-#: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332
+#: ../libnm-core/crypto_gnutls.c:286 ../libnm-util/crypto_gnutls.c:329
#, c-format
msgid "Error initializing certificate data: %s"
msgstr "初始化证书数据出错:%s"
-#: ../libnm-core/crypto_gnutls.c:298 ../libnm-util/crypto_gnutls.c:354
+#: ../libnm-core/crypto_gnutls.c:308 ../libnm-util/crypto_gnutls.c:351
#, c-format
msgid "Couldn't decode certificate: %s"
msgstr "无法解码证书:%s"
-#: ../libnm-core/crypto_gnutls.c:326 ../libnm-util/crypto_gnutls.c:378
+#: ../libnm-core/crypto_gnutls.c:336 ../libnm-util/crypto_gnutls.c:375
#, c-format
msgid "Couldn't initialize PKCS#12 decoder: %s"
msgstr "无法初始化 PKCS#12 解码器:%s"
-#: ../libnm-core/crypto_gnutls.c:339 ../libnm-util/crypto_gnutls.c:391
+#: ../libnm-core/crypto_gnutls.c:349 ../libnm-util/crypto_gnutls.c:388
#, c-format
msgid "Couldn't decode PKCS#12 file: %s"
msgstr "无法解码 PKCS#12 文件:%s"
-#: ../libnm-core/crypto_gnutls.c:351 ../libnm-util/crypto_gnutls.c:403
+#: ../libnm-core/crypto_gnutls.c:361 ../libnm-util/crypto_gnutls.c:400
#, c-format
msgid "Couldn't verify PKCS#12 file: %s"
msgstr "无法校验 PKCS#12 文件:%s"
-#: ../libnm-core/crypto_gnutls.c:383 ../libnm-util/crypto_gnutls.c:431
+#: ../libnm-core/crypto_gnutls.c:393 ../libnm-util/crypto_gnutls.c:428
#, c-format
msgid "Couldn't initialize PKCS#8 decoder: %s"
msgstr "无法初始化 PKCS#8 解码器:%s"
-#: ../libnm-core/crypto_gnutls.c:406 ../libnm-util/crypto_gnutls.c:454
+#: ../libnm-core/crypto_gnutls.c:416 ../libnm-util/crypto_gnutls.c:451
#, c-format
msgid "Couldn't decode PKCS#8 file: %s"
msgstr "无法解码 PKCS#8 文件:%s"
@@ -8976,778 +10154,833 @@ msgstr "无法解码 PKCS#8 文件:%s"
msgid "Failed to initialize the crypto engine: %d."
msgstr "初始化加密引擎失败:%d。"
-#: ../libnm-core/crypto_nss.c:120 ../libnm-util/crypto_nss.c:170
+#: ../libnm-core/crypto_nss.c:122 ../libnm-util/crypto_nss.c:170
#, c-format
msgid "Invalid IV length (must be at least %d)."
-msgstr "无效的初始向量长度(至少为 %d)。"
+msgstr "无效的初始向量长度(至少为 %d)。"
-#: ../libnm-core/crypto_nss.c:131 ../libnm-util/crypto_nss.c:181
+#: ../libnm-core/crypto_nss.c:133 ../libnm-util/crypto_nss.c:181
#, c-format
msgid "Failed to initialize the decryption cipher slot."
msgstr "初始化解密计算插槽失败。"
-#: ../libnm-core/crypto_nss.c:141 ../libnm-util/crypto_nss.c:191
+#: ../libnm-core/crypto_nss.c:143 ../libnm-util/crypto_nss.c:191
#, c-format
msgid "Failed to set symmetric key for decryption."
msgstr "为解密设置对称密钥失败。"
-#: ../libnm-core/crypto_nss.c:151 ../libnm-util/crypto_nss.c:201
+#: ../libnm-core/crypto_nss.c:153 ../libnm-util/crypto_nss.c:201
#, c-format
msgid "Failed to set IV for decryption."
msgstr "为解密设置初始向量失败。"
-#: ../libnm-core/crypto_nss.c:159 ../libnm-util/crypto_nss.c:209
+#: ../libnm-core/crypto_nss.c:161 ../libnm-util/crypto_nss.c:209
#, c-format
msgid "Failed to initialize the decryption context."
msgstr "初始化解密环境失败。"
-#: ../libnm-core/crypto_nss.c:172 ../libnm-util/crypto_nss.c:222
+#: ../libnm-core/crypto_nss.c:174 ../libnm-util/crypto_nss.c:222
#, c-format
msgid "Failed to decrypt the private key: %d."
msgstr "解密私钥失败:%d。"
-#: ../libnm-core/crypto_nss.c:180 ../libnm-util/crypto_nss.c:230
+#: ../libnm-core/crypto_nss.c:182 ../libnm-util/crypto_nss.c:230
#, c-format
msgid "Failed to decrypt the private key: decrypted data too large."
msgstr "解密私钥失败:解密后的数据太大。"
-#: ../libnm-core/crypto_nss.c:191 ../libnm-util/crypto_nss.c:241
+#: ../libnm-core/crypto_nss.c:193 ../libnm-util/crypto_nss.c:241
#, c-format
msgid "Failed to finalize decryption of the private key: %d."
msgstr "结束解密私钥失败:%d。"
-#: ../libnm-core/crypto_nss.c:299 ../libnm-util/crypto_nss.c:345
+#: ../libnm-core/crypto_nss.c:304 ../libnm-util/crypto_nss.c:345
#, c-format
msgid "Failed to initialize the encryption cipher slot."
msgstr "初始化加密计算插槽空间失败。"
-#: ../libnm-core/crypto_nss.c:307 ../libnm-util/crypto_nss.c:353
+#: ../libnm-core/crypto_nss.c:312 ../libnm-util/crypto_nss.c:353
#, c-format
msgid "Failed to set symmetric key for encryption."
msgstr "为加密设置对称密钥失败。"
-#: ../libnm-core/crypto_nss.c:315 ../libnm-util/crypto_nss.c:361
+#: ../libnm-core/crypto_nss.c:320 ../libnm-util/crypto_nss.c:361
#, c-format
msgid "Failed to set IV for encryption."
-msgstr "为加密设置 IV 失败。"
+msgstr "为加密设置初始向量失败。"
-#: ../libnm-core/crypto_nss.c:323 ../libnm-util/crypto_nss.c:369
+#: ../libnm-core/crypto_nss.c:328 ../libnm-util/crypto_nss.c:369
#, c-format
msgid "Failed to initialize the encryption context."
msgstr "初始化加密内容失败。"
-#: ../libnm-core/crypto_nss.c:331 ../libnm-util/crypto_nss.c:377
+#: ../libnm-core/crypto_nss.c:336 ../libnm-util/crypto_nss.c:377
#, c-format
msgid "Failed to encrypt: %d."
msgstr "加密失败:%d。"
-#: ../libnm-core/crypto_nss.c:339 ../libnm-util/crypto_nss.c:385
+#: ../libnm-core/crypto_nss.c:344 ../libnm-util/crypto_nss.c:385
#, c-format
msgid "Unexpected amount of data after encrypting."
msgstr "加密后意外的数据量。"
-#: ../libnm-core/crypto_nss.c:382 ../libnm-util/crypto_nss.c:425
+#: ../libnm-core/crypto_nss.c:387 ../libnm-util/crypto_nss.c:425
#, c-format
msgid "Couldn't decode certificate: %d"
msgstr "无法解码证书:%d"
-#: ../libnm-core/crypto_nss.c:420
+#: ../libnm-core/crypto_nss.c:425
#, c-format
msgid "Password must be UTF-8"
msgstr "密码必须是 UTF-8 格式"
-#: ../libnm-core/crypto_nss.c:450 ../libnm-util/crypto_nss.c:488
+#: ../libnm-core/crypto_nss.c:455 ../libnm-util/crypto_nss.c:488
#, c-format
msgid "Couldn't initialize PKCS#12 decoder: %d"
msgstr "无法初始化 PKCS#12 解码器:%d"
-#: ../libnm-core/crypto_nss.c:459 ../libnm-util/crypto_nss.c:497
+#: ../libnm-core/crypto_nss.c:464 ../libnm-util/crypto_nss.c:497
#, c-format
msgid "Couldn't decode PKCS#12 file: %d"
msgstr "无法解码 PKCS#12 文件:%d"
-#: ../libnm-core/crypto_nss.c:468 ../libnm-util/crypto_nss.c:506
+#: ../libnm-core/crypto_nss.c:473 ../libnm-util/crypto_nss.c:506
#, c-format
msgid "Couldn't verify PKCS#12 file: %d"
msgstr "无法校验 PKCS#12 文件:%d"
-#: ../libnm-core/crypto_nss.c:519 ../libnm-util/crypto_nss.c:550
+#: ../libnm-core/crypto_nss.c:524 ../libnm-util/crypto_nss.c:550
msgid "Could not generate random data."
msgstr "无法生成随机数据。"
-#: ../libnm-core/nm-connection.c:249
+#: ../libnm-core/nm-connection.c:283
msgid "wrong type; should be a list of strings."
-msgstr "错误的类型,应该是一个字符串列表。"
+msgstr "错误的类型;应为一个字符串列表。"
-#: ../libnm-core/nm-connection.c:319
+#: ../libnm-core/nm-connection.c:353
msgid "unknown setting name"
msgstr "未知的设置名称"
-#: ../libnm-core/nm-connection.c:331
+#: ../libnm-core/nm-connection.c:365
msgid "duplicate setting name"
msgstr "重复的设置名称"
-#: ../libnm-core/nm-connection.c:1233
+#: ../libnm-core/nm-connection.c:1325
msgid "setting not found"
msgstr "未找到设置"
-#: ../libnm-core/nm-connection.c:1300
+#: ../libnm-core/nm-connection.c:1391 ../libnm-core/nm-connection.c:1416
+#: ../libnm-core/nm-connection.c:1441
+msgid "setting is required for non-slave connections"
+msgstr "对于非从连接,设置是必需的"
+
+#: ../libnm-core/nm-connection.c:1404 ../libnm-core/nm-connection.c:1429
+#: ../libnm-core/nm-connection.c:1454
msgid "setting not allowed in slave connection"
msgstr "从连接中不允许设置"
-#: ../libnm-core/nm-connection.c:1316
-msgid "setting is required for non-slave connections"
-msgstr "对于非从连接,设置是必需的。"
-
-#: ../libnm-core/nm-connection.c:1412
+#: ../libnm-core/nm-connection.c:1544
msgid "Unexpected failure to verify the connection"
msgstr "检验连接意外地失败"
-#: ../libnm-core/nm-connection.c:1454
+#: ../libnm-core/nm-connection.c:1588
msgid "Unexpected failure to normalize the connection"
msgstr "正常化连接意外地失败"
-#: ../libnm-core/nm-connection.c:1973 ../libnm-core/nm-setting-8021x.c:2881
-#: ../libnm-core/nm-setting-8021x.c:2898 ../libnm-core/nm-setting-8021x.c:2929
-#: ../libnm-core/nm-setting-8021x.c:2946 ../libnm-core/nm-setting-8021x.c:2988
-#: ../libnm-core/nm-setting-8021x.c:3000 ../libnm-core/nm-setting-8021x.c:3018
-#: ../libnm-core/nm-setting-8021x.c:3030 ../libnm-core/nm-setting-8021x.c:3054
-#: ../libnm-core/nm-setting-8021x.c:3235 ../libnm-core/nm-setting-adsl.c:189
-#: ../libnm-core/nm-setting-bluetooth.c:138
-#: ../libnm-core/nm-setting-bluetooth.c:196
-#: ../libnm-core/nm-setting-bluetooth.c:210 ../libnm-core/nm-setting-cdma.c:159
-#: ../libnm-core/nm-setting-connection.c:894
-#: ../libnm-core/nm-setting-connection.c:937
-#: ../libnm-core/nm-setting-connection.c:1066
-#: ../libnm-core/nm-setting-ip-config.c:2514
-#: ../libnm-core/nm-setting-ip-tunnel.c:352
-#: ../libnm-core/nm-setting-olpc-mesh.c:120
-#: ../libnm-core/nm-setting-ovs-patch.c:95 ../libnm-core/nm-setting-pppoe.c:161
-#: ../libnm-core/nm-setting-vpn.c:518 ../libnm-core/nm-setting-vxlan.c:360
-#: ../libnm-core/nm-setting-wimax.c:126
-#: ../libnm-core/nm-setting-wireless-security.c:900
-#: ../libnm-core/nm-setting-wireless.c:750 ../libnm-util/nm-setting.c:1357
-#: ../libnm-util/nm-setting.c:1376 ../libnm-util/nm-setting.c:1394
-#: ../libnm-util/nm-setting-8021x.c:2325 ../libnm-util/nm-setting-8021x.c:2342
-#: ../libnm-util/nm-setting-8021x.c:2383 ../libnm-util/nm-setting-8021x.c:2400
-#: ../libnm-util/nm-setting-8021x.c:2452 ../libnm-util/nm-setting-8021x.c:2464
-#: ../libnm-util/nm-setting-8021x.c:2482 ../libnm-util/nm-setting-8021x.c:2494
-#: ../libnm-util/nm-setting-8021x.c:2518 ../libnm-util/nm-setting-8021x.c:2680
-#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:142
-#: ../libnm-util/nm-setting-bluetooth.c:160 ../libnm-util/nm-setting-cdma.c:162
-#: ../libnm-util/nm-setting-connection.c:768
-#: ../libnm-util/nm-setting-connection.c:784
-#: ../libnm-util/nm-setting-connection.c:845
+#: ../libnm-core/nm-connection.c:2126 ../libnm-core/nm-setting-8021x.c:2867
+#: ../libnm-core/nm-setting-8021x.c:2884 ../libnm-core/nm-setting-8021x.c:2915
+#: ../libnm-core/nm-setting-8021x.c:2932 ../libnm-core/nm-setting-8021x.c:2974
+#: ../libnm-core/nm-setting-8021x.c:2986 ../libnm-core/nm-setting-8021x.c:3004
+#: ../libnm-core/nm-setting-8021x.c:3016 ../libnm-core/nm-setting-8021x.c:3040
+#: ../libnm-core/nm-setting-8021x.c:3219 ../libnm-core/nm-setting-adsl.c:187
+#: ../libnm-core/nm-setting-bluetooth.c:136
+#: ../libnm-core/nm-setting-bluetooth.c:194
+#: ../libnm-core/nm-setting-bluetooth.c:208 ../libnm-core/nm-setting-cdma.c:157
+#: ../libnm-core/nm-setting-connection.c:928
+#: ../libnm-core/nm-setting-connection.c:971
+#: ../libnm-core/nm-setting-connection.c:1126
+#: ../libnm-core/nm-setting-ip-config.c:2492
+#: ../libnm-core/nm-setting-ip-tunnel.c:373
+#: ../libnm-core/nm-setting-olpc-mesh.c:118
+#: ../libnm-core/nm-setting-ovs-patch.c:92 ../libnm-core/nm-setting-pppoe.c:159
+#: ../libnm-core/nm-setting-vpn.c:488 ../libnm-core/nm-setting-vxlan.c:358
+#: ../libnm-core/nm-setting-wimax.c:124
+#: ../libnm-core/nm-setting-wireless-security.c:918
+#: ../libnm-core/nm-setting-wireless.c:750 ../libnm-util/nm-setting.c:1355
+#: ../libnm-util/nm-setting.c:1374 ../libnm-util/nm-setting.c:1392
+#: ../libnm-util/nm-setting-8021x.c:2324 ../libnm-util/nm-setting-8021x.c:2341
+#: ../libnm-util/nm-setting-8021x.c:2382 ../libnm-util/nm-setting-8021x.c:2399
+#: ../libnm-util/nm-setting-8021x.c:2451 ../libnm-util/nm-setting-8021x.c:2463
+#: ../libnm-util/nm-setting-8021x.c:2481 ../libnm-util/nm-setting-8021x.c:2493
+#: ../libnm-util/nm-setting-8021x.c:2517 ../libnm-util/nm-setting-8021x.c:2677
+#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:141
+#: ../libnm-util/nm-setting-bluetooth.c:159 ../libnm-util/nm-setting-cdma.c:161
+#: ../libnm-util/nm-setting-connection.c:765
+#: ../libnm-util/nm-setting-connection.c:781
+#: ../libnm-util/nm-setting-connection.c:842
#: ../libnm-util/nm-setting-ip4-config.c:869
-#: ../libnm-util/nm-setting-ip6-config.c:833
-#: ../libnm-util/nm-setting-ip6-config.c:899
+#: ../libnm-util/nm-setting-ip6-config.c:831
+#: ../libnm-util/nm-setting-ip6-config.c:897
#: ../libnm-util/nm-setting-olpc-mesh.c:123
-#: ../libnm-util/nm-setting-pppoe.c:163 ../libnm-util/nm-setting-vpn.c:423
-#: ../libnm-util/nm-setting-wimax.c:150
-#: ../libnm-util/nm-setting-wireless-security.c:891
-#: ../libnm-util/nm-setting-wireless.c:769
+#: ../libnm-util/nm-setting-pppoe.c:162 ../libnm-util/nm-setting-vpn.c:422
+#: ../libnm-util/nm-setting-wimax.c:149
+#: ../libnm-util/nm-setting-wireless-security.c:890
+#: ../libnm-util/nm-setting-wireless.c:768
msgid "property is missing"
msgstr "缺少属性"
-#: ../libnm-core/nm-connection.c:2117
+#: ../libnm-core/nm-connection.c:2271
msgid "IP Tunnel"
msgstr "IP 隧道"
-#: ../libnm-core/nm-dbus-utils.c:188
+#: ../libnm-core/nm-dbus-utils.c:189
#, c-format
msgid "Method returned type '%s', but expected '%s'"
-msgstr "方法返回类型 '%s',但期望的是 '%s'"
+msgstr "方法返回类型 \"%s\",但期望的是 \"%s\""
-#: ../libnm-core/nm-keyfile-reader.c:144
+#: ../libnm-core/nm-keyfile.c:199
msgid "ignoring missing number"
msgstr "忽略缺失的数字"
-#: ../libnm-core/nm-keyfile-reader.c:152
+#: ../libnm-core/nm-keyfile.c:207
#, c-format
msgid "ignoring invalid number '%s'"
-msgstr "忽略无效的数字 '%s'"
+msgstr "忽略无效的数字 \"%s\""
-#: ../libnm-core/nm-keyfile-reader.c:173
+#: ../libnm-core/nm-keyfile.c:228
#, c-format
msgid "ignoring invalid %s address: %s"
msgstr "忽略无效的 %s 地址:%s"
-#: ../libnm-core/nm-keyfile-reader.c:215
+#: ../libnm-core/nm-keyfile.c:270
#, c-format
msgid "ignoring invalid gateway '%s' for %s route"
-msgstr "忽略 %s 路由的无效网关 '%s'"
+msgstr "忽略 %2$s 路由的无效网关 \"%1$s\""
-#: ../libnm-core/nm-keyfile-reader.c:236
+#: ../libnm-core/nm-keyfile.c:291
#, c-format
msgid "ignoring invalid %s route: %s"
msgstr "忽略无效的 %s 路由:%s"
-#: ../libnm-core/nm-keyfile-reader.c:362
+#: ../libnm-core/nm-keyfile.c:416
#, c-format
msgid "unexpected character '%c' for address %s: '%s' (position %td)"
-msgstr "意外字符 “%c”(地址 %s): “%s” (位置 %td)"
+msgstr "对于地址 %2$s 的意外字符 \"%1$c\":\"%3$s\"(位置 %4$td)"
-#: ../libnm-core/nm-keyfile-reader.c:372
+#: ../libnm-core/nm-keyfile.c:426
#, c-format
msgid "unexpected character '%c' for %s: '%s' (position %td)"
-msgstr "意外字符 “%c” (%s): “%s” (位置 %td)"
+msgstr "对于 %2$s 的意外字符 \"%1$c\":\"%3$s\"(位置 %4$td)"
-#: ../libnm-core/nm-keyfile-reader.c:381
+#: ../libnm-core/nm-keyfile.c:435
#, c-format
msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
-msgstr "意外字符 “%c”(在 %s 的前缀长度中): “%s” (位置 %td)"
+msgstr "对于 %2$s,前缀长度中有意外字符 \"%1$c\":\"%3$s\"(位置 %4$td)"
-#: ../libnm-core/nm-keyfile-reader.c:392
+#: ../libnm-core/nm-keyfile.c:446
#, c-format
msgid "garbage at the end of value %s: '%s'"
-msgstr "值 %s: '%s' 结尾的无用信息"
+msgstr "值 %s 的末尾有无用信息:\"%s\""
-#: ../libnm-core/nm-keyfile-reader.c:398
+#: ../libnm-core/nm-keyfile.c:452
#, c-format
msgid "deprecated semicolon at the end of value %s: '%s'"
-msgstr "值 %s: '%s' 结尾已舍弃的分号"
+msgstr "值 %s 的末尾有舍弃的分号:\"%s\""
-#: ../libnm-core/nm-keyfile-reader.c:413
+#: ../libnm-core/nm-keyfile.c:467
#, c-format
msgid "invalid prefix length for %s '%s', defaulting to %d"
-msgstr "%s '%s' 的无效前缀长度,默认为 %d。"
+msgstr "%s 的前缀长度 \"%s\" 无效,默认为 %d"
-#: ../libnm-core/nm-keyfile-reader.c:420
+#: ../libnm-core/nm-keyfile.c:474
#, c-format
msgid "missing prefix length for %s '%s', defaulting to %d"
-msgstr "%s '%s' 缺失的前缀长度,默认为 %d。"
-
-#: ../libnm-core/nm-keyfile-reader.c:554
-#, c-format
-msgid "ignoring invalid DNS server IPv4 address '%s'"
-msgstr "忽略无效的 DNS 服务器 IPv4 地址 '%s'"
+msgstr "缺少 %s 的前缀长度 \"%s\",默认为 %d"
-#: ../libnm-core/nm-keyfile-reader.c:593
+#: ../libnm-core/nm-keyfile.c:738
#, c-format
-msgid "ignoring invalid DNS server IPv6 address '%s'"
-msgstr "忽略无效的 DNS 服务器 IPv6 地址 '%s'"
+msgid "ignoring invalid DNS server IPv%c address '%s'"
+msgstr "忽略无效的 DNS 服务器 IPv%c 地址 \"%s\""
-#: ../libnm-core/nm-keyfile-reader.c:687 ../libnm-core/nm-keyfile-reader.c:1721
+#: ../libnm-core/nm-keyfile.c:834 ../libnm-core/nm-keyfile.c:2629
#, c-format
msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
-msgstr "忽略无效的字节元素 '%d'(不在 0 和 255 之间)"
+msgstr "忽略无效的字节元素 \"%d\"(不在 0 和 255 之间)"
-#: ../libnm-core/nm-keyfile-reader.c:698
+#: ../libnm-core/nm-keyfile.c:845
msgid "ignoring invalid MAC address"
msgstr "忽略无效的 MAC 地址"
-#: ../libnm-core/nm-keyfile-reader.c:935
+#: ../libnm-core/nm-keyfile.c:1082
msgid "ignoring invalid SSID"
msgstr "忽略无效的 SSID"
-#: ../libnm-core/nm-keyfile-reader.c:951
+#: ../libnm-core/nm-keyfile.c:1098
msgid "ignoring invalid raw password"
msgstr "忽略无效的原始密码"
-#: ../libnm-core/nm-keyfile-reader.c:1026
-#: ../libnm-core/nm-keyfile-reader.c:1202
-#, c-format
-msgid "certificate or key file '%s' does not exist"
-msgstr "证书或密钥文件 '%s' 不存在"
+#: ../libnm-core/nm-keyfile.c:1236
+msgid "invalid key/cert value"
+msgstr "无效的密钥/证书值"
-#: ../libnm-core/nm-keyfile-reader.c:1031
+#: ../libnm-core/nm-keyfile.c:1247
#, c-format
msgid "invalid key/cert value path \"%s\""
msgstr "无效的密钥/证书值路径 \"%s\""
-#: ../libnm-core/nm-keyfile-reader.c:1041
+#: ../libnm-core/nm-keyfile.c:1263 ../libnm-core/nm-keyfile.c:1346
+#, c-format
+msgid "certificate or key file '%s' does not exist"
+msgstr "证书或密钥文件 \"%s\" 不存在"
+
+#: ../libnm-core/nm-keyfile.c:1272
#, c-format
msgid "invalid PKCS#11 URI \"%s\""
-msgstr ""
+msgstr "无效的 PKCS#11 URI \"%s\""
-#: ../libnm-core/nm-keyfile-reader.c:1079
+#: ../libnm-core/nm-keyfile.c:1316
msgid "invalid key/cert value data:;base64, is not base64"
-msgstr "无效的密钥/证书值数据:;base64,不是 base64"
+msgstr "无效的密钥/证书值 data:;base64,不是 base64"
-#: ../libnm-core/nm-keyfile-reader.c:1092
+#: ../libnm-core/nm-keyfile.c:1325
msgid "invalid key/cert value data:;base64,file://"
-msgstr "无效的密钥/证书值数据:;base64,file://"
+msgstr "无效的密钥/证书值 data:;base64,file://"
-#: ../libnm-core/nm-keyfile-reader.c:1239
+#: ../libnm-core/nm-keyfile.c:1358
msgid "invalid key/cert value is not a valid blob"
-msgstr "无效的密钥/证书值不是有效的 blob"
-
-#: ../libnm-core/nm-keyfile-reader.c:1244
-msgid "invalid key/cert value"
-msgstr "无效的密钥/证书值"
+msgstr "无效的密钥/证书值,不是有效的比特块(blob)"
-#: ../libnm-core/nm-keyfile-reader.c:1291
+#: ../libnm-core/nm-keyfile.c:1408
#, c-format
msgid "invalid parity value '%s'"
-msgstr "无效的奇偶校验值 '%s'"
+msgstr "无效的奇偶校验值 \"%s\""
-#: ../libnm-core/nm-keyfile-reader.c:1309
+#: ../libnm-core/nm-keyfile.c:1426
#, c-format
msgid "ignoring invalid team configuration: %s"
-msgstr ""
+msgstr "忽略无效的组合(team)配置:%s"
-#: ../libnm-core/nm-keyfile-reader.c:1352
-#, fuzzy, c-format
+#: ../libnm-core/nm-keyfile.c:1469
+#, c-format
msgid "invalid qdisc: %s"
-msgstr "无效的 IP 地址:%s"
+msgstr "无效的排队规则(qdisc):%s"
-#: ../libnm-core/nm-keyfile-reader.c:1400
-#, fuzzy, c-format
+#: ../libnm-core/nm-keyfile.c:1517
+#, c-format
msgid "invalid tfilter: %s"
-msgstr "无效的路由:%s"
+msgstr "无效的流量过滤器(tfilter):%s"
-#: ../libnm-core/nm-keyfile-reader.c:1622
+#: ../libnm-core/nm-keyfile.c:2538
#, c-format
msgid "error loading setting value: %s"
-msgstr "加载设置值出错:%s"
+msgstr "加载设置值时出错:%s"
-#: ../libnm-core/nm-keyfile-reader.c:1654
+#: ../libnm-core/nm-keyfile.c:2563
#, c-format
msgid "invalid negative value (%i)"
-msgstr "无效的负值 (%i)"
+msgstr "无效的负值(%i)"
-#: ../libnm-core/nm-keyfile-reader.c:1675
+#: ../libnm-core/nm-keyfile.c:2584
#, c-format
msgid "invalid char value (%i)"
-msgstr "无效的字符值 (%i)"
+msgstr "无效的字符值(%i)"
-#: ../libnm-core/nm-keyfile-reader.c:1698
+#: ../libnm-core/nm-keyfile.c:2606
#, c-format
msgid "invalid int64 value (%s)"
-msgstr "无效的 int64 值 (%s)"
+msgstr "无效的 int64 值(%s)"
-#: ../libnm-core/nm-keyfile-reader.c:1757
+#: ../libnm-core/nm-keyfile.c:2665
#, c-format
msgid "too large FLAGS property '%s' (%llu)"
-msgstr "过大的 FLAGS 属性 '%s' (%llu)"
+msgstr "过大的 FLAGS 属性 \"%s\" (%llu)"
-#: ../libnm-core/nm-keyfile-reader.c:1770
+#: ../libnm-core/nm-keyfile.c:2678
#, c-format
msgid "unhandled setting property type '%s'"
-msgstr "未处理的设置属性类型 '%s'"
+msgstr "未处理的设置属性类型 \"%s\""
-#: ../libnm-core/nm-keyfile-reader.c:1801
+#: ../libnm-core/nm-keyfile.c:2699
#, c-format
msgid "invalid setting name '%s'"
-msgstr "无效的设置名称 '%s'"
+msgstr "无效的设置名称 \"%s\""
+
+#: ../libnm-core/nm-keyfile.c:2742
+#, c-format
+msgid "invalid key '%s.%s'"
+msgstr "无效的密钥 \"%s.%s\""
+
+#: ../libnm-core/nm-keyfile.c:2757
+#, c-format
+msgid "key '%s.%s' is not boolean"
+msgstr "密钥 \"%s.%s\" 不是布尔值"
-#: ../libnm-core/nm-setting-8021x.c:436
+#: ../libnm-core/nm-setting-6lowpan.c:104
+#, c-format
+msgid "property is not specified"
+msgstr "未指定属性"
+
+#: ../libnm-core/nm-setting-6lowpan.c:126 ../libnm-core/nm-setting-macsec.c:306
+#: ../libnm-core/nm-setting-vlan.c:632 ../libnm-util/nm-setting-vlan.c:556
+#, c-format
+msgid "'%s' value doesn't match '%s=%s'"
+msgstr "\"%s\" 值与 \"%s=%s\" 不匹配"
+
+#: ../libnm-core/nm-setting-6lowpan.c:137
+#: ../libnm-core/nm-setting-ip-tunnel.c:351
+#: ../libnm-core/nm-setting-macsec.c:317 ../libnm-core/nm-setting-macvlan.c:161
+#: ../libnm-core/nm-setting-vlan.c:643 ../libnm-core/nm-setting-vxlan.c:401
+#: ../libnm-util/nm-setting-vlan.c:567
+#, c-format
+msgid "'%s' is neither an UUID nor an interface name"
+msgstr "\"%s\" 不是 UUID 或接口名称"
+
+#: ../libnm-core/nm-setting-8021x.c:434
msgid "data missing"
msgstr "数据缺失"
-#: ../libnm-core/nm-setting-8021x.c:472
+#: ../libnm-core/nm-setting-8021x.c:470
msgid "binary data missing"
msgstr "二进制数据缺失"
-#: ../libnm-core/nm-setting-8021x.c:500
+#: ../libnm-core/nm-setting-8021x.c:498
msgid "URI not NUL terminated"
-msgstr ""
+msgstr "URI 非 NUL 终止符"
-#: ../libnm-core/nm-setting-8021x.c:509
+#: ../libnm-core/nm-setting-8021x.c:507
msgid "URI is empty"
-msgstr ""
+msgstr "URI 为空"
-#: ../libnm-core/nm-setting-8021x.c:517
+#: ../libnm-core/nm-setting-8021x.c:515
msgid "URI is not valid UTF-8"
-msgstr ""
+msgstr "URI 不是有效的 UTF-8"
-#: ../libnm-core/nm-setting-8021x.c:753 ../libnm-util/nm-setting-8021x.c:639
+#: ../libnm-core/nm-setting-8021x.c:751 ../libnm-util/nm-setting-8021x.c:639
msgid "CA certificate must be in X.509 format"
-msgstr "CA 证书格式必须是 X.509"
+msgstr "CA 证书必须是 X.509 格式"
-#: ../libnm-core/nm-setting-8021x.c:1158 ../libnm-core/nm-setting-8021x.c:1512
-#: ../libnm-core/nm-setting-8021x.c:1923 ../libnm-util/nm-setting-8021x.c:957
-#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543
+#: ../libnm-core/nm-setting-8021x.c:1156 ../libnm-core/nm-setting-8021x.c:1510
+#: ../libnm-core/nm-setting-8021x.c:1920 ../libnm-util/nm-setting-8021x.c:957
+#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1542
msgid "invalid certificate format"
msgstr "无效的证书格式"
-#: ../libnm-core/nm-setting-8021x.c:2275 ../libnm-util/nm-setting-8021x.c:1812
+#: ../libnm-core/nm-setting-8021x.c:2272 ../libnm-util/nm-setting-8021x.c:1811
msgid "invalid private key"
msgstr "无效的私有密钥"
-#: ../libnm-core/nm-setting-8021x.c:2622 ../libnm-util/nm-setting-8021x.c:2123
+#: ../libnm-core/nm-setting-8021x.c:2614 ../libnm-util/nm-setting-8021x.c:2122
msgid "invalid phase2 private key"
-msgstr "无效的二阶段私有密钥"
-
-#: ../libnm-core/nm-setting-8021x.c:2888 ../libnm-core/nm-setting-8021x.c:2905
-#: ../libnm-core/nm-setting-8021x.c:2936 ../libnm-core/nm-setting-8021x.c:2953
-#: ../libnm-core/nm-setting-8021x.c:2994 ../libnm-core/nm-setting-8021x.c:3006
-#: ../libnm-core/nm-setting-8021x.c:3024 ../libnm-core/nm-setting-8021x.c:3036
-#: ../libnm-core/nm-setting-8021x.c:3061 ../libnm-core/nm-setting-adsl.c:196
-#: ../libnm-core/nm-setting-cdma.c:166 ../libnm-core/nm-setting-cdma.c:175
-#: ../libnm-core/nm-setting-connection.c:901
-#: ../libnm-core/nm-setting-connection.c:949 ../libnm-core/nm-setting-gsm.c:299
-#: ../libnm-core/nm-setting-gsm.c:356 ../libnm-core/nm-setting-gsm.c:393
-#: ../libnm-core/nm-setting-gsm.c:402 ../libnm-core/nm-setting-ip-config.c:2521
-#: ../libnm-core/nm-setting-ip4-config.c:198
-#: ../libnm-core/nm-setting-ip4-config.c:205
-#: ../libnm-core/nm-setting-pppoe.c:168 ../libnm-core/nm-setting-pppoe.c:177
-#: ../libnm-core/nm-setting-vpn.c:527 ../libnm-core/nm-setting-vpn.c:537
-#: ../libnm-core/nm-setting-wimax.c:135
-#: ../libnm-core/nm-setting-wireless-security.c:930
-#: ../libnm-core/nm-setting-wireless-security.c:954
-#: ../libnm-core/nm-setting.c:1118 ../libnm-util/nm-setting-8021x.c:2332
-#: ../libnm-util/nm-setting-8021x.c:2349 ../libnm-util/nm-setting-8021x.c:2390
-#: ../libnm-util/nm-setting-8021x.c:2407 ../libnm-util/nm-setting-8021x.c:2458
-#: ../libnm-util/nm-setting-8021x.c:2470 ../libnm-util/nm-setting-8021x.c:2488
-#: ../libnm-util/nm-setting-8021x.c:2500 ../libnm-util/nm-setting-8021x.c:2525
-#: ../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
+msgstr "无效的二阶段私钥"
+
+#: ../libnm-core/nm-setting-8021x.c:2874 ../libnm-core/nm-setting-8021x.c:2891
+#: ../libnm-core/nm-setting-8021x.c:2922 ../libnm-core/nm-setting-8021x.c:2939
+#: ../libnm-core/nm-setting-8021x.c:2980 ../libnm-core/nm-setting-8021x.c:2992
+#: ../libnm-core/nm-setting-8021x.c:3010 ../libnm-core/nm-setting-8021x.c:3022
+#: ../libnm-core/nm-setting-8021x.c:3047 ../libnm-core/nm-setting-adsl.c:194
+#: ../libnm-core/nm-setting-cdma.c:164 ../libnm-core/nm-setting-cdma.c:173
+#: ../libnm-core/nm-setting-connection.c:935
+#: ../libnm-core/nm-setting-connection.c:983 ../libnm-core/nm-setting-gsm.c:297
+#: ../libnm-core/nm-setting-gsm.c:354 ../libnm-core/nm-setting-gsm.c:391
+#: ../libnm-core/nm-setting-gsm.c:400 ../libnm-core/nm-setting-ip-config.c:2499
+#: ../libnm-core/nm-setting-ip4-config.c:196
+#: ../libnm-core/nm-setting-ip4-config.c:203
+#: ../libnm-core/nm-setting-pppoe.c:166 ../libnm-core/nm-setting-pppoe.c:175
+#: ../libnm-core/nm-setting-vpn.c:497 ../libnm-core/nm-setting-vpn.c:507
+#: ../libnm-core/nm-setting-wimax.c:133
+#: ../libnm-core/nm-setting-wireless-security.c:948
+#: ../libnm-core/nm-setting-wireless-security.c:972
+#: ../libnm-core/nm-setting.c:1127 ../libnm-util/nm-setting-8021x.c:2331
+#: ../libnm-util/nm-setting-8021x.c:2348 ../libnm-util/nm-setting-8021x.c:2389
+#: ../libnm-util/nm-setting-8021x.c:2406 ../libnm-util/nm-setting-8021x.c:2457
+#: ../libnm-util/nm-setting-8021x.c:2469 ../libnm-util/nm-setting-8021x.c:2487
+#: ../libnm-util/nm-setting-8021x.c:2499 ../libnm-util/nm-setting-8021x.c:2524
+#: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:168
+#: ../libnm-util/nm-setting-cdma.c:177
+#: ../libnm-util/nm-setting-connection.c:772
+#: ../libnm-util/nm-setting-connection.c:849 ../libnm-util/nm-setting-gsm.c:281
+#: ../libnm-util/nm-setting-gsm.c:338 ../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
-#: ../libnm-util/nm-setting-wimax.c:159
-#: ../libnm-util/nm-setting-wireless-security.c:921
-#: ../libnm-util/nm-setting-wireless-security.c:945
+#: ../libnm-util/nm-setting-pppoe.c:169 ../libnm-util/nm-setting-pppoe.c:178
+#: ../libnm-util/nm-setting-vpn.c:431 ../libnm-util/nm-setting-vpn.c:441
+#: ../libnm-util/nm-setting-wimax.c:158
+#: ../libnm-util/nm-setting-wireless-security.c:920
+#: ../libnm-util/nm-setting-wireless-security.c:944
msgid "property is empty"
msgstr "属性为空"
-#: ../libnm-core/nm-setting-8021x.c:2918 ../libnm-core/nm-setting-8021x.c:2966
-#: ../libnm-util/nm-setting-8021x.c:2360 ../libnm-util/nm-setting-8021x.c:2372
-#: ../libnm-util/nm-setting-8021x.c:2418 ../libnm-util/nm-setting-8021x.c:2430
+#: ../libnm-core/nm-setting-8021x.c:2904 ../libnm-core/nm-setting-8021x.c:2952
+#: ../libnm-util/nm-setting-8021x.c:2359 ../libnm-util/nm-setting-8021x.c:2371
+#: ../libnm-util/nm-setting-8021x.c:2417 ../libnm-util/nm-setting-8021x.c:2429
#, c-format
msgid "has to match '%s' property for PKCS#12"
-msgstr "PKCS#12:必须匹配“%s”属性"
+msgstr "必须匹配 PKCS#12 的 \"%s\" 属性"
-#: ../libnm-core/nm-setting-8021x.c:3197
+#: ../libnm-core/nm-setting-8021x.c:3181
#, c-format
msgid "certificate is invalid: %s"
msgstr "证书是无效的:%s"
-#: ../libnm-core/nm-setting-8021x.c:3207
+#: ../libnm-core/nm-setting-8021x.c:3191
#, c-format
msgid "password is not supported when certificate is not on a PKCS#11 token"
-msgstr ""
-
-#: ../libnm-core/nm-setting-8021x.c:3244
-#: ../libnm-core/nm-setting-bluetooth.c:123
-#: ../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:215
-#: ../libnm-core/nm-setting-ip6-config.c:226
-#: ../libnm-core/nm-setting-olpc-mesh.c:149
-#: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:678
-#: ../libnm-core/nm-setting-wired.c:688
-#: ../libnm-core/nm-setting-wireless-security.c:973
-#: ../libnm-core/nm-setting-wireless-security.c:982
+msgstr "当证书不在 PKCS#11 令牌上时不支持密码"
+
+#: ../libnm-core/nm-setting-8021x.c:3228
+#: ../libnm-core/nm-setting-bluetooth.c:121
+#: ../libnm-core/nm-setting-infiniband.c:190
+#: ../libnm-core/nm-setting-infiniband.c:205
+#: ../libnm-core/nm-setting-ip4-config.c:187
+#: ../libnm-core/nm-setting-ip6-config.c:235
+#: ../libnm-core/nm-setting-ip6-config.c:246
+#: ../libnm-core/nm-setting-olpc-mesh.c:147
+#: ../libnm-core/nm-setting-wimax.c:142 ../libnm-core/nm-setting-wired.c:676
+#: ../libnm-core/nm-setting-wired.c:686
#: ../libnm-core/nm-setting-wireless-security.c:991
-#: ../libnm-core/nm-setting-wireless-security.c:1027
-#: ../libnm-core/nm-setting-wireless-security.c:1037
-#: ../libnm-core/nm-setting-wireless-security.c:1060
-#: ../libnm-core/nm-setting-wireless-security.c:1085
-#: ../libnm-core/nm-setting-wireless-security.c:1112
-#: ../libnm-core/nm-setting-wireless-security.c:1151
+#: ../libnm-core/nm-setting-wireless-security.c:1000
+#: ../libnm-core/nm-setting-wireless-security.c:1009
+#: ../libnm-core/nm-setting-wireless-security.c:1045
+#: ../libnm-core/nm-setting-wireless-security.c:1055
+#: ../libnm-core/nm-setting-wireless-security.c:1078
+#: ../libnm-core/nm-setting-wireless-security.c:1103
+#: ../libnm-core/nm-setting-wireless-security.c:1130
+#: ../libnm-core/nm-setting-wireless-security.c:1169
#: ../libnm-core/nm-setting-wireless.c:811
#: ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-util/nm-setting.c:1367
-#: ../libnm-util/nm-setting.c:1385 ../libnm-util/nm-setting.c:1404
-#: ../libnm-util/nm-setting-8021x.c:2655 ../libnm-util/nm-setting-8021x.c:2689
-#: ../libnm-util/nm-setting-bluetooth.c:151
+#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-core/nm-setting-wpan.c:129
+#: ../libnm-util/nm-setting.c:1365 ../libnm-util/nm-setting.c:1383
+#: ../libnm-util/nm-setting.c:1402 ../libnm-util/nm-setting-8021x.c:2652
+#: ../libnm-util/nm-setting-8021x.c:2686
+#: ../libnm-util/nm-setting-bluetooth.c:150
#: ../libnm-util/nm-setting-infiniband.c:205
#: ../libnm-util/nm-setting-infiniband.c:221
#: ../libnm-util/nm-setting-ip4-config.c:925
-#: ../libnm-util/nm-setting-ip6-config.c:890
+#: ../libnm-util/nm-setting-ip6-config.c:888
#: ../libnm-util/nm-setting-olpc-mesh.c:151
-#: ../libnm-util/nm-setting-wimax.c:168 ../libnm-util/nm-setting-wired.c:658
-#: ../libnm-util/nm-setting-wired.c:667
-#: ../libnm-util/nm-setting-wireless-security.c:964
-#: ../libnm-util/nm-setting-wireless-security.c:973
-#: ../libnm-util/nm-setting-wireless-security.c:982
-#: ../libnm-util/nm-setting-wireless-security.c:1018
-#: ../libnm-util/nm-setting-wireless-security.c:1028
-#: ../libnm-util/nm-setting-wireless.c:829
-#: ../libnm-util/nm-setting-wireless.c:838
-#: ../libnm-util/nm-setting-wireless.c:847
+#: ../libnm-util/nm-setting-wimax.c:167 ../libnm-util/nm-setting-wired.c:657
+#: ../libnm-util/nm-setting-wired.c:666
+#: ../libnm-util/nm-setting-wireless-security.c:963
+#: ../libnm-util/nm-setting-wireless-security.c:972
+#: ../libnm-util/nm-setting-wireless-security.c:981
+#: ../libnm-util/nm-setting-wireless-security.c:1017
+#: ../libnm-util/nm-setting-wireless-security.c:1027
+#: ../libnm-util/nm-setting-wireless.c:828
+#: ../libnm-util/nm-setting-wireless.c:837
+#: ../libnm-util/nm-setting-wireless.c:846
msgid "property is invalid"
msgstr "属性无效"
-#: ../libnm-core/nm-setting-8021x.c:3269 ../libnm-core/nm-setting-8021x.c:3279
-#: ../libnm-core/nm-setting-8021x.c:3289 ../libnm-core/nm-setting-8021x.c:3308
-#: ../libnm-core/nm-setting-8021x.c:3318 ../libnm-core/nm-setting-adsl.c:208
-#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:151
-#: ../libnm-core/nm-setting-wireless-security.c:909
-#: ../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-wireless-security.c:900
+#: ../libnm-core/nm-setting-8021x.c:3253 ../libnm-core/nm-setting-8021x.c:3263
+#: ../libnm-core/nm-setting-8021x.c:3273 ../libnm-core/nm-setting-8021x.c:3292
+#: ../libnm-core/nm-setting-8021x.c:3302 ../libnm-core/nm-setting-adsl.c:206
+#: ../libnm-core/nm-setting-adsl.c:218 ../libnm-core/nm-setting-bluetooth.c:149
+#: ../libnm-core/nm-setting-wireless-security.c:927
+#: ../libnm-util/nm-setting-8021x.c:2711 ../libnm-util/nm-setting-8021x.c:2721
+#: ../libnm-util/nm-setting-8021x.c:2731 ../libnm-util/nm-setting-8021x.c:2741
+#: ../libnm-util/nm-setting-8021x.c:2751 ../libnm-util/nm-setting-adsl.c:228
+#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:167
+#: ../libnm-util/nm-setting-wireless-security.c:899
#, c-format
msgid "'%s' is not a valid value for the property"
-msgstr "“%s”不是该属性的有效取值"
+msgstr "\"%s\" 不是该属性的有效取值"
-#: ../libnm-core/nm-setting-8021x.c:3299
-#, fuzzy
+#: ../libnm-core/nm-setting-8021x.c:3283
msgid "invalid auth flags"
-msgstr "无效的路由:%s"
+msgstr "无效的验证标记"
-#: ../libnm-core/nm-setting-bluetooth.c:173
+#: ../libnm-core/nm-setting-bluetooth.c:171
#, c-format
msgid "'%s' connection requires '%s' or '%s' setting"
-msgstr "'%s' 连接需要 '%s' 或者 '%s' 设置"
+msgstr "\"%s\" 连接需要 \"%s\" 或者 \"%s\" 设置"
-#: ../libnm-core/nm-setting-bluetooth.c:219
+#: ../libnm-core/nm-setting-bluetooth.c:217
#, c-format
msgid "'%s' connection requires '%s' setting"
-msgstr ""
+msgstr "\"%s\" 连接需要 \"%s\" 设置"
-#: ../libnm-core/nm-setting-bond.c:566 ../libnm-util/nm-setting-bond.c:517
+#: ../libnm-core/nm-setting-bond.c:564 ../libnm-util/nm-setting-bond.c:516
#, c-format
msgid "invalid option '%s' or its value '%s'"
-msgstr "无效选项“%s”或值“%s”"
+msgstr "无效的选项 \"%s\" 或其值 \"%s\""
-#: ../libnm-core/nm-setting-bond.c:591 ../libnm-util/nm-setting-bond.c:536
+#: ../libnm-core/nm-setting-bond.c:589 ../libnm-util/nm-setting-bond.c:535
#, c-format
msgid "only one of '%s' and '%s' can be set"
-msgstr "只能设置“%s”和“%s”中的一个"
+msgstr "只能设置 \"%s\" 和 \"%s\" 中的一个"
-#: ../libnm-core/nm-setting-bond.c:604 ../libnm-util/nm-setting-bond.c:547
+#: ../libnm-core/nm-setting-bond.c:602 ../libnm-util/nm-setting-bond.c:546
#, c-format
msgid "mandatory option '%s' is missing"
-msgstr "缺少强制选项 “%s”"
+msgstr "缺少必填选项 \"%s\""
-#: ../libnm-core/nm-setting-bond.c:614 ../libnm-util/nm-setting-bond.c:556
+#: ../libnm-core/nm-setting-bond.c:612 ../libnm-util/nm-setting-bond.c:555
#, c-format
msgid "'%s' is not a valid value for '%s'"
-msgstr "“%s”不是“%s”的有效取值"
+msgstr "\"%s\" 不是 \"%s\" 的有效取值"
-#: ../libnm-core/nm-setting-bond.c:628 ../libnm-util/nm-setting-bond.c:569
+#: ../libnm-core/nm-setting-bond.c:626 ../libnm-util/nm-setting-bond.c:568
#, c-format
msgid "'%s=%s' is incompatible with '%s > 0'"
-msgstr "“%s=%s”与“%s > 0”不兼容"
+msgstr "\"%s=%s\" 与 \"%s > 0\" 不兼容"
-#: ../libnm-core/nm-setting-bond.c:643
+#: ../libnm-core/nm-setting-bond.c:641
#, c-format
msgid "'%s' is not valid for the '%s' option: %s"
-msgstr ""
+msgstr "\"%s\" 对 \"%s\" 选项无效:%s"
-#: ../libnm-core/nm-setting-bond.c:654 ../libnm-util/nm-setting-bond.c:592
+#: ../libnm-core/nm-setting-bond.c:652 ../libnm-util/nm-setting-bond.c:591
#, c-format
msgid "'%s' option is only valid for '%s=%s'"
-msgstr "“%s” 选项只能在 “%s=%s” 中使用"
+msgstr "\"%s\" 选项只能在 \"%s=%s\" 中使用"
-#: ../libnm-core/nm-setting-bond.c:667 ../libnm-util/nm-setting-bond.c:605
+#: ../libnm-core/nm-setting-bond.c:665 ../libnm-util/nm-setting-bond.c:604
#, c-format
msgid "'%s=%s' is not a valid configuration for '%s'"
-msgstr "“%s=%s”不是“%s”的有效配置"
+msgstr "\"%s=%s\" 不是 \"%s\" 的有效配置"
-#: ../libnm-core/nm-setting-bond.c:680 ../libnm-core/nm-setting-bond.c:689
-#: ../libnm-core/nm-setting-bond.c:709 ../libnm-core/nm-setting-bond.c:745
-#: ../libnm-util/nm-setting-bond.c:618 ../libnm-util/nm-setting-bond.c:627
-#: ../libnm-util/nm-setting-bond.c:647 ../libnm-util/nm-setting-bond.c:683
+#: ../libnm-core/nm-setting-bond.c:678 ../libnm-core/nm-setting-bond.c:687
+#: ../libnm-core/nm-setting-bond.c:707 ../libnm-core/nm-setting-bond.c:743
+#: ../libnm-util/nm-setting-bond.c:617 ../libnm-util/nm-setting-bond.c:626
+#: ../libnm-util/nm-setting-bond.c:646 ../libnm-util/nm-setting-bond.c:682
#, c-format
msgid "'%s' option requires '%s' option to be set"
-msgstr "“%s” 选项需要设置 “%s” 选项"
+msgstr "\"%s\" 选项需要设置 \"%s\" 选项"
-#: ../libnm-core/nm-setting-bond.c:720 ../libnm-util/nm-setting-bond.c:658
+#: ../libnm-core/nm-setting-bond.c:718 ../libnm-util/nm-setting-bond.c:657
#, c-format
msgid "'%s' option is empty"
-msgstr "“%s”选项为空"
+msgstr "\"%s\"选项为空"
-#: ../libnm-core/nm-setting-bond.c:732 ../libnm-util/nm-setting-bond.c:670
+#: ../libnm-core/nm-setting-bond.c:730 ../libnm-util/nm-setting-bond.c:669
#, c-format
msgid "'%s' is not a valid IPv4 address for '%s' option"
-msgstr "“%s”不是“%s”选项的有效 IPv4 地址。"
+msgstr "\"%s\" 不是 \"%s\" 选项的有效 IPv4 地址"
-#: ../libnm-core/nm-setting-bond.c:760 ../libnm-util/nm-setting-bond.c:697
+#: ../libnm-core/nm-setting-bond.c:758 ../libnm-util/nm-setting-bond.c:696
#, c-format
msgid "'%s' option is only valid with mode '%s'"
-msgstr "'%s' 选项只在 '%s' 模式里有效"
+msgstr "\"%s\" 选项只在 \"%s\" 模式里有效"
-#: ../libnm-core/nm-setting-bond.c:771
+#: ../libnm-core/nm-setting-bond.c:769
#, c-format
msgid "'%s' and '%s' cannot have different values"
-msgstr "'%s' 和 '%s' 不能有不同的值"
+msgstr "\"%s\" 和 \"%s\" 不能有不同的值"
-#: ../libnm-core/nm-setting-bond.c:787
+#: ../libnm-core/nm-setting-bond.c:785
#, c-format
msgid "'%s' option should be string"
-msgstr "'%s' 选项应该为字符串"
+msgstr "\"%s\" 选项应该为字符串"
-#: ../libnm-core/nm-setting-bond.c:803
+#: ../libnm-core/nm-setting-bond.c:801
#, c-format
msgid "'%s' option is not valid with mode '%s'"
-msgstr ""
+msgstr "\"%s\" 选项在 \"%s\" 模式里无效"
-#: ../libnm-core/nm-setting-bridge-port.c:127
-#: ../libnm-core/nm-setting-ovs-interface.c:262
-#: ../libnm-core/nm-setting-ovs-port.c:189
-#: ../libnm-core/nm-setting-ovs-bridge.c:152
-#: ../libnm-core/nm-setting-team-port.c:358
+#: ../libnm-core/nm-setting-bridge-port.c:125
+#: ../libnm-core/nm-setting-ovs-interface.c:259
+#: ../libnm-core/nm-setting-ovs-port.c:187
+#: ../libnm-core/nm-setting-ovs-bridge.c:150
+#: ../libnm-core/nm-setting-team-port.c:357
#, c-format
msgid "missing setting"
msgstr "缺少设置"
-#: ../libnm-core/nm-setting-bridge-port.c:138
-#: ../libnm-core/nm-setting-ovs-interface.c:283
-#: ../libnm-core/nm-setting-ovs-port.c:210
-#: ../libnm-core/nm-setting-team-port.c:369
+#: ../libnm-core/nm-setting-bridge-port.c:136
+#: ../libnm-core/nm-setting-ovs-interface.c:280
+#: ../libnm-core/nm-setting-ovs-port.c:208
+#: ../libnm-core/nm-setting-team-port.c:368
#, c-format
msgid ""
"A connection with a '%s' setting must have the slave-type set to '%s'. "
"Instead it is '%s'"
-msgstr "具有 '%s' 设置的连接必须将 slave-type 设置为 '%s'。而它是 '%s'。"
+msgstr "具有 \"%s\" 设置的连接必须将 slave-type 设置为 \"%s\"。而它是 \"%s\""
-#: ../libnm-core/nm-setting-bridge.c:231 ../libnm-util/nm-setting-bridge.c:269
+#: ../libnm-core/nm-setting-bridge.c:229 ../libnm-util/nm-setting-bridge.c:268
#, c-format
msgid "value '%d' is out of range <%d-%d>"
-msgstr "值“%d”超出了范围 <%d-%d>"
+msgstr "值 \"%d\" 超出了范围 <%d-%d>"
-#: ../libnm-core/nm-setting-bridge.c:248 ../libnm-core/nm-setting-wired.c:652
-#: ../libnm-core/nm-setting-wired.c:714 ../libnm-core/nm-setting-wired.c:756
-#: ../libnm-util/nm-setting-bridge.c:286 ../libnm-util/nm-setting-wired.c:633
-#: ../libnm-util/nm-setting-wired.c:691
+#: ../libnm-core/nm-setting-bridge.c:246 ../libnm-core/nm-setting-wired.c:650
+#: ../libnm-core/nm-setting-wired.c:712 ../libnm-core/nm-setting-wired.c:754
+#: ../libnm-util/nm-setting-bridge.c:285 ../libnm-util/nm-setting-wired.c:632
+#: ../libnm-util/nm-setting-wired.c:690
msgid "is not a valid MAC address"
msgstr "不是有效的 MAC 地址"
-#: ../libnm-core/nm-setting-bridge.c:289
+#: ../libnm-core/nm-setting-bridge.c:287
msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)"
-msgstr ""
+msgstr "掩码不能包含位 0(STP)、1(MAC)或2(LACP)"
-#: ../libnm-core/nm-setting-connection.c:871
+#: ../libnm-core/nm-setting-connection.c:905
#, c-format
msgid "setting required for connection of type '%s'"
-msgstr "类型为 '%s' 的连接要求的设置"
+msgstr "类型为 \"%s\" 的连接需要设置"
-#: ../libnm-core/nm-setting-connection.c:910
-#: ../libnm-util/nm-setting-connection.c:791
+#: ../libnm-core/nm-setting-connection.c:944
+#: ../libnm-util/nm-setting-connection.c:788
#, c-format
msgid "'%s' is not a valid UUID"
-msgstr "“%s”不是有效的 UUID"
+msgstr "\"%s\"不是有效的 UUID"
-#: ../libnm-core/nm-setting-connection.c:960
+#: ../libnm-core/nm-setting-connection.c:994
#, c-format
msgid "connection type '%s' is not valid"
-msgstr "连接类型 '%s' 无效"
+msgstr "连接类型 \"%s\" 无效"
-#: ../libnm-core/nm-setting-connection.c:996
-#: ../libnm-util/nm-setting-connection.c:877
+#: ../libnm-core/nm-setting-connection.c:1030
+#: ../libnm-util/nm-setting-connection.c:874
#, c-format
msgid "Unknown slave type '%s'"
-msgstr "未知的从类型 '%s'"
+msgstr "未知的从类型 \"%s\""
-#: ../libnm-core/nm-setting-connection.c:1007
-#: ../libnm-util/nm-setting-connection.c:887
+#: ../libnm-core/nm-setting-connection.c:1041
+#: ../libnm-util/nm-setting-connection.c:884
#, c-format
msgid "Slave connections need a valid '%s' property"
-msgstr "从连接需要有效的 '%s' 属性"
+msgstr "从连接需要有效的 \"%s\" 属性"
-#: ../libnm-core/nm-setting-connection.c:1028
-#: ../libnm-util/nm-setting-connection.c:897
+#: ../libnm-core/nm-setting-connection.c:1062
+#: ../libnm-util/nm-setting-connection.c:894
#, c-format
msgid "Cannot set '%s' without '%s'"
-msgstr "没有 '%s' 无法设置 '%s'"
+msgstr "没有 \"%s\" 无法设置 \"%s\""
-#: ../libnm-core/nm-setting-connection.c:1041
+#: ../libnm-core/nm-setting-connection.c:1076
#, c-format
-msgid "Only '%s' connections can be enslaved to '%s'"
-msgstr ""
+msgid "'%s' connections must be enslaved to '%s', not '%s'"
+msgstr "\"%s\" 连接必须从属于 \"%s\",而不是 \"%s\""
-#: ../libnm-core/nm-setting-connection.c:1054
+#: ../libnm-core/nm-setting-connection.c:1090
#, c-format
msgid "metered value %d is not valid"
-msgstr "测量值 %d 无效"
+msgstr "计量值 %d 无效"
+
+#: ../libnm-core/nm-setting-connection.c:1101
+#, c-format
+msgid "mdns value %d is not valid"
+msgstr "mdns %d 无效"
+
+#: ../libnm-core/nm-setting-connection.c:1114
+#, c-format
+msgid "value %d is not valid"
+msgstr "值 %d 无效"
-#: ../libnm-core/nm-setting-connection.c:1075
+#: ../libnm-core/nm-setting-connection.c:1135
#, c-format
msgid "property type should be set to '%s'"
-msgstr "属性类型应该设置为 '%s'"
+msgstr "属性类型应该设置为 \"%s\""
-#: ../libnm-core/nm-setting-connection.c:1090
+#: ../libnm-core/nm-setting-connection.c:1150
#, c-format
msgid "slave-type '%s' requires a '%s' setting in the connection"
-msgstr "slave-type '%s' 要求连接中有 '%s' 设置"
+msgstr "slave-type \"%s\" 要求连接中有 \"%s\" 设置"
-#: ../libnm-core/nm-setting-connection.c:1100
+#: ../libnm-core/nm-setting-connection.c:1160
#, c-format
msgid ""
"Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
"set to '%s'"
-msgstr "检测到设置了 '%s' 和端口类型 '%s' 的从连接。'%s' 应该设置为 '%s'。"
+msgstr ""
+"检测到设置了 \"%s\" 和端口类型为 \"%s\" 的从连接。\"%s\" 应该设置为 \"%s\""
-#: ../libnm-core/nm-setting-connection.c:1117
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-connection.c:1177
+#, c-format
msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting"
-msgstr "检测到设置了 '%s' 和端口类型 '%s' 的从连接。'%s' 应该设置为 '%s'。"
+msgstr "\"%s\" 设为 \"%s\" 的从连接不能有个 \"%s\" 设置"
-#: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
+#: ../libnm-core/nm-setting-dcb.c:520 ../libnm-util/nm-setting-dcb.c:593
msgid "flags invalid"
msgstr "标志无效"
-#: ../libnm-core/nm-setting-dcb.c:531 ../libnm-util/nm-setting-dcb.c:603
+#: ../libnm-core/nm-setting-dcb.c:529 ../libnm-util/nm-setting-dcb.c:602
msgid "flags invalid - disabled"
-msgstr "标志无效 - 已禁用"
+msgstr "标志无效 — 已禁用"
-#: ../libnm-core/nm-setting-dcb.c:557 ../libnm-core/nm-setting-dcb.c:606
-#: ../libnm-util/nm-setting-dcb.c:629 ../libnm-util/nm-setting-dcb.c:678
+#: ../libnm-core/nm-setting-dcb.c:555 ../libnm-core/nm-setting-dcb.c:604
+#: ../libnm-util/nm-setting-dcb.c:628 ../libnm-util/nm-setting-dcb.c:677
msgid "property invalid (not enabled)"
msgstr "属性无效(未启用)"
-#: ../libnm-core/nm-setting-dcb.c:566 ../libnm-util/nm-setting-dcb.c:638
+#: ../libnm-core/nm-setting-dcb.c:564 ../libnm-util/nm-setting-dcb.c:637
msgid "element invalid"
msgstr "元素无效"
-#: ../libnm-core/nm-setting-dcb.c:581 ../libnm-util/nm-setting-dcb.c:653
+#: ../libnm-core/nm-setting-dcb.c:579 ../libnm-util/nm-setting-dcb.c:652
msgid "sum not 100%"
-msgstr "sum 不是 100%"
+msgstr "总和不是 100%"
-#: ../libnm-core/nm-setting-dcb.c:615 ../libnm-core/nm-setting-dcb.c:647
-#: ../libnm-util/nm-setting-dcb.c:687 ../libnm-util/nm-setting-dcb.c:719
+#: ../libnm-core/nm-setting-dcb.c:613 ../libnm-core/nm-setting-dcb.c:645
+#: ../libnm-util/nm-setting-dcb.c:686 ../libnm-util/nm-setting-dcb.c:718
msgid "property invalid"
msgstr "属性无效"
-#: ../libnm-core/nm-setting-dcb.c:637 ../libnm-util/nm-setting-dcb.c:709
+#: ../libnm-core/nm-setting-dcb.c:635 ../libnm-util/nm-setting-dcb.c:708
msgid "property missing"
msgstr "缺少属性"
-#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:295
+#: ../libnm-core/nm-setting-ethtool.c:269
+msgid "unsupported offload feature"
+msgstr "不支持的卸载功能"
+
+#: ../libnm-core/nm-setting-ethtool.c:277
+msgid "offload feature has invalid variant type"
+msgstr "卸载功能有无效的变种类型"
+
+#: ../libnm-core/nm-setting-ethtool.c:300
+#, c-format
+msgid "unknown ethtool option '%s'"
+msgstr "未知的 ethtool 选项 \"%s\""
+
+#: ../libnm-core/nm-setting-gsm.c:310 ../libnm-util/nm-setting-gsm.c:294
#, c-format
msgid "property value '%s' is empty or too long (>64)"
-msgstr "属性值“%s”为空或过长(>64)"
+msgstr "属性值 \"%s\" 为空或过长(>64)"
-#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:327
+#: ../libnm-core/nm-setting-gsm.c:342 ../libnm-util/nm-setting-gsm.c:326
#, c-format
msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
-msgstr "“%s”包含无效字符(请使用 [A-Za-z._-])"
+msgstr "\"%s\" 包含无效字符(请使用 [A-Za-z._-])"
-#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:353
+#: ../libnm-core/nm-setting-gsm.c:368 ../libnm-util/nm-setting-gsm.c:352
#, c-format
msgid "'%s' length is invalid (should be 5 or 6 digits)"
-msgstr "“%s”长度无效(应为5位或6位数)"
+msgstr "\"%s\" 长度无效(应为 5 位或 6 位数)"
+
+#: ../libnm-core/nm-setting-gsm.c:379 ../libnm-util/nm-setting-gsm.c:363
+#, c-format
+msgid "'%s' is not a number"
+msgstr "\"%s\" 不是数字"
-#: ../libnm-core/nm-setting-gsm.c:415
+#: ../libnm-core/nm-setting-gsm.c:413
msgid "property is empty or wrong size"
msgstr "属性为空或大小错误"
-#: ../libnm-core/nm-setting-gsm.c:425
+#: ../libnm-core/nm-setting-gsm.c:423
msgid "property must contain only digits"
msgstr "属性必须只包含数字"
-#: ../libnm-core/nm-setting-infiniband.c:228
+#: ../libnm-core/nm-setting-infiniband.c:226
#: ../libnm-util/nm-setting-infiniband.c:239
msgid "Must specify a P_Key if specifying parent"
-msgstr "如果指定上级接口,则必须指定 P_Key。"
+msgstr "如果指定上级接口,则必须指定 P_Key"
-#: ../libnm-core/nm-setting-infiniband.c:238
+#: ../libnm-core/nm-setting-infiniband.c:236
#: ../libnm-util/nm-setting-infiniband.c:249
msgid "InfiniBand P_Key connection did not specify parent interface name"
msgstr "InfiniBand P_Key 连接未指定上级接口名"
-#: ../libnm-core/nm-setting-infiniband.c:276
+#: ../libnm-core/nm-setting-infiniband.c:274
#: ../libnm-util/nm-setting-infiniband.c:285
#, c-format
msgid ""
"interface name of software infiniband device must be '%s' or unset (instead "
"it is '%s')"
-msgstr "软件 infiniband 设备的接口名必须为 '%s' 或未设置(相反它是 '%s')"
+msgstr "软件 infiniband 设备的接口名必须为 \"%s\" 或未设置(但现在是 \"%s\")"
-#: ../libnm-core/nm-setting-infiniband.c:291
+#: ../libnm-core/nm-setting-infiniband.c:289
#, c-format
msgid "mtu for transport mode '%s' can be at most %d but it is %d"
-msgstr "传输模式 '%s' 的 MTU 最多为 %d,但现在是 %d。"
+msgstr "传输模式 \"%s\" 的 MTU 最多为 %d,但现在是 %d"
#: ../libnm-core/nm-setting-ip-config.c:133
#, c-format
@@ -9762,897 +10995,923 @@ msgstr "缺失 IPv6 地址"
#: ../libnm-core/nm-setting-ip-config.c:138
#, c-format
msgid "Invalid IPv4 address '%s'"
-msgstr "无效的 IPv4 地址 '%s'"
+msgstr "无效的 IPv4 地址 \"%s\""
#: ../libnm-core/nm-setting-ip-config.c:138
#, c-format
msgid "Invalid IPv6 address '%s'"
-msgstr "无效的 IPv6 地址 '%s'"
+msgstr "无效的 IPv6 地址 \"%s\""
#: ../libnm-core/nm-setting-ip-config.c:153
#, c-format
msgid "Invalid IPv4 address prefix '%u'"
-msgstr "无效 IPv4 地址前缀 '%u'"
+msgstr "无效 IPv4 地址前缀 \"%u\""
#: ../libnm-core/nm-setting-ip-config.c:153
#, c-format
msgid "Invalid IPv6 address prefix '%u'"
-msgstr "无效 IPv6 地址前缀 '%u'"
+msgstr "无效 IPv6 地址前缀 \"%u\""
#: ../libnm-core/nm-setting-ip-config.c:168
#, c-format
msgid "Invalid routing metric '%s'"
-msgstr "无效的路由度量 '%s'"
+msgstr "无效的路由度量 \"%s\""
-#: ../libnm-core/nm-setting-ip-config.c:1317
-#, fuzzy
+#: ../libnm-core/nm-setting-ip-config.c:1287
+#: ../libnm-core/nm-setting-sriov.c:421
msgid "unknown attribute"
-msgstr "未知的设置名称"
+msgstr "未知属性"
-#: ../libnm-core/nm-setting-ip-config.c:1327
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:1297
+#: ../libnm-core/nm-setting-sriov.c:431
+#, c-format
msgid "invalid attribute type '%s'"
-msgstr "无效的奇偶校验值 '%s'"
+msgstr "无效的属性类型 \"%s\""
-#: ../libnm-core/nm-setting-ip-config.c:1338
+#: ../libnm-core/nm-setting-ip-config.c:1308
#, c-format
msgid "attribute is not valid for a IPv4 route"
-msgstr ""
+msgstr "属性对 IPv4 路由无效"
-#: ../libnm-core/nm-setting-ip-config.c:1339
+#: ../libnm-core/nm-setting-ip-config.c:1309
#, c-format
msgid "attribute is not valid for a IPv6 route"
-msgstr ""
+msgstr "属性对 IPv6 路由无效"
-#: ../libnm-core/nm-setting-ip-config.c:1355
-#: ../libnm-core/nm-setting-ip-config.c:1379
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:1325
+#: ../libnm-core/nm-setting-ip-config.c:1349
+#, c-format
msgid "'%s' is not a valid IPv4 address"
-msgstr "'%s' 不是有效的 IP 地址"
+msgstr "\"%s\" 不是有效的 IPv4 地址"
-#: ../libnm-core/nm-setting-ip-config.c:1356
-#: ../libnm-core/nm-setting-ip-config.c:1380
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:1326
+#: ../libnm-core/nm-setting-ip-config.c:1350
+#, c-format
msgid "'%s' is not a valid IPv6 address"
-msgstr "'%s' 不是有效的 IP 地址"
+msgstr "\"%s\" 不是有效的 IPv6 地址"
-#: ../libnm-core/nm-setting-ip-config.c:1370
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:1340
+#, c-format
msgid "invalid prefix %s"
-msgstr "无效的路由:%s"
+msgstr "无效的前缀 %s"
-#: ../libnm-core/nm-setting-ip-config.c:2534
+#: ../libnm-core/nm-setting-ip-config.c:2512
#, c-format
msgid "%d. DNS server address is invalid"
msgstr "%d。DNS 服务器地址无效"
-#: ../libnm-core/nm-setting-ip-config.c:2550
+#: ../libnm-core/nm-setting-ip-config.c:2528
#, c-format
msgid "%d. IP address is invalid"
msgstr "%d。IP 地址无效"
-#: ../libnm-core/nm-setting-ip-config.c:2562
+#: ../libnm-core/nm-setting-ip-config.c:2540
#, c-format
msgid "%d. IP address has 'label' property with invalid type"
-msgstr "%d。IP 地址有无效类型的 'label' 属性"
+msgstr "%d。IP 地址有无效类型的 \"label\" 属性"
-#: ../libnm-core/nm-setting-ip-config.c:2571
+#: ../libnm-core/nm-setting-ip-config.c:2549
#, c-format
msgid "%d. IP address has invalid label '%s'"
-msgstr "%d。IP 地址有无效标签 '%s'"
+msgstr "%d。IP 地址有无效标签 \"%s\""
-#: ../libnm-core/nm-setting-ip-config.c:2585
+#: ../libnm-core/nm-setting-ip-config.c:2563
msgid "gateway cannot be set if there are no addresses configured"
-msgstr "如果没有配置地址,网关会无法设置。"
+msgstr "如果没有配置地址,网关会无法设置"
-#: ../libnm-core/nm-setting-ip-config.c:2594
+#: ../libnm-core/nm-setting-ip-config.c:2572
msgid "gateway is invalid"
msgstr "网关无效"
-#: ../libnm-core/nm-setting-ip-config.c:2608
+#: ../libnm-core/nm-setting-ip-config.c:2586
#, c-format
msgid "%d. route is invalid"
msgstr "%d。路由无效"
-#: ../libnm-core/nm-setting-ip-config.c:2617
+#: ../libnm-core/nm-setting-ip-config.c:2595
#, c-format
msgid "%d. route cannot be a default route"
msgstr "%d。路由不能是默认路由"
-#: ../libnm-core/nm-setting-ip-config.c:2628
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2606
+#, c-format
msgid "a gateway is incompatible with '%s'"
-msgstr "错误:无效的网关地址“%s”\n"
+msgstr "网关与 \"%s\" 不兼容"
-#: ../libnm-core/nm-setting-ip4-config.c:143
-#: ../libnm-core/nm-setting-ip6-config.c:167
+#: ../libnm-core/nm-setting-ip4-config.c:141
+#: ../libnm-core/nm-setting-ip6-config.c:187
#: ../libnm-util/nm-setting-ip4-config.c:879
-#: ../libnm-util/nm-setting-ip6-config.c:843
+#: ../libnm-util/nm-setting-ip6-config.c:841
#, c-format
msgid "this property cannot be empty for '%s=%s'"
-msgstr "'%s=%s' 不允许这个属性为空"
+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:182
-#: ../libnm-core/nm-setting-ip6-config.c:192
+#: ../libnm-core/nm-setting-ip4-config.c:153
+#: ../libnm-core/nm-setting-ip4-config.c:163
+#: ../libnm-core/nm-setting-ip4-config.c:175
#: ../libnm-core/nm-setting-ip6-config.c:202
+#: ../libnm-core/nm-setting-ip6-config.c:212
+#: ../libnm-core/nm-setting-ip6-config.c:222
#: ../libnm-util/nm-setting-ip4-config.c:891
#: ../libnm-util/nm-setting-ip4-config.c:901
#: ../libnm-util/nm-setting-ip4-config.c:913
-#: ../libnm-util/nm-setting-ip6-config.c:855
-#: ../libnm-util/nm-setting-ip6-config.c:865
-#: ../libnm-util/nm-setting-ip6-config.c:877
+#: ../libnm-util/nm-setting-ip6-config.c:853
+#: ../libnm-util/nm-setting-ip6-config.c:863
+#: ../libnm-util/nm-setting-ip6-config.c:875
#, c-format
msgid "this property is not allowed for '%s=%s'"
-msgstr "此属性不允许用于“%s=%s”"
+msgstr "此属性不允许用于\"%s=%s\""
-#: ../libnm-core/nm-setting-ip4-config.c:214
+#: ../libnm-core/nm-setting-ip4-config.c:212
#, c-format
msgid "'%s' is not a valid FQDN"
-msgstr "'%s' 不是有效的 FQDN"
+msgstr "\"%s\" 不是有效的 FQDN"
-#: ../libnm-core/nm-setting-ip4-config.c:223
+#: ../libnm-core/nm-setting-ip4-config.c:221
msgid "property cannot be set when dhcp-hostname is also set"
msgstr "当设置了 dhcp-hostname 则不能设置属性"
-#: ../libnm-core/nm-setting-ip4-config.c:235
+#: ../libnm-core/nm-setting-ip4-config.c:233
#, c-format
msgid "multiple addresses are not allowed for '%s=%s'"
-msgstr ""
+msgstr "\"%s=%s\" 不允许多个地址"
-#: ../libnm-core/nm-setting-ip4-config.c:249
+#: ../libnm-core/nm-setting-ip4-config.c:247
msgid "property should be TRUE when method is set to disabled"
-msgstr ""
+msgstr "方法设为禁用时属性应该是 TRUE"
-#: ../libnm-core/nm-setting-ip6-config.c:241
-#, fuzzy
+#: ../libnm-core/nm-setting-ip6-config.c:261
msgid "value is not a valid token"
-msgstr "“%s” 的值不是有效的 UUID"
+msgstr "值不是有效的令牌"
-#: ../libnm-core/nm-setting-ip6-config.c:252
+#: ../libnm-core/nm-setting-ip6-config.c:272
msgid "only makes sense with EUI64 address generation mode"
-msgstr ""
+msgstr "只有 EUI64 地址生成模式才有意义"
-#: ../libnm-core/nm-setting-ip6-config.c:264
+#: ../libnm-core/nm-setting-ip6-config.c:283
+msgid "invalid DUID"
+msgstr "无效的 DUID"
+
+#: ../libnm-core/nm-setting-ip6-config.c:295
msgid "token is not in canonical form"
-msgstr ""
+msgstr "令牌不是规范形式"
-#: ../libnm-core/nm-setting-ip6-config.c:276
+#: ../libnm-core/nm-setting-ip6-config.c:307
msgid "property should be TRUE when method is set to ignore"
-msgstr ""
+msgstr "方法设为忽略时属性应该是 TRUE"
-#: ../libnm-core/nm-setting-ip-tunnel.c:318
+#: ../libnm-core/nm-setting-ip-tunnel.c:339
#, c-format
msgid "'%d' is not a valid tunnel mode"
-msgstr "'%d' 是无效的隧道模式"
-
-#: ../libnm-core/nm-setting-ip-tunnel.c:330
-#: ../libnm-core/nm-setting-macsec.c:302 ../libnm-core/nm-setting-macvlan.c:167
-#: ../libnm-core/nm-setting-vlan.c:645 ../libnm-core/nm-setting-vxlan.c:403
-#: ../libnm-util/nm-setting-vlan.c:567
-#, c-format
-msgid "'%s' is neither an UUID nor an interface name"
-msgstr "“%s”不是 UUID 或接口名称"
+msgstr "\"%d\" 是无效的隧道模式"
-#: ../libnm-core/nm-setting-ip-tunnel.c:341
-#: ../libnm-core/nm-setting-ip-tunnel.c:361
+#: ../libnm-core/nm-setting-ip-tunnel.c:362
+#: ../libnm-core/nm-setting-ip-tunnel.c:382
#, c-format
msgid "'%s' is not a valid IPv%c address"
-msgstr "'%s' 不是有效的 IPv%c 地址"
+msgstr "\"%s\" 不是有效的 IPv%c 地址"
-#: ../libnm-core/nm-setting-ip-tunnel.c:375
+#: ../libnm-core/nm-setting-ip-tunnel.c:399
msgid "tunnel keys can only be specified for GRE tunnels"
msgstr "只能为 GRE 隧道指定隧道密钥"
-#: ../libnm-core/nm-setting-ip-tunnel.c:388
-#: ../libnm-core/nm-setting-ip-tunnel.c:404
+#: ../libnm-core/nm-setting-ip-tunnel.c:412
+#: ../libnm-core/nm-setting-ip-tunnel.c:428
#, c-format
msgid "'%s' is not a valid tunnel key"
-msgstr "'%s' 不是有效的频道密钥"
+msgstr "\"%s\" 不是有效的隧道密钥"
-#: ../libnm-core/nm-setting-ip-tunnel.c:416
+#: ../libnm-core/nm-setting-ip-tunnel.c:440
msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
msgstr "只有启用路径 MTU 发现时才允许固定的 TTL"
-#: ../libnm-core/nm-setting-macsec.c:235
+#: ../libnm-core/nm-setting-ip-tunnel.c:453
+#, c-format
+msgid "some flags are invalid for the select mode: %s"
+msgstr "有些标记对所选模式无效:%s"
+
+#: ../libnm-core/nm-setting-ip-tunnel.c:467
+#, c-format
+msgid "wired setting not allowed for mode %s"
+msgstr "模式 %s 不允许有线设置"
+
+#: ../libnm-core/nm-setting-macsec.c:250
msgid "the key is empty"
-msgstr ""
+msgstr "密钥为空"
-#: ../libnm-core/nm-setting-macsec.c:246
+#: ../libnm-core/nm-setting-macsec.c:261
#, c-format
msgid "the key must be %d characters"
-msgstr ""
+msgstr "密钥必须是 %d 个字符"
-#: ../libnm-core/nm-setting-macsec.c:254
-#, fuzzy
+#: ../libnm-core/nm-setting-macsec.c:269
msgid "the key contains non-hexadecimal characters"
-msgstr "初始向量中包含非十六进制数字。"
+msgstr "密钥包含非十六进制字符"
-#: ../libnm-core/nm-setting-macsec.c:291 ../libnm-core/nm-setting-vlan.c:634
-#: ../libnm-util/nm-setting-vlan.c:556
-#, c-format
-msgid "'%s' value doesn't match '%s=%s'"
-msgstr "“%s”值与“%s=%s”不符"
-
-#: ../libnm-core/nm-setting-macsec.c:316 ../libnm-core/nm-setting-macvlan.c:181
-#: ../libnm-core/nm-setting-vlan.c:659 ../libnm-util/nm-setting-vlan.c:580
+#: ../libnm-core/nm-setting-macsec.c:331 ../libnm-core/nm-setting-macvlan.c:175
+#: ../libnm-core/nm-setting-vlan.c:657 ../libnm-util/nm-setting-vlan.c:580
#, c-format
msgid "property is not specified and neither is '%s:%s'"
-msgstr "属性未指定或不是“%s:%s”"
+msgstr "属性未指定,也不是 \"%s:%s\""
-#: ../libnm-core/nm-setting-macsec.c:333
+#: ../libnm-core/nm-setting-macsec.c:348
#, c-format
msgid "EAP key management requires '%s' setting presence"
-msgstr ""
+msgstr "EAP 密钥管理需要 \"%s\" 设置存在"
-#: ../libnm-core/nm-setting-macsec.c:344
+#: ../libnm-core/nm-setting-macsec.c:359
#, c-format
msgid "invalid port %d"
-msgstr ""
+msgstr "无效的端口 %d"
-#: ../libnm-core/nm-setting-macvlan.c:192
+#: ../libnm-core/nm-setting-macvlan.c:186
msgid "non promiscuous operation is allowed only in passthru mode"
-msgstr "只有 passthru 模式才允许 non-promiscuous 操作"
+msgstr "只有通过(passthru)模式才允许无混杂操作"
-#: ../libnm-core/nm-setting-olpc-mesh.c:130
+#: ../libnm-core/nm-setting-olpc-mesh.c:128
#: ../libnm-core/nm-setting-wireless.c:760
#: ../libnm-util/nm-setting-olpc-mesh.c:132
-#: ../libnm-util/nm-setting-wireless.c:778
+#: ../libnm-util/nm-setting-wireless.c:777
msgid "SSID length is out of range <1-32> bytes"
-msgstr "SSID 长度超出范围<1-32>字节"
+msgstr "SSID 长度超出 <1-32> 字节范围"
-#: ../libnm-core/nm-setting-olpc-mesh.c:139
+#: ../libnm-core/nm-setting-olpc-mesh.c:137
#: ../libnm-core/nm-setting-wireless.c:800
#: ../libnm-util/nm-setting-olpc-mesh.c:141
-#: ../libnm-util/nm-setting-wireless.c:818
+#: ../libnm-util/nm-setting-wireless.c:817
#, c-format
msgid "'%d' is not a valid channel"
-msgstr "“%d”不是有效的信道"
+msgstr "\"%d\" 不是有效的信道"
-#: ../libnm-core/nm-setting-ovs-interface.c:113
+#: ../libnm-core/nm-setting-ovs-interface.c:111
#, c-format
msgid "'%s' is not a valid interface type"
-msgstr ""
+msgstr "\"%s\" 不是有效的接口类型"
-#: ../libnm-core/nm-setting-ovs-interface.c:135
+#: ../libnm-core/nm-setting-ovs-interface.c:133
#, c-format
msgid "A connection with a '%s' setting needs connection.type explicitly set"
-msgstr ""
+msgstr "有 \"%s\" 设置的连接需要明确设定 connection.type"
-#: ../libnm-core/nm-setting-ovs-interface.c:147
+#: ../libnm-core/nm-setting-ovs-interface.c:145
#, c-format
msgid "A connection of type '%s' cannot have ovs-interface.type \"system\""
-msgstr ""
+msgstr "\"%s\" 类型的连接不能有 ovs-interface.type \"system\""
-#: ../libnm-core/nm-setting-ovs-interface.c:159
+#: ../libnm-core/nm-setting-ovs-interface.c:157
#, c-format
msgid "A connection of type '%s' cannot have an ovs-interface.type \"%s\""
-msgstr ""
+msgstr "\"%s\" 类型的连接不能有 ovs-interface.type \"%s\""
-#: ../libnm-core/nm-setting-ovs-interface.c:175
+#: ../libnm-core/nm-setting-ovs-interface.c:173
#, c-format
msgid ""
"A connection with '%s' setting must be of connection.type \"ovs-interface\" "
"but is \"%s\""
msgstr ""
+"有 \"%s\" 设置的连接必须是 connection.type \"ovs-interface\" 类型,但现在是 "
+"\"%s\""
-#: ../libnm-core/nm-setting-ovs-interface.c:186
+#: ../libnm-core/nm-setting-ovs-interface.c:184
#, c-format
msgid ""
"A connection with '%s' setting needs to be of 'patch' interface type, not "
"'%s'"
-msgstr ""
+msgstr "有 \"%s\" 设置的连接必须是 \"patch\" 接口类型 ,而不是 \"%s\""
-#: ../libnm-core/nm-setting-ovs-interface.c:201
+#: ../libnm-core/nm-setting-ovs-interface.c:199
#, c-format
msgid "A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
-msgstr ""
+msgstr "ovs-interface.type \"%s\" 类型的连接缺少设置 \"ovs-patch\""
-#: ../libnm-core/nm-setting-ovs-interface.c:221
+#: ../libnm-core/nm-setting-ovs-interface.c:219
#, c-format
msgid "Missing ovs interface setting"
-msgstr ""
+msgstr "缺少 ovs 接口设置"
-#: ../libnm-core/nm-setting-ovs-interface.c:227
+#: ../libnm-core/nm-setting-ovs-interface.c:225
#, c-format
msgid "Missing ovs interface type"
-msgstr ""
+msgstr "缺少 ovs 接口类型"
-#: ../libnm-core/nm-setting-ovs-interface.c:271
-#: ../libnm-core/nm-setting-ovs-port.c:198
+#: ../libnm-core/nm-setting-ovs-interface.c:268
+#: ../libnm-core/nm-setting-ovs-port.c:196
#, c-format
msgid "A connection with a '%s' setting must have a master."
-msgstr ""
+msgstr "有 \"%s\" 设置的连接必须有个主连接。"
-#: ../libnm-core/nm-setting-ovs-patch.c:110
-#: ../libnm-core/nm-setting-vxlan.c:375
+#: ../libnm-core/nm-setting-ovs-patch.c:104
+#: ../libnm-core/nm-setting-vxlan.c:373
#, c-format
msgid "'%s' is not a valid IP address"
-msgstr "'%s' 不是有效的 IP 地址"
+msgstr "\"%s\" 不是有效的 IP 地址"
-#: ../libnm-core/nm-setting-ovs-port.c:223
+#: ../libnm-core/nm-setting-ovs-port.c:221
#, c-format
msgid "'%s' is not allowed in vlan_mode"
-msgstr ""
+msgstr "\"%s\" 在 vlan_mode 里不允许"
-#: ../libnm-core/nm-setting-ovs-port.c:233
+#: ../libnm-core/nm-setting-ovs-port.c:231
#, c-format
msgid "the tag id must be in range 0-4094 but is %u"
-msgstr ""
+msgstr "标记 ID 必须在 0~4094 范围内,但其是 %u"
-#: ../libnm-core/nm-setting-ovs-port.c:243
+#: ../libnm-core/nm-setting-ovs-port.c:241
#, c-format
msgid "'%s' is not allowed in lacp"
-msgstr ""
+msgstr "\"%s\" 在 lacp 里不允许"
-#: ../libnm-core/nm-setting-ovs-port.c:253
+#: ../libnm-core/nm-setting-ovs-port.c:251
#, c-format
msgid "'%s' is not allowed in bond_mode"
-msgstr ""
+msgstr "\"%s\" 在 bond_mode 里不允许"
-#: ../libnm-core/nm-setting-ovs-bridge.c:161
+#: ../libnm-core/nm-setting-ovs-bridge.c:159
#, c-format
msgid "A connection with a '%s' setting must not have a master."
-msgstr ""
+msgstr "有 \"%s\" 设置的连接不能有主连接。"
-#: ../libnm-core/nm-setting-ovs-bridge.c:172
+#: ../libnm-core/nm-setting-ovs-bridge.c:170
#, c-format
msgid "'%s' is not allowed in fail_mode"
-msgstr ""
+msgstr "\"%s\" 在 fail_mode 里不允许"
-#: ../libnm-core/nm-setting-ppp.c:365 ../libnm-util/nm-setting-ppp.c:387
+#: ../libnm-core/nm-setting-ppp.c:363 ../libnm-util/nm-setting-ppp.c:386
#, c-format
msgid "'%d' is out of valid range <128-16384>"
-msgstr "“%d”超出范围<128-16384>"
+msgstr "\"%d\" 超出范围 <128-16384>"
-#: ../libnm-core/nm-setting-ppp.c:378 ../libnm-util/nm-setting-ppp.c:400
+#: ../libnm-core/nm-setting-ppp.c:376 ../libnm-util/nm-setting-ppp.c:399
#, c-format
msgid "setting this property requires non-zero '%s' property"
-msgstr "设置此属性要求“%s”属性不为零"
+msgstr "设置此属性要求 \"%s\" 属性不为零"
-#: ../libnm-core/nm-setting-proxy.c:163
+#: ../libnm-core/nm-setting-proxy.c:161
#, c-format
msgid "invalid proxy method"
-msgstr ""
+msgstr "无效的代理方法"
-#: ../libnm-core/nm-setting-proxy.c:173 ../libnm-core/nm-setting-proxy.c:182
+#: ../libnm-core/nm-setting-proxy.c:171 ../libnm-core/nm-setting-proxy.c:180
#, c-format
msgid "this property is not allowed for method none"
-msgstr ""
+msgstr "无方法时不允许此属性"
-#: ../libnm-core/nm-setting-proxy.c:193
+#: ../libnm-core/nm-setting-proxy.c:191
#, c-format
msgid "the script is too large"
-msgstr ""
+msgstr "脚本太大"
-#: ../libnm-core/nm-setting-proxy.c:201
+#: ../libnm-core/nm-setting-proxy.c:199
#, c-format
msgid "the script is not valid utf8"
-msgstr ""
+msgstr "脚本不是有效的 utf8"
-#: ../libnm-core/nm-setting-proxy.c:209
+#: ../libnm-core/nm-setting-proxy.c:207
#, c-format
msgid "the script lacks FindProxyForURL function"
-msgstr ""
+msgstr "脚本缺少 FindProxyForURL 功能"
+
+#: ../libnm-core/nm-setting-sriov.c:1086
+#, c-format
+msgid "VF with index %u, but the total number of VFs is %u"
+msgstr "有索引为 %u 的虚拟功能,但虚拟功能总数为 %u"
+
+#: ../libnm-core/nm-setting-sriov.c:1097
+#, c-format
+msgid "invalid VF %u: %s"
+msgstr "无效的虚拟功能 %u:%s"
+
+#: ../libnm-core/nm-setting-sriov.c:1109
+#, c-format
+msgid "duplicate VF index %u"
+msgstr "重复的虚拟功能索引 %u"
+
+#: ../libnm-core/nm-setting-sriov.c:1130
+#, c-format
+msgid "VFs %d and %d are not sorted by ascending index"
+msgstr "虚拟功能 %d 和 %d 未按升序排列"
#: ../libnm-core/nm-setting-tc-config.c:68
-#: ../libnm-core/nm-setting-tc-config.c:283
-#: ../libnm-core/nm-setting-tc-config.c:547
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-tc-config.c:296
+#: ../libnm-core/nm-setting-tc-config.c:550
+#, c-format
msgid "'%s' is not a valid kind"
-msgstr "“%s”不是有效波段"
+msgstr "\"%s\" 不是有效的种类"
#: ../libnm-core/nm-setting-tc-config.c:76
-#: ../libnm-core/nm-setting-tc-config.c:555
-#, fuzzy
+#: ../libnm-core/nm-setting-tc-config.c:558
msgid "parent handle missing"
-msgstr "数据缺失"
+msgstr "缺少上级处理模块"
+
+#: ../libnm-core/nm-setting-tc-config.c:1203
+msgid "there are duplicate TC qdiscs"
+msgstr "存在重复的 TC 排队规则"
+
+#: ../libnm-core/nm-setting-tc-config.c:1223
+msgid "there are duplicate TC filters"
+msgstr "存在重复的 TC 过滤器"
#: ../libnm-core/nm-setting-team.c:134 ../libnm-core/nm-setting-team.c:193
#: ../libnm-core/nm-setting-team.c:266
-#, fuzzy, c-format
+#, c-format
msgid "%s is out of range [0, %d]"
-msgstr "值“%d”超出了范围 <%d-%d>"
+msgstr "%s 超出了范围 [0, %d]"
#: ../libnm-core/nm-setting-team.c:175
#, c-format
msgid "Missing target-host in nsna_ping link watcher"
-msgstr ""
+msgstr "在 nsna_ping 链路监视器里缺少目标主机"
#: ../libnm-core/nm-setting-team.c:181 ../libnm-core/nm-setting-team.c:248
-#, fuzzy, c-format
+#, c-format
msgid "target-host '%s' contains invalid characters"
-msgstr "初始向量中包含非十六进制数字。"
+msgstr "目标主机 \"%s\" 包含无效的字符"
#: ../libnm-core/nm-setting-team.c:241
#, c-format
msgid "Missing %s in arp_ping link watcher"
-msgstr ""
+msgstr "在 arp_ping 链路监视器里缺少 %s"
#: ../libnm-core/nm-setting-team.c:254
-#, fuzzy, c-format
+#, c-format
msgid "source-host '%s' contains invalid characters"
-msgstr "初始向量中包含非十六进制数字。"
+msgstr "来源主机 \"%s\" 包含无效的字符"
#: ../libnm-core/nm-setting-team.c:1153
-#: ../libnm-core/nm-setting-team-port.c:381
+#: ../libnm-core/nm-setting-team-port.c:380
#, c-format
msgid "team config exceeds size limit"
-msgstr ""
+msgstr "组合(team)配置超过大小限制"
-#: ../libnm-core/nm-setting-team.c:1178
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team.c:1179
+#, c-format
msgid "invalid runner \"%s\""
-msgstr "无效的路由:%s"
+msgstr "无效的运行程序(runner)\"%s\""
-#: ../libnm-core/nm-setting-team.c:1191
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team.c:1192
+#, c-format
msgid "missing link watcher name"
-msgstr "缺少文件名"
+msgstr "缺少链路监视器名称"
-#: ../libnm-core/nm-setting-team.c:1201
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team.c:1202
+#, c-format
msgid "unknown link watcher \"%s\""
-msgstr "未知的 VPN 插件“%s”"
+msgstr "未知的链路监视器 \"%s\""
-#: ../libnm-core/nm-setting-team.c:1212
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team.c:1213
+#, c-format
msgid "missing target host"
-msgstr "缺少设置"
+msgstr "缺少目标主机"
-#: ../libnm-core/nm-setting-team.c:1220
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team.c:1221
+#, c-format
msgid "missing source address"
-msgstr "缺失 IPv4 地址"
+msgstr "缺少来源地址"
-#: ../libnm-core/nm-setting-tun.c:187
+#: ../libnm-core/nm-setting-tun.c:185
#, c-format
msgid "'%u': invalid mode"
-msgstr "'%u':无效模式"
+msgstr "\"%u\":无效模式"
-#: ../libnm-core/nm-setting-tun.c:197
+#: ../libnm-core/nm-setting-tun.c:195
#, c-format
msgid "'%s': invalid user ID"
-msgstr "'%s':无效的用户 ID"
+msgstr "\"%s\":无效的用户 ID"
-#: ../libnm-core/nm-setting-tun.c:208
+#: ../libnm-core/nm-setting-tun.c:206
#, c-format
msgid "'%s': invalid group ID"
-msgstr "'%s':无效的组 ID"
+msgstr "\"%s\":无效的组 ID"
-#: ../libnm-core/nm-setting-user.c:111
-#, fuzzy
+#: ../libnm-core/nm-setting-user.c:109
msgid "missing key"
-msgstr "缺少设置"
+msgstr "缺少密钥"
-#: ../libnm-core/nm-setting-user.c:117
-#, fuzzy
+#: ../libnm-core/nm-setting-user.c:115
msgid "key is too long"
-msgstr "错误:SSID 太长。"
+msgstr "密钥太长"
-#: ../libnm-core/nm-setting-user.c:122
-#, fuzzy
+#: ../libnm-core/nm-setting-user.c:120
msgid "key must be UTF8"
msgstr "密码必须是 UTF-8 格式"
-#: ../libnm-core/nm-setting-user.c:145
+#: ../libnm-core/nm-setting-user.c:143
msgid "key requires a '.' for a namespace"
-msgstr ""
+msgstr "密钥需要 \".\" 用于命名空间"
-#: ../libnm-core/nm-setting-user.c:158
+#: ../libnm-core/nm-setting-user.c:156
msgid "key cannot contain \"..\""
-msgstr ""
+msgstr "密钥不能包含 \"..\""
-#: ../libnm-core/nm-setting-user.c:163
-#, fuzzy
+#: ../libnm-core/nm-setting-user.c:161
msgid "key contains invalid characters"
-msgstr "初始向量中包含非十六进制数字。"
+msgstr "密钥包含无效的字符"
-#: ../libnm-core/nm-setting-user.c:188
-#, fuzzy
+#: ../libnm-core/nm-setting-user.c:186
msgid "value is missing"
-msgstr "缺少属性"
+msgstr "缺少值"
-#: ../libnm-core/nm-setting-user.c:195
-#, fuzzy
+#: ../libnm-core/nm-setting-user.c:193
msgid "value is too large"
-msgstr "“%d”值超出范围 <0-3>"
+msgstr "值太大"
-#: ../libnm-core/nm-setting-user.c:201
-#, fuzzy
+#: ../libnm-core/nm-setting-user.c:199
msgid "value is not valid UTF8"
-msgstr "“%s” 的值不是有效的 UUID"
+msgstr "值不是有效的 UTF-8"
-#: ../libnm-core/nm-setting-user.c:338
+#: ../libnm-core/nm-setting-user.c:329
msgid "maximum number of user data entries reached"
-msgstr ""
+msgstr "已达到最大的用户数据输入项"
-#: ../libnm-core/nm-setting-user.c:379
+#: ../libnm-core/nm-setting-user.c:370
#, c-format
msgid "invalid key \"%s\": %s"
-msgstr ""
+msgstr "无效的密钥 \"%s\":%s"
-#: ../libnm-core/nm-setting-user.c:383
+#: ../libnm-core/nm-setting-user.c:374
#, c-format
msgid "invalid value for \"%s\": %s"
-msgstr ""
+msgstr "对 \"%s\" 无效的值:%s"
-#: ../libnm-core/nm-setting-user.c:398
+#: ../libnm-core/nm-setting-user.c:389
#, c-format
msgid "maximum number of user data entries reached (%u instead of %u)"
-msgstr ""
+msgstr "已达到最大的用户数据输入项(现为 %u,最大只有 %u )"
-#: ../libnm-core/nm-setting-vlan.c:670 ../libnm-util/nm-setting-vlan.c:600
+#: ../libnm-core/nm-setting-vlan.c:668 ../libnm-util/nm-setting-vlan.c:600
#, c-format
msgid "the vlan id must be in range 0-4094 but is %u"
-msgstr "VLAN ID 的范围必须是 0-4094,但却是 %u"
+msgstr "vlan id 的必须在范围 0~4094 内,但却是 %u"
-#: ../libnm-core/nm-setting-vlan.c:680 ../libnm-util/nm-setting-vlan.c:591
+#: ../libnm-core/nm-setting-vlan.c:678 ../libnm-util/nm-setting-vlan.c:591
msgid "flags are invalid"
-msgstr "标志无效"
+msgstr "标记无效"
-#: ../libnm-core/nm-setting-vlan.c:692
+#: ../libnm-core/nm-setting-vlan.c:690
msgid "vlan setting should have a ethernet setting as well"
-msgstr ""
+msgstr "vlan 设置也应该有以太网设置"
+
+#: ../libnm-core/nm-setting-vpn.c:518
+msgid "cannot set connection.multi-connect for VPN setting"
+msgstr "无法为 VPN 设置设定 connection.multi-connect"
-#: ../libnm-core/nm-setting-vpn.c:559
+#: ../libnm-core/nm-setting-vpn.c:539
#, c-format
msgid "secret was empty"
-msgstr "秘密(secret)为空"
+msgstr "密钥为空"
-#: ../libnm-core/nm-setting-vpn.c:589
+#: ../libnm-core/nm-setting-vpn.c:569
msgid "setting contained a secret with an empty name"
-msgstr "设置包含具有空名称的秘密"
+msgstr "设置包含具有空名称的密钥"
-#: ../libnm-core/nm-setting-vpn.c:597
+#: ../libnm-core/nm-setting-vpn.c:577
#, c-format
msgid "secret value was empty"
-msgstr "秘密(secret)值为空"
+msgstr "密钥值为空"
-#: ../libnm-core/nm-setting-vpn.c:644 ../libnm-core/nm-setting.c:1788
+#: ../libnm-core/nm-setting-vpn.c:624 ../libnm-core/nm-setting.c:1891
msgid "not a secret property"
-msgstr "不是 secret 属性"
+msgstr "不是密钥(secret)属性"
-#: ../libnm-core/nm-setting-vpn.c:650
+#: ../libnm-core/nm-setting-vpn.c:630
msgid "secret is not of correct type"
-msgstr "Secret 不是正确的类型"
+msgstr "密钥(secret)不是正确的类型"
-#: ../libnm-core/nm-setting-vpn.c:681
+#: ../libnm-core/nm-setting-vpn.c:661
#, c-format
msgid "failed to convert value '%s' to uint"
-msgstr "转换 '%s' 值为 uint 失败"
+msgstr "转换 \"%s\" 值为 uint 失败"
-#: ../libnm-core/nm-setting-vxlan.c:388
+#: ../libnm-core/nm-setting-vxlan.c:386
#, c-format
msgid "'%s' is not a valid IP%c address"
-msgstr "'%s' 不是有效的 IP%c 地址"
+msgstr "\"%s\" 不是有效的 IP%c 地址"
-#: ../libnm-core/nm-setting-vxlan.c:415
+#: ../libnm-core/nm-setting-vxlan.c:413
#, c-format
msgid "%d is greater than local port max %d"
msgstr "%d 大于本地端口最大值 %d"
-#: ../libnm-core/nm-setting-wired.c:632 ../libnm-util/nm-setting-wired.c:613
+#: ../libnm-core/nm-setting-wired.c:630 ../libnm-util/nm-setting-wired.c:612
#, c-format
msgid "'%s' is not a valid Ethernet port value"
-msgstr "'%s' 不是有效的以太网端口值"
+msgstr "\"%s\" 不是有效的以太网端口值"
-#: ../libnm-core/nm-setting-wired.c:642 ../libnm-util/nm-setting-wired.c:623
+#: ../libnm-core/nm-setting-wired.c:640 ../libnm-util/nm-setting-wired.c:622
#, c-format
msgid "'%s' is not a valid duplex value"
-msgstr "“%s”不是有效的双工值"
+msgstr "\"%s\"不是有效的双工值"
-#: ../libnm-core/nm-setting-wired.c:701 ../libnm-util/nm-setting-wired.c:680
+#: ../libnm-core/nm-setting-wired.c:699 ../libnm-util/nm-setting-wired.c:679
#, c-format
msgid "invalid '%s' or its value '%s'"
-msgstr "“%s”或其值“%s”无效"
+msgstr "\"%s\" 或其值 \"%s\" 无效"
-#: ../libnm-core/nm-setting-wired.c:738
+#: ../libnm-core/nm-setting-wired.c:736
msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
-msgstr "Wake-on-LAN 模式 'default' 和 'ignore' 是相互排斥的标记"
+msgstr "LAN 唤醒模式 \"default\" 和 \"ignore\" 是相互排斥的标记"
-#: ../libnm-core/nm-setting-wired.c:747
+#: ../libnm-core/nm-setting-wired.c:745
msgid "Wake-on-LAN password can only be used with magic packet mode"
-msgstr "Wake-on-LAN 密码只能用于 magic packet 模式"
+msgstr "LAN 唤醒密码只能在幻数据包模式使用"
#: ../libnm-core/nm-setting-wired.c:770
-msgid "when link autonegotiation is enabled no duplex value is accepted"
-msgstr ""
-
-#: ../libnm-core/nm-setting-wired.c:778
-msgid "when link autonegotiation is enabled speed should be 0"
-msgstr ""
+msgid "both speed and duplex should have a valid value or both should be unset"
+msgstr "速度和双工都应设定有效值或者都保持未设定"
-#: ../libnm-core/nm-setting-wired.c:788
+#: ../libnm-core/nm-setting-wired.c:771
msgid "both speed and duplex are required for static link configuration"
-msgstr ""
+msgstr "静态链路配置需要设置速度和双工"
-#: ../libnm-core/nm-setting-wireless-security.c:921
-#: ../libnm-util/nm-setting-wireless-security.c:912
+#: ../libnm-core/nm-setting-wireless-security.c:939
+#: ../libnm-util/nm-setting-wireless-security.c:911
#, c-format
msgid "'%s' security requires '%s=%s'"
-msgstr "“%s”安全要求“%s=%s”"
+msgstr "\"%s\" 安全需要 \"%s=%s\""
-#: ../libnm-core/nm-setting-wireless-security.c:942
-#: ../libnm-util/nm-setting-wireless-security.c:933
+#: ../libnm-core/nm-setting-wireless-security.c:960
+#: ../libnm-util/nm-setting-wireless-security.c:932
#, c-format
msgid "'%s' security requires '%s' setting presence"
-msgstr "“%s”安全要求“%s”设置存在"
+msgstr "\"%s\" 安全需要 \"%s\" 设置存在"
-#: ../libnm-core/nm-setting-wireless-security.c:963
-#: ../libnm-util/nm-setting-wireless-security.c:954
+#: ../libnm-core/nm-setting-wireless-security.c:981
+#: ../libnm-util/nm-setting-wireless-security.c:953
#, c-format
msgid "'%d' value is out of range <0-3>"
-msgstr "“%d”值超出范围 <0-3>"
+msgstr "\"%d\" 值超出范围 <0-3>"
-#: ../libnm-core/nm-setting-wireless-security.c:1018
-#: ../libnm-util/nm-setting-wireless-security.c:1009
+#: ../libnm-core/nm-setting-wireless-security.c:1036
+#: ../libnm-util/nm-setting-wireless-security.c:1008
#, c-format
msgid "'%s' connections require '%s' in this property"
-msgstr "“%s”连接要求此属性中的“%s”"
+msgstr "\"%s\" 连接需要此属性中的 \"%s\""
-#: ../libnm-core/nm-setting-wireless-security.c:1048
-#: ../libnm-util/nm-setting-wireless-security.c:1039
+#: ../libnm-core/nm-setting-wireless-security.c:1066
+#: ../libnm-util/nm-setting-wireless-security.c:1038
#, c-format
msgid "'%s' can only be used with '%s=%s' (WEP)"
-msgstr "“%s”只能与“%s=%s”(WEP)共用"
+msgstr "\"%s\" 只能与 \"%s=%s\"(WEP)共用"
-#: ../libnm-core/nm-setting-wireless-security.c:1072
+#: ../libnm-core/nm-setting-wireless-security.c:1090
#, c-format
msgid "'%s' can only be used with '%s=%s' or '%s=%s'"
-msgstr ""
+msgstr "\"%s\" 只能与 \"%s=%s\" 或 \"%s=%s\"共用"
-#: ../libnm-core/nm-setting-wireless-security.c:1094
+#: ../libnm-core/nm-setting-wireless-security.c:1112
msgid "can't be simultaneously disabled and enabled"
-msgstr ""
+msgstr "不能同时启用和禁用"
#: ../libnm-core/nm-setting-wireless.c:769
-#: ../libnm-util/nm-setting-wireless.c:787
+#: ../libnm-util/nm-setting-wireless.c:786
#, c-format
msgid "'%s' is not a valid Wi-Fi mode"
-msgstr "“%s”不是有效的 Wi-Fi 模式"
+msgstr "\"%s\" 不是有效的 Wi-Fi 模式"
#: ../libnm-core/nm-setting-wireless.c:779
-#: ../libnm-util/nm-setting-wireless.c:797
+#: ../libnm-util/nm-setting-wireless.c:796
#, c-format
msgid "'%s' is not a valid band"
-msgstr "“%s”不是有效波段"
+msgstr "\"%s\" 不是有效频段"
#: ../libnm-core/nm-setting-wireless.c:789
#, c-format
msgid "'%s' requires setting '%s' property"
-msgstr "'%s' 需要设置 '%s' 属性"
+msgstr "\"%s\" 需要设置 \"%s\" 属性"
#: ../libnm-core/nm-setting-wireless.c:883
#, c-format
msgid "invalid value"
-msgstr ""
+msgstr "无效值"
+
+#: ../libnm-core/nm-setting-wireless.c:893
+msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
+msgstr "WLAN 唤醒模式 \"default\" 和 \"ignore\" 是相互排斥的标记"
-#: ../libnm-core/nm-setting-wireless.c:904
+#: ../libnm-core/nm-setting-wireless.c:902
+msgid "Wake-on-WLAN trying to set unknown flag"
+msgstr "WLAN 唤醒正在尝试设定未知的标记"
+
+#: ../libnm-core/nm-setting-wireless.c:924
#, c-format
msgid "conflicting value of mac-address-randomization and cloned-mac-address"
-msgstr ""
+msgstr "mac-address-randomization 和 cloned-mac-address 的值冲突"
-#: ../libnm-core/nm-setting.c:821
+#: ../libnm-core/nm-setting.c:771
#, c-format
msgid "duplicate property"
msgstr "重复的属性"
-#: ../libnm-core/nm-setting.c:849 ../libnm-core/nm-setting.c:896
+#: ../libnm-core/nm-setting.c:819 ../libnm-core/nm-setting.c:866
#, c-format
msgid "can't set property of type '%s' from value of type '%s'"
-msgstr "无法从类型为 '%s' 的值设置类型为 '%s' 的属性"
+msgstr "无法从类型为 \"%2$s\" 的值设置类型为 \"%1$s\" 的属性"
-#: ../libnm-core/nm-setting.c:868 ../libnm-core/nm-setting.c:882
+#: ../libnm-core/nm-setting.c:838 ../libnm-core/nm-setting.c:852
#, c-format
msgid "failed to set property: %s"
msgstr "设定属性失败:%s"
-#: ../libnm-core/nm-setting.c:910
+#: ../libnm-core/nm-setting.c:880
#, c-format
msgid "can not set property: %s"
msgstr "无法设定属性:%s"
-#: ../libnm-core/nm-setting.c:926
+#: ../libnm-core/nm-setting.c:896
#, c-format
msgid "unknown property"
msgstr "未知属性"
-#: ../libnm-core/nm-setting.c:1686
+#: ../libnm-core/nm-setting.c:1789
msgid "secret not found"
-msgstr "未找到 secret"
+msgstr "未找到密钥"
-#: ../libnm-core/nm-setting.c:1778
+#: ../libnm-core/nm-setting.c:1881
msgid "secret is not set"
-msgstr "未设置 secret"
+msgstr "未设置密钥"
-#: ../libnm-core/nm-utils.c:2123
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2095
+#, c-format
msgid "'%s' is not a valid handle."
-msgstr "“%s”不是有效波段"
+msgstr "\"%s\" 不是有效的处理模块。"
-#: ../libnm-core/nm-utils.c:2220
+#: ../libnm-core/nm-utils.c:2191
#, c-format
msgid "'%s' unexpected: parent already specified."
-msgstr ""
+msgstr "意外的 \"%s\":已指定上级。"
-#: ../libnm-core/nm-utils.c:2236
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2207
+#, c-format
msgid "invalid handle: '%s'"
-msgstr "无效选项“%s”"
+msgstr "无效的句柄:\"%s\""
-#: ../libnm-core/nm-utils.c:2258
-#, fuzzy
+#: ../libnm-core/nm-utils.c:2229
msgid "parent not specified."
-msgstr "未指定服务"
+msgstr "未指定上级。"
-#: ../libnm-core/nm-utils.c:2305
+#: ../libnm-core/nm-utils.c:2276
#, c-format
msgid "unsupported qdisc option: '%s'."
-msgstr ""
+msgstr "不支持的排队规则(qdisc)选项:\"%s\"。"
-#: ../libnm-core/nm-utils.c:2421
-#, fuzzy
+#: ../libnm-core/nm-utils.c:2392
msgid "action name missing."
-msgstr "数据缺失"
+msgstr "操作名缺失。"
-#: ../libnm-core/nm-utils.c:2445
+#: ../libnm-core/nm-utils.c:2416
#, c-format
msgid "unsupported action option: '%s'."
-msgstr ""
+msgstr "不支持的操作选项:\"%s\"。"
-#: ../libnm-core/nm-utils.c:2583
-#, fuzzy
+#: ../libnm-core/nm-utils.c:2554
msgid "invalid action: "
-msgstr "无效选项“%s”"
+msgstr "无效操作:"
-#: ../libnm-core/nm-utils.c:2587
+#: ../libnm-core/nm-utils.c:2558
#, c-format
msgid "unsupported tfilter option: '%s'."
-msgstr ""
+msgstr "不支持的流量过滤器(tfilter)选项:\"%s\"。"
-#: ../libnm-core/nm-utils.c:2946
+#: ../libnm-core/nm-utils.c:3160
#, c-format
msgid "failed stat file %s: %s"
msgstr "统计文件 %s 失败:%s"
-#: ../libnm-core/nm-utils.c:2955
+#: ../libnm-core/nm-utils.c:3169
#, c-format
msgid "not a file (%s)"
-msgstr "不是一个文件 (%s)"
+msgstr "不是一个文件(%s)"
-#: ../libnm-core/nm-utils.c:2966
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:3180
+#, c-format
msgid "invalid file owner %d for %s"
-msgstr "file:无效文件(file)操作:%s"
+msgstr "对 %2$s 无效的文件所有者 %1$d"
-#: ../libnm-core/nm-utils.c:2977
+#: ../libnm-core/nm-utils.c:3191
#, c-format
msgid "file permissions for %s"
msgstr "%s 的文件权限"
-#: ../libnm-core/nm-utils.c:2987
+#: ../libnm-core/nm-utils.c:3201
#, c-format
msgid "reject %s"
msgstr "拒绝 %s"
-#: ../libnm-core/nm-utils.c:3007
+#: ../libnm-core/nm-utils.c:3220
#, c-format
msgid "path is not absolute (%s)"
-msgstr "路径不是绝对路径 (%s)"
+msgstr "路径不是绝对路径(%s)"
-#: ../libnm-core/nm-utils.c:3021
+#: ../libnm-core/nm-utils.c:3234
#, c-format
msgid "Plugin file does not exist (%s)"
-msgstr "插件文件不存在 (%s)"
+msgstr "插件文件不存在(%s)"
-#: ../libnm-core/nm-utils.c:3029
+#: ../libnm-core/nm-utils.c:3242
#, c-format
msgid "Plugin is not a valid file (%s)"
-msgstr "插件不是有效的文件 (%s)"
+msgstr "插件不是有效的文件(%s)"
-#: ../libnm-core/nm-utils.c:3039
+#: ../libnm-core/nm-utils.c:3252
#, c-format
msgid "libtool archives are not supported (%s)"
-msgstr "不支持 libtool 归档 (%s)"
+msgstr "不支持 libtool 归档(%s)"
-#: ../libnm-core/nm-utils.c:3121 ../libnm-util/nm-utils.c:1798
+#: ../libnm-core/nm-utils.c:3334 ../libnm-util/nm-utils.c:1794
#, c-format
msgid "Could not find \"%s\" binary"
msgstr "无法找到 \"%s\" 二进制文件"
-#: ../libnm-core/nm-utils.c:4167
+#: ../libnm-core/nm-utils.c:4351
#, c-format
msgid "not a valid ethernet MAC address for mask at position %lld"
-msgstr ""
+msgstr "对于 %lld 位置的掩码,该以太网 MAC 地址无效"
-#: ../libnm-core/nm-utils.c:4182
+#: ../libnm-core/nm-utils.c:4366
#, c-format
msgid "not a valid ethernet MAC address #%u at position %lld"
-msgstr ""
+msgstr "在位置 %2$lld,该以太网 MAC 地址 #%1$u 无效"
-#: ../libnm-core/nm-utils.c:4218
+#: ../libnm-core/nm-utils.c:4402
msgid "interface name is too short"
-msgstr ""
+msgstr "接口名太短"
-#: ../libnm-core/nm-utils.c:4227
+#: ../libnm-core/nm-utils.c:4411
msgid "interface name is reserved"
-msgstr ""
+msgstr "接口名被保留"
-#: ../libnm-core/nm-utils.c:4239
+#: ../libnm-core/nm-utils.c:4423
msgid "interface name contains an invalid character"
-msgstr ""
+msgstr "接口名包含无效字符"
-#: ../libnm-core/nm-utils.c:4245
+#: ../libnm-core/nm-utils.c:4429
msgid "interface name is longer than 15 characters"
-msgstr ""
+msgstr "接口名长度超过 15 字符"
-#: ../libnm-core/nm-utils.c:5283 ../libnm-core/nm-utils.c:5626
+#: ../libnm-core/nm-utils.c:5075
+msgid "not valid utf-8"
+msgstr "不是有效的 utf-8"
+
+#: ../libnm-core/nm-utils.c:5097 ../libnm-core/nm-utils.c:5565
+msgid "is not a JSON object"
+msgstr "不是 JSON 对象"
+
+#: ../libnm-core/nm-utils.c:5541 ../libnm-core/nm-utils.c:5881
msgid "value is NULL"
-msgstr ""
+msgstr "值为 NULL"
-#: ../libnm-core/nm-utils.c:5283 ../libnm-core/nm-utils.c:5626
+#: ../libnm-core/nm-utils.c:5541 ../libnm-core/nm-utils.c:5881
msgid "value is empty"
-msgstr ""
+msgstr "值为空"
-#: ../libnm-core/nm-utils.c:5292
+#: ../libnm-core/nm-utils.c:5553
#, c-format
msgid "invalid JSON at position %d (%s)"
-msgstr ""
-
-#: ../libnm-core/nm-utils.c:5304 ../libnm-core/nm-utils.c:5645
-msgid "is not a JSON object"
-msgstr ""
+msgstr "位置 %d 有无效的 JSON(%s)"
-#: ../libnm-core/nm-utils.c:5615
-msgid "not valid utf-8"
-msgstr ""
-
-#: ../libnm-core/nm-utils.c:5958 ../libnm-core/nm-utils.c:5978
+#: ../libnm-core/nm-utils.c:6198 ../libnm-core/nm-utils.c:6218
msgid "unterminated escape sequence"
-msgstr ""
+msgstr "未结束的转义序列"
-#: ../libnm-core/nm-utils.c:6003
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:6243
+#, c-format
msgid "unknown attribute '%s'"
-msgstr "未知设备“%s”"
+msgstr "未知属性 \"%s\""
-#: ../libnm-core/nm-utils.c:6018
+#: ../libnm-core/nm-utils.c:6258
#, c-format
msgid "missing key-value separator '%c' after '%s'"
-msgstr ""
+msgstr "在 \"%2$s\" 后缺少键值对分隔符 \"%1$c\""
-#: ../libnm-core/nm-utils.c:6034
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:6274
+#, c-format
msgid "invalid uint32 value '%s' for attribute '%s'"
-msgstr "无效选项“%s”或值“%s”"
+msgstr "uint32 值 \"%1$s\" 对属性 \"%2$s\" 无效"
-#: ../libnm-core/nm-utils.c:6043
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:6283
+#, c-format
msgid "invalid uint8 value '%s' for attribute '%s'"
-msgstr "无效选项“%s”或值“%s”"
+msgstr "uint8 值 \"%1$s\" 对属性 \"%2$s\" 无效"
-#: ../libnm-core/nm-utils.c:6053
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:6293
+#, c-format
msgid "invalid boolean value '%s' for attribute '%s'"
-msgstr "无效选项“%s”或值“%s”"
+msgstr "布尔值 \"%1$s\" 对属性 \"%2$s\" 无效"
-#: ../libnm-core/nm-utils.c:6063
+#: ../libnm-core/nm-utils.c:6303
#, c-format
msgid "unsupported attribute '%s' of type '%s'"
-msgstr ""
+msgstr "不支持类型 \"%2$s\" 的属性 \"%1$s\""
#: ../libnm-core/nm-vpn-editor-plugin.c:296
-#, fuzzy, c-format
+#, c-format
msgid "cannot load plugin \"%s\": %s"
-msgstr "无法加载插件 %s"
+msgstr "无法加载插件 \"%s\":%s"
#: ../libnm-core/nm-vpn-editor-plugin.c:307
#, c-format
msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
-msgstr "从 %s (%s) 加载 nm_vpn_editor_plugin_factory() 失败"
+msgstr "从 %s 加载 nm_vpn_editor_plugin_factory() 失败(%s)"
#: ../libnm-core/nm-vpn-editor-plugin.c:332
#, c-format
@@ -10662,12 +11921,12 @@ msgstr "初始化插件 %s 时出现未知错误"
#: ../libnm-core/nm-vpn-editor-plugin.c:349
#, c-format
msgid "cannot load VPN plugin in '%s': missing plugin name"
-msgstr "无法在 '%s' 里加载 VPN 插件:缺少插件名称。"
+msgstr "无法在 \"%s\" 里加载 VPN 插件:缺少插件名称"
#: ../libnm-core/nm-vpn-editor-plugin.c:358
#, c-format
msgid "cannot load VPN plugin in '%s': invalid service name"
-msgstr "无法在 '%s' 里加载 VPN 插件:无效的服务名称。"
+msgstr "无法在 \"%s\" 里加载 VPN 插件:无效的服务名称"
#: ../libnm-core/nm-vpn-editor-plugin.c:501
#, c-format
@@ -10687,90 +11946,90 @@ msgstr "缺少文件名"
#: ../libnm-core/nm-vpn-plugin-info.c:118
#, c-format
msgid "filename must be an absolute path (%s)"
-msgstr "文件名必须为绝对路径 (%s)"
+msgstr "文件名必须为绝对路径(%s)"
#: ../libnm-core/nm-vpn-plugin-info.c:127
#, c-format
msgid "filename has invalid format (%s)"
-msgstr "文件名具有无效的格式 (%s)"
+msgstr "文件名具有无效的格式(%s)"
#: ../libnm-core/nm-vpn-plugin-info.c:450
#, c-format
msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
-msgstr "已存在冲突的具有相同 %s.%s 值的插件(%s)"
+msgstr "已存在具有相同 %s.%s 值的冲突插件(%s)"
#: ../libnm-core/nm-vpn-plugin-info.c:488
#, c-format
msgid "there exists a conflicting plugin with the same name (%s)"
-msgstr "已存在冲突的具有相同名称(%s)的插件"
+msgstr "已存在具有相同名称(%s)的冲突插件"
-#: ../libnm-core/nm-vpn-plugin-info.c:1071
+#: ../libnm-core/nm-vpn-plugin-info.c:1070
#, c-format
msgid "missing \"plugin\" setting"
msgstr "缺少 \"plugin\" 设置"
-#: ../libnm-core/nm-vpn-plugin-info.c:1081
+#: ../libnm-core/nm-vpn-plugin-info.c:1080
#, c-format
msgid "%s: don't retry loading plugin which already failed previously"
-msgstr "%s:不要重新加载之前已失败的插件"
+msgstr "%s:不要重试加载之前已失败的插件"
-#: ../libnm-core/nm-vpn-plugin-info.c:1175
+#: ../libnm-core/nm-vpn-plugin-info.c:1174
msgid "missing filename to load VPN plugin info"
msgstr "缺少文件名来加载 VPN 插件信息"
-#: ../libnm-core/nm-vpn-plugin-info.c:1187
+#: ../libnm-core/nm-vpn-plugin-info.c:1186
msgid "missing name for VPN plugin info"
msgstr "缺少 VPN 插件信息的名称"
-#: ../libnm-core/nm-vpn-plugin-info.c:1196
+#: ../libnm-core/nm-vpn-plugin-info.c:1195
msgid "missing service for VPN plugin info"
msgstr "缺少 VPN 插件信息的服务"
-#: ../libnm-glib/nm-device.c:1825 ../libnm/nm-device.c:1525
+#: ../libnm-glib/nm-device.c:1824 ../libnm/nm-device.c:1310
msgid "Bluetooth"
msgstr "蓝牙"
-#: ../libnm-glib/nm-device.c:1827 ../libnm/nm-device.c:1527
+#: ../libnm-glib/nm-device.c:1826 ../libnm/nm-device.c:1312
msgid "OLPC Mesh"
msgstr "OLPC Mesh"
-#: ../libnm-glib/nm-device.c:1829 ../libnm/nm-device.c:1535
+#: ../libnm-glib/nm-device.c:1828 ../libnm/nm-device.c:1320
msgid "WiMAX"
-msgstr "WiMAX 参数"
+msgstr "WiMAX"
-#: ../libnm-glib/nm-device.c:1843 ../libnm/nm-device.c:1549
+#: ../libnm-glib/nm-device.c:1842 ../libnm/nm-device.c:1334
msgid "ADSL"
-msgstr "ADSL 参数"
+msgstr "ADSL"
-#: ../libnm-glib/nm-device.c:1845 ../libnm/nm-device.c:1551
+#: ../libnm-glib/nm-device.c:1844 ../libnm/nm-device.c:1336
msgid "MACVLAN"
msgstr "MACVLAN"
-#: ../libnm-glib/nm-device.c:1847 ../libnm/nm-device.c:1553
+#: ../libnm-glib/nm-device.c:1846 ../libnm/nm-device.c:1338
msgid "VXLAN"
msgstr "VXLAN"
-#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1555
+#: ../libnm-glib/nm-device.c:1848 ../libnm/nm-device.c:1340
msgid "IPTunnel"
-msgstr "IPTunnel"
+msgstr "IP 隧道"
-#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1557
+#: ../libnm-glib/nm-device.c:1850 ../libnm/nm-device.c:1342
msgid "Tun"
msgstr "Tun"
-#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1559
+#: ../libnm-glib/nm-device.c:1852 ../libnm/nm-device.c:1344
msgid "Veth"
msgstr "Veth"
-#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1597
+#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1388
msgid "Wired"
-msgstr "有线连接"
+msgstr "有线"
-#: ../libnm-glib/nm-device.c:1916 ../libnm/nm-device.c:1628
+#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1419
msgid "PCI"
msgstr "PCI"
-#: ../libnm-glib/nm-device.c:1918 ../libnm/nm-device.c:1630
+#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1421
msgid "USB"
msgstr "USB"
@@ -10780,26 +12039,26 @@ msgstr "USB"
#. * "%2$s (%1$s)" if there's no grammatical way to combine
#. * the strings otherwise.
#.
-#: ../libnm-glib/nm-device.c:2015 ../libnm-glib/nm-device.c:2034
-#: ../libnm/nm-device.c:1725 ../libnm/nm-device.c:1744
+#: ../libnm-glib/nm-device.c:2014 ../libnm-glib/nm-device.c:2033
+#: ../libnm/nm-device.c:1734 ../libnm/nm-device.c:1753
#, c-format
msgctxt "long device name"
msgid "%s %s"
msgstr "%s %s"
-#: ../libnm-glib/nm-remote-connection.c:149
+#: ../libnm-glib/nm-remote-connection.c:148
msgid "Disconnected by D-Bus"
msgstr "被 D-Bus 断开"
#: ../libnm-util/crypto_gnutls.c:84
#, c-format
msgid "Hash length too long (%d > %d)."
-msgstr "Hash 长度太常 (%d > %d)。"
+msgstr "散列长度太长(%d > %d)。"
#: ../libnm-util/crypto_gnutls.c:115
#, c-format
msgid "Failed to initialize the MD5 engine: %s (%s)"
-msgstr "初始化 MD5 引擎失败:%s (%s)"
+msgstr "初始化 MD5 引擎失败:%s(%s)"
#: ../libnm-util/crypto_nss.c:99
#, c-format
@@ -10811,26 +12070,26 @@ msgstr "初始化 MD5 环境失败:%d。"
msgid "Couldn't convert password to UCS2: %d"
msgstr "无法将密码转换为 USC2 方式:%d"
-#: ../libnm-util/nm-setting-bluetooth.c:186
+#: ../libnm-util/nm-setting-bluetooth.c:185
#, c-format
msgid "requires '%s' or '%s' setting"
-msgstr "要求“%s”或“%s”设置"
+msgstr "需要 \"%s\" 或 \"%s\" 设置"
-#: ../libnm-util/nm-setting-bond.c:582
+#: ../libnm-util/nm-setting-bond.c:581
#, c-format
msgid "'%s' is not a valid interface name for '%s' option"
-msgstr "“%s” 不是 “%s” 选项的有效接口名"
+msgstr "\"%s\" 不是 \"%s\" 选项的有效接口名"
-#: ../libnm-util/nm-setting-connection.c:834
+#: ../libnm-util/nm-setting-connection.c:831
#: ../libnm-util/nm-setting-infiniband.c:269
#, c-format
msgid "'%s' is not a valid interface name"
-msgstr "“%s”不是有效的接口名称"
+msgstr "\"%s\" 不是有效的接口名称"
-#: ../libnm-util/nm-setting-connection.c:862
+#: ../libnm-util/nm-setting-connection.c:859
#, c-format
msgid "requires presence of '%s' setting in the connection"
-msgstr "要求连接中存在“%s”设置"
+msgstr "需要连接中存在 \"%s\" 设置"
#: ../libnm-util/nm-setting-infiniband.c:231
msgid "not a valid interface name"
@@ -10847,57 +12106,57 @@ msgid "%d. IPv4 address has invalid prefix"
msgstr "%d。IPv4 地址前缀无效"
#: ../libnm-util/nm-setting-ip4-config.c:983
-#: ../libnm-util/nm-setting-ip6-config.c:939
+#: ../libnm-util/nm-setting-ip6-config.c:937
#, c-format
msgid "%d. route has invalid prefix"
msgstr "%d。路由前缀无效"
-#: ../libnm-util/nm-setting-ip6-config.c:913
+#: ../libnm-util/nm-setting-ip6-config.c:911
#, c-format
msgid "%d. IPv6 address is invalid"
-msgstr "%d. IPv6 地址无效。"
+msgstr "%d。IPv6 地址无效"
-#: ../libnm-util/nm-setting-ip6-config.c:923
+#: ../libnm-util/nm-setting-ip6-config.c:921
#, c-format
msgid "%d. IPv6 address has invalid prefix"
-msgstr "%d. IPv6 地址有无效前缀。"
+msgstr "%d。IPv6 地址前缀无效"
-#: ../libnm-util/nm-setting-vpn.c:582
+#: ../libnm-util/nm-setting-vpn.c:581
#, c-format
msgid "Failed to convert '%s' value '%s' to uint"
-msgstr "转换 '%s' 值 '%s' 为 uint 失败"
+msgstr "转换 \"%s\" 值 \"%s\" 为 uint 失败"
-#: ../libnm-util/nm-setting-vpn.c:589
+#: ../libnm-util/nm-setting-vpn.c:588
#, c-format
msgid "Secret flags property '%s' not found"
-msgstr "未找到 Secret flags 属性 '%s'"
+msgstr "未找到密钥(secret)标记属性 \"%s\""
-#: ../libnm-util/nm-setting-wireless.c:807
+#: ../libnm-util/nm-setting-wireless.c:806
#, c-format
msgid "requires setting '%s' property"
-msgstr "要求设置“%s”属性"
+msgstr "需要设置 \"%s\" 属性"
-#: ../libnm/nm-device-adsl.c:73
+#: ../libnm/nm-device-adsl.c:72
msgid "The connection was not an ADSL connection."
-msgstr "这个连接不是一个 ADSL 连接。"
+msgstr "此连接不是 ADSL 连接。"
#: ../libnm/nm-device-bond.c:111
msgid "The connection was not a bond connection."
-msgstr "这个连接不是一个 Bond 连接。"
+msgstr "此连接不是绑定(bond)连接。"
#: ../libnm/nm-device-bridge.c:115
msgid "The connection was not a bridge connection."
-msgstr "这个连接不是一个桥接连接。"
+msgstr "此连接不是网桥连接。"
#: ../libnm/nm-device-bt.c:137
#, c-format
msgid "The connection was not a Bluetooth connection."
-msgstr "这个连接不是一个 Bluetooth 连接。"
+msgstr "此连接不是蓝牙连接。"
#: ../libnm/nm-device-bt.c:143
#, c-format
msgid "The connection is of Bluetooth NAP type."
-msgstr ""
+msgstr "此连接为蓝牙 NAP 类型。"
#: ../libnm/nm-device-bt.c:152
msgid "Invalid device Bluetooth address."
@@ -10913,28 +12172,27 @@ msgid ""
msgstr "设备缺少连接所要求的蓝牙功能。"
#: ../libnm/nm-device-dummy.c:76
-#, fuzzy
msgid "The connection was not a dummy connection."
-msgstr "这个连接不是一个调制解调器连接。"
+msgstr "此连接不是虚拟(dummy)连接。"
#: ../libnm/nm-device-dummy.c:83 ../libnm/nm-device-generic.c:97
-#: ../libnm/nm-device-ovs-bridge.c:68 ../libnm/nm-device-ovs-interface.c:68
-#: ../libnm/nm-device-ovs-port.c:67
+#: ../libnm/nm-device-ovs-bridge.c:97 ../libnm/nm-device-ovs-interface.c:68
+#: ../libnm/nm-device-ovs-port.c:96
msgid "The connection did not specify an interface name."
-msgstr "这个连接未指定接口名。"
+msgstr "此连接未指定接口名。"
#: ../libnm/nm-device-ethernet.c:206
msgid "The connection was not an Ethernet or PPPoE connection."
-msgstr "这个连接不是 Ethernet 或 PPPoE 连接。"
+msgstr "此连接不是以太网或 PPPoE 连接。"
#: ../libnm/nm-device-ethernet.c:221
msgid "The connection and device differ in S390 subchannels."
-msgstr "连接和设备在 S390 子通道有所不同。"
+msgstr "此连接和设备在 S390 子信道不相同。"
#: ../libnm/nm-device-ethernet.c:236
#, c-format
msgid "Invalid device MAC address %s."
-msgstr ""
+msgstr "无效的设备 MAC 地址 %s。"
#: ../libnm/nm-device-ethernet.c:241
msgid "The MACs of the device and the connection do not match."
@@ -10948,15 +12206,15 @@ msgstr "黑名单里无效的 MAC 地址:%s。"
#: ../libnm/nm-device-ethernet.c:257
#, c-format
msgid "Device MAC (%s) is blacklisted by the connection."
-msgstr "设备 MAC(%s)别连接放入了黑名单。"
+msgstr "设备 MAC(%s)被连接列入了黑名单。"
#: ../libnm/nm-device-generic.c:90
msgid "The connection was not a generic connection."
-msgstr "这个连接不是一个通用的连接。"
+msgstr "此连接不是通用的连接。"
#: ../libnm/nm-device-tun.c:208
msgid "The connection was not a tun connection."
-msgstr "这个连接不是一个 tun 连接。"
+msgstr "此连接不是 tun 连接。"
#: ../libnm/nm-device-tun.c:217
msgid "The mode of the device and the connection didn't match"
@@ -10964,33 +12222,33 @@ msgstr "设备和连接的模式不匹配"
#: ../libnm/nm-device-infiniband.c:93
msgid "The connection was not an InfiniBand connection."
-msgstr "这个连接不是一个 InfiniBand 连接。"
+msgstr "此连接不是 InfiniBand 连接。"
-#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:599
+#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:625
#: ../libnm/nm-device-wimax.c:324
msgid "Invalid device MAC address."
msgstr "无效的设备 MAC 地址。"
-#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:606
+#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:632
#: ../libnm/nm-device-wimax.c:331
msgid "The MACs of the device and the connection didn't match."
msgstr "设备和连接的 MAC 地址不匹配。"
-#: ../libnm/nm-device-ip-tunnel.c:253
+#: ../libnm/nm-device-ip-tunnel.c:271
msgid "The connection was not an IP tunnel connection."
-msgstr "这个连接不是一个 IP 隧道连接。"
+msgstr "此连接不是 IP 隧道连接。"
-#: ../libnm/nm-device-macvlan.c:158
+#: ../libnm/nm-device-macvlan.c:157
msgid "The connection was not a MAC-VLAN connection."
-msgstr "这个连接不是一个 MAC-VLAN 连接。"
+msgstr "此连接不是 MAC-VLAN 连接。"
#: ../libnm/nm-device-modem.c:119
msgid "The connection was not a modem connection."
-msgstr "这个连接不是一个调制解调器连接。"
+msgstr "此连接不是调制解调器连接。"
#: ../libnm/nm-device-modem.c:127
msgid "The connection was not a valid modem connection."
-msgstr "这个连接不是一个有效的调制解调器连接。"
+msgstr "此连接不是有效的调制解调器连接。"
#: ../libnm/nm-device-modem.c:134
msgid "The device is lacking capabilities required by the connection."
@@ -10998,27 +12256,27 @@ msgstr "设备缺少连接所要求的功能。"
#: ../libnm/nm-device-olpc-mesh.c:114
msgid "The connection was not an OLPC Mesh connection."
-msgstr "这个连接不是一个 'OLPC Mesh' 连接。"
+msgstr "此连接不是 OLPC Mesh 连接。"
-#: ../libnm/nm-device-ovs-bridge.c:61
+#: ../libnm/nm-device-ovs-bridge.c:90
msgid "The connection was not a ovs_bridge connection."
-msgstr ""
+msgstr "此连接不是 ovs 网桥连接。"
#: ../libnm/nm-device-ovs-interface.c:61
msgid "The connection was not a ovs_interface connection."
-msgstr ""
+msgstr "此连接不是 ovs 接口连接。"
-#: ../libnm/nm-device-ovs-port.c:60
+#: ../libnm/nm-device-ovs-port.c:89
msgid "The connection was not a ovs_port connection."
-msgstr ""
+msgstr "此连接不是 ovs 端口连接。"
#: ../libnm/nm-device-team.c:138
msgid "The connection was not a team connection."
-msgstr "这个连接不是一个 team 连接。"
+msgstr "此连接不是组合(team)连接。"
#: ../libnm/nm-device-vlan.c:128
msgid "The connection was not a VLAN connection."
-msgstr "这个连接不是一个 VLAN 连接。"
+msgstr "此连接不是 VLAN 连接。"
#: ../libnm/nm-device-vlan.c:135
msgid "The VLAN identifiers of the device and the connection didn't match."
@@ -11030,102 +12288,116 @@ msgstr "设备和连接的硬件地址不匹配。"
#: ../libnm/nm-device-vxlan.c:386
msgid "The connection was not a VXLAN connection."
-msgstr "这个连接不是 VXLAN 连接。"
+msgstr "此连接不是 VXLAN 连接。"
#: ../libnm/nm-device-vxlan.c:393
msgid "The VXLAN identifiers of the device and the connection didn't match."
msgstr "设备和连接的 VXLAN 标识符不匹配。"
-#: ../libnm/nm-device-wifi.c:590
+#: ../libnm/nm-device-wifi.c:616
msgid "The connection was not a Wi-Fi connection."
-msgstr "这个连接不是一个 Wi-Fi 连接。"
+msgstr "此连接不是 Wi-Fi 连接。"
-#: ../libnm/nm-device-wifi.c:626
+#: ../libnm/nm-device-wifi.c:652
msgid "The device is lacking WPA capabilities required by the connection."
-msgstr "设备缺少连接所要求的 WPA 功能"
+msgstr "设备缺少连接所要求的 WPA 功能。"
-#: ../libnm/nm-device-wifi.c:633
+#: ../libnm/nm-device-wifi.c:659
msgid "The device is lacking WPA2/RSN capabilities required by the connection."
-msgstr "设备缺少连接所要求的 WPA2/RSN 功能"
+msgstr "设备缺少连接所要求的 WPA2/RSN 功能。"
#: ../libnm/nm-device-wimax.c:315
msgid "The connection was not a WiMAX connection."
-msgstr "这个连接不是 WiMAX 连接。"
+msgstr "此连接不是 WiMAX 连接。"
-#: ../libnm/nm-device.c:1529
-msgid "OpenVSwitch Interface"
-msgstr ""
+#: ../libnm/nm-device-wpan.c:82
+msgid "The connection was not a wpan connection."
+msgstr "此连接不是 wpan 连接。"
-#: ../libnm/nm-device.c:1531
-msgid "OpenVSwitch Port"
-msgstr ""
+#: ../libnm/nm-device.c:1314
+msgid "Open vSwitch Interface"
+msgstr "Open vSwitch 接口"
-#: ../libnm/nm-device.c:1533
-msgid "OpenVSwitch Bridge"
-msgstr ""
+#: ../libnm/nm-device.c:1316
+msgid "Open vSwitch Port"
+msgstr "Open vSwitch 端口"
-#: ../libnm/nm-device.c:1561
+#: ../libnm/nm-device.c:1318
+msgid "Open vSwitch Bridge"
+msgstr "Open vSwitch 网桥"
+
+#: ../libnm/nm-device.c:1346
msgid "MACsec"
-msgstr ""
+msgstr "MACsec"
-#: ../libnm/nm-device.c:1563
+#: ../libnm/nm-device.c:1348
msgid "Dummy"
-msgstr ""
+msgstr "虚拟"
-#: ../libnm/nm-device.c:1565
+#: ../libnm/nm-device.c:1350
msgid "PPP"
-msgstr ""
+msgstr "PPP"
+
+#: ../libnm/nm-device.c:1352
+msgid "IEEE 802.15.4"
+msgstr "IEEE 802.15.4"
-#: ../libnm/nm-device.c:2456
+#: ../libnm/nm-device.c:1354
+msgid "6LoWPAN"
+msgstr "6LoWPAN"
+
+#: ../libnm/nm-device.c:1356
+#| msgid "Wired"
+msgid "WireGuard"
+msgstr "WireGuard"
+
+#: ../libnm/nm-device.c:2475
#, c-format
msgid "The connection was not valid: %s"
msgstr "连接无效:%s"
-#: ../libnm/nm-device.c:2465
+#: ../libnm/nm-device.c:2484
#, c-format
msgid "The interface names of the device and the connection didn't match."
msgstr "这个设备的接口名和连接不匹配。"
#: ../libnm/nm-manager.c:274
-#, fuzzy
msgid "Checkpoint was removed before it was initialized"
-msgstr "连接在初始化之前被删除"
+msgstr "检查点在初始化之前被删除"
-#: ../libnm/nm-manager.c:941
+#: ../libnm/nm-manager.c:955
msgid "Active connection removed before it was initialized"
-msgstr "活动连接在初始化之前无法被删除"
+msgstr "活动连接在初始化之前被删除"
#: ../libnm/nm-remote-settings.c:256
msgid "Connection removed before it was initialized"
msgstr "连接在初始化之前被删除"
-#: ../libnm/nm-vpn-plugin-old.c:840 ../libnm/nm-vpn-service-plugin.c:957
+#: ../libnm/nm-vpn-plugin-old.c:847 ../libnm/nm-vpn-service-plugin.c:1016
msgid "No service name specified"
msgstr "未指定服务"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:1
msgid "Enable or disable system networking"
-msgstr "启用或禁用系统网络"
+msgstr "启用或禁用系统联网"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:2
msgid "System policy prevents enabling or disabling system networking"
-msgstr "系统策略阻止启用或禁用系统网络"
+msgstr "系统策略阻止启用或禁用系统联网"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:3
-#, fuzzy
msgid "Reload NetworkManager configuration"
-msgstr "输出网络管理器配置并退出"
+msgstr "重新加载网络管理器配置"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:4
-#, fuzzy
msgid "System policy prevents reloading NetworkManager"
-msgstr "系统策略阻止启用或禁用系统网络"
+msgstr "系统策略阻止重新加载网络管理器"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:5
msgid ""
"Put NetworkManager to sleep or wake it up (should only be used by system "
"power management)"
-msgstr "挂起或唤醒网络管理器(应仅用于系统电源管理)"
+msgstr "挂起或唤醒网络管理器(应仅用于系统电源管理)"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:6
msgid "System policy prevents putting NetworkManager to sleep or waking it up"
@@ -11149,7 +12421,7 @@ msgstr "系统策略阻止启用或禁用移动宽带设备"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:11
msgid "Enable or disable WiMAX mobile broadband devices"
-msgstr "启用/禁用 WiMAX 移动宽带设备"
+msgstr "启用或禁用 WiMAX 移动宽带设备"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:12
msgid ""
@@ -11162,7 +12434,7 @@ msgstr "允许控制网络连接"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:14
msgid "System policy prevents control of network connections"
-msgstr "系统策略阻止更改网络连接"
+msgstr "系统策略阻止网络连接的控制"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:15
msgid "Connection sharing via a protected WiFi network"
@@ -11190,19 +12462,19 @@ msgstr "系统策略阻止更改个人网络设置"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:21
msgid "Modify network connections for all users"
-msgstr "更改所有用户的网络连接"
+msgstr "修改所有用户的网络连接"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:22
msgid "System policy prevents modification of network settings for all users"
-msgstr "系统策略阻止更改全部用户的共用网络设置"
+msgstr "系统策略阻止徐该全部用户的共用网络设置"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:23
msgid "Modify persistent system hostname"
-msgstr "更改系统固有主机名"
+msgstr "修改系统固有主机名"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:24
msgid "System policy prevents modification of the persistent system hostname"
-msgstr "系统策略阻止更改系统固有主机名"
+msgstr "系统策略阻止修改系统固有主机名"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:25
msgid "Modify persistent global DNS configuration"
@@ -11212,142 +12484,128 @@ msgstr "修改持久性全局 DNS 配置"
msgid ""
"System policy prevents modification of the persistent global DNS "
"configuration"
-msgstr "系统策略阻止更改持久性全局 DNS 配置"
+msgstr "系统策略阻止修改持久性全局 DNS 配置"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:27
msgid "Perform a checkpoint or rollback of interfaces configuration"
-msgstr ""
+msgstr "执行接口配置的检查点或回滚"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:28
msgid "System policy prevents the creation of a checkpoint or its rollback"
-msgstr ""
+msgstr "系统策略阻止检查点的创建或其回滚"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:29
msgid "Enable or disable device statistics"
-msgstr ""
+msgstr "启用或禁用设备统计"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:30
msgid "System policy prevents enabling or disabling device statistics"
-msgstr ""
+msgstr "系统策略阻止启用或禁用设备统计"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:31
msgid "Enable or disable connectivity checking"
-msgstr ""
+msgstr "启用或禁用连接性检查"
#: ../data/org.freedesktop.NetworkManager.policy.in.in.h:32
msgid "System policy prevents enabling or disabling connectivity checking"
-msgstr ""
+msgstr "系统策略阻止启用或禁用连接性检查"
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: ../shared/nm-utils/nm-shared-utils.c:979
#, c-format
msgid "object class '%s' has no property named '%s'"
-msgstr "对象类 '%s' 没有名为 '%s' 的属性"
+msgstr "对象类 \"%s\" 没有名为 \"%s\" 的属性"
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: ../shared/nm-utils/nm-shared-utils.c:986
#, c-format
msgid "property '%s' of object class '%s' is not writable"
-msgstr "对象类 '%s' 的 '%s' 属性是不可写的"
+msgstr "对象类 \"%2$s\" 的 \"%1$s\" 属性是不可写的"
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: ../shared/nm-utils/nm-shared-utils.c:993
#, c-format
msgid ""
"construct property \"%s\" for object '%s' can't be set after construction"
-msgstr "对象 '%s' 的构造属性 \"%s\" 在构造后不能被设置"
+msgstr "对象 \"%2$s\" 的构造属性 \"%1$s\" 在构造后不能被设定"
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: ../shared/nm-utils/nm-shared-utils.c:1001
#, c-format
msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
-msgstr "'%s::%s' 不是有效的属性名,'%s' 不是 GObject 子类型。"
+msgstr "\"%s::%s\" 不是有效的属性名;\"%s\" 不是 GObject 子类型"
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: ../shared/nm-utils/nm-shared-utils.c:1010
#, c-format
msgid "unable to set property '%s' of type '%s' from value of type '%s'"
-msgstr "无法从类型 '%s' 的值设置类型为 '%s' 的属性 '%s'"
+msgstr "无法从类型 \"%3$s\" 的值设定类型为 \"%2$s\" 的属性 \"%1$s\""
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: ../shared/nm-utils/nm-shared-utils.c:1021
#, c-format
msgid ""
"value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
"type '%s'"
-msgstr "类型 '%s' 的值 \"%s\" 是无效的或超出类型为 '%s' 的属性 '%s' 的范围"
+msgstr ""
+"类型 \"%2$s\" 的值 \"%1$s\" 无效或超出类型为 \"%4$s\" 的属性 \"%3$s\" 范围"
#. TRANSLATORS: the first %s is a prefix for the connection id, such
#. * 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:119
#, c-format
msgctxt "connection id fallback"
-msgid "%s %d"
-msgstr "%s %d"
+msgid "%s %u"
+msgstr "%s %u"
-#: ../src/main.c:179 ../src/main.c:318
+#: ../src/main.c:180 ../src/main.c:314
#, c-format
msgid "Failed to read configuration: %s\n"
msgstr "读取配置失败:%s\n"
#. Logging/debugging
-#: ../src/main.c:193 ../src/nm-iface-helper.c:292
+#: ../src/main.c:194 ../src/nm-iface-helper.c:297
msgid "Print NetworkManager version and exit"
msgstr "输出网络管理器版本并退出"
-#: ../src/main.c:194 ../src/nm-iface-helper.c:293
+#: ../src/main.c:195 ../src/nm-iface-helper.c:298
msgid "Don't become a daemon"
msgstr "不成为守护进程"
-#: ../src/main.c:195 ../src/nm-iface-helper.c:295
+#: ../src/main.c:196 ../src/nm-iface-helper.c:300
#, c-format
msgid "Log level: one of [%s]"
msgstr "日志级别:取 [%s] 之一"
-#: ../src/main.c:197 ../src/nm-iface-helper.c:297
+#: ../src/main.c:198 ../src/nm-iface-helper.c:302
#, c-format
msgid "Log domains separated by ',': any combination of [%s]"
-msgstr "以 “,” 分开的日志域:可以是 [%s] 的任意组合"
+msgstr "以 \",\" 分开的日志域:可以是 [%s] 的任意组合"
-#: ../src/main.c:199 ../src/nm-iface-helper.c:299
+#: ../src/main.c:200 ../src/nm-iface-helper.c:304
msgid "Make all warnings fatal"
msgstr "视所有警告为致命错误"
-#: ../src/main.c:200
+#: ../src/main.c:201
msgid "Specify the location of a PID file"
msgstr "指定一个 PID 文件的位置"
-#: ../src/main.c:202
+#: ../src/main.c:203
msgid "Print NetworkManager configuration and exit"
-msgstr "打印 NetworkManager 配置并退出"
+msgstr "输出网络管理器配置并退出"
-#: ../src/main.c:212
+#: ../src/main.c:213
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 ""
-"网络管理器监视所有网络连接,并自动选择要使用的最佳连接。\n"
+"网络管理器(NetworkManager)监视所有网络连接,并自动选择要使用的最佳连接。\n"
"它还允许用户指定计算机无线网卡连接的无线访问点。"
-#: ../src/main.c:303 ../src/main-utils.c:286 ../src/nm-iface-helper.c:398
+#: ../src/main.c:304 ../src/main-utils.c:286 ../src/nm-iface-helper.c:442
#, c-format
msgid "%s. Please use --help to see a list of valid options.\n"
msgstr "%s。请使用 --help 查看有效选项列表。\n"
-#: ../src/main.c:308 ../src/nm-iface-helper.c:403
-#, c-format
-msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
-msgstr "正在忽略传给命令行的未识别日志域“%s”\n"
-
-#: ../src/main.c:333
-#, c-format
-msgid "Error in configuration file: %s.\n"
-msgstr "配置文件有错误:%s。\n"
-
-#: ../src/main.c:338
-#, c-format
-msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
-msgstr "正在忽略来自配置文件的未识别日志域“%s”。\n"
-
-#: ../src/main.c:349 ../src/nm-iface-helper.c:413
+#: ../src/main.c:339 ../src/nm-iface-helper.c:457
#, c-format
msgid "Could not daemonize: %s [error %u]\n"
msgstr "无法设为守护进程:%s [错误 %u]\n"
@@ -11370,23 +12628,23 @@ msgstr "关闭 %s 失败:%s\n"
#: ../src/main-utils.c:148 ../src/main-utils.c:159
#, c-format
msgid "Cannot create '%s': %s"
-msgstr "无法创建 '%s':%s"
+msgstr "无法创建 \"%s\":%s"
#: ../src/main-utils.c:212
#, c-format
msgid "%s is already running (pid %ld)\n"
-msgstr "%s 已在运行中 (pid %ld)\n"
+msgstr "%s 已在运行中(pid %ld)\n"
#: ../src/main-utils.c:222
#, c-format
msgid "You must be root to run %s!\n"
msgstr "运行 %s 必须是根用户!\n"
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:280
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:313
msgid "# Created by NetworkManager\n"
msgstr "# 由 NetworkManger 创建\n"
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:290
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:324
#, c-format
msgid ""
"# Merged from %s\n"
@@ -11395,99 +12653,106 @@ msgstr ""
"# 合并自 %s\n"
"\n"
-#: ../src/devices/bluetooth/nm-bluez-device.c:211
+#: ../src/devices/bluetooth/nm-bluez-device.c:212
#, c-format
msgid "%s Network"
msgstr "%s 网络"
-#: ../src/devices/bluetooth/nm-device-bt.c:264
+#: ../src/devices/bluetooth/nm-device-bt.c:270
msgid "PAN requested, but Bluetooth device does not support NAP"
msgstr "PAN 已请求,但蓝牙设备不支持 NAP"
-#: ../src/devices/bluetooth/nm-device-bt.c:274
+#: ../src/devices/bluetooth/nm-device-bt.c:280
msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
-msgstr "PAN 连接无法指定 GSM、CDMA 或序列设置"
+msgstr "PAN 连接无法指定 GSM、CDMA 或串行设置"
-#: ../src/devices/bluetooth/nm-device-bt.c:287
+#: ../src/devices/bluetooth/nm-device-bt.c:293
msgid "PAN connection"
msgstr "PAN 连接"
-#: ../src/devices/bluetooth/nm-device-bt.c:294
+#: ../src/devices/bluetooth/nm-device-bt.c:300
msgid "DUN requested, but Bluetooth device does not support DUN"
-msgstr "DUN 已请求,但 Bluetooth 设备不支持 DUN"
+msgstr "DUN 已请求,但蓝牙设备不支持 DUN"
-#: ../src/devices/bluetooth/nm-device-bt.c:304
+#: ../src/devices/bluetooth/nm-device-bt.c:310
msgid "DUN connection must include a GSM or CDMA setting"
msgstr "DUN 连接必须包含 GSM 或 CDMA 设置"
-#: ../src/devices/bluetooth/nm-device-bt.c:314
-#: ../src/devices/wwan/nm-modem-broadband.c:709
+#: ../src/devices/bluetooth/nm-device-bt.c:320
+#: ../src/devices/wwan/nm-modem-broadband.c:705
msgid "GSM connection"
msgstr "GSM 连接"
-#: ../src/devices/bluetooth/nm-device-bt.c:318
-#: ../src/devices/wwan/nm-modem-broadband.c:733
+#: ../src/devices/bluetooth/nm-device-bt.c:324
+#: ../src/devices/wwan/nm-modem-broadband.c:729
msgid "CDMA connection"
msgstr "CDMA 连接"
-#: ../src/devices/bluetooth/nm-device-bt.c:326
+#: ../src/devices/bluetooth/nm-device-bt.c:332
msgid "Unknown/unhandled Bluetooth connection type"
msgstr "未知的/未处理的蓝牙连接类型"
-#: ../src/devices/bluetooth/nm-device-bt.c:347
-#: ../src/devices/nm-device-ethernet.c:1408
-#: ../src/devices/nm-device-infiniband.c:210
-#: ../src/devices/wifi/nm-device-wifi.c:952
+#: ../src/devices/bluetooth/nm-device-bt.c:353
+#: ../src/devices/nm-device-ethernet.c:1426
+#: ../src/devices/nm-device-infiniband.c:188
+#: ../src/devices/wifi/nm-device-wifi.c:907
msgid "connection does not match device"
msgstr "连接不匹配设备"
-#: ../src/devices/nm-device-bond.c:91
+#: ../src/devices/nm-device-6lowpan.c:191
+msgid "6LOWPAN connection"
+msgstr "6LOWPAN 连接"
+
+#: ../src/devices/nm-device-bond.c:72
msgid "Bond connection"
msgstr "绑定连接"
-#: ../src/devices/nm-device-bridge.c:130
+#: ../src/devices/nm-device-bridge.c:153
msgid "Bridge connection"
-msgstr "桥接连接"
+msgstr "网桥连接"
-#: ../src/devices/nm-device-dummy.c:70
-#, fuzzy
+#: ../src/devices/nm-device-dummy.c:68
msgid "Dummy connection"
-msgstr "ADSL 连接"
+msgstr "虚拟连接"
-#: ../src/devices/nm-device-ethernet.c:1389
+#: ../src/devices/nm-device-ethernet.c:1407
msgid "PPPoE connection"
msgstr "PPPoE 连接"
-#: ../src/devices/nm-device-ethernet.c:1389
+#: ../src/devices/nm-device-ethernet.c:1407
msgid "Wired connection"
msgstr "有线连接"
-#: ../src/devices/nm-device-ethernet-utils.c:36
+#: ../src/devices/nm-device-ethernet-utils.c:33
#, c-format
msgid "Wired connection %d"
msgstr "有线连接 %d"
-#: ../src/devices/nm-device-ip-tunnel.c:340
+#: ../src/devices/nm-device-ip-tunnel.c:418
msgid "IP tunnel connection"
msgstr "IP 隧道连接"
-#: ../src/devices/nm-device-macvlan.c:344
+#: ../src/devices/nm-device-macvlan.c:365
msgid "MACVLAN connection"
msgstr "MACVLAN 连接"
-#: ../src/devices/nm-device-tun.c:146
+#: ../src/devices/nm-device-tun.c:158
msgid "TUN connection"
msgstr "TUN 连接"
-#: ../src/devices/team/nm-device-team.c:119
+#: ../src/devices/nm-device-wpan.c:68
+msgid "WPAN connection"
+msgstr "WPAN 连接"
+
+#: ../src/devices/team/nm-device-team.c:101
msgid "Team connection"
-msgstr "Team 连接"
+msgstr "组合连接"
-#: ../src/devices/wifi/nm-device-olpc-mesh.c:152
+#: ../src/devices/wifi/nm-device-olpc-mesh.c:124
msgid "Mesh"
msgstr "Mesh"
-#: ../src/devices/wifi/nm-device-wifi.c:919
+#: ../src/devices/wifi/nm-device-wifi.c:880
msgid "WPA Ad-Hoc disabled due to kernel bugs"
msgstr "由于内核程序错误禁用了 WPA Ad-Hoc"
@@ -11502,7 +12767,7 @@ msgstr "LEAP 验证要求 LEAP 用户名"
#: ../src/devices/wifi/nm-wifi-utils.c:87
msgid "LEAP username requires 'leap' authentication"
-msgstr "LEAP 用户名要求 'leap' 验证"
+msgstr "LEAP 用户名要求 \"leap\" 验证"
#: ../src/devices/wifi/nm-wifi-utils.c:100
msgid "LEAP authentication requires IEEE 802.1x key management"
@@ -11519,23 +12784,23 @@ msgstr "LEAP 验证和 802.1x 设置不兼容"
#: ../src/devices/wifi/nm-wifi-utils.c:154
#, c-format
msgid "a connection using '%s' authentication cannot use WPA key management"
-msgstr "使用 '%s' 验证的连接无法使用 WPA 密钥管理"
+msgstr "使用 \"%s\" 验证的连接无法使用 WPA 密钥管理"
#: ../src/devices/wifi/nm-wifi-utils.c:165
#, c-format
msgid "a connection using '%s' authentication cannot specify WPA protocols"
-msgstr "使用 '%s' 验证的连接无法指定 WPA 协议"
+msgstr "使用 \"%s\" 验证的连接无法指定 WPA 协议"
#: ../src/devices/wifi/nm-wifi-utils.c:181
#: ../src/devices/wifi/nm-wifi-utils.c:198
#, c-format
msgid "a connection using '%s' authentication cannot specify WPA ciphers"
-msgstr "使用 '%s' 验证的连接无法指定 WPA 密文"
+msgstr "使用 \"%s\" 验证的连接无法指定 WPA 密文"
#: ../src/devices/wifi/nm-wifi-utils.c:210
#, c-format
msgid "a connection using '%s' authentication cannot specify a WPA password"
-msgstr "使用 '%s' 验证的连接无法指定 WPA 密码"
+msgstr "使用 \"%s\" 验证的连接无法指定 WPA 密码"
#: ../src/devices/wifi/nm-wifi-utils.c:241
msgid "Dynamic WEP requires an 802.1x setting"
@@ -11544,19 +12809,19 @@ msgstr "动态 WEP 要求 802.1x 设置"
#: ../src/devices/wifi/nm-wifi-utils.c:251
#: ../src/devices/wifi/nm-wifi-utils.c:279
msgid "Dynamic WEP requires 'open' authentication"
-msgstr "动态 WEP 要求 'open' 验证"
+msgstr "动态 WEP 要求 \"open\" 验证"
#: ../src/devices/wifi/nm-wifi-utils.c:266
msgid "Dynamic WEP requires 'ieee8021x' key management"
-msgstr "动态 WEP 要求 'ieee8021x' 密钥管理"
+msgstr "动态 WEP 要求 \"ieee8021x\" 密钥管理"
#: ../src/devices/wifi/nm-wifi-utils.c:313
msgid "WPA-PSK authentication is incompatible with 802.1x"
-msgstr "WPA-PSK 验证和 802.1x 是兼容的"
+msgstr "WPA-PSK 验证和 802.1x 兼容"
#: ../src/devices/wifi/nm-wifi-utils.c:323
msgid "WPA-PSK requires 'open' authentication"
-msgstr "WPA-PSK 要求 'open' 验证"
+msgstr "WPA-PSK 要求 \"open\" 验证"
#: ../src/devices/wifi/nm-wifi-utils.c:335
msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
@@ -11564,15 +12829,15 @@ msgstr "WPA Ad-Hoc 验证要求 Ad-Hoc 模式的 AP"
#: ../src/devices/wifi/nm-wifi-utils.c:348
msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
-msgstr "WPA Ad-Hoc 验证要求 'wpa' 协议"
+msgstr "WPA Ad-Hoc 验证要求 \"wpa\" 协议"
#: ../src/devices/wifi/nm-wifi-utils.c:360
msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
-msgstr "WPA Ad-Hoc 验证要求 'none' 配对密码"
+msgstr "WPA Ad-Hoc 验证要求 \"none\" 配对密码"
#: ../src/devices/wifi/nm-wifi-utils.c:372
msgid "WPA Ad-Hoc requires 'tkip' group cipher"
-msgstr "WPA Ad-Hoc 要求 'tkip' 组密码"
+msgstr "WPA Ad-Hoc 要求 \"tkip\" 组密码"
#: ../src/devices/wifi/nm-wifi-utils.c:386
msgid "Access point does not support PSK but setting requires it"
@@ -11584,11 +12849,11 @@ msgstr "WPA-EAP 验证要求 802.1x 设置"
#: ../src/devices/wifi/nm-wifi-utils.c:426
msgid "WPA-EAP requires 'open' authentication"
-msgstr "WPA-EAP 要求 'open' 验证"
+msgstr "WPA-EAP 要求 \"open\" 验证"
#: ../src/devices/wifi/nm-wifi-utils.c:437
msgid "802.1x setting requires 'wpa-eap' key management"
-msgstr "802.1x 设置要求 'wpa-eap' 密钥管理"
+msgstr "802.1x 设置要求 \"wpa-eap\" 密钥管理"
#: ../src/devices/wifi/nm-wifi-utils.c:450
msgid "Access point does not support 802.1x but setting requires it"
@@ -11609,200 +12874,319 @@ msgstr "Ad-Hoc 模式和 LEAP 安全性不兼容"
#: ../src/devices/wifi/nm-wifi-utils.c:507
msgid "Ad-Hoc mode requires 'open' authentication"
-msgstr "Ad-Hoc 模式要求 'open' 验证"
+msgstr "Ad-Hoc 模式要求 \"open\" 验证"
#: ../src/devices/wifi/nm-wifi-utils.c:517
msgid ""
"Access point mode is Infrastructure but setting requires Ad-Hoc security"
msgstr "接入点模式是 Infrastructure 但设置要求 Ad-Hoc 安全性"
-#: ../src/devices/wifi/nm-wifi-utils.c:559
-#: ../src/devices/wifi/nm-wifi-utils.c:589
+#: ../src/devices/wifi/nm-wifi-utils.c:558
+#: ../src/devices/wifi/nm-wifi-utils.c:586
#, c-format
msgid "connection does not match access point"
-msgstr "连接不匹配接入点"
+msgstr "连接和接入点不匹配"
-#: ../src/devices/wifi/nm-wifi-utils.c:613
+#: ../src/devices/wifi/nm-wifi-utils.c:610
msgid "Access point is unencrypted but setting specifies security"
msgstr "接入点未加密但设置指定了安全性"
-#: ../src/devices/wifi/nm-wifi-utils.c:702
+#: ../src/devices/wifi/nm-wifi-utils.c:699
msgid ""
"WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
"WEP"
msgstr "WPA 验证和非 EAP(原始的)LEAP 或动态 WEP 不兼容"
-#: ../src/devices/wifi/nm-wifi-utils.c:712
+#: ../src/devices/wifi/nm-wifi-utils.c:709
msgid "WPA authentication is incompatible with Shared Key authentication"
-msgstr "WPA 验证和 Shared Key 验证不兼容"
+msgstr "WPA 验证和共享密钥(Shared Key)验证不兼容"
-#: ../src/devices/wifi/nm-wifi-utils.c:759
+#: ../src/devices/wifi/nm-wifi-utils.c:756
msgid "Failed to determine AP security information"
msgstr "确定 AP 安全信息失败"
-#: ../src/devices/wwan/nm-modem-broadband.c:695
+#: ../src/devices/wwan/nm-modem-broadband.c:691
msgid "GSM mobile broadband connection requires a 'gsm' setting"
-msgstr "GSM 移动宽带连接要求 'gsm' 设置"
+msgstr "GSM 移动宽带连接要求 \"gsm\" 设置"
-#: ../src/nm-config.c:486
+#: ../src/nm-config.c:521
msgid "Config file location"
msgstr "配置文件位置"
-#: ../src/nm-config.c:487
+#: ../src/nm-config.c:522
msgid "Config directory location"
msgstr "配置目录位置"
-#: ../src/nm-config.c:488
+#: ../src/nm-config.c:523
msgid "System config directory location"
msgstr "系统配置目录位置"
-#: ../src/nm-config.c:489
+#: ../src/nm-config.c:524
msgid "Internal config file location"
-msgstr "内部的配置文件位置"
+msgstr "内部配置文件位置"
-#: ../src/nm-config.c:490
+#: ../src/nm-config.c:525
msgid "State file location"
msgstr "状态文件位置"
-#: ../src/nm-config.c:491
+#: ../src/nm-config.c:526
msgid "State file for no-auto-default devices"
msgstr "no-auto-default 设备的状态文件"
-#: ../src/nm-config.c:492
+#: ../src/nm-config.c:527
msgid "List of plugins separated by ','"
-msgstr "插件列表,以“,”隔开"
+msgstr "插件列表,以 \",\" 隔开"
-#: ../src/nm-config.c:493
+#: ../src/nm-config.c:528
msgid "Quit after initial configuration"
-msgstr "初始配置后退出"
+msgstr "初始化配置后退出"
-#: ../src/nm-config.c:494 ../src/nm-iface-helper.c:294
+#: ../src/nm-config.c:529 ../src/nm-iface-helper.c:299
msgid "Don't become a daemon, and log to stderr"
-msgstr "不成为守护进程,并向 stderr 打印日志"
+msgstr "不成为守护进程,并向标准错误打印日志"
#. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:497
+#: ../src/nm-config.c:532
msgid "An http(s) address for checking internet connectivity"
msgstr "检查网络连通用的 http(s) 地址"
-#: ../src/nm-config.c:498
+#: ../src/nm-config.c:533
msgid "The interval between connectivity checks (in seconds)"
-msgstr "网络连通检查间隔(秒)"
+msgstr "连接性检查间隔(以秒计)"
-#: ../src/nm-config.c:499
+#: ../src/nm-config.c:534
msgid "The expected start of the response"
msgstr "预期的响应开头"
#. Interface/IP config
-#: ../src/nm-iface-helper.c:274
+#: ../src/nm-iface-helper.c:279
msgid "The interface to manage"
msgstr "要管理的接口"
-#: ../src/nm-iface-helper.c:275
+#: ../src/nm-iface-helper.c:280
msgid "Connection UUID"
msgstr "连接 UUID"
-#: ../src/nm-iface-helper.c:276
+#: ../src/nm-iface-helper.c:281
msgid "Connection Token for Stable IDs"
-msgstr ""
+msgstr "固定 ID 的连接令牌"
-#: ../src/nm-iface-helper.c:277
+#: ../src/nm-iface-helper.c:282
msgid "Whether to manage IPv6 SLAAC"
msgstr "是否管理 IPv6 SLAAC"
-#: ../src/nm-iface-helper.c:278
+#: ../src/nm-iface-helper.c:283
msgid "Whether SLAAC must be successful"
msgstr "SLAAC 是否必须是成功的"
-#: ../src/nm-iface-helper.c:279
+#: ../src/nm-iface-helper.c:284
msgid "Use an IPv6 temporary privacy address"
msgstr "使用 IPv6 临时私有地址"
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:285
msgid "Current DHCPv4 address"
msgstr "当前的 DHCPv4 地址"
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:286
msgid "Whether DHCPv4 must be successful"
msgstr "DHCPv4 是否必须是成功的"
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:287
msgid "Hex-encoded DHCPv4 client ID"
msgstr "十六进制编码的 DHCPv4 客户 ID"
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:288
msgid "Hostname to send to DHCP server"
msgstr "发送至 DHCP 服务器的主机名"
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:288
msgid "barbar"
msgstr "barbar"
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:289
msgid "FQDN to send to DHCP server"
-msgstr "发送至 DHCP 服务器的全限定名"
+msgstr "发送至 DHCP 服务器的 FQDN"
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:289
msgid "host.domain.org"
msgstr "host.domain.org"
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:290
msgid "Route priority for IPv4"
msgstr "IPv4 的路由优先级"
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:290
msgid "0"
msgstr "0"
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:291
msgid "Route priority for IPv6"
msgstr "IPv6 的路由优先级"
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:291
msgid "1024"
msgstr "1024"
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:292
msgid "Hex-encoded Interface Identifier"
msgstr "十六进制编码的接口标识符"
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:293
msgid "IPv6 SLAAC address generation mode"
msgstr "IPv6 SLAAC 地址生成模式"
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:294
msgid ""
"The logging backend configuration value. See logging.backend in "
"NetworkManager.conf"
-msgstr "日志后台配置的值。请参考 NetworkManager.conf 里的 logging.backend "
+msgstr "日志后台的配置值。请参考 NetworkManager.conf 里的 logging.backend"
-#: ../src/nm-iface-helper.c:309
+#: ../src/nm-iface-helper.c:314
msgid ""
"nm-iface-helper is a small, standalone process that manages a single network "
"interface."
msgstr "nm-iface-helper 是一个管理单个网络接口的小型独立进程。"
-#: ../src/nm-iface-helper.c:379
+#: ../src/nm-iface-helper.c:423
#, c-format
msgid "An interface name and UUID are required\n"
msgstr "接口名称和 UUID 是必需的\n"
-#: ../src/nm-iface-helper.c:385
+#: ../src/nm-iface-helper.c:429
#, c-format
msgid "Failed to find interface index for %s (%s)\n"
msgstr "寻找 %s(%s) 的接口索引失败\n"
-#: ../src/nm-iface-helper.c:446
+#: ../src/nm-iface-helper.c:447
+#, c-format
+msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
+msgstr "正在忽略传给命令行的未识别日志域 \"%s\"。\n"
+
+#: ../src/nm-iface-helper.c:486
#, c-format
msgid "(%s): Invalid IID %s\n"
-msgstr "(%s): 无效的 IID %s\n"
+msgstr "(%s):无效的 IID %s\n"
+
+#: ../src/nm-iface-helper.c:497
+#, c-format
+msgid "(%s): Invalid DHCP client-id %s\n"
+msgstr "(%s):无效的 DHCP 客户端 ID %s\n"
-#: ../src/nm-logging.c:267
+#: ../src/nm-logging.c:273
#, c-format
msgid "Unknown log level '%s'"
-msgstr "未知日志等级“%s”"
+msgstr "未知的日志等级 \"%s\""
-#: ../src/nm-logging.c:369
+#: ../src/nm-logging.c:375
#, c-format
msgid "Unknown log domain '%s'"
-msgstr "未知日志域“%s”"
+msgstr "未知的日志域 \"%s\""
+
+#~ msgid ""
+#~ "The setting's name, which uniquely identifies the setting within the "
+#~ "connection. Each setting type has a name unique to that type, for "
+#~ "example \"ppp\" or \"wireless\" or \"wired\"."
+#~ msgstr ""
+#~ "设置的名称,用在连接里的唯一标志。每个设置类型拥有该类型的唯一名称,例如 "
+#~ "\"ppp\"、\"wireless\" 或 \"wired\"。"
+
+#~ msgid "Error: bad color: %s\n"
+#~ msgstr "错误:错误的颜色:%s\n"
+
+#~ msgid "'%s' is ambiguous (%s x %s)"
+#~ msgstr "\"%s\" 不明确(%s x %s)"
+
+#~ msgid "'%s' is not a valid flag; use <0-%d> or a combination of '%s'"
+#~ msgstr "\"%s\" 标记无效,请使用 <0-%d> 或 \"%s\" 的组合"
+
+#~ msgid "'%s' sum is higher than all flags => all flags set"
+#~ msgstr "\"%s\" 总和高于全部的标记 => 全部标记集合"
+
+#~ msgid "%d (disabled)"
+#~ msgstr "%d(禁用)"
+
+#~ msgid "%d (enabled, prefer public IP)"
+#~ msgstr "%d(启用,首选公共 IP)"
+
+#~ msgid "%d (enabled, prefer temporary IP)"
+#~ msgstr "%d(启用,首选临时 IP)"
+
+#~ msgid ""
+#~ "If TRUE, enforce auto-negotiation of port speed and duplex mode. If "
+#~ "FALSE, \"speed\" and \"duplex\" properties should be both set or link "
+#~ "configuration will be skipped."
+#~ msgstr ""
+#~ "如果为 TRUE,强制端口速度和双工模式的自动协商。如果为 FALSE,\"speed\" 和 "
+#~ "\"duplex\" 属性都应该被设定或者链接配置将被忽略。"
+
+#~ msgid ""
+#~ "Can be specified only when \"auto-negotiate\" is \"off\". In that case, "
+#~ "statically configures the device to use that specified duplex mode, "
+#~ "either \"half\" or \"full\". Must be set together with the \"speed\" "
+#~ "property if specified. Before specifying a duplex mode be sure your "
+#~ "device supports it."
+#~ msgstr ""
+#~ "只在 \"auto-negotiate\" 为 \"off\" 时可指定。在该情况下,静态配置设备使用"
+#~ "指定的双工模式,\"half\" 或 \"full\"。如果指定则必须同时设定 \"speed\" 属"
+#~ "性。在指定双工模式前请确保您的设备支持它。"
+
+#~ msgid ""
+#~ "Can be set to a value greater than zero only when \"auto-negotiate\" is "
+#~ "\"off\". In that case, statically configures the device to use that "
+#~ "specified speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together "
+#~ "with the \"duplex\" property when non-zero. Before specifying a speed "
+#~ "value be sure your device supports it."
+#~ msgstr ""
+#~ "只在 \"auto-negotiate\" 为 \"off\" 时可以设置为大于零的值。这种情况下,静"
+#~ "态配置设备使用该指定的速度。以 Mbit/s 计算,例如 100 == 100Mbit/s。非零时 "
+#~ "\"duplex\" 属性必须同时设置。在指定速度值前请确保您的设备支持它。"
+
+#~ msgid ""
+#~ "Intra-connection DNS priority. The relative priority to be used when "
+#~ "determining the order of DNS servers in resolv.conf. A lower value means "
+#~ "that servers will be on top of the file. Zero selects the default value, "
+#~ "which is 50 for VPNs and 100 for other connections. Note that the "
+#~ "priority is to order DNS settings for multiple active connections. It "
+#~ "does not disambiguate multiple DNS servers within the same connection "
+#~ "profile. For that, just specify the DNS servers in the desired order. "
+#~ "When multiple devices have configurations with the same priority, the one "
+#~ "with an active default route will be preferred. Note that when using "
+#~ "dns=dnsmasq the order is meaningless since dnsmasq forwards queries to "
+#~ "all known servers at the same time. Negative values have the special "
+#~ "effect of excluding other configurations with a greater priority value; "
+#~ "so in presence of at least a negative priority, only DNS servers from "
+#~ "connections with the lowest priority value will be used."
+#~ msgstr ""
+#~ "内部连接的 DNS 优先级。当确定 resolv.conf 里的 DNS 服务器顺序时使用的相对"
+#~ "优先级。更低的值代表服务器将位于文件的更顶部。零代表默认值,即 50 用于 "
+#~ "VPN 和 100 用于其他连接。注意此优先级用于为多个活动连接排序 DNS 设置。它不"
+#~ "是对同个连接配置集中的多个 DNS 服务器进行明确选择。要完成这个,只要以期望"
+#~ "的顺序指定 DNS 服务器就行。当多个设备配置了同样的优先级,将优先选择活动默"
+#~ "认路由的那一个。注意当使用 dns=dnsmasq 时,此顺序无意义因为 dnsmasq 同时转"
+#~ "发查询到所有已知服务器。负值具有排除其他拥有更高优先级值的配置的特殊效果;"
+#~ "所以存在至少一个负值优先级的情况下,只使用具有最低优先级值的连接的 DNS 服"
+#~ "务器。"
+
+#~ msgid "ignoring invalid DNS server IPv6 address '%s'"
+#~ msgstr "忽略无效的 DNS 服务器 IPv6 地址 \"%s\""
+
+#~ msgid "when link autonegotiation is enabled no duplex value is accepted"
+#~ msgstr "当链路自动协商启用时不接受任何双工值"
+
+#~ msgid "when link autonegotiation is enabled speed should be 0"
+#~ msgstr "当链路自动协商启用时速度应该为 0"
+
+#~ msgid "Error in configuration file: %s.\n"
+#~ msgstr "配置文件有错误:%s。\n"
+
+#~ msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
+#~ msgstr "正在忽略来自配置文件的未识别日志域 \"%s\"。\n"
+
+#~ msgid "'%s' is not a valid flag number; use <0-%d>"
+#~ msgstr "'%s' 是无效的标记数字,请使用 <0-%d>。"
+
+#~ msgid "Editor failed with status %d"
+#~ msgstr "编辑器失败,状态码:%d"
+
+#~ msgid "Editor failed with signal %d"
+#~ msgstr "编辑器失败,信号 %d"