diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 3309 |
1 files changed, 1746 insertions, 1563 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 23be1f7c51..0c88db4047 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -16,9 +16,8 @@ msgid "" msgstr "" "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" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-01-08 16:44+0100\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" @@ -115,7 +114,7 @@ msgstr "nmcli 已成功地注册为 polkit 代理。\n" #: ../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 +#: ../clients/cli/connections.c:1454 msgid "GROUP" msgstr "组" @@ -134,7 +133,7 @@ msgstr "错误：openconnect 失败，状态为 %d\n" msgid "Error: openconnect failed with signal %d\n" msgstr "错误：openconnect 失败，信号为 %d\n" -#: ../clients/cli/common.c:710 +#: ../clients/cli/common.c:711 #, c-format msgid "" "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask " @@ -144,123 +143,139 @@ msgstr "" "就无法进行\n" "询问。\n" -#: ../clients/cli/common.c:1200 +#: ../clients/cli/common.c:1211 #, c-format msgid "Error: Could not create NMClient object: %s." msgstr "错误：无法创建 NMClient 对象：%s。" -#: ../clients/cli/common.c:1220 +#: ../clients/cli/common.c:1231 msgid "Error: NetworkManager is not running." msgstr "错误：网络管理器（NetworkManager）未运行。" -#: ../clients/cli/common.c:1316 +#: ../clients/cli/common.c:1327 #, c-format msgid "Error: argument '%s' not understood. Try passing --help instead." msgstr "错误：不能理解参数 \"%s\"。试下换成传递 --help 参数。" -#: ../clients/cli/common.c:1326 +#: ../clients/cli/common.c:1337 msgid "Error: missing argument. Try passing --help." msgstr "错误：缺少参数。试下传递 --help 参数。" -#: ../clients/cli/common.c:1379 +#: ../clients/cli/common.c:1390 msgid "access denied" msgstr "访问遭到拒绝" +#: ../clients/cli/common.c:1398 ../clients/cli/connections.c:81 +#: ../clients/cli/connections.c:90 ../clients/cli/devices.c:444 +#: ../clients/cli/devices.c:536 ../clients/cli/devices.c:543 +#: ../clients/cli/general.c:41 ../clients/cli/general.c:129 +#: ../clients/cli/general.c:134 ../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:1567 +#: ../clients/common/nm-meta-setting-desc.c:1617 +#: ../clients/common/nm-meta-setting-desc.c:2757 +#: ../clients/common/nm-meta-setting-desc.c:2812 +msgid "unknown" +msgstr "未知" + +#: ../clients/cli/common.c:1399 +msgid "none" +msgstr "无" + +#: ../clients/cli/common.c:1400 +msgid "portal" +msgstr "入口" + +#: ../clients/cli/common.c:1401 +msgid "limited" +msgstr "受限" + +#: ../clients/cli/common.c:1402 +msgid "full" +msgstr "完全" + #. define some prompts for connection editor -#: ../clients/cli/connections.c:64 +#: ../clients/cli/connections.c:65 msgid "Setting name? " msgstr "设置名称？" -#: ../clients/cli/connections.c:65 +#: ../clients/cli/connections.c:66 msgid "Property name? " msgstr "属性名称？" -#: ../clients/cli/connections.c:66 +#: ../clients/cli/connections.c:67 msgid "Enter connection type: " msgstr "输入连接类型：" #. define some other prompts -#: ../clients/cli/connections.c:70 +#: ../clients/cli/connections.c:71 msgid "Connection (name, UUID, or path): " msgstr "连接（名称、UUID 或路径）：" -#: ../clients/cli/connections.c:71 +#: ../clients/cli/connections.c:72 msgid "VPN connection (name, UUID, or path): " msgstr "VPN 连接（名称、UUID 或路径）：" -#: ../clients/cli/connections.c:72 +#: ../clients/cli/connections.c:73 msgid "Connection(s) (name, UUID, or path): " msgstr "连接（名称、UUID 或路径）：" # apath = active path -#: ../clients/cli/connections.c:73 +#: ../clients/cli/connections.c:74 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 +#: ../clients/cli/connections.c:82 msgid "activating" msgstr "激活中" -#: ../clients/cli/connections.c:82 +#: ../clients/cli/connections.c:83 msgid "activated" msgstr "已激活" -#: ../clients/cli/connections.c:83 ../clients/common/nm-client-utils.c:271 +#: ../clients/cli/connections.c:84 ../clients/common/nm-client-utils.c:271 msgid "deactivating" msgstr "停用中" -#: ../clients/cli/connections.c:84 +#: ../clients/cli/connections.c:85 msgid "deactivated" msgstr "已停用" -#: ../clients/cli/connections.c:90 +#: ../clients/cli/connections.c:91 msgid "VPN connecting (prepare)" msgstr "VPN 连接中（准备）" -#: ../clients/cli/connections.c:91 +#: ../clients/cli/connections.c:92 msgid "VPN connecting (need authentication)" msgstr "VPN 连接中（需要验证）" -#: ../clients/cli/connections.c:92 +#: ../clients/cli/connections.c:93 msgid "VPN connecting" msgstr "VPN 连接中" -#: ../clients/cli/connections.c:93 +#: ../clients/cli/connections.c:94 msgid "VPN connecting (getting IP configuration)" msgstr "VPN 连接中（获取 IP 配置中）" -#: ../clients/cli/connections.c:94 +#: ../clients/cli/connections.c:95 msgid "VPN connected" msgstr "VPN 已连接" -#: ../clients/cli/connections.c:95 +#: ../clients/cli/connections.c:96 msgid "VPN connection failed" msgstr "VPN 连接失败" -#: ../clients/cli/connections.c:96 +#: ../clients/cli/connections.c:97 msgid "VPN disconnected" msgstr "VPN 已断开" -#: ../clients/cli/connections.c:464 +#: ../clients/cli/connections.c:518 msgid "never" msgstr "从不" -#: ../clients/cli/connections.c:814 +#: ../clients/cli/connections.c:868 #, c-format msgid "" "Usage: nmcli connection { COMMAND | help }\n" @@ -336,7 +351,7 @@ msgstr "" " export [id | uuid | path] <ID> [<输出文件>]\n" "\n" -#: ../clients/cli/connections.c:836 +#: ../clients/cli/connections.c:890 #, c-format msgid "" "Usage: nmcli connection show { ARGUMENTS | help }\n" @@ -381,7 +396,7 @@ msgstr "" "会考虑活动的配置集。请使用全局的 --show-secrets 选项以同时显示关联的密钥" "（secret）。\n" -#: ../clients/cli/connections.c:857 +#: ../clients/cli/connections.c:911 #, c-format msgid "" "Usage: nmcli connection up { ARGUMENTS | help }\n" @@ -422,7 +437,7 @@ msgstr "" "nsp - 指定要连接的 NSP（只对 WiMAX 有效）\n" "passwd-file - 激活连接所需的密码文件\n" -#: ../clients/cli/connections.c:878 +#: ../clients/cli/connections.c:932 #, c-format msgid "" "Usage: nmcli connection down { ARGUMENTS | help }\n" @@ -444,8 +459,8 @@ msgstr "" "D-Bus 路径来确定。\n" "\n" -#: ../clients/cli/connections.c:890 -#, c-format +#: ../clients/cli/connections.c:944 +#, fuzzy, c-format msgid "" "Usage: nmcli connection add { ARGUMENTS | help }\n" "\n" @@ -582,9 +597,9 @@ msgid "" " [destination-port <0-65535>]\n" "\n" " wpan: [short-addr <0x0000-0xffff>]\n" -"\n" " [pan-id <0x0000-0xffff>]\n" -"\n" +" [page <default|0-31>]\n" +" [channel <default|0-26>]\n" " [mac <MAC address>]\n" "\n" " 6lowpan: dev <parent device (connection UUID, ifname, or MAC)>\n" @@ -757,7 +772,7 @@ msgstr "" " [ip6 <IPv6 地址>] [gw6 <IPv6 网关>]\n" "\n" -#: ../clients/cli/connections.c:1012 +#: ../clients/cli/connections.c:1068 #, c-format msgid "" "Usage: nmcli connection modify { ARGUMENTS | help }\n" @@ -802,7 +817,7 @@ msgstr "" "nmcli con mod bond0 -bond.options downdelay\n" "\n" -#: ../clients/cli/connections.c:1035 +#: ../clients/cli/connections.c:1091 #, c-format msgid "" "Usage: nmcli connection clone { ARGUMENTS | help }\n" @@ -824,7 +839,7 @@ msgstr "" "成）和 ID（由 <新名称> 参数提供）不同。\n" "\n" -#: ../clients/cli/connections.c:1047 +#: ../clients/cli/connections.c:1103 #, c-format msgid "" "Usage: nmcli connection edit { ARGUMENTS | help }\n" @@ -851,7 +866,7 @@ msgstr "" "在交互式编辑器中添加新的连接配置文件。\n" "\n" -#: ../clients/cli/connections.c:1062 +#: ../clients/cli/connections.c:1118 #, c-format msgid "" "Usage: nmcli connection delete { ARGUMENTS | help }\n" @@ -870,7 +885,7 @@ msgstr "" "配置集由其名称、UUID 或 D-Bus 路径来确定。\n" "\n" -#: ../clients/cli/connections.c:1073 +#: ../clients/cli/connections.c:1129 #, c-format msgid "" "Usage: nmcli connection monitor { ARGUMENTS | help }\n" @@ -890,7 +905,7 @@ msgstr "" "每当指定的连接修改时，这个命令将其打印出来。如果没有指定则监视所有的连接。\n" "\n" -#: ../clients/cli/connections.c:1085 +#: ../clients/cli/connections.c:1141 #, c-format msgid "" "Usage: nmcli connection reload { help }\n" @@ -903,7 +918,7 @@ msgstr "" "从磁盘重新载入所有的连接文件。\n" "\n" -#: ../clients/cli/connections.c:1093 +#: ../clients/cli/connections.c:1149 #, c-format msgid "" "Usage: nmcli connection load { ARGUMENTS | help }\n" @@ -924,7 +939,7 @@ msgstr "" "网络管理器（NetworkManager）能注意到它的最新状态。\n" "\n" -#: ../clients/cli/connections.c:1105 +#: ../clients/cli/connections.c:1161 #, c-format msgid "" "Usage: nmcli connection import { ARGUMENTS | help }\n" @@ -947,7 +962,7 @@ msgstr "" "目前只支持 VPN 配置。配置通过 NetworkManager VPN 插件导入。\n" "\n" -#: ../clients/cli/connections.c:1118 +#: ../clients/cli/connections.c:1174 #, c-format msgid "" "Usage: nmcli connection export { ARGUMENTS | help }\n" @@ -965,339 +980,344 @@ msgstr "" "导出连接。目前只支持 VPN 连接。数据会导出到标准输出或文件（如果给定了）。\n" "\n" -#: ../clients/cli/connections.c:1200 +#: ../clients/cli/connections.c:1264 #, c-format msgid "Error updating secrets for %s: %s\n" msgstr "更新 %s 的密钥时出错：%s\n" -#: ../clients/cli/connections.c:1243 +#: ../clients/cli/connections.c:1307 msgid "Connection profile details" msgstr "连接配置集详情" -#: ../clients/cli/connections.c:1256 ../clients/cli/connections.c:1341 +#: ../clients/cli/connections.c:1320 ../clients/cli/connections.c:1405 #, c-format msgid "Error: 'connection show': %s" msgstr "错误：\"connection show\"：%s" -#: ../clients/cli/connections.c:1331 +#: ../clients/cli/connections.c:1395 msgid "Activate connection details" msgstr "激活连接详情" -#: ../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 +#: ../clients/cli/connections.c:1503 ../clients/cli/devices.c:1453 +#: ../clients/cli/devices.c:1467 ../clients/cli/devices.c:1482 +#: ../clients/cli/devices.c:1540 ../clients/cli/devices.c:1642 msgid "NAME" msgstr "名称" -#: ../clients/cli/connections.c:1527 +#: ../clients/cli/connections.c:1591 #, c-format msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s" msgstr "无效字段 \"%s\"；允许的字段为 %s 和 %s，或 %s,%s" -#: ../clients/cli/connections.c:1542 ../clients/cli/connections.c:1550 +#: ../clients/cli/connections.c:1606 ../clients/cli/connections.c:1614 #, c-format msgid "'%s' has to be alone" msgstr "\"%s\" 必须是单独的" -#: ../clients/cli/connections.c:1815 +#: ../clients/cli/connections.c:1876 #, c-format msgid "incorrect string '%s' of '--order' option" msgstr "\"--order\" 选项的字符串 \"%s\" 错误" -#: ../clients/cli/connections.c:1840 +#: ../clients/cli/connections.c:1901 #, c-format msgid "incorrect item '%s' in '--order' option" msgstr "\"--order\" 选项里有错误项 \"%s\"" -#: ../clients/cli/connections.c:1878 +#: ../clients/cli/connections.c:1939 msgid "No connection specified" msgstr "未指定连接" -#: ../clients/cli/connections.c:1889 +#: ../clients/cli/connections.c:1950 #, c-format msgid "%s argument is missing" msgstr "缺少 %s 参数" -#: ../clients/cli/connections.c:1907 +#: ../clients/cli/connections.c:1968 #, c-format msgid "unknown connection '%s'" msgstr "未知的连接 \"%s\"" -#: ../clients/cli/connections.c:1936 +#: ../clients/cli/connections.c:1997 msgid "'--order' argument is missing" msgstr "缺少 \"--order\" 参数" -#: ../clients/cli/connections.c:1997 +#: ../clients/cli/connections.c:2057 msgid "NetworkManager active profiles" msgstr "网络管理器活动的配置集" -#: ../clients/cli/connections.c:1998 +#: ../clients/cli/connections.c:2058 msgid "NetworkManager connection profiles" 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 +#: ../clients/cli/connections.c:2110 ../clients/cli/connections.c:2856 +#: ../clients/cli/connections.c:2868 ../clients/cli/connections.c:2880 +#: ../clients/cli/connections.c:3109 ../clients/cli/connections.c:8899 +#: ../clients/cli/connections.c:8915 ../clients/cli/devices.c:2976 +#: ../clients/cli/devices.c:2988 ../clients/cli/devices.c:3001 +#: ../clients/cli/devices.c:3195 ../clients/cli/devices.c:3206 +#: ../clients/cli/devices.c:3224 ../clients/cli/devices.c:3233 +#: ../clients/cli/devices.c:3254 ../clients/cli/devices.c:3265 +#: ../clients/cli/devices.c:3283 ../clients/cli/devices.c:3725 +#: ../clients/cli/devices.c:3735 ../clients/cli/devices.c:3743 +#: ../clients/cli/devices.c:3755 ../clients/cli/devices.c:3770 +#: ../clients/cli/devices.c:3778 ../clients/cli/devices.c:3952 +#: ../clients/cli/devices.c:3963 ../clients/cli/devices.c:4134 #, c-format msgid "Error: %s argument is missing." msgstr "错误：缺少 %s 参数。" -#: ../clients/cli/connections.c:2078 +#: ../clients/cli/connections.c:2138 #, c-format msgid "Error: %s - no such connection profile." msgstr "错误：%s - 没有这样的连接配置集。" -#: ../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 +#: ../clients/cli/connections.c:2229 ../clients/cli/connections.c:2843 +#: ../clients/cli/connections.c:2907 ../clients/cli/connections.c:8419 +#: ../clients/cli/connections.c:8525 ../clients/cli/connections.c:9015 +#: ../clients/cli/devices.c:1727 ../clients/cli/devices.c:1995 +#: ../clients/cli/devices.c:2168 ../clients/cli/devices.c:2276 +#: ../clients/cli/devices.c:2468 ../clients/cli/devices.c:3915 +#: ../clients/cli/devices.c:4140 ../clients/cli/general.c:895 #, c-format msgid "Error: %s." msgstr "错误：%s。" -#: ../clients/cli/connections.c:2262 +#: ../clients/cli/connections.c:2322 #, c-format msgid "no active connection on device '%s'" msgstr "设备 \"%s\" 上没有活动的连接" -#: ../clients/cli/connections.c:2270 +#: ../clients/cli/connections.c:2330 msgid "no active connection or device" msgstr "没有活动的连接或设备" -#: ../clients/cli/connections.c:2290 -#, c-format -msgid "device '%s' not compatible with connection '%s':" +#: ../clients/cli/connections.c:2350 +#, fuzzy, c-format +msgid "device '%s' not compatible with connection '%s': " msgstr "设备 \"%s\" 与连接 \"%s\" 不兼容：" -#: ../clients/cli/connections.c:2323 +#: ../clients/cli/connections.c:2383 #, c-format msgid "device '%s' not compatible with connection '%s'" msgstr "设备 \"%s\" 与连接 \"%s\" 不兼容" -#: ../clients/cli/connections.c:2326 +#: ../clients/cli/connections.c:2386 #, c-format msgid "no device found for connection '%s'" msgstr "没有找到可用于连接 \"%s\" 的设备" -#: ../clients/cli/connections.c:2358 +#: ../clients/cli/connections.c:2437 +#, c-format +msgid "Hint: use '%s' to get more details." +msgstr "" + +#: ../clients/cli/connections.c:2455 #, c-format msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n" msgstr "连接已成功激活（%s）（D-Bus 活动路径：%s）\n" -#: ../clients/cli/connections.c:2362 ../clients/cli/connections.c:2510 -#: ../clients/cli/connections.c:6590 +#: ../clients/cli/connections.c:2459 ../clients/cli/connections.c:2609 +#: ../clients/cli/connections.c:6716 #, c-format msgid "Connection successfully activated (D-Bus active path: %s)\n" msgstr "连接已成功激活（D-Bus 活动路径：%s）\n" -#: ../clients/cli/connections.c:2369 ../clients/cli/connections.c:2490 +#: ../clients/cli/connections.c:2466 ../clients/cli/connections.c:2588 #, c-format msgid "Error: Connection activation failed: %s" msgstr "错误：连接激活失败：%s" -#: ../clients/cli/connections.c:2405 +#: ../clients/cli/connections.c:2503 #, c-format msgid "Error: Timeout expired (%d seconds)" msgstr "错误：超时时间已到（%d 秒）" -#: ../clients/cli/connections.c:2572 +#: ../clients/cli/connections.c:2671 #, c-format msgid "failed to read passwd-file '%s': %s" msgstr "读取 passwd-file \"%s\" 失败：%s" -#: ../clients/cli/connections.c:2585 +#: ../clients/cli/connections.c:2684 #, c-format msgid "missing colon in 'password' entry '%s'" msgstr "\"password\" 条目 \"%s\" 缺失了冒号" -#: ../clients/cli/connections.c:2593 +#: ../clients/cli/connections.c:2692 #, c-format msgid "missing dot in 'password' entry '%s'" msgstr "\"password\" 条目 \"%s\" 缺失了点号" -#: ../clients/cli/connections.c:2606 +#: ../clients/cli/connections.c:2705 #, c-format msgid "invalid setting name in 'password' entry '%s'" msgstr "\"password\" 条目 \"%s\" 里出现无效的设置名称" -#: ../clients/cli/connections.c:2652 +#: ../clients/cli/connections.c:2759 #, c-format msgid "unknown device '%s'." msgstr "未知设备 \"%s\"。" -#: ../clients/cli/connections.c:2657 +#: ../clients/cli/connections.c:2764 msgid "neither a valid connection nor device given" msgstr "没有给定有效的连接或设备" -#: ../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 +#: ../clients/cli/connections.c:2890 ../clients/cli/devices.c:1686 +#: ../clients/cli/devices.c:3033 ../clients/cli/devices.c:3296 +#: ../clients/cli/devices.c:3969 #, c-format msgid "Unknown parameter: %s\n" msgstr "未知参数：%s\n" -#: ../clients/cli/connections.c:2808 +#: ../clients/cli/connections.c:2915 msgid "preparing" msgstr "准备中" -#: ../clients/cli/connections.c:2916 +#: ../clients/cli/connections.c:3024 #, c-format msgid "Connection '%s' (%s) successfully deleted.\n" msgstr "成功删除连接 \"%s\" (%s)。\n" -#: ../clients/cli/connections.c:2932 +#: ../clients/cli/connections.c:3040 #, c-format msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n" msgstr "" "成功停用连接 \"%s\"（D-Bus 活动路径：%s）\n" "\n" -#: ../clients/cli/connections.c:2981 ../clients/cli/connections.c:8439 -#: ../clients/cli/connections.c:8470 ../clients/cli/connections.c:8628 +#: ../clients/cli/connections.c:3091 ../clients/cli/connections.c:8633 +#: ../clients/cli/connections.c:8664 ../clients/cli/connections.c:8822 #, c-format msgid "Error: No connection specified." msgstr "错误：未指定连接。" -#: ../clients/cli/connections.c:3011 +#: ../clients/cli/connections.c:3121 #, c-format msgid "Error: '%s' is not an active connection.\n" msgstr "错误：\"%s\" 不是活动的连接。\n" -#: ../clients/cli/connections.c:3012 +#: ../clients/cli/connections.c:3122 #, c-format msgid "Error: not all active connections found." msgstr "错误：未找到所有的活动连接。" -#: ../clients/cli/connections.c:3020 +#: ../clients/cli/connections.c:3130 #, c-format msgid "Error: no active connection provided." msgstr "错误：未提供活动连接。" -#: ../clients/cli/connections.c:3051 +#: ../clients/cli/connections.c:3161 #, c-format msgid "Connection '%s' deactivation failed: %s\n" msgstr "错误：停用连接 \"%s\" 失败：%s\n" -#: ../clients/cli/connections.c:3302 ../clients/cli/connections.c:3359 +#: ../clients/cli/connections.c:3412 ../clients/cli/connections.c:3469 #: ../clients/common/nm-client-utils.c:221 #, c-format msgid "'%s' not among [%s]" msgstr "\"%s\" 不在 [%s] 中" #. We should not really come here -#: ../clients/cli/connections.c:3322 ../clients/cli/connections.c:3382 +#: ../clients/cli/connections.c:3432 ../clients/cli/connections.c:3492 #: ../clients/common/nm-client-utils.c:289 #, c-format msgid "Unknown error" msgstr "未知错误" -#: ../clients/cli/connections.c:3516 +#: ../clients/cli/connections.c:3626 #, c-format msgid "Warning: master='%s' doesn't refer to any existing profile.\n" msgstr "警告：master=\"%s\" 没有引用任何现有的配置集。\n" -#: ../clients/cli/connections.c:3865 +#: ../clients/cli/connections.c:3979 #, c-format msgid "Error: invalid property '%s': %s." msgstr "错误：无效的属性 \"%s\"：%s。" -#: ../clients/cli/connections.c:3882 +#: ../clients/cli/connections.c:3996 #, c-format msgid "Error: failed to modify %s.%s: %s." msgstr "错误：修改 %s.%s 失败：%s。" -#: ../clients/cli/connections.c:3902 +#: ../clients/cli/connections.c:4016 #, c-format msgid "Error: failed to remove a value from %s.%s: %s." msgstr "错误：从 %s.%s 删除值失败：%s。" -#: ../clients/cli/connections.c:3936 +#: ../clients/cli/connections.c:4050 #, c-format msgid "Error: '%s' is mandatory." msgstr "错误：设置 \"%s\" 是必填的。" -#: ../clients/cli/connections.c:3963 +#: ../clients/cli/connections.c:4077 #, c-format msgid "Error: invalid slave type; %s." msgstr "错误：无效的从属类型；%s。" -#: ../clients/cli/connections.c:3971 +#: ../clients/cli/connections.c:4085 #, c-format msgid "Error: invalid connection type; %s." msgstr "错误：无效的连接类型；%s。" -#: ../clients/cli/connections.c:4048 +#: ../clients/cli/connections.c:4162 #, c-format msgid "Error: bad connection type: %s" msgstr "错误：错误的连接类型：%s" -#: ../clients/cli/connections.c:4094 +#: ../clients/cli/connections.c:4208 #, c-format msgid "Error: '%s': %s" msgstr "错误：\"%s\"：%s" -#: ../clients/cli/connections.c:4115 +#: ../clients/cli/connections.c:4229 msgid "Error: master is required" msgstr "错误：需要主连接" -#: ../clients/cli/connections.c:4174 +#: ../clients/cli/connections.c:4288 #, c-format msgid "Error: error adding bond option '%s=%s'." msgstr "错误：添加绑定（bond）选项 \"%s=%s\" 时出错。" -#: ../clients/cli/connections.c:4205 +#: ../clients/cli/connections.c:4319 #, c-format msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n" msgstr "错误：\"%s\" 不是有效的监视模式；使用 \"%s\" 或 \"%s\"。\n" -#: ../clients/cli/connections.c:4236 +#: ../clients/cli/connections.c:4350 #, c-format msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]." msgstr "错误：\"bt-type\"：\"%s\" 无效；使用 [%s, %s, %s (%s), %s]。" -#: ../clients/cli/connections.c:4485 +#: ../clients/cli/connections.c:4599 #, c-format msgid "Error: value for '%s' is missing." msgstr "错误：缺少 \"%s\" 的值。" -#: ../clients/cli/connections.c:4531 +#: ../clients/cli/connections.c:4645 msgid "Error: <setting>.<property> argument is missing." msgstr "错误：缺少 <设置>.<属性> 参数。" -#: ../clients/cli/connections.c:4554 +#: ../clients/cli/connections.c:4668 #, c-format msgid "Error: invalid or not allowed setting '%s': %s." msgstr "错误：无效或不允许的设置 \"%s\"：%s。" -#: ../clients/cli/connections.c:4600 ../clients/cli/connections.c:4616 +#: ../clients/cli/connections.c:4714 ../clients/cli/connections.c:4730 #, c-format msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)." msgstr "错误：\"%s\" 不明确（%s.%s 或 %s.%s）。" -#: ../clients/cli/connections.c:4634 +#: ../clients/cli/connections.c:4748 #, c-format msgid "Error: invalid <setting>.<property> '%s'." msgstr "错误：无效的 <设置>.<属性> \"%s\"。" -#: ../clients/cli/connections.c:4678 ../clients/cli/connections.c:8272 +#: ../clients/cli/connections.c:4792 ../clients/cli/connections.c:8465 #, c-format msgid "Error: Failed to add '%s' connection: %s" msgstr "错误：添加 \"%s\" 连接失败：%s" -#: ../clients/cli/connections.c:4696 +#: ../clients/cli/connections.c:4810 #, c-format msgid "" "Warning: There is another connection with the name '%1$s'. Reference the " @@ -1308,66 +1328,66 @@ msgid_plural "" msgstr[0] "" "警告：存在 %3$u 条名为 \"%1$s\" 的其他连接。可由它的 uuid \"%2$s\" 引用\n" -#: ../clients/cli/connections.c:4705 +#: ../clients/cli/connections.c:4819 #, c-format msgid "Connection '%s' (%s) successfully added.\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/cli/connections.c:4872 ../clients/cli/connections.c:6839 +#: ../clients/cli/connections.c:6840 ../clients/cli/devices.c:535 +#: ../clients/cli/devices.c:542 ../clients/cli/devices.c:1207 +#: ../clients/cli/general.c:136 ../clients/cli/utils.h:296 #: ../clients/common/nm-client-utils.c:279 -#: ../clients/common/nm-meta-setting-desc.c:754 -#: ../clients/common/nm-meta-setting-desc.c:2702 +#: ../clients/common/nm-meta-setting-desc.c:771 +#: ../clients/common/nm-meta-setting-desc.c:2752 msgid "no" msgstr "否" -#: ../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/cli/connections.c:4873 ../clients/cli/connections.c:6839 +#: ../clients/cli/connections.c:6840 ../clients/cli/devices.c:534 +#: ../clients/cli/devices.c:541 ../clients/cli/devices.c:1207 +#: ../clients/cli/general.c:135 ../clients/cli/utils.h:296 #: ../clients/common/nm-client-utils.c:278 -#: ../clients/common/nm-meta-setting-desc.c:754 -#: ../clients/common/nm-meta-setting-desc.c:2699 +#: ../clients/common/nm-meta-setting-desc.c:771 +#: ../clients/common/nm-meta-setting-desc.c:2749 msgid "yes" msgstr "是" -#: ../clients/cli/connections.c:4845 +#: ../clients/cli/connections.c:4959 #, c-format msgid "" "You can specify this option more than once. Press <Enter> when you're done.\n" msgstr "您可以多次指定此选项。按下 <回车键> 以完成。\n" #. Ask for optional arguments. -#: ../clients/cli/connections.c:4944 +#: ../clients/cli/connections.c:5061 #, c-format msgid "There is %d optional setting for %s.\n" msgid_plural "There are %d optional settings for %s.\n" msgstr[0] "%2$s 有 %1$d 个可选的设置。\n" -#: ../clients/cli/connections.c:4947 +#: ../clients/cli/connections.c:5067 #, 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:5080 ../clients/cli/utils.c:294 +#: ../clients/cli/connections.c:5200 ../clients/cli/utils.c:295 #, c-format msgid "Error: value for '%s' argument is required." msgstr "错误：需要 \"%s\" 参数的值。" -#: ../clients/cli/connections.c:5087 +#: ../clients/cli/connections.c:5207 #, c-format msgid "Error: 'save': %s." msgstr "错误：\"save\"：%s。" -#: ../clients/cli/connections.c:5173 ../clients/cli/connections.c:5184 +#: ../clients/cli/connections.c:5293 ../clients/cli/connections.c:5304 #, c-format msgid "Error: '%s' argument is required." msgstr "错误：需要 \"%s\" 参数。" -#: ../clients/cli/connections.c:6149 +#: ../clients/cli/connections.c:6269 #, c-format msgid "['%s' setting values]\n" msgstr "[\"%s\" 设置值]\n" @@ -1375,7 +1395,7 @@ msgstr "[\"%s\" 设置值]\n" #. TRANSLATORS: do not translate command names and keywords before :: #. * However, you should translate terms enclosed in <>. #. -#: ../clients/cli/connections.c:6258 +#: ../clients/cli/connections.c:6378 #, c-format msgid "" "---[ Main menu ]---\n" @@ -1407,7 +1427,7 @@ msgstr "" "nmcli <配置选项> <值> :: nmcli configuration\n" "quit :: 退出 nmcli\n" -#: ../clients/cli/connections.c:6285 +#: ../clients/cli/connections.c:6405 #, c-format msgid "" "goto <setting>[.<prop>] | <prop> :: enter setting/property for editing\n" @@ -1426,7 +1446,7 @@ msgstr "" " nmcli connection> goto secondaries\n" " nmcli> goto ipv4.addresses\n" -#: ../clients/cli/connections.c:6292 +#: ../clients/cli/connections.c:6412 #, c-format msgid "" "remove <setting>[.<prop>] :: remove setting or reset property value\n" @@ -1445,7 +1465,7 @@ msgstr "" "示例：nmcli> remove wifi-sec\n" " nmcli> remove eth.mtu\n" -#: ../clients/cli/connections.c:6299 +#: ../clients/cli/connections.c:6419 #, c-format msgid "" "set [<setting>.<prop> <value>] :: set property value\n" @@ -1460,7 +1480,7 @@ msgstr "" "\n" "示例：nmcli> set con.id 我的连接\n" -#: ../clients/cli/connections.c:6304 +#: ../clients/cli/connections.c:6424 #, c-format msgid "" "describe [<setting>.<prop>] :: describe property\n" @@ -1473,7 +1493,7 @@ msgstr "" "显示属性描述。您可以参阅 nm-settings(5) 手册页来查看全部的网络管理器" "（NetworkManager）设置和属性。\n" -#: ../clients/cli/connections.c:6309 +#: ../clients/cli/connections.c:6429 #, c-format msgid "" "print [all] :: print setting or connection values\n" @@ -1488,7 +1508,7 @@ msgstr "" "\n" "示例：nmcli ipv4> print all\n" -#: ../clients/cli/connections.c:6314 +#: ../clients/cli/connections.c:6434 #, c-format msgid "" "verify [all | fix] :: verify setting or connection validity\n" @@ -1512,7 +1532,7 @@ msgstr "" " nmcli> verify fix\n" " nmcli bond> verify\n" -#: ../clients/cli/connections.c:6323 +#: ../clients/cli/connections.c:6443 #, c-format msgid "" "save [persistent|temporary] :: save the connection\n" @@ -1538,7 +1558,7 @@ msgstr "" "删\n" "除永久性连接，连接配置集就必须被删除。\n" -#: ../clients/cli/connections.c:6334 +#: ../clients/cli/connections.c:6454 #, c-format msgid "" "activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n" @@ -1559,7 +1579,7 @@ msgstr "" "/<ap>|<nsp> - AP (Wi-Fi) 或者 NSP (WiMAX)（未指定 <接口名> 时前置 / 符" "号。）\n" -#: ../clients/cli/connections.c:6341 ../clients/cli/connections.c:6499 +#: ../clients/cli/connections.c:6461 ../clients/cli/connections.c:6619 #, c-format msgid "" "back :: go to upper menu level\n" @@ -1568,7 +1588,7 @@ msgstr "" "back :: 转到上层菜单\n" "\n" -#: ../clients/cli/connections.c:6344 +#: ../clients/cli/connections.c:6464 #, c-format msgid "" "help/? [<command>] :: help for the nmcli commands\n" @@ -1577,7 +1597,7 @@ msgstr "" "help/? [<命令>] :: nmcli 命令的帮助\n" "\n" -#: ../clients/cli/connections.c:6347 +#: ../clients/cli/connections.c:6467 #, c-format msgid "" "nmcli [<conf-option> <value>] :: nmcli configuration\n" @@ -1604,7 +1624,7 @@ msgstr "" " nmcli> nmcli save-confirmation no\n" " nmcli> nmcli prompt-color 3\n" -#: ../clients/cli/connections.c:6369 ../clients/cli/connections.c:6505 +#: ../clients/cli/connections.c:6489 ../clients/cli/connections.c:6625 #, c-format msgid "" "quit :: exit nmcli\n" @@ -1616,8 +1636,8 @@ msgstr "" "\n" "此命令用于退出 nmcli。当被编辑的连接没有保存时，会询问用户确定操作。\n" -#: ../clients/cli/connections.c:6374 ../clients/cli/connections.c:6510 -#: ../clients/cli/connections.c:6929 ../clients/cli/connections.c:7856 +#: ../clients/cli/connections.c:6494 ../clients/cli/connections.c:6630 +#: ../clients/cli/connections.c:7065 ../clients/cli/connections.c:8048 #, c-format msgid "Unknown command: '%s'\n" msgstr "未知命令：\"%s\"\n" @@ -1625,7 +1645,7 @@ msgstr "未知命令：\"%s\"\n" #. TRANSLATORS: do not translate command names and keywords before :: #. * However, you should translate terms enclosed in <>. #. -#: ../clients/cli/connections.c:6439 +#: ../clients/cli/connections.c:6559 #, c-format msgid "" "---[ Property menu ]---\n" @@ -1651,7 +1671,7 @@ msgstr "" "help/? [<命令>] :: 输出该帮助或命令描述\n" "quit :: 退出 nmcli\n" -#: ../clients/cli/connections.c:6464 +#: ../clients/cli/connections.c:6584 #, c-format msgid "" "set [<value>] :: set new value\n" @@ -1662,7 +1682,7 @@ msgstr "" "\n" "此命令用于设置提供的 <值> 到该属性\n" -#: ../clients/cli/connections.c:6468 +#: ../clients/cli/connections.c:6588 #, c-format msgid "" "add [<value>] :: append new value to the property\n" @@ -1677,7 +1697,7 @@ msgstr "" "会替换该值（和 \"set\" 一样）。\n" "\n" -#: ../clients/cli/connections.c:6474 +#: ../clients/cli/connections.c:6594 #, c-format msgid "" "change :: change current value\n" @@ -1688,7 +1708,7 @@ msgstr "" "\n" "显示当前值并允许编辑它。\n" -#: ../clients/cli/connections.c:6478 +#: ../clients/cli/connections.c:6598 #, c-format msgid "" "remove [<value>|<index>|<option name>] :: delete the value\n" @@ -1720,7 +1740,7 @@ msgstr "" " nmcli bond.options> remove downdelay\n" "\n" -#: ../clients/cli/connections.c:6489 +#: ../clients/cli/connections.c:6609 #, c-format msgid "" "describe :: describe property\n" @@ -1733,7 +1753,7 @@ msgstr "" "显示属性描述。您可以参阅 nm-settings(5) 手册页来查看所有的网络管理器" "（NetworkManager）设置和属性。\n" -#: ../clients/cli/connections.c:6494 +#: ../clients/cli/connections.c:6614 #, c-format msgid "" "print [property|setting|connection] :: print property (setting, connection) " @@ -1746,7 +1766,7 @@ msgstr "" "\n" "显示属性。提供参数您也可以显示整个设置或连接的值。\n" -#: ../clients/cli/connections.c:6502 +#: ../clients/cli/connections.c:6622 #, c-format msgid "" "help/? [<command>] :: help for nmcli commands\n" @@ -1755,28 +1775,28 @@ msgstr "" "help/? [<命令>] :: nmcli 命令的帮助\n" "\n" -#: ../clients/cli/connections.c:6596 +#: ../clients/cli/connections.c:6722 #, c-format msgid "Error: Connection activation failed.\n" msgstr "错误：连接激活失败。\n" -#: ../clients/cli/connections.c:6687 +#: ../clients/cli/connections.c:6819 #, c-format msgid "Error: setting '%s' is mandatory and cannot be removed.\n" msgstr "错误：设置 \"%s\" 是必填的而且无法移除。\n" #. TRANSLATORS: status line in nmcli connection editor -#: ../clients/cli/connections.c:6705 +#: ../clients/cli/connections.c:6837 #, c-format msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n" msgstr "[ 类型：%s | 名称：%s | UUID：%s | 变动：%s | 临时：%s ]\n" -#: ../clients/cli/connections.c:6741 +#: ../clients/cli/connections.c:6873 #, c-format msgid "The connection is not saved. Do you really want to quit? %s" msgstr "连接未保存。您真的要退出吗？%s" -#: ../clients/cli/connections.c:6787 +#: ../clients/cli/connections.c:6915 #, c-format msgid "" "The connection profile has been removed from another client. You may type " @@ -1784,66 +1804,66 @@ msgid "" msgstr "" "此连接配置集已被其他客户端移除了。您可以在主菜单中输入 \"save\" 来还原它。\n" -#: ../clients/cli/connections.c:6818 ../clients/cli/connections.c:7210 -#: ../clients/cli/connections.c:7268 +#: ../clients/cli/connections.c:6949 ../clients/cli/connections.c:7364 +#: ../clients/cli/connections.c:7424 #, c-format msgid "Allowed values for '%s' property: %s\n" msgstr "\"%s\" 属性允许的值：%s\n" -#: ../clients/cli/connections.c:6821 ../clients/cli/connections.c:7213 -#: ../clients/cli/connections.c:7271 +#: ../clients/cli/connections.c:6953 ../clients/cli/connections.c:7368 +#: ../clients/cli/connections.c:7428 #, c-format msgid "Enter '%s' value: " msgstr "输入 \"%s\" 值：" -#: ../clients/cli/connections.c:6835 ../clients/cli/connections.c:6855 -#: ../clients/cli/connections.c:7217 ../clients/cli/connections.c:7276 +#: ../clients/cli/connections.c:6968 ../clients/cli/connections.c:6990 +#: ../clients/cli/connections.c:7373 ../clients/cli/connections.c:7434 #, c-format msgid "Error: failed to set '%s' property: %s\n" msgstr "错误：设置 \"%s\" 属性失败：%s\n" -#: ../clients/cli/connections.c:6849 +#: ../clients/cli/connections.c:6983 #, c-format msgid "Edit '%s' value: " msgstr "编辑 \"%s\" 值：" -#: ../clients/cli/connections.c:6875 ../clients/cli/settings.c:394 +#: ../clients/cli/connections.c:7012 ../clients/cli/settings.c:395 #, c-format msgid "Error: %s\n" msgstr "错误：%s\n" -#: ../clients/cli/connections.c:6881 ../clients/cli/connections.c:7371 -#: ../clients/cli/connections.c:7422 +#: ../clients/cli/connections.c:7017 ../clients/cli/connections.c:7532 +#: ../clients/cli/connections.c:7583 #, c-format msgid "Error: failed to remove value of '%s': %s\n" msgstr "错误：移除 \"%s\" 的值失败：%s\n" -#: ../clients/cli/connections.c:6902 +#: ../clients/cli/connections.c:7038 #, c-format msgid "Unknown command argument: '%s'\n" msgstr "未知的命令参数：\"%s\"\n" -#: ../clients/cli/connections.c:6992 +#: ../clients/cli/connections.c:7129 #, c-format msgid "Available settings: %s\n" msgstr "有效设置：%s\n" -#: ../clients/cli/connections.c:7004 +#: ../clients/cli/connections.c:7141 #, c-format msgid "Error: invalid setting name; %s\n" msgstr "错误：无效的设置名称；%s\n" -#: ../clients/cli/connections.c:7021 +#: ../clients/cli/connections.c:7159 #, c-format msgid "Available properties: %s\n" msgstr "有效属性：%s\n" -#: ../clients/cli/connections.c:7029 +#: ../clients/cli/connections.c:7167 #, c-format msgid "Error: property %s\n" msgstr "错误：属性 %s\n" -#: ../clients/cli/connections.c:7070 +#: ../clients/cli/connections.c:7212 #, c-format msgid "" "Saving the connection with 'autoconnect=yes'. That might result in an " @@ -1853,418 +1873,423 @@ msgstr "" "使用 \"autoconnect=yes\" 保存该连接。这样会立即激活该连接。\n" "您仍要保存吗？ %s" -#: ../clients/cli/connections.c:7149 +#: ../clients/cli/connections.c:7298 #, c-format msgid "You may edit the following settings: %s\n" msgstr "您可编辑下列设置：%s\n" -#: ../clients/cli/connections.c:7178 +#: ../clients/cli/connections.c:7329 #, c-format msgid "" "The connection profile has been removed from another client. You may type " "'save' to restore it.\n" msgstr "此连接配置集已被其他客户端移除了。您可以输入 \"save\" 来还原它。\n" -#: ../clients/cli/connections.c:7221 ../clients/cli/connections.c:7466 -#: ../clients/cli/connections.c:7498 +#: ../clients/cli/connections.c:7377 ../clients/cli/connections.c:7628 +#: ../clients/cli/connections.c:7660 #, c-format msgid "Error: no setting selected; valid are [%s]\n" msgstr "错误：未选择设置；有效的为 [%s]\n" -#: ../clients/cli/connections.c:7222 +#: ../clients/cli/connections.c:7378 #, c-format msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n" msgstr "先使用 \"goto <设置>\"，或 \"set <设置>.<属性>\"\n" -#: ../clients/cli/connections.c:7237 ../clients/cli/connections.c:7398 -#: ../clients/cli/connections.c:7488 +#: ../clients/cli/connections.c:7393 ../clients/cli/connections.c:7559 +#: ../clients/cli/connections.c:7650 #, c-format msgid "Error: invalid setting argument '%s'; valid are [%s]\n" msgstr "错误：无效的设置参数 \"%s\"；有效的为 [%s]\n" -#: ../clients/cli/connections.c:7246 +#: ../clients/cli/connections.c:7402 #, c-format msgid "Error: missing setting for '%s' property\n" msgstr "错误：缺少 \"%s\" 属性的设置\n" -#: ../clients/cli/connections.c:7253 +#: ../clients/cli/connections.c:7409 #, c-format msgid "Error: invalid property: %s\n" msgstr "错误：无效的属性：%s\n" -#: ../clients/cli/connections.c:7307 +#: ../clients/cli/connections.c:7466 #, c-format msgid "Error: unknown setting '%s'\n" msgstr "错误：未知的设置 \"%s\"\n" -#: ../clients/cli/connections.c:7332 +#: ../clients/cli/connections.c:7491 #, c-format msgid "You may edit the following properties: %s\n" msgstr "您可以编辑下列属性：%s\n" -#: ../clients/cli/connections.c:7376 +#: ../clients/cli/connections.c:7537 #, c-format msgid "Error: no argument given; valid are [%s]\n" msgstr "错误：未给定参数：有效的为 [%s]\n" -#: ../clients/cli/connections.c:7395 +#: ../clients/cli/connections.c:7556 #, c-format msgid "Setting '%s' is not present in the connection.\n" msgstr "设置 \"%s\" 在连接里未提供。\n" -#: ../clients/cli/connections.c:7443 +#: ../clients/cli/connections.c:7604 #, c-format msgid "Error: %s properties, nor it is a setting name.\n" msgstr "错误：%s 属性，也不是设置名称。\n" -#: ../clients/cli/connections.c:7467 ../clients/cli/connections.c:7499 +#: ../clients/cli/connections.c:7629 ../clients/cli/connections.c:7661 #, c-format msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n" msgstr "先使用 \"goto <设置>\"，或 \"describe <设置>.<属性>\"\n" -#: ../clients/cli/connections.c:7522 +#: ../clients/cli/connections.c:7684 #, c-format msgid "Error: invalid property: %s, neither a valid setting name.\n" msgstr "错误：无效的属性：%s，也不是有效的设置名称。\n" -#: ../clients/cli/connections.c:7552 +#: ../clients/cli/connections.c:7714 #, c-format msgid "Error: unknown setting: '%s'\n" msgstr "错误：未知的设置：\"%s\"\n" -#: ../clients/cli/connections.c:7557 +#: ../clients/cli/connections.c:7719 #, c-format msgid "Error: '%s' setting not present in the connection\n" msgstr "错误：设置 \"%s\" 在连接里未提供。\n" -#: ../clients/cli/connections.c:7588 +#: ../clients/cli/connections.c:7750 #, c-format msgid "Error: invalid property: %s%s\n" msgstr "错误：无效的属性：%s%s\n" -#: ../clients/cli/connections.c:7590 +#: ../clients/cli/connections.c:7752 msgid ", neither a valid setting name" msgstr "，也不是有效的设置名称" -#: ../clients/cli/connections.c:7606 +#: ../clients/cli/connections.c:7768 #, c-format msgid "Invalid verify option: %s\n" msgstr "无效的验证选项：%s\n" -#: ../clients/cli/connections.c:7614 +#: ../clients/cli/connections.c:7776 #, c-format msgid "Verify setting '%s': %s\n" msgstr "验证设置 \"%s\"：%s\n" -#: ../clients/cli/connections.c:7629 +#: ../clients/cli/connections.c:7791 #, c-format msgid "Verify connection: %s\n" msgstr "验证连接：%s\n" -#: ../clients/cli/connections.c:7632 +#: ../clients/cli/connections.c:7794 #, c-format msgid "The error cannot be fixed automatically.\n" msgstr "错误无法自动修复。\n" -#: ../clients/cli/connections.c:7649 +#: ../clients/cli/connections.c:7815 #, c-format msgid "Error: invalid argument '%s'\n" msgstr "错误：无效的参数 \"%s\"\n" -#: ../clients/cli/connections.c:7681 +#: ../clients/cli/connections.c:7867 #, c-format msgid "Error: Failed to save '%s' (%s) connection: %s\n" msgstr "错误：保存 \"%s\" (%s) 连接失败：%s\n" -#: ../clients/cli/connections.c:7688 +#: ../clients/cli/connections.c:7873 +#, fuzzy, c-format +msgid "Error: Timeout saving '%s' (%s) connection\n" +msgstr "错误：保存 \"%s\" (%s) 连接失败：%s\n" + +#: ../clients/cli/connections.c:7878 #, c-format msgid "Connection '%s' (%s) successfully saved.\n" msgstr "连接 \"%s\" (%s) 已成功保存。\n" -#: ../clients/cli/connections.c:7689 +#: ../clients/cli/connections.c:7879 #, c-format msgid "Connection '%s' (%s) successfully updated.\n" msgstr "成功地更新了连接 \"%s\" (%s)。\n" -#: ../clients/cli/connections.c:7721 +#: ../clients/cli/connections.c:7912 #, c-format msgid "Error: connection verification failed: %s\n" msgstr "错误：连接验证失败：%s。\n" -#: ../clients/cli/connections.c:7722 +#: ../clients/cli/connections.c:7913 msgid "(unknown error)" msgstr "（未知错误）" -#: ../clients/cli/connections.c:7723 +#: ../clients/cli/connections.c:7914 #, c-format msgid "You may try running 'verify fix' to fix errors.\n" msgstr "您可以运行 \"verify fix\" 来修复错误。\n" -#: ../clients/cli/connections.c:7745 +#: ../clients/cli/connections.c:7936 #, c-format msgid "Error: connection is not saved. Type 'save' first.\n" msgstr "错误：连接还未保存。先输入 \"save\"。\n" -#: ../clients/cli/connections.c:7749 +#: ../clients/cli/connections.c:7940 #, c-format msgid "Error: connection is not valid: %s\n" msgstr "错误：连接是无效的：%s\n" -#: ../clients/cli/connections.c:7759 +#: ../clients/cli/connections.c:7950 #, c-format msgid "Error: Cannot activate connection: %s.\n" msgstr "错误：无法激活连接：%s。\n" -#: ../clients/cli/connections.c:7768 +#: ../clients/cli/connections.c:7959 #, c-format msgid "Error: Failed to activate '%s' (%s) connection: %s\n" msgstr "错误：激活 \"%s\" (%s) 连接失败：%s\n" -#: ../clients/cli/connections.c:7774 +#: ../clients/cli/connections.c:7966 msgid "Monitoring connection activation (press any key to continue)\n" msgstr "正在监视连接激活（按任意键继续）\n" # 具体的选项名，不需翻译，下同 -#: ../clients/cli/connections.c:7810 +#: ../clients/cli/connections.c:8002 #, c-format msgid "Error: status-line: %s\n" msgstr "错误：status-line：%s\n" -#: ../clients/cli/connections.c:7818 +#: ../clients/cli/connections.c:8010 #, c-format msgid "Error: save-confirmation: %s\n" msgstr "错误：save-confirmation：%s\n" -#: ../clients/cli/connections.c:7826 +#: ../clients/cli/connections.c:8018 #, c-format msgid "Error: show-secrets: %s\n" msgstr "错误：show-secrets：%s\n" -#: ../clients/cli/connections.c:7833 +#: ../clients/cli/connections.c:8025 #, c-format msgid "Current nmcli configuration:\n" msgstr "当前 nmcli 配置：\n" -#: ../clients/cli/connections.c:7841 +#: ../clients/cli/connections.c:8033 #, c-format msgid "Invalid configuration option '%s'; allowed [%s]\n" msgstr "无效的配置选项 \"%s\"；允许 [%s]\n" -#: ../clients/cli/connections.c:8059 +#: ../clients/cli/connections.c:8251 #, c-format msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided." msgstr "错误：只能提供 \"id\"、\"filename\"、\"uuid\" 或 \"path\" 之一。" -#: ../clients/cli/connections.c:8073 ../clients/cli/connections.c:8233 +#: ../clients/cli/connections.c:8265 ../clients/cli/connections.c:8426 #, c-format msgid "Error: Unknown connection '%s'." msgstr "错误：未知连接 \"%s\"。" -#: ../clients/cli/connections.c:8089 +#: ../clients/cli/connections.c:8281 #, c-format msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n" msgstr "警告：正在编辑已有的连接 \"%s\"；\"type\" 参数已忽略\n" -#: ../clients/cli/connections.c:8092 +#: ../clients/cli/connections.c:8284 #, c-format msgid "" "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n" msgstr "警告：正在编辑已有的连接 \"%s\"；\"con-name\" 参数已忽略\n" -#: ../clients/cli/connections.c:8119 +#: ../clients/cli/connections.c:8311 #, c-format msgid "Valid connection types: %s\n" msgstr "有效的连接类型：%s\n" -#: ../clients/cli/connections.c:8121 +#: ../clients/cli/connections.c:8313 #, c-format msgid "Error: invalid connection type; %s\n" msgstr "错误：无效的连接类型；%s\n" -#: ../clients/cli/connections.c:8156 +#: ../clients/cli/connections.c:8349 #, c-format msgid "===| nmcli interactive connection editor |===" msgstr "===| nmcli 交互式连接编辑器 |===" -#: ../clients/cli/connections.c:8159 +#: ../clients/cli/connections.c:8352 #, c-format msgid "Editing existing '%s' connection: '%s'" msgstr "正在编辑已有的连接 \"%s\"：\"%s\"" -#: ../clients/cli/connections.c:8161 +#: ../clients/cli/connections.c:8354 #, c-format msgid "Adding a new '%s' connection" msgstr "正在添加新的 \"%s\" 连接" -#: ../clients/cli/connections.c:8163 +#: ../clients/cli/connections.c:8356 #, c-format msgid "Type 'help' or '?' for available commands." msgstr "输入 \"help\" 或 \"?\" 查看可用的命令。" -#: ../clients/cli/connections.c:8165 +#: ../clients/cli/connections.c:8358 #, c-format msgid "Type 'print' to show all the connection properties." msgstr "输入 \"print\" 来显示所有的连接属性。" -#: ../clients/cli/connections.c:8167 +#: ../clients/cli/connections.c:8360 #, c-format msgid "Type 'describe [<setting>.<prop>]' for detailed property description." msgstr "输入 \"describe [<设置>.<属性>]\" 来获得详细的属性描述。" -#: ../clients/cli/connections.c:8195 +#: ../clients/cli/connections.c:8388 #, c-format msgid "Error: Failed to modify connection '%s': %s" msgstr "错误：修改连接 \"%s\" 失败：%s" -#: ../clients/cli/connections.c:8201 +#: ../clients/cli/connections.c:8394 #, c-format msgid "Connection '%s' (%s) successfully modified.\n" msgstr "连接 \"%s\" (%s) 已成功修改。\n" -#: ../clients/cli/connections.c:8277 +#: ../clients/cli/connections.c:8470 #, c-format msgid "%s (%s) cloned as %s (%s).\n" msgstr "%s (%s) 已克隆为 %s (%s)。\n" -#: ../clients/cli/connections.c:8342 +#: ../clients/cli/connections.c:8536 msgid "New connection name: " msgstr "新连接名称：" -#: ../clients/cli/connections.c:8344 +#: ../clients/cli/connections.c:8538 #, c-format msgid "Error: <new name> argument is missing." msgstr "错误：缺少 <新名称> 参数。" -#: ../clients/cli/connections.c:8349 ../clients/cli/connections.c:8829 +#: ../clients/cli/connections.c:8543 ../clients/cli/connections.c:9026 #, c-format msgid "Error: unknown extra argument: '%s'." msgstr "错误：未知的额外参数：\"%s\"。" -#: ../clients/cli/connections.c:8394 +#: ../clients/cli/connections.c:8588 #, c-format msgid "Error: not all connections deleted." msgstr "错误：未删除所有的连接。" -#: ../clients/cli/connections.c:8395 +#: ../clients/cli/connections.c:8589 #, c-format msgid "Error: Connection deletion failed: %s" msgstr "错误：连接删除失败：%s" -#: ../clients/cli/connections.c:8451 ../clients/cli/connections.c:8572 +#: ../clients/cli/connections.c:8645 ../clients/cli/connections.c:8766 #, c-format msgid "Error: %s.\n" msgstr "错误：%s。\n" -#: ../clients/cli/connections.c:8452 ../clients/cli/connections.c:8573 +#: ../clients/cli/connections.c:8646 ../clients/cli/connections.c:8767 #, c-format msgid "Error: not all connections found." msgstr "错误：未找到所有连接。" #. truncate trailing ", " -#: ../clients/cli/connections.c:8503 +#: ../clients/cli/connections.c:8697 #, c-format msgid "Error: cannot delete unknown connection(s): %s." msgstr "错误：无法删除未知连接：%s。" -#: ../clients/cli/connections.c:8513 +#: ../clients/cli/connections.c:8707 #, c-format msgid "%s: connection profile changed\n" msgstr "%s：连接配置集已改动\n" -#: ../clients/cli/connections.c:8539 +#: ../clients/cli/connections.c:8733 #, c-format msgid "%s: connection profile created\n" msgstr "%s：连接配置集已创建\n" -#: ../clients/cli/connections.c:8548 +#: ../clients/cli/connections.c:8742 #, c-format msgid "%s: connection profile removed\n" msgstr "%s：连接配置集已移除\n" -#: ../clients/cli/connections.c:8610 +#: ../clients/cli/connections.c:8804 #, c-format msgid "Error: failed to reload connections: %s." msgstr "错误：重新加载连接失败：%s。" -#: ../clients/cli/connections.c:8643 +#: ../clients/cli/connections.c:8837 #, c-format msgid "Error: failed to load connection: %s." msgstr "错误：加载连接失败：%s。" -#: ../clients/cli/connections.c:8651 +#: ../clients/cli/connections.c:8845 #, c-format msgid "Could not load file '%s'\n" msgstr "无法加载文件 \"%s\"\n" -#: ../clients/cli/connections.c:8658 +#: ../clients/cli/connections.c:8852 msgid "File to import: " msgstr "要导入的文件：" -#: ../clients/cli/connections.c:8689 +#: ../clients/cli/connections.c:8886 #, c-format msgid "Error: No arguments provided." msgstr "错误：未提供参数。" -#: ../clients/cli/connections.c:8712 +#: ../clients/cli/connections.c:8909 #, c-format msgid "Warning: 'type' already specified, ignoring extra one.\n" msgstr "警告：已指定 \"type\"，忽略额外的参数。\n" -#: ../clients/cli/connections.c:8726 +#: ../clients/cli/connections.c:8923 #, c-format msgid "Warning: 'file' already specified, ignoring extra one.\n" msgstr "警告：已指定 \"file\"，忽略额外的参数。\n" -#: ../clients/cli/connections.c:8728 +#: ../clients/cli/connections.c:8925 #, c-format msgid "Unknown parameter: %s" msgstr "未知参数：%s" -#: ../clients/cli/connections.c:8739 +#: ../clients/cli/connections.c:8936 #, c-format msgid "Error: 'type' argument is required." msgstr "错误：需要 \"type\" 参数。" -#: ../clients/cli/connections.c:8743 +#: ../clients/cli/connections.c:8940 #, c-format msgid "Error: 'file' argument is required." msgstr "错误：需要 \"file\" 参数。" -#: ../clients/cli/connections.c:8749 +#: ../clients/cli/connections.c:8946 #, c-format msgid "Error: failed to find VPN plugin for %s." msgstr "错误：查找用于 %s 的 VPN 插件失败。" -#: ../clients/cli/connections.c:8756 ../clients/cli/connections.c:8848 +#: ../clients/cli/connections.c:8953 ../clients/cli/connections.c:9047 #, c-format msgid "Error: failed to load VPN plugin: %s." msgstr "错误：加载 VPN 插件失败：%s。" -#: ../clients/cli/connections.c:8763 +#: ../clients/cli/connections.c:8960 #, c-format msgid "Error: failed to import '%s': %s." msgstr "错误：导入 \"%s\" 失败失败失败失败失败失败失败失败失败失败失败：%s。" -#: ../clients/cli/connections.c:8835 +#: ../clients/cli/connections.c:9033 msgid "Output file name: " msgstr "输出文件名称：" -#: ../clients/cli/connections.c:8839 +#: ../clients/cli/connections.c:9038 #, c-format msgid "Error: the connection is not VPN." msgstr "错误：连接不是 VPN。" -#: ../clients/cli/connections.c:8861 +#: ../clients/cli/connections.c:9060 #, c-format msgid "Error: failed to create temporary file %s." msgstr "错误：创建临时文件 %s 失败。" -#: ../clients/cli/connections.c:8869 +#: ../clients/cli/connections.c:9068 #, c-format msgid "Error: failed to export '%s': %s." msgstr "错误：导出 \"%s\" 失败：%s。" -#: ../clients/cli/connections.c:8881 +#: ../clients/cli/connections.c:9080 #, c-format msgid "Error: failed to read temporary file '%s': %s." msgstr "错误：读取临时文件 \"%s\" 失败：%s。" @@ -2278,30 +2303,30 @@ msgstr "接口：" msgid "Interface(s): " msgstr "接口：" -#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1266 +#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1235 msgid "(none)" msgstr "（无）" -#: ../clients/cli/devices.c:175 ../clients/cli/devices.c:182 +#: ../clients/cli/devices.c:184 ../clients/cli/devices.c:191 msgid "(unknown)" msgstr "（未知）" -#: ../clients/cli/devices.c:316 +#: ../clients/cli/devices.c:339 #, c-format msgid "<invisible> | %s" msgstr "<不可见> | %s" -#: ../clients/cli/devices.c:317 +#: ../clients/cli/devices.c:340 msgid "<invisible>" msgstr "<不可见>" -#: ../clients/cli/devices.c:418 +#: ../clients/cli/devices.c:441 #, c-format msgid "%u Mb/s" msgstr "%u Mb/s" -#: ../clients/cli/devices.c:672 -#, c-format +#: ../clients/cli/devices.c:695 +#, fuzzy, c-format msgid "" "Usage: nmcli device { COMMAND | help }\n" "\n" @@ -2326,7 +2351,7 @@ msgid "" "\n" " monitor <ifname> ...\n" "\n" -" wifi [list [ifname <ifname>] [bssid <BSSID>]]\n" +" wifi [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|auto]]\n" "\n" " wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] " "[ifname <ifname>]\n" @@ -2380,7 +2405,7 @@ msgstr "" "\n" # 大写的 DEVICE、TYPE、STATE、CONNECTION 找不到具体对应的翻译位置，这是在 CLI 是显示的列表项，所以没有翻译。 -#: ../clients/cli/devices.c:695 +#: ../clients/cli/devices.c:718 #, c-format msgid "" "Usage: nmcli device status { help }\n" @@ -2409,7 +2434,7 @@ msgstr "" "说 \n" "\"nmcli device\" 会调用 \"nmcli device status\"。\n" -#: ../clients/cli/devices.c:710 +#: ../clients/cli/devices.c:733 #, c-format msgid "" "Usage: nmcli device show { ARGUMENTS | help }\n" @@ -2428,7 +2453,7 @@ msgstr "" "该命令列出所有设备或者给定设备的详情。\n" "\n" -#: ../clients/cli/devices.c:721 +#: ../clients/cli/devices.c:744 #, c-format msgid "" "Usage: nmcli device connect { ARGUMENTS | help }\n" @@ -2450,7 +2475,7 @@ msgstr "" "动连接的连接。\n" "\n" -#: ../clients/cli/devices.c:733 +#: ../clients/cli/devices.c:756 #, c-format msgid "" "Usage: nmcli device reapply { ARGUMENTS | help }\n" @@ -2468,7 +2493,7 @@ msgstr "" "尝试将自上次应用以来对当前活动连接所做的更改更新到设备上。\n" "\n" -#: ../clients/cli/devices.c:744 +#: ../clients/cli/devices.c:767 #, c-format msgid "" "Usage: nmcli device modify { ARGUMENTS | --help }\n" @@ -2506,7 +2531,7 @@ msgstr "" "nmcli dev mod em1 -ipv4.dns 1\n" "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n" -#: ../clients/cli/devices.c:764 +#: ../clients/cli/devices.c:787 #, c-format msgid "" "Usage: nmcli device disconnect { ARGUMENTS | help }\n" @@ -2526,7 +2551,7 @@ msgstr "" "该命令断开设备的连接并阻止其在没有用户/手动干预的情况下继续自动激活连接。\n" "\n" -#: ../clients/cli/devices.c:776 +#: ../clients/cli/devices.c:799 #, c-format msgid "" "Usage: nmcli device delete { ARGUMENTS | help }\n" @@ -2549,7 +2574,7 @@ msgstr "" "令来删除。\n" "\n" -#: ../clients/cli/devices.c:789 +#: ../clients/cli/devices.c:812 #, c-format msgid "" "Usage: nmcli device set { ARGUMENTS | help }\n" @@ -2572,7 +2597,7 @@ msgstr "" "修改设备属性。\n" "\n" -#: ../clients/cli/devices.c:802 +#: ../clients/cli/devices.c:825 #, c-format msgid "" "Usage: nmcli device monitor { ARGUMENTS | help }\n" @@ -2593,31 +2618,32 @@ msgstr "" "接。\n" "\n" -#: ../clients/cli/devices.c:814 -#, c-format +#: ../clients/cli/devices.c:837 +#, fuzzy, c-format msgid "" "Usage: nmcli device wifi { ARGUMENTS | help }\n" "\n" "Perform operation on Wi-Fi devices.\n" "\n" -"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>]]\n" +"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|" +"auto]]\n" "\n" "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n" -"used to list APs for a particular interface, or with a specific BSSID.\n" +"used to list APs for a particular interface, or with a specific BSSID. The\n" +"--rescan flag tells whether a new Wi-Fi scan should be triggered.\n" "\n" "ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|" "phrase] [ifname <ifname>]\n" " [bssid <BSSID>] [name <name>] [private yes|no] [hidden " "yes|no]\n" "\n" -"Connect to a Wi-Fi network specified by SSID or BSSID. The command creates\n" -"a new connection and then activates it on a device. This is a command-line\n" -"counterpart of clicking an SSID in a GUI client. The command always creates\n" -"a new connection and thus it is mainly useful for connecting to new Wi-Fi\n" -"networks. If a connection for the network already exists, it is better to\n" -"bring up the existing profile as follows: nmcli con up id <name>. Note that\n" -"only open, WEP and WPA-PSK networks are supported at the moment. It is also\n" -"assumed that IP configuration is obtained via DHCP.\n" +"Connect to a Wi-Fi network specified by SSID or BSSID. The command finds a\n" +"matching connection or creates one and then activates it on a device. This\n" +"is a command-line counterpart of clicking an SSID in a GUI client. If a\n" +"connection for the network already exists, it is possible to bring up the\n" +"existing profile as follows: nmcli con up id <name>. Note that only open,\n" +"WEP and WPA-PSK networks are supported if no previous connection exists.\n" +"It is also assumed that IP configuration is obtained via DHCP.\n" "\n" "ARGUMENTS := hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n" " [band a|bg] [channel <channel>] [password <password>]\n" @@ -2694,7 +2720,7 @@ msgstr "" "点，可以使用 \"nmcli device wifi list\" 来显示。\n" "\n" -#: ../clients/cli/devices.c:861 +#: ../clients/cli/devices.c:884 #, c-format msgid "" "Usage: nmcli device lldp { ARGUMENTS | help }\n" @@ -2714,277 +2740,256 @@ msgstr "" "备。\n" "\n" -#: ../clients/cli/devices.c:1015 +#: ../clients/cli/devices.c:982 #, c-format msgid "Error: No interface specified." msgstr "错误：没有指定接口。" -#: ../clients/cli/devices.c:1038 +#: ../clients/cli/devices.c:1005 #, c-format msgid "Warning: argument '%s' is duplicated.\n" msgstr "警告：重复的参数 \"%s\"。\n" -#: ../clients/cli/devices.c:1041 +#: ../clients/cli/devices.c:1008 #, c-format msgid "Error: Device '%s' not found.\n" msgstr "错误：没有找到设备 \"%s\"。\n" -#: ../clients/cli/devices.c:1042 +#: ../clients/cli/devices.c:1009 #, c-format msgid "Error: not all devices found." msgstr "错误：未找到所有设备。" -#: ../clients/cli/devices.c:1071 +#: ../clients/cli/devices.c:1040 msgid "No interface specified" msgstr "没有指定接口" -#: ../clients/cli/devices.c:1090 +#: ../clients/cli/devices.c:1059 #, c-format msgid "Device '%s' not found" msgstr "未找到设备 \"%s\"" -#: ../clients/cli/devices.c:1186 +#: ../clients/cli/devices.c:1155 #, c-format msgid "%u MHz" msgstr "%u MHz" -#: ../clients/cli/devices.c:1187 +#: ../clients/cli/devices.c:1156 #, c-format msgid "%u Mbit/s" msgstr "%u Mbit/s" -#: ../clients/cli/devices.c:1198 +#: ../clients/cli/devices.c:1167 msgid "WEP" msgstr "WEP" -#: ../clients/cli/devices.c:1202 +#: ../clients/cli/devices.c:1171 msgid "WPA1" msgstr "WPA1" -#: ../clients/cli/devices.c:1206 +#: ../clients/cli/devices.c:1175 msgid "WPA2" msgstr "WPA2" -#: ../clients/cli/devices.c:1211 +#: ../clients/cli/devices.c:1180 msgid "802.1X" msgstr "802.1X" -#: ../clients/cli/devices.c:1226 +#: ../clients/cli/devices.c:1195 msgid "Ad-Hoc" msgstr "Ad-Hoc" -#: ../clients/cli/devices.c:1227 +#: ../clients/cli/devices.c:1196 msgid "Infra" msgstr "Infra" -#: ../clients/cli/devices.c:1228 +#: ../clients/cli/devices.c:1197 msgid "N/A" msgstr "不可用" -#: ../clients/cli/devices.c:1423 +#: ../clients/cli/devices.c:1392 msgid "Device details" msgstr "设备详情" -#: ../clients/cli/devices.c:1434 +#: ../clients/cli/devices.c:1403 #, c-format msgid "Error: 'device show': %s" msgstr "错误：\"device show\"：%s" -#: ../clients/cli/devices.c:1732 +#: ../clients/cli/devices.c:1701 msgid "Status of devices" msgstr "设备状态" -#: ../clients/cli/devices.c:1736 +#: ../clients/cli/devices.c:1705 #, c-format msgid "Error: 'device status': %s" msgstr "错误：\"dev status\": %s" -#: ../clients/cli/devices.c:1763 ../clients/cli/devices.c:2218 -#: ../clients/cli/devices.c:4100 +#: ../clients/cli/devices.c:1732 ../clients/cli/devices.c:2173 +#: ../clients/cli/devices.c:4144 #, c-format msgid "Error: invalid extra argument '%s'." msgstr "错误：无效的额外参数 \"%s\"。" -#: ../clients/cli/devices.c:1799 ../clients/cli/general.c:539 +#: ../clients/cli/devices.c:1768 ../clients/cli/general.c:518 #, c-format msgid "Error: Timeout %d sec expired." msgstr "错误：超时时间 %d 秒已到。" -#: ../clients/cli/devices.c:1848 +#: ../clients/cli/devices.c:1817 #, c-format msgid "Device '%s' successfully activated with '%s'.\n" msgstr "成功用 \"%2$s\" 激活了设备 \"%1$s\"。\n" -#: ../clients/cli/devices.c:1854 +#: ../clients/cli/devices.c:1823 #, c-format msgid "Error: Connection activation failed: (%d) %s.\n" msgstr "错误：连接激活失败：(%d) %s。\n" -#: ../clients/cli/devices.c:1890 +#: ../clients/cli/devices.c:1862 #, c-format msgid "Error: Failed to setup a Wi-Fi hotspot: %s" msgstr "错误：建立 Wi-Fi 热点失败：%s" -#: ../clients/cli/devices.c:1893 +#: ../clients/cli/devices.c:1865 #, c-format msgid "Error: Failed to add/activate new connection: %s" msgstr "错误：添加/激活新连接失败：%s" -#: ../clients/cli/devices.c:1903 -#, c-format -msgid "Error: Failed to setup a Wi-Fi hotspot" -msgstr "错误：建立 Wi-Fi 热点失败" - -#: ../clients/cli/devices.c:1905 -#, c-format -msgid "Error: Failed to add/activate new connection: Unknown error" -msgstr "错误：无法添加/激活新连接：未知错误" - -#: ../clients/cli/devices.c:1917 -#, c-format -msgid "Connection with UUID '%s' created and activated on device '%s'\n" -msgstr "UUID 为 \"%s\" 的连接已创建并在设备 \"%s\" 上激活\n" - -#: ../clients/cli/devices.c:1920 -#, c-format -msgid "Hotspot '%s' activated on device '%s'\n" -msgstr "热点 \"%s\" 已在设备 \"%s\" 上激活\n" +#: ../clients/cli/devices.c:1868 +#, fuzzy, c-format +msgid "Error: Failed to activate connection: %s" +msgstr "错误：添加/激活新连接失败：%s" -#: ../clients/cli/devices.c:1984 +#: ../clients/cli/devices.c:1938 #, c-format msgid "Error: Device activation failed: %s" msgstr "错误：激活设备失败：%s" -#: ../clients/cli/devices.c:1993 +#: ../clients/cli/devices.c:1947 #, c-format msgid "Error: Device activation failed: device was disconnected" msgstr "错误：设备激活失败：设备已断开连接" -# 原译设备已连接。原话用来提示设备已连接过了，不能再激活另一个连接了。如果使用“已连接”会让人认为是连接成功的意思，所以改成这个。 -#: ../clients/cli/devices.c:2008 -#, c-format -msgid "Device '%s' has been connected.\n" -msgstr "设备 \"%s\" 已有连接。\n" - -#: ../clients/cli/devices.c:2049 +#: ../clients/cli/devices.c:2000 #, c-format msgid "Error: extra argument not allowed: '%s'." msgstr "错误：不允许的额外参数：\"%s\"。" -#: ../clients/cli/devices.c:2121 ../clients/cli/devices.c:2136 -#: ../clients/cli/devices.c:2366 +#: ../clients/cli/devices.c:2073 ../clients/cli/devices.c:2088 +#: ../clients/cli/devices.c:2325 #, c-format msgid "Device '%s' successfully disconnected.\n" msgstr "成功断开设备 \"%s\"。\n" -#: ../clients/cli/devices.c:2124 +#: ../clients/cli/devices.c:2076 ../clients/cli/devices.c:2399 #, c-format msgid "Device '%s' successfully removed.\n" msgstr "成功移除设备 \"%s\"。\n" -#: ../clients/cli/devices.c:2183 ../clients/cli/devices.c:2253 +#: ../clients/cli/devices.c:2138 ../clients/cli/devices.c:2208 #, c-format msgid "Error: Reapplying connection to device '%s' (%s) failed: %s" msgstr "错误：重新应用连接到 \"%s\" (%s) 失败：%s" -#: ../clients/cli/devices.c:2193 ../clients/cli/devices.c:2262 +#: ../clients/cli/devices.c:2148 ../clients/cli/devices.c:2217 #, c-format msgid "Connection successfully reapplied to device '%s'.\n" msgstr "成功重新应用连接到设备 \"%s\"。\n" -#: ../clients/cli/devices.c:2287 +#: ../clients/cli/devices.c:2242 #, c-format msgid "Error: Reading applied connection from device '%s' (%s) failed: %s" msgstr "错误：从设备 \"%s\" (%s) 读取已应用的连接失败：%s" -#: ../clients/cli/devices.c:2351 +#: ../clients/cli/devices.c:2309 #, c-format msgid "Error: not all devices disconnected." msgstr "错误：未断开所有设备的连接。" -#: ../clients/cli/devices.c:2352 +#: ../clients/cli/devices.c:2310 #, c-format msgid "Error: Device '%s' (%s) disconnecting failed: %s\n" msgstr "错误：断开设备 \"%s\" (%s) 的连接失败：%s\n" -#: ../clients/cli/devices.c:2430 +#: ../clients/cli/devices.c:2390 #, c-format msgid "Error: not all devices deleted." msgstr "错误：未删除所有设备。" -#: ../clients/cli/devices.c:2431 +#: ../clients/cli/devices.c:2391 #, c-format msgid "Error: Device '%s' (%s) deletion failed: %s\n" msgstr "错误：删除设备 \"%s\" (%s) 失败：%s\n" -#: ../clients/cli/devices.c:2515 +#: ../clients/cli/devices.c:2473 #, c-format msgid "Error: No property specified." msgstr "错误：未指定属性。" -#: ../clients/cli/devices.c:2530 ../clients/cli/devices.c:2547 -#: ../clients/cli/general.c:713 ../clients/cli/general.c:725 +#: ../clients/cli/devices.c:2488 ../clients/cli/devices.c:2505 +#: ../clients/cli/general.c:691 ../clients/cli/general.c:703 #, c-format msgid "Error: '%s' argument is missing." msgstr "错误：缺少 \"%s\" 参数。" -#: ../clients/cli/devices.c:2536 +#: ../clients/cli/devices.c:2494 #, c-format msgid "Error: 'managed': %s." msgstr "错误：\"managed\"：%s。" -#: ../clients/cli/devices.c:2553 +#: ../clients/cli/devices.c:2511 #, c-format msgid "Error: 'autoconnect': %s." msgstr "错误：\"autoconnect\"：%s。" -#: ../clients/cli/devices.c:2561 ../clients/cli/general.c:739 +#: ../clients/cli/devices.c:2519 ../clients/cli/general.c:717 #, c-format msgid "Error: property '%s' is not known." msgstr "错误：属性 \"%s\" 是未知的。" -#: ../clients/cli/devices.c:2610 +#: ../clients/cli/devices.c:2568 #, c-format msgid "%s: using connection '%s'\n" msgstr "" "%s：正使用连接 \"%s\"\n" "\n" -#: ../clients/cli/devices.c:2636 +#: ../clients/cli/devices.c:2594 #, c-format msgid "%s: device created\n" msgstr "%s：设备已创建\n" -#: ../clients/cli/devices.c:2643 +#: ../clients/cli/devices.c:2601 #, c-format msgid "%s: device removed\n" msgstr "%s：设备已移除\n" -#: ../clients/cli/devices.c:2818 +#: ../clients/cli/devices.c:2781 msgid "Wi-Fi scan list" msgstr "Wi-Fi 扫描列表" -#: ../clients/cli/devices.c:2895 +#: ../clients/cli/devices.c:2868 #, c-format msgid "Error: Access point with bssid '%s' not found." msgstr "错误：未找到 bssid 为 \"%s\" 的接入点。" -#: ../clients/cli/devices.c:3085 +#: ../clients/cli/devices.c:3024 #, c-format msgid "Error: 'device wifi': %s" msgstr "错误：\"device wifi\"：%s" -#: ../clients/cli/devices.c:3103 +#: ../clients/cli/devices.c:3042 #, c-format msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]" msgstr "错误：无效的重新扫描参数：\"%s\" 未在 [auto, no, yes] 之中" -#: ../clients/cli/devices.c:3110 +#: ../clients/cli/devices.c:3049 #, c-format msgid "Error: Device '%s' not found." msgstr "错误：没有找到设备 \"%s\"。" -#: ../clients/cli/devices.c:3120 +#: ../clients/cli/devices.c:3060 #, c-format msgid "" "Error: Device '%s' was not recognized as a Wi-Fi device, check " @@ -2993,140 +2998,145 @@ msgstr "" "错误：设备 \"%s\" 没有被识别为 Wi-Fi 设备，请检查网络管理器（NetworkManager）" "的 Wi-Fi 插件。" -#: ../clients/cli/devices.c:3124 ../clients/cli/devices.c:3342 -#: ../clients/cli/devices.c:3779 ../clients/cli/devices.c:3938 +#: ../clients/cli/devices.c:3064 ../clients/cli/devices.c:3324 +#: ../clients/cli/devices.c:3823 ../clients/cli/devices.c:3982 #, c-format msgid "Error: Device '%s' is not a Wi-Fi device." msgstr "错误：设备 \"%s\" 不是 Wi-Fi 设备。" -#: ../clients/cli/devices.c:3191 +#: ../clients/cli/devices.c:3173 msgid "SSID or BSSID: " msgstr "SSID 或 BSSID：" -#: ../clients/cli/devices.c:3196 +#: ../clients/cli/devices.c:3178 #, c-format msgid "Error: SSID or BSSID are missing." msgstr "错误：缺少 SSID/BSSID。" -#: ../clients/cli/devices.c:3233 +#: ../clients/cli/devices.c:3215 #, c-format msgid "Error: bssid argument value '%s' is not a valid BSSID." msgstr "错误：bssid 参数值\"%s\"为无效 BSSID。" -#: ../clients/cli/devices.c:3263 +#: ../clients/cli/devices.c:3245 #, c-format msgid "" "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'." msgstr "错误：wep-key-type 参数值 \"%s\" 无效，请使用 \"key\" 或 \"phrase\"。" -#: ../clients/cli/devices.c:3290 ../clients/cli/devices.c:3308 +#: ../clients/cli/devices.c:3272 ../clients/cli/devices.c:3290 #, c-format msgid "Error: %s: %s." msgstr "错误：%s：%s。" -#: ../clients/cli/devices.c:3325 +#: ../clients/cli/devices.c:3307 #, c-format msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)." msgstr "错误：要连接的 BSSID (%s) 与 bssid 参数 (%s) 不同。" -#: ../clients/cli/devices.c:3331 +#: ../clients/cli/devices.c:3313 #, c-format msgid "Error: Parameter '%s' is neither SSID nor BSSID." msgstr "错误：参数 \"%s\" 不是 SSID 或 BSSID。" -#: ../clients/cli/devices.c:3344 ../clients/cli/devices.c:3781 -#: ../clients/cli/devices.c:3940 +#: ../clients/cli/devices.c:3326 ../clients/cli/devices.c:3825 +#: ../clients/cli/devices.c:3984 #, c-format msgid "Error: No Wi-Fi device found." msgstr "错误：未发现 Wi-Fi 设备。" -#: ../clients/cli/devices.c:3364 +#: ../clients/cli/devices.c:3346 #, c-format msgid "Error: Failed to scan hidden SSID: %s." msgstr "错误：扫描隐藏的 SSID 失败：%s。" -#: ../clients/cli/devices.c:3391 +#: ../clients/cli/devices.c:3373 #, c-format msgid "Error: No network with SSID '%s' found." msgstr "错误：未发现 SSID 为 \"%s\" 的网络。" -#: ../clients/cli/devices.c:3393 +#: ../clients/cli/devices.c:3375 #, c-format msgid "Error: No access point with BSSID '%s' found." msgstr "错误：未找到 BSSID 为 \"%s\" 的接入点。" -#: ../clients/cli/devices.c:3435 +#: ../clients/cli/devices.c:3403 +#, c-format +msgid "Error: Connection '%s' exists but properties don't match." +msgstr "" + +#: ../clients/cli/devices.c:3446 #, c-format msgid "" "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n" msgstr "警告：\"%s\" 应该是隐藏 AP 的 SSID，但看起来像 BSSID。\n" -#: ../clients/cli/devices.c:3451 +#: ../clients/cli/devices.c:3482 msgid "Password: " msgstr "密码：" -#: ../clients/cli/devices.c:3600 +#: ../clients/cli/devices.c:3644 #, c-format msgid "'%s' is not valid WPA PSK" msgstr "\"%s\" 不是有效的 WPA PSK" -#: ../clients/cli/devices.c:3617 +#: ../clients/cli/devices.c:3661 #, c-format msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)" msgstr "\"%s\" 不是有效的 WEP 密钥（它应该是 5 或 13 个 ASCII 字符）" -#: ../clients/cli/devices.c:3633 +#: ../clients/cli/devices.c:3677 #, c-format msgid "Hotspot password: %s\n" msgstr "热点密码：%s\n" -#: ../clients/cli/devices.c:3704 +#: ../clients/cli/devices.c:3748 #, c-format msgid "Error: ssid is too long." msgstr "错误：SSID 太长。" # 这里 channel/band 开头不大写，表示其是命令行选项，所以不译。下面的同理。 -#: ../clients/cli/devices.c:3718 +#: ../clients/cli/devices.c:3762 #, c-format msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'." msgstr "错误：band 参数值 \"%s\" 无效，请使用 \"a\" 或 \"bg\"。" -#: ../clients/cli/devices.c:3743 +#: ../clients/cli/devices.c:3787 #, c-format msgid "Error: Unknown parameter %s." msgstr "错误：未知参数 %s。" -#: ../clients/cli/devices.c:3763 +#: ../clients/cli/devices.c:3807 #, c-format msgid "Error: channel requires band too." msgstr "错误：channal 也需要 band。" -#: ../clients/cli/devices.c:3768 +#: ../clients/cli/devices.c:3812 #, c-format msgid "Error: channel '%s' not valid for band '%s'." msgstr "错误：band \"%s\" 的 channel \"%s\" 无效。" -#: ../clients/cli/devices.c:3792 +#: ../clients/cli/devices.c:3836 #, c-format msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode." msgstr "错误：设备 \"%s\" 既不支持 AP 也不支持 Ad-Hoc 模式。" -#: ../clients/cli/devices.c:3826 +#: ../clients/cli/devices.c:3870 #, c-format msgid "Error: Invalid 'password': %s." msgstr "错误：无效的 \"password\"：%s。" -#: ../clients/cli/devices.c:3901 +#: ../clients/cli/devices.c:3945 #, c-format msgid "Error: '%s' cannot repeat." msgstr "错误：\"%s\" 不能重复。" #. Main header name -#: ../clients/cli/devices.c:4006 +#: ../clients/cli/devices.c:4050 msgid "Device LLDP neighbors" msgstr "设备 LLDP 邻居" -#: ../clients/cli/devices.c:4116 +#: ../clients/cli/devices.c:4160 #, c-format msgid "Error: 'device lldp list': %s" msgstr "错误：\"device lldp list\"：%s" @@ -3159,47 +3169,31 @@ msgstr "断开中" msgid "disconnected" msgstr "已断开" -#: ../clients/cli/general.c:83 -msgid "none" -msgstr "无" - -#: ../clients/cli/general.c:84 -msgid "portal" -msgstr "入口" - -#: ../clients/cli/general.c:85 -msgid "limited" -msgstr "受限" - -#: ../clients/cli/general.c:86 -msgid "full" -msgstr "完全" - -#: ../clients/cli/general.c:158 +#: ../clients/cli/general.c:137 msgid "auth" msgstr "验证" -#: ../clients/cli/general.c:186 +#: ../clients/cli/general.c:165 msgid "running" msgstr "运行中" -#: ../clients/cli/general.c:200 +#: ../clients/cli/general.c:179 msgid "starting" msgstr "启动中" -#: ../clients/cli/general.c:200 +#: ../clients/cli/general.c:179 msgid "started" msgstr "已启动" -#: ../clients/cli/general.c:234 +#: ../clients/cli/general.c:213 msgid "enabled" msgstr "已启用" -#: ../clients/cli/general.c:234 +#: ../clients/cli/general.c:213 msgid "disabled" msgstr "已禁用" -#: ../clients/cli/general.c:352 +#: ../clients/cli/general.c:331 #, c-format msgid "" "Usage: nmcli general { COMMAND | help }\n" @@ -3228,7 +3222,7 @@ msgstr "" " logging [level <日志级别>] [domains <日志域>]\n" "\n" -#: ../clients/cli/general.c:363 +#: ../clients/cli/general.c:342 #, c-format msgid "" "Usage: nmcli general status { help }\n" @@ -3244,7 +3238,7 @@ msgstr "" "\"status\" 是默认操作，即 \"nmcli gen\" 调用 \"nmcli gen status\"\n" "\n" -#: ../clients/cli/general.c:372 +#: ../clients/cli/general.c:351 #, c-format msgid "" "Usage: nmcli general hostname { ARGUMENTS | help }\n" @@ -3267,7 +3261,7 @@ msgstr "" "新的永久系统主机名。\n" "\n" -#: ../clients/cli/general.c:384 +#: ../clients/cli/general.c:363 #, c-format msgid "" "Usage: nmcli general permissions { help }\n" @@ -3280,7 +3274,7 @@ msgstr "" "显示验证操作的调用程序权限。\n" "\n" -#: ../clients/cli/general.c:392 +#: ../clients/cli/general.c:371 #, c-format msgid "" "Usage: nmcli general logging { ARGUMENTS | help }\n" @@ -3305,7 +3299,7 @@ msgstr "" "可能的日志域列表请参阅手册页。\n" "\n" -#: ../clients/cli/general.c:405 +#: ../clients/cli/general.c:384 #, c-format msgid "" "Usage: nmcli networking { COMMAND | help }\n" @@ -3330,7 +3324,7 @@ msgstr "" " connectivity [check]\n" "\n" -#: ../clients/cli/general.c:415 +#: ../clients/cli/general.c:394 #, c-format msgid "" "Usage: nmcli networking on { help }\n" @@ -3343,7 +3337,7 @@ msgstr "" "打开联网。\n" "\n" -#: ../clients/cli/general.c:423 +#: ../clients/cli/general.c:402 #, c-format msgid "" "Usage: nmcli networking off { help }\n" @@ -3356,7 +3350,7 @@ msgstr "" "关闭联网。\n" "\n" -#: ../clients/cli/general.c:431 +#: ../clients/cli/general.c:410 #, c-format msgid "" "Usage: nmcli networking connectivity { ARGUMENTS | help }\n" @@ -3376,7 +3370,7 @@ msgstr "" "可选的 \"check\" 参数可让网络管理器（NetworkManager）重新检查连接性。\n" "\n" -#: ../clients/cli/general.c:443 +#: ../clients/cli/general.c:422 #, c-format msgid "" "Usage: nmcli radio { COMMAND | help }\n" @@ -3393,7 +3387,7 @@ msgstr "" " all | wifi | wwan [ on | off ]\n" "\n" -#: ../clients/cli/general.c:452 +#: ../clients/cli/general.c:431 #, c-format msgid "" "Usage: nmcli radio all { ARGUMENTS | help }\n" @@ -3410,7 +3404,7 @@ msgstr "" "获取所有无线电开关的状态，或者打开/关闭它们。\n" "\n" -#: ../clients/cli/general.c:462 +#: ../clients/cli/general.c:441 #, c-format msgid "" "Usage: nmcli radio wifi { ARGUMENTS | help }\n" @@ -3427,7 +3421,7 @@ msgstr "" "获取 Wi-Fi 无线电开关的状态，或者打开/关闭它。\n" "\n" -#: ../clients/cli/general.c:472 +#: ../clients/cli/general.c:451 #, c-format msgid "" "Usage: nmcli radio wwan { ARGUMENTS | help }\n" @@ -3444,7 +3438,7 @@ msgstr "" "获取移动宽带无线电开关的状态，或者打开/关闭它。\n" "\n" -#: ../clients/cli/general.c:482 +#: ../clients/cli/general.c:461 #, c-format msgid "" "Usage: nmcli monitor\n" @@ -3459,180 +3453,180 @@ msgstr "" "每当 NetworkManager 出现更改时打印一行信息。\n" "\n" -#: ../clients/cli/general.c:512 +#: ../clients/cli/general.c:491 msgid "NetworkManager status" msgstr "网络管理器状态" -#: ../clients/cli/general.c:516 +#: ../clients/cli/general.c:495 #, c-format msgid "Error: only these fields are allowed: %s" msgstr "错误：只允许使用这些字段：%s" -#: ../clients/cli/general.c:570 +#: ../clients/cli/general.c:548 msgid "NetworkManager permissions" msgstr "网络管理器权限" # XXX: 这里考虑一下要不要翻译 # XXX: Should we translate this? -#: ../clients/cli/general.c:574 +#: ../clients/cli/general.c:552 #, c-format msgid "Error: 'general permissions': %s" msgstr "错误：\"常规权限\"：%s" -#: ../clients/cli/general.c:663 +#: ../clients/cli/general.c:641 msgid "NetworkManager logging" msgstr "网络管理器日志" -#: ../clients/cli/general.c:667 +#: ../clients/cli/general.c:645 #, c-format msgid "Error: 'general logging': %s" msgstr "错误：\"常规日志\"：%s" -#: ../clients/cli/general.c:749 +#: ../clients/cli/general.c:727 #, c-format msgid "Error: failed to set logging: %s" msgstr "错误：设置日志失败：%s" -#: ../clients/cli/general.c:766 +#: ../clients/cli/general.c:744 #, c-format msgid "Error: failed to set hostname: %s" msgstr "错误：设置主机名失败：%s" -#: ../clients/cli/general.c:835 +#: ../clients/cli/general.c:813 #, c-format msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)" msgstr "错误：\"--fields\" 值 \"%s\" 在此无效（允许的字段：%s）" -#: ../clients/cli/general.c:860 +#: ../clients/cli/general.c:838 #, c-format msgid "Error: invalid '%s' argument: '%s' (use on/off)." msgstr "错误：无效的 \"%s\" 参数：\"%s\"（使用 on/off）。" #. no arguments -> get current state -#: ../clients/cli/general.c:908 ../clients/cli/general.c:920 +#: ../clients/cli/general.c:886 ../clients/cli/general.c:898 msgid "Connectivity" msgstr "连接性" -#: ../clients/cli/general.c:923 +#: ../clients/cli/general.c:901 #, c-format msgid "Error: 'networking' command '%s' is not valid." msgstr "错误：\"networking\" 命令 \"%s\" 无效。" -#: ../clients/cli/general.c:937 +#: ../clients/cli/general.c:915 msgid "Networking" msgstr "联网" #. no argument, show all radio switches -#: ../clients/cli/general.c:972 +#: ../clients/cli/general.c:950 msgid "Radio switches" msgstr "无线电开关" #. no argument, show current Wi-Fi state -#: ../clients/cli/general.c:1002 +#: ../clients/cli/general.c:980 msgid "Wi-Fi radio switch" msgstr "Wi-Fi 无线电开关" #. no argument, show current WWAN (mobile broadband) state -#: ../clients/cli/general.c:1029 +#: ../clients/cli/general.c:1007 msgid "WWAN radio switch" msgstr "WWAN 无线电开关" -#: ../clients/cli/general.c:1077 +#: ../clients/cli/general.c:1055 msgid "NetworkManager has started" msgstr "网络管理器已启动" -#: ../clients/cli/general.c:1077 +#: ../clients/cli/general.c:1055 msgid "NetworkManager has stopped" msgstr "网络管理器已停止" -#: ../clients/cli/general.c:1088 +#: ../clients/cli/general.c:1066 #, c-format msgid "Hostname set to '%s'\n" msgstr "主机名已设为 \"%s\"\n" -#: ../clients/cli/general.c:1103 +#: ../clients/cli/general.c:1081 #, c-format msgid "'%s' is now the primary connection\n" msgstr "\"%s\" 现在是主连接\n" -#: ../clients/cli/general.c:1105 +#: ../clients/cli/general.c:1083 #, c-format msgid "There's no primary connection\n" msgstr "没有主连接\n" -#: ../clients/cli/general.c:1117 +#: ../clients/cli/general.c:1095 #, c-format msgid "Connectivity is now '%s'\n" msgstr "连接性现在是 \"%s\"\n" -#: ../clients/cli/general.c:1130 +#: ../clients/cli/general.c:1109 #, c-format msgid "Networkmanager is now in the '%s' state\n" msgstr "网络管理器现在处于 \"%s\" 状态\n" -#: ../clients/cli/general.c:1150 +#: ../clients/cli/general.c:1129 msgid "connection available" msgstr "连接可用" -#: ../clients/cli/general.c:1152 +#: ../clients/cli/general.c:1131 msgid "connections available" msgstr "连接可用" -#: ../clients/cli/general.c:1170 +#: ../clients/cli/general.c:1149 msgid "autoconnect" msgstr "自动连接" -#: ../clients/cli/general.c:1172 +#: ../clients/cli/general.c:1151 msgid "fw missing" msgstr "缺失固件" -#: ../clients/cli/general.c:1177 +#: ../clients/cli/general.c:1156 msgid "plugin missing" msgstr "缺失插件" -#: ../clients/cli/general.c:1182 +#: ../clients/cli/general.c:1161 msgid "sw" msgstr "软件" -#: ../clients/cli/general.c:1184 +#: ../clients/cli/general.c:1163 msgid "hw" msgstr "硬件" -#: ../clients/cli/general.c:1189 +#: ../clients/cli/general.c:1168 msgid "iface" msgstr "接口" -#: ../clients/cli/general.c:1192 +#: ../clients/cli/general.c:1171 msgid "port" msgstr "端口" -#: ../clients/cli/general.c:1195 +#: ../clients/cli/general.c:1174 msgid "mtu" msgstr "mtu" -#: ../clients/cli/general.c:1212 +#: ../clients/cli/general.c:1191 msgid "master" msgstr "主连接" -#: ../clients/cli/general.c:1216 ../clients/tui/nm-editor-utils.c:239 +#: ../clients/cli/general.c:1195 ../clients/tui/nm-editor-utils.c:239 #: ../clients/tui/nmt-connect-connection-list.c:407 msgid "VPN" msgstr "VPN" -#: ../clients/cli/general.c:1218 +#: ../clients/cli/general.c:1197 msgid "ip4 default" msgstr "ip4 默认" -#: ../clients/cli/general.c:1220 +#: ../clients/cli/general.c:1199 msgid "ip6 default" msgstr "ip6 默认" -#: ../clients/cli/general.c:1303 +#: ../clients/cli/general.c:1281 #, c-format msgid "%s VPN connection" msgstr "%s VPN 连接" -#: ../clients/cli/general.c:1371 +#: ../clients/cli/general.c:1349 #, c-format msgid "" "Use \"nmcli device show\" to get complete information about known devices " @@ -3647,39 +3641,36 @@ msgstr "" "\n" "完整的用法细节，可参考 nmcli(1) 和 nmcli-examples(5) 手册页。\n" -#: ../clients/cli/general.c:1392 +#: ../clients/cli/general.c:1370 #, c-format msgid "Error: 'monitor' command '%s' is not valid." msgstr "错误：\"monitor\" 命令 \"%s\" 无效。" -#: ../clients/cli/general.c:1404 +#: ../clients/cli/general.c:1382 msgid "Networkmanager is not running (waiting for it)\n" msgstr "网络管理器未运行（等待中）。\n" #: ../clients/cli/nmcli.c:245 -#, c-format +#, fuzzy, 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" -" -c[olors] auto|yes|no whether to use colors in " -"output\n" -" -f[ields] <field1,field2,...>|all|common specify fields to output\n" -" -g[et-values] <field1,field2,...>|all|common shortcut for -m tabular -t -" -"f\n" -" -e[scape] yes|no escape columns separators " -"in values\n" -" -a[sk] ask for missing parameters\n" -" -s[how-secrets] allow displaying passwords\n" -" -w[ait] <seconds> set timeout waiting for " -"finishing operations\n" -" -v[ersion] show program version\n" -" -h[elp] print this help\n" +" -a, --ask ask for missing parameters\n" +" -c, --colors auto|yes|no whether to use colors in output\n" +" -e, --escape yes|no escape columns separators in " +"values\n" +" -f, --fields <field,...>|all|common specify fields to output\n" +" -g, --get-values <field,...>|all|common shortcut for -m tabular -t -f\n" +" -h, --help print this help\n" +" -m, --mode tabular|multiline output mode\n" +" -o, --overview overview mode\n" +" -p, --pretty pretty output\n" +" -s, --show-secrets allow displaying passwords\n" +" -t, --terse terse output\n" +" -v, --version how program version\n" +" -w, --wait <seconds> set timeout waiting for finishing " +"operations\n" "\n" "OBJECT\n" " g[eneral] NetworkManager's general status and operations\n" @@ -3795,21 +3786,21 @@ msgstr "错误：选项 \"%s\" 未知，尝试 \"nmcli -help\"。" msgid "Error: nmcli terminated by signal %s (%d)" msgstr "错误：nmcli 被信号 %s (%d) 终止了" -#: ../clients/cli/nmcli.c:1052 +#: ../clients/cli/nmcli.c:1060 msgid "Success" msgstr "成功" -#: ../clients/cli/polkit-agent.c:68 +#: ../clients/cli/polkit-agent.c:69 #, c-format msgid "Authentication message: %s\n" msgstr "验证消息：%s\n" -#: ../clients/cli/polkit-agent.c:76 +#: ../clients/cli/polkit-agent.c:77 #, c-format msgid "Authentication error: %s\n" msgstr "验证错误：%s\n" -#: ../clients/cli/polkit-agent.c:136 +#: ../clients/cli/polkit-agent.c:137 #, c-format msgid "Warning: polkit agent initialization failed: %s\n" msgstr "警告：polkit 代理初始化失败：%s\n" @@ -3841,113 +3832,112 @@ msgstr "警告： 设置 %s.%s 需要删除 ipv4 和 ipv6 设置\n" msgid "Do you want to remove them? [yes] " msgstr "您要删除它们吗？[yes]：" -#: ../clients/cli/settings.c:332 +#: ../clients/cli/settings.c:333 #, c-format msgid "Warning: %s is not an UUID of any existing connection profile\n" msgstr "警告：%s 不是任何现有连接配置集的 UUID\n" -#: ../clients/cli/settings.c:337 ../clients/cli/settings.c:350 +#: ../clients/cli/settings.c:338 ../clients/cli/settings.c:351 #, c-format msgid "'%s' is not a VPN connection profile" msgstr "\"%s\" 不是 VPN 连接配置集" -#: ../clients/cli/settings.c:344 +#: ../clients/cli/settings.c:345 #, c-format msgid "'%s' is not a name of any exiting profile" msgstr "\"%s\" 不是任何现有配置集的名称" -#: ../clients/cli/settings.c:388 +#: ../clients/cli/settings.c:389 #, c-format msgid "Warning: %s\n" msgstr "警告：%s\n" -#: ../clients/cli/settings.c:391 +#: ../clients/cli/settings.c:392 #, c-format msgid "Info: %s\n" msgstr "信息：%s\n" -#: ../clients/cli/settings.c:484 +#: ../clients/cli/settings.c:485 msgid "don't know how to get the property value" msgstr "不知道如何获取属性值" -#: ../clients/cli/settings.c:574 ../clients/cli/settings.c:616 +#: ../clients/cli/settings.c:575 ../clients/cli/settings.c:617 msgid "the property can't be changed" msgstr "无法更改该属性" -#: ../clients/cli/settings.c:730 +#: ../clients/cli/settings.c:731 msgid "[NM property description]" msgstr "[NM 属性描述]" -#: ../clients/cli/settings.c:740 +#: ../clients/cli/settings.c:741 msgid "[nmcli specific description]" msgstr "[nmcli 特定描述]" -#: ../clients/cli/utils.c:319 +#: ../clients/cli/utils.c:320 #, c-format msgid "Error: Argument '%s' was expected, but '%s' provided." msgstr "错误：需要参数 \"%s\" 但提供的是 \"%s\"。" -#: ../clients/cli/utils.c:322 +#: ../clients/cli/utils.c:323 #, c-format msgid "Error: Unexpected argument '%s'" msgstr "错误：意外参数 \"%s\"" -#: ../clients/cli/utils.c:709 +#: ../clients/cli/utils.c:710 #, c-format msgid "invalid field '%s%s%s'; no such field" msgstr "无效字段 \"%s%s%s\"；没有此类字段" -#: ../clients/cli/utils.c:713 +#: ../clients/cli/utils.c:714 #, c-format msgid "invalid field '%s%s%s'; allowed fields: [%s]" msgstr "无效字段 \"%s%s%s\";允许的字段：[%s]" -#: ../clients/cli/utils.c:809 +#: ../clients/cli/utils.c:810 #, c-format msgid "failure to select field" msgstr "选择字段失败" -#: ../clients/cli/utils.c:1435 +#: ../clients/cli/utils.c:1438 #, c-format msgid "Error reading nmcli output: %s\n" msgstr "读取 nmcli 输出时出错：%s\n" -#: ../clients/cli/utils.c:1440 +#: ../clients/cli/utils.c:1443 #, c-format msgid "Error writing nmcli output: %s\n" msgstr "写入 nmcli 输出时出错：%s\n" -#: ../clients/cli/utils.c:1464 +#: ../clients/cli/utils.c:1467 #, c-format msgid "Failed to create pager pipe: %s\n" msgstr "创建与子进程通讯的管道失败：%s\n" -#: ../clients/cli/utils.c:1472 +#: ../clients/cli/utils.c:1475 #, c-format msgid "Failed to fork pager: %s\n" msgstr "fork 子进程失败：%s\n" -#: ../clients/cli/utils.c:1518 ../clients/cli/utils.c:1520 +#: ../clients/cli/utils.c:1521 ../clients/cli/utils.c:1523 #, c-format msgid "Failed to duplicate pager pipe: %s\n" msgstr "复制与子进程通讯的管道失败：%s\n" -#: ../clients/cli/utils.h:298 ../clients/common/nm-meta-setting-desc.c:4899 +#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4949 msgid "on" msgstr "开" -#: ../clients/cli/utils.h:298 ../clients/common/nm-meta-setting-desc.c:4901 +#: ../clients/cli/utils.h:302 ../clients/common/nm-meta-setting-desc.c:4951 msgid "off" msgstr "关" -#: ../clients/cli/utils.h:324 +#: ../clients/cli/utils.h:328 #, c-format msgid "%lld (%s)" msgstr "%lld（%s）" -#: ../clients/cli/utils.h:331 +#: ../clients/cli/utils.h:335 #, c-format -#| msgid "%lld (%s)" msgid "%lld - %s" msgstr "%lld — %s" @@ -4028,7 +4018,7 @@ msgstr "否（猜测）" #. 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 +#: ../libnm/nm-device.c:1437 msgid "Unknown" msgstr "未知" @@ -4286,7 +4276,8 @@ msgid "The device parent's management changed" msgstr "设备的上级管理已更改" #: ../clients/common/nm-client-utils.c:351 -msgid "OpenVSwitch database connection failed" +#, fuzzy +msgid "Open vSwitch database connection failed" msgstr "OpenVSwitch 数据库连接失败" #: ../clients/common/nm-client-utils.c:352 @@ -4400,227 +4391,228 @@ msgstr "下一跳（\"%s\"）必须在首位" msgid "the metric ('%s') must be before attributes" msgstr "跃点数（\"%s\"）必需在属性前" -#: ../clients/common/nm-meta-setting-desc.c:218 +#: ../clients/common/nm-meta-setting-desc.c:227 #, c-format msgid "invalid route: %s. %s" msgstr "无效路由：%s。%s" -#: ../clients/common/nm-meta-setting-desc.c:230 +#: ../clients/common/nm-meta-setting-desc.c:239 msgid "default route cannot be added (NetworkManager handles it by itself)" msgstr "无法添加默认路由（网络管理器自己进行处理）" -#: ../clients/common/nm-meta-setting-desc.c:429 +#: ../clients/common/nm-meta-setting-desc.c:446 #, c-format msgid "invalid priority map '%s'" msgstr "无效的优先级映射 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:436 -#: ../clients/common/nm-meta-setting-desc.c:442 +#: ../clients/common/nm-meta-setting-desc.c:453 +#: ../clients/common/nm-meta-setting-desc.c:459 #, c-format msgid "priority '%s' is not valid (<0-%ld>)" msgstr "优先级 \"%s\" 无效（<0-%ld>）" -#: ../clients/common/nm-meta-setting-desc.c:494 +#: ../clients/common/nm-meta-setting-desc.c:511 #, c-format msgid "cannot read pac-script from file '%s'" msgstr "无法从文件 \"%s\" 读取 PAC 脚本" -#: ../clients/common/nm-meta-setting-desc.c:501 +#: ../clients/common/nm-meta-setting-desc.c:518 #, c-format msgid "file '%s' contains non-valid utf-8" msgstr "文件 \"%s\" 包含无效的 utf-8" -#: ../clients/common/nm-meta-setting-desc.c:514 +#: ../clients/common/nm-meta-setting-desc.c:531 #, c-format msgid "'%s' does not contain a valid PAC Script" msgstr "\"%s\" 没有包含有效的 PAC 脚本" -#: ../clients/common/nm-meta-setting-desc.c:517 +#: ../clients/common/nm-meta-setting-desc.c:534 #, c-format msgid "Not a valid PAC Script" msgstr "不是有效的 PAC 脚本" -#: ../clients/common/nm-meta-setting-desc.c:571 +#: ../clients/common/nm-meta-setting-desc.c:588 #, c-format msgid "cannot read team config from file '%s'" msgstr "无法从文件 \"%s\" 读取组合（team）配置" -#: ../clients/common/nm-meta-setting-desc.c:578 +#: ../clients/common/nm-meta-setting-desc.c:595 #, c-format msgid "team config file '%s' contains non-valid utf-8" msgstr "组合（team）配置文件 \"%s\" 包含无效的 utf-8" -#: ../clients/common/nm-meta-setting-desc.c:590 +#: ../clients/common/nm-meta-setting-desc.c:607 #, c-format msgid "'%s' does not contain a valid team configuration" msgstr "\"%s\" 没有包含有效的组合（team）配置" -#: ../clients/common/nm-meta-setting-desc.c:593 +#: ../clients/common/nm-meta-setting-desc.c:610 #, c-format msgid "team configuration must be a JSON object" msgstr "组合（team）配置必须为 JSON 目标" -#: ../clients/common/nm-meta-setting-desc.c:714 +#: ../clients/common/nm-meta-setting-desc.c:731 #: ../clients/tui/nmt-mtu-entry.c:84 msgid "(default)" msgstr "（默认）" -#: ../clients/common/nm-meta-setting-desc.c:855 +#: ../clients/common/nm-meta-setting-desc.c:885 msgid "auto" msgstr "自动" -#: ../clients/common/nm-meta-setting-desc.c:1007 +#: ../clients/common/nm-meta-setting-desc.c:1037 #, c-format msgid "%s (%s)" msgstr "%s（%s）" -#: ../clients/common/nm-meta-setting-desc.c:1131 -#, c-format -msgid "'%s' is out of range [%lli, %lli]" -msgstr "\"%s\" 超出范围 [%lli, %lli]" +#: ../clients/common/nm-meta-setting-desc.c:1180 +#: ../clients/common/nm-meta-setting-desc.c:1184 +#, fuzzy +msgid "'%s' is out of range [%" +msgstr "\"%s\" 超出范围 [0, %u]" -#: ../clients/common/nm-meta-setting-desc.c:1137 +#: ../clients/common/nm-meta-setting-desc.c:1189 #, c-format msgid "'%s' is not a valid number" msgstr "\"%s\" 不是有效的数字" -#: ../clients/common/nm-meta-setting-desc.c:1187 +#: ../clients/common/nm-meta-setting-desc.c:1243 #, c-format msgid "'%s' is out of range [0, %u]" msgstr "\"%s\" 超出范围 [0, %u]" -#: ../clients/common/nm-meta-setting-desc.c:1230 +#: ../clients/common/nm-meta-setting-desc.c:1286 #, c-format msgid "'%s' is not a valid Ethernet MAC" msgstr "\"%s\" 不是有效的以太网 MAC" -#: ../clients/common/nm-meta-setting-desc.c:1334 +#: ../clients/common/nm-meta-setting-desc.c:1391 #, c-format msgid "invalid option '%s', use a combination of [%s]" msgstr "无效选项 \"%s\"，请使用 [%s] 的组合" -#: ../clients/common/nm-meta-setting-desc.c:1339 ../libnm-core/nm-keyfile.c:770 +#: ../clients/common/nm-meta-setting-desc.c:1396 ../libnm-core/nm-keyfile.c:780 #, c-format msgid "invalid option '%s', use one of [%s]" msgstr "无效选项 \"%s\"，请使用 [%s] 中的一个。" -#: ../clients/common/nm-meta-setting-desc.c:1458 +#: ../clients/common/nm-meta-setting-desc.c:1515 #, c-format msgid "%d (key)" msgstr "%d（密钥）" -#: ../clients/common/nm-meta-setting-desc.c:1460 +#: ../clients/common/nm-meta-setting-desc.c:1517 #, c-format msgid "%d (passphrase)" msgstr "%d（密码）" -#: ../clients/common/nm-meta-setting-desc.c:1463 +#: ../clients/common/nm-meta-setting-desc.c:1520 #, c-format msgid "%d (unknown)" msgstr "%d（未知）" -#: ../clients/common/nm-meta-setting-desc.c:1495 +#: ../clients/common/nm-meta-setting-desc.c:1552 msgid "0 (NONE)" msgstr "0（无）" -#: ../clients/common/nm-meta-setting-desc.c:1501 +#: ../clients/common/nm-meta-setting-desc.c:1558 msgid "REORDER_HEADERS, " msgstr "记录头、" -#: ../clients/common/nm-meta-setting-desc.c:1503 +#: ../clients/common/nm-meta-setting-desc.c:1560 msgid "GVRP, " msgstr "GVRP、" -#: ../clients/common/nm-meta-setting-desc.c:1505 +#: ../clients/common/nm-meta-setting-desc.c:1562 msgid "LOOSE_BINDING, " msgstr "松散绑定、" -#: ../clients/common/nm-meta-setting-desc.c:1507 +#: ../clients/common/nm-meta-setting-desc.c:1564 msgid "MVRP, " msgstr "MVRP、" -#: ../clients/common/nm-meta-setting-desc.c:1547 +#: ../clients/common/nm-meta-setting-desc.c:1604 msgid "0 (none)" msgstr "0（无）" -#: ../clients/common/nm-meta-setting-desc.c:1553 +#: ../clients/common/nm-meta-setting-desc.c:1610 msgid "agent-owned, " msgstr "为代理拥有、" -#: ../clients/common/nm-meta-setting-desc.c:1555 +#: ../clients/common/nm-meta-setting-desc.c:1612 msgid "not saved, " msgstr "未保存、" -#: ../clients/common/nm-meta-setting-desc.c:1557 +#: ../clients/common/nm-meta-setting-desc.c:1614 msgid "not required, " msgstr "不必需、" -#: ../clients/common/nm-meta-setting-desc.c:1622 +#: ../clients/common/nm-meta-setting-desc.c:1679 #, c-format msgid "'%s' is not valid; use <option>=<value>" msgstr "\"%s\" 无效；请使用 <选项>=<值>" -#: ../clients/common/nm-meta-setting-desc.c:1661 +#: ../clients/common/nm-meta-setting-desc.c:1718 msgid "no item to remove" msgstr "没有要移除的项" -#: ../clients/common/nm-meta-setting-desc.c:1665 +#: ../clients/common/nm-meta-setting-desc.c:1722 #, c-format msgid "index '%d' is not in range <0-%d>" msgstr "索引 \"%d\" 超出了范围 <0-%d>" -#: ../clients/common/nm-meta-setting-desc.c:1680 +#: ../clients/common/nm-meta-setting-desc.c:1737 #, c-format msgid "invalid option '%s'" msgstr "无效选项 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:1682 +#: ../clients/common/nm-meta-setting-desc.c:1739 msgid "missing option" msgstr "缺少选项" -#: ../clients/common/nm-meta-setting-desc.c:1706 +#: ../clients/common/nm-meta-setting-desc.c:1763 #, c-format msgid "'%s' is not a valid MAC" msgstr "\"%s\" 不是有效的 MAC" -#: ../clients/common/nm-meta-setting-desc.c:1733 -#: ../clients/common/nm-meta-setting-desc.c:1830 -#: ../clients/common/nm-meta-setting-desc.c:4805 +#: ../clients/common/nm-meta-setting-desc.c:1790 +#: ../clients/common/nm-meta-setting-desc.c:1887 +#: ../clients/common/nm-meta-setting-desc.c:4855 ../src/nm-config.c:547 #, c-format msgid "'%s' is not valid" msgstr "\"%s\" 无效" -#: ../clients/common/nm-meta-setting-desc.c:1774 +#: ../clients/common/nm-meta-setting-desc.c:1831 #, c-format msgid "'%u' flags are not valid; use combination of %s" msgstr "\"%u\" 标记无效；请使用 %s 的组合" -#: ../clients/common/nm-meta-setting-desc.c:1810 +#: ../clients/common/nm-meta-setting-desc.c:1867 #, c-format msgid "'%s' is not a valid number (or out of range)" msgstr "\"%s\" 不是有效的数字（或超出范围）" -#: ../clients/common/nm-meta-setting-desc.c:1929 +#: ../clients/common/nm-meta-setting-desc.c:1985 #, c-format msgid "'%s' is not a valid hex character" msgstr "\"%s\" 不是有效十六进制字符" -#: ../clients/common/nm-meta-setting-desc.c:2218 +#: ../clients/common/nm-meta-setting-desc.c:2268 #, c-format msgid "the property doesn't contain EAP method '%s'" msgstr "属性没有包含 EAP 方法 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:2241 +#: ../clients/common/nm-meta-setting-desc.c:2291 #, c-format msgid "the property doesn't contain alternative subject match '%s'" msgstr "属性没有包含符合 \"%s\" 的替换者" -#: ../clients/common/nm-meta-setting-desc.c:2267 +#: ../clients/common/nm-meta-setting-desc.c:2317 #, c-format msgid "the property doesn't contain \"phase2\" alternative subject match '%s'" msgstr "属性没有包含符合 \"%s\" 的 \"phase2\" 替换者" -#: ../clients/common/nm-meta-setting-desc.c:2389 +#: ../clients/common/nm-meta-setting-desc.c:2439 #, c-format msgid "" "Enter a list of bonding options formatted as:\n" @@ -4658,217 +4650,217 @@ 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:2452 +#: ../clients/common/nm-meta-setting-desc.c:2502 #, c-format msgid "Can not change the connection type" msgstr "无法更改连接类型" -#: ../clients/common/nm-meta-setting-desc.c:2555 +#: ../clients/common/nm-meta-setting-desc.c:2605 #, c-format msgid "the property doesn't contain permission '%s'" msgstr "属性没有包含权限 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:2576 +#: ../clients/common/nm-meta-setting-desc.c:2626 #, c-format msgid "'%s' is not valid master; use ifname or connection UUID" msgstr "\"%s\" 不是有效的主连接；使用接口名或连接的 UUID" -#: ../clients/common/nm-meta-setting-desc.c:2673 +#: ../clients/common/nm-meta-setting-desc.c:2723 #, c-format msgid "the value '%s' is not a valid UUID" msgstr "值 \"%s\" 不是有效的 UUID" -#: ../clients/common/nm-meta-setting-desc.c:2680 +#: ../clients/common/nm-meta-setting-desc.c:2730 #, c-format msgid "the property doesn't contain UUID '%s'" msgstr "属性没有包含 UUID \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:2749 +#: ../clients/common/nm-meta-setting-desc.c:2799 msgid "0 (disabled)" msgstr "0（禁用）" -#: ../clients/common/nm-meta-setting-desc.c:2755 +#: ../clients/common/nm-meta-setting-desc.c:2805 msgid "enabled, " msgstr "启用、" -#: ../clients/common/nm-meta-setting-desc.c:2757 +#: ../clients/common/nm-meta-setting-desc.c:2807 msgid "advertise, " msgstr "通告、" -#: ../clients/common/nm-meta-setting-desc.c:2759 +#: ../clients/common/nm-meta-setting-desc.c:2809 msgid "willing, " msgstr "愿意、" -#: ../clients/common/nm-meta-setting-desc.c:2881 +#: ../clients/common/nm-meta-setting-desc.c:2931 #, c-format msgid "'%s' is not a valid DCB flag" msgstr "\"%s\" 不是有效的 DCB 标记" -#: ../clients/common/nm-meta-setting-desc.c:2910 +#: ../clients/common/nm-meta-setting-desc.c:2960 msgid "must contain 8 comma-separated numbers" msgstr "必须包含 8 个用逗号分隔的数字" -#: ../clients/common/nm-meta-setting-desc.c:2926 +#: ../clients/common/nm-meta-setting-desc.c:2976 #, c-format msgid "'%s' not a number between 0 and %u (inclusive) or %u" msgstr "\"%s\" 不是 0 和 %u（包括）之间的数字或是 %u" -#: ../clients/common/nm-meta-setting-desc.c:2929 +#: ../clients/common/nm-meta-setting-desc.c:2979 #, c-format msgid "'%s' not a number between 0 and %u (inclusive)" msgstr "\"%s\" 不是 0 和 %u（包括）之间的数字" -#: ../clients/common/nm-meta-setting-desc.c:2950 +#: ../clients/common/nm-meta-setting-desc.c:3000 #, c-format msgid "changes will have no effect until '%s' includes 1 (enabled)" msgstr "除非 \"%s\" 包含 1（启用），否则更改无法生效" -#: ../clients/common/nm-meta-setting-desc.c:3005 +#: ../clients/common/nm-meta-setting-desc.c:3055 #, c-format msgid "bandwidth percentages must total 100%%" msgstr "带宽百分比总和必须为 100%%" -#: ../clients/common/nm-meta-setting-desc.c:3078 -#: ../clients/common/nm-meta-setting-desc.c:3084 +#: ../clients/common/nm-meta-setting-desc.c:3128 +#: ../clients/common/nm-meta-setting-desc.c:3134 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code" msgstr "SIM 运营商 ID 必须为 5 或 6 个数字的 MCCMNC 代码" -#: ../clients/common/nm-meta-setting-desc.c:3108 +#: ../clients/common/nm-meta-setting-desc.c:3158 #, c-format msgid "'%s' is not a valid IBoIP P_Key" msgstr "\"%s\" 不是有效的 IBoIP P_Key" -#: ../clients/common/nm-meta-setting-desc.c:3131 +#: ../clients/common/nm-meta-setting-desc.c:3181 msgid "default" msgstr "默认" -#: ../clients/common/nm-meta-setting-desc.c:3270 -#: ../clients/common/nm-meta-setting-desc.c:3287 +#: ../clients/common/nm-meta-setting-desc.c:3320 +#: ../clients/common/nm-meta-setting-desc.c:3337 #, c-format msgid "invalid IPv4 address '%s'" msgstr "无效的 IPv4 地址\"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:3293 -#: ../clients/common/nm-meta-setting-desc.c:3537 +#: ../clients/common/nm-meta-setting-desc.c:3343 +#: ../clients/common/nm-meta-setting-desc.c:3587 #, c-format msgid "the property doesn't contain DNS server '%s'" msgstr "属性没有包含 DNS 服务器 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:3331 -#: ../clients/common/nm-meta-setting-desc.c:3575 +#: ../clients/common/nm-meta-setting-desc.c:3381 +#: ../clients/common/nm-meta-setting-desc.c:3625 #, c-format msgid "the property doesn't contain DNS search domain '%s'" msgstr "属性没有包含 DNS 搜索域 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:3368 -#: ../clients/common/nm-meta-setting-desc.c:3612 +#: ../clients/common/nm-meta-setting-desc.c:3418 +#: ../clients/common/nm-meta-setting-desc.c:3662 #, c-format msgid "the property doesn't contain DNS option '%s'" msgstr "属性没有包含 DNS 选项 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:3411 -#: ../clients/common/nm-meta-setting-desc.c:3661 +#: ../clients/common/nm-meta-setting-desc.c:3461 +#: ../clients/common/nm-meta-setting-desc.c:3711 #, c-format msgid "the property doesn't contain IP address '%s'" msgstr "属性没有包含 IP 地址 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:3431 -#: ../clients/common/nm-meta-setting-desc.c:3680 +#: ../clients/common/nm-meta-setting-desc.c:3481 +#: ../clients/common/nm-meta-setting-desc.c:3730 #, c-format msgid "invalid gateway address '%s'" msgstr "无效的网关地址 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:3470 -#: ../clients/common/nm-meta-setting-desc.c:3721 +#: ../clients/common/nm-meta-setting-desc.c:3520 +#: ../clients/common/nm-meta-setting-desc.c:3771 #, c-format msgid "the property doesn't contain route '%s'" msgstr "属性没有包含路由 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:3514 -#: ../clients/common/nm-meta-setting-desc.c:3531 +#: ../clients/common/nm-meta-setting-desc.c:3564 +#: ../clients/common/nm-meta-setting-desc.c:3581 #, c-format msgid "invalid IPv6 address '%s'" msgstr "无效的 IPv6 地址 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:3783 +#: ../clients/common/nm-meta-setting-desc.c:3833 #, c-format msgid "the property doesn't contain interface name '%s'" msgstr "属性没有包含接口名 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:3820 +#: ../clients/common/nm-meta-setting-desc.c:3870 #, c-format msgid "'%s' is not a valid channel; use <1-13>" msgstr "\"%s\" 不是有效的信道；请使用 <1-13>" -#: ../clients/common/nm-meta-setting-desc.c:3912 +#: ../clients/common/nm-meta-setting-desc.c:3962 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:3934 +#: ../clients/common/nm-meta-setting-desc.c:3984 msgid "" "The valid syntax is: '[root | parent <handle>] [handle <handle>] <qdisc>'" msgstr "" "有效语法为：\"[root | parent <句柄>] [handle <句柄>] <排队规则（qdisc）>\"" -#: ../clients/common/nm-meta-setting-desc.c:3958 +#: ../clients/common/nm-meta-setting-desc.c:4008 #, c-format msgid "the property doesn't contain vf with index %u" msgstr "属性没有包含索引为 %u 的虚拟功能（vf）" -#: ../clients/common/nm-meta-setting-desc.c:3985 +#: ../clients/common/nm-meta-setting-desc.c:4035 #, c-format msgid "the property doesn't contain qdisc '%s'" msgstr "属性没有包含排队规则（qdisc） \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:4039 +#: ../clients/common/nm-meta-setting-desc.c:4089 msgid "" "The valid syntax is: '[root | parent <handle>] [handle <handle>] <tfilter>'" msgstr "" "有效语法为：\"[root | parent <处理模块>] [handle <处理模块>] <流量过滤器" "（tfilter）>\"" -#: ../clients/common/nm-meta-setting-desc.c:4062 +#: ../clients/common/nm-meta-setting-desc.c:4112 #, c-format msgid "the property doesn't contain tfilter '%s'" msgstr "属性没有包含流量过滤器（tfilter）\"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:4129 +#: ../clients/common/nm-meta-setting-desc.c:4179 #, c-format msgid "the property doesn't contain string '%s'" msgstr "属性没有包含字符串 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:4204 -#: ../clients/common/nm-meta-setting-desc.c:4278 +#: ../clients/common/nm-meta-setting-desc.c:4254 +#: ../clients/common/nm-meta-setting-desc.c:4328 #, c-format msgid "the property doesn't contain link watcher '%s'" msgstr "属性没有包含链路监视器 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:4384 +#: ../clients/common/nm-meta-setting-desc.c:4434 #, c-format msgid "only one mapping at a time is supported; taking the first one (%s)" msgstr "警告：一次只支持映射一个；使用第一个（%s）" -#: ../clients/common/nm-meta-setting-desc.c:4392 +#: ../clients/common/nm-meta-setting-desc.c:4442 #, c-format msgid "the property doesn't contain mapping '%s'" msgstr "属性没有包含映射 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:4400 +#: ../clients/common/nm-meta-setting-desc.c:4450 msgid "no priority to remove" msgstr "没有要删除的优先级" -#: ../clients/common/nm-meta-setting-desc.c:4404 +#: ../clients/common/nm-meta-setting-desc.c:4454 #, c-format msgid "index '%d' is not in the range of <0-%d>" msgstr "索引 \"%d\" 超出了范围 <0-%d>" -#: ../clients/common/nm-meta-setting-desc.c:4473 +#: ../clients/common/nm-meta-setting-desc.c:4523 #, c-format msgid "'%s' cannot be empty" msgstr "\"%s\" 不能为空" -#: ../clients/common/nm-meta-setting-desc.c:4512 -#: ../clients/common/nm-meta-setting-desc.c:4643 +#: ../clients/common/nm-meta-setting-desc.c:4562 +#: ../clients/common/nm-meta-setting-desc.c:4693 #: ../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 @@ -4878,23 +4870,23 @@ msgstr "\"%s\" 不能为空" msgid "'%s' is not a valid MAC address" msgstr "\"%s\" 不是有效的 MAC 地址" -#: ../clients/common/nm-meta-setting-desc.c:4518 -#: ../clients/common/nm-meta-setting-desc.c:4649 +#: ../clients/common/nm-meta-setting-desc.c:4568 +#: ../clients/common/nm-meta-setting-desc.c:4699 #, c-format msgid "the property doesn't contain MAC address '%s'" msgstr "属性没有包含 MAC 地址 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:4536 +#: ../clients/common/nm-meta-setting-desc.c:4586 #, c-format msgid "'%s' is not valid; 2 or 3 strings should be provided" msgstr "\"%s\" 无效；应提供两至三个字符串" -#: ../clients/common/nm-meta-setting-desc.c:4550 +#: ../clients/common/nm-meta-setting-desc.c:4600 #, c-format msgid "'%s' string value should consist of 1 - 199 characters" msgstr "\"%s\" 字符串值应该由 1～199 个字符组成" -#: ../clients/common/nm-meta-setting-desc.c:4582 +#: ../clients/common/nm-meta-setting-desc.c:4632 #, c-format msgid "" "Enter a list of S/390 options formatted as:\n" @@ -4905,87 +4897,87 @@ msgstr "" " option = <值>, option = <值>,... \n" "有效选项为：%s\n" -#: ../clients/common/nm-meta-setting-desc.c:4616 +#: ../clients/common/nm-meta-setting-desc.c:4666 #, c-format msgid "'%s' is not a valid channel" msgstr "\"%s\" 不是有效的信道" -#: ../clients/common/nm-meta-setting-desc.c:4622 +#: ../clients/common/nm-meta-setting-desc.c:4672 #, c-format msgid "'%ld' is not a valid channel" msgstr "\"%ld\" 不是有效的信道" -#: ../clients/common/nm-meta-setting-desc.c:4705 -#: ../clients/common/nm-meta-setting-desc.c:4741 -#: ../clients/common/nm-meta-setting-desc.c:4777 +#: ../clients/common/nm-meta-setting-desc.c:4755 +#: ../clients/common/nm-meta-setting-desc.c:4791 +#: ../clients/common/nm-meta-setting-desc.c:4827 #, c-format msgid "the property doesn't contain protocol '%s'" msgstr "属性没有包含协议 \"%s\"" -#: ../clients/common/nm-meta-setting-desc.c:4814 +#: ../clients/common/nm-meta-setting-desc.c:4864 #, c-format msgid "" "'%s' not compatible with %s '%s', please change the key or set the right %s " "first." msgstr "\"%s\" 和 %s \"%s\" 不兼容，请先修改密钥或设置正确的 %s。" -#: ../clients/common/nm-meta-setting-desc.c:4824 +#: ../clients/common/nm-meta-setting-desc.c:4874 #, c-format msgid "WEP key is guessed to be of '%s'" msgstr "猜测 WEP 密钥为 \"%s\" 类型" -#: ../clients/common/nm-meta-setting-desc.c:4829 +#: ../clients/common/nm-meta-setting-desc.c:4879 #, c-format msgid "WEP key index set to '%d'" msgstr "WEP 密钥索引已设为 \"%d\"" -#: ../clients/common/nm-meta-setting-desc.c:4868 +#: ../clients/common/nm-meta-setting-desc.c:4918 #, c-format msgid "'%s' is not compatible with '%s' type, please change or delete the key." msgstr "\"%s\" 和 \"%s\" 类型不兼容，请修改或删除密钥。" -#: ../clients/common/nm-meta-setting-desc.c:4878 +#: ../clients/common/nm-meta-setting-desc.c:4928 #, c-format msgid "'%s' is not a valid PSK" msgstr "\"%s\" 不是有效的 PSK" -#: ../clients/common/nm-meta-setting-desc.c:4930 +#: ../clients/common/nm-meta-setting-desc.c:4980 #, c-format msgid "'%s' is not valid; use 'on', 'off', or 'ignore'" msgstr "\"%s\" 无效；请使用 \"on\"、\"off\" 或 \"ignore\"" -#: ../clients/common/nm-meta-setting-desc.c:4989 +#: ../clients/common/nm-meta-setting-desc.c:5039 msgid "Bonding primary interface [none]" msgstr "绑定主要接口 [无]" #. this is a virtual property, only needed during "ask" mode. -#: ../clients/common/nm-meta-setting-desc.c:4996 +#: ../clients/common/nm-meta-setting-desc.c:5046 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:5005 +#: ../clients/common/nm-meta-setting-desc.c:5055 msgid "Bonding miimon [100]" msgstr "绑定 miimon [100]" -#: ../clients/common/nm-meta-setting-desc.c:5013 +#: ../clients/common/nm-meta-setting-desc.c:5063 msgid "Bonding downdelay [0]" msgstr "绑定 downdelay [0]" -#: ../clients/common/nm-meta-setting-desc.c:5021 +#: ../clients/common/nm-meta-setting-desc.c:5071 msgid "Bonding updelay [0]" msgstr "绑定 updelay [0]" -#: ../clients/common/nm-meta-setting-desc.c:5029 +#: ../clients/common/nm-meta-setting-desc.c:5079 msgid "Bonding arp-interval [0]" msgstr "绑定 arp-interval [0]" -#: ../clients/common/nm-meta-setting-desc.c:5037 +#: ../clients/common/nm-meta-setting-desc.c:5087 msgid "Bonding arp-ip-target [none]" msgstr "绑定 arp-ip-target [none]" -#: ../clients/common/nm-meta-setting-desc.c:5045 +#: ../clients/common/nm-meta-setting-desc.c:5095 msgid "LACP rate ('slow' or 'fast') [slow]" msgstr "LACP 速率（\"slow\" 或 \"fast\"）[slow]" @@ -4993,7 +4985,7 @@ msgstr "LACP 速率（\"slow\" 或 \"fast\"）[slow]" #. * 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:5164 +#: ../clients/common/nm-meta-setting-desc.c:5212 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 " @@ -5010,7 +5002,7 @@ msgstr "" "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n" " set team.config /etc/my-team.conf\n" -#: ../clients/common/nm-meta-setting-desc.c:5172 +#: ../clients/common/nm-meta-setting-desc.c:5220 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 " @@ -5057,7 +5049,7 @@ msgstr "" " 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:5222 +#: ../clients/common/nm-meta-setting-desc.c:5270 msgid "" "Enter file path to CA certificate (optionally prefixed with file://).\n" " [file://]<file path>\n" @@ -5069,7 +5061,7 @@ msgstr "" "请注意，nmcli 不支持将证书指定为原始比特块（blob）数据。\n" "示例：/home/cimrman/cacert.crt\n" -#: ../clients/common/nm-meta-setting-desc.c:5256 +#: ../clients/common/nm-meta-setting-desc.c:5304 msgid "" "Enter file path to client certificate (optionally prefixed with file://).\n" " [file://]<file path>\n" @@ -5081,7 +5073,7 @@ msgstr "" "请注意，nmcli 不支持将证书指定为原始比特块（blob）数据。\n" "示例：/home/cimrman/jara.crt\n" -#: ../clients/common/nm-meta-setting-desc.c:5313 +#: ../clients/common/nm-meta-setting-desc.c:5361 msgid "" "Enter file path to CA certificate for inner authentication (optionally " "prefixed\n" @@ -5095,7 +5087,7 @@ msgstr "" "请注意，nmcli 不支持将证书指定为原始比特块（blob）数据。\n" "示例：/home/cimrman/ca-zweite-phase.crt\n" -#: ../clients/common/nm-meta-setting-desc.c:5348 +#: ../clients/common/nm-meta-setting-desc.c:5396 msgid "" "Enter file path to client certificate for inner authentication (optionally " "prefixed\n" @@ -5109,7 +5101,7 @@ msgstr "" "请注意，nmcli 不支持将证书指定为原始比特块（blob）数据。\n" "示例：/home/cimrman/jara-zweite-phase.crt\n" -#: ../clients/common/nm-meta-setting-desc.c:5375 +#: ../clients/common/nm-meta-setting-desc.c:5423 msgid "" "Enter bytes as a list of hexadecimal values.\n" "Two formats are accepted:\n" @@ -5130,8 +5122,8 @@ msgstr "" "例如：ab0455a6ea3a74C2\n" " ab 4 55 0xa6 ea 3a 74 C2\n" -#: ../clients/common/nm-meta-setting-desc.c:5392 -#: ../clients/common/nm-meta-setting-desc.c:5410 +#: ../clients/common/nm-meta-setting-desc.c:5440 +#: ../clients/common/nm-meta-setting-desc.c:5458 msgid "" "Enter path to a private key and the key password (if not set yet):\n" " [file://]<file path> [<password>]\n" @@ -5143,84 +5135,84 @@ msgstr "" "请注意，nmcli 不支持将私有密钥指定为原始比特块（blob）数据。\n" "示例：/home/cimrman/jara-priv-key Dardanely\n" -#: ../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/common/nm-meta-setting-desc.c:5497 +#: ../clients/common/nm-secret-agent-simple.c:265 +#: ../clients/common/nm-secret-agent-simple.c:363 #: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332 msgid "Username" msgstr "用户名" -#: ../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 +#: ../clients/common/nm-meta-setting-desc.c:5503 +#: ../clients/common/nm-meta-setting-desc.c:5687 +#: ../clients/common/nm-meta-setting-desc.c:6060 +#: ../clients/common/nm-meta-setting-desc.c:6720 msgid "Password [none]" msgstr "密码 [无]" -#: ../clients/common/nm-meta-setting-desc.c:5501 +#: ../clients/common/nm-meta-setting-desc.c:5549 msgid "Bluetooth device address" msgstr "蓝牙设备地址" -#: ../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 +#: ../clients/common/nm-meta-setting-desc.c:5594 +#: ../clients/common/nm-meta-setting-desc.c:6114 +#: ../clients/common/nm-meta-setting-desc.c:7446 +#: ../clients/common/nm-meta-setting-desc.c:7484 +#: ../clients/common/nm-meta-setting-desc.c:7621 +#: ../clients/common/nm-meta-setting-desc.c:7839 msgid "MAC [none]" msgstr "MAC [无]" -#: ../clients/common/nm-meta-setting-desc.c:5552 +#: ../clients/common/nm-meta-setting-desc.c:5600 msgid "Enable STP [no]" msgstr "启用 STP [否]" -#: ../clients/common/nm-meta-setting-desc.c:5558 +#: ../clients/common/nm-meta-setting-desc.c:5606 msgid "STP priority [32768]" msgstr "STP 优先级 [32768]" -#: ../clients/common/nm-meta-setting-desc.c:5564 +#: ../clients/common/nm-meta-setting-desc.c:5612 msgid "Forward delay [15]" msgstr "转发延时 [15]" -#: ../clients/common/nm-meta-setting-desc.c:5570 +#: ../clients/common/nm-meta-setting-desc.c:5618 msgid "Hello time [2]" msgstr "呼叫时间 [2]" -#: ../clients/common/nm-meta-setting-desc.c:5576 +#: ../clients/common/nm-meta-setting-desc.c:5624 msgid "Max age [20]" msgstr "最大寿命 [20]" -#: ../clients/common/nm-meta-setting-desc.c:5582 +#: ../clients/common/nm-meta-setting-desc.c:5630 msgid "MAC address ageing time [300]" msgstr "MAC 地址老化时间 [300]" -#: ../clients/common/nm-meta-setting-desc.c:5588 +#: ../clients/common/nm-meta-setting-desc.c:5636 msgid "Group forward mask [0]" msgstr "组前向掩码 [0]" -#: ../clients/common/nm-meta-setting-desc.c:5594 +#: ../clients/common/nm-meta-setting-desc.c:5642 msgid "Enable IGMP snooping [no]" msgstr "启用 IGMP 监听 [否]" -#: ../clients/common/nm-meta-setting-desc.c:5606 +#: ../clients/common/nm-meta-setting-desc.c:5654 msgid "Bridge port priority [32]" msgstr "网桥端口优先级 [32]" -#: ../clients/common/nm-meta-setting-desc.c:5612 +#: ../clients/common/nm-meta-setting-desc.c:5660 msgid "Bridge port STP path cost [100]" msgstr "网桥端口 STP 路径开销 [100]" -#: ../clients/common/nm-meta-setting-desc.c:5618 +#: ../clients/common/nm-meta-setting-desc.c:5666 msgid "Hairpin [no]" msgstr "Hairpin [否]" -#: ../clients/common/nm-meta-setting-desc.c:5633 -#: ../clients/common/nm-meta-setting-desc.c:5998 -#: ../clients/common/nm-meta-setting-desc.c:7281 +#: ../clients/common/nm-meta-setting-desc.c:5681 +#: ../clients/common/nm-meta-setting-desc.c:6054 +#: ../clients/common/nm-meta-setting-desc.c:7336 msgid "Username [none]" msgstr "用户名 [无]" -#: ../clients/common/nm-meta-setting-desc.c:5736 +#: ../clients/common/nm-meta-setting-desc.c:5784 msgid "" "Enter a list of user permissions. This is a list of user names formatted " "as:\n" @@ -5235,7 +5227,7 @@ msgstr "" "\n" "例如：alice bob charlie\n" -#: ../clients/common/nm-meta-setting-desc.c:5778 +#: ../clients/common/nm-meta-setting-desc.c:5826 msgid "" "Enter secondary connections that should be activated when this connection " "is\n" @@ -5255,7 +5247,7 @@ msgstr "" "\n" "示例：private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n" -#: ../clients/common/nm-meta-setting-desc.c:5795 +#: ../clients/common/nm-meta-setting-desc.c:5843 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" @@ -5269,25 +5261,25 @@ msgstr "" "\"false\"、\"no\"、\"off\"，设置连接为不计流量的\n" "\"unknown\"，让网络管理器（NetworkManager）使用一些启发式算法来选择值\n" -#: ../clients/common/nm-meta-setting-desc.c:6015 +#: ../clients/common/nm-meta-setting-desc.c:6071 msgid "APN" msgstr "APN" -#: ../clients/common/nm-meta-setting-desc.c:6067 -#: ../clients/common/nm-meta-setting-desc.c:7454 -#: ../clients/common/nm-meta-setting-desc.c:7600 +#: ../clients/common/nm-meta-setting-desc.c:6123 +#: ../clients/common/nm-meta-setting-desc.c:7509 +#: ../clients/common/nm-meta-setting-desc.c:7655 msgid "MTU [auto]" msgstr "MTU [自动]" -#: ../clients/common/nm-meta-setting-desc.c:6086 +#: ../clients/common/nm-meta-setting-desc.c:6142 msgid "P_KEY [none]" msgstr "P_KEY [无]" -#: ../clients/common/nm-meta-setting-desc.c:6095 +#: ../clients/common/nm-meta-setting-desc.c:6151 msgid "Parent interface [none]" msgstr "上级接口 [无]" -#: ../clients/common/nm-meta-setting-desc.c:6118 +#: ../clients/common/nm-meta-setting-desc.c:6174 msgid "" "Enter a list of IPv4 addresses of DNS servers.\n" "\n" @@ -5297,11 +5289,11 @@ msgstr "" "\n" "示例：8.8.8.8, 8.8.4.4\n" -#: ../clients/common/nm-meta-setting-desc.c:6150 +#: ../clients/common/nm-meta-setting-desc.c:6206 msgid "IPv4 address (IP[/plen]) [none]" msgstr "IPv4 地址（IP[/plen]）[无]" -#: ../clients/common/nm-meta-setting-desc.c:6152 +#: ../clients/common/nm-meta-setting-desc.c:6208 msgid "" "Enter a list of IPv4 addresses formatted as:\n" " ip[/prefix], ip[/prefix],...\n" @@ -5315,11 +5307,11 @@ msgstr "" "\n" "示例：192.168.1.5/24, 10.0.0.11/24\n" -#: ../clients/common/nm-meta-setting-desc.c:6165 +#: ../clients/common/nm-meta-setting-desc.c:6221 msgid "IPv4 gateway [none]" msgstr "IPv4 网关 [无]" -#: ../clients/common/nm-meta-setting-desc.c:6173 +#: ../clients/common/nm-meta-setting-desc.c:6229 msgid "" "Enter a list of IPv4 routes formatted as:\n" " ip[/prefix] [next-hop] [metric],...\n" @@ -5340,7 +5332,7 @@ msgstr "" "示例：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" -#: ../clients/common/nm-meta-setting-desc.c:6275 +#: ../clients/common/nm-meta-setting-desc.c:6331 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 " @@ -5358,11 +5350,11 @@ msgstr "" "\n" "示例：2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n" -#: ../clients/common/nm-meta-setting-desc.c:6313 +#: ../clients/common/nm-meta-setting-desc.c:6369 msgid "IPv6 address (IP[/plen]) [none]" msgstr "IPv6 地址（IP[/plen]）[无]" -#: ../clients/common/nm-meta-setting-desc.c:6315 +#: ../clients/common/nm-meta-setting-desc.c:6371 msgid "" "Enter a list of IPv6 addresses formatted as:\n" " ip[/prefix], ip[/prefix],...\n" @@ -5376,11 +5368,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:6328 +#: ../clients/common/nm-meta-setting-desc.c:6384 msgid "IPv6 gateway [none]" msgstr "IPv6 网关 [无]" -#: ../clients/common/nm-meta-setting-desc.c:6336 +#: ../clients/common/nm-meta-setting-desc.c:6392 msgid "" "Enter a list of IPv6 routes formatted as:\n" " ip[/prefix] [next-hop] [metric],...\n" @@ -5403,162 +5395,162 @@ msgstr "" "beef::3 2\n" " abbe::/64 55\n" -#: ../clients/common/nm-meta-setting-desc.c:6441 -#: ../clients/common/nm-meta-setting-desc.c:7314 +#: ../clients/common/nm-meta-setting-desc.c:6497 +#: ../clients/common/nm-meta-setting-desc.c:7369 msgid "Parent device [none]" msgstr "上级设备 [无]" -#: ../clients/common/nm-meta-setting-desc.c:6447 +#: ../clients/common/nm-meta-setting-desc.c:6503 msgid "Local endpoint [none]" msgstr "本地端点 [无]" -#: ../clients/common/nm-meta-setting-desc.c:6454 -#: ../clients/common/nm-meta-setting-desc.c:7334 +#: ../clients/common/nm-meta-setting-desc.c:6510 +#: ../clients/common/nm-meta-setting-desc.c:7389 msgid "Remote" msgstr "远程" -#: ../clients/common/nm-meta-setting-desc.c:6499 +#: ../clients/common/nm-meta-setting-desc.c:6555 msgid "MACsec parent device or connection UUID" msgstr "MACsec 上级设备或连接 UUID" -#: ../clients/common/nm-meta-setting-desc.c:6520 +#: ../clients/common/nm-meta-setting-desc.c:6576 msgid "Enable encryption [yes]" msgstr "启用加密 [是]" -#: ../clients/common/nm-meta-setting-desc.c:6526 -#: ../clients/common/nm-secret-agent-simple.c:534 +#: ../clients/common/nm-meta-setting-desc.c:6582 +#: ../clients/common/nm-secret-agent-simple.c:835 msgid "MKA CAK" msgstr "MKA CAK" -#: ../clients/common/nm-meta-setting-desc.c:6536 +#: ../clients/common/nm-meta-setting-desc.c:6592 msgid "MKA_CKN" msgstr "MKA_CKN" -#: ../clients/common/nm-meta-setting-desc.c:6542 +#: ../clients/common/nm-meta-setting-desc.c:6598 msgid "SCI port [1]" msgstr "SCI 端口 [1]" -#: ../clients/common/nm-meta-setting-desc.c:6568 +#: ../clients/common/nm-meta-setting-desc.c:6624 msgid "MACVLAN parent device or connection UUID" msgstr "MACVLAN 上级设备或连接 UUID" -#: ../clients/common/nm-meta-setting-desc.c:6589 +#: ../clients/common/nm-meta-setting-desc.c:6645 msgid "Tap [no]" msgstr "Tap [否]" -#: ../clients/common/nm-meta-setting-desc.c:6615 -#: ../clients/common/nm-meta-setting-desc.c:7521 +#: ../clients/common/nm-meta-setting-desc.c:6671 +#: ../clients/common/nm-meta-setting-desc.c:7576 #: ../clients/tui/nmt-page-wifi.c:224 msgid "SSID" msgstr "SSID" -#: ../clients/common/nm-meta-setting-desc.c:6624 +#: ../clients/common/nm-meta-setting-desc.c:6680 msgid "OLPC Mesh channel [1]" msgstr "OLPC Mesh 信道 [1]" -#: ../clients/common/nm-meta-setting-desc.c:6633 +#: ../clients/common/nm-meta-setting-desc.c:6689 msgid "DHCP anycast MAC address [none]" msgstr "DHCP 任意广播 MAC 地址 [无]" -#: ../clients/common/nm-meta-setting-desc.c:6645 +#: ../clients/common/nm-meta-setting-desc.c:6701 msgid "PPPoE parent device" msgstr "PPPoE 上级设备" -#: ../clients/common/nm-meta-setting-desc.c:6651 +#: ../clients/common/nm-meta-setting-desc.c:6707 msgid "Service [none]" msgstr "服务 [无]" -#: ../clients/common/nm-meta-setting-desc.c:6658 +#: ../clients/common/nm-meta-setting-desc.c:6714 msgid "PPPoE username" msgstr "PPPoE 用户名" -#: ../clients/common/nm-meta-setting-desc.c:6832 +#: ../clients/common/nm-meta-setting-desc.c:6888 msgid "Browser only [no]" msgstr "仅浏览器 [否]" -#: ../clients/common/nm-meta-setting-desc.c:6838 +#: ../clients/common/nm-meta-setting-desc.c:6894 msgid "PAC URL" msgstr "PAC URL" -#: ../clients/common/nm-meta-setting-desc.c:6844 +#: ../clients/common/nm-meta-setting-desc.c:6900 msgid "PAC script" msgstr "PAC 脚本" -#: ../clients/common/nm-meta-setting-desc.c:6879 -#: ../clients/common/nm-meta-setting-desc.c:7028 +#: ../clients/common/nm-meta-setting-desc.c:6935 +#: ../clients/common/nm-meta-setting-desc.c:7084 msgid "Team JSON configuration [none]" msgstr "组合 JSON 配置 [无]" -#: ../clients/common/nm-meta-setting-desc.c:7184 +#: ../clients/common/nm-meta-setting-desc.c:7239 msgid "User ID [none]" msgstr "用户 ID [无]" -#: ../clients/common/nm-meta-setting-desc.c:7190 +#: ../clients/common/nm-meta-setting-desc.c:7245 msgid "Group ID [none]" msgstr "分组 ID [无]" -#: ../clients/common/nm-meta-setting-desc.c:7196 +#: ../clients/common/nm-meta-setting-desc.c:7251 msgid "Enable PI [no]" msgstr "启用 PI [否]" -#: ../clients/common/nm-meta-setting-desc.c:7202 +#: ../clients/common/nm-meta-setting-desc.c:7257 msgid "Enable VNET header [no]" msgstr "启用 VNET 首部 [否]" -#: ../clients/common/nm-meta-setting-desc.c:7208 +#: ../clients/common/nm-meta-setting-desc.c:7263 msgid "Enable multi queue [no]" msgstr "启用多队列 [否]" -#: ../clients/common/nm-meta-setting-desc.c:7221 +#: ../clients/common/nm-meta-setting-desc.c:7276 msgid "VLAN parent device or connection UUID" msgstr "VLAN 上级设备或连接 UUID" -#: ../clients/common/nm-meta-setting-desc.c:7228 +#: ../clients/common/nm-meta-setting-desc.c:7283 msgid "VLAN ID (<0-4094>)" msgstr "VLAN ID <0-4095>" -#: ../clients/common/nm-meta-setting-desc.c:7234 +#: ../clients/common/nm-meta-setting-desc.c:7289 msgid "VLAN flags (<0-7>) [none]" msgstr "VLAN 标记（<0-7>）[无]" -#: ../clients/common/nm-meta-setting-desc.c:7243 +#: ../clients/common/nm-meta-setting-desc.c:7298 msgid "Ingress priority maps [none]" msgstr "入口优先级映射 [无]" -#: ../clients/common/nm-meta-setting-desc.c:7253 +#: ../clients/common/nm-meta-setting-desc.c:7308 msgid "Egress priority maps [none]" msgstr "出口优先级映射 [无]" -#: ../clients/common/nm-meta-setting-desc.c:7321 +#: ../clients/common/nm-meta-setting-desc.c:7376 msgid "VXLAN ID" msgstr "VXLAN ID" -#: ../clients/common/nm-meta-setting-desc.c:7327 +#: ../clients/common/nm-meta-setting-desc.c:7382 msgid "Local address [none]" msgstr "本地地址 [无]" -#: ../clients/common/nm-meta-setting-desc.c:7340 +#: ../clients/common/nm-meta-setting-desc.c:7395 msgid "Minimum source port [0]" msgstr "最小来源端口 [0]" -#: ../clients/common/nm-meta-setting-desc.c:7346 +#: ../clients/common/nm-meta-setting-desc.c:7401 msgid "Maximum source port [0]" msgstr "最大来源端口 [0]" -#: ../clients/common/nm-meta-setting-desc.c:7352 +#: ../clients/common/nm-meta-setting-desc.c:7407 msgid "Destination port [8472]" msgstr "目标端口 [8472]" -#: ../clients/common/nm-meta-setting-desc.c:7398 +#: ../clients/common/nm-meta-setting-desc.c:7453 msgid "WiMAX NSP name" msgstr "WiMAX NSP 名称" -#: ../clients/common/nm-meta-setting-desc.c:7435 -#: ../clients/common/nm-meta-setting-desc.c:7571 +#: ../clients/common/nm-meta-setting-desc.c:7490 +#: ../clients/common/nm-meta-setting-desc.c:7626 msgid "Cloned MAC [none]" msgstr "克隆的 MAC 地址 [无]" -#: ../clients/common/nm-meta-setting-desc.c:7462 +#: ../clients/common/nm-meta-setting-desc.c:7517 msgid "" "Enter a list of subchannels (comma or space separated).\n" "\n" @@ -5568,7 +5560,7 @@ msgstr "" "\n" "示例：0.0.0e20 0.0.0e21 0.0.0e22\n" -#: ../clients/common/nm-meta-setting-desc.c:7730 +#: ../clients/common/nm-meta-setting-desc.c:7785 msgid "" "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, " "and 2 or passphrase.\n" @@ -5576,201 +5568,213 @@ msgstr "" "输入 WEP 密钥类型。可接受的值为：0 或者 unknown、1 或者 key, 以及 2 或者 " "passphrase。\n" -#: ../clients/common/nm-meta-setting-desc.c:7792 +#: ../clients/common/nm-meta-setting-desc.c:7847 msgid "Short address (<0x0000-0xffff>)" msgstr "短地址（<0x0000-0xffff>）" -#: ../clients/common/nm-meta-setting-desc.c:7808 +#: ../clients/common/nm-meta-setting-desc.c:7863 msgid "PAN Identifier (<0x0000-0xffff>)" msgstr "PAN 标识符（<0x0000-0xffff>）" -#: ../clients/common/nm-meta-setting-desc.c:7830 +#: ../clients/common/nm-meta-setting-desc.c:7878 +#, fuzzy +msgid "Page (<default|0-31>)" +msgstr "（默认）" + +#: ../clients/common/nm-meta-setting-desc.c:7892 +msgid "Channel (<default|0-26>)" +msgstr "" + +#: ../clients/common/nm-meta-setting-desc.c:7913 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:7957 +#: ../clients/common/nm-meta-setting-desc.c:8040 msgid "802-1x settings" msgstr "802-1x 设置" -#: ../clients/common/nm-meta-setting-desc.c:7958 +#: ../clients/common/nm-meta-setting-desc.c:8041 #: ../src/devices/adsl/nm-device-adsl.c:133 msgid "ADSL connection" msgstr "ADSL 连接" -#: ../clients/common/nm-meta-setting-desc.c:7959 +#: ../clients/common/nm-meta-setting-desc.c:8042 msgid "bluetooth connection" msgstr "蓝牙连接" -#: ../clients/common/nm-meta-setting-desc.c:7960 +#: ../clients/common/nm-meta-setting-desc.c:8043 msgid "Bond device" msgstr "绑定设备" -#: ../clients/common/nm-meta-setting-desc.c:7961 +#: ../clients/common/nm-meta-setting-desc.c:8044 msgid "Bridge device" msgstr "网桥设备" -#: ../clients/common/nm-meta-setting-desc.c:7962 +#: ../clients/common/nm-meta-setting-desc.c:8045 msgid "Bridge port" msgstr "网桥端口" -#: ../clients/common/nm-meta-setting-desc.c:7963 +#: ../clients/common/nm-meta-setting-desc.c:8046 msgid "CDMA mobile broadband connection" msgstr "CDMA 移动宽带连接" -#: ../clients/common/nm-meta-setting-desc.c:7964 +#: ../clients/common/nm-meta-setting-desc.c:8047 msgid "General settings" msgstr "常规设置" -#: ../clients/common/nm-meta-setting-desc.c:7965 +#: ../clients/common/nm-meta-setting-desc.c:8048 msgid "DCB settings" msgstr "DCB 设置" -#: ../clients/common/nm-meta-setting-desc.c:7966 +#: ../clients/common/nm-meta-setting-desc.c:8049 msgid "Dummy settings" msgstr "虚拟设置" -#: ../clients/common/nm-meta-setting-desc.c:7967 +#: ../clients/common/nm-meta-setting-desc.c:8050 msgid "Ethtool settings" msgstr "Ethtool 设置" -#: ../clients/common/nm-meta-setting-desc.c:7968 +#: ../clients/common/nm-meta-setting-desc.c:8051 msgid "Generic settings" msgstr "通用设置" -#: ../clients/common/nm-meta-setting-desc.c:7969 +#: ../clients/common/nm-meta-setting-desc.c:8052 msgid "GSM mobile broadband connection" msgstr "GSM 移动宽带连接" -#: ../clients/common/nm-meta-setting-desc.c:7970 -#: ../src/devices/nm-device-infiniband.c:170 +#: ../clients/common/nm-meta-setting-desc.c:8053 +#: ../src/devices/nm-device-infiniband.c:172 msgid "InfiniBand connection" msgstr "InfiniBand 连接" -#: ../clients/common/nm-meta-setting-desc.c:7971 +#: ../clients/common/nm-meta-setting-desc.c:8054 msgid "IPv4 protocol" msgstr "IPv4 协议" -#: ../clients/common/nm-meta-setting-desc.c:7972 +#: ../clients/common/nm-meta-setting-desc.c:8055 msgid "IPv6 protocol" msgstr "IPv6 协议" -#: ../clients/common/nm-meta-setting-desc.c:7973 +#: ../clients/common/nm-meta-setting-desc.c:8056 msgid "IP-tunnel settings" msgstr "IP 隧道设置" -#: ../clients/common/nm-meta-setting-desc.c:7974 +#: ../clients/common/nm-meta-setting-desc.c:8057 msgid "MACsec connection" msgstr "MACsec 连接" -#: ../clients/common/nm-meta-setting-desc.c:7975 +#: ../clients/common/nm-meta-setting-desc.c:8058 msgid "macvlan connection" msgstr "macvlan 连接" -#: ../clients/common/nm-meta-setting-desc.c:7976 +#: ../clients/common/nm-meta-setting-desc.c:8059 msgid "Match" msgstr "匹配" -#: ../clients/common/nm-meta-setting-desc.c:7977 +#: ../clients/common/nm-meta-setting-desc.c:8060 msgid "OLPC Mesh connection" msgstr "OLPC Mesh 连接" -#: ../clients/common/nm-meta-setting-desc.c:7978 -msgid "OpenVSwitch bridge settings" +#: ../clients/common/nm-meta-setting-desc.c:8061 +#, fuzzy +msgid "Open vSwitch bridge settings" msgstr "OpenVSwitch 网桥设置" -#: ../clients/common/nm-meta-setting-desc.c:7979 -msgid "OpenVSwitch interface settings" +#: ../clients/common/nm-meta-setting-desc.c:8062 +#, fuzzy +msgid "Open vSwitch interface settings" msgstr "OpenVSwitch 接口设置" -#: ../clients/common/nm-meta-setting-desc.c:7980 -msgid "OpenVSwitch patch interface settings" +#: ../clients/common/nm-meta-setting-desc.c:8063 +#, fuzzy +msgid "Open vSwitch patch interface settings" msgstr "OpenVSwitch 插线接口设置" -#: ../clients/common/nm-meta-setting-desc.c:7981 -msgid "OpenVSwitch port settings" +#: ../clients/common/nm-meta-setting-desc.c:8064 +#, fuzzy +msgid "Open vSwitch port settings" msgstr "OpenVSwitch 端口设置" -#: ../clients/common/nm-meta-setting-desc.c:7982 +#: ../clients/common/nm-meta-setting-desc.c:8065 msgid "PPP settings" msgstr "PPP 设置" -#: ../clients/common/nm-meta-setting-desc.c:7983 +#: ../clients/common/nm-meta-setting-desc.c:8066 msgid "PPPoE" msgstr "PPPoE" -#: ../clients/common/nm-meta-setting-desc.c:7984 +#: ../clients/common/nm-meta-setting-desc.c:8067 msgid "Proxy" msgstr "代理" -#: ../clients/common/nm-meta-setting-desc.c:7985 +#: ../clients/common/nm-meta-setting-desc.c:8068 msgid "Serial settings" msgstr "串行设置" -#: ../clients/common/nm-meta-setting-desc.c:7986 -#| msgid "802-1x settings" +#: ../clients/common/nm-meta-setting-desc.c:8069 msgid "SR-IOV settings" msgstr "SR-IOV 设置" -#: ../clients/common/nm-meta-setting-desc.c:7987 +#: ../clients/common/nm-meta-setting-desc.c:8070 msgid "Traffic controls" msgstr "流量控制" -#: ../clients/common/nm-meta-setting-desc.c:7988 +#: ../clients/common/nm-meta-setting-desc.c:8071 msgid "Team device" msgstr "组合设备" -#: ../clients/common/nm-meta-setting-desc.c:7989 +#: ../clients/common/nm-meta-setting-desc.c:8072 msgid "Team port" msgstr "组合端口" -#: ../clients/common/nm-meta-setting-desc.c:7990 +#: ../clients/common/nm-meta-setting-desc.c:8073 msgid "Tun device" msgstr "Tun 设备" -#: ../clients/common/nm-meta-setting-desc.c:7991 +#: ../clients/common/nm-meta-setting-desc.c:8074 msgid "User settings" msgstr "用户设置" -#: ../clients/common/nm-meta-setting-desc.c:7992 +#: ../clients/common/nm-meta-setting-desc.c:8075 #: ../src/devices/nm-device-vlan.c:400 msgid "VLAN connection" msgstr "VLAN 连接" -#: ../clients/common/nm-meta-setting-desc.c:7993 ../src/nm-manager.c:5126 +#: ../clients/common/nm-meta-setting-desc.c:8076 ../src/nm-manager.c:5488 msgid "VPN connection" msgstr "VPN 连接" -#: ../clients/common/nm-meta-setting-desc.c:7994 -#: ../src/devices/nm-device-vxlan.c:370 +#: ../clients/common/nm-meta-setting-desc.c:8077 +#: ../src/devices/nm-device-vxlan.c:371 msgid "VXLAN connection" msgstr "VXLAN 连接" -#: ../clients/common/nm-meta-setting-desc.c:7995 +#: ../clients/common/nm-meta-setting-desc.c:8078 msgid "WiMAX connection" msgstr "WiMAX 连接" -#: ../clients/common/nm-meta-setting-desc.c:7996 +#: ../clients/common/nm-meta-setting-desc.c:8079 msgid "Wired Ethernet" msgstr "有线以太网" -#: ../clients/common/nm-meta-setting-desc.c:7997 +#: ../clients/common/nm-meta-setting-desc.c:8080 msgid "Wi-Fi connection" msgstr "Wi-Fi 连接" -#: ../clients/common/nm-meta-setting-desc.c:7998 +#: ../clients/common/nm-meta-setting-desc.c:8081 msgid "Wi-Fi security settings" msgstr "Wi-Fi 安全设置" -#: ../clients/common/nm-meta-setting-desc.c:7999 +#: ../clients/common/nm-meta-setting-desc.c:8082 msgid "WPAN settings" msgstr "WPAN 设置" -#: ../clients/common/nm-meta-setting-desc.c:8000 +#: ../clients/common/nm-meta-setting-desc.c:8083 msgid "6LOWPAN settings" msgstr "6LOWPAN 设置" -#: ../clients/common/nm-meta-setting-desc.c:8351 +#: ../clients/common/nm-meta-setting-desc.c:8434 msgid "name" msgstr "名称" @@ -5778,13 +5782,13 @@ msgstr "名称" msgid "An authentication session is already underway." msgstr "验证会话已在进行。" -#: ../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-secret-agent-simple.c:271 +#: ../clients/common/nm-secret-agent-simple.c:311 +#: ../clients/common/nm-secret-agent-simple.c:339 +#: ../clients/common/nm-secret-agent-simple.c:375 +#: ../clients/common/nm-secret-agent-simple.c:820 +#: ../clients/common/nm-secret-agent-simple.c:852 +#: ../clients/common/nm-secret-agent-simple.c:874 #: ../clients/common/nm-vpn-helpers.c:119 #: ../clients/common/nm-vpn-helpers.c:123 #: ../clients/common/nm-vpn-helpers.c:129 @@ -5794,93 +5798,94 @@ msgstr "验证会话已在进行。" msgid "Password" msgstr "密码" -#: ../clients/common/nm-secret-agent-simple.c:265 +#: ../clients/common/nm-secret-agent-simple.c:281 msgid "Identity" msgstr "身份" -#: ../clients/common/nm-secret-agent-simple.c:271 +#: ../clients/common/nm-secret-agent-simple.c:287 msgid "Private key password" msgstr "私钥密码" -#: ../clients/common/nm-secret-agent-simple.c:310 +#: ../clients/common/nm-secret-agent-simple.c:326 #: ../clients/tui/nmt-page-wifi.c:289 msgid "Key" msgstr "密钥" -#: ../clients/common/nm-secret-agent-simple.c:353 +#: ../clients/common/nm-secret-agent-simple.c:369 #: ../clients/tui/nmt-page-dsl.c:78 msgid "Service" msgstr "服务" -#: ../clients/common/nm-secret-agent-simple.c:484 +#: ../clients/common/nm-secret-agent-simple.c:548 +#: ../clients/common/nm-secret-agent-simple.c:816 +#: ../clients/common/nm-secret-agent-simple.c:848 +#: ../clients/common/nm-secret-agent-simple.c:870 +#: ../clients/common/nm-secret-agent-simple.c:892 +#, c-format +msgid "A password is required to connect to '%s'." +msgstr "需要密码来连接到 \"%s\"。" + +#: ../clients/common/nm-secret-agent-simple.c:785 msgid "Authentication required by wireless network" msgstr "无线网络要求身份验证" -#: ../clients/common/nm-secret-agent-simple.c:485 +#: ../clients/common/nm-secret-agent-simple.c:786 #, c-format msgid "" "Passwords or encryption keys are required to access the wireless network " "'%s'." msgstr "需要密码或密钥来访问无线网络 \"%s\"。" -#: ../clients/common/nm-secret-agent-simple.c:489 +#: ../clients/common/nm-secret-agent-simple.c:790 msgid "Wired 802.1X authentication" msgstr "有线 802.1X 身份验证" -#: ../clients/common/nm-secret-agent-simple.c:490 +#: ../clients/common/nm-secret-agent-simple.c:791 #, c-format msgid "Secrets are required to access the wired network '%s'" msgstr "需要密钥来访问有线网络 \"%s\"。" -#: ../clients/common/nm-secret-agent-simple.c:495 +#: ../clients/common/nm-secret-agent-simple.c:796 msgid "DSL authentication" msgstr "DSL 身份验证" -#: ../clients/common/nm-secret-agent-simple.c:496 +#: ../clients/common/nm-secret-agent-simple.c:797 #, c-format msgid "Secrets are required for the DSL connection '%s'" msgstr "DSL 连接 \"%s\" 需要密钥。" -#: ../clients/common/nm-secret-agent-simple.c:504 +#: ../clients/common/nm-secret-agent-simple.c:805 msgid "PIN code required" msgstr "需要 PIN 码" -#: ../clients/common/nm-secret-agent-simple.c:505 +#: ../clients/common/nm-secret-agent-simple.c:806 msgid "PIN code is needed for the mobile broadband device" msgstr "移动宽带设备需要 PIN 码" -#: ../clients/common/nm-secret-agent-simple.c:508 +#: ../clients/common/nm-secret-agent-simple.c:809 msgid "PIN" msgstr "PIN" -#: ../clients/common/nm-secret-agent-simple.c:514 -#: ../clients/common/nm-secret-agent-simple.c:546 -#: ../clients/common/nm-secret-agent-simple.c:568 +#: ../clients/common/nm-secret-agent-simple.c:815 +#: ../clients/common/nm-secret-agent-simple.c:847 +#: ../clients/common/nm-secret-agent-simple.c:869 msgid "Mobile broadband network password" msgstr "移动宽带网络密码" -#: ../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\"。" - -#: ../clients/common/nm-secret-agent-simple.c:528 +#: ../clients/common/nm-secret-agent-simple.c:829 #, c-format msgid "Secrets are required to access the MACsec network '%s'" msgstr "需要密钥来访问 MACsec 网络 \"%s\"。" -#: ../clients/common/nm-secret-agent-simple.c:532 +#: ../clients/common/nm-secret-agent-simple.c:833 msgid "MACsec PSK authentication" msgstr "MACsec PSK 身份验证" -#: ../clients/common/nm-secret-agent-simple.c:540 +#: ../clients/common/nm-secret-agent-simple.c:841 msgid "MACsec EAP authentication" msgstr "MACsec EAP 身份验证" -#: ../clients/common/nm-secret-agent-simple.c:581 +#: ../clients/common/nm-secret-agent-simple.c:882 msgid "VPN password required" msgstr "需要 VPN 密码" @@ -6057,14 +6062,17 @@ msgstr "" "的 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. 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." +#, fuzzy +msgid "" +"If TRUE, indicates that the network is a non-broadcasting network that hides " +"its SSID. This works both in infrastructure and AP mode. In infrastructure " +"mode, various workarounds are used for a more reliable discovery of hidden " +"networks, such as probe-scanning the SSID. However, these workarounds " +"expose inherent insecurities with hidden SSID networks, and thus hidden SSID " +"networks should be used with caution. In AP mode, the created network does " +"not broadcast its SSID. Note that marking the network as hidden may be a " +"privacy issue for you (in infrastructure mode) or client stations (in AP " +"mode), as the explicit probe-scans are distinctly recognizable on the air." msgstr "" "如为 TRUE，表明此网络是个隐藏了它 SSID 的非广播网络。这种情况下，可以采用多种" "解决方法，比如探测扫描 SSID 以获得更可靠的网络发现。但是，这些解决方法也暴露" @@ -6546,8 +6554,8 @@ msgstr "" #: ../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 +#: ../clients/common/settings-docs.h.in:174 +#: ../clients/common/settings-docs.h.in:286 msgid "Flags indicating how to handle the \"password\" property." msgstr "指示如何处理 \"password\" 属性的标志。" @@ -6806,7 +6814,7 @@ msgid "PIN used for EAP authentication methods." msgstr "用于 EAP 验证方法的 PIN。" #: ../clients/common/settings-docs.h.in:82 -#: ../clients/common/settings-docs.h.in:175 +#: ../clients/common/settings-docs.h.in:176 msgid "Flags indicating how to handle the \"pin\" property." msgstr "指示如何处理 \"pin\" 属性的标志。" @@ -7190,8 +7198,8 @@ msgid "The Spanning Tree Protocol (STP) priority of this bridge port." msgstr "此网桥端口的生成树协议（STP）优先级。" #: ../clients/common/settings-docs.h.in:124 -#: ../clients/common/settings-docs.h.in:169 -#: ../clients/common/settings-docs.h.in:180 +#: ../clients/common/settings-docs.h.in:170 +#: ../clients/common/settings-docs.h.in:181 msgid "" "If non-zero, only transmit packets of the specified size or smaller, " "breaking larger packets up into multiple frames." @@ -7207,7 +7215,7 @@ msgstr "" "用号码（#777）。" #: ../clients/common/settings-docs.h.in:126 -#: ../clients/common/settings-docs.h.in:172 +#: ../clients/common/settings-docs.h.in:173 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 " @@ -7217,7 +7225,7 @@ msgstr "" "如果需要密码，可在这里指定。" #: ../clients/common/settings-docs.h.in:128 -#: ../clients/common/settings-docs.h.in:178 +#: ../clients/common/settings-docs.h.in:179 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 " @@ -7323,37 +7331,54 @@ msgid "Whether LLDP is enabled for the connection." msgstr "是否为连接启用 LLDP。" #: ../clients/common/settings-docs.h.in:138 +#, fuzzy +msgid "" +"Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the " +"connection. LLMNR is a protocol based on the Domain Name System (DNS) packet " +"format that allows both IPv4 and IPv6 hosts to perform name resolution for " +"hosts on the same local link. The permitted values are: yes: register " +"hostname and resolving for the connection, no: disable LLMNR for the " +"interface, resolve: do not register hostname but allow resolving of LLMNR " +"host names. This feature requires a plugin which supports LLMNR. One such " +"plugin is dns-systemd-resolved." +msgstr "" +"是否为此连接启用 mDNS。允许的值有：yes，注册主机名并解析连接；no，禁用接口的 " +"mDNS；resolve，不要注册主机名但允许 mDNS 主机名的解析。当在当前激活的连接上更" +"新此属性时，更改立即生效。此功能需要支持 mDNS 的插件。一个这样的插件是 dns-" +"systemd-resolved。" + +#: ../clients/common/settings-docs.h.in:139 msgid "Interface name of the master device or UUID of the master connection." msgstr "主设备的接口名或 UUID 或主连接。" -#: ../clients/common/settings-docs.h.in:139 +#: ../clients/common/settings-docs.h.in:140 +#, fuzzy 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." +"host names. 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.h.in:140 +#: ../clients/common/settings-docs.h.in:141 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 +#: ../clients/common/settings-docs.h.in:142 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.h.in:142 +#: ../clients/common/settings-docs.h.in:143 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 " @@ -7375,7 +7400,7 @@ msgstr "" "何 [已保留] 信息都必须被忽略并保留为将来使用。所有的 [类型]、[ID] 和 [已保" "留] 都必须为有效的 UTF-8。" -#: ../clients/common/settings-docs.h.in:143 +#: ../clients/common/settings-docs.h.in:144 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 " @@ -7384,13 +7409,13 @@ msgstr "" "如果连接可以用提供设置服务的 D-Bus 接口以正确的权限来修改，为 FALSE；如果连接" "为只读且无法修改，为 TRUE。" -#: ../clients/common/settings-docs.h.in:144 +#: ../clients/common/settings-docs.h.in:145 msgid "" "List of connection UUIDs that should be activated when the base connection " "itself is activated. Currently only VPN connections are supported." msgstr "当基础连接本身激活时应一块激活的连接 UUID 列表。当前只支持 VPN 连接。" -#: ../clients/common/settings-docs.h.in:145 +#: ../clients/common/settings-docs.h.in:146 msgid "" "Setting name of the device type of this slave's master connection (eg, \"bond" "\"), or NULL if this connection is not a slave." @@ -7398,7 +7423,8 @@ msgstr "" "此从连接的主连接设备类型的设置名称（例如 \"bond\"），或者为 NULL 如果此连接不" "是从连接。" -#: ../clients/common/settings-docs.h.in:146 +#: ../clients/common/settings-docs.h.in:147 +#, fuzzy msgid "" "This represents the identity of the connection used for various purposes. It " "allows to configure multiple profiles to share the identity. Also, the " @@ -7415,9 +7441,10 @@ msgid "" "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}\", \"${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 " +"supported are \"${CONNECTION}\", \"${DEVICE}\", \"${MAC}\", \"${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 and \"${MAC}\" is the permanent MAC address 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}-" @@ -7445,7 +7472,7 @@ msgstr "" "接口区别开来。如果值未设定，将查询全局连接默认值。如果值仍未设定，则默认为跟 " "\"${CONNECTION}\" 相同并为连接使用唯一的固定 ID。" -#: ../clients/common/settings-docs.h.in:147 +#: ../clients/common/settings-docs.h.in:148 msgid "" "The time, in seconds since the Unix Epoch, that the connection was last " "_successfully_ fully activated. NetworkManager updates the connection " @@ -7457,7 +7484,7 @@ msgstr "" "（NetworkManager）会定期更新连接的时间戳以确保活动连接有最新的时间戳。该用来" "读取（此属性的更改不被保留）。" -#: ../clients/common/settings-docs.h.in:148 +#: ../clients/common/settings-docs.h.in:149 msgid "" "Base type of the connection. For hardware-dependent connections, should " "contain the setting name of the hardware-type specific setting (ie, \"802-3-" @@ -7470,7 +7497,7 @@ msgstr "" "硬件相关的连接如 VPN 或其他的，应包含该设置类型的设置名称（例如 \"vpn\" 或 " "\"bridge\"，等等）。" -#: ../clients/common/settings-docs.h.in:149 +#: ../clients/common/settings-docs.h.in:150 msgid "" "A universally unique identifier for the connection, for example generated " "with libuuid. It should be assigned when the connection is created, and " @@ -7487,7 +7514,7 @@ msgstr "" "能需要重新创建。UUIS 必须为如 \"2815492f-7e56-435e-b2e9-246bd7cdc664\" 的格式" "（示例，只包含十六进制和 \"-\"）。" -#: ../clients/common/settings-docs.h.in:150 +#: ../clients/common/settings-docs.h.in:151 msgid "" "The trust level of a the connection. Free form case-insensitive string (for " "example \"Home\", \"Work\", \"Public\"). NULL or unspecified zone means the " @@ -7499,7 +7526,7 @@ msgstr "" "共\"）。NULL 或为指定区域表示连接将放置到防火墙定义的默认区域。当在当前激活的" "连接上更新此属性时，更改立即生效。" -#: ../clients/common/settings-docs.h.in:151 +#: ../clients/common/settings-docs.h.in:152 msgid "" "Specifies the NMSettingDcbFlags for the DCB FCoE application. Flags may be " "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), " @@ -7509,11 +7536,11 @@ msgstr "" "NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 " "NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。" -#: ../clients/common/settings-docs.h.in:152 +#: ../clients/common/settings-docs.h.in:153 msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"." msgstr "FCoE 控制器模式；为 \"fabric\"（默认）或 \"vn2vn\"。" -#: ../clients/common/settings-docs.h.in:153 +#: ../clients/common/settings-docs.h.in:154 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 " @@ -7522,7 +7549,7 @@ msgstr "" "FCoE 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。只当 \"app-fcoe-" "flags\" 属性包含 NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。" -#: ../clients/common/settings-docs.h.in:154 +#: ../clients/common/settings-docs.h.in:155 msgid "" "Specifies the NMSettingDcbFlags for the DCB FIP application. Flags may be " "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), " @@ -7532,7 +7559,7 @@ msgstr "" "NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 " "NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。" -#: ../clients/common/settings-docs.h.in:155 +#: ../clients/common/settings-docs.h.in:156 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 " @@ -7541,7 +7568,7 @@ msgstr "" "FIP 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。只当 \"app-fip-" "flags\" 属性包含 NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。" -#: ../clients/common/settings-docs.h.in:156 +#: ../clients/common/settings-docs.h.in:157 msgid "" "Specifies the NMSettingDcbFlags for the DCB iSCSI application. Flags may be " "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), " @@ -7551,7 +7578,7 @@ msgstr "" "NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 " "NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。" -#: ../clients/common/settings-docs.h.in:157 +#: ../clients/common/settings-docs.h.in:158 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 " @@ -7560,7 +7587,7 @@ msgstr "" "iSCSI 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。只当 \"app-" "iscsi-flags\" 属性包含 NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。" -#: ../clients/common/settings-docs.h.in:158 +#: ../clients/common/settings-docs.h.in:159 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 " @@ -7572,7 +7599,7 @@ msgstr "" "级可使用的优先级指定组的带宽百分比。属于同个组的所有优先级百分比总和必须为 " "100%。" -#: ../clients/common/settings-docs.h.in:159 +#: ../clients/common/settings-docs.h.in:160 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 " @@ -7581,7 +7608,7 @@ msgstr "" "8 个布尔值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示对应优先级" "是否应该传输优先级暂停。" -#: ../clients/common/settings-docs.h.in:160 +#: ../clients/common/settings-docs.h.in:161 msgid "" "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags " "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), " @@ -7591,7 +7618,7 @@ msgstr "" "NM_SETTING_DCB_FLAG_ENABLE (0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 " "NM_SETTING_DCB_FLAG_WILLING (0x4) 的任意组合。" -#: ../clients/common/settings-docs.h.in:161 +#: ../clients/common/settings-docs.h.in:162 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 " @@ -7601,7 +7628,7 @@ msgstr "" "8 个无符号整数值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示分配" "到该组的链路带宽百分比。允许的值为 0～100，且所有值的总和必须为 100%。" -#: ../clients/common/settings-docs.h.in:162 +#: ../clients/common/settings-docs.h.in:163 msgid "" "Specifies the NMSettingDcbFlags for DCB Priority Groups. Flags may be any " "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), " @@ -7611,7 +7638,7 @@ msgstr "" "(0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING " "(0x4) 的任意组合。" -#: ../clients/common/settings-docs.h.in:163 +#: ../clients/common/settings-docs.h.in:164 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 " @@ -7620,7 +7647,7 @@ msgstr "" "8 个无符号整数值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示优先" "级组 ID。允许的优先级组 ID 值为 0～7，或 15 表示无限制组。" -#: ../clients/common/settings-docs.h.in:164 +#: ../clients/common/settings-docs.h.in:165 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 " @@ -7629,7 +7656,7 @@ msgstr "" "8 个布尔值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示优先级是否" "可以使用分配到它指定组的全部带宽。" -#: ../clients/common/settings-docs.h.in:165 +#: ../clients/common/settings-docs.h.in:166 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 " @@ -7638,7 +7665,7 @@ msgstr "" "8 个无符号整数值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示该优" "先级映射的流量等级（0～7）。" -#: ../clients/common/settings-docs.h.in:166 +#: ../clients/common/settings-docs.h.in:167 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 " @@ -7653,7 +7680,7 @@ msgstr "" "平台，因此为用户的移动带宽套餐使用正确的 APN 很重要。根据 GSM 03.60 章节 " "14.9，APN 只能由字符 a～z、0～9、. 和 - 组成。" -#: ../clients/common/settings-docs.h.in:167 +#: ../clients/common/settings-docs.h.in:168 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 " @@ -7662,13 +7689,13 @@ msgstr "" "此连接要应用的设备唯一标识符（由 WWAN 管理服务给定）。如果给定了，连接将只应" "用到指定的设备。" -#: ../clients/common/settings-docs.h.in:168 +#: ../clients/common/settings-docs.h.in:169 msgid "" "When TRUE, only connections to the home network will be allowed. Connections " "to roaming networks will not be made." msgstr "为 TRUE 时，将只允许连接到本地网络，不会连接到漫游网络。" -#: ../clients/common/settings-docs.h.in:170 +#: ../clients/common/settings-docs.h.in:171 msgid "" "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network " "registration. If the Network ID is specified, NetworkManager will attempt " @@ -7680,18 +7707,13 @@ msgstr "" "网络管理器（NetworkManager）将尝试强制设备只在指定的网络注册。当设备不能直接" "控制漫游时，这可以用于确保设备不漫游。" -#: ../clients/common/settings-docs.h.in:171 +#: ../clients/common/settings-docs.h.in:172 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." +"Legacy setting that used to help establishing PPP data sessions for GSM-" +"based modems. Deprecated: 1" msgstr "" -"当与基于 GSM 移动宽带网络建立 PPP 数据会话时要拨打的号码。很多调制解调器不需" -"要 PPP 来连接到移动网络，这种情况下该属性应留空，以允许网络管理器" -"（NetworkManager）自动选择合适的设置。" -#: ../clients/common/settings-docs.h.in:174 +#: ../clients/common/settings-docs.h.in:175 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 " @@ -7700,7 +7722,7 @@ msgstr "" "如果 SIM 被 PIN 锁住了，在请求任何其他操作前必须解锁。在这里指定 PIN 以允许设" "备的操作。" -#: ../clients/common/settings-docs.h.in:176 +#: ../clients/common/settings-docs.h.in:177 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 " @@ -7710,7 +7732,7 @@ msgstr "" "此连接应用的 SIM 卡的唯一标识符（由 WWAN 管理服务给定）。如果给定了，此连接将" "应用到包含匹配给定标识符 SIM 卡的 \"device-id\" 所允许的任何设备。" -#: ../clients/common/settings-docs.h.in:177 +#: ../clients/common/settings-docs.h.in:178 msgid "" "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific " "mobile network operator which this connection applies to. If given, the " @@ -7721,7 +7743,7 @@ msgstr "" "移动网络运营商。如果给定了，连接将应用到包含给定运营商提供 SIM 卡的 \"device-" "id\" 和 \"sim-id\" 所允许的任何设备。" -#: ../clients/common/settings-docs.h.in:179 +#: ../clients/common/settings-docs.h.in:180 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 " @@ -7730,7 +7752,7 @@ msgstr "" "如指定了，此连接将只应用到符合永久 MAC 地址的 IPoIB 设备。此属性不会改变设备" "的 MAC 地址（例如 MAC 欺骗）。" -#: ../clients/common/settings-docs.h.in:181 +#: ../clients/common/settings-docs.h.in:182 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 " @@ -7740,7 +7762,7 @@ msgstr "" "P_Key\"）。否则它是个 16 位无符号整数，其高位已设定如果它是个 \"正式会员\" " "P_Key。" -#: ../clients/common/settings-docs.h.in:182 +#: ../clients/common/settings-docs.h.in:183 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 " @@ -7749,19 +7771,19 @@ msgstr "" "此设备的上级设备的接口名称。一般是 NULL，但如果 \"p_key\" 已设定，您必须通过" "设置此属性或 \"mac-address\" 来指定基础设备。" -#: ../clients/common/settings-docs.h.in:183 +#: ../clients/common/settings-docs.h.in:184 msgid "" "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"." msgstr "" "IP-over-InfiniBand 传输模式。要么为 \"datagram\" 要么为 \"connected\"。" -#: ../clients/common/settings-docs.h.in:184 +#: ../clients/common/settings-docs.h.in:185 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 +#: ../clients/common/settings-docs.h.in:186 msgid "" "Tunnel flags. Currently the following values are supported: " "NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), " @@ -7778,13 +7800,13 @@ msgstr "" "(0x10)、NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20)。它们只对 IPv6 隧道有" "效。" -#: ../clients/common/settings-docs.h.in:186 +#: ../clients/common/settings-docs.h.in:187 msgid "" "The flow label to assign to tunnel packets. This property applies only to " "IPv6 tunnels." msgstr "要分配到隧道数据包的流量标签。此属性只应用到 IPv6 隧道。" -#: ../clients/common/settings-docs.h.in:187 +#: ../clients/common/settings-docs.h.in:188 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." @@ -7792,26 +7814,26 @@ msgstr "" "用于隧道输入数据包的密钥。该属性值对某些隧道模式有效（GRE、IP6GRE）。如果留空" "则不使用密钥。" -#: ../clients/common/settings-docs.h.in:188 +#: ../clients/common/settings-docs.h.in:189 msgid "" "The local endpoint of the tunnel; the value can be empty, otherwise it must " "contain an IPv4 or IPv6 address." msgstr "隧道的本地端点。值可以为空，否则它必须包含一个 IPv4 或 IPv6 地址。" -#: ../clients/common/settings-docs.h.in:189 +#: ../clients/common/settings-docs.h.in:190 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.h.in:190 +#: ../clients/common/settings-docs.h.in:191 msgid "" "If non-zero, only transmit packets of the specified size or smaller, " "breaking larger packets up into multiple fragments." msgstr "如果非零，只传输指定大小或更小的数据包，将较大的数据包分成多个帧。" -#: ../clients/common/settings-docs.h.in:191 +#: ../clients/common/settings-docs.h.in:192 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." @@ -7819,7 +7841,7 @@ msgstr "" "用于隧道输出数据包的密钥。该属性值对某些隧道模式有效（GRE、IP6GRE）。如果留空" "则不使用密钥。" -#: ../clients/common/settings-docs.h.in:192 +#: ../clients/common/settings-docs.h.in:193 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 " @@ -7828,35 +7850,35 @@ msgstr "" "如果给定了，指定新设备将绑定到的上级接口名或上级连接 UUID，以让隧道的数据包只" "能通过该接口进行路由。" -#: ../clients/common/settings-docs.h.in:193 +#: ../clients/common/settings-docs.h.in:194 msgid "Whether to enable Path MTU Discovery on this tunnel." msgstr "是否在此隧道启用路径 MTU 发现。" -#: ../clients/common/settings-docs.h.in:194 +#: ../clients/common/settings-docs.h.in:195 msgid "" "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 " "address." msgstr "隧道的远程端点；值必须包含一个 IPv4 或 IPv6 地址。" -#: ../clients/common/settings-docs.h.in:195 +#: ../clients/common/settings-docs.h.in:196 msgid "" "The type of service (IPv4) or traffic class (IPv6) field to be set on " "tunneled packets." msgstr "设定在隧道数据包上的服务类型（IPv4）或流量等级（IPv6）字段。" -#: ../clients/common/settings-docs.h.in:196 +#: ../clients/common/settings-docs.h.in:197 msgid "" "The TTL to assign to tunneled packets. 0 is a special value meaning that " "packets inherit the TTL value." msgstr "分配到隧道数据包的 TTL。0 为特殊值，表示数据包继承 TTL 值。" -#: ../clients/common/settings-docs.h.in:197 -#: ../clients/common/settings-docs.h.in:218 +#: ../clients/common/settings-docs.h.in:198 +#: ../clients/common/settings-docs.h.in:219 msgid "Array of IP addresses." msgstr "IP 地址数组。" -#: ../clients/common/settings-docs.h.in:198 -#: ../clients/common/settings-docs.h.in:219 +#: ../clients/common/settings-docs.h.in:199 +#: ../clients/common/settings-docs.h.in:220 msgid "" "Timeout in milliseconds used to check for the presence of duplicate IP " "addresses on the network. If an address conflict is detected, the " @@ -7869,7 +7891,8 @@ msgstr "" "零值表示不执行重复 IP 检查，-1 表示默认值（配置 ipvx.dad-timeout 覆盖或 3 " "秒）。大于零的值为以毫秒计算的超时时间。该属性当前只实现于 IPv4。" -#: ../clients/common/settings-docs.h.in:199 +#: ../clients/common/settings-docs.h.in:200 +#, fuzzy 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 " @@ -7882,10 +7905,14 @@ msgid "" "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 " +"links. The special value \"duid\" generates a RFC4361-compliant client " +"identifier based on a hash of the interface name as IAID and /etc/machine-" +"id. 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." +"key. If you set the stable-id, you may want to include the \"${DEVICE}\" or " +"\"${MAC}\" specifier to get a per-device key. If unset, a globally " +"configured default is used. If still unset, the default depends on the DHCP " +"plugin." msgstr "" "发送到 DHCP 服务器的字符串，用以确定 DHCP 服务器可能用于自定义 DHCP 租约和选" "项的本地机器。当属性值为十六进制字符串时，将其解读为二进制的客户端 ID，这种情" @@ -7898,7 +7925,7 @@ msgstr "" "型 0 的客户端标识符（参见 connection.stable-id）。如果未设，使用全局默认值。" "如果仍未设定，重新使用来自上个租约的 client-id。" -#: ../clients/common/settings-docs.h.in:200 +#: ../clients/common/settings-docs.h.in:201 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-" @@ -7907,8 +7934,8 @@ msgstr "" "如果 \"dhcp-send-hostname\" 属性为 TRUE，当获取租约时指定的 FQDN 将被发送到 " "DHCP 服务器。此属性与 \"dhcp-hostname\" 相互排斥而且无法被同时设定。" -#: ../clients/common/settings-docs.h.in:201 -#: ../clients/common/settings-docs.h.in:221 +#: ../clients/common/settings-docs.h.in:202 +#: ../clients/common/settings-docs.h.in:222 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-" @@ -7917,8 +7944,8 @@ msgstr "" "如果 \"dhcp-send-hostname\" 属性为 TRUE，当获取租约时指定的名称将被发送到 " "DHCP 服务器。此属性与 \"dhcp-fqdn\" 相互排斥而且无法被同时设定。" -#: ../clients/common/settings-docs.h.in:202 -#: ../clients/common/settings-docs.h.in:222 +#: ../clients/common/settings-docs.h.in:203 +#: ../clients/common/settings-docs.h.in:223 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 " @@ -7930,18 +7957,18 @@ msgstr "" "机名来更新 DNS 数据库，实质上为计算机提供了个静态的主机名。如果 \"dhcp-" "hostname\" 属性为 NULL 且此属性为 TRUE，以计算机的当前永久主机。" -#: ../clients/common/settings-docs.h.in:203 -#: ../clients/common/settings-docs.h.in:223 +#: ../clients/common/settings-docs.h.in:204 +#: ../clients/common/settings-docs.h.in:224 msgid "A timeout for a DHCP transaction in seconds." msgstr "DHCP 事务的超时时间，以秒计。" -#: ../clients/common/settings-docs.h.in:204 -#: ../clients/common/settings-docs.h.in:224 +#: ../clients/common/settings-docs.h.in:205 +#: ../clients/common/settings-docs.h.in:225 msgid "Array of IP addresses of DNS servers." msgstr "DNS 服务器的 IP 地址数组。" -#: ../clients/common/settings-docs.h.in:205 -#: ../clients/common/settings-docs.h.in:225 +#: ../clients/common/settings-docs.h.in:206 +#: ../clients/common/settings-docs.h.in:226 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 " @@ -7950,19 +7977,21 @@ msgstr "" "在 man 5 resolv.conf 中描述的 DNS 选项数组。NULL 代表选项未设定并保留默认值。" "此情况下网络管理器（NetworkManager）将使用默认选项。这跟空列表的属性不同。" -#: ../clients/common/settings-docs.h.in:206 -#: ../clients/common/settings-docs.h.in:226 +#: ../clients/common/settings-docs.h.in:207 +#: ../clients/common/settings-docs.h.in:227 +#, fuzzy msgid "" "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. Negative values have the special effect of " +"this setting. A lower value is better (higher priority). Zero selects a " +"globally configured default value. If the latter is missing or zero too, it " +"defaults to 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. 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 " @@ -7990,8 +8019,8 @@ msgstr "" "个连接将获选。如果连接指定了个域，其为具有负 DNS 优先级值的另一域的子域，那这" "个子域会被忽略。" -#: ../clients/common/settings-docs.h.in:207 -#: ../clients/common/settings-docs.h.in:227 +#: ../clients/common/settings-docs.h.in:208 +#: ../clients/common/settings-docs.h.in:228 msgid "" "Array of DNS search domains. Domains starting with a tilde ('~') are " "considered 'routing' domains and are used only to decide the interface over " @@ -8001,15 +8030,15 @@ msgstr "" "DNS 搜索域的数组。域以半角波浪号（\"~\"）开头的视为 \"路由\" 域并只用于确定查" "询必须转发的接口；它们不用于完全未限定的主机名。" -#: ../clients/common/settings-docs.h.in:208 -#: ../clients/common/settings-docs.h.in:228 +#: ../clients/common/settings-docs.h.in:209 +#: ../clients/common/settings-docs.h.in:229 msgid "" "The gateway associated with this configuration. This is only meaningful if " "\"addresses\" is also set." msgstr "与此配置关联的网关。这只在 \"addresses\" 也设定的时候有意义。" -#: ../clients/common/settings-docs.h.in:209 -#: ../clients/common/settings-docs.h.in:229 +#: ../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 nameservers and search domains are ignored and only nameservers " @@ -8020,8 +8049,8 @@ msgstr "" "被忽略且只有 \"dns\" 和 \"dns-search\" 属性中指定的名称服务器和搜索域被使用，" "如果有的话。" -#: ../clients/common/settings-docs.h.in:210 -#: ../clients/common/settings-docs.h.in:230 +#: ../clients/common/settings-docs.h.in:211 +#: ../clients/common/settings-docs.h.in:231 msgid "" "When \"method\" is set to \"auto\" and this property to TRUE, automatically " "configured routes are ignored and only routes specified in the \"routes\" " @@ -8030,8 +8059,8 @@ msgstr "" "当 \"method\" 设为 \"auto\" 且此属性为 TRUE 时，自动配置的路由被忽略且只有 " "\"routes\" 属性中指定的路由被使用，如果有的话。" -#: ../clients/common/settings-docs.h.in:211 -#: ../clients/common/settings-docs.h.in:232 +#: ../clients/common/settings-docs.h.in:212 +#: ../clients/common/settings-docs.h.in:233 msgid "" "If TRUE, allow overall network configuration to proceed even if the " "configuration specified by this property times out. Note that at least one " @@ -8045,8 +8074,9 @@ msgstr "" "NMSettingIP4Config 设置此属性为 TRUE 时允许整体网络配置在 IPv4 配置失败但 " "IPv6 配置成功完成时成功。" -#: ../clients/common/settings-docs.h.in:212 -#: ../clients/common/settings-docs.h.in:233 +#: ../clients/common/settings-docs.h.in:213 +#: ../clients/common/settings-docs.h.in:234 +#, fuzzy msgid "" "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both " "support \"auto\", \"manual\", and \"link-local\". See the subclass-specific " @@ -8057,7 +8087,9 @@ msgid "" "methods that imply no upstream network, such as \"shared\" or \"link-local" "\", these properties must be empty. For IPv4 method \"shared\", the IP " "subnet can be configured by adding one manual IPv4 address or otherwise " -"10.42.x.0/24 is chosen." +"10.42.x.0/24 is chosen. Note that the shared method must be configured on " +"the interface which shares the internet to a subnet, not on the uplink which " +"is shared." msgstr "" "IP 配置方法。NMSettingIP4Config 和 NMSettingIP6Config 都支持 \"auto" "\"、\"manual\" 和 \"link-local\"。其他值请查看子类特定的文档。通常，对于 " @@ -8067,8 +8099,8 @@ msgstr "" "对于 IPv4 方法 \"shared\"，配置 IP 子网可通过添加一个手动的 IPv4 地址或是选" "择 10.42.x.0/24 完成。" -#: ../clients/common/settings-docs.h.in:213 -#: ../clients/common/settings-docs.h.in:234 +#: ../clients/common/settings-docs.h.in:214 +#: ../clients/common/settings-docs.h.in:235 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." @@ -8076,8 +8108,8 @@ msgstr "" "如果为 TRUE，此连接将永不成为此 IP 类型的默认连接，这表示网络管理器" "（NetworkManager）永远不会为其分配默认路由。" -#: ../clients/common/settings-docs.h.in:214 -#: ../clients/common/settings-docs.h.in:235 +#: ../clients/common/settings-docs.h.in:215 +#: ../clients/common/settings-docs.h.in:236 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 " @@ -8092,8 +8124,8 @@ msgstr "" "默认路由。注意对于 IPv6，内核接受零值（0）但会将其转为 1024（用户默认）。因" "此，设置此属性为零等于设置它为 1024。对于 IPv4，零是跃点的常规值。" -#: ../clients/common/settings-docs.h.in:215 -#: ../clients/common/settings-docs.h.in:236 +#: ../clients/common/settings-docs.h.in:216 +#: ../clients/common/settings-docs.h.in:237 msgid "" "Enable policy routing (source routing) and set the routing table used when " "adding routes. This affects all routes, including device-routes, IPv4LL, " @@ -8117,12 +8149,12 @@ msgstr "" "同路由表的静态路由）。另外，网络管理器将不会从表中删除任何外部路由，除了主路" "由。这是为了给用网络管理器之外工具管理路由表的用户保持后向兼容性。" -#: ../clients/common/settings-docs.h.in:216 -#: ../clients/common/settings-docs.h.in:237 +#: ../clients/common/settings-docs.h.in:217 +#: ../clients/common/settings-docs.h.in:238 msgid "Array of IP routes." msgstr "IP 路由数组。" -#: ../clients/common/settings-docs.h.in:217 +#: ../clients/common/settings-docs.h.in:218 msgid "" "Configure method for creating the address for use with RFC4862 IPv6 " "Stateless Address Autoconfiguration. The permitted values are: " @@ -8155,7 +8187,8 @@ msgstr "" "置与由 \"ip6-privacy\" 配置的隐私扩展不同，而且它不会影响此选项配置的临时地" "址。" -#: ../clients/common/settings-docs.h.in:220 +#: ../clients/common/settings-docs.h.in:221 +#, fuzzy 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 " @@ -8172,14 +8205,16 @@ msgid "" "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." +"type, derived from the connection's stable-id and a per-host unique key. You " +"may want to include the \"${DEVICE}\" or \"${MAC}\" specifier in the stable-" +"id, in case this profile gets activated on multiple devices. 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 携带在客户端标识符选项中。如果属性为十六进制的字符串" @@ -8197,7 +8232,7 @@ msgstr "" "戳相同）。当属性未设定时，使用 \"ipv6.dhcp-duid\" 提供的全局值。如果未提供全" "局值，认定为默认的 \"lease\" 值。" -#: ../clients/common/settings-docs.h.in:231 +#: ../clients/common/settings-docs.h.in:232 msgid "" "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If " "enabled, it makes the kernel generate a temporary IPv6 address in addition " @@ -8222,7 +8257,7 @@ msgstr "" "意此设置与固定隐私地址不同，后者可通过 \"addr-gen-mode\" 属性的 \"stable-" "privacy\" 设置启用，可作为避免 IPv6 地址追踪的另一种方法。" -#: ../clients/common/settings-docs.h.in:238 +#: ../clients/common/settings-docs.h.in:239 msgid "" "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 " "tokenized interface identifiers. Useful with eui64 addr-gen-mode." @@ -8230,32 +8265,32 @@ msgstr "" "配置用于 draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 令牌化接口标识符" "的令牌。对 eui64 addr-gen-mode 有用。" -#: ../clients/common/settings-docs.h.in:239 +#: ../clients/common/settings-docs.h.in:240 msgid "Whether the transmitted traffic must be encrypted." msgstr "是否加密传输的流量。" -#: ../clients/common/settings-docs.h.in:240 +#: ../clients/common/settings-docs.h.in:241 msgid "" "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement." msgstr "用于 MACsec 密钥协商的预共享 CAK。" -#: ../clients/common/settings-docs.h.in:241 +#: ../clients/common/settings-docs.h.in:242 msgid "Flags indicating how to handle the \"mka-cak\" property." msgstr "指示如何处理 \"mka-cak\" 属性的标志。" -#: ../clients/common/settings-docs.h.in:242 +#: ../clients/common/settings-docs.h.in:243 msgid "" "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key " "Agreement." msgstr "用于 MACsec 密钥协商的预共享 CKN（连接关联密钥名称）。" -#: ../clients/common/settings-docs.h.in:243 +#: ../clients/common/settings-docs.h.in:244 msgid "" "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key " "Agreement) is obtained." msgstr "指定如何获取用于 MKA（MACsec 密钥协商）的 CAK（连接关联密钥）。" -#: ../clients/common/settings-docs.h.in:244 +#: ../clients/common/settings-docs.h.in:245 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 " @@ -8266,29 +8301,29 @@ msgstr "" "如果此属性未指定，该连接必须包含具有 \"mac-address\" 属性的 \"802-3-ethernet" "\" 设置。" -#: ../clients/common/settings-docs.h.in:245 +#: ../clients/common/settings-docs.h.in:246 msgid "" "The port component of the SCI (Secure Channel Identifier), between 1 and " "65534." msgstr "SCI（安全信道标识符）的端口组件，介于 1 和 65534 之间。" -#: ../clients/common/settings-docs.h.in:246 +#: ../clients/common/settings-docs.h.in:247 msgid "" "Specifies whether the SCI (Secure Channel Identifier) is included in every " "packet." msgstr "指定 SCI（安全信道标识符）是否包括在每个数据包中。" -#: ../clients/common/settings-docs.h.in:247 +#: ../clients/common/settings-docs.h.in:248 msgid "Specifies the validation mode for incoming frames." msgstr "指定传入帧的验证模式。" -#: ../clients/common/settings-docs.h.in:248 +#: ../clients/common/settings-docs.h.in:249 msgid "" "The macvlan mode, which specifies the communication mechanism between " "multiple macvlans on the same lower device." msgstr "macvlan 模式，它指定了同一低层设备上的多个 macvlans 之间的通信机制。" -#: ../clients/common/settings-docs.h.in:249 +#: ../clients/common/settings-docs.h.in:250 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 " @@ -8299,15 +8334,15 @@ msgstr "" "UUID。如果此属性未指定，该连接必须包含具有 \"mac-address\" 属性的 \"802-3-" "ethernet\" 设置。" -#: ../clients/common/settings-docs.h.in:250 +#: ../clients/common/settings-docs.h.in:251 msgid "Whether the interface should be put in promiscuous mode." msgstr "是否应将接口置于混杂模式。" -#: ../clients/common/settings-docs.h.in:251 +#: ../clients/common/settings-docs.h.in:252 msgid "Whether the interface should be a MACVTAP." msgstr "接口是否应为 MACVTAP。" -#: ../clients/common/settings-docs.h.in:252 +#: ../clients/common/settings-docs.h.in:253 msgid "" "A list of interface names to match. Each element is a shell wildcard " "pattern. When an element is prefixed with exclamation mark (!) the " @@ -8320,56 +8355,56 @@ msgstr "" "时，条件反转。当满足下列条件时，视为匹配的候选接口名：(a) 未前插 \"!\" 的任意" "元素匹配或不存此类元素；(b) 无前插 \"!\" 的元素匹配。" -#: ../clients/common/settings-docs.h.in:253 +#: ../clients/common/settings-docs.h.in:254 msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty." msgstr "网桥失败模式。\"secure\"、\"standalone\" 之一或留空。" -#: ../clients/common/settings-docs.h.in:254 +#: ../clients/common/settings-docs.h.in:255 msgid "Enable or disable multicast snooping." msgstr "启用或禁用多播监听。" -#: ../clients/common/settings-docs.h.in:255 +#: ../clients/common/settings-docs.h.in:256 msgid "Enable or disable RSTP." msgstr "启用或禁用 RSTP。" -#: ../clients/common/settings-docs.h.in:256 +#: ../clients/common/settings-docs.h.in:257 msgid "Enable or disable STP." msgstr "启用或禁用 STP。" -#: ../clients/common/settings-docs.h.in:257 +#: ../clients/common/settings-docs.h.in:258 msgid "The interface type. Either \"internal\", or empty." msgstr "接口类型。要么为 \"internal\"，要么留空。" -#: ../clients/common/settings-docs.h.in:258 +#: ../clients/common/settings-docs.h.in:259 msgid "" "Specifies the unicast destination IP address of a remote Open vSwitch bridge " "port to connect to." msgstr "指定要连接的远程 Open vSwitch 网桥端口的单播目标 IP 地址。" -#: ../clients/common/settings-docs.h.in:259 +#: ../clients/common/settings-docs.h.in:260 msgid "The time port must be inactive in order to be considered down." msgstr "端口被视为关闭所需停用的时间。" -#: ../clients/common/settings-docs.h.in:260 +#: ../clients/common/settings-docs.h.in:261 msgid "" "Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"." msgstr "" "绑定（Bonding）模式。\"active-backup\"、\"balance-slb\" 或 \"balance-tcp\" 之" "一。" -#: ../clients/common/settings-docs.h.in:261 +#: ../clients/common/settings-docs.h.in:262 msgid "The time port must be active before it starts forwarding traffic." msgstr "端口开始流量转发所需激活的时间。" -#: ../clients/common/settings-docs.h.in:262 +#: ../clients/common/settings-docs.h.in:263 msgid "LACP mode. One of \"active\", \"off\", or \"passive\"." msgstr "LACP 模式。\"active\"、\"off\" 或 \"passive\" 之一。" -#: ../clients/common/settings-docs.h.in:263 +#: ../clients/common/settings-docs.h.in:264 msgid "The VLAN tag in the range 0-4095." msgstr "VLAN 标记在 0～4095 范围内。" -#: ../clients/common/settings-docs.h.in:264 +#: ../clients/common/settings-docs.h.in:265 msgid "" "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", " "\"trunk\" or unset." @@ -8377,7 +8412,7 @@ msgstr "" "VLAN 模式。\"access\"、\"native-tagged\"、\"native-untagged\"、\"trunk\" 之一" "或不设定。" -#: ../clients/common/settings-docs.h.in:265 +#: ../clients/common/settings-docs.h.in:266 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 " @@ -8386,7 +8421,7 @@ msgstr "" "如果非零，指示 pppd 设定串口到指定的波特率。要自动选择速度时此值通常保留为 " "0。" -#: ../clients/common/settings-docs.h.in:266 +#: ../clients/common/settings-docs.h.in:267 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 " @@ -8395,7 +8430,7 @@ msgstr "" "如果为 TRUE，指定 pppd 应设定串口以使用通过 RTS 和 CTS 信号的硬件流量控制。此" "值通常应设为 FALSE。" -#: ../clients/common/settings-docs.h.in:267 +#: ../clients/common/settings-docs.h.in:268 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 " @@ -8405,7 +8440,7 @@ msgstr "" "如果非零，指示如果指定的 LCP 回响请求号码未被节点回应时 pppd 就认定到节点的连" "接失败了。如果要使用此属性，\"lcp-echo-interval\" 属性也必须设为非零值。" -#: ../clients/common/settings-docs.h.in:268 +#: ../clients/common/settings-docs.h.in:269 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 " @@ -8415,14 +8450,14 @@ msgstr "" "如果非零，指示 pppd 每几秒发送一个 LCP 回响请求帧到节点（几秒为该属性指定）。" "注意有些 PPP 节点将响应回响请求而有些不会，并且无法自动检测此行为。" -#: ../clients/common/settings-docs.h.in:269 +#: ../clients/common/settings-docs.h.in:270 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.h.in:270 +#: ../clients/common/settings-docs.h.in:271 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 " @@ -8431,16 +8466,16 @@ msgstr "" "如果非零，指示 pppd 请求节点发送的数据包不要超过指定的大小。如果非零，MRU 应" "在 128 和 16384 之间。" -#: ../clients/common/settings-docs.h.in:271 +#: ../clients/common/settings-docs.h.in:272 msgid "" "If non-zero, instruct pppd to send packets no larger than the specified size." msgstr "如果非零，指示 pppd 不要发送超过指定大小的数据包。" -#: ../clients/common/settings-docs.h.in:272 +#: ../clients/common/settings-docs.h.in:273 msgid "If TRUE, Van Jacobsen TCP header compression will not be requested." msgstr "如果为 TRUE，将不请求压缩 Van Jacobsen TCP 首部。" -#: ../clients/common/settings-docs.h.in:273 +#: ../clients/common/settings-docs.h.in:274 msgid "" "If TRUE, do not require the other side (usually the PPP server) to " "authenticate itself to the client. If FALSE, require authentication from " @@ -8449,35 +8484,35 @@ msgstr "" "如果为 TRUE，不需要其他方（通常是 PPP 服务器）验证自己到客户端。如果为 " "FALSE，需要来自远端的验证。在大多数情况下，此属性应为 TRUE。" -#: ../clients/common/settings-docs.h.in:274 +#: ../clients/common/settings-docs.h.in:275 msgid "If TRUE, BSD compression will not be requested." msgstr "如果为 TURE，将不会请求 BSD 压缩。" -#: ../clients/common/settings-docs.h.in:275 +#: ../clients/common/settings-docs.h.in:276 msgid "If TRUE, \"deflate\" compression will not be requested." msgstr "如果为 TURE，将不会请求 \"deflate\" 压缩。" -#: ../clients/common/settings-docs.h.in:276 +#: ../clients/common/settings-docs.h.in:277 msgid "If TRUE, the CHAP authentication method will not be used." msgstr "如果为 TRUE，将不会使用 CHAP 验证方法。" -#: ../clients/common/settings-docs.h.in:277 +#: ../clients/common/settings-docs.h.in:278 msgid "If TRUE, the EAP authentication method will not be used." msgstr "如果为 TRUE，将不会使用 EAP 验证方法。" -#: ../clients/common/settings-docs.h.in:278 +#: ../clients/common/settings-docs.h.in:279 msgid "If TRUE, the MSCHAP authentication method will not be used." msgstr "如果为 TRUE，将不会使用 MSCHAP 验证方法。" -#: ../clients/common/settings-docs.h.in:279 +#: ../clients/common/settings-docs.h.in:280 msgid "If TRUE, the MSCHAPv2 authentication method will not be used." msgstr "如果为 TRUE，将不会使用 MSCHAPv2 验证方法。" -#: ../clients/common/settings-docs.h.in:280 +#: ../clients/common/settings-docs.h.in:281 msgid "If TRUE, the PAP authentication method will not be used." msgstr "如果为 TRUE，将不会使用 PAP 验证方法。" -#: ../clients/common/settings-docs.h.in:281 +#: ../clients/common/settings-docs.h.in:282 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 " @@ -8486,7 +8521,7 @@ msgstr "" "如果为 TRUE，PPP 会话将需要 MPPE（微软点对点加密）。如果 64 位或 128 位的 " "MPPE 都不可用，会话将失败。注意 MPPE 不用在移动宽带连接。" -#: ../clients/common/settings-docs.h.in:282 +#: ../clients/common/settings-docs.h.in:283 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 " @@ -8495,7 +8530,7 @@ msgstr "" "如果为 TRUE，PPP 会话将需要 MPPE（微软点对点加密）且 \"require-mppe\" 也必须" "设为 TRUE。如果 128 位的 MPPE 不可用，会话将失败。" -#: ../clients/common/settings-docs.h.in:283 +#: ../clients/common/settings-docs.h.in:284 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 " @@ -8505,11 +8540,11 @@ msgstr "" "如果给定了，指定此 PPPoE 连接应被创建在的上级接口名。如果此属性未指定，连接将" "激活到 NMSettingConnection 的 \"interface-name\" 所指定的接口。" -#: ../clients/common/settings-docs.h.in:284 +#: ../clients/common/settings-docs.h.in:285 msgid "Password used to authenticate with the PPPoE service." msgstr "用于 PPPoE 服务验证的密码。" -#: ../clients/common/settings-docs.h.in:286 +#: ../clients/common/settings-docs.h.in:287 msgid "" "If specified, instruct PPPoE to only initiate sessions with access " "concentrators that provide the specified service. For most providers, this " @@ -8519,28 +8554,28 @@ msgstr "" "如果指定了，指示 PPPoE 只启动与提供了指定服务的集线器的会话。对于大多数运营" "商，此属性应留空。如果有多个集线器存在或者特定服务需要时，此属性才需要设定。" -#: ../clients/common/settings-docs.h.in:287 +#: ../clients/common/settings-docs.h.in:288 msgid "Username used to authenticate with the PPPoE service." msgstr "用于 PPPoE 服务验证的用户名。" -#: ../clients/common/settings-docs.h.in:288 +#: ../clients/common/settings-docs.h.in:289 msgid "Whether the proxy configuration is for browser only." msgstr "代理配置是否只用于浏览器。" -#: ../clients/common/settings-docs.h.in:289 +#: ../clients/common/settings-docs.h.in:290 msgid "" "Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)" msgstr "代理配置的方法，默认为 NM_SETTING_PROXY_METHOD_NONE (0)" -#: ../clients/common/settings-docs.h.in:290 +#: ../clients/common/settings-docs.h.in:291 msgid "PAC script for the connection." msgstr "用于连接的 PAC 脚本。" -#: ../clients/common/settings-docs.h.in:291 +#: ../clients/common/settings-docs.h.in:292 msgid "PAC URL for obtaining PAC file." msgstr "用户获取 PAC 文件的 PAC URL。" -#: ../clients/common/settings-docs.h.in:292 +#: ../clients/common/settings-docs.h.in:293 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 " @@ -8549,25 +8584,25 @@ msgstr "" "通过串口通信使用的速度。注意该值一般对移动宽带调制解调器没有效果，因为它们通" "常忽略速度设置并使用最高的可用速度。" -#: ../clients/common/settings-docs.h.in:293 +#: ../clients/common/settings-docs.h.in:294 msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example." msgstr "串口通信的字节宽度。以 \"8n1\" 中的 8 为例。" -#: ../clients/common/settings-docs.h.in:294 +#: ../clients/common/settings-docs.h.in:295 msgid "Parity setting of the serial port." msgstr "串口的奇偶校验设置。" -#: ../clients/common/settings-docs.h.in:295 +#: ../clients/common/settings-docs.h.in:296 msgid "Time to delay between each byte sent to the modem, in microseconds." msgstr "每次发送字节到调制解调器的延迟时间，以微秒计。" -#: ../clients/common/settings-docs.h.in:296 +#: ../clients/common/settings-docs.h.in:297 msgid "" "Number of stop bits for communication on the serial port. Either 1 or 2. " "The 1 in \"8n1\" for example." msgstr "用在串口通信的停止位数量。要么是 1 要么是 2。以 \"8n1\" 中的 1 为例。" -#: ../clients/common/settings-docs.h.in:297 +#: ../clients/common/settings-docs.h.in:298 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 " @@ -8583,20 +8618,27 @@ msgstr "" "被声明且不会为它们创建网络接口。当设为 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 "" +"The total number of virtual functions to create. Note that when the sriov " +"setting is present NetworkManager enforces the number of virtual functions " +"on the interface also when it is zero. To prevent any changes to SR-IOV " +"parameters don't add a sriov setting to the connection." +msgstr "" + +#: ../clients/common/settings-docs.h.in:300 +#, fuzzy +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." +"check=true\". Multiple VFs can be specified using a comma as separator. " +"Currently the following attributes are supported: mac, spoof-check, trust, " +"min-tx-rate, max-tx-rate, vlans. The \"vlans\" attribute is represented as a " +"semicolon-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\" 条目为每个虚拟功能的必填项。当表示为字符串时，虚拟功能的格式" @@ -8605,15 +8647,15 @@ msgstr "" "描述符的格式为 \"ID[.PRIORITY[.PROTO]]\"。PROTO 可以是用于 802.1Q（默认）的 " "\"q\" 或用于 802.1ad 的 \"ad\"。" -#: ../clients/common/settings-docs.h.in:300 +#: ../clients/common/settings-docs.h.in:301 msgid "Array of TC queueing disciplines." msgstr "TC 排队规则阵列。" -#: ../clients/common/settings-docs.h.in:301 +#: ../clients/common/settings-docs.h.in:302 msgid "Array of TC traffic filters." msgstr "TC 流量过滤器阵列。" -#: ../clients/common/settings-docs.h.in:302 +#: ../clients/common/settings-docs.h.in:303 msgid "" "The JSON configuration for the team network interface. The property should " "contain raw JSON configuration data suitable for teamd, because the value is " @@ -8624,8 +8666,9 @@ msgstr "" "因为该值直接传递给 teamd。如果未指定则使用默认的配置。格式详情请参阅 teamd." "conf 手册。" -#: ../clients/common/settings-docs.h.in:303 -#: ../clients/common/settings-docs.h.in:321 +#: ../clients/common/settings-docs.h.in:304 +#: ../clients/common/settings-docs.h.in:322 +#, fuzzy msgid "" "Link watchers configuration for the connection: each link watcher is defined " "by a dictionary, whose keys depend upon the selected link watcher. Available " @@ -8633,7 +8676,7 @@ msgid "" "in the dictionary with the key 'name'. Available keys are: ethtool: 'delay-" "up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-" "max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', " -"'validate-active', 'validate-incative', 'send-always'. See teamd.conf man " +"'validate-active', 'validate-inactive', 'send-always'. See teamd.conf man " "for more details." msgstr "" "连接的链路监视器配置：每个链路监视器都由一个目录定义，其密钥取决于所选的链路" @@ -8643,23 +8686,23 @@ msgstr "" "\"、\"target-host\"；arp_ping：包括 nsna_ping 中的和 \"source-host" "\"、\"validate-active\"、\"validate-incative\"、\"send-always\"。" -#: ../clients/common/settings-docs.h.in:304 +#: ../clients/common/settings-docs.h.in:305 msgid "Corresponds to the teamd mcast_rejoin.count." msgstr "对应于 teamd mcast_rejoin.count。" -#: ../clients/common/settings-docs.h.in:305 +#: ../clients/common/settings-docs.h.in:306 msgid "Corresponds to the teamd mcast_rejoin.interval." msgstr "对应于 teamd mcast_rejoin.interval。" -#: ../clients/common/settings-docs.h.in:306 +#: ../clients/common/settings-docs.h.in:307 msgid "Corresponds to the teamd notify_peers.count." msgstr "对应于 teamd notify_peers.count。" -#: ../clients/common/settings-docs.h.in:307 +#: ../clients/common/settings-docs.h.in:308 msgid "Corresponds to the teamd notify_peers.interval." msgstr "对应于 teamd notify_peers.interval。" -#: ../clients/common/settings-docs.h.in:308 +#: ../clients/common/settings-docs.h.in:309 msgid "" "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", " "\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". When " @@ -8672,43 +8715,43 @@ msgstr "" "时，所有指定到运行程序的属性都将充值为默认值；所有指定到其他运行程序的属性都" "将设为空值（或者不可能时设为默认值）。" -#: ../clients/common/settings-docs.h.in:309 +#: ../clients/common/settings-docs.h.in:310 msgid "Corresponds to the teamd runner.active." msgstr "对应于 teamd runner.active。" -#: ../clients/common/settings-docs.h.in:310 +#: ../clients/common/settings-docs.h.in:311 msgid "Corresponds to the teamd runner.agg_select_policy." msgstr "对应于 teamd runner.agg_select_policy。" -#: ../clients/common/settings-docs.h.in:311 +#: ../clients/common/settings-docs.h.in:312 msgid "Corresponds to the teamd runner.fast_rate." msgstr "对应于 teamd runner.fast_rate。" -#: ../clients/common/settings-docs.h.in:312 +#: ../clients/common/settings-docs.h.in:313 msgid "Corresponds to the teamd runner.hwaddr_policy." msgstr "对应于 teamd runner.hwaddr_policy。" -#: ../clients/common/settings-docs.h.in:313 +#: ../clients/common/settings-docs.h.in:314 msgid "Corresponds to the teamd runner.min_ports." msgstr "对应于 teamd runner.min_ports。" -#: ../clients/common/settings-docs.h.in:314 +#: ../clients/common/settings-docs.h.in:315 msgid "Corresponds to the teamd runner.sys_prio." msgstr "对应于 teamd runner.sys_prio。" -#: ../clients/common/settings-docs.h.in:315 +#: ../clients/common/settings-docs.h.in:316 msgid "Corresponds to the teamd runner.tx_balancer.name." msgstr "对应于 teamd runner.tx_balancer.name。" -#: ../clients/common/settings-docs.h.in:316 +#: ../clients/common/settings-docs.h.in:317 msgid "Corresponds to the teamd runner.tx_balancer.interval." msgstr "对应于 teamd runner.tx_balancer.interval。" -#: ../clients/common/settings-docs.h.in:317 +#: ../clients/common/settings-docs.h.in:318 msgid "Corresponds to the teamd runner.tx_hash." msgstr "对应于 teamd runner.tx_hash。" -#: ../clients/common/settings-docs.h.in:318 +#: ../clients/common/settings-docs.h.in:319 msgid "" "The JSON configuration for the team port. The property should contain raw " "JSON configuration data suitable for teamd, because the value is passed " @@ -8719,19 +8762,19 @@ msgstr "" "该值直接传递给 teamd。如果未指定则使用默认的配置。格式详情请参阅 teamd.conf " "手册。" -#: ../clients/common/settings-docs.h.in:319 +#: ../clients/common/settings-docs.h.in:320 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key." msgstr "对应于 teamd ports.PORTIFNAME.lacp_key。" -#: ../clients/common/settings-docs.h.in:320 +#: ../clients/common/settings-docs.h.in:321 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio." msgstr "对应于 teamd ports.PORTIFNAME.lacp_prio。" -#: ../clients/common/settings-docs.h.in:322 +#: ../clients/common/settings-docs.h.in:323 msgid "Corresponds to the teamd ports.PORTIFNAME.prio." msgstr "对应于 teamd ports.PORTIFNAME.prio。" -#: ../clients/common/settings-docs.h.in:323 +#: ../clients/common/settings-docs.h.in:324 msgid "" "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the " "parameter is skipped from the json config." @@ -8739,17 +8782,17 @@ msgstr "" "对应于 teamd ports.PORTIFNAME.queue_id。设定为 -1 时表示参数从 json 配置忽" "略。" -#: ../clients/common/settings-docs.h.in:324 +#: ../clients/common/settings-docs.h.in:325 msgid "Corresponds to the teamd ports.PORTIFNAME.sticky." msgstr "对应于 teamd ports.PORTIFNAME.sticky。" -#: ../clients/common/settings-docs.h.in:325 +#: ../clients/common/settings-docs.h.in:326 msgid "" "The group ID which will own the device. If set to NULL everyone will be able " "to use the device." msgstr "将拥有设备的组 ID。如果设为 NULL 则每个人都能使用设备。" -#: ../clients/common/settings-docs.h.in:326 +#: ../clients/common/settings-docs.h.in:327 msgid "" "The operating mode of the virtual device. Allowed values are " "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and " @@ -8758,7 +8801,7 @@ msgstr "" "虚拟设备的操作模式。允许值有 NM_SETTING_TUN_MODE_TUN (1) 以创建第三层设备和 " "NM_SETTING_TUN_MODE_TAP (2) 以创建类以太网的第二层设备。" -#: ../clients/common/settings-docs.h.in:327 +#: ../clients/common/settings-docs.h.in:328 msgid "" "If the property is set to TRUE, the interface will support multiple file " "descriptors (queues) to parallelize packet sending or receiving. Otherwise, " @@ -8767,25 +8810,25 @@ msgstr "" "如果属性设为 TRUE，接口将支持多个文件描述符（队列）以并行化数据包的发送和接" "收，接口将只支持单个队列。" -#: ../clients/common/settings-docs.h.in:328 +#: ../clients/common/settings-docs.h.in:329 msgid "" "The user ID which will own the device. If set to NULL everyone will be able " "to use the device." msgstr "将拥有设备的用户 ID。如果设为 NULL 则每个人都能使用设备。" -#: ../clients/common/settings-docs.h.in:329 +#: ../clients/common/settings-docs.h.in:330 msgid "" "If TRUE the interface will prepend a 4 byte header describing the physical " "interface to the packets." msgstr "如果为 TRUE，接口将前置一个描述到数据包的物理接口的 4 字节首部。" -#: ../clients/common/settings-docs.h.in:330 +#: ../clients/common/settings-docs.h.in:331 msgid "" "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network " "header." msgstr "如果为 TRUE，隧道数据包的 IFF_VNET_HDR 将包含一个 virtio 网络首部。" -#: ../clients/common/settings-docs.h.in:331 +#: ../clients/common/settings-docs.h.in:332 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 " @@ -8795,7 +8838,7 @@ msgstr "" "包含用户数据的键/值对字典。此数据被网络管理器（NetworkManager）忽略且可被用户" "随意使用。键只支持严格的 ASCII 格式，但是值可以为长度有限的任意 UTF8 字符串。" -#: ../clients/common/settings-docs.h.in:332 +#: ../clients/common/settings-docs.h.in:333 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" @@ -8804,7 +8847,7 @@ msgstr "" "用于传出的数据包，从 Linux SKB 优先级到 802.1p 优先级的映射列表。映射以 \"从:" "到\" 的格式给定，其中 \"从\" 和 \"到\" 都是无符号整数，如 \"7:3\"。" -#: ../clients/common/settings-docs.h.in:333 +#: ../clients/common/settings-docs.h.in:334 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 " @@ -8823,7 +8866,7 @@ msgstr "" "议）。此属性的默认值为 NM_VLAN_FLAG_REORDER_HEADERS，但它以前是 0。为了保持后" "向兼容性，D-Bus API 里的默认值继续为 0 而且 D-Bus 上缺少属性时仍视为 0。" -#: ../clients/common/settings-docs.h.in:334 +#: ../clients/common/settings-docs.h.in:335 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." @@ -8831,7 +8874,7 @@ msgstr "" "由此连接创建的接口应该分配的 VLAN 标识符。有效范围为从 0 到 4094，不包括保留" "的 ID 4095。" -#: ../clients/common/settings-docs.h.in:335 +#: ../clients/common/settings-docs.h.in:336 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" @@ -8840,7 +8883,7 @@ msgstr "" "用于传入的数据包，从 802.1p 优先级到 Linux SKB 优先级的映射列表。映射以 \"从:" "到\" 的格式给定，其中 \"从\" 和 \"到\" 都是无符号整数，如 \"7:3\"。" -#: ../clients/common/settings-docs.h.in:336 +#: ../clients/common/settings-docs.h.in:337 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 " @@ -8851,13 +8894,13 @@ msgstr "" "果此属性未指定，该连接必须包含具有 \"mac-address\" 属性的 \"802-3-ethernet\" " "设置。" -#: ../clients/common/settings-docs.h.in:337 +#: ../clients/common/settings-docs.h.in:338 msgid "" "Dictionary of key/value pairs of VPN plugin specific data. Both keys and " "values must be strings." msgstr "VPN 插件特定数据的键/值对字典。键和值都必须为字符串。" -#: ../clients/common/settings-docs.h.in:338 +#: ../clients/common/settings-docs.h.in:339 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 " @@ -8866,14 +8909,14 @@ msgstr "" "如果 VPN 服务支持持久连接，并且此属性为 TRUE，VPN 将尝试在链路更改和中断的整" "个期间都保持连接，直到手动断开连接。" -#: ../clients/common/settings-docs.h.in:339 +#: ../clients/common/settings-docs.h.in:340 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.h.in:340 +#: ../clients/common/settings-docs.h.in:341 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." @@ -8881,7 +8924,7 @@ msgstr "" "此连接用于连接到它网络的 VPN 插件的 D-Bus 服务名。例如 org.freedesktop." "NetworkManager.vpnc 用于 vpnc 插件。" -#: ../clients/common/settings-docs.h.in:341 +#: ../clients/common/settings-docs.h.in:342 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 " @@ -8892,7 +8935,7 @@ msgstr "" "超时，即 60 秒（除非被配置文件中的 vpn.timeout 覆盖）。大于零的值表示以秒计算" "的超时时间。" -#: ../clients/common/settings-docs.h.in:342 +#: ../clients/common/settings-docs.h.in:343 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 " @@ -8905,55 +8948,55 @@ msgstr "" "VPN 需要每个用户提供个不同的名称，那么让此属性留空。如果此属性留空，网络管理" "器（NetworkManager）将自动提供 VPN 连接所需要用户的用户名。" -#: ../clients/common/settings-docs.h.in:343 +#: ../clients/common/settings-docs.h.in:344 msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel." msgstr "指定内核已获知 FDB 条目的生存期，以秒计。" -#: ../clients/common/settings-docs.h.in:344 +#: ../clients/common/settings-docs.h.in:345 msgid "" "Specifies the UDP destination port to communicate to the remote VXLAN tunnel " "endpoint." msgstr "指定连接到远程 VXLAN 隧道端点的 UDP 目标端口。" -#: ../clients/common/settings-docs.h.in:345 +#: ../clients/common/settings-docs.h.in:346 msgid "" "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use." msgstr "指定要使用的 VXLAN 网络标识符（或 VXLAN 分段标识符）。" -#: ../clients/common/settings-docs.h.in:346 +#: ../clients/common/settings-docs.h.in:347 msgid "Specifies whether netlink LL ADDR miss notifications are generated." msgstr "指定是否生成网络链路 LL ADDR 未命中通知。" -#: ../clients/common/settings-docs.h.in:347 +#: ../clients/common/settings-docs.h.in:348 msgid "Specifies whether netlink IP ADDR miss notifications are generated." msgstr "指定是否生成网络链路 IP ADDR 未命中通知。" -#: ../clients/common/settings-docs.h.in:348 +#: ../clients/common/settings-docs.h.in:349 msgid "" "Specifies whether unknown source link layer addresses and IP addresses are " "entered into the VXLAN device forwarding database." msgstr "指定是否让未知来源的链路层地址和 IP 地址输入进 VXLAN 设备转发数据库。" -#: ../clients/common/settings-docs.h.in:349 +#: ../clients/common/settings-docs.h.in:350 msgid "" "Specifies the maximum number of FDB entries. A value of zero means that the " "kernel will store unlimited entries." msgstr "指定 FDB 条目的最大数量。零值表示允许内核存储不限量的条目。" -#: ../clients/common/settings-docs.h.in:350 +#: ../clients/common/settings-docs.h.in:351 msgid "If given, specifies the source IP address to use in outgoing packets." msgstr "如果给定，指定要在传出数据包使用的来源 IP 地址。" -#: ../clients/common/settings-docs.h.in:351 +#: ../clients/common/settings-docs.h.in:352 msgid "" "If given, specifies the parent interface name or parent connection UUID." msgstr "如果给定了，其指定上级接口名称或上级连接的 UUID。" -#: ../clients/common/settings-docs.h.in:352 +#: ../clients/common/settings-docs.h.in:353 msgid "Specifies whether ARP proxy is turned on." msgstr "指定是否打开 ARP 代理。" -#: ../clients/common/settings-docs.h.in:353 +#: ../clients/common/settings-docs.h.in:354 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 " @@ -8962,31 +9005,31 @@ msgstr "" "指定当目标链路层地址在 VXLAN 设备转发数据库中未知时要在传出数据包中使用的单播" "目标 IP 地址，或者要加入的多播 IP 地址。" -#: ../clients/common/settings-docs.h.in:354 +#: ../clients/common/settings-docs.h.in:355 msgid "Specifies whether route short circuit is turned on." msgstr "指定是否打开路由短路。" -#: ../clients/common/settings-docs.h.in:355 +#: ../clients/common/settings-docs.h.in:356 msgid "" "Specifies the maximum UDP source port to communicate to the remote VXLAN " "tunnel endpoint." msgstr "指定连接到远程 VXLAN 隧道端点的最大 UDP 来源端口。" -#: ../clients/common/settings-docs.h.in:356 +#: ../clients/common/settings-docs.h.in:357 msgid "" "Specifies the minimum UDP source port to communicate to the remote VXLAN " "tunnel endpoint." msgstr "指定连接到远程 VXLAN 隧道端点的最小 UDP 来源端口。" -#: ../clients/common/settings-docs.h.in:357 +#: ../clients/common/settings-docs.h.in:358 msgid "Specifies the TOS value to use in outgoing packets." msgstr "指定要在传出数据包使用的 TOS 值。" -#: ../clients/common/settings-docs.h.in:358 +#: ../clients/common/settings-docs.h.in:359 msgid "Specifies the time-to-live value to use in outgoing packets." msgstr "指定要在传出数据包使用的存活时间值。" -#: ../clients/common/settings-docs.h.in:359 +#: ../clients/common/settings-docs.h.in:360 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 " @@ -8995,13 +9038,19 @@ msgstr "" "如指定了，此连接将只应用到其 MAC 地址符合的 WiMAX 设备。此属性不会改变设备的 " "MAC 地址（又名 MAC 欺骗）。已弃用：1" -#: ../clients/common/settings-docs.h.in:360 +#: ../clients/common/settings-docs.h.in:361 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 +#: ../clients/common/settings-docs.h.in:362 +msgid "" +"IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use " +"whatever the device is already set to\"." +msgstr "" + +#: ../clients/common/settings-docs.h.in:363 msgid "" "If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) " "MAC layer device whose permanent MAC address matches." @@ -9009,11 +9058,17 @@ msgstr "" "如果指定了，此连接将只应用到其永久 MAC 地址匹配的 IEEE 802.15.4 (WPAN) MAC 层" "设备。" -#: ../clients/common/settings-docs.h.in:362 +#: ../clients/common/settings-docs.h.in:364 +msgid "" +"IEEE 802.15.4 channel page. A positive integer or -1, meaning \"do not set, " +"use whatever the device is already set to\"." +msgstr "" + +#: ../clients/common/settings-docs.h.in:365 msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier." msgstr "IEEE 802.15.4 个人区域网络（PAN）标识符。" -#: ../clients/common/settings-docs.h.in:363 +#: ../clients/common/settings-docs.h.in:366 msgid "Short IEEE 802.15.4 address to be used within a restricted environment." msgstr "在受限环境中使用的短 IEEE 802.15.4 地址。" @@ -9032,23 +9087,23 @@ msgid "Error: Could not create NMClient object: %s\n" msgstr "错误：无法创建 NMClient 对象：%s\n" #: ../clients/nm-online.c:252 +msgid "Don't print anything" +msgstr "不输出任何结果" + +#: ../clients/nm-online.c:253 +msgid "Wait for NetworkManager startup instead of a connection" +msgstr "等待网络管理器启动而不是连接" + +#: ../clients/nm-online.c:254 msgid "" "Time to wait for a connection, in seconds (without the option, default value " "is 30)" msgstr "等待连接时间，以秒计（没有该选项时，默认为 30）" -#: ../clients/nm-online.c:253 +#: ../clients/nm-online.c:255 msgid "Exit immediately if NetworkManager is not running or connecting" msgstr "如果网络管理器未运行或连接则立即退出" -#: ../clients/nm-online.c:254 -msgid "Don't print anything" -msgstr "不输出任何结果" - -#: ../clients/nm-online.c:255 -msgid "Wait for NetworkManager startup instead of a connection" -msgstr "等待网络管理器启动而不是连接" - #: ../clients/nm-online.c:275 msgid "" "Waits for NetworkManager to finish activating startup network connections." @@ -9082,7 +9137,7 @@ msgid "Could not re-read file: %s" msgstr "无法重新读取文件：%s" #: ../clients/tui/nm-editor-utils.c:144 ../libnm-glib/nm-device.c:1820 -#: ../libnm/nm-device.c:1306 +#: ../libnm/nm-device.c:1380 msgid "Ethernet" msgstr "以太网" @@ -9092,7 +9147,7 @@ msgid "Ethernet connection %d" msgstr "以太网连接 %d" #: ../clients/tui/nm-editor-utils.c:152 ../libnm-glib/nm-device.c:1822 -#: ../libnm/nm-device.c:1308 +#: ../libnm/nm-device.c:1382 msgid "Wi-Fi" msgstr "Wi-Fi" @@ -9101,8 +9156,8 @@ msgstr "Wi-Fi" msgid "Wi-Fi connection %d" msgstr "Wi-Fi 连接 %d" -#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2268 -#: ../libnm-glib/nm-device.c:1832 ../libnm/nm-device.c:1324 +#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2376 +#: ../libnm-glib/nm-device.c:1832 ../libnm/nm-device.c:1398 msgid "InfiniBand" msgstr "InfiniBand" @@ -9112,7 +9167,7 @@ msgid "InfiniBand connection %d" msgstr "InfiniBand 连接 %d" #: ../clients/tui/nm-editor-utils.c:170 ../libnm-glib/nm-device.c:1830 -#: ../libnm/nm-device.c:1322 +#: ../libnm/nm-device.c:1396 msgid "Mobile Broadband" msgstr "移动宽带" @@ -9130,10 +9185,10 @@ msgstr "DSL" msgid "DSL connection %d" msgstr "DSL 连接 %d" -#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2260 +#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2368 #: ../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 +#: ../libnm/nm-device.c:1400 +#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4794 msgid "Bond" msgstr "绑定" @@ -9142,10 +9197,10 @@ msgstr "绑定" msgid "Bond connection %d" msgstr "绑定连接 %d" -#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2264 +#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2372 #: ../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 +#: ../libnm/nm-device.c:1404 +#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5130 msgid "Bridge" msgstr "网桥" @@ -9154,10 +9209,10 @@ msgstr "网桥" msgid "Bridge connection %d" msgstr "网桥连接 %d" -#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2262 +#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2370 #: ../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 +#: ../libnm/nm-device.c:1402 +#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4897 msgid "Team" msgstr "组合" @@ -9167,8 +9222,8 @@ msgid "Team connection %d" msgstr "组合连接 %d" #: ../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 +#: ../libnm-core/nm-connection.c:2374 ../libnm-glib/nm-device.c:1840 +#: ../libnm-util/nm-connection.c:1629 ../libnm/nm-device.c:1406 msgid "VLAN" msgstr "VLAN" @@ -9971,339 +10026,360 @@ msgstr "无法联系网络管理器：%s\n" msgid "NetworkManager is not running." msgstr "NetworkManaer 未运行。" -#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:130 -#, c-format -msgid "PEM key file had no end tag '%s'." +#: ../libnm-core/nm-crypto.c:214 +#, fuzzy, c-format +msgid "PEM key file had no start tag" msgstr "PEM 密钥文件没有结束标记 \"%s\"。" -#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:143 +#: ../libnm-core/nm-crypto.c:222 ../libnm-util/crypto.c:130 #, c-format -msgid "Doesn't look like a PEM private key file." -msgstr "不像是一个 PEM 私钥文件。" +msgid "PEM key file had no end tag '%s'." +msgstr "PEM 密钥文件没有结束标记 \"%s\"。" -#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:160 +#: ../libnm-core/nm-crypto.c:249 ../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:168 +#: ../libnm-core/nm-crypto.c:257 ../libnm-util/crypto.c:168 #, c-format msgid "Malformed PEM file: unknown Proc-Type tag '%s'." msgstr "错误的 PEM 文件格式：未知的 Proc-Type 标记 \"%s\"。" -#: ../libnm-core/crypto.c:172 ../libnm-util/crypto.c:178 +#: ../libnm-core/nm-crypto.c:269 ../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:183 ../libnm-util/crypto.c:189 +#: ../libnm-core/nm-crypto.c:280 ../libnm-util/crypto.c:189 #, c-format msgid "Malformed PEM file: no IV found in DEK-Info tag." msgstr "错误的 PEM 文件格式：没有在 DEK-Info 标记找到初始向量。" -#: ../libnm-core/crypto.c:190 ../libnm-util/crypto.c:196 +#: ../libnm-core/nm-crypto.c:288 ../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:205 ../libnm-util/crypto.c:211 +#: ../libnm-core/nm-crypto.c:299 ../libnm-util/crypto.c:211 #, c-format msgid "Malformed PEM file: unknown private key cipher '%s'." msgstr "错误的 PEM 文件格式：未知的私钥密码 \"%s\"。" -#: ../libnm-core/crypto.c:224 ../libnm-util/crypto.c:230 +#: ../libnm-core/nm-crypto.c:320 ../libnm-util/crypto.c:230 #, c-format msgid "Could not decode private key." msgstr "无法解码私钥。" -#: ../libnm-core/crypto.c:278 ../libnm-util/crypto.c:282 +#: ../libnm-core/nm-crypto.c:361 ../libnm-util/crypto.c:282 msgid "Failed to find expected PKCS#8 start tag." msgstr "无法找到预期的 PKCS#8 起始标记。" -#: ../libnm-core/crypto.c:286 ../libnm-util/crypto.c:290 +#: ../libnm-core/nm-crypto.c:369 ../libnm-util/crypto.c:290 #, c-format msgid "Failed to find expected PKCS#8 end tag '%s'." msgstr "无法找到预期的 PKCS#8 结束标记\"%s\"。" -#: ../libnm-core/crypto.c:305 ../libnm-util/crypto.c:309 +#: ../libnm-core/nm-crypto.c:381 ../libnm-util/crypto.c:309 msgid "Failed to decode PKCS#8 private key." msgstr "无法解码 PKCS#8 私钥。" -#: ../libnm-core/crypto.c:347 ../libnm-util/crypto.c:351 +#: ../libnm-core/nm-crypto.c:440 ../libnm-util/crypto.c:351 #, c-format msgid "IV must be an even number of bytes in length." msgstr "初始向量长度必须是偶数字节。" -#: ../libnm-core/crypto.c:361 ../libnm-util/crypto.c:365 +#: ../libnm-core/nm-crypto.c:456 ../libnm-util/crypto.c:365 #, c-format msgid "IV contains non-hexadecimal digits." msgstr "初始向量中包含非十六进制数字。" -#: ../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\"。" +#: ../libnm-core/nm-crypto.c:532 +#, fuzzy, c-format +msgid "IV must contain at least 8 characters" +msgstr "密钥包含无效的字符" -#: ../libnm-core/crypto.c:504 ../libnm-util/crypto.c:515 +#: ../libnm-core/nm-crypto.c:580 ../libnm-util/crypto.c:515 #, c-format msgid "Unable to determine private key type." msgstr "无法确定私钥类型。" -#: ../libnm-core/crypto.c:512 +#: ../libnm-core/nm-crypto.c:592 #, c-format msgid "Password provided, but key was not encrypted." msgstr "已提供密码，但密钥没有加密。" -#: ../libnm-core/crypto.c:565 ../libnm-util/crypto.c:570 +#: ../libnm-core/nm-crypto.c:653 ../libnm-util/crypto.c:570 #, c-format msgid "PEM certificate had no start tag '%s'." msgstr "PEM 证书没有起始标记 \"%s\"。" -#: ../libnm-core/crypto.c:574 ../libnm-util/crypto.c:579 +#: ../libnm-core/nm-crypto.c:662 ../libnm-util/crypto.c:579 #, c-format msgid "PEM certificate had no end tag '%s'." msgstr "PEM 证书没有结束标记 \"%s\"。" -#: ../libnm-core/crypto.c:592 ../libnm-util/crypto.c:597 +#: ../libnm-core/nm-crypto.c:674 ../libnm-util/crypto.c:597 #, c-format msgid "Failed to decode certificate." msgstr "无法解码证书。" -#: ../libnm-core/crypto_gnutls.c:48 ../libnm-util/crypto_gnutls.c:48 +#: ../libnm-core/nm-crypto.c:703 ../libnm-core/nm-crypto.c:756 +#, fuzzy, c-format +msgid "Certificate file is empty" +msgstr "密钥为空" + +#: ../libnm-core/nm-crypto.c:736 +#, fuzzy, c-format +msgid "Failed to recognize certificate" +msgstr "无法解码证书。" + +#: ../libnm-core/nm-crypto.c:846 +#, fuzzy, c-format +msgid "not a valid private key" +msgstr "无效的私有密钥" + +#: ../libnm-core/nm-crypto-gnutls.c:75 ../libnm-util/crypto_gnutls.c:48 msgid "Failed to initialize the crypto engine." msgstr "初始化加密引擎失败。" -#: ../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）。" +#: ../libnm-core/nm-crypto-gnutls.c:107 ../libnm-core/nm-crypto-nss.c:129 +#, fuzzy, c-format +msgid "Unsupported key cipher for decryption" +msgstr "不支持的流量过滤器（tfilter）选项：\"%s\"。" -#: ../libnm-core/crypto_gnutls.c:121 ../libnm-util/crypto_gnutls.c:175 +#: ../libnm-core/nm-crypto-gnutls.c:117 ../libnm-core/nm-crypto-nss.c:136 +#, fuzzy, c-format +msgid "Invalid IV length (must be at least %u)." +msgstr "无效的初始向量长度（至少为 %d）。" + +#: ../libnm-core/nm-crypto-gnutls.c:134 ../libnm-util/crypto_gnutls.c:175 #, c-format msgid "Failed to initialize the decryption cipher context: %s (%s)" msgstr "初始化解密计算内容失败：%s（%s）" -#: ../libnm-core/crypto_gnutls.c:130 ../libnm-util/crypto_gnutls.c:184 +#: ../libnm-core/nm-crypto-gnutls.c:146 ../libnm-util/crypto_gnutls.c:184 #, c-format msgid "Failed to decrypt the private key: %s (%s)" msgstr "解密私钥失败：%s（%s）" -#: ../libnm-core/crypto_gnutls.c:140 ../libnm-core/crypto_nss.c:204 +#: ../libnm-core/nm-crypto-gnutls.c:160 ../libnm-core/nm-crypto-nss.c:223 #: ../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:151 ../libnm-core/crypto_nss.c:215 +#: ../libnm-core/nm-crypto-gnutls.c:171 ../libnm-core/nm-crypto-nss.c:234 #: ../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:234 ../libnm-util/crypto_gnutls.c:280 +#: ../libnm-core/nm-crypto-gnutls.c:205 ../libnm-core/nm-crypto-nss.c:289 +#, fuzzy, c-format +msgid "Unsupported key cipher for encryption" +msgstr "不支持的流量过滤器（tfilter）选项：\"%s\"。" + +#: ../libnm-core/nm-crypto-gnutls.c:221 ../libnm-util/crypto_gnutls.c:280 #, c-format msgid "Failed to initialize the encryption cipher context: %s (%s)" msgstr "初始化加密计算内容失败：%s（%s）" -#: ../libnm-core/crypto_gnutls.c:243 ../libnm-util/crypto_gnutls.c:289 +#: ../libnm-core/nm-crypto-gnutls.c:247 ../libnm-util/crypto_gnutls.c:289 #, c-format msgid "Failed to encrypt the data: %s (%s)" msgstr "加密数据失败：%s（%s）" -#: ../libnm-core/crypto_gnutls.c:286 ../libnm-util/crypto_gnutls.c:329 +#: ../libnm-core/nm-crypto-gnutls.c:272 ../libnm-util/crypto_gnutls.c:329 #, c-format msgid "Error initializing certificate data: %s" msgstr "初始化证书数据出错：%s" -#: ../libnm-core/crypto_gnutls.c:308 ../libnm-util/crypto_gnutls.c:351 +#: ../libnm-core/nm-crypto-gnutls.c:294 ../libnm-util/crypto_gnutls.c:351 #, c-format msgid "Couldn't decode certificate: %s" msgstr "无法解码证书：%s" -#: ../libnm-core/crypto_gnutls.c:336 ../libnm-util/crypto_gnutls.c:375 +#: ../libnm-core/nm-crypto-gnutls.c:321 ../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:349 ../libnm-util/crypto_gnutls.c:388 +#: ../libnm-core/nm-crypto-gnutls.c:334 ../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:361 ../libnm-util/crypto_gnutls.c:400 +#: ../libnm-core/nm-crypto-gnutls.c:348 ../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:393 ../libnm-util/crypto_gnutls.c:428 +#: ../libnm-core/nm-crypto-gnutls.c:376 ../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:416 ../libnm-util/crypto_gnutls.c:451 +#: ../libnm-core/nm-crypto-gnutls.c:403 ../libnm-util/crypto_gnutls.c:451 #, c-format msgid "Couldn't decode PKCS#8 file: %s" msgstr "无法解码 PKCS#8 文件：%s" -#: ../libnm-core/crypto_nss.c:54 ../libnm-util/crypto_nss.c:53 +#: ../libnm-core/nm-crypto-nss.c:82 ../libnm-util/crypto_nss.c:53 #, c-format msgid "Failed to initialize the crypto engine: %d." msgstr "初始化加密引擎失败：%d。" -#: ../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）。" - -#: ../libnm-core/crypto_nss.c:133 ../libnm-util/crypto_nss.c:181 +#: ../libnm-core/nm-crypto-nss.c:148 ../libnm-util/crypto_nss.c:181 #, c-format msgid "Failed to initialize the decryption cipher slot." msgstr "初始化解密计算插槽失败。" -#: ../libnm-core/crypto_nss.c:143 ../libnm-util/crypto_nss.c:191 +#: ../libnm-core/nm-crypto-nss.c:158 ../libnm-util/crypto_nss.c:191 #, c-format msgid "Failed to set symmetric key for decryption." msgstr "为解密设置对称密钥失败。" -#: ../libnm-core/crypto_nss.c:153 ../libnm-util/crypto_nss.c:201 +#: ../libnm-core/nm-crypto-nss.c:168 ../libnm-util/crypto_nss.c:201 #, c-format msgid "Failed to set IV for decryption." msgstr "为解密设置初始向量失败。" -#: ../libnm-core/crypto_nss.c:161 ../libnm-util/crypto_nss.c:209 +#: ../libnm-core/nm-crypto-nss.c:176 ../libnm-util/crypto_nss.c:209 #, c-format msgid "Failed to initialize the decryption context." msgstr "初始化解密环境失败。" -#: ../libnm-core/crypto_nss.c:174 ../libnm-util/crypto_nss.c:222 +#: ../libnm-core/nm-crypto-nss.c:192 ../libnm-util/crypto_nss.c:222 #, c-format msgid "Failed to decrypt the private key: %d." msgstr "解密私钥失败：%d。" -#: ../libnm-core/crypto_nss.c:182 ../libnm-util/crypto_nss.c:230 +#: ../libnm-core/nm-crypto-nss.c:200 ../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:193 ../libnm-util/crypto_nss.c:241 +#: ../libnm-core/nm-crypto-nss.c:211 ../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:304 ../libnm-util/crypto_nss.c:345 +#: ../libnm-core/nm-crypto-nss.c:300 ../libnm-util/crypto_nss.c:345 #, c-format msgid "Failed to initialize the encryption cipher slot." msgstr "初始化加密计算插槽空间失败。" -#: ../libnm-core/crypto_nss.c:312 ../libnm-util/crypto_nss.c:353 +#: ../libnm-core/nm-crypto-nss.c:308 ../libnm-util/crypto_nss.c:353 #, c-format msgid "Failed to set symmetric key for encryption." msgstr "为加密设置对称密钥失败。" -#: ../libnm-core/crypto_nss.c:320 ../libnm-util/crypto_nss.c:361 +#: ../libnm-core/nm-crypto-nss.c:316 ../libnm-util/crypto_nss.c:361 #, c-format msgid "Failed to set IV for encryption." msgstr "为加密设置初始向量失败。" -#: ../libnm-core/crypto_nss.c:328 ../libnm-util/crypto_nss.c:369 +#: ../libnm-core/nm-crypto-nss.c:324 ../libnm-util/crypto_nss.c:369 #, c-format msgid "Failed to initialize the encryption context." msgstr "初始化加密内容失败。" -#: ../libnm-core/crypto_nss.c:336 ../libnm-util/crypto_nss.c:377 +#: ../libnm-core/nm-crypto-nss.c:347 ../libnm-util/crypto_nss.c:377 #, c-format msgid "Failed to encrypt: %d." msgstr "加密失败：%d。" -#: ../libnm-core/crypto_nss.c:344 ../libnm-util/crypto_nss.c:385 +#: ../libnm-core/nm-crypto-nss.c:355 ../libnm-util/crypto_nss.c:385 #, c-format msgid "Unexpected amount of data after encrypting." msgstr "加密后意外的数据量。" -#: ../libnm-core/crypto_nss.c:387 ../libnm-util/crypto_nss.c:425 +#: ../libnm-core/nm-crypto-nss.c:393 ../libnm-util/crypto_nss.c:425 #, c-format msgid "Couldn't decode certificate: %d" msgstr "无法解码证书：%d" -#: ../libnm-core/crypto_nss.c:425 +#: ../libnm-core/nm-crypto-nss.c:439 #, c-format msgid "Password must be UTF-8" msgstr "密码必须是 UTF-8 格式" -#: ../libnm-core/crypto_nss.c:455 ../libnm-util/crypto_nss.c:488 +#: ../libnm-core/nm-crypto-nss.c:462 +#, fuzzy, c-format +msgid "Couldn't initialize slot" +msgstr "无法初始化 PKCS#8 解码器：%s" + +#: ../libnm-core/nm-crypto-nss.c:470 ../libnm-util/crypto_nss.c:489 #, c-format msgid "Couldn't initialize PKCS#12 decoder: %d" msgstr "无法初始化 PKCS#12 解码器：%d" -#: ../libnm-core/crypto_nss.c:464 ../libnm-util/crypto_nss.c:497 +#: ../libnm-core/nm-crypto-nss.c:479 ../libnm-util/crypto_nss.c:498 #, c-format msgid "Couldn't decode PKCS#12 file: %d" msgstr "无法解码 PKCS#12 文件：%d" -#: ../libnm-core/crypto_nss.c:473 ../libnm-util/crypto_nss.c:506 +#: ../libnm-core/nm-crypto-nss.c:488 ../libnm-util/crypto_nss.c:507 #, c-format msgid "Couldn't verify PKCS#12 file: %d" msgstr "无法校验 PKCS#12 文件：%d" -#: ../libnm-core/crypto_nss.c:524 ../libnm-util/crypto_nss.c:550 +#: ../libnm-core/nm-crypto-nss.c:538 ../libnm-util/crypto_nss.c:551 msgid "Could not generate random data." msgstr "无法生成随机数据。" -#: ../libnm-core/nm-connection.c:283 +#: ../libnm-core/nm-connection.c:301 msgid "wrong type; should be a list of strings." msgstr "错误的类型；应为一个字符串列表。" -#: ../libnm-core/nm-connection.c:353 +#: ../libnm-core/nm-connection.c:371 msgid "unknown setting name" msgstr "未知的设置名称" -#: ../libnm-core/nm-connection.c:365 +#: ../libnm-core/nm-connection.c:383 msgid "duplicate setting name" msgstr "重复的设置名称" -#: ../libnm-core/nm-connection.c:1325 +#: ../libnm-core/nm-connection.c:1366 msgid "setting not found" msgstr "未找到设置" -#: ../libnm-core/nm-connection.c:1391 ../libnm-core/nm-connection.c:1416 -#: ../libnm-core/nm-connection.c:1441 +#: ../libnm-core/nm-connection.c:1432 ../libnm-core/nm-connection.c:1457 +#: ../libnm-core/nm-connection.c:1482 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 +#: ../libnm-core/nm-connection.c:1445 ../libnm-core/nm-connection.c:1470 +#: ../libnm-core/nm-connection.c:1495 msgid "setting not allowed in slave connection" msgstr "从连接中不允许设置" -#: ../libnm-core/nm-connection.c:1544 +#: ../libnm-core/nm-connection.c:1585 msgid "Unexpected failure to verify the connection" msgstr "检验连接意外地失败" -#: ../libnm-core/nm-connection.c:1588 +#: ../libnm-core/nm-connection.c:1630 msgid "Unexpected failure to normalize the connection" msgstr "正常化连接意外地失败" -#: ../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-connection.c:2234 ../libnm-core/nm-setting-8021x.c:2571 +#: ../libnm-core/nm-setting-8021x.c:2588 ../libnm-core/nm-setting-8021x.c:2619 +#: ../libnm-core/nm-setting-8021x.c:2636 ../libnm-core/nm-setting-8021x.c:2678 +#: ../libnm-core/nm-setting-8021x.c:2690 ../libnm-core/nm-setting-8021x.c:2708 +#: ../libnm-core/nm-setting-8021x.c:2720 ../libnm-core/nm-setting-8021x.c:2744 +#: ../libnm-core/nm-setting-8021x.c:2826 ../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-connection.c:947 +#: ../libnm-core/nm-setting-connection.c:990 +#: ../libnm-core/nm-setting-connection.c:1156 #: ../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-vpn.c:550 ../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 @@ -10329,188 +10405,180 @@ msgstr "正常化连接意外地失败" msgid "property is missing" msgstr "缺少属性" -#: ../libnm-core/nm-connection.c:2271 +#: ../libnm-core/nm-connection.c:2379 msgid "IP Tunnel" msgstr "IP 隧道" -#: ../libnm-core/nm-dbus-utils.c:189 +#: ../libnm-core/nm-dbus-utils.c:202 #, c-format msgid "Method returned type '%s', but expected '%s'" msgstr "方法返回类型 \"%s\"，但期望的是 \"%s\"" -#: ../libnm-core/nm-keyfile.c:199 +#: ../libnm-core/nm-keyfile-utils.c:210 +#, fuzzy, c-format +msgid "value is not an integer in range [%lld, %lld]" +msgstr "\"%s\" 超出范围 [%lli, %lli]" + +#: ../libnm-core/nm-keyfile.c:210 msgid "ignoring missing number" msgstr "忽略缺失的数字" -#: ../libnm-core/nm-keyfile.c:207 +#: ../libnm-core/nm-keyfile.c:218 #, c-format msgid "ignoring invalid number '%s'" msgstr "忽略无效的数字 \"%s\"" -#: ../libnm-core/nm-keyfile.c:228 +#: ../libnm-core/nm-keyfile.c:239 #, c-format msgid "ignoring invalid %s address: %s" msgstr "忽略无效的 %s 地址：%s" -#: ../libnm-core/nm-keyfile.c:270 +#: ../libnm-core/nm-keyfile.c:281 #, c-format msgid "ignoring invalid gateway '%s' for %s route" msgstr "忽略 %2$s 路由的无效网关 \"%1$s\"" -#: ../libnm-core/nm-keyfile.c:291 +#: ../libnm-core/nm-keyfile.c:302 #, c-format msgid "ignoring invalid %s route: %s" msgstr "忽略无效的 %s 路由：%s" -#: ../libnm-core/nm-keyfile.c:416 +#: ../libnm-core/nm-keyfile.c:427 #, c-format msgid "unexpected character '%c' for address %s: '%s' (position %td)" msgstr "对于地址 %2$s 的意外字符 \"%1$c\"：\"%3$s\"（位置 %4$td）" -#: ../libnm-core/nm-keyfile.c:426 +#: ../libnm-core/nm-keyfile.c:437 #, c-format msgid "unexpected character '%c' for %s: '%s' (position %td)" msgstr "对于 %2$s 的意外字符 \"%1$c\"：\"%3$s\"（位置 %4$td）" -#: ../libnm-core/nm-keyfile.c:435 +#: ../libnm-core/nm-keyfile.c:446 #, c-format msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)" msgstr "对于 %2$s，前缀长度中有意外字符 \"%1$c\"：\"%3$s\"（位置 %4$td）" -#: ../libnm-core/nm-keyfile.c:446 +#: ../libnm-core/nm-keyfile.c:457 #, c-format msgid "garbage at the end of value %s: '%s'" msgstr "值 %s 的末尾有无用信息：\"%s\"" -#: ../libnm-core/nm-keyfile.c:452 +#: ../libnm-core/nm-keyfile.c:463 #, c-format msgid "deprecated semicolon at the end of value %s: '%s'" msgstr "值 %s 的末尾有舍弃的分号：\"%s\"" -#: ../libnm-core/nm-keyfile.c:467 +#: ../libnm-core/nm-keyfile.c:478 #, c-format msgid "invalid prefix length for %s '%s', defaulting to %d" msgstr "%s 的前缀长度 \"%s\" 无效，默认为 %d" -#: ../libnm-core/nm-keyfile.c:474 +#: ../libnm-core/nm-keyfile.c:485 #, c-format msgid "missing prefix length for %s '%s', defaulting to %d" msgstr "缺少 %s 的前缀长度 \"%s\"，默认为 %d" -#: ../libnm-core/nm-keyfile.c:738 +#: ../libnm-core/nm-keyfile.c:748 #, c-format msgid "ignoring invalid DNS server IPv%c address '%s'" msgstr "忽略无效的 DNS 服务器 IPv%c 地址 \"%s\"" -#: ../libnm-core/nm-keyfile.c:834 ../libnm-core/nm-keyfile.c:2629 +#: ../libnm-core/nm-keyfile.c:844 ../libnm-core/nm-keyfile.c:2734 #, c-format msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)" msgstr "忽略无效的字节元素 \"%d\"（不在 0 和 255 之间）" -#: ../libnm-core/nm-keyfile.c:845 +#: ../libnm-core/nm-keyfile.c:855 msgid "ignoring invalid MAC address" msgstr "忽略无效的 MAC 地址" -#: ../libnm-core/nm-keyfile.c:1082 +#: ../libnm-core/nm-keyfile.c:1105 msgid "ignoring invalid SSID" msgstr "忽略无效的 SSID" -#: ../libnm-core/nm-keyfile.c:1098 +#: ../libnm-core/nm-keyfile.c:1121 msgid "ignoring invalid raw password" msgstr "忽略无效的原始密码" -#: ../libnm-core/nm-keyfile.c:1236 +#: ../libnm-core/nm-keyfile.c:1258 msgid "invalid key/cert value" msgstr "无效的密钥/证书值" -#: ../libnm-core/nm-keyfile.c:1247 +#: ../libnm-core/nm-keyfile.c:1269 #, c-format msgid "invalid key/cert value path \"%s\"" msgstr "无效的密钥/证书值路径 \"%s\"" -#: ../libnm-core/nm-keyfile.c:1263 ../libnm-core/nm-keyfile.c:1346 +#: ../libnm-core/nm-keyfile.c:1285 ../libnm-core/nm-keyfile.c:1368 #, c-format msgid "certificate or key file '%s' does not exist" msgstr "证书或密钥文件 \"%s\" 不存在" -#: ../libnm-core/nm-keyfile.c:1272 +#: ../libnm-core/nm-keyfile.c:1294 #, c-format msgid "invalid PKCS#11 URI \"%s\"" msgstr "无效的 PKCS#11 URI \"%s\"" -#: ../libnm-core/nm-keyfile.c:1316 +#: ../libnm-core/nm-keyfile.c:1338 msgid "invalid key/cert value data:;base64, is not base64" msgstr "无效的密钥/证书值 data:;base64，不是 base64" -#: ../libnm-core/nm-keyfile.c:1325 +#: ../libnm-core/nm-keyfile.c:1347 msgid "invalid key/cert value data:;base64,file://" msgstr "无效的密钥/证书值 data:;base64,file://" -#: ../libnm-core/nm-keyfile.c:1358 +#: ../libnm-core/nm-keyfile.c:1380 msgid "invalid key/cert value is not a valid blob" msgstr "无效的密钥/证书值，不是有效的比特块（blob）" -#: ../libnm-core/nm-keyfile.c:1408 +#: ../libnm-core/nm-keyfile.c:1482 #, c-format msgid "invalid parity value '%s'" msgstr "无效的奇偶校验值 \"%s\"" -#: ../libnm-core/nm-keyfile.c:1426 +#: ../libnm-core/nm-keyfile.c:1499 ../libnm-core/nm-keyfile.c:2789 +#, fuzzy, c-format +msgid "invalid setting: %s" +msgstr "无效的设置名称 \"%s\"" + +#: ../libnm-core/nm-keyfile.c:1514 #, c-format msgid "ignoring invalid team configuration: %s" msgstr "忽略无效的组合（team）配置：%s" -#: ../libnm-core/nm-keyfile.c:1469 +#: ../libnm-core/nm-keyfile.c:1557 #, c-format msgid "invalid qdisc: %s" msgstr "无效的排队规则（qdisc）：%s" -#: ../libnm-core/nm-keyfile.c:1517 +#: ../libnm-core/nm-keyfile.c:1605 #, c-format msgid "invalid tfilter: %s" msgstr "无效的流量过滤器（tfilter）：%s" -#: ../libnm-core/nm-keyfile.c:2538 +#: ../libnm-core/nm-keyfile.c:2634 #, c-format msgid "error loading setting value: %s" msgstr "加载设置值时出错：%s" -#: ../libnm-core/nm-keyfile.c:2563 -#, c-format -msgid "invalid negative value (%i)" -msgstr "无效的负值（%i）" - -#: ../libnm-core/nm-keyfile.c:2584 -#, c-format -msgid "invalid char value (%i)" -msgstr "无效的字符值（%i）" - -#: ../libnm-core/nm-keyfile.c:2606 -#, c-format -msgid "invalid int64 value (%s)" -msgstr "无效的 int64 值（%s）" - -#: ../libnm-core/nm-keyfile.c:2665 -#, c-format -msgid "too large FLAGS property '%s' (%llu)" -msgstr "过大的 FLAGS 属性 \"%s\" (%llu)" - -#: ../libnm-core/nm-keyfile.c:2678 -#, c-format -msgid "unhandled setting property type '%s'" -msgstr "未处理的设置属性类型 \"%s\"" +#: ../libnm-core/nm-keyfile.c:2661 ../libnm-core/nm-keyfile.c:2672 +#: ../libnm-core/nm-keyfile.c:2690 ../libnm-core/nm-keyfile.c:2701 +#: ../libnm-core/nm-keyfile.c:2712 ../libnm-core/nm-keyfile.c:2764 +#: ../libnm-core/nm-keyfile.c:2775 +msgid "value cannot be interpreted as integer" +msgstr "" -#: ../libnm-core/nm-keyfile.c:2699 +#: ../libnm-core/nm-keyfile.c:2810 #, c-format msgid "invalid setting name '%s'" msgstr "无效的设置名称 \"%s\"" -#: ../libnm-core/nm-keyfile.c:2742 +#: ../libnm-core/nm-keyfile.c:2855 #, c-format msgid "invalid key '%s.%s'" msgstr "无效的密钥 \"%s.%s\"" -#: ../libnm-core/nm-keyfile.c:2757 +#: ../libnm-core/nm-keyfile.c:2870 #, c-format msgid "key '%s.%s' is not boolean" msgstr "密钥 \"%s.%s\" 不是布尔值" @@ -10520,7 +10588,7 @@ msgstr "密钥 \"%s.%s\" 不是布尔值" msgid "property is not specified" msgstr "未指定属性" -#: ../libnm-core/nm-setting-6lowpan.c:126 ../libnm-core/nm-setting-macsec.c:306 +#: ../libnm-core/nm-setting-6lowpan.c:126 ../libnm-core/nm-setting-macsec.c:314 #: ../libnm-core/nm-setting-vlan.c:632 ../libnm-util/nm-setting-vlan.c:556 #, c-format msgid "'%s' value doesn't match '%s=%s'" @@ -10528,69 +10596,76 @@ 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-macsec.c:325 ../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:470 +#: ../libnm-core/nm-setting-8021x.c:229 msgid "binary data missing" msgstr "二进制数据缺失" -#: ../libnm-core/nm-setting-8021x.c:498 +#: ../libnm-core/nm-setting-8021x.c:257 msgid "URI not NUL terminated" msgstr "URI 非 NUL 终止符" -#: ../libnm-core/nm-setting-8021x.c:507 +#: ../libnm-core/nm-setting-8021x.c:266 msgid "URI is empty" msgstr "URI 为空" -#: ../libnm-core/nm-setting-8021x.c:515 +#: ../libnm-core/nm-setting-8021x.c:274 msgid "URI is not valid UTF-8" msgstr "URI 不是有效的 UTF-8" -#: ../libnm-core/nm-setting-8021x.c:751 ../libnm-util/nm-setting-8021x.c:639 +#: ../libnm-core/nm-setting-8021x.c:292 +msgid "data missing" +msgstr "数据缺失" + +#: ../libnm-core/nm-setting-8021x.c:315 ../libnm-core/nm-setting-8021x.c:682 +#, c-format +msgid "certificate is invalid: %s" +msgstr "证书是无效的：%s" + +#: ../libnm-core/nm-setting-8021x.c:323 +#, fuzzy, c-format +msgid "certificate detected as invalid scheme" +msgstr "证书是无效的：%s" + +#: ../libnm-core/nm-setting-8021x.c:537 ../libnm-util/nm-setting-8021x.c:639 msgid "CA certificate must be in X.509 format" msgstr "CA 证书必须是 X.509 格式" -#: ../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-core/nm-setting-8021x.c:553 ../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:2272 ../libnm-util/nm-setting-8021x.c:1811 -msgid "invalid private key" -msgstr "无效的私有密钥" - -#: ../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:692 +#, c-format +msgid "password is not supported when certificate is not on a PKCS#11 token" +msgstr "当证书不在 PKCS#11 令牌上时不支持密码" -#: ../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-8021x.c:2578 ../libnm-core/nm-setting-8021x.c:2595 +#: ../libnm-core/nm-setting-8021x.c:2626 ../libnm-core/nm-setting-8021x.c:2643 +#: ../libnm-core/nm-setting-8021x.c:2684 ../libnm-core/nm-setting-8021x.c:2696 +#: ../libnm-core/nm-setting-8021x.c:2714 ../libnm-core/nm-setting-8021x.c:2726 +#: ../libnm-core/nm-setting-8021x.c:2751 ../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-connection.c:954 +#: ../libnm-core/nm-setting-connection.c:1002 +#: ../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: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-vpn.c:559 ../libnm-core/nm-setting-vpn.c:569 #: ../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-core/nm-setting.c:1237 ../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 @@ -10609,24 +10684,14 @@ msgstr "无效的二阶段私钥" msgid "property is empty" msgstr "属性为空" -#: ../libnm-core/nm-setting-8021x.c:2904 ../libnm-core/nm-setting-8021x.c:2952 +#: ../libnm-core/nm-setting-8021x.c:2608 ../libnm-core/nm-setting-8021x.c:2656 #: ../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\" 属性" -#: ../libnm-core/nm-setting-8021x.c:3181 -#, c-format -msgid "certificate is invalid: %s" -msgstr "证书是无效的：%s" - -#: ../libnm-core/nm-setting-8021x.c:3191 -#, c-format -msgid "password is not supported when certificate is not on a PKCS#11 token" -msgstr "当证书不在 PKCS#11 令牌上时不支持密码" - -#: ../libnm-core/nm-setting-8021x.c:3228 +#: ../libnm-core/nm-setting-8021x.c:2835 #: ../libnm-core/nm-setting-bluetooth.c:121 #: ../libnm-core/nm-setting-infiniband.c:190 #: ../libnm-core/nm-setting-infiniband.c:205 @@ -10647,7 +10712,7 @@ msgstr "当证书不在 PKCS#11 令牌上时不支持密码" #: ../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-core/nm-setting-wpan.c:129 +#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-core/nm-setting-wpan.c:173 #: ../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 @@ -10670,9 +10735,9 @@ msgstr "当证书不在 PKCS#11 令牌上时不支持密码" msgid "property is invalid" msgstr "属性无效" -#: ../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-8021x.c:2862 ../libnm-core/nm-setting-8021x.c:2874 +#: ../libnm-core/nm-setting-8021x.c:2888 ../libnm-core/nm-setting-8021x.c:2915 +#: ../libnm-core/nm-setting-8021x.c:2930 ../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 @@ -10684,7 +10749,7 @@ msgstr "属性无效" msgid "'%s' is not a valid value for the property" msgstr "\"%s\" 不是该属性的有效取值" -#: ../libnm-core/nm-setting-8021x.c:3283 +#: ../libnm-core/nm-setting-8021x.c:2898 msgid "invalid auth flags" msgstr "无效的验证标记" @@ -10811,71 +10876,68 @@ msgstr "不是有效的 MAC 地址" msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)" msgstr "掩码不能包含位 0（STP）、1（MAC）或2（LACP）" -#: ../libnm-core/nm-setting-connection.c:905 +#: ../libnm-core/nm-setting-connection.c:924 #, c-format msgid "setting required for connection of type '%s'" msgstr "类型为 \"%s\" 的连接需要设置" -#: ../libnm-core/nm-setting-connection.c:944 +#: ../libnm-core/nm-setting-connection.c:963 #: ../libnm-util/nm-setting-connection.c:788 #, c-format msgid "'%s' is not a valid UUID" msgstr "\"%s\"不是有效的 UUID" -#: ../libnm-core/nm-setting-connection.c:994 +#: ../libnm-core/nm-setting-connection.c:1013 #, c-format msgid "connection type '%s' is not valid" msgstr "连接类型 \"%s\" 无效" -#: ../libnm-core/nm-setting-connection.c:1030 +#: ../libnm-core/nm-setting-connection.c:1049 #: ../libnm-util/nm-setting-connection.c:874 #, c-format msgid "Unknown slave type '%s'" msgstr "未知的从类型 \"%s\"" -#: ../libnm-core/nm-setting-connection.c:1041 +#: ../libnm-core/nm-setting-connection.c:1060 #: ../libnm-util/nm-setting-connection.c:884 #, c-format msgid "Slave connections need a valid '%s' property" msgstr "从连接需要有效的 \"%s\" 属性" -#: ../libnm-core/nm-setting-connection.c:1062 +#: ../libnm-core/nm-setting-connection.c:1081 #: ../libnm-util/nm-setting-connection.c:894 #, c-format msgid "Cannot set '%s' without '%s'" msgstr "没有 \"%s\" 无法设置 \"%s\"" -#: ../libnm-core/nm-setting-connection.c:1076 +#: ../libnm-core/nm-setting-connection.c:1095 #, c-format msgid "'%s' connections must be enslaved to '%s', not '%s'" msgstr "\"%s\" 连接必须从属于 \"%s\"，而不是 \"%s\"" -#: ../libnm-core/nm-setting-connection.c:1090 +#: ../libnm-core/nm-setting-connection.c:1109 #, c-format msgid "metered value %d is not valid" 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 +#: ../libnm-core/nm-setting-connection.c:1120 +#: ../libnm-core/nm-setting-connection.c:1131 +#: ../libnm-core/nm-setting-connection.c:1144 #, c-format msgid "value %d is not valid" msgstr "值 %d 无效" -#: ../libnm-core/nm-setting-connection.c:1135 +#: ../libnm-core/nm-setting-connection.c:1165 #, c-format msgid "property type should be set to '%s'" msgstr "属性类型应该设置为 \"%s\"" -#: ../libnm-core/nm-setting-connection.c:1150 +#: ../libnm-core/nm-setting-connection.c:1180 #, c-format msgid "slave-type '%s' requires a '%s' setting in the connection" msgstr "slave-type \"%s\" 要求连接中有 \"%s\" 设置" -#: ../libnm-core/nm-setting-connection.c:1160 +#: ../libnm-core/nm-setting-connection.c:1190 #, c-format msgid "" "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be " @@ -10883,7 +10945,7 @@ msgid "" msgstr "" "检测到设置了 \"%s\" 和端口类型为 \"%s\" 的从连接。\"%s\" 应该设置为 \"%s\"" -#: ../libnm-core/nm-setting-connection.c:1177 +#: ../libnm-core/nm-setting-connection.c:1207 #, c-format msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting" msgstr "\"%s\" 设为 \"%s\" 的从连接不能有个 \"%s\" 设置" @@ -10931,31 +10993,31 @@ msgstr "卸载功能有无效的变种类型" msgid "unknown ethtool option '%s'" msgstr "未知的 ethtool 选项 \"%s\"" -#: ../libnm-core/nm-setting-gsm.c:310 ../libnm-util/nm-setting-gsm.c:294 +#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:294 #, c-format msgid "property value '%s' is empty or too long (>64)" msgstr "属性值 \"%s\" 为空或过长（>64）" -#: ../libnm-core/nm-setting-gsm.c:342 ../libnm-util/nm-setting-gsm.c:326 +#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:326 #, c-format msgid "'%s' contains invalid char(s) (use [A-Za-z._-])" msgstr "\"%s\" 包含无效字符（请使用 [A-Za-z._-]）" -#: ../libnm-core/nm-setting-gsm.c:368 ../libnm-util/nm-setting-gsm.c:352 +#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:352 #, c-format msgid "'%s' length is invalid (should be 5 or 6 digits)" msgstr "\"%s\" 长度无效（应为 5 位或 6 位数）" -#: ../libnm-core/nm-setting-gsm.c:379 ../libnm-util/nm-setting-gsm.c:363 +#: ../libnm-core/nm-setting-gsm.c:381 ../libnm-util/nm-setting-gsm.c:363 #, c-format msgid "'%s' is not a number" msgstr "\"%s\" 不是数字" -#: ../libnm-core/nm-setting-gsm.c:413 +#: ../libnm-core/nm-setting-gsm.c:415 msgid "property is empty or wrong size" msgstr "属性为空或大小错误" -#: ../libnm-core/nm-setting-gsm.c:423 +#: ../libnm-core/nm-setting-gsm.c:425 msgid "property must contain only digits" msgstr "属性必须只包含数字" @@ -11195,35 +11257,43 @@ msgstr "有些标记对所选模式无效：%s" msgid "wired setting not allowed for mode %s" msgstr "模式 %s 不允许有线设置" -#: ../libnm-core/nm-setting-macsec.c:250 +#: ../libnm-core/nm-setting-macsec.c:258 msgid "the key is empty" msgstr "密钥为空" -#: ../libnm-core/nm-setting-macsec.c:261 +#: ../libnm-core/nm-setting-macsec.c:269 #, c-format msgid "the key must be %d characters" msgstr "密钥必须是 %d 个字符" -#: ../libnm-core/nm-setting-macsec.c:269 +#: ../libnm-core/nm-setting-macsec.c:277 msgid "the key contains non-hexadecimal characters" msgstr "密钥包含非十六进制字符" -#: ../libnm-core/nm-setting-macsec.c:331 ../libnm-core/nm-setting-macvlan.c:175 +#: ../libnm-core/nm-setting-macsec.c:339 ../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\"" -#: ../libnm-core/nm-setting-macsec.c:348 +#: ../libnm-core/nm-setting-macsec.c:360 #, c-format msgid "EAP key management requires '%s' setting presence" msgstr "EAP 密钥管理需要 \"%s\" 设置存在" -#: ../libnm-core/nm-setting-macsec.c:359 +#: ../libnm-core/nm-setting-macsec.c:369 +msgid "must be either psk (0) or eap (1)" +msgstr "" + +#: ../libnm-core/nm-setting-macsec.c:378 #, c-format msgid "invalid port %d" msgstr "无效的端口 %d" +#: ../libnm-core/nm-setting-macsec.c:389 +msgid "only valid for psk mode" +msgstr "" + #: ../libnm-core/nm-setting-macvlan.c:186 msgid "non promiscuous operation is allowed only in passthru mode" msgstr "只有通过（passthru）模式才允许无混杂操作" @@ -11411,59 +11481,64 @@ msgstr "存在重复的 TC 排队规则" 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 +#: ../libnm-core/nm-setting-team.c:135 ../libnm-core/nm-setting-team.c:194 +#: ../libnm-core/nm-setting-team.c:306 #, c-format msgid "%s is out of range [0, %d]" msgstr "%s 超出了范围 [0, %d]" -#: ../libnm-core/nm-setting-team.c:175 +#: ../libnm-core/nm-setting-team.c:176 #, c-format msgid "Missing target-host in nsna_ping link watcher" msgstr "在 nsna_ping 链路监视器里缺少目标主机" -#: ../libnm-core/nm-setting-team.c:181 ../libnm-core/nm-setting-team.c:248 +#: ../libnm-core/nm-setting-team.c:182 ../libnm-core/nm-setting-team.c:288 #, c-format msgid "target-host '%s' contains invalid characters" msgstr "目标主机 \"%s\" 包含无效的字符" -#: ../libnm-core/nm-setting-team.c:241 +#: ../libnm-core/nm-setting-team.c:281 #, c-format msgid "Missing %s in arp_ping link watcher" msgstr "在 arp_ping 链路监视器里缺少 %s" -#: ../libnm-core/nm-setting-team.c:254 +#: ../libnm-core/nm-setting-team.c:294 #, c-format msgid "source-host '%s' contains invalid characters" msgstr "来源主机 \"%s\" 包含无效的字符" -#: ../libnm-core/nm-setting-team.c:1153 +#: ../libnm-core/nm-setting-team.c:312 +#, fuzzy +msgid "vlanid is out of range [-1, 4094]" +msgstr "%s 超出了范围 [0, %d]" + +#: ../libnm-core/nm-setting-team.c:1220 #: ../libnm-core/nm-setting-team-port.c:380 #, c-format msgid "team config exceeds size limit" msgstr "组合（team）配置超过大小限制" -#: ../libnm-core/nm-setting-team.c:1179 +#: ../libnm-core/nm-setting-team.c:1246 #, c-format msgid "invalid runner \"%s\"" msgstr "无效的运行程序（runner）\"%s\"" -#: ../libnm-core/nm-setting-team.c:1192 +#: ../libnm-core/nm-setting-team.c:1259 #, c-format msgid "missing link watcher name" msgstr "缺少链路监视器名称" -#: ../libnm-core/nm-setting-team.c:1202 +#: ../libnm-core/nm-setting-team.c:1269 #, c-format msgid "unknown link watcher \"%s\"" msgstr "未知的链路监视器 \"%s\"" -#: ../libnm-core/nm-setting-team.c:1213 +#: ../libnm-core/nm-setting-team.c:1280 #, c-format msgid "missing target host" msgstr "缺少目标主机" -#: ../libnm-core/nm-setting-team.c:1221 +#: ../libnm-core/nm-setting-team.c:1288 #, c-format msgid "missing source address" msgstr "缺少来源地址" @@ -11551,36 +11626,36 @@ msgstr "标记无效" msgid "vlan setting should have a ethernet setting as well" msgstr "vlan 设置也应该有以太网设置" -#: ../libnm-core/nm-setting-vpn.c:518 +#: ../libnm-core/nm-setting-vpn.c:580 msgid "cannot set connection.multi-connect for VPN setting" msgstr "无法为 VPN 设置设定 connection.multi-connect" -#: ../libnm-core/nm-setting-vpn.c:539 +#: ../libnm-core/nm-setting-vpn.c:601 #, c-format msgid "secret was empty" msgstr "密钥为空" -#: ../libnm-core/nm-setting-vpn.c:569 +#: ../libnm-core/nm-setting-vpn.c:631 msgid "setting contained a secret with an empty name" msgstr "设置包含具有空名称的密钥" -#: ../libnm-core/nm-setting-vpn.c:577 +#: ../libnm-core/nm-setting-vpn.c:639 #, c-format msgid "secret value was empty" msgstr "密钥值为空" -#: ../libnm-core/nm-setting-vpn.c:624 ../libnm-core/nm-setting.c:1891 +#: ../libnm-core/nm-setting-vpn.c:686 ../libnm-core/nm-setting.c:2024 msgid "not a secret property" msgstr "不是密钥（secret）属性" -#: ../libnm-core/nm-setting-vpn.c:630 +#: ../libnm-core/nm-setting-vpn.c:692 msgid "secret is not of correct type" msgstr "密钥（secret）不是正确的类型" -#: ../libnm-core/nm-setting-vpn.c:661 -#, c-format -msgid "failed to convert value '%s' to uint" -msgstr "转换 \"%s\" 值为 uint 失败" +#: ../libnm-core/nm-setting-vpn.c:725 +#, fuzzy +msgid "secret flags property not found" +msgstr "未找到密钥（secret）标记属性 \"%s\"" #: ../libnm-core/nm-setting-vxlan.c:386 #, c-format @@ -11697,208 +11772,218 @@ msgstr "WLAN 唤醒正在尝试设定未知的标记" msgid "conflicting value of mac-address-randomization and cloned-mac-address" msgstr "mac-address-randomization 和 cloned-mac-address 的值冲突" -#: ../libnm-core/nm-setting.c:771 +#: ../libnm-core/nm-setting-wpan.c:182 +msgid "page must be defined along with a channel" +msgstr "" + +#: ../libnm-core/nm-setting-wpan.c:191 +#, c-format +msgid "page must be between %d and %d" +msgstr "" + +#: ../libnm-core/nm-setting-wpan.c:202 +#, c-format +msgid "channel must not be between %d and %d" +msgstr "" + +#: ../libnm-core/nm-setting.c:852 #, c-format msgid "duplicate property" msgstr "重复的属性" -#: ../libnm-core/nm-setting.c:819 ../libnm-core/nm-setting.c:866 +#: ../libnm-core/nm-setting.c:900 ../libnm-core/nm-setting.c:947 #, c-format msgid "can't set property of type '%s' from value of type '%s'" msgstr "无法从类型为 \"%2$s\" 的值设置类型为 \"%1$s\" 的属性" -#: ../libnm-core/nm-setting.c:838 ../libnm-core/nm-setting.c:852 +#: ../libnm-core/nm-setting.c:919 ../libnm-core/nm-setting.c:933 #, c-format msgid "failed to set property: %s" msgstr "设定属性失败：%s" -#: ../libnm-core/nm-setting.c:880 +#: ../libnm-core/nm-setting.c:961 #, c-format msgid "can not set property: %s" msgstr "无法设定属性：%s" -#: ../libnm-core/nm-setting.c:896 +#: ../libnm-core/nm-setting.c:977 #, c-format msgid "unknown property" msgstr "未知属性" -#: ../libnm-core/nm-setting.c:1789 +#: ../libnm-core/nm-setting.c:1935 msgid "secret not found" msgstr "未找到密钥" -#: ../libnm-core/nm-setting.c:1881 -msgid "secret is not set" -msgstr "未设置密钥" - -#: ../libnm-core/nm-utils.c:2095 +#: ../libnm-core/nm-utils.c:2045 #, c-format msgid "'%s' is not a valid handle." msgstr "\"%s\" 不是有效的处理模块。" -#: ../libnm-core/nm-utils.c:2191 +#: ../libnm-core/nm-utils.c:2141 #, c-format msgid "'%s' unexpected: parent already specified." msgstr "意外的 \"%s\"：已指定上级。" -#: ../libnm-core/nm-utils.c:2207 +#: ../libnm-core/nm-utils.c:2157 #, c-format msgid "invalid handle: '%s'" msgstr "无效的句柄：\"%s\"" -#: ../libnm-core/nm-utils.c:2229 +#: ../libnm-core/nm-utils.c:2179 msgid "parent not specified." msgstr "未指定上级。" -#: ../libnm-core/nm-utils.c:2276 +#: ../libnm-core/nm-utils.c:2226 #, c-format msgid "unsupported qdisc option: '%s'." msgstr "不支持的排队规则（qdisc）选项：\"%s\"。" -#: ../libnm-core/nm-utils.c:2392 +#: ../libnm-core/nm-utils.c:2342 msgid "action name missing." msgstr "操作名缺失。" -#: ../libnm-core/nm-utils.c:2416 +#: ../libnm-core/nm-utils.c:2366 #, c-format msgid "unsupported action option: '%s'." msgstr "不支持的操作选项：\"%s\"。" -#: ../libnm-core/nm-utils.c:2554 +#: ../libnm-core/nm-utils.c:2504 msgid "invalid action: " msgstr "无效操作：" -#: ../libnm-core/nm-utils.c:2558 +#: ../libnm-core/nm-utils.c:2508 #, c-format msgid "unsupported tfilter option: '%s'." msgstr "不支持的流量过滤器（tfilter）选项：\"%s\"。" -#: ../libnm-core/nm-utils.c:3160 +#: ../libnm-core/nm-utils.c:3110 #, c-format msgid "failed stat file %s: %s" msgstr "统计文件 %s 失败：%s" -#: ../libnm-core/nm-utils.c:3169 +#: ../libnm-core/nm-utils.c:3119 #, c-format msgid "not a file (%s)" msgstr "不是一个文件（%s）" -#: ../libnm-core/nm-utils.c:3180 +#: ../libnm-core/nm-utils.c:3130 #, c-format msgid "invalid file owner %d for %s" msgstr "对 %2$s 无效的文件所有者 %1$d" -#: ../libnm-core/nm-utils.c:3191 +#: ../libnm-core/nm-utils.c:3141 #, c-format msgid "file permissions for %s" msgstr "%s 的文件权限" -#: ../libnm-core/nm-utils.c:3201 +#: ../libnm-core/nm-utils.c:3151 #, c-format msgid "reject %s" msgstr "拒绝 %s" -#: ../libnm-core/nm-utils.c:3220 +#: ../libnm-core/nm-utils.c:3170 #, c-format msgid "path is not absolute (%s)" msgstr "路径不是绝对路径（%s）" -#: ../libnm-core/nm-utils.c:3234 +#: ../libnm-core/nm-utils.c:3184 #, c-format msgid "Plugin file does not exist (%s)" msgstr "插件文件不存在（%s）" -#: ../libnm-core/nm-utils.c:3242 +#: ../libnm-core/nm-utils.c:3192 #, c-format msgid "Plugin is not a valid file (%s)" msgstr "插件不是有效的文件（%s）" -#: ../libnm-core/nm-utils.c:3252 +#: ../libnm-core/nm-utils.c:3202 #, c-format msgid "libtool archives are not supported (%s)" msgstr "不支持 libtool 归档（%s）" -#: ../libnm-core/nm-utils.c:3334 ../libnm-util/nm-utils.c:1794 +#: ../libnm-core/nm-utils.c:3284 ../libnm-util/nm-utils.c:1794 #, c-format msgid "Could not find \"%s\" binary" msgstr "无法找到 \"%s\" 二进制文件" -#: ../libnm-core/nm-utils.c:4351 +#: ../libnm-core/nm-utils.c:4369 #, c-format msgid "not a valid ethernet MAC address for mask at position %lld" msgstr "对于 %lld 位置的掩码，该以太网 MAC 地址无效" -#: ../libnm-core/nm-utils.c:4366 +#: ../libnm-core/nm-utils.c:4384 #, c-format msgid "not a valid ethernet MAC address #%u at position %lld" msgstr "在位置 %2$lld，该以太网 MAC 地址 #%1$u 无效" -#: ../libnm-core/nm-utils.c:4402 +#: ../libnm-core/nm-utils.c:4420 msgid "interface name is too short" msgstr "接口名太短" -#: ../libnm-core/nm-utils.c:4411 +#: ../libnm-core/nm-utils.c:4429 msgid "interface name is reserved" msgstr "接口名被保留" -#: ../libnm-core/nm-utils.c:4423 +#: ../libnm-core/nm-utils.c:4441 msgid "interface name contains an invalid character" msgstr "接口名包含无效字符" -#: ../libnm-core/nm-utils.c:4429 +#: ../libnm-core/nm-utils.c:4447 msgid "interface name is longer than 15 characters" msgstr "接口名长度超过 15 字符" -#: ../libnm-core/nm-utils.c:5075 +#: ../libnm-core/nm-utils.c:5107 msgid "not valid utf-8" msgstr "不是有效的 utf-8" -#: ../libnm-core/nm-utils.c:5097 ../libnm-core/nm-utils.c:5565 +#: ../libnm-core/nm-utils.c:5128 ../libnm-core/nm-utils.c:5601 msgid "is not a JSON object" msgstr "不是 JSON 对象" -#: ../libnm-core/nm-utils.c:5541 ../libnm-core/nm-utils.c:5881 +#: ../libnm-core/nm-utils.c:5577 ../libnm-core/nm-utils.c:5917 msgid "value is NULL" msgstr "值为 NULL" -#: ../libnm-core/nm-utils.c:5541 ../libnm-core/nm-utils.c:5881 +#: ../libnm-core/nm-utils.c:5577 ../libnm-core/nm-utils.c:5917 msgid "value is empty" msgstr "值为空" -#: ../libnm-core/nm-utils.c:5553 +#: ../libnm-core/nm-utils.c:5589 #, c-format msgid "invalid JSON at position %d (%s)" msgstr "位置 %d 有无效的 JSON（%s）" -#: ../libnm-core/nm-utils.c:6198 ../libnm-core/nm-utils.c:6218 +#: ../libnm-core/nm-utils.c:6244 ../libnm-core/nm-utils.c:6264 msgid "unterminated escape sequence" msgstr "未结束的转义序列" -#: ../libnm-core/nm-utils.c:6243 +#: ../libnm-core/nm-utils.c:6289 #, c-format msgid "unknown attribute '%s'" msgstr "未知属性 \"%s\"" -#: ../libnm-core/nm-utils.c:6258 +#: ../libnm-core/nm-utils.c:6304 #, c-format msgid "missing key-value separator '%c' after '%s'" msgstr "在 \"%2$s\" 后缺少键值对分隔符 \"%1$c\"" -#: ../libnm-core/nm-utils.c:6274 +#: ../libnm-core/nm-utils.c:6320 #, c-format msgid "invalid uint32 value '%s' for attribute '%s'" msgstr "uint32 值 \"%1$s\" 对属性 \"%2$s\" 无效" -#: ../libnm-core/nm-utils.c:6283 +#: ../libnm-core/nm-utils.c:6329 #, c-format msgid "invalid uint8 value '%s' for attribute '%s'" msgstr "uint8 值 \"%1$s\" 对属性 \"%2$s\" 无效" -#: ../libnm-core/nm-utils.c:6293 +#: ../libnm-core/nm-utils.c:6339 #, c-format msgid "invalid boolean value '%s' for attribute '%s'" msgstr "布尔值 \"%1$s\" 对属性 \"%2$s\" 无效" -#: ../libnm-core/nm-utils.c:6303 +#: ../libnm-core/nm-utils.c:6349 #, c-format msgid "unsupported attribute '%s' of type '%s'" msgstr "不支持类型 \"%2$s\" 的属性 \"%1$s\"" @@ -11985,51 +12070,51 @@ msgstr "缺少 VPN 插件信息的名称" msgid "missing service for VPN plugin info" msgstr "缺少 VPN 插件信息的服务" -#: ../libnm-glib/nm-device.c:1824 ../libnm/nm-device.c:1310 +#: ../libnm-glib/nm-device.c:1824 ../libnm/nm-device.c:1384 msgid "Bluetooth" msgstr "蓝牙" -#: ../libnm-glib/nm-device.c:1826 ../libnm/nm-device.c:1312 +#: ../libnm-glib/nm-device.c:1826 ../libnm/nm-device.c:1386 msgid "OLPC Mesh" msgstr "OLPC Mesh" -#: ../libnm-glib/nm-device.c:1828 ../libnm/nm-device.c:1320 +#: ../libnm-glib/nm-device.c:1828 ../libnm/nm-device.c:1394 msgid "WiMAX" msgstr "WiMAX" -#: ../libnm-glib/nm-device.c:1842 ../libnm/nm-device.c:1334 +#: ../libnm-glib/nm-device.c:1842 ../libnm/nm-device.c:1408 msgid "ADSL" msgstr "ADSL" -#: ../libnm-glib/nm-device.c:1844 ../libnm/nm-device.c:1336 +#: ../libnm-glib/nm-device.c:1844 ../libnm/nm-device.c:1410 msgid "MACVLAN" msgstr "MACVLAN" -#: ../libnm-glib/nm-device.c:1846 ../libnm/nm-device.c:1338 +#: ../libnm-glib/nm-device.c:1846 ../libnm/nm-device.c:1412 msgid "VXLAN" msgstr "VXLAN" -#: ../libnm-glib/nm-device.c:1848 ../libnm/nm-device.c:1340 +#: ../libnm-glib/nm-device.c:1848 ../libnm/nm-device.c:1414 msgid "IPTunnel" msgstr "IP 隧道" -#: ../libnm-glib/nm-device.c:1850 ../libnm/nm-device.c:1342 +#: ../libnm-glib/nm-device.c:1850 ../libnm/nm-device.c:1416 msgid "Tun" msgstr "Tun" -#: ../libnm-glib/nm-device.c:1852 ../libnm/nm-device.c:1344 +#: ../libnm-glib/nm-device.c:1852 ../libnm/nm-device.c:1418 msgid "Veth" msgstr "Veth" -#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1388 +#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1462 msgid "Wired" msgstr "有线" -#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1419 +#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1493 msgid "PCI" msgstr "PCI" -#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1421 +#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1495 msgid "USB" msgstr "USB" @@ -12040,7 +12125,7 @@ msgstr "USB" #. * the strings otherwise. #. #: ../libnm-glib/nm-device.c:2014 ../libnm-glib/nm-device.c:2033 -#: ../libnm/nm-device.c:1734 ../libnm/nm-device.c:1753 +#: ../libnm/nm-device.c:1808 ../libnm/nm-device.c:1827 #, c-format msgctxt "long device name" msgid "%s %s" @@ -12050,6 +12135,18 @@ msgstr "%s %s" msgid "Disconnected by D-Bus" msgstr "被 D-Bus 断开" +#: ../libnm-util/crypto.c:143 +#, c-format +msgid "Doesn't look like a PEM private key file." +msgstr "不像是一个 PEM 私钥文件。" + +#: ../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\"。" + #: ../libnm-util/crypto_gnutls.c:84 #, c-format msgid "Hash length too long (%d > %d)." @@ -12060,16 +12157,34 @@ msgstr "散列长度太长（%d > %d）。" msgid "Failed to initialize the MD5 engine: %s (%s)" msgstr "初始化 MD5 引擎失败：%s（%s）" +#: ../libnm-util/crypto_gnutls.c:159 +#, c-format +msgid "Invalid IV length (must be at least %zd)." +msgstr "无效的初始向量长度（至少为 %zd）。" + #: ../libnm-util/crypto_nss.c:99 #, c-format msgid "Failed to initialize the MD5 context: %d." msgstr "初始化 MD5 环境失败：%d。" -#: ../libnm-util/crypto_nss.c:460 +#: ../libnm-util/crypto_nss.c:170 +#, c-format +msgid "Invalid IV length (must be at least %d)." +msgstr "无效的初始向量长度（至少为 %d）。" + +#: ../libnm-util/crypto_nss.c:457 #, c-format msgid "Couldn't convert password to UCS2: %d" msgstr "无法将密码转换为 USC2 方式：%d" +#: ../libnm-util/nm-setting-8021x.c:1811 +msgid "invalid private key" +msgstr "无效的私有密钥" + +#: ../libnm-util/nm-setting-8021x.c:2122 +msgid "invalid phase2 private key" +msgstr "无效的二阶段私钥" + #: ../libnm-util/nm-setting-bluetooth.c:185 #, c-format msgid "requires '%s' or '%s' setting" @@ -12314,49 +12429,48 @@ msgstr "此连接不是 WiMAX 连接。" msgid "The connection was not a wpan connection." msgstr "此连接不是 wpan 连接。" -#: ../libnm/nm-device.c:1314 +#: ../libnm/nm-device.c:1388 msgid "Open vSwitch Interface" msgstr "Open vSwitch 接口" -#: ../libnm/nm-device.c:1316 +#: ../libnm/nm-device.c:1390 msgid "Open vSwitch Port" msgstr "Open vSwitch 端口" -#: ../libnm/nm-device.c:1318 +#: ../libnm/nm-device.c:1392 msgid "Open vSwitch Bridge" msgstr "Open vSwitch 网桥" -#: ../libnm/nm-device.c:1346 +#: ../libnm/nm-device.c:1420 msgid "MACsec" msgstr "MACsec" -#: ../libnm/nm-device.c:1348 +#: ../libnm/nm-device.c:1422 msgid "Dummy" msgstr "虚拟" -#: ../libnm/nm-device.c:1350 +#: ../libnm/nm-device.c:1424 msgid "PPP" msgstr "PPP" -#: ../libnm/nm-device.c:1352 +#: ../libnm/nm-device.c:1426 msgid "IEEE 802.15.4" msgstr "IEEE 802.15.4" -#: ../libnm/nm-device.c:1354 +#: ../libnm/nm-device.c:1428 msgid "6LoWPAN" msgstr "6LoWPAN" -#: ../libnm/nm-device.c:1356 -#| msgid "Wired" +#: ../libnm/nm-device.c:1430 msgid "WireGuard" msgstr "WireGuard" -#: ../libnm/nm-device.c:2475 +#: ../libnm/nm-device.c:2549 #, c-format msgid "The connection was not valid: %s" msgstr "连接无效：%s" -#: ../libnm/nm-device.c:2484 +#: ../libnm/nm-device.c:2558 #, c-format msgid "The interface names of the device and the connection didn't match." msgstr "这个设备的接口名和连接不匹配。" @@ -12365,7 +12479,7 @@ msgstr "这个设备的接口名和连接不匹配。" msgid "Checkpoint was removed before it was initialized" msgstr "检查点在初始化之前被删除" -#: ../libnm/nm-manager.c:955 +#: ../libnm/nm-manager.c:953 msgid "Active connection removed before it was initialized" msgstr "活动连接在初始化之前被删除" @@ -12373,7 +12487,7 @@ msgstr "活动连接在初始化之前被删除" msgid "Connection removed before it was initialized" msgstr "连接在初始化之前被删除" -#: ../libnm/nm-vpn-plugin-old.c:847 ../libnm/nm-vpn-service-plugin.c:1016 +#: ../libnm/nm-vpn-plugin-old.c:847 ../libnm/nm-vpn-service-plugin.c:1051 msgid "No service name specified" msgstr "未指定服务" @@ -12441,7 +12555,8 @@ msgid "Connection sharing via a protected Wi-Fi network" msgstr "通过受保护的 Wi-Fi 网络共享连接" #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:16 -msgid "System policy prevents sharing connections via a protected Wi-Fi network" +msgid "" +"System policy prevents sharing connections via a protected Wi-Fi network" msgstr "系统策略阻止使用受保护的 Wi-Fi 网络共享连接" #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:17 @@ -12510,33 +12625,33 @@ msgstr "启用或禁用连接性检查" msgid "System policy prevents enabling or disabling connectivity checking" msgstr "系统策略阻止启用或禁用连接性检查" -#: ../shared/nm-utils/nm-shared-utils.c:979 +#: ../shared/nm-utils/nm-shared-utils.c:1130 #, c-format msgid "object class '%s' has no property named '%s'" msgstr "对象类 \"%s\" 没有名为 \"%s\" 的属性" -#: ../shared/nm-utils/nm-shared-utils.c:986 +#: ../shared/nm-utils/nm-shared-utils.c:1137 #, c-format msgid "property '%s' of object class '%s' is not writable" msgstr "对象类 \"%2$s\" 的 \"%1$s\" 属性是不可写的" -#: ../shared/nm-utils/nm-shared-utils.c:993 +#: ../shared/nm-utils/nm-shared-utils.c:1144 #, c-format msgid "" "construct property \"%s\" for object '%s' can't be set after construction" msgstr "对象 \"%2$s\" 的构造属性 \"%1$s\" 在构造后不能被设定" -#: ../shared/nm-utils/nm-shared-utils.c:1001 +#: ../shared/nm-utils/nm-shared-utils.c:1152 #, c-format msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" msgstr "\"%s::%s\" 不是有效的属性名；\"%s\" 不是 GObject 子类型" -#: ../shared/nm-utils/nm-shared-utils.c:1010 +#: ../shared/nm-utils/nm-shared-utils.c:1161 #, c-format msgid "unable to set property '%s' of type '%s' from value of type '%s'" msgstr "无法从类型 \"%3$s\" 的值设定类型为 \"%2$s\" 的属性 \"%1$s\"" -#: ../shared/nm-utils/nm-shared-utils.c:1021 +#: ../shared/nm-utils/nm-shared-utils.c:1172 #, c-format msgid "" "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " @@ -12548,13 +12663,13 @@ msgstr "" #. * as "Wired Connection" or "VPN Connection". The %d is a number #. * that is combined with the first argument to create a unique #. * connection id. -#: ../src/NetworkManagerUtils.c:119 +#: ../src/NetworkManagerUtils.c:120 #, c-format msgctxt "connection id fallback" msgid "%s %u" msgstr "%s %u" -#: ../src/main.c:180 ../src/main.c:314 +#: ../src/main.c:180 ../src/main.c:315 #, c-format msgid "Failed to read configuration: %s\n" msgstr "读取配置失败：%s\n" @@ -12600,12 +12715,12 @@ msgstr "" "网络管理器（NetworkManager）监视所有网络连接，并自动选择要使用的最佳连接。\n" "它还允许用户指定计算机无线网卡连接的无线访问点。" -#: ../src/main.c:304 ../src/main-utils.c:286 ../src/nm-iface-helper.c:442 +#: ../src/main.c:305 ../src/main-utils.c:286 ../src/nm-iface-helper.c:441 #, c-format msgid "%s. Please use --help to see a list of valid options.\n" msgstr "%s。请使用 --help 查看有效选项列表。\n" -#: ../src/main.c:339 ../src/nm-iface-helper.c:457 +#: ../src/main.c:340 ../src/nm-iface-helper.c:456 #, c-format msgid "Could not daemonize: %s [error %u]\n" msgstr "无法设为守护进程：%s [错误 %u]\n" @@ -12640,11 +12755,11 @@ msgstr "%s 已在运行中（pid %ld）\n" msgid "You must be root to run %s!\n" msgstr "运行 %s 必须是根用户！\n" -#: ../src/dhcp/nm-dhcp-dhclient-utils.c:313 +#: ../src/dhcp/nm-dhcp-dhclient-utils.c:291 msgid "# Created by NetworkManager\n" msgstr "# 由 NetworkManger 创建\n" -#: ../src/dhcp/nm-dhcp-dhclient-utils.c:324 +#: ../src/dhcp/nm-dhcp-dhclient-utils.c:302 #, c-format msgid "" "# Merged from %s\n" @@ -12658,33 +12773,33 @@ msgstr "" msgid "%s Network" msgstr "%s 网络" -#: ../src/devices/bluetooth/nm-device-bt.c:270 +#: ../src/devices/bluetooth/nm-device-bt.c:272 msgid "PAN requested, but Bluetooth device does not support NAP" msgstr "PAN 已请求，但蓝牙设备不支持 NAP" -#: ../src/devices/bluetooth/nm-device-bt.c:280 +#: ../src/devices/bluetooth/nm-device-bt.c:282 msgid "PAN connections cannot specify GSM, CDMA, or serial settings" msgstr "PAN 连接无法指定 GSM、CDMA 或串行设置" -#: ../src/devices/bluetooth/nm-device-bt.c:293 +#: ../src/devices/bluetooth/nm-device-bt.c:295 msgid "PAN connection" msgstr "PAN 连接" -#: ../src/devices/bluetooth/nm-device-bt.c:300 +#: ../src/devices/bluetooth/nm-device-bt.c:302 msgid "DUN requested, but Bluetooth device does not support DUN" msgstr "DUN 已请求，但蓝牙设备不支持 DUN" -#: ../src/devices/bluetooth/nm-device-bt.c:310 +#: ../src/devices/bluetooth/nm-device-bt.c:312 msgid "DUN connection must include a GSM or CDMA setting" msgstr "DUN 连接必须包含 GSM 或 CDMA 设置" -#: ../src/devices/bluetooth/nm-device-bt.c:320 -#: ../src/devices/wwan/nm-modem-broadband.c:705 +#: ../src/devices/bluetooth/nm-device-bt.c:322 +#: ../src/devices/wwan/nm-modem-broadband.c:696 msgid "GSM connection" msgstr "GSM 连接" #: ../src/devices/bluetooth/nm-device-bt.c:324 -#: ../src/devices/wwan/nm-modem-broadband.c:729 +#: ../src/devices/wwan/nm-modem-broadband.c:720 msgid "CDMA connection" msgstr "CDMA 连接" @@ -12693,9 +12808,9 @@ msgid "Unknown/unhandled Bluetooth connection type" msgstr "未知的/未处理的蓝牙连接类型" #: ../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 +#: ../src/devices/nm-device-ethernet.c:1432 +#: ../src/devices/nm-device-infiniband.c:190 +#: ../src/devices/wifi/nm-device-wifi.c:908 msgid "connection does not match device" msgstr "连接不匹配设备" @@ -12715,11 +12830,11 @@ msgstr "网桥连接" msgid "Dummy connection" msgstr "虚拟连接" -#: ../src/devices/nm-device-ethernet.c:1407 +#: ../src/devices/nm-device-ethernet.c:1413 msgid "PPPoE connection" msgstr "PPPoE 连接" -#: ../src/devices/nm-device-ethernet.c:1407 +#: ../src/devices/nm-device-ethernet.c:1413 msgid "Wired connection" msgstr "有线连接" @@ -12728,11 +12843,11 @@ msgstr "有线连接" msgid "Wired connection %d" msgstr "有线连接 %d" -#: ../src/devices/nm-device-ip-tunnel.c:418 +#: ../src/devices/nm-device-ip-tunnel.c:419 msgid "IP tunnel connection" msgstr "IP 隧道连接" -#: ../src/devices/nm-device-macvlan.c:365 +#: ../src/devices/nm-device-macvlan.c:366 msgid "MACVLAN connection" msgstr "MACVLAN 连接" @@ -12740,19 +12855,19 @@ msgstr "MACVLAN 连接" msgid "TUN connection" msgstr "TUN 连接" -#: ../src/devices/nm-device-wpan.c:68 +#: ../src/devices/nm-device-wpan.c:69 msgid "WPAN connection" msgstr "WPAN 连接" -#: ../src/devices/team/nm-device-team.c:101 +#: ../src/devices/team/nm-device-team.c:102 msgid "Team connection" msgstr "组合连接" -#: ../src/devices/wifi/nm-device-olpc-mesh.c:124 +#: ../src/devices/wifi/nm-device-olpc-mesh.c:136 msgid "Mesh" msgstr "Mesh" -#: ../src/devices/wifi/nm-device-wifi.c:880 +#: ../src/devices/wifi/nm-device-wifi.c:881 msgid "WPA Ad-Hoc disabled due to kernel bugs" msgstr "由于内核程序错误禁用了 WPA Ad-Hoc" @@ -12905,59 +13020,74 @@ msgstr "WPA 验证和共享密钥（Shared Key）验证不兼容" msgid "Failed to determine AP security information" msgstr "确定 AP 安全信息失败" -#: ../src/devices/wwan/nm-modem-broadband.c:691 +#: ../src/devices/wwan/nm-modem-broadband.c:686 msgid "GSM mobile broadband connection requires a 'gsm' setting" msgstr "GSM 移动宽带连接要求 \"gsm\" 设置" -#: ../src/nm-config.c:521 +#: ../src/nm-config.c:563 +#, fuzzy, c-format +msgid "Bad '%s' option: " +msgstr "\"%s\"选项为空" + +#: ../src/nm-config.c:576 msgid "Config file location" msgstr "配置文件位置" -#: ../src/nm-config.c:522 +#: ../src/nm-config.c:577 msgid "Config directory location" msgstr "配置目录位置" -#: ../src/nm-config.c:523 +#: ../src/nm-config.c:578 msgid "System config directory location" msgstr "系统配置目录位置" -#: ../src/nm-config.c:524 +#: ../src/nm-config.c:579 msgid "Internal config file location" msgstr "内部配置文件位置" -#: ../src/nm-config.c:525 +#: ../src/nm-config.c:580 msgid "State file location" msgstr "状态文件位置" -#: ../src/nm-config.c:526 +#: ../src/nm-config.c:581 msgid "State file for no-auto-default devices" msgstr "no-auto-default 设备的状态文件" -#: ../src/nm-config.c:527 +#: ../src/nm-config.c:582 msgid "List of plugins separated by ','" msgstr "插件列表，以 \",\" 隔开" -#: ../src/nm-config.c:528 +#: ../src/nm-config.c:583 msgid "Quit after initial configuration" msgstr "初始化配置后退出" -#: ../src/nm-config.c:529 ../src/nm-iface-helper.c:299 +#: ../src/nm-config.c:584 ../src/nm-iface-helper.c:299 msgid "Don't become a daemon, and log to stderr" msgstr "不成为守护进程，并向标准错误打印日志" #. These three are hidden for now, and should eventually just go away. -#: ../src/nm-config.c:532 +#: ../src/nm-config.c:587 msgid "An http(s) address for checking internet connectivity" msgstr "检查网络连通用的 http(s) 地址" -#: ../src/nm-config.c:533 +#: ../src/nm-config.c:588 msgid "The interval between connectivity checks (in seconds)" msgstr "连接性检查间隔（以秒计）" -#: ../src/nm-config.c:534 +#: ../src/nm-config.c:589 msgid "The expected start of the response" msgstr "预期的响应开头" +#: ../src/nm-config.c:596 +#, fuzzy +msgid "NetworkManager options" +msgstr "网络管理器权限" + +#: ../src/nm-config.c:596 +#, fuzzy +msgid "Show NetworkManager options" +msgstr "网络管理器权限" + #. Interface/IP config #: ../src/nm-iface-helper.c:279 msgid "The interface to manage" @@ -13047,41 +13177,94 @@ msgid "" "interface." msgstr "nm-iface-helper 是一个管理单个网络接口的小型独立进程。" -#: ../src/nm-iface-helper.c:423 +#: ../src/nm-iface-helper.c:422 #, c-format msgid "An interface name and UUID are required\n" msgstr "接口名称和 UUID 是必需的\n" -#: ../src/nm-iface-helper.c:429 +#: ../src/nm-iface-helper.c:428 #, c-format msgid "Failed to find interface index for %s (%s)\n" msgstr "寻找 %s(%s) 的接口索引失败\n" -#: ../src/nm-iface-helper.c:447 +#: ../src/nm-iface-helper.c:446 #, c-format msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n" msgstr "正在忽略传给命令行的未识别日志域 \"%s\"。\n" -#: ../src/nm-iface-helper.c:486 +#: ../src/nm-iface-helper.c:485 #, c-format msgid "(%s): Invalid IID %s\n" msgstr "（%s）：无效的 IID %s\n" -#: ../src/nm-iface-helper.c:497 +#: ../src/nm-iface-helper.c:496 #, c-format msgid "(%s): Invalid DHCP client-id %s\n" msgstr "（%s）：无效的 DHCP 客户端 ID %s\n" -#: ../src/nm-logging.c:273 +#: ../src/nm-logging.c:275 #, c-format msgid "Unknown log level '%s'" msgstr "未知的日志等级 \"%s\"" -#: ../src/nm-logging.c:375 +#: ../src/nm-logging.c:377 #, c-format msgid "Unknown log domain '%s'" msgstr "未知的日志域 \"%s\"" +#~ msgid "Error: Failed to setup a Wi-Fi hotspot" +#~ msgstr "错误：建立 Wi-Fi 热点失败" + +#~ msgid "Error: Failed to add/activate new connection: Unknown error" +#~ msgstr "错误：无法添加/激活新连接：未知错误" + +#~ msgid "Connection with UUID '%s' created and activated on device '%s'\n" +#~ msgstr "UUID 为 \"%s\" 的连接已创建并在设备 \"%s\" 上激活\n" + +#~ msgid "Hotspot '%s' activated on device '%s'\n" +#~ msgstr "热点 \"%s\" 已在设备 \"%s\" 上激活\n" + +# 原译设备已连接。原话用来提示设备已连接过了，不能再激活另一个连接了。如果使用“已连接”会让人认为是连接成功的意思，所以改成这个。 +#~ msgid "Device '%s' has been connected.\n" +#~ msgstr "设备 \"%s\" 已有连接。\n" + +#~ 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）自动选择合适的设置。" + +#~ msgid "The total number of virtual functions to create." +#~ msgstr "要创建的虚拟功能总数。" + +#~ msgid "invalid negative value (%i)" +#~ msgstr "无效的负值（%i）" + +#~ msgid "invalid char value (%i)" +#~ msgstr "无效的字符值（%i）" + +#~ msgid "invalid int64 value (%s)" +#~ msgstr "无效的 int64 值（%s）" + +#~ msgid "too large FLAGS property '%s' (%llu)" +#~ msgstr "过大的 FLAGS 属性 \"%s\" (%llu)" + +#~ msgid "unhandled setting property type '%s'" +#~ msgstr "未处理的设置属性类型 \"%s\"" + +#~ msgid "mdns value %d is not valid" +#~ msgstr "mdns %d 无效" + +#~ msgid "failed to convert value '%s' to uint" +#~ msgstr "转换 \"%s\" 值为 uint 失败" + +#~ msgid "secret is not set" +#~ msgstr "未设置密钥" + #~ msgid "" #~ "The setting's name, which uniquely identifies the setting within the " #~ "connection. Each setting type has a name unique to that type, for " |