po: updated Simplified Chinese translation (bgo #626628)

1 files changed, 390 insertions, 326 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d1e17ae850..ccd64cd937 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,92 +4,94 @@
 # This file is distributed under the same license as the NetworkManager package.
 #
 # Funda Wang <fundawang@linux.net.cn>, 2004.
-# Aron Xu <happyaron.xu@gmail.com>, 2009.
 # Leah Liu <lliu@redhat.com>, 2010.
+# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: zh_CN\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 14:31+0530\n"
-"PO-Revision-Date: 2010-05-10 19:25+1000\n"
-"Last-Translator: Leah Liu <lliu@redhat.com>\n"
-"Language-Team: Wei Liu\n"
+"Project-Id-Version: NetworkManager master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2010-08-11 03:24+0000\n"
+"PO-Revision-Date: 2010-08-11 21:16+0800\n"
+"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../cli/src/connections.c:59 ../cli/src/connections.c:74
-#: ../cli/src/devices.c:85 ../cli/src/devices.c:98 ../cli/src/devices.c:108
-#: ../cli/src/devices.c:118 ../cli/src/devices.c:131 ../cli/src/devices.c:142
-#: ../cli/src/devices.c:152
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:101 ../cli/src/devices.c:111
+#: ../cli/src/devices.c:121 ../cli/src/devices.c:134 ../cli/src/devices.c:145
+#: ../cli/src/devices.c:156 ../cli/src/devices.c:165 ../cli/src/devices.c:174
 msgid "NAME"
 msgstr "名称"
 
 #. 0
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:76
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:61
+#: ../cli/src/connections.c:62
 msgid "DEVICES"
 msgstr "设备"
 
 #. 2
-#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
+#: ../cli/src/connections.c:63 ../cli/src/connections.c:78
 msgid "SCOPE"
 msgstr "范围"
 
 #. 3
-#: ../cli/src/connections.c:63
+#: ../cli/src/connections.c:64
 msgid "DEFAULT"
 msgstr "默认"
 
 #. 4
-#: ../cli/src/connections.c:64
+#: ../cli/src/connections.c:65
 msgid "DBUS-SERVICE"
 msgstr "DBUS 服务"
 
 #. 5
-#: ../cli/src/connections.c:65
+#: ../cli/src/connections.c:66
 msgid "SPEC-OBJECT"
 msgstr "SPEC 对象"
 
 #. 6
-#: ../cli/src/connections.c:66
+#: ../cli/src/connections.c:67
 msgid "VPN"
 msgstr "VPN"
 
 #. 1
 #. 0
 #. 1
-#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
+#: ../cli/src/connections.c:77 ../cli/src/devices.c:62 ../cli/src/devices.c:90
 msgid "TYPE"
 msgstr "类型"
 
 #. 3
-#: ../cli/src/connections.c:78
+#: ../cli/src/connections.c:79
 msgid "TIMESTAMP"
 msgstr "时间戳"
 
 #. 4
-#: ../cli/src/connections.c:79
+#: ../cli/src/connections.c:80
 msgid "TIMESTAMP-REAL"
 msgstr "真实时间戳"
 
 #. 5
-#: ../cli/src/connections.c:80
+#: ../cli/src/connections.c:81
 msgid "AUTOCONNECT"
 msgstr "自动连接"
 
 #. 6
-#: ../cli/src/connections.c:81
+#: ../cli/src/connections.c:82
 msgid "READONLY"
 msgstr "只读"
 
-#: ../cli/src/connections.c:157
+#: ../cli/src/connections.c:158
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
@@ -101,8 +103,8 @@ msgid ""
 "<timeout>]\n"
 "  down id <id> | uuid <id>\n"
 msgstr ""
-"用法：nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"用法：nmcli con { 命令 | help }\n"
+"  命令 := { list | status | up | down }\n"
 "\n"
 "  list [id <id> | uuid <id> | system | user]\n"
 "  status\n"
@@ -110,514 +112,524 @@ msgstr ""
 "<timeout>]\n"
 "  down id <id> | uuid <id>\n"
 
-#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
+#: ../cli/src/connections.c:198 ../cli/src/connections.c:537
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "错误：'con list': %s"
 
-#: ../cli/src/connections.c:199 ../cli/src/connections.c:538
+#: ../cli/src/connections.c:200 ../cli/src/connections.c:539
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "错误：'con list': %s；允许的字段：%s"
 
-#: ../cli/src/connections.c:207
+#: ../cli/src/connections.c:208
 msgid "Connection details"
 msgstr "连接详情"
 
-#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
+#: ../cli/src/connections.c:382 ../cli/src/connections.c:602
 msgid "system"
 msgstr "系统"
 
-#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
+#: ../cli/src/connections.c:382 ../cli/src/connections.c:602
 msgid "user"
 msgstr "用户"
 
-#: ../cli/src/connections.c:383
+#: ../cli/src/connections.c:384
 msgid "never"
 msgstr "从不"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:385
-#: ../cli/src/connections.c:602 ../cli/src/connections.c:605
-#: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
-#: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
-#: ../cli/src/devices.c:543 ../cli/src/settings.c:504
-#: ../cli/src/settings.c:544 ../cli/src/settings.c:643
-#: ../cli/src/settings.c:912 ../cli/src/settings.c:913
-#: ../cli/src/settings.c:915 ../cli/src/settings.c:917
-#: ../cli/src/settings.c:1042 ../cli/src/settings.c:1043
-#: ../cli/src/settings.c:1044 ../cli/src/settings.c:1123
-#: ../cli/src/settings.c:1124 ../cli/src/settings.c:1125
-#: ../cli/src/settings.c:1126 ../cli/src/settings.c:1127
-#: ../cli/src/settings.c:1128 ../cli/src/settings.c:1129
-#: ../cli/src/settings.c:1130 ../cli/src/settings.c:1131
-#: ../cli/src/settings.c:1132 ../cli/src/settings.c:1133
-#: ../cli/src/settings.c:1134 ../cli/src/settings.c:1135
-#: ../cli/src/settings.c:1210
+#: ../cli/src/connections.c:385 ../cli/src/connections.c:386
+#: ../cli/src/connections.c:603 ../cli/src/connections.c:606
+#: ../cli/src/devices.c:432 ../cli/src/devices.c:557 ../cli/src/devices.c:583
+#: ../cli/src/devices.c:584 ../cli/src/devices.c:585 ../cli/src/devices.c:586
+#: ../cli/src/devices.c:587 ../cli/src/settings.c:508
+#: ../cli/src/settings.c:551 ../cli/src/settings.c:652
+#: ../cli/src/settings.c:926 ../cli/src/settings.c:927
+#: ../cli/src/settings.c:929 ../cli/src/settings.c:931
+#: ../cli/src/settings.c:1056 ../cli/src/settings.c:1057
+#: ../cli/src/settings.c:1058 ../cli/src/settings.c:1137
+#: ../cli/src/settings.c:1138 ../cli/src/settings.c:1139
+#: ../cli/src/settings.c:1140 ../cli/src/settings.c:1141
+#: ../cli/src/settings.c:1142 ../cli/src/settings.c:1143
+#: ../cli/src/settings.c:1144 ../cli/src/settings.c:1145
+#: ../cli/src/settings.c:1146 ../cli/src/settings.c:1147
+#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149
+#: ../cli/src/settings.c:1224
 msgid "yes"
 msgstr "是"
 
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:385
-#: ../cli/src/connections.c:602 ../cli/src/connections.c:605
-#: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
-#: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
-#: ../cli/src/devices.c:543 ../cli/src/settings.c:504
-#: ../cli/src/settings.c:506 ../cli/src/settings.c:544
-#: ../cli/src/settings.c:643 ../cli/src/settings.c:912
-#: ../cli/src/settings.c:913 ../cli/src/settings.c:915
-#: ../cli/src/settings.c:917 ../cli/src/settings.c:1042
-#: ../cli/src/settings.c:1043 ../cli/src/settings.c:1044
-#: ../cli/src/settings.c:1123 ../cli/src/settings.c:1124
-#: ../cli/src/settings.c:1125 ../cli/src/settings.c:1126
-#: ../cli/src/settings.c:1127 ../cli/src/settings.c:1128
-#: ../cli/src/settings.c:1129 ../cli/src/settings.c:1130
-#: ../cli/src/settings.c:1131 ../cli/src/settings.c:1132
-#: ../cli/src/settings.c:1133 ../cli/src/settings.c:1134
-#: ../cli/src/settings.c:1135 ../cli/src/settings.c:1210
+#: ../cli/src/connections.c:385 ../cli/src/connections.c:386
+#: ../cli/src/connections.c:603 ../cli/src/connections.c:606
+#: ../cli/src/devices.c:432 ../cli/src/devices.c:557 ../cli/src/devices.c:583
+#: ../cli/src/devices.c:584 ../cli/src/devices.c:585 ../cli/src/devices.c:586
+#: ../cli/src/devices.c:587 ../cli/src/settings.c:508
+#: ../cli/src/settings.c:510 ../cli/src/settings.c:551
+#: ../cli/src/settings.c:652 ../cli/src/settings.c:926
+#: ../cli/src/settings.c:927 ../cli/src/settings.c:929
+#: ../cli/src/settings.c:931 ../cli/src/settings.c:1056
+#: ../cli/src/settings.c:1057 ../cli/src/settings.c:1058
+#: ../cli/src/settings.c:1137 ../cli/src/settings.c:1138
+#: ../cli/src/settings.c:1139 ../cli/src/settings.c:1140
+#: ../cli/src/settings.c:1141 ../cli/src/settings.c:1142
+#: ../cli/src/settings.c:1143 ../cli/src/settings.c:1144
+#: ../cli/src/settings.c:1145 ../cli/src/settings.c:1146
+#: ../cli/src/settings.c:1147 ../cli/src/settings.c:1148
+#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1224
 msgid "no"
 msgstr "否"
 
-#: ../cli/src/connections.c:457 ../cli/src/connections.c:500
+#: ../cli/src/connections.c:458 ../cli/src/connections.c:501
 msgid "System connections"
 msgstr "系统连接"
 
-#: ../cli/src/connections.c:462 ../cli/src/connections.c:513
+#: ../cli/src/connections.c:463 ../cli/src/connections.c:514
 msgid "User connections"
 msgstr "用户连接"
 
-#: ../cli/src/connections.c:474 ../cli/src/connections.c:1334
-#: ../cli/src/connections.c:1350 ../cli/src/connections.c:1359
-#: ../cli/src/connections.c:1370 ../cli/src/connections.c:1452
-#: ../cli/src/devices.c:864 ../cli/src/devices.c:874 ../cli/src/devices.c:973
-#: ../cli/src/devices.c:980
+#: ../cli/src/connections.c:475 ../cli/src/connections.c:1335
+#: ../cli/src/connections.c:1351 ../cli/src/connections.c:1360
+#: ../cli/src/connections.c:1371 ../cli/src/connections.c:1456
+#: ../cli/src/devices.c:962 ../cli/src/devices.c:972 ../cli/src/devices.c:1074
+#: ../cli/src/devices.c:1081
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "错误：缺少 %s 参数。"
 
-#: ../cli/src/connections.c:487
+#: ../cli/src/connections.c:488
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "错误：%s - 没有这个连接。"
 
-#: ../cli/src/connections.c:519 ../cli/src/connections.c:1383
-#: ../cli/src/connections.c:1470 ../cli/src/devices.c:687
-#: ../cli/src/devices.c:754 ../cli/src/devices.c:888 ../cli/src/devices.c:986
+#: ../cli/src/connections.c:520 ../cli/src/connections.c:1384
+#: ../cli/src/connections.c:1474 ../cli/src/devices.c:785
+#: ../cli/src/devices.c:852 ../cli/src/devices.c:986 ../cli/src/devices.c:1087
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "未知参数：%s\n"
 
-#: ../cli/src/connections.c:528
+#: ../cli/src/connections.c:529
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "错误：没有指定有效参数。"
 
-#: ../cli/src/connections.c:543 ../cli/src/connections.c:1572
-#: ../cli/src/devices.c:1192 ../cli/src/network-manager.c:274
+#: ../cli/src/connections.c:544 ../cli/src/connections.c:1577
+#: ../cli/src/devices.c:1293 ../cli/src/network-manager.c:274
 #, c-format
 msgid "Error: %s."
 msgstr "错误：%s。"
 
-#: ../cli/src/connections.c:649
+#: ../cli/src/connections.c:650
 #, c-format
 msgid "Error: 'con status': %s"
 msgstr "错误：'con status': %s"
 
-#: ../cli/src/connections.c:651
+#: ../cli/src/connections.c:652
 #, c-format
 msgid "Error: 'con status': %s; allowed fields: %s"
 msgstr "错误：'con status': %s；允许的字段：%s"
 
-#: ../cli/src/connections.c:658
+#: ../cli/src/connections.c:659
 msgid "Active connections"
 msgstr "活跃连接"
 
-#: ../cli/src/connections.c:1026
+#: ../cli/src/connections.c:1027
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "设备 '%s' 中没有活跃连接"
 
-#: ../cli/src/connections.c:1034
+#: ../cli/src/connections.c:1035
 #, c-format
 msgid "no active connection or device"
 msgstr "没有活跃连接或者设备"
 
-#: ../cli/src/connections.c:1084
+#: ../cli/src/connections.c:1085
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "设备 '%s' 不兼容连接 '%s'"
 
-#: ../cli/src/connections.c:1086
+#: ../cli/src/connections.c:1087
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "没有找到可用于连接 '%s' 的设备"
 
-#: ../cli/src/connections.c:1097
+#: ../cli/src/connections.c:1098
 msgid "activating"
 msgstr "激活中"
 
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:1100
 msgid "activated"
-msgstr "激活的"
+msgstr "已激活"
 
-#: ../cli/src/connections.c:1102 ../cli/src/connections.c:1125
-#: ../cli/src/connections.c:1158 ../cli/src/devices.c:224
-#: ../cli/src/devices.c:514 ../cli/src/network-manager.c:92
-#: ../cli/src/network-manager.c:145 ../cli/src/settings.c:469
+#: ../cli/src/connections.c:1103 ../cli/src/connections.c:1126
+#: ../cli/src/connections.c:1159 ../cli/src/devices.c:246
+#: ../cli/src/devices.c:558 ../cli/src/network-manager.c:92
+#: ../cli/src/network-manager.c:145 ../cli/src/settings.c:473
 msgid "unknown"
 msgstr "未知"
 
-#: ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:1112
 msgid "VPN connecting (prepare)"
-msgstr "VPN 连接（准备）"
+msgstr "VPN 连接(准备)"
 
-#: ../cli/src/connections.c:1113
+#: ../cli/src/connections.c:1114
 msgid "VPN connecting (need authentication)"
-msgstr "VPN 连接中（需要验证）"
+msgstr "VPN 连接中(需要验证)"
 
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:1116
 msgid "VPN connecting"
 msgstr "VPN 连接中"
 
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:1118
 msgid "VPN connecting (getting IP configuration)"
-msgstr "VPN 连接中（获取 IP 配置）"
+msgstr "VPN 连接中(获取 IP 配置)"
 
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:1120
 msgid "VPN connected"
-msgstr "VNP 连接"
+msgstr "VPN 连接"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:1122
 msgid "VPN connection failed"
 msgstr "VPN 连接失败"
 
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:1124
 msgid "VPN disconnected"
 msgstr "断开 VPN 连接"
 
-#: ../cli/src/connections.c:1134
+#: ../cli/src/connections.c:1135
 msgid "unknown reason"
 msgstr "未知原因"
 
-#: ../cli/src/connections.c:1136
+#: ../cli/src/connections.c:1137
 msgid "none"
 msgstr "无"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1139
 msgid "the user was disconnected"
-msgstr "断开连接的用户"
+msgstr "用户已断开连接"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1141
 msgid "the base network connection was interrupted"
 msgstr "基点网络连接中断"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1143
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN 服务意外停止"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1145
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN 服务返回无效配置"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1147
 msgid "the connection attempt timed out"
 msgstr "连接尝试超时"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1149
 msgid "the VPN service did not start in time"
 msgstr "VPN 连接没有按时启动"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1151
 msgid "the VPN service failed to start"
 msgstr "VPN 服务启动失败"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1153
 msgid "no valid VPN secrets"
-msgstr "没有有效 VPN secret"
+msgstr "没有有效的 VPN 加密"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1155
 msgid "invalid VPN secrets"
-msgstr "无效 VPN secret"
+msgstr "无效 VPN 加密"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1157
 msgid "the connection was removed"
 msgstr "连接被删除"
 
-#: ../cli/src/connections.c:1170
+#: ../cli/src/connections.c:1171
 #, c-format
 msgid "state: %s\n"
 msgstr "状态：%s\n"
 
-#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
+#: ../cli/src/connections.c:1174 ../cli/src/connections.c:1200
 #, c-format
 msgid "Connection activated\n"
-msgstr "连接被激活\n"
+msgstr "连接已激活\n"
 
-#: ../cli/src/connections.c:1176
+#: ../cli/src/connections.c:1177
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "错误：激活连接失败。"
 
-#: ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1196
 #, c-format
 msgid "state: %s (%d)\n"
 msgstr "状态：%s (%d)\n"
 
-#: ../cli/src/connections.c:1205
+#: ../cli/src/connections.c:1206
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "错误：激活连接失败：%s。"
 
-#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
+#: ../cli/src/connections.c:1223 ../cli/src/devices.c:909
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "错误：超时 %d 秒过期。"
 
-#: ../cli/src/connections.c:1265
+#: ../cli/src/connections.c:1266
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "错误：激活连接失败：%s"
 
-#: ../cli/src/connections.c:1279
+#: ../cli/src/connections.c:1280
 #, c-format
 msgid "Error: Obtaining active connection for '%s' failed."
 msgstr "错误：获取 '%s' 的活跃连接失败。"
 
-#: ../cli/src/connections.c:1288
+#: ../cli/src/connections.c:1289
 #, c-format
 msgid "Active connection state: %s\n"
 msgstr "活跃连接状态：%s\n"
 
-#: ../cli/src/connections.c:1289
+#: ../cli/src/connections.c:1290
 #, c-format
 msgid "Active connection path: %s\n"
 msgstr "活跃连接路径：%s\n"
 
-#: ../cli/src/connections.c:1343 ../cli/src/connections.c:1461
+#: ../cli/src/connections.c:1344 ../cli/src/connections.c:1465
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "错误：未知连接：%s"
 
-#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
+#: ../cli/src/connections.c:1379 ../cli/src/devices.c:980
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "错误：超时值 '%s' 无效。"
 
-#: ../cli/src/connections.c:1391 ../cli/src/connections.c:1478
+#: ../cli/src/connections.c:1392 ../cli/src/connections.c:1482
 #, c-format
 msgid "Error: id or uuid has to be specified."
-msgstr "错误：必须指定 id 或者 uuid。"
+msgstr "错误：必须指定 ID 或者 UUID。"
 
-#: ../cli/src/connections.c:1411
+#: ../cli/src/connections.c:1412
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "错误：没有找到合适的设备：%s。"
 
-#: ../cli/src/connections.c:1413
+#: ../cli/src/connections.c:1414
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "错误：没有找到合适的设备。"
 
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1509
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "警告：连接没有激活\n"
 
-#: ../cli/src/connections.c:1561
+#: ../cli/src/connections.c:1566
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "错误：'con' 命令 '%s' 无效。"
 
-#: ../cli/src/connections.c:1597
+#: ../cli/src/connections.c:1602
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "错误：无法连接到 D-Bus。"
 
-#: ../cli/src/connections.c:1604
+#: ../cli/src/connections.c:1609
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "错误：无法获得系统设置。"
 
-#: ../cli/src/connections.c:1612
+#: ../cli/src/connections.c:1617
 #, c-format
 msgid "Error: Could not get user settings."
 msgstr "错误：无法获得用户设置。"
 
-#: ../cli/src/connections.c:1622
+#: ../cli/src/connections.c:1627
 #, c-format
 msgid "Error: Can't obtain connections: settings services are not running."
 msgstr "错误：无法获得连接：设定服务没有运行。"
 
 #. 0
 #. 9
-#: ../cli/src/devices.c:60 ../cli/src/devices.c:86 ../cli/src/devices.c:162
+#: ../cli/src/devices.c:61 ../cli/src/devices.c:89 ../cli/src/devices.c:184
 msgid "DEVICE"
 msgstr "设备"
 
 #. 1
 #. 4
 #. 0
-#: ../cli/src/devices.c:62 ../cli/src/devices.c:90
+#: ../cli/src/devices.c:63 ../cli/src/devices.c:93
 #: ../cli/src/network-manager.c:36
 msgid "STATE"
 msgstr "状态"
 
-#: ../cli/src/devices.c:71
+#: ../cli/src/devices.c:72
 msgid "GENERAL"
 msgstr "常规"
 
 #. 0
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:73
 msgid "CAPABILITIES"
 msgstr "功能"
 
 #. 1
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:74
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI 属性"
 
 #. 2
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:75
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:76
 msgid "WIRED-PROPERTIES"
 msgstr "有线连接属性"
 
 #. 4
-#: ../cli/src/devices.c:76
+#: ../cli/src/devices.c:77
 msgid "IP4-SETTINGS"
 msgstr "IP4 设置"
 
 #. 5
-#: ../cli/src/devices.c:77
+#: ../cli/src/devices.c:78
 msgid "IP4-DNS"
 msgstr "IP4-DNS"
 
+#. 6
+#: ../cli/src/devices.c:79
+msgid "IP6-SETTINGS"
+msgstr "IP6 设置"
+
+#. 7
+#: ../cli/src/devices.c:80
+msgid "IP6-DNS"
+msgstr "IP6-DNS"
+
 #. 2
-#: ../cli/src/devices.c:88
+#: ../cli/src/devices.c:91
 msgid "DRIVER"
 msgstr "驱动程序"
 
 #. 3
-#: ../cli/src/devices.c:89
+#: ../cli/src/devices.c:92
 msgid "HWADDR"
 msgstr "硬盘"
 
 #. 0
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:102
 msgid "CARRIER-DETECT"
 msgstr "容器探测"
 
 #. 1
-#: ../cli/src/devices.c:100
+#: ../cli/src/devices.c:103
 msgid "SPEED"
 msgstr "速度"
 
 #. 0
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:112
 msgid "CARRIER"
 msgstr "容器"
 
 #. 0
-#: ../cli/src/devices.c:119
+#: ../cli/src/devices.c:122
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:120
+#: ../cli/src/devices.c:123
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:124
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:125
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:126
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:132
+#: ../cli/src/devices.c:135 ../cli/src/devices.c:146
 msgid "ADDRESS"
 msgstr "地址"
 
 #. 1
-#: ../cli/src/devices.c:133
+#: ../cli/src/devices.c:136 ../cli/src/devices.c:147
 msgid "PREFIX"
 msgstr "前缀"
 
 #. 2
-#: ../cli/src/devices.c:134
+#: ../cli/src/devices.c:137 ../cli/src/devices.c:148
 msgid "GATEWAY"
 msgstr "网关"
 
 #. 0
-#: ../cli/src/devices.c:143
+#: ../cli/src/devices.c:157 ../cli/src/devices.c:166
 msgid "DNS"
 msgstr "DNS"
 
 #. 0
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:175
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:176
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:177
 msgid "MODE"
 msgstr "型号"
 
 #. 3
-#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:178
 msgid "FREQ"
 msgstr "FREQ"
 
 #. 4
-#: ../cli/src/devices.c:157
+#: ../cli/src/devices.c:179
 msgid "RATE"
 msgstr "频率"
 
 #. 5
-#: ../cli/src/devices.c:158
+#: ../cli/src/devices.c:180
 msgid "SIGNAL"
 msgstr "信号"
 
 #. 6
-#: ../cli/src/devices.c:159
+#: ../cli/src/devices.c:181
 msgid "SECURITY"
 msgstr "安全性"
 
 #. 7
-#: ../cli/src/devices.c:160
+#: ../cli/src/devices.c:182
 msgid "WPA-FLAGS"
 msgstr "WPA-标志"
 
 #. 8
-#: ../cli/src/devices.c:161
+#: ../cli/src/devices.c:183
 msgid "RSN-FLAGS"
 msgstr "RSN-标志"
 
 #. 10
-#: ../cli/src/devices.c:163
+#: ../cli/src/devices.c:185
 msgid "ACTIVE"
 msgstr "活跃"
 
-#: ../cli/src/devices.c:186
+#: ../cli/src/devices.c:208
 #, c-format
 msgid ""
 "Usage: nmcli dev { COMMAND | help }\n"
@@ -640,204 +652,205 @@ msgstr ""
 "  wifi [list [iface <iface>] | apinfo iface <iface> hwaddr <hwaddr>]\n"
 "\n"
 
-#: ../cli/src/devices.c:206
+#: ../cli/src/devices.c:228
 msgid "unmanaged"
-msgstr "未管理的"
+msgstr "未管理"
 
-#: ../cli/src/devices.c:208
+#: ../cli/src/devices.c:230
 msgid "unavailable"
-msgstr "不可用的"
+msgstr "不可用"
 
-#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
+#: ../cli/src/devices.c:232 ../cli/src/network-manager.c:89
 msgid "disconnected"
-msgstr "断开连接"
+msgstr "已断开"
 
-#: ../cli/src/devices.c:212
+#: ../cli/src/devices.c:234
 msgid "connecting (prepare)"
-msgstr "连接中（准备）"
+msgstr "连接中(准备)"
 
-#: ../cli/src/devices.c:214
+#: ../cli/src/devices.c:236
 msgid "connecting (configuring)"
-msgstr "连接中（配置中）"
+msgstr "连接中(配置)"
 
-#: ../cli/src/devices.c:216
+#: ../cli/src/devices.c:238
 msgid "connecting (need authentication)"
-msgstr "连接中（需要验证）"
+msgstr "连接中(需要验证)"
 
-#: ../cli/src/devices.c:218
+#: ../cli/src/devices.c:240
 msgid "connecting (getting IP configuration)"
-msgstr "连接中（获得 IP 配置）"
+msgstr "连接中(获得 IP 配置)"
 
-#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
+#: ../cli/src/devices.c:242 ../cli/src/network-manager.c:87
 msgid "connected"
 msgstr "连接的"
 
-#: ../cli/src/devices.c:222
+#: ../cli/src/devices.c:244
 msgid "connection failed"
 msgstr "连接失败"
 
-#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
+#: ../cli/src/devices.c:267 ../cli/src/devices.c:424
 msgid "Unknown"
 msgstr "未知"
 
-#: ../cli/src/devices.c:277
+#: ../cli/src/devices.c:299
 msgid "(none)"
-msgstr "（无）"
+msgstr "(无)"
 
-#: ../cli/src/devices.c:302
+#: ../cli/src/devices.c:324
 #, c-format
 msgid "%s: error converting IP4 address 0x%X"
 msgstr "%s：转换 IP4 地址 0x%X 出错"
 
-#: ../cli/src/devices.c:349
+#: ../cli/src/devices.c:393
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:350
+#: ../cli/src/devices.c:394
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:359
+#: ../cli/src/devices.c:403
 msgid "Encrypted: "
-msgstr "加密的："
+msgstr "加密："
 
-#: ../cli/src/devices.c:364
+#: ../cli/src/devices.c:408
 msgid "WEP "
 msgstr "WEP"
 
-#: ../cli/src/devices.c:366
+#: ../cli/src/devices.c:410
 msgid "WPA "
 msgstr "WPA"
 
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:412
 msgid "WPA2 "
 msgstr "WPA2"
 
-#: ../cli/src/devices.c:371
+#: ../cli/src/devices.c:415
 msgid "Enterprise "
 msgstr "企业级"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:424
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:424
 msgid "Infrastructure"
 msgstr "基础构架"
 
-#: ../cli/src/devices.c:442
+#: ../cli/src/devices.c:486
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "错误：'dev list': %s"
 
-#: ../cli/src/devices.c:444
+#: ../cli/src/devices.c:488
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "错误：'dev list': %s；允许的字段：%s"
 
-#: ../cli/src/devices.c:453
+#: ../cli/src/devices.c:497
 msgid "Device details"
 msgstr "设备详情"
 
-#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+#: ../cli/src/devices.c:527 ../cli/src/devices.c:925
 msgid "(unknown)"
-msgstr "（未知）"
+msgstr "(未知)"
 
-#: ../cli/src/devices.c:484
+#: ../cli/src/devices.c:528
 msgid "unknown)"
-msgstr "未知）"
+msgstr "未知)"
 
-#: ../cli/src/devices.c:510
+#: ../cli/src/devices.c:554
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:627
 msgid "on"
 msgstr "开"
 
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:627
 msgid "off"
 msgstr "关"
 
-#: ../cli/src/devices.c:710
+#: ../cli/src/devices.c:808
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "错误：'dev status': %s"
 
-#: ../cli/src/devices.c:712
+#: ../cli/src/devices.c:810
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "错误：'dev status': %s；允许的字段：%s"
 
-#: ../cli/src/devices.c:719
+#: ../cli/src/devices.c:817
 msgid "Status of devices"
 msgstr "设备状态"
 
-#: ../cli/src/devices.c:747
+#: ../cli/src/devices.c:845
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "错误：缺少 '%s' 参数。"
 
-#: ../cli/src/devices.c:776 ../cli/src/devices.c:915 ../cli/src/devices.c:1035
+#: ../cli/src/devices.c:874 ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1136
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "错误：没有找到设备 '%s'。"
 
-#: ../cli/src/devices.c:799
+#: ../cli/src/devices.c:897
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "成功：成功断开设备 '%s'。"
 
-#: ../cli/src/devices.c:824
+#: ../cli/src/devices.c:922
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
-msgstr "错误：断开设备 '%s'（%s）失败：%s"
+msgstr "错误：断开设备 '%s'(%s)失败：%s"
 
-#: ../cli/src/devices.c:832
+#: ../cli/src/devices.c:930
 #, c-format
 msgid "Device state: %d (%s)\n"
 msgstr "设备状态：%d (%s)\n"
 
-#: ../cli/src/devices.c:896
+#: ../cli/src/devices.c:994
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "错误：没有指定 iface。"
 
-#: ../cli/src/devices.c:1011
+#: ../cli/src/devices.c:1112
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "错误：'dev wifi'：%s"
 
-#: ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1114
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "错误：'dev wifi': %s；允许的字段：%s"
 
-#: ../cli/src/devices.c:1020
+#: ../cli/src/devices.c:1121
 msgid "WiFi scan list"
 msgstr "WiFi 扫描列表"
 
-#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
+#: ../cli/src/devices.c:1156 ../cli/src/devices.c:1210
 #, c-format
 msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "错误：没有找到使用 hwaddr '%s' 的访问点。"
+msgstr "错误：没有找到使用硬件地址 '%s' 的访问点。"
 
-#: ../cli/src/devices.c:1072
+#: ../cli/src/devices.c:1173
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "错误：设备 '%s' 不是 WiFi 设备。"
 
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1237
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "错误：'dev wifi' 命令 '%s' 无效。"
 
-#: ../cli/src/devices.c:1183
+#: ../cli/src/devices.c:1284
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "错误：'dev' 命令 '%s' 无效。"
@@ -893,7 +906,7 @@ msgstr ""
 
 #: ../cli/src/network-manager.c:83
 msgid "asleep"
-msgstr "asleep"
+msgstr "睡眠"
 
 #: ../cli/src/network-manager.c:85
 msgid "connecting"
@@ -918,13 +931,13 @@ msgstr "网络管理器状态"
 #: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
 #: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
 msgid "enabled"
-msgstr "启用的"
+msgstr "已启用"
 
 #: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
 #: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
 #: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
 msgid "disabled"
-msgstr "禁用的"
+msgstr "已禁用"
 
 #: ../cli/src/network-manager.c:148
 msgid "running"
@@ -932,7 +945,7 @@ msgstr "运行中"
 
 #: ../cli/src/network-manager.c:148
 msgid "not running"
-msgstr "没有运行"
+msgstr "未运行"
 
 #: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
 #, c-format
@@ -941,7 +954,7 @@ msgstr "错误：'--fields' 值 '%s' 在此无效；允许的字段：%s"
 
 #: ../cli/src/network-manager.c:209
 msgid "WiFi enabled"
-msgstr "启用 WiFi"
+msgstr "已启用 WiFi"
 
 #: ../cli/src/network-manager.c:220
 #, c-format
@@ -950,7 +963,7 @@ msgstr "错误：无效 'wifi' 参数：'%s'。"
 
 #: ../cli/src/network-manager.c:241
 msgid "WWAN enabled"
-msgstr "启用 WWAN"
+msgstr "已启用 WWAN"
 
 #: ../cli/src/network-manager.c:252
 #, c-format
@@ -983,18 +996,18 @@ msgid ""
 "  dev         devices managed by NetworkManager\n"
 "\n"
 msgstr ""
-"用法：%s [OPTIONS] OBJECT { COMMAND | help }\n"
+"用法：%s [选项] 对象 { 命令 | help }\n"
 "\n"
-"OPTIONS\n"
-"  -t[erse]    terse output\n"
-"  -p[retty]   pretty output\n"
-"  -v[ersion]  show program version\n"
-"  -h[elp]     print this help\n"
+"选项\n"
+"  -t[erse]	简洁输出\n"
+"  -p[retty]	美观输出\n"
+"  -v[ersion]	显示程序版本\n"
+"  -h[elp]	显示此帮助\n"
 "\n"
-"OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"对象\n"
+"  nm		NetworkManager 状态\n"
+"  con		NetworkManager 连接\n"
+"  dev		NetworkManager 管理的设备\n"
 "\n"
 
 #: ../cli/src/nmcli.c:113
@@ -1005,7 +1018,7 @@ msgstr "错误：对象 '%s' 未知，尝试 'nmcli help'。"
 #: ../cli/src/nmcli.c:143
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
-msgstr "错误：第二此指定选项 '--terse'。"
+msgstr "错误：第二次指定选项 '--terse'。"
 
 #: ../cli/src/nmcli.c:148
 #, c-format
@@ -1050,7 +1063,7 @@ msgstr "错误：选项 '%s' 未知，尝试 'nmcli -help'。"
 #: ../cli/src/nmcli.c:234
 #, c-format
 msgid "Caught signal %d, shutting down..."
-msgstr "捕获信号 %d，关闭中......"
+msgstr "捕获信号 %d，关闭..."
 
 #: ../cli/src/nmcli.c:259
 #, c-format
@@ -1061,78 +1074,79 @@ msgstr "错误：无法连接到网络管理器。"
 msgid "Success"
 msgstr "成功"
 
-#: ../cli/src/settings.c:407
+#: ../cli/src/settings.c:411
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:409
+#: ../cli/src/settings.c:413
 #, c-format
 msgid "%d (104/128-bit passphrase)"
-msgstr "%d（104/128 位密码短语）"
+msgstr "%d (104/128 位密码短语)"
 
-#: ../cli/src/settings.c:412
+#: ../cli/src/settings.c:416
 #, c-format
 msgid "%d (unknown)"
-msgstr "%d（未知）"
+msgstr "%d (未知)"
 
-#: ../cli/src/settings.c:438
+#: ../cli/src/settings.c:442
 msgid "0 (unknown)"
-msgstr "0（未知）"
+msgstr "0 (未知)"
 
-#: ../cli/src/settings.c:444
+#: ../cli/src/settings.c:448
 msgid "any, "
 msgstr "任意，"
 
-#: ../cli/src/settings.c:446
+#: ../cli/src/settings.c:450
 msgid "900 MHz, "
 msgstr "900 MHz，"
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:452
 msgid "1800 MHz, "
 msgstr "1800 MHz，"
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:454
 msgid "1900 MHz, "
 msgstr "1900 MHz，"
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:456
 msgid "850 MHz, "
 msgstr "850 MHz，"
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:458
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz，"
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:460
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz，"
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:462
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz，"
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:464
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz，"
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:466
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz，"
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:468
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz，"
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:470
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz，"
 
-#: ../cli/src/settings.c:546 ../cli/src/settings.c:708
+#: ../cli/src/settings.c:554 ../cli/src/settings.c:721
 msgid "auto"
 msgstr "自动"
 
-#: ../cli/src/settings.c:704 ../cli/src/settings.c:707 ../cli/src/utils.c:172
+#: ../cli/src/settings.c:716 ../cli/src/settings.c:719
+#: ../cli/src/settings.c:720 ../cli/src/utils.c:172
 msgid "not set"
 msgstr "未设置"
 
@@ -1229,7 +1243,7 @@ msgstr "没有足够的空间储存文件数据。"
 #: ../libnm-util/crypto.c:324
 #, c-format
 msgid "IV must be an even number of bytes in length."
-msgstr "IV 长度必须是偶数字节。"
+msgstr "初始向量长度必须是偶数字节。"
 
 #: ../libnm-util/crypto.c:333
 #, c-format
@@ -1275,7 +1289,7 @@ msgstr "初始化 MD5 引擎失败：%s / %s。"
 #: ../libnm-util/crypto_gnutls.c:156
 #, c-format
 msgid "Invalid IV length (must be at least %zd)."
-msgstr "无效 IV 长度（必须至少为 %zd）。"
+msgstr "无效初始向量长度(至少为为 %zd)。"
 
 #: ../libnm-util/crypto_gnutls.c:165 ../libnm-util/crypto_nss.c:188
 #, c-format
@@ -1330,7 +1344,7 @@ msgstr "为加密设置对称密钥失败：%s / %s。"
 #: ../libnm-util/crypto_gnutls.c:313
 #, c-format
 msgid "Failed to set IV for encryption: %s / %s."
-msgstr "为加密设置 IV 失败：%s / %s。"
+msgstr "为加密设置初始向量失败：%s / %s。"
 
 #: ../libnm-util/crypto_gnutls.c:322
 #, c-format
@@ -1375,7 +1389,7 @@ msgstr "初始化 MD5 环境失败：%d。"
 #: ../libnm-util/crypto_nss.c:179
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
-msgstr "无效 IV 长度（必须至少 %d）。"
+msgstr "无效的初始向量长度(至少为 %d)。"
 
 #: ../libnm-util/crypto_nss.c:196
 #, c-format
@@ -1471,30 +1485,113 @@ msgstr "无法校验 PKCS#12 文件：%d"
 msgid "Could not generate random data."
 msgstr "无法生成随机数据。"
 
-#: ../libnm-util/nm-utils.c:1925
+#: ../libnm-util/nm-utils.c:1975
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "没有足够的空间生成加密密钥。"
 
-#: ../libnm-util/nm-utils.c:2035
+#: ../libnm-util/nm-utils.c:2085
 msgid "Could not allocate memory for PEM file creation."
 msgstr "无法为创建 PEM 文件分配内存。"
 
-#: ../libnm-util/nm-utils.c:2047
+#: ../libnm-util/nm-utils.c:2097
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "无法为在 PEM 文件中写入 IV 分配内存。"
 
-#: ../libnm-util/nm-utils.c:2059
+#: ../libnm-util/nm-utils.c:2109
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr "无法为在 PEM 文件中写入加密密钥分配内存。"
 
-#: ../libnm-util/nm-utils.c:2078
+#: ../libnm-util/nm-utils.c:2128
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "无法为 PEM 文件数据分配内存。"
 
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
+msgid "Connection sharing via a protected WiFi network"
+msgstr "通过受保护的 WiFi 网络共享连接"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
+msgid "Connection sharing via an open WiFi network"
+msgstr "通过公开 WiFi 网络共享连接"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
+msgid "Modify persistent system hostname"
+msgstr "更改系统固有主机名"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
+msgid "Modify system connections"
+msgstr "更改系统连接"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
+msgid "System policy prevents modification of system settings"
+msgstr "系统策略阻止更改系统设置"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr "系统策略阻止更改系统固有主机名"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr "系统策略阻止使用受保护的 WiFi 网络共享连接"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr "系统策略阻止使用公开 WiFi 网络共享连接"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+msgid "Allow control of network connections"
+msgstr "允许控制网络连接"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
+msgid "Allow use of user-specific connections"
+msgstr "允许用户连接"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+msgid "Enable or disable WiFi devices"
+msgstr "启用或禁用 WiFi 设备"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+msgid "Enable or disable mobile broadband devices"
+msgstr "启用或禁用移动宽带设备"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+msgid "Enable or disable system networking"
+msgstr "启用或禁用系统网络"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"挂起或唤醒 NetworkManager (应仅用于系统电源管理)"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+msgid "System policy prevents control of network connections"
+msgstr "系统策略阻止更改网络连接"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr "系统策略阻止启用或禁用 WiFi 设备"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr "系统策略阻止启用或禁用移动宽带设备"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+msgid "System policy prevents enabling or disabling system networking"
+msgstr "系统策略阻止启用或禁用系统网络"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr "系统策略阻止挂起或唤醒 NetworkManager"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
+msgid "System policy prevents use of user-specific connections"
+msgstr "系统策略阻止使用用户连接"
+
 #: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
 #: ../src/nm-netlink-monitor.c:653
 #, c-format
@@ -1540,16 +1637,16 @@ msgstr "更新链接缓存出错：%s"
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr "无效选项。请使用 --help 查看有效选项列表。\n"
 
-#: ../src/main.c:562
+#: ../src/main.c:573
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s。请使用 --help 查看有效选项列表。\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:325
+#: ../src/dhcp-manager/nm-dhcp-dhclient.c:324
 msgid "# Created by NetworkManager\n"
 msgstr "# 由 NetworkManger 创建\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:341
+#: ../src/dhcp-manager/nm-dhcp-dhclient.c:340
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1558,19 +1655,19 @@ msgstr ""
 "# 合并自 %s\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:279
+#: ../src/dhcp-manager/nm-dhcp-manager.c:284
 msgid "no usable DHCP client could be found."
 msgstr "找到无法使用的 DHCP 客户端。"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:288
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 msgid "'dhclient' could be found."
 msgstr "找到 'dhclient'。"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:298
+#: ../src/dhcp-manager/nm-dhcp-manager.c:303
 msgid "'dhcpcd' could be found."
 msgstr "找到 'dhcpcd'。"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:306
+#: ../src/dhcp-manager/nm-dhcp-manager.c:311
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "不支持的 DHCP 客户端 '%s'"
@@ -1585,11 +1682,11 @@ msgstr "未知日志等级 '%s'"
 msgid "Unknown log domain '%s'"
 msgstr "未知日志域 '%s'"
 
-#: ../src/named-manager/nm-named-manager.c:343
+#: ../src/named-manager/nm-named-manager.c:384
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr "注意：libc 解析器可能不支持超过三个名字服务器。"
 
-#: ../src/named-manager/nm-named-manager.c:345
+#: ../src/named-manager/nm-named-manager.c:386
 msgid "The nameservers listed below may not be recognized."
 msgstr "以下列出的名字服务器可能无法被识别。"
 
@@ -1598,39 +1695,6 @@ msgstr "以下列出的名字服务器可能无法被识别。"
 msgid "Auto %s"
 msgstr "自动 %s"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3256
+#: ../system-settings/plugins/ifcfg-rh/reader.c:3412
 msgid "System"
 msgstr "系统"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "通过受保护的 WiFi 网络共享连接"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "通过公开 WiFi 网络共享连接"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "更改系统固有主机名"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "更改系统连接"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "系统策略阻止更改系统设置"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr "系统策略阻止更改系统固有主机名"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr "系统策略阻止使用受保护的 WiFi 网络共享连接"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "系统策略组织使用公开 WiFi 网络共享连接"
-