summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShankar Prasad <svenkate@redhat.com>2014-09-29 09:25:48 +0200
committerJi穩 Klime禳 <jklimes@redhat.com>2014-09-29 09:25:48 +0200
commitd483a8774671cafbaa879335c5c8930def0cd403 (patch)
tree38625afb29da20458cf4150e9ac90b39506523a4
parentb6e7fb910151cf3dbfb39077646d985dfbda4a1e (diff)
downloadNetworkManager-d483a8774671cafbaa879335c5c8930def0cd403.tar.gz
po: update Kannada (kn) translation (bgo #737131)
https://bugzilla.gnome.org/show_bug.cgi?id=737131
-rw-r--r--po/kn.po6363
1 files changed, 3885 insertions, 2478 deletions
diff --git a/po/kn.po b/po/kn.po
index 16d69e0e54..c9e35952fe 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -2,562 +2,723 @@
# Kannada translation of NetworkManager.
# Copyright (C) 2009 NetworkManager's COPYRIGHT HOLDER
# This file is distributed under the same license as the NetworkManager package.
-#
+#
# Shankar Prasad <svenkate@redhat.com>, 2009, 2010, 2012, 2013.
# Shankar Prasad <svenkate@redhat.com>, 2009, 2010, 2012, 2013, 2014.
-# Shankar <svenkate@redhat.com>, 2014. #zanata
+# Shankar <svenkate@redhat.com>, 2014. #zanata.
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 17:13+0530\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2014-01-30 05:52-0500\n"
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&keywords=I18N+L10N&component=Translations\n"
+"POT-Creation-Date: 2014-09-17 22:04+0000\n"
+"PO-Revision-Date: 2014-09-22 22:26+0530\n"
"Last-Translator: Shankar Prasad <svenkate AT redhat Dot com>\n"
"Language-Team: Kannada <kde-i18n-doc@kde.org>\n"
"Language: kn\n"
-"X-Generator: Zanata 3.2.3\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.5\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../cli/src/common.c:34 ../cli/src/common.c:46 ../cli/src/common.c:54
-#: ../cli/src/common.c:65 ../cli/src/connections.c:174
-#: ../cli/src/connections.c:200
+#: ../clients/cli/common.c:38 ../clients/cli/common.c:50
+#: ../clients/cli/common.c:58 ../clients/cli/common.c:69
+#: ../clients/cli/connections.c:169 ../clients/cli/connections.c:191
msgid "GROUP"
msgstr "GROUP"
-#: ../cli/src/common.c:35 ../cli/src/common.c:55
+#. 0
+#: ../clients/cli/common.c:39 ../clients/cli/common.c:59
msgid "ADDRESS"
msgstr "ADDRESS"
-#: ../cli/src/common.c:36 ../cli/src/common.c:56
+#. 1
+#: ../clients/cli/common.c:40 ../clients/cli/common.c:60
msgid "ROUTE"
msgstr "ROUTE"
-#: ../cli/src/common.c:37 ../cli/src/common.c:57
+#. 2
+#: ../clients/cli/common.c:41 ../clients/cli/common.c:61
msgid "DNS"
msgstr "DNS"
-#: ../cli/src/common.c:38 ../cli/src/common.c:58
+#. 3
+#: ../clients/cli/common.c:42 ../clients/cli/common.c:62
msgid "DOMAIN"
msgstr "DOMAIN"
-#: ../cli/src/common.c:39
+#. 4
+#: ../clients/cli/common.c:43
msgid "WINS"
msgstr "WINS"
-#: ../cli/src/common.c:47 ../cli/src/common.c:66
+#. 0
+#: ../clients/cli/common.c:51 ../clients/cli/common.c:70
msgid "OPTION"
msgstr "OPTION"
-#: ../cli/src/common.c:404 ../cli/src/settings.c:2808
+#: ../clients/cli/common.c:371 ../clients/cli/settings.c:3049
+#: ../clients/cli/settings.c:3068
#, c-format
msgid "invalid IPv4 address '%s'"
msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 IPv4 鉦菽窒鉦喪移鉦 '%s'"
-#: ../cli/src/common.c:412
+#: ../clients/cli/common.c:379
#, c-format
msgid "invalid prefix '%s'; <1-32> allowed"
msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮 '%s'; <1-32> 鉦鉦兒鉦桌略鉦賴硫鉦耜移鉦鉦賴畢鈳"
-#: ../cli/src/common.c:419 ../cli/src/common.c:472
+#: ../clients/cli/common.c:386 ../clients/cli/common.c:439
#, c-format
msgid "invalid gateway '%s'"
msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦鈳鉦鈳鉦菽 '%s'"
-#: ../cli/src/common.c:457 ../cli/src/settings.c:3054
+#: ../clients/cli/common.c:424 ../clients/cli/settings.c:3395
+#: ../clients/cli/settings.c:3414
#, c-format
msgid "invalid IPv6 address '%s'"
msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 IPv4 鉦菽窒鉦喪移鉦 '%s'"
-#: ../cli/src/common.c:465
+#: ../clients/cli/common.c:432
#, c-format
msgid "invalid prefix '%s'; <1-128> allowed"
msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮 '%s'; <1-128> 鉦鉦兒鉦桌略鉦賴硫鉦耜移鉦鉦賴畢鈳"
-#: ../cli/src/common.c:512
+#: ../clients/cli/common.c:515
#, c-format
-msgid "invalid IPv4 route '%s'"
-msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 IPv4 鉦啤鉦鈳 '%s'"
+#| msgid "invalid next hop address '%s'"
+msgid "invalid route destination address '%s'"
+msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦啤鉦鈳 鉦鈳鉦啤窒鉦 鉦菽窒鉦喪移鉦 '%s'"
-#: ../cli/src/common.c:520
+#: ../clients/cli/common.c:522
#, c-format
-msgid "invalid prefix '%s'; <0-32> allowed"
-msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮 '%s'; <0-32> 鉦鉦兒鉦桌略鉦賴硫鉦耜移鉦鉦賴畢鈳"
+#| msgid "invalid prefix '%s'; <1-32> allowed"
+msgid "invalid prefix '%s'; <1-%d> allowed"
+msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮 '%s'; <1-%d> 鉦鉦兒鉦桌略鉦賴硫鉦耜移鉦鈳鉦戈鉦戈畢鈳"
-#: ../cli/src/common.c:527 ../cli/src/common.c:590
+#: ../clients/cli/common.c:532
#, c-format
msgid "invalid next hop address '%s'"
msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦桌鉦鉦舟窒鉦 hop 鉦菽窒鉦喪移鉦 '%s'"
-#: ../cli/src/common.c:534 ../cli/src/common.c:598
+#: ../clients/cli/common.c:537
#, c-format
-msgid "invalid metric '%s'"
-msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦桌鉦鈳鉦啤窒鉦鈳 '%s'"
+msgid ""
+"the second component of route ('%s') is neither a next hop address nor a "
+"metric"
+msgstr ""
+"鉦啤鉦鈳鉦 鉦鉦啤瓷鉦兒 鉦鉦鉦鉦菽 ('%s') 鉦鉦鉦舟 鉦桌鉦鉦舟窒鉦 鉦嫩移鉦芹 鉦菽窒鉦喪移鉦詮眶鉦擒鉦耜窒 鉦鉦鉦舟 鉦桌鉦鈳鉦啤窒鉦鈳 鉦鉦鉦耜窒 "
+"鉦鉦鉦賴眷鈳鉦"
-#: ../cli/src/common.c:575
+#: ../clients/cli/common.c:547
#, c-format
-msgid "invalid IPv6 route '%s'"
-msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 IPv6 鉦啤鉦鈳 '%s'"
+msgid "invalid metric '%s'"
+msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦桌鉦鈳鉦啤窒鉦鈳 '%s'"
-#: ../cli/src/common.c:583
-#, c-format
-msgid "invalid prefix '%s'; <0-128> allowed"
-msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮 '%s'; <0-128> 鉦鉦兒鉦桌略鉦賴硫鉦耜移鉦鉦賴畢鈳"
+#: ../clients/cli/common.c:556
+msgid "default route cannot be added (NetworkManager handles it by itself)"
+msgstr ""
+"鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略 鉦啤鉦鈳 鉦鉦兒鉦兒 鉦詮鉦啤窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦賴眷鈳鉦 (NetworkManager 鉦鉦舟疏鈳鉦兒 鉦詮鉦菽盔鉦 "
+"鉦兒窒鉦冢移鉦能窒鉦詮鉦戈鉦戈畢鈳)"
-#: ../cli/src/common.c:619
+#: ../clients/cli/common.c:644
msgid "unmanaged"
msgstr "鉦兒窒鉦啤鉦菽硃鉦賴硫鉦舟 鉦鉦啤鉦"
-#: ../cli/src/common.c:621
+#: ../clients/cli/common.c:646
msgid "unavailable"
msgstr "鉦耜痍鈳鉦能眶鉦賴眷鈳鉦"
-#: ../cli/src/common.c:623 ../cli/src/network-manager.c:276
+#: ../clients/cli/common.c:648 ../clients/cli/network-manager.c:274
msgid "disconnected"
msgstr "鉦詮鉦芹盒鈳鉦鉦鉦﹤窒鉦舟 鉦嫩鉦鉦賴畢鈳"
-#: ../cli/src/common.c:625
+#: ../clients/cli/common.c:650
msgid "connecting (prepare)"
msgstr "鉦詮鉦芹盒鈳鉦 鉦鉦耜鉦芹窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟 (鉦詮窒鉦舟鉦抉鈳鉦喪窒鉦鈳)"
-#: ../cli/src/common.c:627
+#: ../clients/cli/common.c:652
msgid "connecting (configuring)"
msgstr "鉦詮鉦芹盒鈳鉦 鉦鉦耜鉦芹窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟 (鉦詮鉦啤鉦賴硫鈳鉦菽窒鉦鈳)"
-#: ../cli/src/common.c:629
+#: ../clients/cli/common.c:654
msgid "connecting (need authentication)"
msgstr "鉦詮鉦芹盒鈳鉦 鉦鉦耜鉦芹窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟 (鉦舟鉦R鉦鉦啤產鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳)"
-#: ../cli/src/common.c:631
+#: ../clients/cli/common.c:656
msgid "connecting (getting IP configuration)"
msgstr "鉦詮鉦芹盒鈳鉦 鉦鉦耜鉦芹窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟 (IP 鉦詮鉦啤鉦兒鉦能疏鈳鉦兒 鉦芹瓷鈳鉦能眷鉦擒鈳鉦戈鉦戈窒鉦舟)"
-#: ../cli/src/common.c:633
+#: ../clients/cli/common.c:658
msgid "connecting (checking IP connectivity)"
msgstr "鉦詮鉦芹盒鈳鉦 鉦鉦耜鉦芹窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟 (IP 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦芹盒鉦賴眸鈳鉦耜窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟)"
-#: ../cli/src/common.c:635
+#: ../clients/cli/common.c:660
msgid "connecting (starting secondary connections)"
msgstr "鉦詮鉦芹盒鈳鉦 鉦鉦耜鉦芹窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟 (鉦鉦啤瓷鉦兒鉦 鉦詮鉦啤鉦兒鉦能疏鈳鉦兒 鉦鉦啤鉦冢窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟)"
-#: ../cli/src/common.c:637 ../cli/src/network-manager.c:272
+#: ../clients/cli/common.c:662 ../clients/cli/network-manager.c:270
msgid "connected"
msgstr "鉦詮鉦芹盒鈳鉦鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:639 ../cli/src/connections.c:732
+#: ../clients/cli/common.c:664 ../clients/cli/connections.c:542
msgid "deactivating"
msgstr "鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪鉦喪鉦戈鉦戈窒鉦舟"
-#: ../cli/src/common.c:641
+#: ../clients/cli/common.c:666
msgid "connection failed"
msgstr "鉦詮鉦芹盒鈳鉦 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:643 ../cli/src/connections.c:737
-#: ../cli/src/connections.c:760 ../cli/src/connections.c:1462
-#: ../cli/src/devices.c:827 ../cli/src/devices.c:2257
-#: ../cli/src/network-manager.c:279 ../cli/src/network-manager.c:297
-#: ../cli/src/network-manager.c:360 ../cli/src/network-manager.c:363
-#: ../cli/src/network-manager.c:373 ../cli/src/network-manager.c:375
-#: ../cli/src/network-manager.c:432 ../cli/src/network-manager.c:448
-#: ../cli/src/settings.c:732 ../cli/src/settings.c:760
-#: ../cli/src/settings.c:822 ../cli/src/settings.c:1137
-#: ../cli/src/utils.c:1080 ../src/main.c:470 ../src/main.c:498
+#: ../clients/cli/common.c:668 ../clients/cli/connections.c:547
+#: ../clients/cli/connections.c:570 ../clients/cli/connections.c:1638
+#: ../clients/cli/devices.c:816 ../clients/cli/devices.c:2367
+#: ../clients/cli/network-manager.c:277 ../clients/cli/network-manager.c:295
+#: ../clients/cli/network-manager.c:358 ../clients/cli/network-manager.c:361
+#: ../clients/cli/network-manager.c:371 ../clients/cli/network-manager.c:373
+#: ../clients/cli/network-manager.c:430 ../clients/cli/network-manager.c:446
+#: ../clients/cli/settings.c:703 ../clients/cli/settings.c:765
+#: ../clients/cli/settings.c:1057 ../clients/cli/utils.c:1121
+#: ../src/main.c:504 ../src/main.c:532
msgid "unknown"
msgstr "鉦鈳鉦戈鉦戈窒鉦耜鉦耜畢"
-#: ../cli/src/common.c:652
+#: ../clients/cli/common.c:677
msgid "No reason given"
msgstr "鉦能移鉦菽鉦舟 鉦鉦擒盒鉦 鉦兒鉦﹤眷鉦擒鉦賴眷鈳鉦"
-#: ../cli/src/common.c:655 ../cli/src/connections.c:2258
+#: ../clients/cli/common.c:680 ../clients/cli/connections.c:2413
#, c-format
msgid "Unknown error"
msgstr "鉦鈳鉦戈鉦戈窒鉦啤畢 鉦舟鉦"
-#: ../cli/src/common.c:658
+#: ../clients/cli/common.c:683
msgid "Device is now managed"
msgstr "鉦詮移鉦抉疏鉦菽疏鈳鉦兒 鉦鉦 鉦兒窒鉦能鉦戈鉦啤產鉦鈳鉦鈳鉦喪痕鉦﹤窒鉦詮眷鉦擒鉦賴畢鈳"
-#: ../cli/src/common.c:661
+#: ../clients/cli/common.c:686
msgid "Device is now unmanaged"
msgstr "鉦詮移鉦抉疏鉦菽疏鈳鉦兒 鉦鉦 鉦兒窒鉦能鉦戈鉦啤產鉦鈳鉦鈳鉦喪痕鉦﹤窒鉦詮眷鉦擒鉦賴眷鈳鉦"
-#: ../cli/src/common.c:664
+#: ../clients/cli/common.c:689
msgid "The device could not be readied for configuration"
msgstr "鉦詮移鉦抉疏鉦菽疏鈳鉦兒 鉦詮鉦啤鉦兒鉦鉦擒鉦 鉦詮窒鉦舟鉦抉鈳鉦喪窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦"
-#: ../cli/src/common.c:667
+#: ../clients/cli/common.c:692
msgid ""
"IP configuration could not be reserved (no available address, timeout, etc.)"
msgstr ""
"IP 鉦詮鉦啤鉦兒鉦能疏鈳鉦兒 鉦鉦擒畢鉦賴盒鉦賴硫鉦耜 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦 (鉦耜痍鈳鉦能眶鉦賴盒鈳鉦 鉦能移鉦菽鉦舟 鉦菽窒鉦喪移鉦, 鉦鉦擒眷鉦戈鉦啤窒鉦鈳, "
"鉦桌鉦鉦戈移鉦舟眶鈳鉦鉦喪窒鉦耜鉦.)"
-#: ../cli/src/common.c:670
+#: ../clients/cli/common.c:695
msgid "The IP configuration is no longer valid"
msgstr "IP 鉦詮鉦啤鉦兒鉦能 鉦鉦兒鉦兒 鉦桌鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒鉦賴盒鈳鉦菽鉦舟窒鉦耜鉦"
-#: ../cli/src/common.c:673
+#: ../clients/cli/common.c:698
msgid "Secrets were required, but not provided"
msgstr "鉦啤硃鉦詮鉦能鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳, 鉦鉦舟盒鈳 鉦鉦舟鉦賴硫鉦耜移鉦鉦賴眷鈳鉦"
-#: ../cli/src/common.c:676
+#: ../clients/cli/common.c:701
msgid "802.1X supplicant disconnected"
msgstr "802.1X 鉦詮痕鈳鉦耜窒鉦鈳鉦能移鉦鉦鈳鉦兒鉦鉦舟窒鉦鉦賴疏 鉦詮鉦芹盒鈳鉦 鉦鉦﹤窒鉦舟窒鉦舟"
-#: ../cli/src/common.c:679
+#: ../clients/cli/common.c:704
msgid "802.1X supplicant configuration failed"
msgstr "802.1X 鉦詮痕鈳鉦耜窒鉦鈳鉦能移鉦鉦鈳 鉦詮鉦啤鉦兒鉦能 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:682
+#: ../clients/cli/common.c:707
msgid "802.1X supplicant failed"
msgstr "802.1X 鉦詮痕鈳鉦耜窒鉦鈳鉦能移鉦鉦鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:685
+#: ../clients/cli/common.c:710
msgid "802.1X supplicant took too long to authenticate"
msgstr "802.1X 鉦詮痕鈳鉦耜窒鉦鈳鉦能移鉦鉦鈳 鉦舟鉦R鉦鉦啤窒鉦詮眷鈳 鉦眇硃鉦 鉦詮皎鉦 鉦戈鉦鈳鉦舟鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:688
+#: ../clients/cli/common.c:713
msgid "PPP service failed to start"
msgstr "PPP 鉦詮鉦菽鉦能疏鈳鉦兒 鉦鉦啤鉦冢窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦戈"
-#: ../cli/src/common.c:691
+#: ../clients/cli/common.c:716
msgid "PPP service disconnected"
msgstr "PPP 鉦詮鉦菽鉦 鉦詮鉦芹盒鈳鉦 鉦鉦﹤窒鉦舟窒鉦舟"
-#: ../cli/src/common.c:694
+#: ../clients/cli/common.c:719
msgid "PPP failed"
msgstr "PPP 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:697
+#: ../clients/cli/common.c:722
msgid "DHCP client failed to start"
msgstr "DHCP 鉦鈳鉦耜鉦鉦鈳 鉦鉦啤鉦冢鈳鉦喪鉦喪鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:700
+#: ../clients/cli/common.c:725
msgid "DHCP client error"
msgstr "DHCP 鉦鈳鉦耜鉦鉦鈳 鉦舟鉦"
-#: ../cli/src/common.c:703
+#: ../clients/cli/common.c:728
msgid "DHCP client failed"
msgstr "DHCP 鉦鈳鉦耜鉦鉦鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:706
+#: ../clients/cli/common.c:731
msgid "Shared connection service failed to start"
msgstr "鉦嫩鉦鉦耜移鉦 鉦詮鉦芹盒鈳鉦 鉦詮鉦菽鉦能 鉦鉦啤鉦冢鈳鉦喪鉦喪鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:709
+#: ../clients/cli/common.c:734
msgid "Shared connection service failed"
msgstr "鉦嫩鉦鉦耜移鉦 鉦詮鉦芹盒鈳鉦 鉦詮鉦菽鉦能 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:712
+#: ../clients/cli/common.c:737
msgid "AutoIP service failed to start"
msgstr "AutoIP 鉦詮鉦菽鉦能疏鈳鉦兒 鉦鉦啤鉦冢窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦戈"
-#: ../cli/src/common.c:715
+#: ../clients/cli/common.c:740
msgid "AutoIP service error"
msgstr "AutoIP 鉦詮鉦菽移 鉦舟鉦"
-#: ../cli/src/common.c:718
+#: ../clients/cli/common.c:743
msgid "AutoIP service failed"
msgstr "AutoIP 鉦詮鉦菽鉦能 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:721
+#: ../clients/cli/common.c:746
msgid "The line is busy"
msgstr "鉦桌移鉦啤鉦鉦菽 鉦鉦擒盒鈳鉦能疏鉦賴盒鉦戈眶鉦擒鉦賴畢鈳"
-#: ../cli/src/common.c:724
+#: ../clients/cli/common.c:749
msgid "No dial tone"
msgstr "鉦﹤盔鉦耜 鉦嗣痊鈳鉦抉眶鉦賴眷鈳鉦"
-#: ../cli/src/common.c:727
+#: ../clients/cli/common.c:752
msgid "No carrier could be established"
msgstr "鉦能移鉦菽鉦舟 鉦菽移鉦嫩鉦菽疏鈳鉦兒 鉦詮移鉦抉窒鉦詮眷鉦擒鉦賴眷鈳鉦"
-#: ../cli/src/common.c:730
+#: ../clients/cli/common.c:755
msgid "The dialing request timed out"
msgstr "鉦﹤盔鉦耜 鉦桌移鉦﹤鉦 鉦桌疏鉦菽窒鉦 鉦鉦擒眷鉦擒眶鉦抉窒 鉦桌鉦鉦賴畢鉦賴畢鈳"
-#: ../cli/src/common.c:733
+#: ../clients/cli/common.c:758
msgid "The dialing attempt failed"
msgstr "鉦﹤盔鉦耜 鉦桌移鉦﹤鉦 鉦芹鉦啤盔鉦戈鉦兒眶鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:736
+#: ../clients/cli/common.c:761
msgid "Modem initialization failed"
msgstr "鉦桌移鉦﹤鉦桌 鉦鉦啤鉦冢鈳鉦喪窒鉦鈳鉦能 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:739
+#: ../clients/cli/common.c:764
msgid "Failed to select the specified APN"
msgstr "鉦兒窒鉦嗣鉦鉦賴略 APN 鉦鉦兒鉦兒 鉦鉦啤窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟."
-#: ../cli/src/common.c:742
+#: ../clients/cli/common.c:767
msgid "Not searching for networks"
msgstr "鉦鉦擒眷鉦眇鉦抉鉦喪窒鉦鉦擒鉦 鉦嫩鉦﹤鉦鉦耜移鉦鈳鉦戈鉦戈窒鉦耜鉦"
-#: ../cli/src/common.c:745
+#: ../clients/cli/common.c:770
msgid "Network registration denied"
msgstr "鉦鉦擒眷鉦眇鉦 鉦兒鉦鉦舟產鉦賴盔鉦兒鉦兒 鉦兒窒鉦啤移鉦鉦啤窒鉦詮眷鉦擒鉦賴畢鈳"
-#: ../cli/src/common.c:748
+#: ../clients/cli/common.c:773
msgid "Network registration timed out"
msgstr "鉦鉦擒眷鉦眇鉦 鉦兒鉦鉦舟產鉦賴盔 鉦鉦擒眷鉦擒眶鉦抉窒 鉦戈鉦啤窒鉦舟"
-#: ../cli/src/common.c:751
+#: ../clients/cli/common.c:776
msgid "Failed to register with the requested network"
msgstr "鉦桌疏鉦菽窒 鉦詮眷鈳鉦耜窒鉦詮眷鉦擒畢 鉦鉦擒眷鉦眇鉦抉畢鈳鉦鉦舟窒鉦鈳 鉦兒鉦鉦舟移鉦能窒鉦詮眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:754
+#: ../clients/cli/common.c:779
msgid "PIN check failed"
msgstr "PIN 鉦芹盒鉦賴眸鈳鉦耜疏鈳鉦能 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:757
+#: ../clients/cli/common.c:782
msgid "Necessary firmware for the device may be missing"
msgstr "鉦詮移鉦抉疏鉦鈳鉦鉦擒鉦 鉦能移鉦菽鉦舟 鉦鉦鉦戈鉦 鉦徇盒鈳鉦桌-鉦菽鉦啤 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦"
-#: ../cli/src/common.c:760
+#: ../clients/cli/common.c:785
msgid "The device was removed"
msgstr "鉦詮移鉦抉疏鉦菽疏鈳鉦兒 鉦戈鉦鈳鉦舟 鉦嫩移鉦鉦耜移鉦鉦賴畢鈳"
-#: ../cli/src/common.c:763
+#: ../clients/cli/common.c:788
msgid "NetworkManager went to sleep"
msgstr "NetworkManager 鉦兒窒鉦舟鉦啤移鉦詮鉦丞窒鉦戈窒鉦鈳 鉦嫩鉦鉦賴畢鈳"
-#: ../cli/src/common.c:766
+#: ../clients/cli/common.c:791
msgid "The device's active connection disappeared"
msgstr "鉦詮移鉦抉疏鉦 鉦詮鈳鉦啤窒鉦 鉦詮鉦芹盒鈳鉦鉦菽 鉦桌盒鈳鉦能移鉦鉦賴畢鈳"
-#: ../cli/src/common.c:769
+#: ../clients/cli/common.c:794
msgid "Device disconnected by user or client"
msgstr "鉦詮移鉦抉疏鉦舟鉦鉦舟窒鉦鉦賴疏 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦眇眾鉦鈳鉦舟移鉦 鉦鉦丞眶 鉦鈳鉦耜鉦鉦鈳鉦兒窒鉦鉦 鉦鉦﹤窒鉦舟 鉦嫩移鉦鉦耜移鉦鉦賴畢鈳"
-#: ../cli/src/common.c:772
+#: ../clients/cli/common.c:797
msgid "Carrier/link changed"
msgstr "鉦菽移鉦嫩/鉦鈳鉦鉦﹤窒鉦能疏鈳鉦兒 鉦眇畢鉦耜移鉦能窒鉦詮眷鉦擒鉦賴畢鈳"
-#: ../cli/src/common.c:775
+#: ../clients/cli/common.c:800
msgid "The device's existing connection was assumed"
msgstr "鉦詮移鉦抉疏鉦 鉦鉦鉦賴疏 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦嫩窒鉦詮眷鉦擒鉦賴畢鈳"
-#: ../cli/src/common.c:778
+#: ../clients/cli/common.c:803
msgid "The supplicant is now available"
msgstr "鉦詮痕鈳鉦耜窒鉦鈳鉦能移鉦鉦鈳 鉦鉦 鉦耜痍鈳鉦能眶鉦賴畢鈳"
-#: ../cli/src/common.c:781
+#: ../clients/cli/common.c:806
msgid "The modem could not be found"
msgstr "鉦桌移鉦﹤鉦桌 鉦鉦鉦﹤ 鉦眇鉦舟窒鉦耜鉦"
-#: ../cli/src/common.c:784
+#: ../clients/cli/common.c:809
msgid "The Bluetooth connection failed or timed out"
msgstr "鉦眇鉦耜鉦鈳鉦戈 鉦詮鉦芹盒鈳鉦鉦菽 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟 鉦鉦丞眶 鉦鉦擒眷鉦擒眶鉦抉窒 鉦桌鉦啤窒鉦舟"
-#: ../cli/src/common.c:787
+#: ../clients/cli/common.c:812
msgid "GSM Modem's SIM card not inserted"
msgstr "GSM 鉦桌移鉦﹤鉦桌鉦 SIM 鉦鉦擒盒鈳鉦﹤ 鉦鉦兒鉦兒 鉦詮鉦啤窒鉦詮眷鉦擒鉦賴眷鈳鉦"
-#: ../cli/src/common.c:790
+#: ../clients/cli/common.c:815
msgid "GSM Modem's SIM PIN required"
msgstr "GSM 鉦桌移鉦﹤鉦桌鉦 SIM PIN 鉦鉦鉦戈鉦能眶鉦賴畢鈳"
-#: ../cli/src/common.c:793
+#: ../clients/cli/common.c:818
msgid "GSM Modem's SIM PUK required"
msgstr "GSM 鉦桌移鉦﹤鉦桌鉦 SIM PUK 鉦鉦鉦戈鉦能眶鉦賴畢鈳"
-#: ../cli/src/common.c:796
+#: ../clients/cli/common.c:821
msgid "GSM Modem's SIM wrong"
msgstr "GSM 鉦桌移鉦﹤鉦桌鉦 SIM 鉦戈痕鈳鉦芹移鉦鉦賴畢鈳"
-#: ../cli/src/common.c:799
+#: ../clients/cli/common.c:824
msgid "InfiniBand device does not support connected mode"
msgstr "InfiniBand 鉦詮移鉦抉疏鉦菽 鉦詮鉦芹盒鈳鉦鉦賴略 鉦詮鉦丞窒鉦戈窒鉦能眷鈳鉦耜窒 鉦眇鉦鉦眇眷鉦賴略鉦菽移鉦鉦賴眷鈳鉦"
-#: ../cli/src/common.c:802
+#: ../clients/cli/common.c:827
msgid "A dependency of the connection failed"
msgstr "鉦詮鉦芹盒鈳鉦鉦 鉦鉦菽眷鉦鉦眇疏鈳鉦能 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:805
+#: ../clients/cli/common.c:830
msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
-msgstr ""
-"ADSL 鉦眇鉦啤窒鉦﹤鉦鉦賴疏 鉦桌鉦鉦擒鉦戈盒鉦 RFC 2684 鉦鉦戈盒鈳鉦兒鉦鈳鉦兒眷鈳鉦耜窒 鉦鉦鉦舟 鉦戈鉦鉦舟盒鈳 鉦鉦鉦﹤鉦眇鉦舟窒鉦舟"
+msgstr "ADSL 鉦眇鉦啤窒鉦﹤鉦鉦賴疏 鉦桌鉦鉦擒鉦戈盒鉦 RFC 2684 鉦鉦戈盒鈳鉦兒鉦鈳鉦兒眷鈳鉦耜窒 鉦鉦鉦舟 鉦戈鉦鉦舟盒鈳 鉦鉦鉦﹤鉦眇鉦舟窒鉦舟"
-#: ../cli/src/common.c:808
+#: ../clients/cli/common.c:833
msgid "ModemManager is unavailable"
msgstr "ModemManager 鉦耜痍鈳鉦能眶鉦賴眷鈳鉦"
-#: ../cli/src/common.c:811
+#: ../clients/cli/common.c:836
msgid "The Wi-Fi network could not be found"
msgstr "Wi-Fi 鉦鉦擒眷鉦眇鉦抉眶鈳 鉦鉦鉦﹤ 鉦眇鉦舟窒鉦耜鉦"
-#: ../cli/src/common.c:814
+#: ../clients/cli/common.c:839
msgid "A secondary connection of the base connection failed"
msgstr "鉦桌鉦 鉦詮鉦芹盒鈳鉦鉦 鉦鉦啤瓷鉦兒 鉦詮鉦芹盒鈳鉦鉦菽 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:817
+#: ../clients/cli/common.c:842
msgid "DCB or FCoE setup failed"
msgstr "DCB 鉦鉦丞眶 FCoE 鉦詮窒鉦舟鉦抉略鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:820
+#: ../clients/cli/common.c:845
msgid "teamd control failed"
msgstr "teamd 鉦兒窒鉦能鉦戈鉦啤 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/common.c:824 ../cli/src/devices.c:634 ../tui/nm-ui-utils.c:359
+#: ../clients/cli/common.c:848
+#| msgid "ModemManager is unavailable"
+msgid "Modem failed or no longer available"
+msgstr "鉦桌移鉦﹤鉦桌 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟 鉦鉦丞眶 鉦鉦 鉦耜痍鈳鉦能眶鉦賴眷鈳鉦"
+
+#: ../clients/cli/common.c:851
+#| msgid "ModemManager is unavailable"
+msgid "Modem now ready and available"
+msgstr "鉦桌移鉦﹤鉦桌 鉦鉦 鉦詮窒鉦舟鉦抉鈳鉦鉦﹤窒鉦舟 鉦桌略鈳鉦戈 鉦耜痍鈳鉦能眶鉦賴畢鈳"
+
+#: ../clients/cli/common.c:854
+msgid "SIM PIN was incorrect"
+msgstr "SIM PIN 鉦戈痕鈳鉦芹移鉦鉦賴畢鈳"
+
+#. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
+#: ../clients/cli/common.c:858 ../clients/cli/devices.c:621
+#: ../libnm-glib/nm-device.c:1812
msgid "Unknown"
msgstr "鉦鈳鉦戈鉦戈窒鉦啤畢"
-#: ../cli/src/common.c:866
+#: ../clients/cli/common.c:900
#, c-format
msgid "invalid priority map '%s'"
msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦舟鉦能略鈳 鉦兒鈳鉦獅 '%s'"
-#: ../cli/src/common.c:873 ../cli/src/common.c:879
+#: ../clients/cli/common.c:907 ../clients/cli/common.c:913
#, c-format
msgid "priority '%s' is not valid (<0-%ld>)"
msgstr "'%s' 鉦鉦舟鉦能略鈳鉦能 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦 (<0-%ld>)"
-#: ../cli/src/common.c:935
+#: ../clients/cli/common.c:980
#, c-format
msgid "'%s' is not a valid team configuration or file name."
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦鈳鉦桌 鉦詮鉦啤鉦兒 鉦鉦丞眶 鉦鉦﹤略鉦 鉦嫩鉦詮盒鈳 鉦鉦鉦賴眷鈳鉦."
-#: ../cli/src/connections.c:62
+#. define some prompts for connection editor
+#: ../clients/cli/connections.c:40
msgid "Setting name? "
msgstr "鉦詮窒鉦舟鉦抉略鈳鉦 鉦嫩鉦詮盒鈳?"
-#: ../cli/src/connections.c:63
+#: ../clients/cli/connections.c:41
msgid "Property name? "
msgstr "鉦鈳鉦鉦 鉦嫩鉦詮盒鈳?"
-#: ../cli/src/connections.c:64
+#: ../clients/cli/connections.c:42
msgid "Enter connection type: "
msgstr "鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦能疏鈳鉦兒 鉦兒皎鈳鉦舟窒鉦詮窒: "
-#: ../cli/src/connections.c:68 ../cli/src/connections.c:175
-#: ../cli/src/devices.c:86 ../cli/src/devices.c:114 ../cli/src/devices.c:124
-#: ../cli/src/devices.c:134 ../cli/src/devices.c:143 ../cli/src/devices.c:158
-#: ../cli/src/devices.c:171 ../cli/src/devices.c:197 ../cli/src/devices.c:212
-#: ../cli/src/devices.c:221
+#. define some other prompts
+#: ../clients/cli/connections.c:45
+msgid "Connection type: "
+msgstr "鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳: "
+
+#: ../clients/cli/connections.c:46
+msgid "VPN type: "
+msgstr "VPN 鉦眇鈳: "
+
+#: ../clients/cli/connections.c:47
+msgid "Bond master: "
+msgstr "鉦眇移鉦鉦﹤ 鉦桌移鉦詮鉦鉦啤:"
+
+#: ../clients/cli/connections.c:48
+msgid "Team master: "
+msgstr "鉦戈鉦﹤畢 鉦芹鉦啤皎鈳鉦:"
+
+#: ../clients/cli/connections.c:49
+msgid "Bridge master: "
+msgstr "鉦眇鉦啤窒鉦鈳 鉦桌移鉦詮鉦鉦啤: "
+
+#: ../clients/cli/connections.c:50
+msgid "Connection (name, UUID, or path): "
+msgstr "鉦詮鉦芹盒鈳鉦 (鉦嫩鉦詮盒鈳, UUID, 鉦鉦丞眶 鉦桌移鉦啤鉦): "
+
+#. 0
+#: ../clients/cli/connections.c:58 ../clients/cli/connections.c:170
+#: ../clients/cli/devices.c:55 ../clients/cli/devices.c:84
+#: ../clients/cli/devices.c:94 ../clients/cli/devices.c:105
+#: ../clients/cli/devices.c:114 ../clients/cli/devices.c:129
+#: ../clients/cli/devices.c:142 ../clients/cli/devices.c:168
+#: ../clients/cli/devices.c:183 ../clients/cli/devices.c:192
msgid "NAME"
msgstr "NAME"
-#: ../cli/src/connections.c:69 ../cli/src/connections.c:176
+#. 0
+#. 1
+#: ../clients/cli/connections.c:59 ../clients/cli/connections.c:171
msgid "UUID"
msgstr "UUID"
-#: ../cli/src/connections.c:70 ../cli/src/connections.c:201
-#: ../cli/src/devices.c:72 ../cli/src/devices.c:88 ../cli/src/devices.c:200
+#. 1
+#. 0
+#. 1
+#. 2
+#: ../clients/cli/connections.c:60 ../clients/cli/connections.c:192
+#: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57
+#: ../clients/cli/devices.c:171
msgid "TYPE"
msgstr "TYPE"
-#: ../cli/src/connections.c:71
+#. 2
+#: ../clients/cli/connections.c:61
msgid "TIMESTAMP"
msgstr "TIMESTAMP"
-#: ../cli/src/connections.c:72
+#. 3
+#: ../clients/cli/connections.c:62
msgid "TIMESTAMP-REAL"
msgstr "TIMESTAMP-REAL"
-#: ../cli/src/connections.c:73 ../cli/src/devices.c:101
+#. 4
+#. 15
+#: ../clients/cli/connections.c:63 ../clients/cli/devices.c:71
msgid "AUTOCONNECT"
msgstr "AUTOCONNECT"
-#: ../cli/src/connections.c:74
+#. 5
+#: ../clients/cli/connections.c:64
msgid "READONLY"
msgstr "READONLY"
-#: ../cli/src/connections.c:75 ../cli/src/connections.c:183
-#: ../cli/src/devices.c:74 ../cli/src/devices.c:187 ../cli/src/devices.c:203
+#. 6
+#. 8
+#. 2
+#. 15
+#. 5
+#: ../clients/cli/connections.c:65 ../clients/cli/connections.c:178
+#: ../clients/cli/devices.c:43 ../clients/cli/devices.c:158
+#: ../clients/cli/devices.c:174
msgid "DBUS-PATH"
msgstr "DBUS-PATH"
-#: ../cli/src/connections.c:177
-msgid "DEVICES"
-msgstr "DEVICES"
+#. 7
+#. 13
+#. 4
+#: ../clients/cli/connections.c:66 ../clients/cli/devices.c:156
+#: ../clients/cli/devices.c:173
+msgid "ACTIVE"
+msgstr "ACTIVE"
-#: ../cli/src/connections.c:178 ../cli/src/devices.c:73
-#: ../cli/src/devices.c:96 ../cli/src/network-manager.c:39
+#. 8
+#. 0
+#. 12
+#. 3
+#: ../clients/cli/connections.c:67 ../clients/cli/devices.c:40
+#: ../clients/cli/devices.c:56 ../clients/cli/devices.c:155
+#: ../clients/cli/devices.c:172
+msgid "DEVICE"
+msgstr "DEVICE"
+
+#. 9
+#. 3
+#. 1
+#. 9
+#. 1
+#: ../clients/cli/connections.c:68 ../clients/cli/connections.c:173
+#: ../clients/cli/devices.c:42 ../clients/cli/devices.c:65
+#: ../clients/cli/network-manager.c:37
msgid "STATE"
msgstr "STATE"
-#: ../cli/src/connections.c:179
+#. 10
+#: ../clients/cli/connections.c:69
+#| msgid "MASTER-PATH"
+msgid "ACTIVE-PATH"
+msgstr "ACTIVE-PATH"
+
+#. 2
+#: ../clients/cli/connections.c:172
+msgid "DEVICES"
+msgstr "DEVICES"
+
+#. 4
+#: ../clients/cli/connections.c:174
msgid "DEFAULT"
msgstr "DEFAULT"
-#: ../cli/src/connections.c:180
+#. 5
+#: ../clients/cli/connections.c:175
msgid "DEFAULT6"
msgstr "DEFAULT6"
-#: ../cli/src/connections.c:181
+#. 6
+#: ../clients/cli/connections.c:176
msgid "SPEC-OBJECT"
msgstr "SPEC-OBJECT"
-#: ../cli/src/connections.c:182 ../cli/src/connections.c:224
-#: ../tui/nm-editor-utils.c:243 ../tui/nmt-connect-connection-list.c:343
+#. 7
+#. 4
+#. Ask for optional 'vpn' arguments.
+#: ../clients/cli/connections.c:177 ../clients/cli/connections.c:215
+#: ../clients/cli/connections.c:3450 ../clients/tui/nm-editor-utils.c:234
+#: ../clients/tui/nmt-connect-connection-list.c:408
msgid "VPN"
msgstr "VPN"
-#: ../cli/src/connections.c:184 ../cli/src/devices.c:77
-#: ../cli/src/devices.c:105
+#. 9
+#. 5
+#. 19
+#: ../clients/cli/connections.c:179 ../clients/cli/devices.c:46
+#: ../clients/cli/devices.c:75
msgid "CON-PATH"
msgstr "CON-PATH"
-#: ../cli/src/connections.c:185
+#. 10
+#: ../clients/cli/connections.c:180
msgid "ZONE"
msgstr "ZONE"
-#: ../cli/src/connections.c:186
+#. 11
+#: ../clients/cli/connections.c:181
msgid "MASTER-PATH"
msgstr "MASTER-PATH"
-#: ../cli/src/connections.c:202
+#. 1
+#: ../clients/cli/connections.c:193
msgid "USERNAME"
msgstr "USERNAME"
-#: ../cli/src/connections.c:203
+#. 2
+#: ../clients/cli/connections.c:194
msgid "GATEWAY"
msgstr "GATEWAY"
-#: ../cli/src/connections.c:204
+#. 3
+#: ../clients/cli/connections.c:195
msgid "BANNER"
msgstr "BANNER"
-#: ../cli/src/connections.c:205
+#. 4
+#: ../clients/cli/connections.c:196
msgid "VPN-STATE"
msgstr "VPN-STATE"
-#: ../cli/src/connections.c:206
+#. 5
+#: ../clients/cli/connections.c:197
msgid "CFG"
msgstr "CFG"
-#: ../cli/src/connections.c:219 ../cli/src/devices.c:236
+#: ../clients/cli/connections.c:210 ../clients/cli/devices.c:207
msgid "GENERAL"
msgstr "GENERAL"
-#: ../cli/src/connections.c:220 ../cli/src/devices.c:243
+#. 0
+#. 6
+#: ../clients/cli/connections.c:211 ../clients/cli/devices.c:214
msgid "IP4"
msgstr "IP4"
-#: ../cli/src/connections.c:221 ../cli/src/devices.c:244
+#. 1
+#. 7
+#: ../clients/cli/connections.c:212 ../clients/cli/devices.c:215
msgid "DHCP4"
msgstr "DHCP4"
-#: ../cli/src/connections.c:222 ../cli/src/devices.c:245
+#. 2
+#. 8
+#: ../clients/cli/connections.c:213 ../clients/cli/devices.c:216
msgid "IP6"
msgstr "IP6"
-#: ../cli/src/connections.c:223 ../cli/src/devices.c:246
+#. 3
+#. 9
+#: ../clients/cli/connections.c:214 ../clients/cli/devices.c:217
msgid "DHCP6"
msgstr "DHCP6"
-#: ../cli/src/connections.c:255
-#, c-format
+#: ../clients/cli/connections.c:249
+#, c-format
+#| msgid ""
+#| "Usage: nmcli connection { COMMAND | help }\n"
+#| "\n"
+#| "COMMAND := { show | up | down | add | modify | edit | delete | reload | "
+#| "load }\n"
+#| "\n"
+#| " show configured [[id | uuid | path] <ID>]\n"
+#| " show active [[id | uuid | path | apath] <ID>]\n"
+#| "\n"
+#| " up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [nsp "
+#| "<name>]\n"
+#| "\n"
+#| " up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>]\n"
+#| "\n"
+#| " down [id | uuid | path | apath] <ID>\n"
+#| "\n"
+#| " add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
+#| "\n"
+#| " modify [id | uuid | path] <ID> <setting>.<property> <value>\n"
+#| "\n"
+#| " edit [id | uuid | path] <ID>\n"
+#| " edit [type <new_con_type>] [con-name <new_con_name>]\n"
+#| "\n"
+#| " delete [id | uuid | path] <ID>\n"
+#| "\n"
+#| " reload\n"
+#| "\n"
+#| " load <filename> [ <filename>... ]\n"
+#| "\n"
msgid ""
"Usage: nmcli connection { COMMAND | help }\n"
"\n"
-"COMMAND := { show | up | down | add | modify | edit | delete | reload | load "
-"}\n"
+"COMMAND := { show | up | down | add | modify | edit | delete | reload | "
+"load }\n"
"\n"
-" show configured [[id | uuid | path] <ID>]\n"
-" show active [[id | uuid | path | apath] <ID>]\n"
+" show [--active] [[id | uuid | path | apath] <ID>] ...\n"
"\n"
" up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [nsp <name>]\n"
"\n"
@@ -567,7 +728,8 @@ msgid ""
"\n"
" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
"\n"
-" modify [id | uuid | path] <ID> <setting>.<property> <value>\n"
+" modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
+"<value>)+\n"
"\n"
" edit [id | uuid | path] <ID>\n"
" edit [type <new_con_type>] [con-name <new_con_name>]\n"
@@ -581,11 +743,10 @@ msgid ""
msgstr ""
"鉦眇眾鉦鈳: nmcli connection { COMMAND | help }\n"
"\n"
-"COMMAND := { show | up | down | add | modify | edit | delete | reload | load "
-"}\n"
+"COMMAND := { show | up | down | add | modify | edit | delete | reload | "
+"load }\n"
"\n"
-" show configured [[id | uuid | path] <ID>]\n"
-" show active [[id | uuid | path | apath] <ID>]\n"
+" show [--active] [[id | uuid | path | apath] <ID>] ...\n"
"\n"
" up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [nsp <name>]\n"
"\n"
@@ -595,7 +756,8 @@ msgstr ""
"\n"
" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
"\n"
-" modify [id | uuid | path] <ID> <setting>.<property> <value>\n"
+" modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
+"<value>)+\n"
"\n"
" edit [id | uuid | path] <ID>\n"
" edit [type <new_con_type>] [con-name <new_con_name>]\n"
@@ -607,47 +769,54 @@ msgstr ""
" load <filename> [ <filename>... ]\n"
"\n"
-#: ../cli/src/connections.c:278
+#: ../clients/cli/connections.c:271
#, c-format
msgid ""
"Usage: nmcli connection show { ARGUMENTS | help }\n"
"\n"
-"ARGUMENTS := active [[id | uuid | path | apath] <ID>]\n"
+"ARGUMENTS := [--active]\n"
"\n"
-"Show connections which are currently used by a device to connect to a "
-"network.\n"
-"Without a parameter, all active connections are listed. When <ID> is "
-"provided,\n"
-"the connection details are displayed instead.\n"
-"\n"
-"ARGUMENTS := configured [[id | uuid | path] <ID>]\n"
-"\n"
-"Show in-memory and on-disk connections, some of which may also be active if\n"
-"a device is using that connection profile. Without a parameter, all profiles\n"
-"are listed. When <ID> is provided, the profile details are displayed instead."
+"List in-memory and on-disk connection profiles, some of which may also be\n"
+"active if a device is using that connection profile. Without a parameter, "
+"all\n"
+"profiles are listed. When --active option is specified, only the active\n"
+"profiles are shown.\n"
"\n"
+"ARGUMENTS := [--active] [id | uuid | path | apath] <ID> ...\n"
"\n"
+"Show details for specified connections. By default, both static "
+"configuration\n"
+"and active connection data are displayed. It is possible to filter the "
+"output\n"
+"using global '--fields' option. Refer to the manual page for more "
+"information.\n"
+"When --active option is specified, only the active profiles are taken into\n"
+"account.\n"
msgstr ""
"鉦眇眾鉦鈳: nmcli connection show { ARGUMENTS | help }\n"
"\n"
-"ARGUMENTS := active [[id | uuid | path | apath] <ID>]\n"
+"ARGUMENTS := [--active]\n"
"\n"
-"鉦鉦鉦舟 鉦鉦擒眷鉦眇鉦抉鈳鉦鈳 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉窒鉦詮眷鈳 鉦鉦鉦舟 鉦詮移鉦抉疏鉦舟窒鉦鉦 鉦芹鉦啤硫鉦鈳鉦 鉦眇眾鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦啤鉦 "
-"鉦詮鉦芹盒鈳鉦鉦鉦喪疏鈳鉦兒 鉦戈鉦啤窒鉦詮.\n"
-"鉦鉦鉦舟 鉦兒窒鉦能略鉦擒鉦鉦菽窒鉦耜鉦耜畢鈳, 鉦鉦耜鉦耜移 鉦詮鈳鉦啤窒鉦 鉦詮鉦芹盒鈳鉦鉦鉦 鉦芹鈳鉦鉦賴盔鉦兒鉦兒 鉦戈鉦啤窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳. <ID> "
-"鉦鉦兒鉦兒 鉦鉦舟鉦賴硫鉦賴畢鉦擒,\n"
-"鉦眇畢鉦耜窒鉦鈳 鉦詮鉦芹盒鈳鉦鉦 鉦菽窒鉦菽盒鉦鉦喪疏鈳鉦兒 鉦戈鉦啤窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
+"鉦鉦鉦舟 鉦詮移鉦抉疏鉦菽 鉦詮鉦芹盒鈳鉦鉦 鉦芹鉦啤鉦徇鉦耜 鉦鉦兒鉦兒 鉦眇眾鉦詮鉦戈鉦戈窒鉦舟鉦舟眷鈳鉦耜窒, 鉦桌鉦桌鉦啤窒鉦能眷鈳鉦耜窒鉦 鉦桌略鈳鉦戈 "
+"鉦﹤窒鉦詮鉦鉦賴疏鉦耜鉦耜窒鉦 鉦詮鉦芹盒鈳鉦鉦吒n"
+"鉦芹鉦啤鉦徇鉦耜鉦鉦 鉦芹鈳鉦鉦賴鉦喪眷鈳鉦耜窒, 鉦鈳鉦耜眶鈳鉦鉦舟 鉦詮鈳鉦啤窒鉦能眶鉦擒鉦賴盒鉦耜鉦眇硃鈳鉦舟. 鉦鉦鉦舟 鉦兒窒鉦能略鉦擒鉦鉦菽窒鉦耜鉦耜畢鈳, "
+"鉦鉦耜鉦耜移\n"
+"鉦芹鉦啤鉦徇鉦耜鉦鉦喪疏鈳鉦兒 鉦芹鈳鉦鉦 鉦桌移鉦﹤眷鉦擒鈳鉦戈鉦戈畢鈳. --active 鉦鉦能鉦鈳鉦能疏鈳鉦兒 鉦詮鉦鉦賴硫鉦耜移鉦鉦賴畢鈳鉦舟盒鈳, 鉦鈳鉦菽眷 "
+"鉦詮鈳鉦啤窒鉦珮n"
+"鉦芹鉦啤鉦徇鉦耜鉦鉦喪疏鈳鉦兒 鉦桌移鉦戈鉦 鉦戈鉦啤窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
"\n"
-"ARGUMENTS := configured [[id | uuid | path] <ID>]\n"
+"ARGUMENTS := [--active] [id | uuid | path | apath] <ID> ...\n"
"\n"
-"Show in-memory and on-disk connections, some of 鉦桌鉦桌鉦啤窒鉦能眷鈳鉦耜窒鉦 鉦桌略鈳鉦戈 "
-"鉦﹤窒鉦詮鉦鉦賴疏鉦耜鉦耜窒鉦 鉦詮鉦芹盒鈳鉦鉦鉦喪疏鈳鉦兒 鉦戈鉦啤窒鉦詮, 鉦 鉦詮鉦芹盒鈳鉦鉦 鉦芹鉦啤鉦徇鉦耜 鉦鉦兒鉦兒 鉦鉦鉦舟 鉦詮移鉦抉疏鉦菽\n"
-"鉦眇眾鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟鉦舟眷鈳鉦耜窒 鉦鉦菽鉦鉦喪眷鈳鉦耜窒 鉦鈳鉦耜眶鈳 鉦詮鈳鉦啤窒鉦能眶鉦擒鉦賴盒鉦眇硃鈳鉦舟. 鉦鉦鉦舟 鉦兒窒鉦能略鉦擒鉦鉦菽窒鉦耜鉦耜畢鈳, "
-"鉦鉦耜鉦耜移 \n"
-"鉦詮鈳鉦啤窒鉦 鉦詮鉦芹盒鈳鉦鉦鉦 鉦芹鈳鉦鉦賴盔鉦兒鉦兒 鉦戈鉦啤窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳. <ID> 鉦鉦兒鉦兒 鉦鉦舟鉦賴硫鉦賴畢鉦擒,\n"
-"鉦眇畢鉦耜窒鉦鈳 鉦詮鉦芹盒鈳鉦鉦 鉦菽窒鉦菽盒鉦鉦喪疏鈳鉦兒 鉦戈鉦啤窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
+"鉦兒窒鉦嗣鉦鉦賴略 鉦詮鉦芹盒鈳鉦鉦鉦喪窒鉦鉦擒鉦賴疏 鉦菽窒鉦菽盒鉦鉦喪疏鈳鉦兒 鉦戈鉦啤窒鉦詮. 鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略鉦菽移鉦鉦, "
+"鉦詮鉦丞窒鉦啤眶鉦擒畢 鉦詮鉦啤鉦兒\n"
+"鉦桌略鈳鉦戈 鉦詮鈳鉦啤窒鉦 鉦詮鉦芹盒鈳鉦鉦 鉦舟略鈳鉦戈移鉦鉦嗣眶鉦兒鉦兒 鉦戈鉦啤窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳. 鉦詮移鉦啤鉦菽略鈳鉦啤窒鉦 '--fields' "
+"鉦鉦能鉦鈳鉦能疏鈳鉦兒 \n"
+"鉦眇眾鉦詮窒鉦鈳鉦鉦﹤ 鉦鉦鈳鉦芹鉦鈳 鉦鉦兒鉦兒 鉦徇窒鉦耜鉦鉦啤 鉦桌移鉦﹤眷鈳 鉦詮移鉦抉鉦能眶鉦賴盒鈳鉦戈鉦戈畢鈳. 鉦嫩鉦鈳鉦鉦賴疏 鉦桌移鉦嫩窒鉦戈窒鉦鉦擒鉦 "
+"鉦桌移鉦嫩窒鉦戈窒 鉦芹鉦鉦菽疏鈳鉦兒 鉦兒鉦﹤窒.\n"
+"--active 鉦鉦能鉦鈳鉦能疏鈳鉦兒 鉦詮鉦鉦賴硫鉦賴畢鉦擒, 鉦鈳鉦菽眷 鉦詮鈳鉦啤窒鉦 鉦芹鉦啤鉦徇鉦耜鉦鉦喪疏鈳鉦兒 鉦桌移鉦戈鉦 鉦芹盒鉦賴鉦鉦兒鉦鈳\n"
+"鉦戈鉦鈳鉦舟鉦鈳鉦喪鉦喪眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
-#: ../cli/src/connections.c:297
+#: ../clients/cli/connections.c:293
#, c-format
msgid ""
"Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -675,7 +844,8 @@ msgstr ""
"<name>]\n"
"\n"
"鉦鉦鉦舟 鉦詮移鉦抉疏鉦舟眷鈳鉦耜窒 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮窒. 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮痊鈳鉦鉦賴盒鈳鉦 鉦芹鉦啤鉦徇鉦耜 鉦鉦兒鉦兒 "
-"鉦鉦舟盒 鉦嫩鉦詮盒鈳,\n"
+"鉦鉦舟盒 "
+"鉦嫩鉦詮盒鈳,\n"
"UUID 鉦鉦丞眶 D-Bus 鉦桌移鉦啤鉦鉦舟窒鉦鉦 鉦鈳鉦啤鉦戈窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
"\n"
"ARGUMENTS := ifname <ifname> [ap <BSSID>] [nsp <name>]\n"
@@ -691,7 +861,7 @@ msgstr ""
"鉦鉦兒鉦菽盔鉦賴硫鈳鉦戈鉦戈畢鈳)\n"
"\n"
-#: ../cli/src/connections.c:318
+#: ../clients/cli/connections.c:314
#, c-format
msgid ""
"Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -708,15 +878,109 @@ msgstr ""
"\n"
"ARGUMENTS := [id | uuid | path | apath] <ID>\n"
"\n"
-"鉦鉦鉦舟 鉦詮移鉦抉疏鉦舟窒鉦鉦 鉦鉦鉦舟 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮窒 (鉦詮移鉦抉疏鉦菽 鉦鉦兒鉦兒眺鈳鉦鈳 鉦詮鉦菽盔鉦-"
-"鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦鈳\n"
+"鉦鉦鉦舟 鉦詮移鉦抉疏鉦舟窒鉦鉦 鉦鉦鉦舟 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮窒 (鉦詮移鉦抉疏鉦菽 鉦鉦兒鉦兒眺鈳鉦鈳 "
+"鉦詮鉦菽盔鉦-鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦鈳\n"
"鉦桌移鉦﹤畢鉦鉦戈 鉦兒窒鉦啤鉦眇鉦抉窒鉦詮窒鉦舟). 鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮痊鈳鉦鉦賴盒鈳鉦 鉦芹鉦啤鉦徇鉦耜 鉦鉦兒鉦兒 鉦鉦舟盒 鉦嫩鉦詮盒鈳, UUID "
"鉦鉦丞眶 \n"
"D-Bus 鉦桌移鉦啤鉦鉦舟窒鉦鉦 鉦鈳鉦啤鉦戈窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
"\n"
-#: ../cli/src/connections.c:331
-#, c-format
+#: ../clients/cli/connections.c:327
+#, c-format
+#| msgid ""
+#| "Usage: nmcli connection add { ARGUMENTS | help }\n"
+#| "\n"
+#| "ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
+#| "\n"
+#| " COMMON_OPTIONS:\n"
+#| " type <type>\n"
+#| " ifname <interface name> | \"*\"\n"
+#| " [con-name <connection name>]\n"
+#| " [autoconnect yes|no]\n"
+#| "\n"
+#| " TYPE_SPECIFIC_OPTIONS:\n"
+#| " ethernet: [mac <MAC address>]\n"
+#| " [cloned-mac <cloned MAC address>]\n"
+#| " [mtu <MTU>]\n"
+#| "\n"
+#| " wifi: ssid <SSID>\n"
+#| " [mac <MAC address>]\n"
+#| " [cloned-mac <cloned MAC address>]\n"
+#| " [mtu <MTU>]\n"
+#| "\n"
+#| " wimax: [mac <MAC address>]\n"
+#| " [nsp <NSP>]\n"
+#| "\n"
+#| " pppoe: username <PPPoE username>\n"
+#| " [password <PPPoE password>]\n"
+#| " [service <PPPoE service name>]\n"
+#| " [mtu <MTU>]\n"
+#| " [mac <MAC address>]\n"
+#| "\n"
+#| " gsm: apn <APN>\n"
+#| " [user <username>]\n"
+#| " [password <password>]\n"
+#| "\n"
+#| " cdma: [user <username>]\n"
+#| " [password <password>]\n"
+#| "\n"
+#| " infiniband: [mac <MAC address>]\n"
+#| " [mtu <MTU>]\n"
+#| " [transport-mode datagram | connected]\n"
+#| " [parent <ifname>]\n"
+#| " [p-key <IPoIB P_Key>]\n"
+#| "\n"
+#| " bluetooth: [addr <bluetooth address>]\n"
+#| " [bt-type panu|dun-gsm|dun-cdma]\n"
+#| "\n"
+#| " vlan: dev <parent device (connection UUID, ifname, or MAC)>\n"
+#| " id <VLAN ID>\n"
+#| " [flags <VLAN flags>]\n"
+#| " [ingress <ingress priority mapping>]\n"
+#| " [egress <egress priority mapping>]\n"
+#| " [mtu <MTU>]\n"
+#| "\n"
+#| " bond: [mode balance-rr (0) | active-backup (1) | balance-xor "
+#| "(2) | broadcast (3) |\n"
+#| " 802.3ad (4) | balance-tlb (5) | balance-alb "
+#| "(6)]\n"
+#| " [primary <ifname>]\n"
+#| " [miimon <num>]\n"
+#| " [downdelay <num>]\n"
+#| " [updelay <num>]\n"
+#| " [arp-interval <num>]\n"
+#| " [arp-ip-target <num>]\n"
+#| "\n"
+#| " bond-slave: master <master (ifname or connection UUID)>\n"
+#| "\n"
+#| " team: [config <file>|<raw JSON data>]\n"
+#| "\n"
+#| " team-slave: master <master (ifname or connection UUID)>\n"
+#| " [config <file>|<raw JSON data>]\n"
+#| "\n"
+#| " bridge: [stp yes|no]\n"
+#| " [priority <num>]\n"
+#| " [forward-delay <2-30>]\n"
+#| " [hello-time <1-10>]\n"
+#| " [max-age <6-40>]\n"
+#| " [ageing-time <0-1000000>]\n"
+#| "\n"
+#| " bridge-slave: master <master (ifname or connection UUID)>\n"
+#| " [priority <0-63>]\n"
+#| " [path-cost <1-65535>]\n"
+#| " [hairpin yes|no]\n"
+#| "\n"
+#| " vpn: vpn-type vpnc|openvpn|pptp|openconnect|openswan\n"
+#| " [user <username>]\n"
+#| "\n"
+#| " olpc-mesh: ssid <SSID>\n"
+#| " [channel <1-13>]\n"
+#| " [dhcp-anycast <MAC address>]\n"
+#| "\n"
+#| " IP_OPTIONS:\n"
+#| " [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
+#| " [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
+#| "\n"
msgid ""
"Usage: nmcli connection add { ARGUMENTS | help }\n"
"\n"
@@ -728,6 +992,8 @@ msgid ""
" [con-name <connection name>]\n"
" [autoconnect yes|no]\n"
"\n"
+" [save yes|no]\n"
+"\n"
" TYPE_SPECIFIC_OPTIONS:\n"
" ethernet: [mac <MAC address>]\n"
" [cloned-mac <cloned MAC address>]\n"
@@ -781,11 +1047,11 @@ msgid ""
" [arp-interval <num>]\n"
" [arp-ip-target <num>]\n"
"\n"
-" bond-slave: master <master (ifname or connection UUID)>\n"
+" bond-slave: master <master (ifname, or connection UUID or name)>\n"
"\n"
" team: [config <file>|<raw JSON data>]\n"
"\n"
-" team-slave: master <master (ifname or connection UUID)>\n"
+" team-slave: master <master (ifname, or connection UUID or name)>\n"
" [config <file>|<raw JSON data>]\n"
"\n"
" bridge: [stp yes|no]\n"
@@ -794,13 +1060,15 @@ msgid ""
" [hello-time <1-10>]\n"
" [max-age <6-40>]\n"
" [ageing-time <0-1000000>]\n"
+" [mac <MAC address>]\n"
"\n"
-" bridge-slave: master <master (ifname or connection UUID)>\n"
+" bridge-slave: master <master (ifname, or connection UUID or name)>\n"
" [priority <0-63>]\n"
" [path-cost <1-65535>]\n"
" [hairpin yes|no]\n"
"\n"
-" vpn: vpn-type vpnc|openvpn|pptp|openconnect|openswan\n"
+" vpn: vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
+"ssh|l2tp|iodine|...\n"
" [user <username>]\n"
"\n"
" olpc-mesh: ssid <SSID>\n"
@@ -822,6 +1090,8 @@ msgstr ""
" [con-name <connection name>]\n"
" [autoconnect yes|no]\n"
"\n"
+" [save yes|no]\n"
+"\n"
" TYPE_SPECIFIC_OPTIONS:\n"
" ethernet: [mac <MAC address>]\n"
" [cloned-mac <cloned MAC address>]\n"
@@ -875,11 +1145,11 @@ msgstr ""
" [arp-interval <num>]\n"
" [arp-ip-target <num>]\n"
"\n"
-" bond-slave: master <master (ifname or connection UUID)>\n"
+" bond-slave: master <master (ifname, or connection UUID or name)>\n"
"\n"
" team: [config <file>|<raw JSON data>]\n"
"\n"
-" team-slave: master <master (ifname or connection UUID)>\n"
+" team-slave: master <master (ifname, or connection UUID or name)>\n"
" [config <file>|<raw JSON data>]\n"
"\n"
" bridge: [stp yes|no]\n"
@@ -888,13 +1158,15 @@ msgstr ""
" [hello-time <1-10>]\n"
" [max-age <6-40>]\n"
" [ageing-time <0-1000000>]\n"
+" [mac <MAC address>]\n"
"\n"
-" bridge-slave: master <master (ifname or connection UUID)>\n"
+" bridge-slave: master <master (ifname, or connection UUID or name)>\n"
" [priority <0-63>]\n"
" [path-cost <1-65535>]\n"
" [hairpin yes|no]\n"
"\n"
-" vpn: vpn-type vpnc|openvpn|pptp|openconnect|openswan\n"
+" vpn: vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
+"ssh|l2tp|iodine|...\n"
" [user <username>]\n"
"\n"
" olpc-mesh: ssid <SSID>\n"
@@ -906,28 +1178,55 @@ msgstr ""
" [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
"\n"
-#: ../cli/src/connections.c:408
+#: ../clients/cli/connections.c:406
#, c-format
msgid ""
"Usage: nmcli connection modify { ARGUMENTS | help }\n"
"\n"
-"ARGUMENTS := [id | uuid | path] <ID> <setting name>.<property name> "
-"[<value>]\n"
+"ARGUMENTS := [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
"\n"
-"Modify a single property in the connection profile.\n"
-"The profile is identified by its name, UUID or D-Bus path.\n"
+"Modify one or more properties of the connection profile.\n"
+"The profile is identified by its name, UUID or D-Bus path. For multi-valued\n"
+"properties you can use optional '+' or '-' prefix to the property name.\n"
+"The '+' sign allows appending items instead of overwriting the whole value.\n"
+"The '-' sign allows removing selected items instead of the whole value.\n"
+"\n"
+"Examples:\n"
+"nmcli con mod home-wifi wifi.ssid rakosnicek\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
+"nmcli con mod em1-1 -ipv4.dns 1\n"
+"nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
+"nmcli con mod bond0 +bond.options mii=500\n"
+"nmcli con mod bond0 -bond.options downdelay\n"
"\n"
msgstr ""
"鉦眇眾鉦鈳: nmcli connection modify { ARGUMENTS | help }\n"
"\n"
-"ARGUMENTS := [id | uuid | path] <ID> <setting name>.<property name> "
-"[<value>]\n"
+"ARGUMENTS := [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
"\n"
-"鉦詮鉦芹盒鈳鉦鉦 鉦芹鉦啤鉦徇鉦耜窒鉦兒眷鈳鉦耜窒 鉦鉦鉦舟 鉦鈳鉦鉦菽疏鈳鉦兒 鉦桌移鉦啤鉦芹瓷鉦賴硫鉦.\n"
-"鉦芹鉦啤鉦徇鉦耜 鉦鉦兒鉦兒 鉦鉦舟盒 鉦嫩鉦詮盒鈳, UUID 鉦鉦丞眶 D-Bus 鉦桌移鉦啤鉦鉦舟窒鉦鉦 鉦鈳鉦啤鉦戈窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
+"鉦詮鉦芹盒鈳鉦 鉦芹鉦啤鉦徇鉦耜鉦 鉦鉦鉦舟 鉦鉦丞眶 鉦嫩鉦鈳鉦鉦賴疏 鉦鈳鉦鉦鉦喪疏鈳鉦兒 鉦桌移鉦啤鉦芹瓷鉦賴硫鉦. 鉦芹鉦啤鉦徇鉦耜 鉦鉦兒鉦兒\n"
+"鉦鉦舟盒 鉦嫩鉦詮盒鉦賴疏, UUID 鉦鉦丞眶 D-Bus 鉦桌移鉦啤鉦鉦 鉦鉦抉移鉦啤畢鉦耜鉦耜窒 鉦鈳鉦啤鉦戈窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳. 鉦眇硃鈳-鉦桌鉦耜鉦能畢\n"
+"鉦鈳鉦鉦鉦喪窒鉦鉦擒鉦 鉦兒鉦菽 鉦鉦鈳鉦鉦賴鉦菽移鉦鉦 鉦鈳鉦鉦 鉦嫩鉦詮盒鉦賴鈳 '+' 鉦鉦丞眶 '-' 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮 鉦鉦兒鉦兒 "
+"鉦眇眾鉦詮痊鉦嫩鉦舟.\n"
+"'+' 鉦鉦賴硃鈳鉦兒鉦能 鉦詮鉦芹鉦啤鉦 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦戈窒鉦舟鉦舟窒鉦眇盒鈳鉦能鉦 鉦眇畢鉦耜窒鉦鈳 鉦鉦鉦嗣鉦喪疏鈳鉦兒 鉦詮鉦啤窒鉦詮眷鈳 鉦鉦菽鉦擒眸 "
+"鉦兒鉦﹤鉦戈鉦戈畢鈳.\n"
+"'-' 鉦鉦賴硃鈳鉦兒鉦能 鉦詮鉦芹鉦啤鉦 鉦桌鉦耜鉦能畢 鉦眇畢鉦耜窒鉦鈳 鉦鉦能鉦鈳 鉦桌移鉦﹤窒鉦 鉦鉦鉦嗣鉦喪疏鈳鉦兒 鉦戈鉦鈳鉦能眷鈳 鉦鉦菽鉦擒眸 "
+"鉦兒鉦﹤鉦戈鉦戈畢鈳.\n"
+"\n"
+"鉦鉦舟移鉦嫩盒鉦鈳鉦鈳:\n"
+"nmcli con mod home-wifi wifi.ssid rakosnicek\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
+"nmcli con mod em1-1 -ipv4.dns 1\n"
+"nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
+"nmcli con mod bond0 +bond.options mii=500\n"
+"nmcli con mod bond0 -bond.options downdelay\n"
"\n"
-#: ../cli/src/connections.c:420
+#: ../clients/cli/connections.c:430
#, c-format
msgid ""
"Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -954,7 +1253,7 @@ msgstr ""
"鉦鉦鉦舟 鉦詮鉦菽移鉦舟移鉦戈鉦桌 鉦詮鉦芹移鉦舟鉦舟眷鈳鉦耜窒 鉦鉦鉦舟 鉦嫩鉦 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鉦啤窒鉦詮窒.\n"
"\n"
-#: ../cli/src/connections.c:436
+#: ../clients/cli/connections.c:446
#, c-format
msgid ""
"Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -973,7 +1272,7 @@ msgstr ""
"鉦芹鉦啤鉦徇鉦耜 鉦鉦兒鉦兒 鉦鉦舟盒 鉦嫩鉦詮盒鈳, UUID 鉦鉦丞眶 D-Bus 鉦桌移鉦啤鉦鉦舟窒鉦鉦 鉦鈳鉦啤鉦戈窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳\n"
"\n"
-#: ../cli/src/connections.c:448
+#: ../clients/cli/connections.c:458
#, c-format
msgid ""
"Usage: nmcli connection reload { help }\n"
@@ -986,7 +1285,7 @@ msgstr ""
"鉦﹤窒鉦詮鉦鉦賴疏鉦賴鉦 鉦鉦耜鉦耜移 鉦詮鉦芹盒鈳鉦 鉦鉦﹤略鉦鉦喪疏鈳鉦兒 鉦桌盒鉦喪窒 鉦耜鉦﹤ 鉦桌移鉦﹤.\n"
"\n"
-#: ../cli/src/connections.c:457
+#: ../clients/cli/connections.c:467
#, c-format
msgid ""
"Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1006,926 +1305,957 @@ msgstr ""
"鉦﹤窒鉦詮鉦鉦賴疏鉦賴鉦 鉦鉦鉦舟 鉦鉦丞眶 鉦嫩鉦鈳鉦鉦賴疏 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦耜鉦﹤/鉦桌盒鈳鉦耜鉦﹤ 鉦桌移鉦﹤. NetworkManager 鉦鈳 "
"鉦鉦舟盒\n"
"鉦鉦戈鉦戈鉦鉦賴疏 鉦詮鉦丞窒鉦戈窒鉦 鉦鉦啤窒鉦菽窒鉦舟 鉦鉦兒鉦兒鉦菽鉦舟疏鈳鉦兒 鉦鉦鉦賴略鉦芹瓷鉦賴硫鉦賴鈳鉦喪鉦喪眷鈳 鉦鉦鉦舟 鉦詮鉦芹盒鈳鉦 鉦鉦﹤略鉦菽疏鈳鉦兒 "
-"鉦鈳鉦能移鉦啤 鉦詮鉦芹移鉦舟窒鉦詮窒鉦 鉦兒鉦戈盒 鉦鉦舟疏鈳鉦兒 \n"
+"鉦鈳鉦能移鉦啤 "
+"鉦詮鉦芹移鉦舟窒鉦詮窒鉦 鉦兒鉦戈盒 鉦鉦舟疏鈳鉦兒 \n"
"鉦眇眾鉦詮窒.\n"
"\n"
-#: ../cli/src/connections.c:515
-#, c-format
-msgid "Error: 'list configured': %s"
-msgstr "鉦舟鉦: 'list configured': %s"
-
-#: ../cli/src/connections.c:523
-msgid "Connection details"
-msgstr "鉦詮鉦芹盒鈳鉦鉦 鉦菽窒鉦菽盒鉦鉦喪"
-
-#: ../cli/src/connections.c:589
-msgid "never"
-msgstr "鉦鉦鉦舟窒鉦鈳 鉦眇鉦"
-
-#: ../cli/src/connections.c:590 ../cli/src/connections.c:591
-#: ../cli/src/connections.c:833 ../cli/src/connections.c:834
-#: ../cli/src/connections.c:836 ../cli/src/connections.c:6112
-#: ../cli/src/devices.c:604 ../cli/src/devices.c:654 ../cli/src/devices.c:796
-#: ../cli/src/devices.c:797 ../cli/src/devices.c:798 ../cli/src/devices.c:831
-#: ../cli/src/devices.c:860 ../cli/src/devices.c:861 ../cli/src/devices.c:862
-#: ../cli/src/devices.c:863 ../cli/src/devices.c:864 ../cli/src/devices.c:865
-#: ../cli/src/devices.c:866 ../cli/src/network-manager.c:442
-msgid "yes"
-msgstr "鉦嫩鉦舟"
-
-#: ../cli/src/connections.c:590 ../cli/src/connections.c:591
-#: ../cli/src/connections.c:833 ../cli/src/connections.c:834
-#: ../cli/src/connections.c:836 ../cli/src/connections.c:6112
-#: ../cli/src/devices.c:604 ../cli/src/devices.c:654 ../cli/src/devices.c:796
-#: ../cli/src/devices.c:797 ../cli/src/devices.c:798 ../cli/src/devices.c:831
-#: ../cli/src/devices.c:860 ../cli/src/devices.c:861 ../cli/src/devices.c:862
-#: ../cli/src/devices.c:863 ../cli/src/devices.c:864 ../cli/src/devices.c:865
-#: ../cli/src/devices.c:866 ../cli/src/network-manager.c:444
-msgid "no"
-msgstr "鉦鉦耜鉦"
-
-#: ../cli/src/connections.c:667
-msgid "List of configured connections"
-msgstr "鉦詮鉦啤鉦賴略鉦鈳鉦鉦 鉦詮鉦芹盒鈳鉦鉦鉦 鉦芹鈳鉦鉦"
-
-#: ../cli/src/connections.c:684 ../cli/src/connections.c:1225
-#: ../cli/src/connections.c:1785 ../cli/src/connections.c:1801
-#: ../cli/src/connections.c:1810 ../cli/src/connections.c:1820
-#: ../cli/src/connections.c:1916 ../cli/src/connections.c:7563
-#: ../cli/src/connections.c:7738 ../cli/src/devices.c:1633
-#: ../cli/src/devices.c:1641 ../cli/src/devices.c:2028
-#: ../cli/src/devices.c:2035 ../cli/src/devices.c:2049
-#: ../cli/src/devices.c:2056 ../cli/src/devices.c:2073
-#: ../cli/src/devices.c:2081 ../cli/src/devices.c:2277
-#: ../cli/src/devices.c:2373 ../cli/src/devices.c:2380
-#, c-format
-msgid "Error: %s argument is missing."
-msgstr "鉦舟鉦: %s 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦"
-
-#: ../cli/src/connections.c:698
-#, c-format
-msgid "Error: %s - no such connection."
-msgstr "鉦舟鉦: %s - 鉦鉦鉦戈硃 鉦能移鉦菽鉦舟 鉦詮鉦芹盒鈳鉦鉦鉦喪窒鉦耜鉦."
-
-#: ../cli/src/connections.c:710
-#, c-format
-msgid "Error: 'show configured': %s"
-msgstr "鉦舟鉦: 'show configured': %s"
-
-#: ../cli/src/connections.c:715 ../cli/src/connections.c:1853
-#: ../cli/src/connections.c:7804 ../cli/src/connections.c:7845
-#: ../cli/src/connections.c:7997 ../cli/src/devices.c:2256
-#: ../cli/src/devices.c:2630 ../cli/src/network-manager.c:539
-#: ../cli/src/network-manager.c:582 ../cli/src/network-manager.c:599
-#: ../cli/src/network-manager.c:645 ../cli/src/network-manager.c:659
-#: ../cli/src/network-manager.c:776 ../cli/src/network-manager.c:820
-#: ../cli/src/network-manager.c:840
-#, c-format
-msgid "Error: %s."
-msgstr "鉦舟鉦: %s."
-
-#: ../cli/src/connections.c:728
+#: ../clients/cli/connections.c:538
msgid "activating"
msgstr "鉦詮鈳鉦啤窒鉦能鈳鉦喪鉦喪鉦戈鉦戈窒鉦舟"
-#: ../cli/src/connections.c:730
+#: ../clients/cli/connections.c:540
msgid "activated"
msgstr "鉦詮鈳鉦啤窒鉦能鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/connections.c:734
+#: ../clients/cli/connections.c:544
msgid "deactivated"
msgstr "鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/connections.c:746
+#: ../clients/cli/connections.c:556
msgid "VPN connecting (prepare)"
msgstr "VPN 鉦詮鉦芹盒鈳鉦 鉦鉦耜鉦芹窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟 (鉦詮窒鉦舟鉦抉鈳鉦喪窒鉦鈳)"
-#: ../cli/src/connections.c:748
+#: ../clients/cli/connections.c:558
msgid "VPN connecting (need authentication)"
msgstr "VPN 鉦詮鉦芹盒鈳鉦 鉦鉦耜鉦芹窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟 (鉦舟鉦R鉦鉦啤產鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳)"
-#: ../cli/src/connections.c:750
+#: ../clients/cli/connections.c:560
msgid "VPN connecting"
msgstr "VPN 鉦詮鉦芹盒鈳鉦鉦賴略鉦鈳鉦喪鉦喪鉦戈鉦戈窒鉦舟"
-#: ../cli/src/connections.c:752
+#: ../clients/cli/connections.c:562
msgid "VPN connecting (getting IP configuration)"
msgstr "VPN 鉦詮鉦芹盒鈳鉦鉦鈳鉦鉦﹤窒鉦舟 (IP 鉦詮鉦啤鉦兒鉦能疏鈳鉦兒 鉦芹瓷鈳鉦能眷鉦擒鈳鉦戈鉦戈窒鉦舟)"
-#: ../cli/src/connections.c:754
+#: ../clients/cli/connections.c:564
msgid "VPN connected"
msgstr "VPN 鉦詮鉦芹盒鈳鉦鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/connections.c:756
+#: ../clients/cli/connections.c:566
msgid "VPN connection failed"
msgstr "VPN 鉦詮鉦芹盒鈳鉦鉦菽 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/connections.c:758
+#: ../clients/cli/connections.c:568
msgid "VPN disconnected"
msgstr "VPN 鉦詮鉦芹盒鈳鉦 鉦鉦﹤窒鉦舟窒鉦舟"
-#: ../cli/src/connections.c:829 ../cli/src/connections.c:839
-#: ../cli/src/devices.c:594
+#: ../clients/cli/connections.c:651
+#| msgid "Connection details"
+msgid "Connection profile details"
+msgstr "鉦詮鉦芹盒鈳鉦 鉦芹鉦啤鉦徇鉦耜鉦 鉦菽窒鉦菽盒鉦鉦喪"
+
+#: ../clients/cli/connections.c:663 ../clients/cli/connections.c:1015
+#, c-format
+#| msgid "Error: 'device show': %s"
+msgid "Error: 'connection show': %s"
+msgstr "鉦舟鉦: 'connection show': %s"
+
+#: ../clients/cli/connections.c:807
+msgid "never"
+msgstr "鉦鉦鉦舟窒鉦鈳 鉦眇鉦"
+
+#. "CAPABILITIES"
+#: ../clients/cli/connections.c:808 ../clients/cli/connections.c:809
+#: ../clients/cli/connections.c:811 ../clients/cli/connections.c:870
+#: ../clients/cli/connections.c:871 ../clients/cli/connections.c:873
+#: ../clients/cli/connections.c:2786 ../clients/cli/connections.c:6472
+#: ../clients/cli/connections.c:6473 ../clients/cli/devices.c:591
+#: ../clients/cli/devices.c:641 ../clients/cli/devices.c:784
+#: ../clients/cli/devices.c:785 ../clients/cli/devices.c:786
+#: ../clients/cli/devices.c:787 ../clients/cli/devices.c:820
+#: ../clients/cli/devices.c:822 ../clients/cli/devices.c:850
+#: ../clients/cli/devices.c:851 ../clients/cli/devices.c:852
+#: ../clients/cli/devices.c:853 ../clients/cli/devices.c:854
+#: ../clients/cli/devices.c:855 ../clients/cli/devices.c:856
+#: ../clients/cli/network-manager.c:440
+msgid "yes"
+msgstr "鉦嫩鉦舟"
+
+#: ../clients/cli/connections.c:808 ../clients/cli/connections.c:809
+#: ../clients/cli/connections.c:811 ../clients/cli/connections.c:870
+#: ../clients/cli/connections.c:871 ../clients/cli/connections.c:873
+#: ../clients/cli/connections.c:2787 ../clients/cli/connections.c:6472
+#: ../clients/cli/connections.c:6473 ../clients/cli/devices.c:591
+#: ../clients/cli/devices.c:641 ../clients/cli/devices.c:784
+#: ../clients/cli/devices.c:785 ../clients/cli/devices.c:786
+#: ../clients/cli/devices.c:787 ../clients/cli/devices.c:820
+#: ../clients/cli/devices.c:822 ../clients/cli/devices.c:850
+#: ../clients/cli/devices.c:851 ../clients/cli/devices.c:852
+#: ../clients/cli/devices.c:853 ../clients/cli/devices.c:854
+#: ../clients/cli/devices.c:855 ../clients/cli/devices.c:856
+#: ../clients/cli/network-manager.c:442
+msgid "no"
+msgstr "鉦鉦耜鉦"
+
+#: ../clients/cli/connections.c:866 ../clients/cli/connections.c:876
+#: ../clients/cli/devices.c:581
msgid "N/A"
msgstr "鉦耜痍鈳鉦能眶鉦賴眷鈳鉦"
-#: ../cli/src/connections.c:1012
+#: ../clients/cli/connections.c:1003
+#| msgid "Active connection details"
+msgid "Activate connection details"
+msgstr "鉦詮鉦芹盒鈳鉦鉦鉦 鉦菽窒鉦菽盒鉦鉦喪疏鈳鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮"
+
+#: ../clients/cli/connections.c:1236
#, c-format
-msgid "Error: 'list active': %s"
-msgstr "鉦舟鉦: ''list active': %s"
+#| msgid "invalid field '%s'; allowed fields: %s"
+msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
+msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦丞眾 '%s'; 鉦鉦兒鉦桌略鉦 鉦鉦啤鉦 鉦詮鉦丞眾鉦鉦喪: %s 鉦桌略鈳鉦戈 %s, 鉦鉦丞眶 %s,%s"
-#: ../cli/src/connections.c:1020
-msgid "Active connection details"
-msgstr "鉦詮鈳鉦啤窒鉦 鉦詮鉦芹盒鈳鉦鉦鉦 鉦菽窒鉦菽盒鉦鉦喪"
+#: ../clients/cli/connections.c:1251 ../clients/cli/connections.c:1259
+#, c-format
+#| msgid "field '%s' has to be alone"
+msgid "'%s' has to be alone"
+msgstr "'%s' 鉦鉦鉦眇鉦舟 鉦鉦鉦鉦賴盔鉦擒鉦賴盔鈳 鉦鉦啤痊鈳鉦鈳"
-#: ../cli/src/connections.c:1177 ../cli/src/connections.c:1840
-#: ../cli/src/connections.c:1899 ../cli/src/connections.c:7592
-#: ../cli/src/connections.c:7707 ../cli/src/connections.c:7798
-#: ../cli/src/connections.c:7826 ../cli/src/devices.c:1197
-#: ../cli/src/devices.c:1245 ../cli/src/devices.c:1403
-#: ../cli/src/devices.c:1538 ../cli/src/devices.c:1675
-#: ../cli/src/devices.c:2115 ../cli/src/devices.c:2414
-#: ../cli/src/network-manager.c:484
+#: ../clients/cli/connections.c:1290 ../clients/cli/connections.c:2004
+#: ../clients/cli/connections.c:2064 ../clients/cli/connections.c:7973
+#: ../clients/cli/connections.c:8181 ../clients/cli/connections.c:8274
+#: ../clients/cli/connections.c:8302 ../clients/cli/devices.c:1186
+#: ../clients/cli/devices.c:1234 ../clients/cli/devices.c:1397
+#: ../clients/cli/devices.c:1531 ../clients/cli/devices.c:1625
+#: ../clients/cli/devices.c:1767 ../clients/cli/devices.c:2225
+#: ../clients/cli/devices.c:2524 ../clients/cli/network-manager.c:482
#, c-format
msgid "Error: NetworkManager is not running."
msgstr "鉦舟鉦: NetworkManager 鉦鉦擒眷鉦兒鉦能眷鈳鉦耜窒鉦耜鉦."
-#: ../cli/src/connections.c:1203
-msgid "List of active connections"
-msgstr "鉦詮鈳鉦啤窒鉦 鉦詮鉦芹盒鈳鉦鉦鉦 鉦芹鈳鉦鉦"
+#. Add headers
+#: ../clients/cli/connections.c:1320
+#| msgid "NetworkManager status"
+msgid "NetworkManager active profiles"
+msgstr "NetworkManager 鉦詮鈳鉦啤窒鉦 鉦芹鉦啤鉦徇鉦耜鉦鉦喪"
+
+#: ../clients/cli/connections.c:1321
+#| msgid "NetworkManager went to sleep"
+msgid "NetworkManager connection profiles"
+msgstr "NetworkManager 鉦詮鉦芹盒鈳鉦 鉦芹鉦啤鉦徇鉦耜鉦鉦喪"
+
+#: ../clients/cli/connections.c:1358 ../clients/cli/connections.c:1949
+#: ../clients/cli/connections.c:1965 ../clients/cli/connections.c:1974
+#: ../clients/cli/connections.c:1984 ../clients/cli/connections.c:2081
+#: ../clients/cli/connections.c:7989 ../clients/cli/connections.c:8212
+#: ../clients/cli/devices.c:1725 ../clients/cli/devices.c:1733
+#: ../clients/cli/devices.c:2138 ../clients/cli/devices.c:2145
+#: ../clients/cli/devices.c:2159 ../clients/cli/devices.c:2166
+#: ../clients/cli/devices.c:2183 ../clients/cli/devices.c:2191
+#: ../clients/cli/devices.c:2387 ../clients/cli/devices.c:2483
+#: ../clients/cli/devices.c:2490
+#, c-format
+msgid "Error: %s argument is missing."
+msgstr "鉦舟鉦: %s 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦"
-#: ../cli/src/connections.c:1239 ../cli/src/connections.c:1926
+#: ../clients/cli/connections.c:1409
#, c-format
-msgid "Error: '%s' is not an active connection."
-msgstr "鉦舟鉦: '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦能移鉦菽鉦舟 鉦詮鈳鉦啤窒鉦 鉦詮鉦芹盒鈳鉦鉦菽眷鈳鉦."
+#| msgid "Error: %s - no such connection."
+msgid "Error: %s - no such connection profile."
+msgstr "鉦舟鉦: %s - 鉦鉦鉦戈硃 鉦能移鉦菽鉦舟 鉦詮鉦芹盒鈳鉦 鉦芹鉦啤鉦徇鉦耜鉦鉦喪窒鉦耜鉦."
-#: ../cli/src/connections.c:1251
+#: ../clients/cli/connections.c:1425 ../clients/cli/connections.c:2017
+#: ../clients/cli/connections.c:8280 ../clients/cli/connections.c:8321
+#: ../clients/cli/connections.c:8513 ../clients/cli/devices.c:2366
+#: ../clients/cli/devices.c:2829 ../clients/cli/network-manager.c:537
+#: ../clients/cli/network-manager.c:580 ../clients/cli/network-manager.c:597
+#: ../clients/cli/network-manager.c:644 ../clients/cli/network-manager.c:658
+#: ../clients/cli/network-manager.c:775 ../clients/cli/network-manager.c:819
+#: ../clients/cli/network-manager.c:839
#, c-format
-msgid "Error: 'show active': %s"
-msgstr "鉦舟鉦: 'show active': %s"
+msgid "Error: %s."
+msgstr "鉦舟鉦: %s."
-#: ../cli/src/connections.c:1344
+#: ../clients/cli/connections.c:1520
#, c-format
msgid "no active connection on device '%s'"
msgstr "'%s' 鉦鉦鉦 鉦詮移鉦抉疏鉦舟眷鈳鉦耜窒 鉦能移鉦菽鉦舟 鉦詮鈳鉦啤窒鉦 鉦詮鉦芹盒鈳鉦鉦菽 鉦鉦鉦﹤鉦眇鉦舟窒鉦耜鉦"
-#: ../cli/src/connections.c:1352
+#: ../clients/cli/connections.c:1528
msgid "no active connection or device"
msgstr "鉦能移鉦菽鉦舟 鉦詮鈳鉦啤窒鉦 鉦詮鉦芹盒鈳鉦 鉦鉦丞眶 鉦詮移鉦抉疏鉦菽 鉦鉦鉦﹤鉦眇鉦舟窒鉦耜鉦"
-#: ../cli/src/connections.c:1423
+#: ../clients/cli/connections.c:1599
#, c-format
msgid "device '%s' not compatible with connection '%s'"
msgstr "'%s' 鉦鉦鉦 鉦詮移鉦抉疏鉦菽 '%s' 鉦詮鉦芹盒鈳鉦鉦舟鉦鉦舟窒鉦鈳 鉦嫩鉦鉦舟窒鉦鈳鉦喪鉦喪鉦戈鉦戈窒鉦耜鉦"
-#: ../cli/src/connections.c:1426
+#: ../clients/cli/connections.c:1602
#, c-format
msgid "no device found for connection '%s'"
msgstr "'%s' 鉦詮鉦芹盒鈳鉦鉦鈳鉦鉦擒鉦 鉦能移鉦菽鉦舟 鉦詮移鉦抉疏鉦菽 鉦鉦鉦﹤ 鉦眇鉦舟窒鉦耜鉦"
-#: ../cli/src/connections.c:1438
+#: ../clients/cli/connections.c:1614
msgid "unknown reason"
msgstr "鉦鈳鉦戈鉦戈窒鉦啤畢 鉦鉦擒盒鉦"
-#: ../cli/src/connections.c:1440 ../cli/src/network-manager.c:288
+#: ../clients/cli/connections.c:1616 ../clients/cli/network-manager.c:286
msgid "none"
msgstr "鉦能移鉦菽鉦舟 鉦鉦耜鉦"
-#: ../cli/src/connections.c:1442
+#: ../clients/cli/connections.c:1618
msgid "the user was disconnected"
msgstr "鉦眇眾鉦鈳鉦舟移鉦啤盒鈳鉦鉦舟窒鉦鈳 鉦詮鉦芹盒鈳鉦 鉦鉦﹤窒鉦舟鉦嫩鉦鉦賴畢鈳"
-#: ../cli/src/connections.c:1444
+#: ../clients/cli/connections.c:1620
msgid "the base network connection was interrupted"
msgstr "鉦桌鉦 鉦鉦擒眷鉦眇鉦 鉦詮鉦芹盒鈳鉦鉦鈳鉦鈳 鉦戈瓷鈳鉦能鉦鉦鉦擒鉦賴畢鈳"
-#: ../cli/src/connections.c:1446
+#: ../clients/cli/connections.c:1622
msgid "the VPN service stopped unexpectedly"
msgstr "VPN 鉦詮鉦菽鉦能疏鈳鉦兒 鉦鉦兒窒鉦啤鉦鈳鉦獅窒鉦戈眶鉦擒鉦 鉦兒窒鉦耜鉦耜窒鉦詮眷鉦擒鉦賴畢鈳"
-#: ../cli/src/connections.c:1448
+#: ../clients/cli/connections.c:1624
msgid "the VPN service returned invalid configuration"
msgstr "VPN 鉦詮鉦菽鉦能 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦啤鉦兒鉦能疏鈳鉦兒 鉦桌盒鉦喪窒鉦詮窒鉦舟"
-#: ../cli/src/connections.c:1450
+#: ../clients/cli/connections.c:1626
msgid "the connection attempt timed out"
msgstr "鉦詮鉦芹盒鈳鉦鉦 鉦芹鉦啤盔鉦戈鉦兒畢 鉦鉦擒眷鉦擒眶鉦抉窒 鉦桌鉦啤窒鉦舟"
-#: ../cli/src/connections.c:1452
+#: ../clients/cli/connections.c:1628
msgid "the VPN service did not start in time"
msgstr "VPN 鉦詮鉦菽鉦能 鉦詮盒鉦賴盔鉦擒畢 鉦詮皎鉦能畢鉦耜鉦耜窒 鉦鉦啤鉦冢鈳鉦喪鉦喪眷鉦賴眷鈳鉦"
-#: ../cli/src/connections.c:1454
+#: ../clients/cli/connections.c:1630
msgid "the VPN service failed to start"
msgstr "VPN 鉦詮鉦菽鉦能 鉦鉦啤鉦冢鈳鉦喪鉦喪眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/connections.c:1456
+#: ../clients/cli/connections.c:1632
msgid "no valid VPN secrets"
msgstr "鉦能移鉦菽鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 VPN 鉦啤硃鉦詮鉦能鉦喪窒鉦耜鉦 (鉦詮鉦鈳鉦啤鉦鈳鉦鉦喪窒鉦耜鉦)"
-#: ../cli/src/connections.c:1458
+#: ../clients/cli/connections.c:1634
msgid "invalid VPN secrets"
msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 VPN 鉦啤硃鉦詮鉦能鉦喪"
-#: ../cli/src/connections.c:1460
+#: ../clients/cli/connections.c:1636
msgid "the connection was removed"
msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦戈鉦鈳鉦舟 鉦嫩移鉦鉦耜移鉦鉦賴畢鈳"
-#: ../cli/src/connections.c:1477 ../cli/src/connections.c:1633
-#: ../cli/src/connections.c:6016
+#: ../clients/cli/connections.c:1658 ../clients/cli/connections.c:1686
+#: ../clients/cli/connections.c:1831 ../clients/cli/connections.c:6368
#, c-format
msgid "Connection successfully activated (D-Bus active path: %s)\n"
msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦能眸鉦詮鉦菽窒鉦能移鉦鉦 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮眷鉦擒鉦賴畢鈳 (D-鉦眇硫鈳 鉦詮鈳鉦啤窒鉦 鉦桌移鉦啤鉦: %s)\n"
-#: ../cli/src/connections.c:1482
+#: ../clients/cli/connections.c:1665
+#, c-format
+#| msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgid ""
+"Connection successfully activated (master waiting for slaves) (D-Bus active "
+"path: %s)\n"
+msgstr ""
+"鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦能眸鉦詮鉦菽窒鉦能移鉦鉦 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮眷鉦擒鉦賴畢鈳 (鉦詮鉦耜鉦菽鉦鉦擒鉦 鉦桌移鉦詮鉦鉦啤 鉦鉦擒盔鈳鉦戈鉦戈窒鉦舟) "
+"(D-鉦眇硫鈳 鉦詮鈳鉦啤窒鉦 鉦桌移鉦啤鉦: %s)\n"
+
+#: ../clients/cli/connections.c:1669 ../clients/cli/connections.c:1691
#, c-format
msgid "Error: Connection activation failed."
msgstr "鉦舟鉦: 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦鈳鉦能 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟."
-#: ../cli/src/connections.c:1507
+#: ../clients/cli/connections.c:1734
#, c-format
msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
msgstr ""
"VPN 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦能眸鉦詮鉦菽窒鉦能移鉦鉦 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮眷鉦擒鉦賴畢鈳 (D-鉦眇硫鈳 鉦詮鈳鉦啤窒鉦 鉦桌移鉦啤鉦: %s)\n"
-#: ../cli/src/connections.c:1514
+#: ../clients/cli/connections.c:1741
#, c-format
msgid "Error: Connection activation failed: %s."
msgstr "鉦舟鉦: 鉦詮鉦芹盒鈳鉦 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦鈳鉦能 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s."
-#: ../cli/src/connections.c:1532 ../cli/src/devices.c:1294
+#: ../clients/cli/connections.c:1759 ../clients/cli/devices.c:1283
#, c-format
msgid "Error: Timeout %d sec expired."
msgstr "鉦舟鉦: 鉦鉦擒眷鉦擒眶鉦抉窒 %d sec 鉦戈鉦啤窒鉦舟."
-#: ../cli/src/connections.c:1597
-#, c-format
-msgid ""
-"Error: Device '%s' is waiting for slaves before proceeding with activation."
-msgstr ""
-"鉦舟鉦: 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦鈳鉦能鉦鉦舟窒鉦鈳 鉦桌鉦鉦舟鉦菽盒鈳鉦能鉦 鉦桌鉦舟眷鈳 '%s' 鉦詮移鉦抉疏鉦菽 鉦鉦芹痕鈳鉦啤鈳鉦啤窒鉦能鉦鉦喪窒鉦鉦擒鉦 "
-"鉦鉦擒盔鈳鉦戈鉦戈窒鉦舟."
-
-#: ../cli/src/connections.c:1617
+#: ../clients/cli/connections.c:1815
#, c-format
msgid "Error: Connection activation failed: %s"
msgstr "鉦舟鉦: 鉦詮鉦芹盒鈳鉦 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦鈳鉦能 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s"
-#: ../cli/src/connections.c:1722 ../cli/src/connections.c:1854
+#: ../clients/cli/connections.c:1888 ../clients/cli/connections.c:2018
msgid "unknown error"
msgstr "鉦鈳鉦戈鉦戈窒鉦啤畢 鉦舟鉦"
-#: ../cli/src/connections.c:1730
+#: ../clients/cli/connections.c:1896
#, c-format
msgid "unknown device '%s'."
msgstr "鉦鈳鉦戈鉦戈窒鉦啤畢 鉦詮移鉦抉疏 '%s'."
-#: ../cli/src/connections.c:1735
+#: ../clients/cli/connections.c:1901
msgid "neither a valid connection nor device given"
msgstr "鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦芹盒鈳鉦鉦菽移鉦鉦賴眷鈳鉦 鉦鉦丞眶 鉦鉦舟鉦賴硫鉦耜移鉦 鉦詮移鉦抉疏鉦菽眷鈳鉦"
-#: ../cli/src/connections.c:1773 ../cli/src/connections.c:1884
-#: ../cli/src/connections.c:7714
-msgid "Connection (name, UUID, or path): "
-msgstr "鉦詮鉦芹盒鈳鉦 (鉦嫩鉦詮盒鈳, UUID, 鉦鉦丞眶 鉦桌移鉦啤鉦): "
-
-#: ../cli/src/connections.c:1829 ../cli/src/devices.c:1171
-#: ../cli/src/devices.c:1647 ../cli/src/devices.c:2092
-#: ../cli/src/devices.c:2386
+#: ../clients/cli/connections.c:1993 ../clients/cli/devices.c:1160
+#: ../clients/cli/devices.c:1739 ../clients/cli/devices.c:2202
+#: ../clients/cli/devices.c:2496
#, c-format
msgid "Unknown parameter: %s\n"
msgstr "鉦鈳鉦戈鉦戈窒鉦啤畢 鉦兒窒鉦能略鉦擒鉦鉦鉦喪: %s\n"
-#: ../cli/src/connections.c:1862
+#: ../clients/cli/connections.c:2026
msgid "preparing"
msgstr "鉦詮窒鉦舟鉦抉鈳鉦喪鉦喪鉦戈鉦戈窒鉦舟"
-#: ../cli/src/connections.c:1889 ../cli/src/connections.c:7719
-#: ../cli/src/connections.c:7832
+#: ../clients/cli/connections.c:2054 ../clients/cli/connections.c:8193
+#: ../clients/cli/connections.c:8308
#, c-format
msgid "Error: No connection specified."
msgstr "鉦舟鉦: 鉦能移鉦菽鉦舟 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鉦鉦賴硫鉦耜移鉦鉦賴眷鈳鉦."
-#: ../cli/src/connections.c:2237 ../cli/src/utils.c:490
+#: ../clients/cli/connections.c:2091
+#, c-format
+msgid "Error: '%s' is not an active connection."
+msgstr "鉦舟鉦: '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦能移鉦菽鉦舟 鉦詮鈳鉦啤窒鉦 鉦詮鉦芹盒鈳鉦鉦菽眷鈳鉦."
+
+#: ../clients/cli/connections.c:2392 ../clients/cli/utils.c:514
#, c-format
msgid "'%s' not among [%s]"
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 [%s] 鉦鉦鉦眇鉦舟盒鉦耜鉦耜窒鉦耜鉦 "
-#: ../cli/src/connections.c:2319
+#: ../clients/cli/connections.c:2471
#, c-format
msgid "Error: '%s': '%s' is not a valid %s MAC address."
msgstr "鉦舟鉦: '%s': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 %s MAC 鉦菽窒鉦喪移鉦詮眶鉦耜鉦."
-#: ../cli/src/connections.c:2320 ../tui/nm-editor-utils.c:173
-#: ../tui/nm-ui-utils.c:347
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:2472 ../clients/cli/connections.c:2902
+#: ../clients/tui/nm-editor-utils.c:164 ../libnm-core/nm-connection.c:1511
+#: ../libnm-glib/nm-device.c:1800
msgid "InfiniBand"
msgstr "InfiniBand"
-#: ../cli/src/connections.c:2320 ../tui/nm-editor-utils.c:156
-#: ../tui/nm-ui-utils.c:335
+#: ../clients/cli/connections.c:2472 ../clients/tui/nm-editor-utils.c:147
+#: ../libnm-glib/nm-device.c:1788
msgid "Ethernet"
msgstr "鉦鉦戈盒鈳鉦兒鉦鈳"
-#: ../cli/src/connections.c:2343
+#: ../clients/cli/connections.c:2492
#, c-format
msgid "Error: 'mtu': '%s' is not a valid MTU."
msgstr "鉦舟鉦: 'mtu: '%s' 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 MTU 鉦鉦耜鉦."
-#: ../cli/src/connections.c:2359
+#: ../clients/cli/connections.c:2508
#, c-format
msgid "Error: 'parent': '%s' is not a valid interface name."
msgstr "鉦舟鉦: 'parent': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦 鉦嫩鉦詮盒鉦耜鉦."
-#: ../cli/src/connections.c:2380
+#: ../clients/cli/connections.c:2529
#, c-format
msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
msgstr "鉦舟鉦: 'p-key': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 InfiniBand P_KEY 鉦鉦耜鉦."
-#: ../cli/src/connections.c:2396
+#: ../clients/cli/connections.c:2558
#, c-format
msgid ""
"Error: 'mode': '%s' is not a valid InfiniBand transport mode [datagram, "
"connected]."
msgstr ""
-"鉦舟鉦: 'mode: '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 InfiniBand 鉦菽盒鈳鉦鉦擒眶鉦鈳 鉦鈳鉦啤皎鉦菽眷鈳鉦 "
-"[鉦﹤鉦鉦擒鈳鉦啤移鉦桌, 鉦詮鉦芹盒鈳鉦鉦賴略鉦鈳鉦鉦﹤窒鉦舟]"
+"鉦舟鉦: 'mode: '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 InfiniBand 鉦菽盒鈳鉦鉦擒眶鉦鈳 鉦鈳鉦啤皎鉦菽眷鈳鉦 [鉦﹤鉦鉦擒鈳鉦啤移鉦桌, "
+"鉦詮鉦芹盒鈳鉦鉦賴略鉦鈳鉦鉦﹤窒鉦舟]"
-#: ../cli/src/connections.c:2412
+#: ../clients/cli/connections.c:2572
#, c-format
msgid "Error: 'flags': '%s' is not valid; use <0-7>."
msgstr "鉦舟鉦: 'flags': '%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦; <0-7> 鉦眇眾鉦詮窒."
-#: ../cli/src/connections.c:2434
+#: ../clients/cli/connections.c:2594
#, c-format
msgid "Error: '%s': '%s' is not valid; %s "
msgstr "鉦舟鉦: '%s': '%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦; %s"
-#: ../cli/src/connections.c:2541
+#: ../clients/cli/connections.c:2777
#, c-format
msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
msgstr "鉦舟鉦: '%s': '%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦; <%u-%u> 鉦眇眾鉦詮窒."
-#: ../cli/src/connections.c:2555
+#. Ask for optional arguments.
+#: ../clients/cli/connections.c:2833
+#, c-format
+#| msgid "There is 1 optional argument for '%s' connection type.\n"
+msgid "There is %d optional argument for '%s' connection type.\n"
+msgid_plural "There are %d optional arguments for '%s' connection type.\n"
+msgstr[0] "%d 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦舟 ('%s' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鉦擒鉦 ).\n"
+msgstr[1] "%d 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪 鉦鉦菽 ('%s' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鉦擒鉦 ).\n"
+
+#: ../clients/cli/connections.c:2836
+#, c-format
+#| msgid "Do you want to provide it? (yes/no) [yes] "
+msgid "Do you want to provide it? %s"
+msgid_plural "Do you want to provide them? %s"
+msgstr[0] "鉦兒鉦菽 鉦鉦舟疏鈳鉦兒 鉦鉦舟鉦賴硫鉦耜 鉦眇盔鉦詮鉦戈鉦戈鉦啤移? %s"
+msgstr[1] "鉦兒鉦菽 鉦鉦菽鉦鉦喪疏鈳鉦兒 鉦鉦舟鉦賴硫鉦耜 鉦眇盔鉦詮鉦戈鉦戈鉦啤移? %s"
+
+#: ../clients/cli/connections.c:2851
msgid "ethernet"
msgstr "鉦鉦戈盒鈳鉦兒鉦鈳"
-#: ../cli/src/connections.c:2555 ../tui/nm-editor-utils.c:164
-#: ../tui/nm-ui-utils.c:337
+#: ../clients/cli/connections.c:2851 ../clients/tui/nm-editor-utils.c:155
+#: ../libnm-glib/nm-device.c:1790
msgid "Wi-Fi"
msgstr "鉦菽-鉦徇"
-#: ../cli/src/connections.c:2558
-#, c-format
-msgid "There are 3 optional arguments for '%s' connection type.\n"
-msgstr "'%s' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 3 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
-
-#: ../cli/src/connections.c:2559 ../cli/src/connections.c:2613
-#: ../cli/src/connections.c:2735 ../cli/src/connections.c:2781
-#: ../cli/src/connections.c:2841 ../cli/src/connections.c:2909
-#: ../cli/src/connections.c:3072 ../cli/src/connections.c:3168
-#: ../cli/src/connections.c:3250
-msgid "Do you want to provide them? (yes/no) [yes] "
-msgstr "鉦兒鉦菽 鉦鉦舟疏鈳鉦兒 鉦鉦舟鉦賴硫鉦耜 鉦眇盔鉦詮鉦戈鉦戈鉦啤移? (鉦嫩鉦舟/鉦鉦耜鉦) [鉦嫩鉦舟]"
-
-#: ../cli/src/connections.c:2567 ../cli/src/connections.c:2621
-#: ../cli/src/connections.c:2748 ../cli/src/connections.c:2849
+#: ../clients/cli/connections.c:2859 ../clients/cli/connections.c:2907
+#: ../clients/cli/connections.c:3016 ../clients/cli/connections.c:3095
msgid "MTU [auto]: "
msgstr "MTU [鉦詮鉦菽盔鉦]: "
-#: ../cli/src/connections.c:2578 ../cli/src/connections.c:2632
-#: ../cli/src/connections.c:2711 ../cli/src/connections.c:2759
+#: ../clients/cli/connections.c:2870 ../clients/cli/connections.c:2918
+#: ../clients/cli/connections.c:2988 ../clients/cli/connections.c:3027
+#: ../clients/cli/connections.c:3382
msgid "MAC [none]: "
msgstr "MAC [鉦能移鉦菽鉦舟 鉦鉦耜鉦淫:"
-#: ../cli/src/connections.c:2589
+#: ../clients/cli/connections.c:2881
msgid "Cloned MAC [none]: "
msgstr "鉦戈畢鈳鉦啤鉦芹鉦鈳鉦喪窒鉦詮窒鉦 MAC [鉦能移鉦菽鉦舟 鉦鉦耜鉦淫:"
-#: ../cli/src/connections.c:2612
+#: ../clients/cli/connections.c:2929
#, c-format
-msgid "There are 5 optional arguments for 'InfiniBand' connection type.\n"
-msgstr "'InfiniBand' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 5 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
-
-#: ../cli/src/connections.c:2643
-msgid "Transport mode (datagram or connected) [datagram]: "
-msgstr "鉦菽盒鈳鉦鉦擒眶鉦鈳 鉦鈳鉦啤皎鉦菽眷鈳鉦 [鉦﹤鉦鉦擒鈳鉦啤移鉦桌, 鉦詮鉦芹盒鈳鉦鉦賴略鉦鈳鉦鉦﹤窒鉦舟] [datagram]:"
+#| msgid "Transport mode"
+msgid "Transport mode %s"
+msgstr "鉦菽盒鈳鉦鉦擒眶鉦鈳 鉦鈳鉦啤皎 %s"
-#: ../cli/src/connections.c:2656
+#: ../clients/cli/connections.c:2942
msgid "Parent interface [none]: "
msgstr "鉦桌鉦 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏 [鉦能移鉦菽鉦舟 鉦鉦耜鉦淫:"
-#: ../cli/src/connections.c:2667
+#: ../clients/cli/connections.c:2953
msgid "P_KEY [none]: "
msgstr "P_KEY [鉦能移鉦菽鉦舟 鉦鉦耜鉦淫: "
-#: ../cli/src/connections.c:2677
+#: ../clients/cli/connections.c:2963
#, c-format
msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
msgstr "鉦舟鉦: 'parent' 鉦鉦兒鉦兒 鉦詮鉦鉦賴硫鉦賴畢鉦擒 'p-key' 鉦鉦﹤鉦﹤移鉦能眶鉦擒鉦賴盒鈳鉦戈鉦戈畢鈳.\n"
-#: ../cli/src/connections.c:2702
-#, c-format
-msgid "There is 1 optional argument for 'WiMax' connection type.\n"
-msgstr "'WiMax' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鉦擒鉦 1 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦舟.\n"
-
-#: ../cli/src/connections.c:2703 ../cli/src/connections.c:2805
-#: ../cli/src/connections.c:3024 ../cli/src/connections.c:3226
-msgid "Do you want to provide it? (yes/no) [yes] "
-msgstr "鉦兒鉦菽 鉦鉦舟疏鈳鉦兒 鉦鉦舟鉦賴硫鉦耜 鉦眇盔鉦詮鉦戈鉦戈鉦啤移? (鉦嫩鉦舟/鉦鉦耜鉦) [鉦嫩鉦舟]"
+#. Ask for optional 'wimax' arguments.
+#: ../clients/cli/connections.c:2983 ../libnm-glib/nm-device.c:1796
+msgid "WiMAX"
+msgstr "WiMAX"
-#: ../cli/src/connections.c:2734
-#, c-format
-msgid "There are 4 optional arguments for 'PPPoE' connection type.\n"
-msgstr "'PPPoE' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 4 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
+#. Ask for optional 'pppoe' arguments.
+#: ../clients/cli/connections.c:3006
+msgid "PPPoE"
+msgstr "PPPoE"
-#: ../cli/src/connections.c:2742 ../cli/src/connections.c:2790
+#: ../clients/cli/connections.c:3010 ../clients/cli/connections.c:3048
msgid "Password [none]: "
msgstr "鉦鈳鉦芹鉦戈痕鉦 [鉦能移鉦菽鉦舟 鉦鉦耜鉦淫: "
-#: ../cli/src/connections.c:2744
+#: ../clients/cli/connections.c:3012
msgid "Service [none]: "
msgstr "鉦詮鉦菽 [鉦能移鉦菽鉦舟 鉦鉦耜鉦淫: "
-#: ../cli/src/connections.c:2780
-#, c-format
-msgid ""
-"There are 2 optional arguments for 'mobile broadband' connection type.\n"
-msgstr "'mobile broadband' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 2 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
+#. Ask for optional 'gsm' or 'cdma' arguments.
+#: ../clients/cli/connections.c:3042
+#| msgid "Mobile Broadband"
+msgid "mobile broadband"
+msgstr "鉦桌鉦眇鉦耜 鉦眇鉦啤移鉦﹤鉦眇鉦能移鉦鉦﹤"
-#: ../cli/src/connections.c:2788 ../cli/src/connections.c:3233
+#: ../clients/cli/connections.c:3046 ../clients/cli/connections.c:3454
msgid "Username [none]: "
msgstr "鉦眇眾鉦鈳鉦舟移鉦 鉦嫩鉦詮盒鈳 [鉦能移鉦菽鉦舟 鉦鉦耜鉦淫: "
-#: ../cli/src/connections.c:2804
-#, c-format
-msgid "There is 1 optional argument for 'bluetooth' connection type.\n"
-msgstr "'bluetooth' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鉦擒鉦 1 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦舟.\n"
+#. Ask for optional 'bluetooth' arguments.
+#: ../clients/cli/connections.c:3061
+#| msgid "Bluetooth"
+msgid "bluetooth"
+msgstr "鉦眇鉦耜鉦鈳鉦戈"
-#: ../cli/src/connections.c:2813
-msgid "Bluetooth type (panu, dun-gsm or dun-cdma) [panu]: "
-msgstr "鉦眇鉦耜鉦鈳鉦戈 鉦眇鈳 (panu, dun-gsm 鉦鉦 dun-cdma) [panu]: "
+#: ../clients/cli/connections.c:3068
+#, c-format
+#| msgid "Bluetooth"
+msgid "Bluetooth type %s"
+msgstr "鉦眇鉦耜鉦鈳鉦戈 鉦眇鈳 %s"
-#: ../cli/src/connections.c:2821
+#: ../clients/cli/connections.c:3074
#, c-format
msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
msgstr "鉦舟鉦: 'bt-type': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦眇鉦耜鉦鈳鉦戈 鉦眇鈳鉦能眷鈳鉦.\n"
-#: ../cli/src/connections.c:2840
-#, c-format
-msgid "There are 4 optional arguments for 'VLAN' connection type.\n"
-msgstr "'VLAN' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 4 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
+#. Ask for optional 'vlan' arguments.
+#. 11
+#: ../clients/cli/connections.c:3090 ../clients/cli/devices.c:219
+#: ../clients/tui/nm-editor-utils.c:218 ../clients/tui/nmt-page-vlan.c:51
+#: ../libnm-core/nm-connection.c:1509 ../libnm-glib/nm-device.c:1808
+#: ../libnm-util/nm-connection.c:1612
+msgid "VLAN"
+msgstr "VLAN"
-#: ../cli/src/connections.c:2860
+#: ../clients/cli/connections.c:3106
msgid "VLAN flags (<0-7>) [none]: "
msgstr "VLAN 鉦徇鉦耜移鉦鈳鉦鉦喪 (<0-7>) [鉦能移鉦菽鉦舟 鉦鉦耜鉦淫: "
-#: ../cli/src/connections.c:2871
+#: ../clients/cli/connections.c:3117
msgid "Ingress priority maps [none]: "
msgstr "鉦鉦鉦鈳鉦啤鉦詮 鉦鉦舟鉦能略鈳 鉦兒鈳鉦獅鉦鉦喪 [鉦能移鉦菽鉦舟 鉦鉦耜鉦淫: "
-#: ../cli/src/connections.c:2882
+#: ../clients/cli/connections.c:3128
msgid "Egress priority maps [none]: "
msgstr "鉦鉦鈳鉦啤鉦詮 鉦鉦舟鉦能略鈳 鉦兒鈳鉦獅鉦鉦喪 [鉦能移鉦菽鉦舟 鉦鉦耜鉦淫: "
-#: ../cli/src/connections.c:2908
-#, c-format
-msgid "There are optional arguments for 'bond' connection type.\n"
-msgstr "'bond' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 3 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
-
-#: ../cli/src/connections.c:2918
+#: ../clients/cli/connections.c:3139
msgid "Bonding mode [balance-rr]: "
msgstr "鉦眇移鉦鉦﹤窒鉦鉦鈳 鉦詮鉦丞窒鉦戈窒 [balance-rr]: "
-#: ../cli/src/connections.c:2934
+#. Ask for optional 'bond' arguments.
+#: ../clients/cli/connections.c:3154
+msgid "bond"
+msgstr "鉦眇移鉦鉦﹤"
+
+#: ../clients/cli/connections.c:3176
msgid "Bonding primary interface [none]: "
msgstr "鉦眇移鉦鉦﹤窒鉦鉦鈳 鉦芹鉦啤移鉦丞皎鉦賴 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏 [鉦能移鉦菽鉦舟 鉦鉦耜鉦淫:"
-#: ../cli/src/connections.c:2937
+#: ../clients/cli/connections.c:3179
#, c-format
msgid "Error: 'primary': '%s' is not a valid interface name.\n"
msgstr "鉦舟鉦: 'primary': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦 鉦嫩鉦詮盒鉦擒鉦賴眷鈳鉦.\n"
-#: ../cli/src/connections.c:2945
-msgid "Bonding monitoring mode (miimon or arp) [miimon]: "
-msgstr "鉦眇移鉦鉦﹤窒鉦鉦鈳 鉦桌鉦耜鉦菽窒鉦鉦擒盒鉦鉦 鉦詮鉦丞窒鉦戈窒 (miimon 鉦鉦丞眶 arp) [miimon]: "
+#: ../clients/cli/connections.c:3187
+#, c-format
+#| msgid "Link monitoring"
+msgid "Bonding monitoring mode %s"
+msgstr "鉦眇移鉦鉦﹤窒鉦鉦鈳 鉦桌鉦耜鉦菽窒鉦鉦擒盒鉦鈳 鉦鈳鉦啤皎 %s"
-#: ../cli/src/connections.c:2950
+#: ../clients/cli/connections.c:3193
#, c-format
msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
msgstr ""
"鉦舟鉦: '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦桌鉦耜鉦菽窒鉦鉦擒盒鉦鉦 鉦詮鉦丞窒鉦戈窒鉦能移鉦鉦賴眷鈳鉦; '%s' 鉦鉦丞眶 '%s' "
-"鉦鉦兒鉦兒 鉦眇眾鉦詮窒.\n"
+"鉦鉦兒鉦兒 "
+"鉦眇眾鉦詮窒.\n"
-#: ../cli/src/connections.c:2959
+#: ../clients/cli/connections.c:3202
msgid "Bonding miimon [100]: "
msgstr "鉦眇移鉦鉦﹤窒鉦鉦鈳 miimon [100]: "
-#: ../cli/src/connections.c:2962
+#: ../clients/cli/connections.c:3205
#, c-format
msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
msgstr "鉦舟鉦: 'miimon': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦鈳鉦能 <0-%u> 鉦鉦鉦賴眷鈳鉦.\n"
-#: ../cli/src/connections.c:2970
+#: ../clients/cli/connections.c:3213
msgid "Bonding downdelay [0]: "
msgstr "鉦眇移鉦鉦﹤窒鉦鉦鈳 鉦﹤鉦兒鉦﹤窒鉦耜 [0]: "
-#: ../cli/src/connections.c:2973
+#: ../clients/cli/connections.c:3216
#, c-format
msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
msgstr "鉦舟鉦: 'downdelay:' '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦鈳鉦能 <0-%u> 鉦鉦鉦賴眷鈳鉦.\n"
-#: ../cli/src/connections.c:2981
+#: ../clients/cli/connections.c:3224
msgid "Bonding updelay [0]: "
msgstr "鉦眇移鉦鉦﹤窒鉦鉦鈳 鉦鉦芹鉦﹤窒鉦耜 [0]: "
-#: ../cli/src/connections.c:2984
+#: ../clients/cli/connections.c:3227
#, c-format
msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
msgstr "鉦舟鉦: 'updelay': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦鈳鉦能 <0-%u> 鉦鉦鉦賴眷鈳鉦.\n"
-#: ../cli/src/connections.c:2993
+#: ../clients/cli/connections.c:3236
msgid "Bonding arp-interval [0]: "
msgstr "鉦眇移鉦鉦﹤窒鉦鉦鈳 arp-interval [0]: "
-#: ../cli/src/connections.c:2996
+#: ../clients/cli/connections.c:3239
#, c-format
msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
msgstr ""
"鉦舟鉦: 'arp-interval': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦鈳鉦能 <0-%u> 鉦鉦鉦賴眷鈳鉦.\n"
-#: ../cli/src/connections.c:3004
+#. FIXME: verify the string
+#: ../clients/cli/connections.c:3247
msgid "Bonding arp-ip-target [none]: "
msgstr "鉦眇移鉦鉦﹤窒鉦鉦鈳 arp-ip-target [鉦能移鉦菽鉦舟 鉦鉦耜鉦淫: "
-#: ../cli/src/connections.c:3023
-#, c-format
-msgid "There is 1 optional argument for '%s' connection type.\n"
-msgstr "'%s' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鉦擒鉦 1 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦舟.\n"
-
-#: ../cli/src/connections.c:3032
+#: ../clients/cli/connections.c:3267
msgid "Team JSON configuration [none]: "
msgstr "鉦鈳鉦桌 JSON 鉦詮鉦啤鉦兒 [鉦能移鉦菽鉦舟 鉦鉦耜鉦淫: "
-#: ../cli/src/connections.c:3051
+#: ../clients/cli/connections.c:3284
msgid "team"
msgstr "鉦鈳鉦桌"
-#: ../cli/src/connections.c:3057
+#: ../clients/cli/connections.c:3290
msgid "team-slave"
msgstr "鉦詮鉦菽-鉦詮鉦耜鉦菽"
-#: ../cli/src/connections.c:3071
-#, c-format
-msgid "There are 6 optional arguments for 'bridge' connection type.\n"
-msgstr "'bridge' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 6 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
+#. Ask for optional 'bridge' arguments.
+#: ../clients/cli/connections.c:3302
+#| msgid "Bridge"
+msgid "bridge"
+msgstr "鉦眇鉦啤窒鉦鈳"
-#: ../cli/src/connections.c:3081
-msgid "Enable STP (yes/no) [yes]: "
-msgstr "STP 鉦鉦兒鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮 (yes/no) [yes]: "
+#: ../clients/cli/connections.c:3308
+#, c-format
+#| msgid "Enable STP (yes/no) [yes]: "
+msgid "Enable STP %s"
+msgstr "%s STP 鉦鉦兒鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮"
-#: ../cli/src/connections.c:3085
+#: ../clients/cli/connections.c:3313
#, c-format
-msgid "Error: 'stp': '%s'.\n"
-msgstr "鉦舟鉦: 'stp': '%s'.\n"
+#| msgid "Error: 'stp': %s."
+msgid "Error: 'stp': %s.\n"
+msgstr "鉦舟鉦: 'stp': %s.\n"
-#: ../cli/src/connections.c:3093
-msgid "STP priority [128]: "
-msgstr "鉦鉦舟鉦能略鈳 鉦鉦舟鉦能略鈳 [128]: "
+#: ../clients/cli/connections.c:3321
+#| msgid "STP priority [128]: "
+msgid "STP priority [32768]: "
+msgstr "STP 鉦鉦舟鉦能略鈳 [32768]: "
-#: ../cli/src/connections.c:3097
+#: ../clients/cli/connections.c:3325
#, c-format
msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
msgstr "鉦舟鉦: 'priority': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦鈳鉦能 <0-%d> 鉦鉦鉦賴眷鈳鉦.\n"
-#: ../cli/src/connections.c:3105
+#: ../clients/cli/connections.c:3333
msgid "Forward delay [15]: "
msgstr "鉦徇移鉦啤鉦菽移鉦啤鉦﹤ 鉦菽窒鉦喪鉦 [15]: "
-#: ../cli/src/connections.c:3109
+#: ../clients/cli/connections.c:3337
#, c-format
msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
msgstr ""
"鉦舟鉦: 'forward-delay': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦鈳鉦能 <2-30> 鉦鉦鉦賴眷鈳鉦.\n"
-#: ../cli/src/connections.c:3118
+#: ../clients/cli/connections.c:3346
msgid "Hello time [2]: "
msgstr "鉦嫩鉦耜 鉦鈳鉦桌 [2]: "
-#: ../cli/src/connections.c:3122
+#: ../clients/cli/connections.c:3350
#, c-format
msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
msgstr ""
"鉦舟鉦: 'hello-time': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦鈳鉦能 <1-10> 鉦鉦鉦賴眷鈳鉦.\n"
-#: ../cli/src/connections.c:3130
+#: ../clients/cli/connections.c:3358
msgid "Max age [20]: "
msgstr "鉦鉦啤窒鉦獅鉦 鉦鉦擒眷鉦擒眶鉦抉窒 [20]: "
-#: ../cli/src/connections.c:3134
+#: ../clients/cli/connections.c:3362
#, c-format
msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
msgstr "鉦舟鉦: 'max-age': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦鈳鉦能 <6-40> 鉦鉦鉦賴眷鈳鉦.\n"
-#: ../cli/src/connections.c:3142
+#: ../clients/cli/connections.c:3370
msgid "MAC address ageing time [300]: "
msgstr "MAC 鉦菽窒鉦喪移鉦詮畢 鉦鉦擒眷鉦擒眶鉦抉窒 鉦戈鉦啤窒鉦鈳鉦 鉦詮皎鉦 [300]: "
-#: ../cli/src/connections.c:3146
+#: ../clients/cli/connections.c:3374
#, c-format
msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
msgstr ""
-"鉦舟鉦: 'ageing-time': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦鈳鉦能 <0-1000000> 鉦鉦鉦賴眷鈳鉦."
-"\n"
+"鉦舟鉦: 'ageing-time': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦鈳鉦能 <0-1000000> 鉦鉦鉦賴眷鈳鉦.\n"
-#: ../cli/src/connections.c:3167
-#, c-format
-msgid "There are 3 optional arguments for 'bridge-slave' connection type.\n"
-msgstr "'bridge-slave' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 3 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
+#. Ask for optional 'bridge-slave' arguments.
+#: ../clients/cli/connections.c:3401
+#| msgid "team-slave"
+msgid "bridge-slave"
+msgstr "鉦眇鉦啤窒鉦鈳-鉦詮鉦耜鉦菽"
-#: ../cli/src/connections.c:3176
+#: ../clients/cli/connections.c:3406
msgid "Bridge port priority [32]: "
msgstr "鉦眇鉦啤窒鉦鈳 鉦詮鉦芹盒鈳鉦鉦詮鉦丞移鉦兒畢 鉦鉦舟鉦能略鈳 [32]: "
-#: ../cli/src/connections.c:3189
+#: ../clients/cli/connections.c:3419
msgid "Bridge port STP path cost [100]: "
msgstr "鉦眇鉦啤窒鉦鈳 鉦詮鉦芹盒鈳鉦鉦詮鉦丞移鉦兒畢 STP 鉦桌移鉦啤鉦鉦 鉦眇鉦耜 [100]: "
-#: ../cli/src/connections.c:3203
-msgid "Hairpin (yes/no) [yes]: "
-msgstr "鉦嫩鉦啤鉦芹窒鉦兒 (yes/no) [yes]: "
-
-#: ../cli/src/connections.c:3207
+#: ../clients/cli/connections.c:3433
#, c-format
-msgid "Error: 'hairpin': '%s'.\n"
-msgstr "鉦舟鉦: 'hairpin': '%s'.\n"
+#| msgid "Hairpin mode"
+msgid "Hairpin %s"
+msgstr "鉦嫩鉦啤鉦芹窒鉦兒 %s"
-#: ../cli/src/connections.c:3225
+#: ../clients/cli/connections.c:3438
#, c-format
-msgid "There is 1 optional argument for 'VPN' connection type.\n"
-msgstr "'VPN' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鉦擒鉦 1 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦舟.\n"
+#| msgid "Error: 'hairpin': %s."
+msgid "Error: 'hairpin': %s.\n"
+msgstr "鉦舟鉦: 'hairpin': %s.\n"
-#: ../cli/src/connections.c:3249
-#, c-format
-msgid "There are 2 optional arguments for 'OLPC Mesh' connection type.\n"
-msgstr "'OLPC Mesh' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 2 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
+#. Ask for optional 'olpc' arguments.
+#: ../clients/cli/connections.c:3465 ../libnm-glib/nm-device.c:1794
+msgid "OLPC Mesh"
+msgstr "OLPC 鉦桌鉦嗣"
-#: ../cli/src/connections.c:3258
+#: ../clients/cli/connections.c:3470
msgid "OLPC Mesh channel [1]: "
msgstr "OLPC 鉦桌鉦嗣 鉦鉦擒疏鉦耜 [1]: "
-#: ../cli/src/connections.c:3261
+#: ../clients/cli/connections.c:3473
#, c-format
msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
msgstr "鉦舟鉦: 'channel': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦鈳鉦能 <1-13> 鉦鉦鉦賴眷鈳鉦.\n"
-#: ../cli/src/connections.c:3269
+#: ../clients/cli/connections.c:3481
msgid "DHCP anycast MAC address [none]: "
msgstr "DHCP 鉦鉦兒窒鉦鈳鉦能移鉦詮鉦鈳 MAC 鉦菽窒鉦喪移鉦 [鉦能移鉦菽鉦舟 鉦鉦耜鉦淫: "
-#: ../cli/src/connections.c:3317
+#: ../clients/cli/connections.c:3526
msgid "IPv4 address (IP[/plen] [gateway]) [none]: "
msgstr "IPv4 鉦菽窒鉦喪移鉦 (IP[/plen] [gateway]) [鉦能移鉦菽鉦舟 鉦鉦耜鉦淫: "
-#: ../cli/src/connections.c:3319
+#: ../clients/cli/connections.c:3528
msgid "IPv6 address (IP[/plen] [gateway]) [none]: "
msgstr "IPv6 鉦菽窒鉦喪移鉦 (IP[/plen] [gateway]) [鉦能移鉦菽鉦舟 鉦鉦耜鉦淫: "
-#: ../cli/src/connections.c:3337
+#: ../clients/cli/connections.c:3546
#, c-format
msgid " Address successfully added: %s %s\n"
msgstr " 鉦菽窒鉦喪移鉦詮眶鉦兒鉦兒 鉦能眸鉦詮鉦菽窒鉦能移鉦鉦 鉦詮鉦啤窒鉦詮眷鉦擒鉦賴畢鈳: %s %s\n"
-#: ../cli/src/connections.c:3339
+#: ../clients/cli/connections.c:3548
#, c-format
msgid " Warning: address already present: %s %s\n"
msgstr " 鉦鉦鈳鉦鉦啤窒鉦鈳: 鉦菽窒鉦喪移鉦詮眶鈳 鉦鉦鉦擒鉦耜 鉦鉦舟: %s %s\n"
-#: ../cli/src/connections.c:3341
+#: ../clients/cli/connections.c:3550
#, c-format
msgid " Warning: ignoring garbage at the end: '%s'\n"
msgstr " 鉦鉦鈳鉦鉦啤窒鉦鈳: 鉦鈳鉦兒鉦能眷鈳鉦耜窒鉦啤鉦 鉦兒窒鉦啤鉦芹盔鈳鉦鈳鉦戈眶鉦擒畢鈳鉦舟疏鈳鉦兒 鉦鉦﹤鉦鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈窒鉦舟: '%s'\n"
-#: ../cli/src/connections.c:3343 ../cli/src/connections.c:4192
-#: ../cli/src/connections.c:4247 ../cli/src/connections.c:4646
-#: ../cli/src/connections.c:4656
+#: ../clients/cli/connections.c:3552 ../clients/cli/connections.c:4375
+#: ../clients/cli/connections.c:4436 ../clients/cli/connections.c:4838
+#: ../clients/cli/connections.c:4848
msgid "Error: "
msgstr "鉦舟鉦: "
-#: ../cli/src/connections.c:3361
-msgid "Do you want to add IP addresses? (yes/no) [yes] "
-msgstr "鉦兒鉦菽 IP 鉦菽窒鉦喪移鉦詮眶鉦兒鉦兒 鉦詮鉦啤窒鉦詮眷鈳 鉦眇盔鉦詮鉦菽窒鉦啤移? (yes/no) [yes] "
+#. Ask for IP addresses
+#: ../clients/cli/connections.c:3569
+#, c-format
+#| msgid "Do you want to add IP addresses? (yes/no) [yes] "
+msgid "Do you want to add IP addresses? %s"
+msgstr "鉦兒鉦菽 IP 鉦菽窒鉦喪移鉦詮眶鉦兒鉦兒 鉦詮鉦啤窒鉦詮眷鈳 鉦眇盔鉦詮鉦菽窒鉦啤移? %s"
-#: ../cli/src/connections.c:3367
+#: ../clients/cli/connections.c:3576
#, c-format
msgid "Press <Enter> to finish adding addresses.\n"
msgstr "鉦菽窒鉦喪移鉦詮眶鉦兒鉦兒 鉦詮鉦啤窒鉦詮鉦菽鉦舟疏鈳鉦兒 鉦芹鉦啤鉦鉦鈳鉦喪窒鉦詮眷鈳 <Enter> 鉦鉦兒鉦兒 鉦鉦戈鉦戈窒.\n"
-#: ../cli/src/connections.c:3513
+#: ../clients/cli/connections.c:3715
#, c-format
msgid "Error: 'parent': not valid without 'p-key'."
msgstr "鉦舟鉦: 'parent': 'p-key' 鉦鉦耜鉦耜畢鈳 鉦桌移鉦兒鉦能眶鉦擒鉦賴盒鈳鉦菽鉦舟窒鉦耜鉦."
-#: ../cli/src/connections.c:3569 ../cli/src/connections.c:4562
+#: ../clients/cli/connections.c:3767 ../clients/cli/connections.c:4757
msgid "SSID: "
msgstr "SSID: "
-#: ../cli/src/connections.c:3572 ../cli/src/connections.c:4565
+#: ../clients/cli/connections.c:3770 ../clients/cli/connections.c:4760
msgid "Error: 'ssid' is required."
msgstr "鉦舟鉦: 'ssid' 鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳."
-#: ../cli/src/connections.c:3636
+#: ../clients/cli/connections.c:3827
msgid "WiMAX NSP name: "
msgstr "WiMAX NSP 鉦嫩鉦詮盒鈳:"
-#: ../cli/src/connections.c:3639
+#: ../clients/cli/connections.c:3830
msgid "Error: 'nsp' is required."
msgstr "鉦舟鉦: 'nsp' 鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳."
-#: ../cli/src/connections.c:3694
+#: ../clients/cli/connections.c:3882
msgid "PPPoE username: "
msgstr "PPPoE 鉦眇眾鉦鈳鉦舟移鉦 鉦嫩鉦詮盒鈳: "
-#: ../cli/src/connections.c:3697
+#: ../clients/cli/connections.c:3885
msgid "Error: 'username' is required."
msgstr "鉦舟鉦: 'username' 鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳."
-#: ../cli/src/connections.c:3768
+#: ../clients/cli/connections.c:3954
msgid "APN: "
msgstr "APN: "
-#: ../cli/src/connections.c:3771
+#: ../clients/cli/connections.c:3957
msgid "Error: 'apn' is required."
msgstr "鉦舟鉦: 'apn' 鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳."
-#: ../cli/src/connections.c:3830
+#: ../clients/cli/connections.c:4015
msgid "Bluetooth device address: "
msgstr "鉦眇鉦耜鉦鈳鉦戈 鉦詮移鉦抉疏鉦 鉦菽窒鉦喪移鉦:"
-#: ../cli/src/connections.c:3833
+#: ../clients/cli/connections.c:4018
msgid "Error: 'addr' is required."
msgstr "鉦舟鉦: 'addr' 鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳."
-#: ../cli/src/connections.c:3876
+#: ../clients/cli/connections.c:4059
#, c-format
msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
msgstr "鉦舟鉦: 'bt-type': '%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦; [%s, %s (%s), %s] 鉦鉦兒鉦兒 鉦眇眾鉦詮窒."
-#: ../cli/src/connections.c:3921
+#: ../clients/cli/connections.c:4103
msgid "VLAN parent device or connection UUID: "
msgstr "VLAN 鉦桌鉦 鉦詮移鉦抉疏 鉦鉦丞眶 鉦詮鉦芹盒鈳鉦 UUID: "
-#: ../cli/src/connections.c:3924
+#: ../clients/cli/connections.c:4106
msgid "Error: 'dev' is required."
msgstr "鉦舟鉦: 'dev' 鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳."
-#: ../cli/src/connections.c:3928
+#: ../clients/cli/connections.c:4110
msgid "VLAN ID <0-4095>: "
msgstr "VLAN ID <0-4095>: "
-#: ../cli/src/connections.c:3931
+#: ../clients/cli/connections.c:4113
msgid "Error: 'id' is required."
msgstr "鉦舟鉦: 'id' 鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳."
-#: ../cli/src/connections.c:3937
+#: ../clients/cli/connections.c:4119
#, c-format
msgid "Error: 'id': '%s' is not valid; use <0-4095>."
msgstr "鉦舟鉦: 'id': '%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦; <0-4095> 鉦眇眾鉦詮窒."
-#: ../cli/src/connections.c:3947
+#: ../clients/cli/connections.c:4129
#, c-format
msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
msgstr ""
"鉦舟鉦: 'dev': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 UUID 鉦鉦鉦耜窒, 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦 鉦嫩鉦詮盒鉦擒鉦耜窒 鉦鉦丞眶 MAC 鉦鉦鉦耜窒 鉦鉦耜鉦."
-""
-#: ../cli/src/connections.c:4082
+#: ../clients/cli/connections.c:4258
#, c-format
msgid "Error: 'mode': %s."
msgstr "鉦舟鉦: 'mode': %s"
-#: ../cli/src/connections.c:4091
+#: ../clients/cli/connections.c:4267
#, c-format
msgid "Error: 'primary': '%s' is not a valid interface name."
msgstr "鉦舟鉦: 'primary': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦 鉦嫩鉦詮盒鉦擒鉦賴眷鈳鉦."
-#: ../cli/src/connections.c:4134
-msgid "Bond master: "
-msgstr "鉦眇移鉦鉦﹤ 鉦桌移鉦詮鉦鉦啤:"
-
-#: ../cli/src/connections.c:4137 ../cli/src/connections.c:4229
-#: ../cli/src/connections.c:4416
+#: ../clients/cli/connections.c:4316 ../clients/cli/connections.c:4414
+#: ../clients/cli/connections.c:4616
msgid "Error: 'master' is required."
msgstr "鉦舟鉦: 'master' 鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳."
-#: ../cli/src/connections.c:4142 ../cli/src/connections.c:4239
-#: ../cli/src/connections.c:4427
+#: ../clients/cli/connections.c:4322 ../clients/cli/connections.c:4420
+#: ../clients/cli/connections.c:4622
+#, c-format
+msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
+msgstr ""
+"鉦鉦鈳鉦鉦啤窒鉦鈳: master='%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦賴盒鈳鉦 鉦能移鉦菽鉦舟 鉦芹鉦啤鉦徇鉦耜鉦鈳 鉦詮鉦眇鉦抉窒鉦詮窒鉦啤鉦菽鉦舟窒鉦耜鉦.\n"
+
+#: ../clients/cli/connections.c:4325 ../clients/cli/connections.c:4428
+#: ../clients/cli/connections.c:4625
#, c-format
msgid ""
"Warning: 'type' is currently ignored. We only support ethernet slaves for "
"now.\n"
msgstr ""
"鉦鉦鈳鉦鉦啤窒鉦鈳: 'type' 鉦鉦兒鉦兒 鉦芹鉦啤硫鉦鈳鉦 鉦鉦﹤鉦鉦鉦賴硫鉦耜移鉦鉦賴畢鈳. 鉦兒移鉦菽 鉦鉦 鉦鈳鉦菽眷 鉦鉦戈盒鈳鉦兒鉦鈳 "
-"鉦詮鉦耜鉦菽鉦鉦喪疏鈳鉦兒 鉦桌移鉦戈鉦 鉦眇鉦鉦眇眷鉦賴硫鈳鉦戈鉦戈鉦菽.\n"
+"鉦詮鉦耜鉦菽鉦鉦喪疏鈳鉦兒 鉦桌移鉦戈鉦 "
+"鉦眇鉦鉦眇眷鉦賴硫鈳鉦戈鉦戈鉦菽.\n"
-#: ../cli/src/connections.c:4226
-msgid "Team master: "
-msgstr "鉦戈鉦﹤畢 鉦芹鉦啤皎鈳鉦:"
-
-#: ../cli/src/connections.c:4329
+#: ../clients/cli/connections.c:4522
#, c-format
msgid "Error: 'stp': %s."
msgstr "鉦舟鉦: 'stp': %s."
-#: ../cli/src/connections.c:4413
-msgid "Bridge master: "
-msgstr "鉦眇鉦啤窒鉦鈳 鉦桌移鉦詮鉦鉦啤: "
-
-#: ../cli/src/connections.c:4421
-#, c-format
-msgid "Error: 'master': '%s' is not valid UUID nor interface."
-msgstr "鉦舟鉦: 'master': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 UUID 鉦鉦丞眶 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦菽移鉦鉦賴眷鈳鉦."
-
-#: ../cli/src/connections.c:4454
+#: ../clients/cli/connections.c:4652
#, c-format
msgid "Error: 'hairpin': %s."
msgstr "鉦舟鉦: 'hairpin': %s."
-#: ../cli/src/connections.c:4506
-msgid "VPN type: "
-msgstr "VPN 鉦眇鈳: "
-
-#: ../cli/src/connections.c:4509
+#: ../clients/cli/connections.c:4705
msgid "Error: 'vpn-type' is required."
msgstr "鉦舟鉦: 'vpn-type' 鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳."
-#: ../cli/src/connections.c:4520
+#: ../clients/cli/connections.c:4712
#, c-format
-msgid "Error: 'vpn-type': %s."
-msgstr "鉦舟鉦: 'vpn-type': %s."
+#| msgid "Error: 'vpn-type': %s."
+msgid "Warning: 'vpn-type': %s not known.\n"
+msgstr "鉦鉦鈳鉦鉦啤窒鉦鈳: 'vpn-type': %s 鉦戈窒鉦喪窒鉦舟窒鉦耜鉦.\n"
-#: ../cli/src/connections.c:4578
+#: ../clients/cli/connections.c:4773
#, c-format
msgid "Error: 'channel': '%s' is not valid; use <1-13>."
msgstr "鉦舟鉦: 'channel': '%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦; <1-13> 鉦眇眾鉦詮窒."
-#: ../cli/src/connections.c:4613
+#: ../clients/cli/connections.c:4805
#, c-format
msgid "Error: '%s' is not a valid connection type."
msgstr "鉦舟鉦: '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦能移鉦鉦賴眷鈳鉦."
-#: ../cli/src/connections.c:4711
+#: ../clients/cli/connections.c:4903
#, c-format
msgid "Error: Failed to add '%s' connection: (%d) %s"
msgstr "鉦舟鉦: '%s' 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鉦啤窒鉦詮眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: (%d) %s"
-#: ../cli/src/connections.c:4715
+#: ../clients/cli/connections.c:4907
#, c-format
msgid "Connection '%s' (%s) successfully added.\n"
msgstr "'%s' (%s) 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦能眸鉦詮鉦菽窒鉦能移鉦鉦 鉦詮鉦啤窒鉦詮眷鉦擒鉦賴畢鈳.\n"
-#: ../cli/src/connections.c:4761
-msgid "Connection type: "
-msgstr "鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳: "
-
-#: ../cli/src/connections.c:4765
+#: ../clients/cli/connections.c:5121
#, c-format
msgid "Error: 'type' argument is required."
msgstr "鉦舟鉦: 'type' 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳."
-#: ../cli/src/connections.c:4771
+#: ../clients/cli/connections.c:5129
#, c-format
msgid "Error: invalid connection type; %s."
msgstr "鉦舟鉦: 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳: %s."
-#: ../cli/src/connections.c:4780
+#: ../clients/cli/connections.c:5138
#, c-format
msgid "Error: 'autoconnect': %s."
msgstr "鉦舟鉦: 'autoconnect': %s."
-#: ../cli/src/connections.c:4796
+#: ../clients/cli/connections.c:5148
+#, c-format
+#| msgid "Error: 'stp': %s."
+msgid "Error: 'save': %s."
+msgstr "鉦舟鉦: 'save': %s."
+
+#: ../clients/cli/connections.c:5164
msgid "Interface name [*]: "
msgstr "鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦 鉦嫩鉦詮盒鈳 [*]:: "
-#: ../cli/src/connections.c:4801
+#: ../clients/cli/connections.c:5169
#, c-format
msgid "Error: 'ifname' argument is required."
msgstr "鉦舟鉦: 'ifname' 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳."
-#: ../cli/src/connections.c:4808
+#: ../clients/cli/connections.c:5176
#, c-format
msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
msgstr ""
"鉦舟鉦: 'ifname': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦 鉦嫩鉦詮盒鉦擒鉦耜窒 鉦鉦丞眶 '*' 鉦鉦鉦耜窒 "
"鉦鉦鉦賴眷鈳鉦."
-#: ../cli/src/connections.c:5627
+#: ../clients/cli/connections.c:5964
#, c-format
msgid "['%s' setting values]\n"
msgstr "['%s' 鉦詮窒鉦舟鉦抉略鈳鉦 鉦桌鉦耜鉦能鉦喪]\n"
-#: ../cli/src/connections.c:5708
-#, c-format
+#. TRANSLATORS: do not translate command names and keywords before ::
+#. * However, you should translate terms enclosed in <>.
+#.
+#: ../clients/cli/connections.c:6046
+#, c-format
+#| msgid ""
+#| "---[ Main menu ]---\n"
+#| "goto [<setting> | <prop>] :: go to a setting or property\n"
+#| "remove <setting>[.<prop>] | <prop> :: remove setting or reset property "
+#| "value\n"
+#| "set [<setting>.<prop> <value>] :: set property value\n"
+#| "describe [<setting>.<prop>] :: describe property\n"
+#| "print [all] :: print the connection\n"
+#| "verify [all] :: verify the connection\n"
+#| "save :: save the connection\n"
+#| "activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n"
+#| "back :: go one level up (back)\n"
+#| "help/? [<command>] :: print this help\n"
+#| "nmcli <conf-option> <value> :: nmcli configuration\n"
+#| "quit :: exit nmcli\n"
msgid ""
"---[ Main menu ]---\n"
"goto [<setting> | <prop>] :: go to a setting or property\n"
@@ -1933,9 +2263,9 @@ msgid ""
"value\n"
"set [<setting>.<prop> <value>] :: set property value\n"
"describe [<setting>.<prop>] :: describe property\n"
-"print [all] :: print the connection\n"
+"print [all | <setting>[.<prop>]] :: print the connection\n"
"verify [all] :: verify the connection\n"
-"save :: save the connection\n"
+"save [persistent|temporary] :: save the connection\n"
"activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n"
"back :: go one level up (back)\n"
"help/? [<command>] :: print this help\n"
@@ -1948,16 +2278,16 @@ msgstr ""
"鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦桌盒鈳鉦嫩鉦鉦舟窒鉦詮\n"
"set [<setting>.<prop> <value>] :: 鉦鈳鉦鉦 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮\n"
"describe [<setting>.<prop>] :: 鉦鈳鉦鉦菽疏鈳鉦兒 鉦菽窒鉦菽盒鉦賴硫鈳\n"
-"print [all] :: 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦桌鉦舟鉦啤窒鉦詮\n"
+"print [all | <setting>[.<prop>]] :: 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦桌鉦舟鉦啤窒鉦詮\n"
"verify [all] :: 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦芹盒鉦賴眸鈳鉦耜窒鉦詮\n"
-"save :: 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮\n"
+"save [persistent|temporary] :: 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮\n"
"activate [<ifname>] [/<ap>|<nsp>] :: 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮\n"
"back :: 鉦桌鉦耜窒鉦 鉦嫩鉦戈鈳鉦鈳 鉦嫩鉦鈳 (鉦嫩窒鉦鉦舟鈳鉦鈳)\n"
"help/? [<command>] :: 鉦 鉦兒鉦啤眶鉦兒鉦兒 鉦桌鉦舟鉦啤窒鉦詮\n"
"nmcli <conf-option> <value> :: nmcli 鉦詮鉦啤鉦兒\n"
"quit :: nmcli 鉦鉦鉦 鉦兒窒鉦啤鉦鉦桌窒鉦詮\n"
-#: ../cli/src/connections.c:5735
+#: ../clients/cli/connections.c:6073
#, c-format
msgid ""
"goto <setting>[.<prop>] | <prop> :: enter setting/property for editing\n"
@@ -1976,12 +2306,13 @@ msgstr ""
" nmcli connection> goto secondaries\n"
" nmcli> goto ipv4.addresses\n"
-#: ../cli/src/connections.c:5742
+#: ../clients/cli/connections.c:6080
#, c-format
msgid ""
"remove <setting>[.<prop>] :: remove setting or reset property value\n"
"\n"
-"This command removes an entire setting from the connection, or if a property\n"
+"This command removes an entire setting from the connection, or if a "
+"property\n"
"is given, resets that property to the default value.\n"
"\n"
"Examples: nmcli> remove wifi-sec\n"
@@ -1996,7 +2327,7 @@ msgstr ""
"鉦鉦舟移鉦嫩盒鉦鈳鉦鉦喪: nmcli> remove wifi-sec\n"
" nmcli> remove eth.mtu\n"
-#: ../cli/src/connections.c:5749
+#: ../clients/cli/connections.c:6087
#, c-format
msgid ""
"set [<setting>.<prop> <value>] :: set property value\n"
@@ -2011,7 +2342,7 @@ msgstr ""
"\n"
"鉦鉦舟移鉦嫩盒鉦鈳: nmcli> set con.id My connection\n"
-#: ../cli/src/connections.c:5754
+#: ../clients/cli/connections.c:6092
#, c-format
msgid ""
"describe [<setting>.<prop>] :: describe property\n"
@@ -2022,9 +2353,10 @@ msgstr ""
"describe [<setting>.<prop>] :: 鉦鈳鉦鉦菽疏鈳鉦兒 鉦菽窒鉦菽盒鉦賴硫鈳\n"
"\n"
"鉦鈳鉦鉦 鉦菽窒鉦菽盒鉦鈳鉦能疏鈳鉦兒 鉦戈鉦啤窒鉦詮鉦戈鉦戈畢鈳. 鉦鉦耜鉦耜移 NM 鉦詮窒鉦舟鉦抉略鈳鉦鉦喪 鉦桌略鈳鉦戈 鉦鈳鉦鉦鉦喪疏鈳鉦兒 鉦兒鉦﹤眷鈳 鉦兒鉦菽 "
-"nm-settings(5) 鉦桌移鉦嫩窒鉦戈窒 鉦芹鉦鉦菽疏鈳鉦兒 鉦兒鉦﹤痊鉦嫩鉦舟.\n"
+"nm-"
+"settings(5) 鉦桌移鉦嫩窒鉦戈窒 鉦芹鉦鉦菽疏鈳鉦兒 鉦兒鉦﹤痊鉦嫩鉦舟.\n"
-#: ../cli/src/connections.c:5759
+#: ../clients/cli/connections.c:6097
#, c-format
msgid ""
"print [all] :: print setting or connection values\n"
@@ -2039,7 +2371,7 @@ msgstr ""
"\n"
"鉦鉦舟移鉦嫩盒鉦鈳: nmcli ipv4> print all\n"
-#: ../cli/src/connections.c:5764
+#: ../clients/cli/connections.c:6102
#, c-format
msgid ""
"verify [all] :: verify setting or connection validity\n"
@@ -2053,24 +2385,43 @@ msgstr ""
"verify [all] :: 鉦詮窒鉦舟鉦抉略鈳 鉦鉦丞眶 鉦詮鉦芹盒鈳鉦鉦 鉦桌移鉦兒鉦能略鈳鉦能疏鈳鉦兒 鉦芹盒鉦賴眸鈳鉦耜窒鉦詮 \n"
"\n"
"鉦詮窒鉦舟鉦抉略鈳 鉦鉦丞眶 鉦詮鉦芹盒鈳鉦鉦菽 鉦桌移鉦兒鉦能眶鉦擒鉦賴畢鈳鉦能 鉦桌略鈳鉦戈 鉦兒鉦戈盒鉦 鉦詮皎鉦能畢鉦耜鉦耜窒 鉦鉦喪窒鉦詮痊鉦嫩鉦舟 "
-"鉦鉦兒鉦兒鉦菽鉦舟疏鈳鉦兒 鉦芹盒鉦賴眸鈳鉦耜窒鉦詮鉦戈鉦戈畢鈳. 鉦鉦舟 鉦舟鉦 鉦鉦鉦鉦擒畢鉦擒 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦桌鉦耜鉦能鉦喪疏鈳鉦兒 "
-"鉦詮鉦鉦賴硫鈳鉦戈鉦戈畢鈳.\n"
+"鉦鉦兒鉦兒鉦菽鉦舟疏鈳鉦兒 "
+"鉦芹盒鉦賴眸鈳鉦耜窒鉦詮鉦戈鉦戈畢鈳. 鉦鉦舟 鉦舟鉦 鉦鉦鉦鉦擒畢鉦擒 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦桌鉦耜鉦能鉦喪疏鈳鉦兒 鉦詮鉦鉦賴硫鈳鉦戈鉦戈畢鈳.\n"
"\n"
"鉦鉦舟移鉦嫩盒鉦鈳鉦鉦喪: nmcli> verify\n"
" nmcli bond> verify\n"
-#: ../cli/src/connections.c:5771
+#: ../clients/cli/connections.c:6109
#, c-format
msgid ""
-"save :: save the connection\n"
-"\n"
-"Sends the connection to NetworkManager that will save it.\n"
-msgstr ""
-"save :: 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮\n"
-"\n"
-"鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 NetworkManager 鉦鈳 鉦鉦喪鉦嫩窒鉦詮鉦戈鉦戈畢鈳 鉦鉦舟 鉦鉦喪窒鉦詮鉦戈鉦戈畢鈳.\n"
-
-#: ../cli/src/connections.c:5775
+"save [persistent|temporary] :: save the connection\n"
+"\n"
+"Sends the connection profile to NetworkManager that either will save it\n"
+"persistently, or will only keep it in memory. 'save' without an argument\n"
+"means 'save persistent'.\n"
+"Note that once you save the profile persistently those settings are saved\n"
+"across reboot or restart. Subsequent changes can also be temporary or\n"
+"persistent, but any temporary changes will not persist across reboot or\n"
+"restart. If you want to fully remove the persistent connection, the "
+"connection\n"
+"profile must be deleted.\n"
+msgstr ""
+"save [persistent|temporary] :: 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮\n"
+"\n"
+"鉦詮鉦芹盒鈳鉦鉦 鉦芹鉦啤鉦徇鉦耜 鉦鉦兒鉦兒 NetworkManager 鉦鈳 鉦鉦喪鉦嫩窒鉦詮鉦戈鉦戈畢鈳, 鉦鉦舟 鉦鉦鉦舟 鉦鉦舟疏鈳鉦兒 "
+"鉦兒窒鉦啤鉦戈盒鉦菽移鉦鉦璞n"
+"鉦鉦喪窒鉦詮鉦戈鉦戈畢鈳, 鉦鉦丞眶 鉦鉦舟 鉦桌鉦桌鉦啤窒鉦能眷鈳鉦耜窒 鉦桌移鉦戈鉦 鉦鉦啤窒鉦詮痊鉦嫩鉦舟. 鉦鉦鉦舟 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦耜鉦耜畢鈳 "
+"'save'\n"
+"鉦鉦鉦舟盒鈳 'save persistent' 鉦鉦鉦舟盒鈳鉦丞眶鉦擒鉦賴盒鈳鉦戈鉦戈畢鈳.\n"
+"鉦鉦桌鉦桌 鉦兒鉦菽 鉦芹鉦啤鉦徇鉦耜 鉦鉦兒鉦兒 鉦兒窒鉦啤鉦戈盒鉦菽移鉦鉦 鉦鉦喪窒鉦詮窒鉦舟盒鈳鉦鉦舟盒鈳 鉦 鉦詮窒鉦舟鉦抉略鈳鉦鉦喪疏鈳鉦兒 鉦桌盒鉦喪窒鉦眇鉦鈳 "
+"鉦桌移鉦﹤窒鉦吒n"
+"鉦鉦丞眶 鉦桌盒鉦喪窒 鉦鉦啤鉦冢窒鉦詮畢 鉦兒鉦戈盒 鉦鉦喪窒鉦能鉦菽鉦戈 鉦桌移鉦﹤眷鉦擒鈳鉦戈鉦戈畢鈳. 鉦兒鉦戈盒 鉦眇畢鉦耜移鉦菽產鈳鉦鉦喪\n"
+"鉦戈移鉦戈鉦鉦擒眷鉦賴鉦菽移鉦鉦賴盒鉦眇硃鈳鉦舟 鉦鉦丞眶 鉦兒窒鉦啤鉦戈盒鉦菽移鉦鉦賴盒鉦眇硃鈳鉦舟, 鉦鉦舟盒鈳 鉦能移鉦菽鉦舟 鉦戈移鉦戈鉦鉦擒眷鉦賴 鉦眇畢鉦耜移鉦菽產鈳鉦鉦喪\n"
+"鉦桌盒鉦喪窒鉦眇鉦鈳 鉦桌移鉦﹤窒鉦舟移鉦 鉦鉦丞眶 鉦桌盒鉦喪窒 鉦鉦啤鉦冢窒鉦詮窒鉦舟移鉦 鉦鉦喪窒鉦舟鉦鈳鉦喪鉦喪鉦菽鉦舟窒鉦耜鉦. 鉦兒鉦菽 鉦兒窒鉦啤鉦戈盒鉦菽移鉦 \n"
+"鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鉦芹鉦啤鉦鉦菽移鉦鉦 鉦戈鉦鈳鉦舟鉦嫩移鉦鉦耜 鉦眇盔鉦詮窒鉦舟眷鈳鉦耜窒, 鉦詮鉦芹盒鈳鉦 鉦芹鉦啤鉦徇鉦耜 鉦鉦兒鉦兒 "
+"鉦鉦喪窒鉦詮痊鈳鉦鉦賴盒鈳鉦戈鉦戈畢鈳.\n"
+
+#: ../clients/cli/connections.c:6120
#, c-format
msgid ""
"activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n"
@@ -2091,21 +2442,25 @@ msgstr ""
"/<ap>|<nsp> - AP (Wi-Fi) 鉦鉦丞眶 NSP (WiMAX) (<ifname> 鉦鉦兒鉦兒 鉦詮鉦鉦賴硫鉦舟 鉦鉦舟鉦舟眷鈳鉦耜窒 / "
"鉦芹鉦啤鉦菽畢鉦耜鉦耜窒 鉦詮鉦啤窒鉦詮窒)\n"
-#: ../cli/src/connections.c:5782 ../cli/src/connections.c:5932
+#: ../clients/cli/connections.c:6127 ../clients/cli/connections.c:6284
#, c-format
-msgid "back :: go to upper menu level\n"
+msgid ""
+"back :: go to upper menu level\n"
"\n"
-msgstr "back :: 鉦桌鉦耜窒鉦 鉦芹盒鉦賴眶鉦賴瓷鉦賴盔 鉦桌鈳鉦鉦鈳鉦鈳 鉦嫩鉦鈳\n"
+msgstr ""
+"back :: 鉦桌鉦耜窒鉦 鉦芹盒鉦賴眶鉦賴瓷鉦賴盔 鉦桌鈳鉦鉦鈳鉦鈳 鉦嫩鉦鈳\n"
"\n"
-#: ../cli/src/connections.c:5785
+#: ../clients/cli/connections.c:6130
#, c-format
-msgid "help/? [<command>] :: help for the nmcli commands\n"
+msgid ""
+"help/? [<command>] :: help for the nmcli commands\n"
"\n"
-msgstr "help/? [<command>] :: nmcli 鉦鉦舟鉦嗣鉦喪窒鉦鉦擒鉦賴疏 鉦兒鉦啤眶鈳\n"
+msgstr ""
+"help/? [<command>] :: nmcli 鉦鉦舟鉦嗣鉦喪窒鉦鉦擒鉦賴疏 鉦兒鉦啤眶鈳\n"
"\n"
-#: ../cli/src/connections.c:5788
+#: ../clients/cli/connections.c:6133
#, c-format
msgid ""
"nmcli [<conf-option> <value>] :: nmcli configuration\n"
@@ -2148,7 +2503,7 @@ msgstr ""
" nmcli> nmcli save-confirmation no\n"
" nmcli> nmcli prompt-color 3\n"
-#: ../cli/src/connections.c:5808 ../cli/src/connections.c:5938
+#: ../clients/cli/connections.c:6153 ../clients/cli/connections.c:6290
#, c-format
msgid ""
"quit :: exit nmcli\n"
@@ -2159,15 +2514,19 @@ msgstr ""
"quit :: nmcli 鉦鉦鉦 鉦兒窒鉦啤鉦鉦桌窒鉦詮\n"
"\n"
"鉦 鉦鉦舟鉦嗣眶鈳 nmcli 鉦鉦鉦舟 鉦兒窒鉦啤鉦鉦桌窒鉦詮鉦菽鉦戈 鉦桌移鉦﹤鉦戈鉦戈畢鈳. 鉦詮鉦芹移鉦舟窒鉦詮鉦戈鉦戈窒鉦啤鉦 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 "
-"鉦鉦喪窒鉦詮畢鈳 鉦鉦舟鉦舟眷鈳鉦耜窒, 鉦鈳鉦啤窒鉦能鉦能疏鈳鉦兒 鉦鉦鉦賴略鉦芹瓷鉦賴硫鈳鉦菽鉦戈 鉦眇眾鉦鈳鉦舟移鉦啤盒鉦兒鉦兒 鉦鈳鉦喪眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
+"鉦鉦喪窒鉦詮畢鈳 "
+"鉦鉦舟鉦舟眷鈳鉦耜窒, 鉦鈳鉦啤窒鉦能鉦能疏鈳鉦兒 鉦鉦鉦賴略鉦芹瓷鉦賴硫鈳鉦菽鉦戈 鉦眇眾鉦鈳鉦舟移鉦啤盒鉦兒鉦兒 鉦鈳鉦喪眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
-#: ../cli/src/connections.c:5813 ../cli/src/connections.c:5943
-#: ../cli/src/connections.c:6313 ../cli/src/connections.c:7162
+#: ../clients/cli/connections.c:6158 ../clients/cli/connections.c:6295
+#: ../clients/cli/connections.c:6683 ../clients/cli/connections.c:7574
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "鉦鈳鉦戈鉦戈窒鉦啤畢 鉦鉦舟鉦: '%s'\n"
-#: ../cli/src/connections.c:5879
+#. TRANSLATORS: do not translate command names and keywords before ::
+#. * However, you should translate terms enclosed in <>.
+#.
+#: ../clients/cli/connections.c:6224
#, c-format
msgid ""
"---[ Property menu ]---\n"
@@ -2194,7 +2553,7 @@ msgstr ""
"help/? [<command>] :: 鉦 鉦兒鉦啤眶鈳 鉦鉦丞眶 鉦鉦舟鉦嗣畢 鉦菽窒鉦菽盒鉦鈳鉦能疏鈳鉦兒 鉦桌鉦舟鉦啤窒鉦詮\n"
"quit :: nmcli 鉦鉦鉦 鉦兒窒鉦啤鉦鉦桌窒鉦詮\n"
-#: ../cli/src/connections.c:5904
+#: ../clients/cli/connections.c:6249
#, c-format
msgid ""
"set [<value>] :: set new value\n"
@@ -2205,22 +2564,28 @@ msgstr ""
"\n"
"鉦 鉦鉦舟鉦嗣眶鈳 鉦 鉦鈳鉦鉦鈳鉦鈳 <value> 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮鉦戈鉦戈畢鈳\n"
-#: ../cli/src/connections.c:5908
+#: ../clients/cli/connections.c:6253
#, c-format
+#| msgid ""
+#| "add [<value>] :: add new option to the property\n"
+#| "\n"
+#| "This command add provided <value> to this property, if the property is of "
+#| "a container type. For single-valued properties it replaces the value "
+#| "(same as 'set').\n"
msgid ""
-"add [<value>] :: add new option to the property\n"
+"add [<value>] :: append new value to the property\n"
"\n"
-"This command add provided <value> to this property, if the property is of a "
-"container type. For single-valued properties it replaces the value (same as "
-"'set').\n"
+"This command adds provided <value> to this property, if the property is of a "
+"container type. For single-valued properties the property value is replaced "
+"(same as 'set').\n"
msgstr ""
-"add [<value>] :: 鉦鈳鉦鉦鈳鉦鈳 鉦嫩鉦 鉦鉦能鉦鈳鉦能疏鈳鉦兒 鉦詮鉦啤窒鉦詮\n"
+"add [<value>] :: 鉦鈳鉦鉦鈳鉦鈳 鉦嫩鉦 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦詮鉦啤窒鉦詮\n"
"\n"
-"鉦 鉦鉦舟鉦嗣眶鈳 鉦鉦舟鉦賴硫鉦耜移鉦 <value> 鉦鉦兒鉦兒 鉦 鉦鈳鉦鉦鈳鉦鈳 鉦詮鉦啤窒鉦詮鉦戈鉦戈畢鈳, 鉦鈳鉦鉦菽 鉦鉦鉦舟 鉦鉦鉦鈳鉦兒盒鉦賴疏 "
-"鉦眇鈳鉦能畢鉦擒鉦賴畢鈳鉦舟盒鈳. 鉦鉦-鉦桌鉦耜鉦能畢 鉦鈳鉦鉦鉦喪窒鉦鉦擒鉦 鉦鉦舟 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦眇畢鉦耜窒 鉦桌移鉦﹤鉦戈鉦戈畢鈳 ('set' "
-"鉦兒鉦戈鉦能 鉦鉦啤鉦戈鉦戈畢鈳).\n"
+"鉦鈳鉦鉦菽 鉦鉦鉦舟 鉦鉦鉦鈳鉦兒盒鉦賴疏 鉦眇鈳鉦能畢鉦擒鉦賴畢鈳鉦舟盒鈳, 鉦 鉦鉦舟鉦嗣眶鈳 鉦鉦舟鉦賴硫鉦耜移鉦 <value> 鉦鉦兒鉦兒 鉦 鉦鈳鉦鉦鈳鉦鈳 "
+"鉦詮鉦啤窒鉦詮鉦戈鉦戈畢鈳. 鉦鉦-鉦桌鉦耜鉦能畢 鉦鈳鉦鉦鉦喪窒鉦鉦擒鉦 鉦鉦舟 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦眇畢鉦耜窒 鉦桌移鉦﹤鉦戈鉦戈畢鈳 ('set' 鉦兒鉦戈鉦能 "
+"鉦鉦啤鉦戈鉦戈畢鈳).\n"
-#: ../cli/src/connections.c:5914
+#: ../clients/cli/connections.c:6259
#, c-format
msgid ""
"change :: change current value\n"
@@ -2231,18 +2596,42 @@ msgstr ""
"\n"
"鉦芹鉦啤硫鉦鈳鉦 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦戈鉦啤窒鉦詮鉦戈鉦戈畢鈳 鉦桌略鈳鉦戈 鉦鉦舟疏鈳鉦兒 鉦詮鉦芹移鉦舟窒鉦詮眷鈳 鉦鉦兒鉦桌略鉦賴硫鈳鉦戈鉦戈畢鈳.\n"
-#: ../cli/src/connections.c:5918
+#: ../clients/cli/connections.c:6263
#, c-format
msgid ""
-"remove [<index>|<option>] :: delete the value\n"
+"remove [<value>|<index>|<option name>] :: delete the value\n"
+"\n"
+"Removes the property value. For single-valued properties, this sets the\n"
+"property back to its default value. For container-type properties, this "
+"removes\n"
+"all the values of that property, or you can specify an argument to remove "
+"just\n"
+"a single item or option. The argument is either a value or index of the item "
+"to\n"
+"remove, or an option name (for properties with named options).\n"
+"\n"
+"Examples: nmcli ipv4.dns> remove 8.8.8.8\n"
+" nmcli ipv4.dns> remove 2\n"
+" nmcli bond.options> remove downdelay\n"
"\n"
-"Removes the property value (sets it to default).\n"
msgstr ""
-"remove [<index>|<option>] :: 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦鉦喪窒鉦詮\n"
+"remove [<value>|<index>|<option name>] :: 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦鉦喪窒鉦詮\n"
+"\n"
+"鉦鈳鉦鉦 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦戈鉦鈳鉦舟鉦嫩移鉦鈳鉦戈鉦戈畢鈳. 鉦鉦鉦舟-鉦桌鉦耜鉦能畢 鉦鈳鉦鉦鉦喪窒鉦鉦擒鉦, 鉦鉦舟 鉦鈳鉦鉦菽疏鈳鉦兒 鉦鉦舟盒\n"
+" 鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略 鉦桌鉦耜鉦能鈳鉦鈳 鉦嫩鉦鉦舟窒鉦詮鉦戈鉦戈畢鈳. 鉦鉦鉦鈳鉦兒盒鈳-鉦眇鈳鉦 鉦鈳鉦鉦鉦喪窒鉦鉦擒鉦, 鉦鉦舟 鉦 鉦鈳鉦鉦 "
+"鉦鉦耜鉦耜移 鉦桌鉦耜鉦能鉦喪疏鈳鉦兒\n"
+"鉦鉦丞眶 鉦鈳鉦菽眷 鉦鉦鉦舟 鉦鉦鉦 鉦鉦丞眶 鉦鉦能鉦鈳鉦能疏鈳鉦兒 鉦桌移鉦戈鉦 鉦戈鉦鈳鉦舟鉦嫩移鉦鉦耜 鉦兒鉦菽 鉦鉦鉦舟 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 "
+"鉦鉦兒鉦兒 鉦詮鉦鉦賴硫鈳鉦戈鉦戈畢鈳.\n "
+"鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦戈鉦鈳鉦舟鉦嫩移鉦鉦眇鉦鉦賴盒鈳鉦 鉦鉦鉦嗣畢 鉦桌鉦耜鉦 鉦鉦丞眶 鉦詮鉦鉦賴盔鉦擒鉦賴盒鈳鉦戈鉦戈畢鈳, 鉦鉦丞眶 鉦鉦鉦舟 鉦鉦能鉦鈳鉦 "
+"鉦嫩鉦詮盒鈳 鉦鉦鉦賴盒鈳鉦戈鉦戈畢鈳\n"
+"(鉦嫩鉦詮盒鉦賴硫鉦耜移鉦 鉦鉦能鉦鈳鉦鉦喪疏鈳鉦兒 鉦嫩鉦鉦舟窒鉦啤鉦 鉦鈳鉦鉦鉦喪窒鉦鉦擒鉦).\n"
+"\n"
+"鉦鉦舟移鉦嫩盒鉦鈳鉦鉦喪: nmcli ipv4.dns> remove 8.8.8.8\n"
+" nmcli ipv4.dns> remove 2\n"
+" nmcli bond.options> remove downdelay\n"
"\n"
-"鉦鈳鉦鉦 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦戈鉦鈳鉦舟鉦嫩移鉦鈳鉦戈鉦戈畢鈳 (鉦鉦舟疏鈳鉦兒 鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略鉦鈳鉦鈳 鉦嫩鉦鉦舟窒鉦詮鉦戈鉦戈畢鈳).\n"
-#: ../cli/src/connections.c:5922
+#: ../clients/cli/connections.c:6274
#, c-format
msgid ""
"describe :: describe property\n"
@@ -2253,9 +2642,10 @@ msgstr ""
"describe :: 鉦鈳鉦鉦菽疏鈳鉦兒 鉦菽窒鉦菽盒鉦賴硫鈳\n"
"\n"
"鉦鈳鉦鉦 鉦菽窒鉦菽盒鉦鈳鉦能疏鈳鉦兒 鉦戈鉦啤窒鉦詮鉦戈鉦戈畢鈳. 鉦鉦耜鉦耜移 NM 鉦詮窒鉦舟鉦抉略鈳鉦鉦喪 鉦桌略鈳鉦戈 鉦鈳鉦鉦鉦喪疏鈳鉦兒 鉦兒鉦﹤眷鈳 鉦兒鉦菽 "
-"nm-settings(5) 鉦桌移鉦嫩窒鉦戈窒 鉦芹鉦鉦菽疏鈳鉦兒 鉦兒鉦﹤痊鉦嫩鉦舟.\n"
+"nm-"
+"settings(5) 鉦桌移鉦嫩窒鉦戈窒 鉦芹鉦鉦菽疏鈳鉦兒 鉦兒鉦﹤痊鉦嫩鉦舟.\n"
-#: ../cli/src/connections.c:5927
+#: ../clients/cli/connections.c:6279
#, c-format
msgid ""
"print [property|setting|connection] :: print property (setting, connection) "
@@ -2265,35 +2655,47 @@ msgid ""
"the whole setting or connection.\n"
msgstr ""
"print [property|setting|connection] :: 鉦鈳鉦鉦 (鉦詮窒鉦舟鉦抉略鈳, 鉦詮鉦芹盒鈳鉦) "
-"鉦桌鉦耜鉦能眶鉦兒鉦兒(鉦鉦喪疏鈳鉦兒) 鉦桌鉦舟鉦啤窒鉦詮\n"
+"鉦桌鉦耜鉦能眶鉦兒鉦兒(鉦鉦喪疏鈳鉦兒) "
+"鉦桌鉦舟鉦啤窒鉦詮\n"
"\n"
"鉦鈳鉦鉦 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦戈鉦啤窒鉦詮鉦戈鉦戈畢鈳. 鉦鉦鉦舟 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦兒鉦兒 鉦鉦舟鉦賴硫鉦賴畢鉦耜鉦耜窒 鉦詮鉦芹鉦啤鉦 "
-"鉦詮窒鉦舟鉦抉略鈳 鉦鉦丞眶 鉦詮鉦芹盒鈳鉦鉦鈳鉦鉦擒鉦賴疏 鉦桌鉦耜鉦能鉦喪疏鈳鉦兒 鉦詮硃 鉦兒鉦菽 鉦戈鉦啤窒鉦詮痊鉦嫩鉦舟.\n"
+"鉦詮窒鉦舟鉦抉略鈳 鉦鉦丞眶 "
+"鉦詮鉦芹盒鈳鉦鉦鈳鉦鉦擒鉦賴疏 鉦桌鉦耜鉦能鉦喪疏鈳鉦兒 鉦詮硃 鉦兒鉦菽 鉦戈鉦啤窒鉦詮痊鉦嫩鉦舟.\n"
-#: ../cli/src/connections.c:5935
+#: ../clients/cli/connections.c:6287
#, c-format
-msgid "help/? [<command>] :: help for nmcli commands\n"
+msgid ""
+"help/? [<command>] :: help for nmcli commands\n"
"\n"
-msgstr "help/? [<command>] :: nmcli 鉦鉦舟鉦嗣鉦喪窒鉦鉦擒鉦賴疏 鉦兒鉦啤眶鈳\n"
+msgstr ""
+"help/? [<command>] :: nmcli 鉦鉦舟鉦嗣鉦喪窒鉦鉦擒鉦賴疏 鉦兒鉦啤眶鈳\n"
"\n"
-#: ../cli/src/connections.c:6022
+#: ../clients/cli/connections.c:6374
#, c-format
msgid "Error: Connection activation failed.\n"
msgstr "鉦舟鉦: 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦鈳鉦能 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟.\n"
-#: ../cli/src/connections.c:6093
+#: ../clients/cli/connections.c:6452
#, c-format
msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
msgstr ""
"鉦舟鉦: '%s' 鉦詮窒鉦舟鉦抉略鈳鉦能 鉦鉦﹤鉦﹤移鉦能眶鉦擒鉦賴盒鈳鉦戈鉦戈畢鈳 鉦桌略鈳鉦戈 鉦戈鉦鈳鉦舟鉦嫩移鉦鉦耜 鉦詮移鉦抉鉦能眶鉦賴盒鈳鉦菽鉦舟窒鉦耜鉦.\n"
-#: ../cli/src/connections.c:6111
+#. TRANSLATORS: status line in nmcli connection editor
+#: ../clients/cli/connections.c:6470
#, c-format
-msgid "[ Connection type: %s | name: %s | UUID: %s | dirty: %s ]\n"
-msgstr "[ Connection type: %s | name: %s | UUID: %s | dirty: %s ]\n"
+#| msgid "[ Connection type: %s | name: %s | UUID: %s | dirty: %s ]\n"
+msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
+msgstr "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
-#: ../cli/src/connections.c:6171
+#: ../clients/cli/connections.c:6505
+#, c-format
+#| msgid "The connection is not saved. Do you really want to quit? [y/n]\n"
+msgid "The connection is not saved. Do you really want to quit? %s"
+msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮眷鉦擒鉦賴眷鈳鉦. 鉦兒鉦菽 鉦兒窒鉦鉦菽移鉦鉦耜 鉦兒窒鉦啤鉦鉦桌窒鉦詮眷鈳 鉦眇盔鉦詮鉦戈鉦戈鉦啤? %s"
+
+#: ../clients/cli/connections.c:6550
#, c-format
msgid ""
"The connection profile has been removed from another client. You may type "
@@ -2302,79 +2704,80 @@ msgstr ""
"鉦詮鉦芹盒鈳鉦鉦 鉦芹鉦啤鉦徇鉦耜 鉦鉦兒鉦兒 鉦眇鉦啤鉦鉦舟 鉦鈳鉦耜鉦鉦鈳鉦兒窒鉦鉦 鉦戈鉦鈳鉦舟鉦嫩移鉦鉦耜移鉦鉦賴畢鈳. 鉦兒鉦菽 鉦鉦舟疏鈳鉦兒 "
"鉦桌盒鉦喪窒鉦詮鉦丞移鉦芹窒鉦詮眷鈳 鉦桌鉦鈳鉦 鉦桌鉦兒鉦菽窒鉦兒眷鈳鉦耜窒 'save' 鉦鉦兒鉦兒 鉦兒皎鈳鉦舟窒鉦詮痊鉦嫩.\n"
-#: ../cli/src/connections.c:6192 ../cli/src/connections.c:6615
-#: ../cli/src/connections.c:6673
+#: ../clients/cli/connections.c:6572 ../clients/cli/connections.c:6987
+#: ../clients/cli/connections.c:7042
#, c-format
msgid "Enter '%s' value: "
msgstr "'%s' 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦兒皎鈳鉦舟窒鉦詮窒: "
-#: ../cli/src/connections.c:6209 ../cli/src/connections.c:6228
-#: ../cli/src/connections.c:6621 ../cli/src/connections.c:6680
+#: ../clients/cli/connections.c:6587 ../clients/cli/connections.c:6605
+#: ../clients/cli/connections.c:6991 ../clients/cli/connections.c:7047
#, c-format
msgid "Error: failed to set '%s' property: %s\n"
msgstr "鉦舟鉦: '%s' 鉦鈳鉦鉦菽疏鈳鉦兒 鉦嫩鉦鉦舟窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s\n"
-#: ../cli/src/connections.c:6221
+#: ../clients/cli/connections.c:6599
#, c-format
msgid "Edit '%s' value: "
msgstr "'%s' 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦詮鉦芹移鉦舟窒鉦詮窒: "
-#: ../cli/src/connections.c:6250
+#: ../clients/cli/connections.c:6626
#, c-format
msgid "Error: %s\n"
msgstr "鉦舟鉦: %s\n"
-#: ../cli/src/connections.c:6256 ../cli/src/connections.c:6759
-#: ../cli/src/connections.c:6800
+#: ../clients/cli/connections.c:6632 ../clients/cli/connections.c:7126
+#: ../clients/cli/connections.c:7167
#, c-format
msgid "Error: failed to remove value of '%s': %s\n"
msgstr "鉦舟鉦: '%s' 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦戈鉦鈳鉦舟鉦嫩移鉦鈳鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s\n"
-#: ../cli/src/connections.c:6277
+#: ../clients/cli/connections.c:6653
#, c-format
msgid "Unknown command argument: '%s'\n"
msgstr "鉦鈳鉦戈鉦戈窒鉦啤畢 鉦鉦舟鉦嗣畢 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳: '%s'\n"
-#: ../cli/src/connections.c:6297 ../cli/src/connections.c:7150
-msgid "The connection is not saved. Do you really want to quit? [y/n]\n"
-msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮眷鉦擒鉦賴眷鈳鉦. 鉦兒鉦菽 鉦兒窒鉦鉦菽移鉦鉦耜 鉦兒窒鉦啤鉦鉦桌窒鉦詮眷鈳 鉦眇盔鉦詮鉦戈鉦戈鉦啤? [y/n]\n"
-
-#: ../cli/src/connections.c:6409
+#: ../clients/cli/connections.c:6779
#, c-format
msgid "Available settings: %s\n"
msgstr "鉦耜痍鈳鉦能眶鉦賴盒鈳鉦 鉦詮窒鉦舟鉦抉略鈳鉦鉦喪: %s\n"
-#: ../cli/src/connections.c:6418
+#: ../clients/cli/connections.c:6788
#, c-format
msgid "Error: invalid setting name; %s\n"
msgstr "鉦舟鉦: 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮窒鉦舟鉦抉略鈳鉦 鉦嫩鉦詮盒鈳; %s\n"
-#: ../cli/src/connections.c:6435
+#: ../clients/cli/connections.c:6805
#, c-format
msgid "Available properties: %s\n"
msgstr "鉦耜痍鈳鉦能眶鉦賴盒鈳鉦 鉦鈳鉦鉦鉦喪: %s\n"
-#: ../cli/src/connections.c:6443
+#: ../clients/cli/connections.c:6813
#, c-format
msgid "Error: property %s\n"
msgstr "鉦舟鉦: %s 鉦鈳鉦αn"
-#: ../cli/src/connections.c:6484
+#: ../clients/cli/connections.c:6854
+#, c-format
+#| msgid ""
+#| "Saving the connection with 'autoconnect=yes'. That might result in an "
+#| "immediate activation of the connection.\n"
+#| "Do you still want to save? [yes] "
msgid ""
"Saving the connection with 'autoconnect=yes'. That might result in an "
"immediate activation of the connection.\n"
-"Do you still want to save? [yes] "
+"Do you still want to save? %s"
msgstr ""
-"'autoconnect=yes' 鉦兒鉦鉦舟窒鉦鈳 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟. 鉦鉦舟 鉦詮鉦芹盒鈳鉦鉦 鉦戈鈳鉦獅產鉦 "
-"鉦鉦鉦舟 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦鈳鉦鈳 鉦鉦擒盒鉦鉦菽移鉦鈳鉦戈鉦戈畢鈳.\n"
-"鉦鉦舟盒鈳 鉦詮硃 鉦兒鉦菽畢鉦兒鉦兒 鉦鉦喪窒鉦詮眷鈳 鉦眇盔鉦詮鉦菽窒鉦啤移? [yes] "
+"'autoconnect=yes' 鉦兒鉦鉦舟窒鉦鈳 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟. 鉦鉦舟 鉦詮鉦芹盒鈳鉦鉦 鉦戈鈳鉦獅產鉦 鉦鉦鉦舟 "
+"鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦鈳鉦鈳 鉦鉦擒盒鉦鉦菽移鉦鈳鉦戈鉦戈畢鈳.\n"
+"鉦鉦舟盒鈳 鉦詮硃 鉦兒鉦菽畢鉦兒鉦兒 鉦鉦喪窒鉦詮眷鈳 鉦眇盔鉦詮鉦菽窒鉦啤移? %s"
-#: ../cli/src/connections.c:6557
+#: ../clients/cli/connections.c:6929
#, c-format
msgid "You may edit the following settings: %s\n"
msgstr "鉦兒鉦菽 鉦 鉦鈳鉦喪鉦賴疏 鉦詮窒鉦舟鉦抉略鈳鉦能疏鈳鉦兒 鉦詮鉦芹移鉦舟窒鉦詮痊鉦嫩鉦舟: %s\n"
-#: ../cli/src/connections.c:6583
+#: ../clients/cli/connections.c:6956
#, c-format
msgid ""
"The connection profile has been removed from another client. You may type "
@@ -2383,567 +2786,663 @@ msgstr ""
"鉦詮鉦芹盒鈳鉦鉦 鉦芹鉦啤鉦徇鉦耜 鉦鉦兒鉦兒 鉦眇鉦啤鉦鉦舟 鉦鈳鉦耜鉦鉦鈳鉦兒窒鉦鉦 鉦戈鉦鈳鉦舟鉦嫩移鉦鉦耜移鉦鉦賴畢鈳. 鉦兒鉦菽 鉦鉦舟疏鈳鉦兒 "
"鉦桌盒鉦喪窒鉦詮鉦丞移鉦芹窒鉦詮眷鈳 'save' 鉦鉦兒鉦兒 鉦兒皎鈳鉦舟窒鉦詮痊鉦嫩.\n"
-#: ../cli/src/connections.c:6613 ../cli/src/connections.c:6671
+#: ../clients/cli/connections.c:6985 ../clients/cli/connections.c:7040
#, c-format
msgid "Allowed values for '%s' property: %s\n"
msgstr "'%s' 鉦鈳鉦鉦鈳鉦鉦擒鉦賴疏 鉦鉦兒鉦桌略鉦 鉦鉦啤鉦 鉦桌鉦耜鉦能鉦喪: %s\n"
-#: ../cli/src/connections.c:6625 ../cli/src/connections.c:6842
+#: ../clients/cli/connections.c:6995 ../clients/cli/connections.c:7209
#, c-format
msgid "Error: no setting selected; valid are [%s]\n"
msgstr "鉦舟鉦: 鉦能移鉦菽鉦舟 鉦詮窒鉦舟鉦抉略鈳鉦能疏鈳鉦兒 鉦鉦啤窒鉦詮眷鉦擒鉦賴眷鈳鉦; ,鉦桌移鉦兒鉦能眶鉦擒畢鉦菽 [%s]\n"
-#: ../cli/src/connections.c:6626
+#: ../clients/cli/connections.c:6996
#, c-format
msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
msgstr ""
"鉦桌鉦舟眷鈳 'goto <setting>' 鉦鉦兒鉦兒, 鉦鉦丞眶 'set <setting>.<property>' 鉦鉦兒鉦兒 鉦眇眾鉦詮窒\n"
-#: ../cli/src/connections.c:6641 ../cli/src/connections.c:6779
-#: ../cli/src/connections.c:6859
+#: ../clients/cli/connections.c:7010 ../clients/cli/connections.c:7146
+#: ../clients/cli/connections.c:7226
#, c-format
msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
msgstr "鉦舟鉦: 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮窒鉦舟鉦抉略鈳 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 '%s'; 鉦桌移鉦兒鉦能眶鉦擒畢鉦菽 [%s]\n"
-#: ../cli/src/connections.c:6651
+#: ../clients/cli/connections.c:7020
#, c-format
msgid "Error: missing setting for '%s' property\n"
msgstr "鉦舟鉦: '%s' 鉦鈳鉦鉦鈳鉦鉦擒鉦 鉦詮窒鉦舟鉦抉略鈳鉦能 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦淚n"
-#: ../cli/src/connections.c:6658
+#: ../clients/cli/connections.c:7027
#, c-format
msgid "Error: invalid property: %s\n"
msgstr "鉦舟鉦: 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦鈳鉦鉦耜鈳鉦獅產 %s\n"
-#: ../cli/src/connections.c:6707
+#: ../clients/cli/connections.c:7074
#, c-format
msgid "Error: unknown setting '%s'\n"
msgstr "鉦舟鉦: 鉦鈳鉦戈鉦戈窒鉦啤畢 鉦詮窒鉦舟鉦抉略鈳 '%s'\n"
-#: ../cli/src/connections.c:6720
+#: ../clients/cli/connections.c:7087
#, c-format
msgid "You may edit the following properties: %s\n"
msgstr "鉦兒鉦菽 鉦 鉦鈳鉦喪鉦賴疏 鉦鈳鉦鉦鉦喪疏鈳鉦兒 鉦詮鉦芹移鉦舟窒鉦詮痊鉦嫩鉦舟: %s\n"
-#: ../cli/src/connections.c:6764
+#: ../clients/cli/connections.c:7131
#, c-format
msgid "Error: no argument given; valid are [%s]\n"
msgstr "鉦舟鉦: 鉦能移鉦菽鉦舟 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦兒鉦兒 鉦鉦舟鉦賴硫鉦耜移鉦鉦賴眷鈳鉦; 鉦桌移鉦兒鉦能眶鉦擒畢鉦菽 [%s]\n"
-#: ../cli/src/connections.c:6777
+#: ../clients/cli/connections.c:7144
#, c-format
msgid "Setting '%s' is not present in the connection.\n"
msgstr "鉦詮鉦芹盒鈳鉦鉦舟眷鈳鉦耜窒 '%s' 鉦詮窒鉦舟鉦抉略鈳鉦能 鉦鉦耜鉦.\n"
-#: ../cli/src/connections.c:6818
+#: ../clients/cli/connections.c:7185
#, c-format
msgid "Error: %s properties, nor it is a setting name.\n"
msgstr "鉦舟鉦: %s 鉦鈳鉦鉦鉦喪, 鉦鉦舟 鉦鉦鉦舟 鉦詮窒鉦舟鉦抉略鈳鉦 鉦嫩鉦詮盒鉦擒鉦賴眷鈳鉦.\n"
-#: ../cli/src/connections.c:6843
+#: ../clients/cli/connections.c:7210
#, c-format
msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
msgstr ""
-"鉦桌鉦舟眷鈳 'goto <setting>' 鉦鉦兒鉦兒, 鉦鉦丞眶 'describe <setting>.<property>' 鉦鉦兒鉦兒 "
-"鉦眇眾鉦詮窒\n"
+"鉦桌鉦舟眷鈳 'goto <setting>' 鉦鉦兒鉦兒, 鉦鉦丞眶 'describe <setting>.<property>' 鉦鉦兒鉦兒 鉦眇眾鉦詮窒\n"
-#: ../cli/src/connections.c:6884
+#: ../clients/cli/connections.c:7251
#, c-format
msgid "Error: invalid property: %s, neither a valid setting name.\n"
msgstr "鉦舟鉦: 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦鈳鉦: %s, 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮窒鉦舟鉦抉略鈳鉦 鉦嫩鉦詮盒鉦擒鉦賴眷鈳鉦.\n"
-#: ../cli/src/connections.c:6908
-#, c-format
-msgid "Error: '%s' setting not present\n"
-msgstr "鉦舟鉦: '%s' 鉦詮窒鉦舟鉦抉略鈳鉦能 鉦鉦詮鉦戈窒鉦戈鉦菽畢鉦耜鉦耜窒鉦耜鉦淚n"
-
-#: ../cli/src/connections.c:6911
+#: ../clients/cli/connections.c:7280
#, c-format
msgid "Error: unknown setting: '%s'\n"
msgstr "鉦舟鉦: 鉦鈳鉦戈鉦戈窒鉦啤畢 鉦詮窒鉦舟鉦抉略鈳 '%s'\n"
-#: ../cli/src/connections.c:6927
+#: ../clients/cli/connections.c:7285
+#, c-format
+#| msgid "Setting '%s' is not present in the connection.\n"
+msgid "Error: '%s' setting not present in the connection\n"
+msgstr "鉦舟鉦: 鉦詮鉦芹盒鈳鉦鉦舟眷鈳鉦耜窒 '%s' 鉦詮窒鉦舟鉦抉略鈳鉦能 鉦鉦耜鉦.\n"
+
+#: ../clients/cli/connections.c:7310
+#, c-format
+#| msgid "Error: invalid property: %s\n"
+msgid "Error: invalid property: %s%s\n"
+msgstr "鉦舟鉦: 鉦戈痕鈳鉦芹移鉦 鉦鈳鉦鉦耜鈳鉦獅產 %s%s\n"
+
+#: ../clients/cli/connections.c:7312
+#| msgid "Error: invalid property: %s, neither a valid setting name.\n"
+msgid ", neither a valid setting name"
+msgstr ", 鉦鉦鉦舟 鉦詮盒鉦賴盔鉦擒畢 鉦詮窒鉦舟鉦抉略鈳鉦 鉦嫩鉦詮盒鈳 鉦鉦鉦賴眷鈳鉦"
+
+#: ../clients/cli/connections.c:7332
#, c-format
msgid "Verify setting '%s': %s\n"
msgstr "'%s' 鉦詮窒鉦舟鉦抉略鈳鉦能疏鈳鉦兒 鉦芹盒鉦賴眸鈳鉦耜窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟: %s\n"
-#: ../cli/src/connections.c:6934
+#: ../clients/cli/connections.c:7339
#, c-format
msgid "Verify connection: %s\n"
msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦芹盒鉦賴眸鈳鉦耜窒鉦詮窒: %s\n"
-#: ../cli/src/connections.c:6973
+#: ../clients/cli/connections.c:7357
+#, c-format
+#| msgid "Error: invalid extra argument '%s'."
+msgid "Error: invalid argument '%s'\n"
+msgstr "鉦舟鉦: 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 '%s'.\n"
+
+#: ../clients/cli/connections.c:7390
#, c-format
msgid "Error: Failed to save '%s' (%s) connection: (%d) %s\n"
msgstr "鉦舟鉦: '%s' (%s) 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: (%d) %s\n"
-#: ../cli/src/connections.c:6980
+#: ../clients/cli/connections.c:7398
#, c-format
msgid "Connection '%s' (%s) successfully saved.\n"
msgstr "'%s' (%s) 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦能眸鉦詮鉦菽窒鉦能移鉦鉦 鉦鉦喪窒鉦詮眷鉦擒鉦賴畢鈳.\n"
-#: ../cli/src/connections.c:7014
+#: ../clients/cli/connections.c:7399
+#, c-format
+#| msgid "Connection '%s' (%s) successfully added.\n"
+msgid "Connection '%s' (%s) successfully updated.\n"
+msgstr "'%s' (%s) 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦能眸鉦詮鉦菽窒鉦能移鉦鉦 鉦鉦芹鉦﹤鉦鈳 鉦桌移鉦﹤眷鉦擒鉦賴畢鈳.\n"
+
+#: ../clients/cli/connections.c:7432
#, c-format
msgid "Error: connection verification failed: %s\n"
msgstr "鉦舟鉦: 鉦詮鉦芹盒鈳鉦鉦 鉦芹盒鉦賴眸鈳鉦耜疏鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s\n"
-#: ../cli/src/connections.c:7015
+#: ../clients/cli/connections.c:7433
msgid "(unknown error)"
msgstr "(鉦鈳鉦戈鉦戈窒鉦啤畢 鉦舟鉦)"
-#: ../cli/src/connections.c:7036
+#: ../clients/cli/connections.c:7454
#, c-format
msgid "Error: connection is not saved. Type 'save' first.\n"
msgstr "鉦舟鉦: 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮眷鉦擒鉦賴眷鈳鉦. 鉦桌鉦舟眷鈳 'save' 鉦鉦兒鉦兒 鉦兒皎鈳鉦舟窒鉦詮窒.\n"
-#: ../cli/src/connections.c:7040
+#: ../clients/cli/connections.c:7458
#, c-format
msgid "Error: connection is not valid: %s\n"
msgstr "鉦舟鉦: 鉦詮鉦芹盒鈳鉦鉦菽 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟移鉦鉦賴眷鈳鉦: %s\n"
-#: ../cli/src/connections.c:7051
+#: ../clients/cli/connections.c:7469
#, c-format
msgid "Error: Cannot activate connection: %s.\n"
msgstr "鉦舟鉦: 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮眷鉦擒鉦賴眷鈳鉦: %s.\n"
-#: ../cli/src/connections.c:7061
+#: ../clients/cli/connections.c:7479
#, c-format
msgid "Error: Failed to activate '%s' (%s) connection: (%d) %s\n"
msgstr "鉦舟鉦: '%s' (%s) 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: (%d) %s\n"
-#: ../cli/src/connections.c:7067
+#: ../clients/cli/connections.c:7485
#, c-format
msgid "Monitoring connection activation (press any key to continue)\n"
msgstr ""
"鉦詮鉦芹盒鈳鉦鉦 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦鈳鉦能疏鈳鉦兒 鉦桌鉦耜鉦菽窒鉦鉦擒盒鉦鈳 鉦兒瓷鈳鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟 (鉦桌鉦鉦舟鉦菽盒鈳鉦能眷鈳 鉦能移鉦菽鉦舟 "
-"鉦鈳鉦耜窒鉦能疏鈳鉦兒 鉦鉦戈鉦戈窒)\n"
+"鉦鈳鉦耜窒鉦能疏鈳鉦兒 "
+"鉦鉦戈鉦戈窒)\n"
-#: ../cli/src/connections.c:7105
+#: ../clients/cli/connections.c:7523
#, c-format
msgid "Error: status-line: %s\n"
msgstr "鉦舟鉦: 鉦詮鉦丞窒鉦戈窒-鉦詮移鉦耜: %s\n"
-#: ../cli/src/connections.c:7113
+#: ../clients/cli/connections.c:7531
#, c-format
msgid "Error: save-confirmation: %s\n"
msgstr "鉦舟鉦: 鉦鉦喪窒鉦鈳-鉦鉦鉦賴略鉦芹瓷鉦賴鈳: %s\n"
-#: ../cli/src/connections.c:7121
+#: ../clients/cli/connections.c:7539
#, c-format
msgid "Error: bad color number: '%s'; use <0-8>\n"
msgstr "鉦舟鉦: 鉦戈痕鈳鉦芹移鉦 鉦眇產鈳鉦鉦 鉦詮鉦鈳鉦能: '%s'; use <0-8>\n"
-#: ../cli/src/connections.c:7133
+#: ../clients/cli/connections.c:7551
#, c-format
msgid "Current nmcli configuration:\n"
msgstr "鉦芹鉦啤硫鉦鈳鉦 nmcli 鉦詮鉦啤鉦兒:\n"
-#: ../cli/src/connections.c:7141
+#: ../clients/cli/connections.c:7559
#, c-format
msgid "Invalid configuration option '%s'; allowed [%s]\n"
msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦啤鉦兒移 鉦鉦能鉦鈳 '%s'; 鉦鉦兒鉦桌略鉦賴硫鉦耜移鉦鈳鉦菽鉦舟 [%s]\n"
-#: ../cli/src/connections.c:7364
-#, c-format
-msgid ""
-">>> Command-line editing is not available. Consider installing a line "
-"editing library to enable the feature. <<<\n"
-"Supported libraries are:\n"
-" - GNU Readline (libreadline) http://cnswww.cns.cwru.edu/php/chet/"
-"readline/rltop.html\n"
-" - NetBSD Editline (libedit) http://www.thrysoee.dk/editline/\n"
-msgstr ""
-">>> 鉦鉦舟鉦-鉦詮移鉦耜窒鉦 鉦詮鉦芹移鉦舟疏鈳 鉦耜痍鈳鉦能眶鉦賴眷鈳鉦. 鉦 鉦詮鉦耜痍鈳鉦能眶鉦兒鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮眷鈳 鉦鉦鉦舟 鉦詮移鉦耜疏鈳鉦兒 "
-"鉦詮鉦芹移鉦舟窒鉦詮眷鈳 鉦耜鉦眇鉦啤盒鉦賴盔鉦兒鉦兒 鉦兒鉦菽 鉦鉦兒鉦詮鉦丞移鉦芹窒鉦詮痊鉦嫩鉦舟. <<<\n"
-"鉦眇鉦鉦眇眷鉦菽窒鉦啤鉦 鉦耜鉦眇鉦啤盒鉦賴鉦喪鉦鉦舟盒鈳:\n"
-" - GNU Readline (libreadline) http://cnswww.cns.cwru.edu/php/chet/"
-"readline/rltop.html\n"
-" - NetBSD Editline (libedit) http://www.thrysoee.dk/editline/\n"
-
-#: ../cli/src/connections.c:7390
+#: ../clients/cli/connections.c:7802
#, c-format
msgid "Error: only one of 'id', uuid, or 'path' can be provided."
msgstr "鉦舟鉦: 'id', uuid, 鉦鉦丞眶 'path' 鉦鉦兒鉦兒 鉦桌移鉦戈鉦 鉦鉦舟鉦賴硫鉦眇硃鈳鉦舟."
-#: ../cli/src/connections.c:7402 ../cli/src/connections.c:7599
+#: ../clients/cli/connections.c:7814 ../clients/cli/connections.c:8004
+#: ../clients/cli/connections.c:8011
#, c-format
msgid "Error: Unknown connection '%s'."
msgstr "鉦舟鉦: 鉦鈳鉦戈鉦戈窒鉦啤畢 鉦詮鉦芹盒鈳鉦 '%s'."
-#: ../cli/src/connections.c:7417
+#: ../clients/cli/connections.c:7829
#, c-format
msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
msgstr ""
"鉦鉦鈳鉦鉦啤窒鉦鈳: 鉦鉦鉦賴盒鈳鉦 鉦詮鉦芹盒鈳鉦 '%s' 鉦鉦兒鉦兒 鉦詮鉦芹移鉦舟窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟; 'type' 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 "
-"鉦鉦兒鉦兒 鉦鉦﹤鉦鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈窒鉦舟\n"
+"鉦鉦兒鉦兒 "
+"鉦鉦﹤鉦鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈窒鉦舟\n"
-#: ../cli/src/connections.c:7420
+#: ../clients/cli/connections.c:7832
#, c-format
msgid ""
"Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
msgstr ""
-"鉦鉦鈳鉦鉦啤窒鉦鈳: 鉦鉦鉦賴盒鈳鉦 鉦詮鉦芹盒鈳鉦 '%s' 鉦鉦兒鉦兒 鉦詮鉦芹移鉦舟窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟; 'con-name' "
-"鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦兒鉦兒 鉦鉦﹤鉦鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈窒鉦舟\n"
+"鉦鉦鈳鉦鉦啤窒鉦鈳: 鉦鉦鉦賴盒鈳鉦 鉦詮鉦芹盒鈳鉦 '%s' 鉦鉦兒鉦兒 鉦詮鉦芹移鉦舟窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟; 'con-name' 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 "
+"鉦鉦兒鉦兒 "
+"鉦鉦﹤鉦鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈窒鉦舟\n"
-#: ../cli/src/connections.c:7434
+#: ../clients/cli/connections.c:7846
#, c-format
msgid "Valid connection types: %s\n"
msgstr "鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鉦喪: %s\n"
-#: ../cli/src/connections.c:7436
+#: ../clients/cli/connections.c:7848
#, c-format
msgid "Error: invalid connection type; %s\n"
msgstr "鉦舟鉦: 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳: %s\n"
-#: ../cli/src/connections.c:7472
+#: ../clients/cli/connections.c:7887
#, c-format
msgid "===| nmcli interactive connection editor |==="
msgstr "===| nmcli 鉦詮鉦菽移鉦舟移鉦戈鉦桌 鉦詮鉦芹盒鈳鉦 鉦詮鉦芹移鉦舟 |==="
-#: ../cli/src/connections.c:7475
+#: ../clients/cli/connections.c:7890
#, c-format
msgid "Editing existing '%s' connection: '%s'"
msgstr "鉦鉦鉦賴盒鈳鉦 '%s' 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鉦芹移鉦舟窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟: '%s'"
-#: ../cli/src/connections.c:7477
+#: ../clients/cli/connections.c:7892
#, c-format
msgid "Adding a new '%s' connection"
msgstr "鉦鉦鉦舟 鉦嫩鉦 '%s' 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鉦啤窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟"
-#: ../cli/src/connections.c:7479
+#: ../clients/cli/connections.c:7894
#, c-format
msgid "Type 'help' or '?' for available commands."
msgstr "鉦耜痍鈳鉦能眶鉦賴盒鈳鉦 鉦鉦舟鉦嗣鉦喪窒鉦鉦擒鉦 'help' 鉦鉦丞眶 '?' 鉦鉦兒鉦兒 鉦鈳鉦芹 鉦桌移鉦﹤窒."
-#: ../cli/src/connections.c:7481
+#: ../clients/cli/connections.c:7896
#, c-format
msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
msgstr "鉦菽窒鉦菽盒鉦菽移鉦 鉦鈳鉦鉦 鉦菽窒鉦菽盒鉦鈳鉦鉦擒鉦 'describe [<setting>.<prop>]' 鉦鉦鉦舟 鉦鈳鉦芹 鉦桌移鉦﹤窒."
-#: ../cli/src/connections.c:7520
+#: ../clients/cli/connections.c:7932
#, c-format
msgid "Error: Failed to modify connection '%s': (%d) %s"
msgstr "鉦舟鉦: '%s' 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦桌移鉦啤鉦芹瓷鉦賴硫鉦耜 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: (%d) %s"
-#: ../cli/src/connections.c:7526
+#: ../clients/cli/connections.c:7938
#, c-format
msgid "Connection '%s' (%s) successfully modified.\n"
msgstr "'%s' (%s) 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦能眸鉦詮鉦菽窒鉦能移鉦鉦 鉦桌移鉦啤鉦芹瓷鉦賴硫鉦耜移鉦鉦賴畢鈳.\n"
-#: ../cli/src/connections.c:7553
+#: ../clients/cli/connections.c:7979
#, c-format
msgid "Error: No arguments provided."
msgstr "鉦舟鉦: 鉦能移鉦菽鉦舟 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪疏鈳鉦兒 鉦鉦舟鉦賴硫鉦耜移鉦鉦賴眷鈳鉦."
-#: ../cli/src/connections.c:7577
+#: ../clients/cli/connections.c:7998
#, c-format
msgid "Error: connection ID is missing."
msgstr "鉦舟鉦: 鉦詮鉦芹盒鈳鉦鉦 ID 鉦能 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦."
-#: ../cli/src/connections.c:7582
+#: ../clients/cli/connections.c:8020 ../clients/cli/connections.c:8033
#, c-format
msgid "Error: <setting>.<property> argument is missing."
msgstr "鉦舟鉦: <setting>.<property> 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦."
-#: ../cli/src/connections.c:7605
+#: ../clients/cli/connections.c:8038
+#, c-format
+#| msgid "Error: fields for '%s' options are missing."
+msgid "Error: value for '%s' is missing."
+msgstr "鉦舟鉦: '%s' 鉦鉦鉦 鉦桌鉦耜鉦能眶鈳 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦."
+
+#: ../clients/cli/connections.c:8056
#, c-format
msgid "Error: invalid <setting>.<property> '%s'."
msgstr "鉦舟鉦: 鉦鉦桌移鉦兒鉦能眶鉦擒畢 <setting>.<property> '%s'."
-#: ../cli/src/connections.c:7620
+#: ../clients/cli/connections.c:8064
#, c-format
msgid "Error: invalid or not allowed setting '%s': %s."
msgstr "鉦舟鉦: 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦丞眶 鉦鉦兒鉦桌略鉦 鉦鉦啤畢鈳 鉦鉦啤鉦 鉦詮窒鉦舟鉦抉略鈳 '%s': %s."
-#: ../cli/src/connections.c:7641
+#: ../clients/cli/connections.c:8085
#, c-format
msgid "Error: invalid property '%s': %s."
msgstr "鉦舟鉦: 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦鈳鉦鉦耜鈳鉦獅產 '%s': %s."
-#: ../cli/src/connections.c:7647
+#: ../clients/cli/connections.c:8096
#, c-format
msgid "Error: failed to modify %s.%s: %s."
msgstr "鉦舟鉦: %s.%s 鉦鉦兒鉦兒 鉦桌移鉦啤鉦芹瓷鉦賴硫鈳鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s."
-#: ../cli/src/connections.c:7677
+#: ../clients/cli/connections.c:8114
+#, c-format
+#| msgid "Error: failed to remove value of '%s': %s\n"
+msgid "Error: failed to remove a value from %s.%s: %s."
+msgstr "鉦舟鉦: %s.'%s' 鉦鉦鉦 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦戈鉦鈳鉦舟鉦嫩移鉦鈳鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s."
+
+#: ../clients/cli/connections.c:8150
#, c-format
msgid "Error: Connection deletion failed: %s"
msgstr "鉦舟鉦: 鉦詮鉦芹盒鈳鉦 鉦鉦喪窒鉦詮鉦菽窒鉦鈳鉦能 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s"
-#: ../cli/src/connections.c:7747
+#: ../clients/cli/connections.c:8221
#, c-format
msgid "Error: unknown connection: %s\n"
msgstr "鉦舟鉦: 鉦鈳鉦戈鉦戈窒鉦啤畢 鉦詮鉦芹盒鈳鉦: %s\n"
-#: ../cli/src/connections.c:7781
+#. truncate trailing ", "
+#: ../clients/cli/connections.c:8257
#, c-format
msgid "Error: cannot delete unknown connection(s): %s."
msgstr "鉦舟鉦: 鉦鈳鉦戈鉦戈窒鉦啤畢 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 (鉦鉦喪疏鈳鉦兒) 鉦鉦喪窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦賴眷鈳鉦: %s."
-#: ../cli/src/connections.c:7852
+#: ../clients/cli/connections.c:8328
#, c-format
msgid "Could not load file '%s'\n"
msgstr "'%s' 鉦鉦﹤略鉦菽疏鈳鉦兒 鉦耜鉦﹤ 鉦桌移鉦﹤眷鉦擒鉦賴眷鈳鉦淚n"
-#: ../cli/src/connections.c:7917
-#, c-format
-msgid ""
-"Error: 'configured' or 'active' command is expected for 'connection show'."
-msgstr ""
-"鉦舟鉦: 'connection show' 鉦鉦擒鉦 'configured' 鉦鉦丞眶 'active' 鉦鉦舟鉦嗣盔鉦兒鉦兒 "
-"鉦兒窒鉦啤鉦鈳鉦獅窒鉦詮眷鉦擒鉦賴畢鈳."
-
-#: ../cli/src/connections.c:7984
-#, c-format
-msgid "Error: '%s' is not valid 'connection' command."
-msgstr "鉦舟鉦: '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 'connection' 鉦鉦舟鉦嗣眶鉦擒鉦賴眷鈳鉦."
-
-#: ../cli/src/connections.c:8053 ../cli/src/network-manager.c:615
+#: ../clients/cli/connections.c:8441 ../clients/cli/network-manager.c:613
#, c-format
-msgid "Error: Could not get system settings."
-msgstr "鉦舟鉦: 鉦菽鉦能眶鉦詮鉦丞鉦 鉦詮窒鉦舟鉦抉略鈳鉦鉦喪 鉦鉦鉦﹤鉦眇鉦舟窒鉦耜鉦."
+#| msgid "Error: Could not get system settings."
+msgid "Error: Could not get system settings: %s."
+msgstr "鉦舟鉦: 鉦菽鉦能眶鉦詮鉦丞鉦 鉦詮窒鉦舟鉦抉略鈳鉦鉦喪疏鈳鉦兒 鉦芹瓷鈳鉦能眷鉦擒鉦賴眷鈳鉦: %s."
-#: ../cli/src/connections.c:8063
+#: ../clients/cli/connections.c:8451
#, c-format
msgid "Error: Can't obtain connections: settings service is not running."
msgstr "鉦舟鉦: 鉦詮鉦芹盒鈳鉦鉦鉦喪疏鈳鉦兒 鉦芹瓷鈳鉦能眷鉦擒鉦賴眷鈳鉦: 鉦詮窒鉦舟鉦抉略鈳鉦鉦 鉦詮鉦菽鉦能 鉦鉦擒眷鉦兒鉦能眷鈳鉦耜窒鉦耜鉦."
-#: ../cli/src/devices.c:71 ../cli/src/devices.c:87 ../cli/src/devices.c:184
-#: ../cli/src/devices.c:201
-msgid "DEVICE"
-msgstr "DEVICE"
+#: ../clients/cli/connections.c:8505
+#, c-format
+msgid "Error: '%s' is not valid 'connection' command."
+msgstr "鉦舟鉦: '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 'connection' 鉦鉦舟鉦嗣眶鉦擒鉦賴眷鈳鉦."
+
+#. define some prompts
+#: ../clients/cli/devices.c:36
+msgid "Interface: "
+msgstr "鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏: "
-#: ../cli/src/devices.c:75 ../cli/src/devices.c:103
+#. 3
+#. 17
+#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:73
msgid "CONNECTION"
msgstr "CONNECTION"
-#: ../cli/src/devices.c:76 ../cli/src/devices.c:104
+#. 4
+#. 18
+#: ../clients/cli/devices.c:45 ../clients/cli/devices.c:74
msgid "CON-UUID"
msgstr "CON-UUID"
-#: ../cli/src/devices.c:89
+#. 2
+#: ../clients/cli/devices.c:58
msgid "VENDOR"
msgstr "VENDOR"
-#: ../cli/src/devices.c:90
+#. 3
+#: ../clients/cli/devices.c:59
msgid "PRODUCT"
msgstr "PRODUCT"
-#: ../cli/src/devices.c:91
+#. 4
+#: ../clients/cli/devices.c:60
msgid "DRIVER"
msgstr "DRIVER"
-#: ../cli/src/devices.c:92
+#. 5
+#: ../clients/cli/devices.c:61
msgid "DRIVER-VERSION"
msgstr "DRIVER-VERSION"
-#: ../cli/src/devices.c:93
+#. 6
+#: ../clients/cli/devices.c:62
msgid "FIRMWARE-VERSION"
msgstr "FIRMWARE-VERSION"
-#: ../cli/src/devices.c:94
+#. 7
+#: ../clients/cli/devices.c:63
msgid "HWADDR"
msgstr "HWADDR"
-#: ../cli/src/devices.c:95 ../tui/nmt-page-ethernet.c:86
-#: ../tui/nmt-page-infiniband.c:90 ../tui/nmt-page-vlan.c:138
-#: ../tui/nmt-page-wifi.c:364
+#. 8
+#: ../clients/cli/devices.c:64 ../clients/tui/nmt-page-ethernet.c:86
+#: ../clients/tui/nmt-page-infiniband.c:96 ../clients/tui/nmt-page-vlan.c:130
+#: ../clients/tui/nmt-page-wifi.c:363
msgid "MTU"
msgstr "MTU"
-#: ../cli/src/devices.c:97
+#. 10
+#: ../clients/cli/devices.c:66
msgid "REASON"
msgstr "REASON"
-#: ../cli/src/devices.c:98
+#. 11
+#: ../clients/cli/devices.c:67
msgid "UDI"
msgstr "UDI"
-#: ../cli/src/devices.c:99
+#. 12
+#: ../clients/cli/devices.c:68
msgid "IP-IFACE"
msgstr "IP-IFACE"
-#: ../cli/src/devices.c:100
+#. 13
+#. 2
+#: ../clients/cli/devices.c:69 ../clients/cli/devices.c:97
+msgid "IS-SOFTWARE"
+msgstr "IS-SOFTWARE"
+
+#. 14
+#: ../clients/cli/devices.c:70
msgid "NM-MANAGED"
msgstr "NM-MANAGED"
-#: ../cli/src/devices.c:102
+#. 16
+#: ../clients/cli/devices.c:72
msgid "FIRMWARE-MISSING"
msgstr "FIRMWARE-MISSING"
-#: ../cli/src/devices.c:115
+#. 0
+#: ../clients/cli/devices.c:85
msgid "AVAILABLE-CONNECTION-PATHS"
msgstr "AVAILABLE-CONNECTION-PATHS"
-#: ../cli/src/devices.c:116
+#. 1
+#: ../clients/cli/devices.c:86
msgid "AVAILABLE-CONNECTIONS"
msgstr "AVAILABLE-CONNECTIONS"
-#: ../cli/src/devices.c:125
+#. 0
+#: ../clients/cli/devices.c:95
msgid "CARRIER-DETECT"
msgstr "CARRIER-DETECT"
-#: ../cli/src/devices.c:126
+#. 1
+#: ../clients/cli/devices.c:96
msgid "SPEED"
msgstr "SPEED"
-#: ../cli/src/devices.c:135
+#. 0
+#: ../clients/cli/devices.c:106
msgid "CARRIER"
msgstr "CARRIER"
-#: ../cli/src/devices.c:144 ../cli/src/devices.c:563
+#. 0
+#: ../clients/cli/devices.c:115 ../clients/cli/devices.c:550
msgid "WEP"
msgstr "WEP"
-#: ../cli/src/devices.c:145
+#. 1
+#: ../clients/cli/devices.c:116
msgid "WPA"
msgstr "WPA"
-#: ../cli/src/devices.c:146 ../cli/src/devices.c:571
+#. 2
+#: ../clients/cli/devices.c:117 ../clients/cli/devices.c:558
msgid "WPA2"
msgstr "WPA2"
-#: ../cli/src/devices.c:147
+#. 3
+#: ../clients/cli/devices.c:118
msgid "TKIP"
msgstr "TKIP"
-#: ../cli/src/devices.c:148
+#. 4
+#: ../clients/cli/devices.c:119
msgid "CCMP"
msgstr "CCMP"
-#: ../cli/src/devices.c:149 ../cli/src/devices.c:239
+#. 5
+#. 2
+#: ../clients/cli/devices.c:120 ../clients/cli/devices.c:210
msgid "AP"
msgstr "AP"
-#: ../cli/src/devices.c:150
+#. 6
+#: ../clients/cli/devices.c:121
msgid "ADHOC"
msgstr "ADHOC"
-#: ../cli/src/devices.c:159
+#. 0
+#: ../clients/cli/devices.c:130
msgid "CTR-FREQ"
msgstr "CTR-FREQ"
-#: ../cli/src/devices.c:160
+#. 1
+#: ../clients/cli/devices.c:131
msgid "RSSI"
msgstr "RSSI"
-#: ../cli/src/devices.c:161
+#. 2
+#: ../clients/cli/devices.c:132
msgid "CINR"
msgstr "CINR"
-#: ../cli/src/devices.c:162
+#. 3
+#: ../clients/cli/devices.c:133
msgid "TX-POW"
msgstr "TX-POW"
-#: ../cli/src/devices.c:163
+#. 4
+#: ../clients/cli/devices.c:134
msgid "BSID"
msgstr "BSID"
-#: ../cli/src/devices.c:172 ../tui/nmt-page-wifi.c:221
+#. 0
+#: ../clients/cli/devices.c:143 ../clients/tui/nmt-page-wifi.c:220
msgid "SSID"
msgstr "SSID"
-#: ../cli/src/devices.c:173
+#. 1
+#: ../clients/cli/devices.c:144
msgid "SSID-HEX"
msgstr "SSID-HEX"
-#: ../cli/src/devices.c:174 ../tui/nmt-page-wifi.c:352
+#. 2
+#: ../clients/cli/devices.c:145 ../clients/tui/nmt-page-wifi.c:351
msgid "BSSID"
msgstr "BSSID"
-#: ../cli/src/devices.c:175
+#. 3
+#: ../clients/cli/devices.c:146
msgid "MODE"
msgstr "MODE"
-#: ../cli/src/devices.c:176
+#. 4
+#: ../clients/cli/devices.c:147
msgid "CHAN"
msgstr "CHAN"
-#: ../cli/src/devices.c:177
+#. 5
+#: ../clients/cli/devices.c:148
msgid "FREQ"
msgstr "FREQ"
-#: ../cli/src/devices.c:178
+#. 6
+#: ../clients/cli/devices.c:149
msgid "RATE"
msgstr "RATE"
-#: ../cli/src/devices.c:179 ../cli/src/devices.c:199
+#. 7
+#. 1
+#: ../clients/cli/devices.c:150 ../clients/cli/devices.c:170
msgid "SIGNAL"
msgstr "SIGNAL"
-#: ../cli/src/devices.c:180
+#. 8
+#: ../clients/cli/devices.c:151
msgid "BARS"
msgstr "BARS"
-#: ../cli/src/devices.c:181
+#. 9
+#: ../clients/cli/devices.c:152
msgid "SECURITY"
msgstr "SECURITY"
-#: ../cli/src/devices.c:182
+#. 10
+#: ../clients/cli/devices.c:153
msgid "WPA-FLAGS"
msgstr "WPA-FLAGS"
-#: ../cli/src/devices.c:183
+#. 11
+#: ../clients/cli/devices.c:154
msgid "RSN-FLAGS"
msgstr "RSN-FLAGS"
-#: ../cli/src/devices.c:185 ../cli/src/devices.c:202
-msgid "ACTIVE"
-msgstr "ACTIVE"
-
-#: ../cli/src/devices.c:186
+#. 14
+#: ../clients/cli/devices.c:157
msgid "*"
msgstr "*"
-#: ../cli/src/devices.c:198 ../cli/src/devices.c:242
+#. 0
+#. 5
+#: ../clients/cli/devices.c:169 ../clients/cli/devices.c:213
msgid "NSP"
msgstr "NSP"
-#: ../cli/src/devices.c:213
+#. 0
+#: ../clients/cli/devices.c:184
msgid "SLAVES"
msgstr "SLAVES"
-#: ../cli/src/devices.c:222
+#. 0
+#: ../clients/cli/devices.c:193
msgid "ID"
msgstr "ID"
-#: ../cli/src/devices.c:237
+#. 0
+#: ../clients/cli/devices.c:208
msgid "CAPABILITIES"
msgstr "CAPABILITIES"
-#: ../cli/src/devices.c:238
+#. 1
+#: ../clients/cli/devices.c:209
msgid "WIFI-PROPERTIES"
msgstr "WIFI-PROPERTIES"
-#: ../cli/src/devices.c:240
+#. 3
+#: ../clients/cli/devices.c:211
msgid "WIRED-PROPERTIES"
msgstr "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:241
+#. 4
+#: ../clients/cli/devices.c:212
msgid "WIMAX-PROPERTIES"
msgstr "WIMAX-PROPERTIES"
-#: ../cli/src/devices.c:247 ../tui/nmt-page-bond.c:73
+#. 10
+#: ../clients/cli/devices.c:218 ../clients/tui/nmt-page-bond.c:73
msgid "BOND"
msgstr "BOND"
-#: ../cli/src/devices.c:248 ../tui/nm-editor-utils.c:227
-#: ../tui/nm-ui-utils.c:355 ../tui/nm-ui-utils.c:580 ../tui/nmt-page-vlan.c:53
-msgid "VLAN"
-msgstr "VLAN"
-
-#: ../cli/src/devices.c:249
+#. 12
+#: ../clients/cli/devices.c:220
msgid "CONNECTIONS"
msgstr "CONNECTIONS"
-#: ../cli/src/devices.c:274
-#, c-format
+#: ../clients/cli/devices.c:245
+#, c-format
+#| msgid ""
+#| "Usage: nmcli device { COMMAND | help }\n"
+#| "\n"
+#| "COMMAND := { status | show | connect | disconnect | wifi | wimax }\n"
+#| "\n"
+#| "COMMAND := { status | show | connect | disconnect | wifi }\n"
+#| "\n"
+#| " status\n"
+#| "\n"
+#| " show [<ifname>]\n"
+#| "\n"
+#| " connect <ifname>\n"
+#| "\n"
+#| " disconnect <ifname>\n"
+#| "\n"
+#| " wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
+#| "\n"
+#| " wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
+#| "[ifname <ifname>]\n"
+#| " [bssid <BSSID>] [name <name>] [private yes|no]\n"
+#| "\n"
+#| " wifi rescan [[ifname] <ifname>]\n"
+#| "\n"
+#| " wimax [list [ifname <ifname>] [nsp <name>]]\n"
+#| "\n"
msgid ""
"Usage: nmcli device { COMMAND | help }\n"
"\n"
-"COMMAND := { status | show | connect | disconnect | wifi | wimax }\n"
+"COMMAND := { status | show | connect | disconnect | delete | wifi | wimax }\n"
"\n"
-"COMMAND := { status | show | connect | disconnect | wifi }\n"
+"COMMAND := { status | show | connect | disconnect | delete | wifi }\n"
"\n"
" status\n"
"\n"
@@ -2953,6 +3452,8 @@ msgid ""
"\n"
" disconnect <ifname>\n"
"\n"
+" delete <ifname>\n"
+"\n"
" wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
"\n"
" wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
@@ -2966,9 +3467,9 @@ msgid ""
msgstr ""
"鉦眇眾鉦鈳: nmcli device { COMMAND | help }\n"
"\n"
-"COMMAND := { status | show | connect | disconnect | wifi | wimax }\n"
+"COMMAND := { status | show | connect | disconnect | delete | wifi | wimax }\n"
"\n"
-"COMMAND := { status | show | connect | disconnect | wifi }\n"
+"COMMAND := { status | show | connect | disconnect | delete | wifi }\n"
"\n"
" status\n"
"\n"
@@ -2978,6 +3479,8 @@ msgstr ""
"\n"
" disconnect <ifname>\n"
"\n"
+" delete <ifname>\n"
+"\n"
" wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
"\n"
" wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
@@ -2989,7 +3492,7 @@ msgstr ""
" wimax [list [ifname <ifname>] [nsp <name>]]\n"
"\n"
-#: ../cli/src/devices.c:298
+#: ../clients/cli/devices.c:270
#, c-format
msgid ""
"Usage: nmcli device status { help }\n"
@@ -3000,8 +3503,10 @@ msgid ""
" TYPE - device type\n"
" STATE - device state\n"
" CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' "
+"is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device "
+"status'.\n"
"\n"
msgstr ""
"鉦眇眾鉦鈳: nmcli device status { help }\n"
@@ -3018,7 +3523,7 @@ msgstr ""
"'nmcli device status' 鉦鉦兒鉦兒 鉦鉦耜移鉦能窒鉦詮鉦戈鉦戈畢鈳 鉦鉦鉦舟移鉦鉦賴盒鈳鉦戈鉦戈畢鈳.\n"
"\n"
-#: ../cli/src/devices.c:314
+#: ../clients/cli/devices.c:286
#, c-format
msgid ""
"Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -3038,7 +3543,7 @@ msgstr ""
"鉦戈鉦啤窒鉦詮鉦戈鉦戈畢鈳.\n"
"\n"
-#: ../cli/src/devices.c:326
+#: ../clients/cli/devices.c:298
#, c-format
msgid ""
"Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -3046,8 +3551,8 @@ msgid ""
"ARGUMENTS := <ifname>\n"
"\n"
"Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be activated."
-"\n"
+"NetworkManager will try to find a suitable connection that will be "
+"activated.\n"
"It will also consider connections that are not set to auto-connect.\n"
"\n"
msgstr ""
@@ -3062,7 +3567,7 @@ msgstr ""
"鉦芹盒鉦賴鉦鉦賴硫鈳鉦戈鉦戈畢鈳.\n"
"\n"
-#: ../cli/src/devices.c:339
+#: ../clients/cli/devices.c:311
#, c-format
msgid ""
"Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -3084,7 +3589,39 @@ msgstr ""
"鉦詮鉦芹盒鈳鉦鉦鉦喪疏鈳鉦兒 鉦詮鉦菽盔鉦-鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮鉦菽鉦舟疏鈳鉦兒 鉦戈瓷鈳鉦能鉦戈鉦戈畢鈳.\n"
"\n"
-#: ../cli/src/devices.c:352
+#: ../clients/cli/devices.c:324
+#, c-format
+#| msgid ""
+#| "Usage: nmcli device show { ARGUMENTS | help }\n"
+#| "\n"
+#| "ARGUMENTS := [<ifname>]\n"
+#| "\n"
+#| "Show details of device(s).\n"
+#| "The command lists details for all devices, or for a given device.\n"
+#| "\n"
+msgid ""
+"Usage: nmcli device delete { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := <ifname>\n"
+"\n"
+"Deletes the software device.\n"
+"The command removes the interface. It only works for software devices\n"
+"(like bonds, bridges, etc.). Hardware devices cannot be deleted by the\n"
+"command.\n"
+"\n"
+msgstr ""
+"鉦眇眾鉦鈳: nmcli device show { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [<ifname>]\n"
+"\n"
+"鉦戈鉦戈鉦啤移鉦鉦 鉦詮移鉦抉疏鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮鉦戈鉦戈畢鈳.\n"
+"鉦鉦舟鉦嗣眶鈳 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦菽疏鈳鉦兒 鉦戈鉦鈳鉦舟鉦嫩移鉦鈳鉦戈鉦戈畢鈳. 鉦鉦舟 鉦鈳鉦菽眷 鉦戈鉦戈鉦啤移鉦鉦 鉦詮移鉦抉疏鉦鉦喪眷鈳鉦耜窒 "
+"(鉦眇移鉦鉦﹤鉦鉦喪, 鉦眇鉦啤窒鉦鈳鉦鉦喪\n"
+"鉦鉦戈鉦能移鉦舟窒鉦能鉦戈硃) 鉦桌移鉦戈鉦 鉦鈳鉦耜硫 鉦桌移鉦﹤鉦戈鉦戈畢鈳. 鉦 鉦鉦舟鉦嗣畢鉦賴鉦 鉦能鉦戈鉦啤移鉦鉦 鉦詮移鉦抉疏鉦鉦喪疏鈳鉦兒 鉦鉦喪窒鉦詮眷鈳 \n"
+"鉦詮移鉦抉鉦能眶鉦賴盒鈳鉦菽鉦舟窒鉦耜鉦淚n"
+"\n"
+
+#: ../clients/cli/devices.c:338
#, c-format
msgid ""
"Usage: nmcli device wifi { ARGUMENTS | help }\n"
@@ -3096,8 +3633,8 @@ msgid ""
"List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
"used to list APs for a particular interface, or with a specific BSSID.\n"
"\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
-"key|phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
+"phrase] [ifname <ifname>]\n"
" [bssid <BSSID>] [name <name>] [private yes|no]\n"
"\n"
"Connect to a Wi-Fi network specified by SSID or BSSID. The command creates\n"
@@ -3111,8 +3648,10 @@ msgid ""
"\n"
"ARGUMENTS := rescan [[ifname] <ifname>]\n"
"\n"
-"Request that NetworkManager immediately re-scan for available access points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
+"Request that NetworkManager immediately re-scan for available access "
+"points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
+"might\n"
"be useful to start scanning manually. Note that this command does not show\n"
"the APs, use 'nmcli device wifi list' for that.\n"
"\n"
@@ -3128,24 +3667,26 @@ msgstr ""
"鉦鉦丞眶 鉦鉦鉦舟 鉦兒窒鉦嗣鉦鉦賴略 BSSID 鉦鉦擒鉦 AP 鉦鉦喪疏鈳鉦兒 鉦芹鈳鉦鉦 鉦桌移鉦﹤眷鈳 'ifname' 鉦桌略鈳鉦戈 'bssid' "
"鉦鉦能鉦鈳鉦鉦喪疏鈳鉦兒 鉦眇眾鉦詮痊鉦嫩鉦舟.\n"
"\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
-"key|phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
+"phrase] [ifname <ifname>]\n"
" [bssid <BSSID>] [name <name>] [private yes|no]\n"
"\n"
"SSID 鉦鉦丞眶 BSSID 鉦鉦鉦 鉦詮鉦鉦賴硫鉦耜移鉦 鉦鉦鉦舟 鉦菽-鉦徇 鉦鉦擒眷鉦眇鉦抉鈳鉦鈳 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉窒鉦詮窒. 鉦鉦舟鉦嗣眶鈳 鉦鉦鉦舟 "
"鉦嫩鉦稞n"
-"鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦啤鉦賴硫鈳鉦戈鉦戈畢鈳 鉦桌略鈳鉦戈 鉦鉦舟疏鈳鉦兒 鉦鉦鉦舟 鉦詮移鉦抉疏鉦舟眷鈳鉦耜窒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮鉦戈鉦戈畢鈳. 鉦鉦舟 "
-"GUI 鉦鈳鉦耜鉦鉦鈳鉦兒眷鈳鉦耜窒 SSID 鉦珮n"
+"鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦啤鉦賴硫鈳鉦戈鉦戈畢鈳 鉦桌略鈳鉦戈 鉦鉦舟疏鈳鉦兒 鉦鉦鉦舟 鉦詮移鉦抉疏鉦舟眷鈳鉦耜窒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮鉦戈鉦戈畢鈳. 鉦鉦舟 GUI "
+"鉦鈳鉦耜鉦鉦鈳鉦兒眷鈳鉦耜窒 SSID 鉦珮n"
"鉦桌鉦耜 鉦鈳鉦耜窒鉦鈳 鉦桌移鉦﹤窒鉦舟移鉦 鉦鉦鉦鉦擒鈳鉦 鉦眇畢鉦耜移鉦菽產鈳鉦鉦 鉦鉦鉦舟 鉦鉦舟鉦-鉦詮移鉦耜窒鉦 鉦冢移鉦鉦菽移鉦鉦賴盒鈳鉦戈鉦戈畢鈳. 鉦鉦舟鉦嗣眶鈳 "
"\n"
"鉦能移鉦菽移鉦鉦耜 鉦鉦鉦舟 鉦嫩鉦 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦啤鉦賴硫鈳鉦戈鉦戈畢鈳 鉦桌略鈳鉦戈 鉦鉦舟 鉦桌鉦鈳鉦能眶鉦擒鉦 鉦菽-鉦徇 "
"鉦鉦擒眷鉦眇鉦抉鉦喪鉦鉦舟窒鉦鈳\n"
"鉦詮鉦芹盒鈳鉦鉦詮移鉦抉窒鉦詮鉦菽移鉦 鉦詮硃鉦擒盔鉦鉦菽移鉦鈳鉦戈鉦戈畢鈳. 鉦鉦擒眷鉦眇鉦抉鈳鉦鉦擒鉦 鉦鉦鉦舟 鉦詮鉦芹盒鈳鉦鉦菽 鉦鉦鉦擒鉦耜 "
"鉦鉦詮鉦戈窒鉦戈鉦菽畢鉦耜鉦耜窒鉦舟鉦舟盒鈳, 鉦\n"
-"鉦鈳鉦喪鉦賴疏鉦鉦戈 鉦鉦鉦擒鉦耜 鉦鉦啤鉦 鉦鉦鉦舟 鉦芹鉦啤鉦徇鉦耜 鉦鉦兒鉦兒 鉦桌鉦耜鈳鉦鈳 鉦戈盒鈳鉦菽鉦舟 鉦鉦戈鉦戈皎: nmcli con "
-"up id <name>.\n"
+"鉦鈳鉦喪鉦賴疏鉦鉦戈 鉦鉦鉦擒鉦耜 鉦鉦啤鉦 鉦鉦鉦舟 鉦芹鉦啤鉦徇鉦耜 鉦鉦兒鉦兒 鉦桌鉦耜鈳鉦鈳 鉦戈盒鈳鉦菽鉦舟 鉦鉦戈鉦戈皎: nmcli con up "
+"id "
+"<name>.\n"
"鉦芹鉦啤硫鉦鈳鉦 鉦鈳鉦菽眷 鉦桌鉦鈳鉦, WEP 鉦桌略鈳鉦戈 WPA-PSK 鉦鉦擒眷鉦眇鉦抉鉦喪 鉦桌移鉦戈鉦 鉦眇鉦鉦眇眷鉦賴略鉦菽移鉦鉦賴眶鈳 "
-"鉦鉦兒鉦兒鉦菽鉦舟疏鈳鉦兒 鉦兒鉦兒痕鉦賴瓷鉦. \n"
+"鉦鉦兒鉦兒鉦菽鉦舟疏鈳鉦兒 "
+"鉦兒鉦兒痕鉦賴瓷鉦. \n"
"IP 鉦詮鉦啤鉦兒鉦能疏鈳鉦兒 鉦詮硃 DHCP 鉦桌鉦鉦擒鉦戈盒 鉦芹瓷鈳鉦能眷鉦擒鈳鉦戈鉦戈畢鈳 鉦鉦鉦舟 鉦鉦嫩窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
"\n"
"ARGUMENTS := rescan [[ifname] <ifname>]\n"
@@ -3158,7 +3699,7 @@ msgstr ""
"鉦戈鉦啤窒鉦詮鉦菽鉦舟窒鉦耜鉦, 鉦鉦舟鈳鉦鉦擒鉦 'nmcli device wifi list' 鉦鉦兒鉦兒 鉦眇眾鉦詮窒.\n"
"\n"
-#: ../cli/src/devices.c:386
+#: ../clients/cli/devices.c:372
#, c-format
msgid ""
"Usage: nmcli device wimax { ARGUMENTS | help }\n"
@@ -3177,347 +3718,382 @@ msgstr ""
"\n"
"ARGUMENTS := [list [ifname <ifname>] [nsp <name>]]\n"
"\n"
-"鉦耜痍鈳鉦能眶鉦賴盒鈳鉦 WiMAX NSP鉦鉦 鉦芹鈳鉦鉦賴盔鉦兒鉦兒 鉦戈鉦啤窒鉦詮. 鉦鉦鉦舟 鉦兒窒鉦啤鉦舟窒鉦獅鉦 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦鈳鉦鉦擒鉦, "
-"鉦鉦丞眶 鉦鉦鉦舟 鉦兒窒鉦嗣鉦鉦賴略\n"
+"鉦耜痍鈳鉦能眶鉦賴盒鈳鉦 WiMAX NSP鉦鉦 鉦芹鈳鉦鉦賴盔鉦兒鉦兒 鉦戈鉦啤窒鉦詮. 鉦鉦鉦舟 鉦兒窒鉦啤鉦舟窒鉦獅鉦 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦鈳鉦鉦擒鉦, 鉦鉦丞眶 "
+"鉦鉦鉦舟 "
+"鉦兒窒鉦嗣鉦鉦賴略\n"
" NSP 鉦鉦擒鉦賴疏 鉦鉦擒眷鉦眇鉦抉鉦 鉦芹鈳鉦鉦賴盔鉦兒鉦兒 鉦兒鉦﹤眷鈳 'ifname' 鉦桌略鈳鉦戈 'nsp' 鉦鉦能鉦鈳鉦鉦喪疏鈳鉦兒 "
"鉦眇眾鉦詮痊鉦嫩鉦舟.\n"
"\n"
-#: ../cli/src/devices.c:480
+#: ../clients/cli/devices.c:461
msgid "(none)"
msgstr "(鉦能移鉦菽鉦舟 鉦鉦耜鉦)"
-#: ../cli/src/devices.c:547
+#: ../clients/cli/devices.c:534
#, c-format
msgid "%u MHz"
msgstr "%u MHz"
-#: ../cli/src/devices.c:548
+#: ../clients/cli/devices.c:535
#, c-format
msgid "%u Mbit/s"
msgstr "%u Mbit/s"
-#: ../cli/src/devices.c:567
+#: ../clients/cli/devices.c:554
msgid "WPA1"
msgstr "WPA1"
-#: ../cli/src/devices.c:576
+#: ../clients/cli/devices.c:563
msgid "802.1X"
msgstr "802.1X"
-#: ../cli/src/devices.c:592
+#: ../clients/cli/devices.c:579
msgid "Ad-Hoc"
msgstr "鉦戈移鉦戈鉦鉦擒眷鉦賴"
-#: ../cli/src/devices.c:593
+#: ../clients/cli/devices.c:580
msgid "Infra"
msgstr "鉦鉦兒鉦徇鉦啤移"
-#: ../cli/src/devices.c:625
+#: ../clients/cli/devices.c:612
msgid "Home"
msgstr "鉦兒鉦耜"
-#: ../cli/src/devices.c:628
+#: ../clients/cli/devices.c:615
msgid "Partner"
msgstr "鉦芹移鉦耜鉦舟移鉦"
-#: ../cli/src/devices.c:631
+#: ../clients/cli/devices.c:618
msgid "Roaming"
msgstr "鉦啤鉦桌窒鉦鉦鈳"
-#: ../cli/src/devices.c:725
+#: ../clients/cli/devices.c:712
msgid "Device details"
msgstr "鉦詮移鉦抉疏鉦 鉦菽窒鉦菽盒鉦鉦喪"
-#: ../cli/src/devices.c:737
+#: ../clients/cli/devices.c:724
#, c-format
msgid "Error: 'device show': %s"
msgstr "鉦舟鉦: 'device show': %s"
-#: ../cli/src/devices.c:787 ../cli/src/devices.c:790 ../cli/src/devices.c:1334
-#: ../cli/src/devices.c:1474
+#: ../clients/cli/devices.c:775 ../clients/cli/devices.c:778
+#: ../clients/cli/devices.c:1326 ../clients/cli/devices.c:1468
+#: ../clients/cli/devices.c:1580
msgid "(unknown)"
msgstr "(鉦鈳鉦戈鉦戈窒鉦啤畢)"
-#: ../cli/src/devices.c:827
+#: ../clients/cli/devices.c:816
#, c-format
msgid "%u Mb/s"
msgstr "%u Mb/s"
-#: ../cli/src/devices.c:913
+#: ../clients/cli/devices.c:902
msgid "on"
msgstr "鉦鉦兒"
-#: ../cli/src/devices.c:913
+#: ../clients/cli/devices.c:902
msgid "off"
msgstr "鉦鉦徇"
-#: ../cli/src/devices.c:1188
+#: ../clients/cli/devices.c:1177
#, c-format
msgid "Error: 'device status': %s"
msgstr "鉦舟鉦: 'device status': %s"
-#: ../cli/src/devices.c:1206
+#. Add headers
+#: ../clients/cli/devices.c:1195
msgid "Status of devices"
msgstr "鉦詮移鉦抉疏鉦鉦 鉦詮鉦丞窒鉦戈窒"
-#: ../cli/src/devices.c:1237
+#: ../clients/cli/devices.c:1226
#, c-format
msgid "Error: invalid extra argument '%s'."
msgstr "鉦舟鉦: 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦嫩鉦鈳鉦鈳鉦菽盒鉦 鉦兒窒鉦能略鉦擒鉦 '%s'."
-#: ../cli/src/devices.c:1265 ../cli/src/devices.c:1422
-#: ../cli/src/devices.c:1557 ../cli/src/devices.c:1696
-#: ../cli/src/devices.c:2436
+#: ../clients/cli/devices.c:1254 ../clients/cli/devices.c:1416
+#: ../clients/cli/devices.c:1550 ../clients/cli/devices.c:1644
+#: ../clients/cli/devices.c:1788 ../clients/cli/devices.c:2546
#, c-format
msgid "Error: Device '%s' not found."
msgstr "鉦舟鉦: '%s' 鉦鉦鉦 鉦詮移鉦抉疏鉦菽 鉦鉦鉦﹤ 鉦眇鉦舟窒鉦耜鉦."
-#: ../cli/src/devices.c:1319
+#: ../clients/cli/devices.c:1309
#, c-format
-msgid "Success: Device '%s' successfully activated."
-msgstr "鉦能眸鉦詮鉦詮: '%s' 鉦鉦鉦 鉦詮移鉦抉疏鉦菽疏鈳鉦兒 鉦能眸鉦詮鉦菽窒鉦能移鉦鉦 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮眷鉦擒鉦賴畢鈳."
+#| msgid "Success: Device '%s' successfully activated."
+msgid "Device '%s' successfully activated with '%s'.\n"
+msgstr "'%s' 鉦鉦鉦 鉦詮移鉦抉疏鉦菽疏鈳鉦兒 鉦能眸鉦詮鉦菽窒鉦能移鉦鉦 '%s' 鉦兒鉦鉦舟窒鉦鈳 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮眷鉦擒鉦賴畢鈳.\n"
-#: ../cli/src/devices.c:1333
+#: ../clients/cli/devices.c:1325
#, c-format
msgid "Error: Device activation failed: %s"
msgstr "鉦舟鉦: 鉦詮移鉦抉疏鉦 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦鈳鉦能 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s"
-#: ../cli/src/devices.c:1350
+#: ../clients/cli/devices.c:1333
+#, c-format
+#| msgid "Error: Device activation failed: %s"
+msgid "Error: Device activation failed: device was disconnected"
+msgstr "鉦舟鉦: 鉦詮移鉦抉疏鉦 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦鈳鉦能 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: 鉦詮移鉦抉疏鉦 鉦詮鉦芹盒鈳鉦 鉦鉦﹤窒鉦舟窒鉦舟"
+
+#: ../clients/cli/devices.c:1346
#, c-format
msgid "Device '%s' has been connected.\n"
msgstr "'%s' 鉦詮移鉦抉疏鉦菽 鉦詮鉦芹盒鈳鉦鉦賴略鉦鈳鉦鉦﹤窒鉦舟.\n"
-#: ../cli/src/devices.c:1377 ../cli/src/devices.c:1512
-msgid "Interface: "
-msgstr "鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏: "
-
-#: ../cli/src/devices.c:1381 ../cli/src/devices.c:1390
-#: ../cli/src/devices.c:1516 ../cli/src/devices.c:1525
+#: ../clients/cli/devices.c:1375 ../clients/cli/devices.c:1384
+#: ../clients/cli/devices.c:1509 ../clients/cli/devices.c:1518
+#: ../clients/cli/devices.c:1604 ../clients/cli/devices.c:1612
#, c-format
msgid "Error: No interface specified."
msgstr "鉦舟鉦: 鉦能移鉦菽鉦舟 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦菽疏鈳鉦兒 鉦詮鉦鉦賴硫鉦耜移鉦鉦賴眷鈳鉦."
-#: ../cli/src/devices.c:1396 ../cli/src/devices.c:1531
+#: ../clients/cli/devices.c:1390 ../clients/cli/devices.c:1524
+#: ../clients/cli/devices.c:1618
#, c-format
msgid "Error: extra argument not allowed: '%s'."
msgstr "鉦舟鉦: 鉦嫩鉦鈳鉦鈳鉦菽盒鉦 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鈳 鉦鉦兒鉦桌略鉦 鉦鉦耜鉦: '%s'."
-#: ../cli/src/devices.c:1459
+#: ../clients/cli/devices.c:1453
#, c-format
msgid "Success: Device '%s' successfully disconnected."
msgstr "鉦能眸鉦詮鉦詮: '%s' 鉦鉦鉦 鉦詮移鉦抉疏鉦舟窒鉦鉦 鉦能眸鉦詮鉦菽窒鉦能移鉦鉦 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦﹤窒鉦舟鉦嫩移鉦鉦耜移鉦鉦賴畢鈳."
-#: ../cli/src/devices.c:1471
+#: ../clients/cli/devices.c:1465
#, c-format
msgid "Error: Device '%s' (%s) disconnecting failed: %s"
msgstr "鉦舟鉦: '%s' (%s) 鉦鉦鉦 鉦詮移鉦抉疏鉦 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦﹤窒鉦舟 鉦嫩移鉦鈳鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s"
-#: ../cli/src/devices.c:1485
+#: ../clients/cli/devices.c:1479
#, c-format
msgid "Device '%s' has been disconnected.\n"
msgstr "'%s' 鉦鉦鉦 鉦詮移鉦抉疏鉦舟窒鉦鉦 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦﹤窒鉦舟鉦嫩移鉦鉦耜移鉦鉦賴畢鈳.\n"
-#: ../cli/src/devices.c:1628
+#: ../clients/cli/devices.c:1577
+#, c-format
+#| msgid "Error: Device '%s' (%s) disconnecting failed: %s"
+msgid "Error: Device '%s' (%s) deletion failed: %s"
+msgstr "鉦舟鉦: '%s' (%s) 鉦鉦鉦 鉦詮移鉦抉疏鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮鉦菽窒鉦鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s"
+
+#: ../clients/cli/devices.c:1650
+#, c-format
+#| msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
+msgid "Error: Device '%s' is a hardware device. It can't be deleted."
+msgstr ""
+"鉦舟鉦: '%s' 鉦詮移鉦抉疏鉦菽 鉦鉦鉦舟 鉦能鉦戈鉦啤移鉦鉦 鉦詮移鉦抉疏鉦菽移鉦鉦賴盒鈳鉦戈鉦戈畢鈳. 鉦鉦舟疏鈳鉦兒 鉦戈鉦鈳鉦舟鉦嫩移鉦鉦耜 "
+"鉦詮移鉦抉鉦能眶鉦賴盒鈳鉦菽鉦舟窒鉦耜鉦."
+
+#: ../clients/cli/devices.c:1720
msgid "Wi-Fi scan list"
msgstr "Wi-Fi 鉦詮鉦鈳鉦能移鉦兒 鉦芹鈳鉦鉦"
-#: ../cli/src/devices.c:1666
+#: ../clients/cli/devices.c:1758
#, c-format
msgid "Error: 'device wifi': %s"
msgstr "鉦舟鉦: 'device wifi': %s"
-#: ../cli/src/devices.c:1719 ../cli/src/devices.c:1788
+#: ../clients/cli/devices.c:1811 ../clients/cli/devices.c:1886
#, c-format
msgid "Error: Access point with bssid '%s' not found."
msgstr "鉦舟鉦: '%s' 鉦鉦鉦 bssid 鉦 鉦兒窒鉦耜鉦鉦鉦 鉦眇窒鉦鉦舟鉦菽 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦."
-#: ../cli/src/devices.c:1743 ../cli/src/devices.c:2131
-#: ../cli/src/devices.c:2293
+#: ../clients/cli/devices.c:1835 ../clients/cli/devices.c:2241
+#: ../clients/cli/devices.c:2403
#, c-format
msgid "Error: Device '%s' is not a Wi-Fi device."
msgstr "鉦舟鉦: '%s' 鉦鉦鉦眇鉦舟 鉦鉦鉦舟 Wi-Fi 鉦詮移鉦抉疏鉦菽移鉦鉦賴眷鈳鉦."
-#: ../cli/src/devices.c:1825 ../cli/src/devices.c:1872
+#: ../clients/cli/devices.c:1929 ../clients/cli/devices.c:1977
#, c-format
msgid "Connection with UUID '%s' created and activated on device '%s'\n"
msgstr ""
"鉦啤鉦賴硫鉦耜移鉦 UUID '%s' 鉦能鉦鉦舟窒鉦鈳 鉦詮鉦芹盒鈳鉦鉦賴略鉦鈳鉦鉦﹤窒鉦舟 鉦桌略鈳鉦戈 '%s' 鉦詮移鉦抉疏鉦舟眷鈳鉦耜窒 "
"鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮眷鉦擒鉦賴畢鈳\n"
-#: ../cli/src/devices.c:1829
+#: ../clients/cli/devices.c:1934
#, c-format
msgid "Error: Connection activation failed: (%d) %s."
msgstr "鉦舟鉦: 鉦詮鉦芹盒鈳鉦 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦鈳鉦能 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: (%d) %s."
-#: ../cli/src/devices.c:1854
+#: ../clients/cli/devices.c:1959
#, c-format
msgid "Error: Failed to add/activate new connection: (%d) %s"
msgstr "鉦舟鉦: 鉦嫩鉦 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鉦啤窒鉦詮眷鈳/鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: (%d) %s"
-#: ../cli/src/devices.c:1862
+#: ../clients/cli/devices.c:1967
#, c-format
msgid "Error: Failed to add/activate new connection: Unknown error"
msgstr "鉦舟鉦: 鉦嫩鉦 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鉦啤窒鉦詮眷鈳/鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: 鉦鈳鉦戈鉦戈窒鉦啤畢 鉦舟鉦"
-#: ../cli/src/devices.c:2013
+#: ../clients/cli/devices.c:2123
msgid "SSID or BSSID: "
msgstr "SSID 鉦鉦丞眶 BSSID: "
-#: ../cli/src/devices.c:2018
+#: ../clients/cli/devices.c:2128
#, c-format
msgid "Error: SSID or BSSID are missing."
msgstr "鉦舟鉦: SSID 鉦鉦丞眶 BSSID 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦."
-#: ../cli/src/devices.c:2042
+#: ../clients/cli/devices.c:2152
#, c-format
msgid "Error: bssid argument value '%s' is not a valid BSSID."
msgstr "鉦舟鉦: bssid 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦桌鉦耜鉦 '%s' 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 BSSID 鉦鉦鉦賴眷鈳鉦."
-#: ../cli/src/devices.c:2066
+#: ../clients/cli/devices.c:2176
#, c-format
msgid ""
"Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
msgstr ""
"鉦舟鉦: wep-key-type 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦桌鉦耜鉦 '%s' 鉦鉦桌移鉦兒鉦能眶鉦擒鉦賴畢鈳, 'key' 鉦鉦丞眶 'phrase' "
-"鉦鉦兒鉦兒 鉦眇眾鉦詮窒."
+"鉦鉦兒鉦兒 "
+"鉦眇眾鉦詮窒."
-#: ../cli/src/devices.c:2086
+#: ../clients/cli/devices.c:2196
#, c-format
msgid "Error: %s: %s."
msgstr "鉦舟鉦: %s: %s."
-#: ../cli/src/devices.c:2101
+#: ../clients/cli/devices.c:2211
#, c-format
msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
msgstr ""
-"鉦舟鉦: 鉦詮鉦芹盒鈳鉦鉦賴略鉦鈳鉦喪鉦喪痊鈳鉦鉦賴盒鈳鉦 BSSID 鉦能 (%s) bssid 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦賴鉦 "
-"(%s)鉦冢窒鉦兒鉦兒眶鉦擒鉦賴盒鈳鉦戈鉦戈畢鈳."
+"鉦舟鉦: 鉦詮鉦芹盒鈳鉦鉦賴略鉦鈳鉦喪鉦喪痊鈳鉦鉦賴盒鈳鉦 BSSID 鉦能 (%s) bssid 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦賴鉦 (%"
+"s)鉦冢窒鉦兒鉦兒眶鉦擒鉦賴盒鈳鉦戈鉦戈畢鈳."
-#: ../cli/src/devices.c:2107
+#: ../clients/cli/devices.c:2217
#, c-format
msgid "Error: Parameter '%s' is neither SSID nor BSSID."
msgstr "鉦舟鉦: '%s' 鉦兒窒鉦能略鉦擒鉦鉦菽 SSID 鉦鉦丞眶 BSSID 鉦鉦鉦賴眷鈳鉦."
-#: ../cli/src/devices.c:2133 ../cli/src/devices.c:2295
+#: ../clients/cli/devices.c:2243 ../clients/cli/devices.c:2405
#, c-format
msgid "Error: No Wi-Fi device found."
msgstr "鉦舟鉦: 鉦能移鉦菽鉦舟 Wi-Fi 鉦詮移鉦抉疏鉦菽 鉦鉦鉦﹤ 鉦眇鉦舟窒鉦耜鉦."
-#: ../cli/src/devices.c:2151
+#: ../clients/cli/devices.c:2261
#, c-format
msgid "Error: No network with SSID '%s' found."
msgstr "鉦舟鉦: SSID '%s' 鉦兒鉦鉦舟窒鉦鈳 鉦能移鉦菽鉦舟 鉦鉦擒眷鉦眇鉦 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦."
-#: ../cli/src/devices.c:2153
+#: ../clients/cli/devices.c:2263
#, c-format
msgid "Error: No access point with BSSID '%s' found."
msgstr "鉦舟鉦: '%s' 鉦鉦鉦 BSSID 鉦 鉦兒窒鉦耜鉦鉦鉦 鉦眇窒鉦鉦舟鉦菽 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦."
-#: ../cli/src/devices.c:2192
+#: ../clients/cli/devices.c:2302
msgid "Password: "
msgstr "鉦鈳鉦芹鉦戈痕鉦: "
-#: ../cli/src/devices.c:2321
+#: ../clients/cli/devices.c:2431
#, c-format
msgid "Error: 'device wifi' command '%s' is not valid."
msgstr "鉦舟鉦: 'device wifi' 鉦鉦舟鉦 '%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦."
-#: ../cli/src/devices.c:2368
+#: ../clients/cli/devices.c:2478
msgid "WiMAX NSP list"
msgstr "WiMAX NSP 鉦芹鈳鉦鉦"
-#: ../cli/src/devices.c:2405
+#: ../clients/cli/devices.c:2515
#, c-format
msgid "Error: 'device wimax': %s"
msgstr "鉦舟鉦: 'device wimax': %s"
-#: ../cli/src/devices.c:2459
+#: ../clients/cli/devices.c:2569
#, c-format
msgid "Error: NSP with name '%s' not found."
msgstr "鉦舟鉦: '%s' 鉦鉦鉦 鉦嫩鉦詮盒鉦賴疏 NSP 鉦鉦鉦﹤ 鉦眇鉦舟窒鉦耜鉦."
-#: ../cli/src/devices.c:2472
+#: ../clients/cli/devices.c:2582
#, c-format
msgid "Error: Device '%s' is not a WiMAX device."
msgstr "鉦舟鉦: '%s' 鉦鉦鉦眇鉦舟 鉦鉦鉦舟 WiMAX 鉦詮移鉦抉疏鉦菽窒鉦耜鉦."
-#: ../cli/src/devices.c:2510
+#: ../clients/cli/devices.c:2626
#, c-format
msgid "Error: Access point with nsp '%s' not found."
msgstr "鉦舟鉦: nsp '%s' 鉦鉦鉦眇鉦舟盒鈳鉦鉦舟窒鉦鉦賴疏 鉦兒窒鉦耜鉦鉦鉦 鉦眇窒鉦鉦舟鉦菽 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦."
-#: ../cli/src/devices.c:2542
+#: ../clients/cli/devices.c:2663
#, c-format
msgid "Error: 'device wimax' command '%s' is not valid."
msgstr "鉦舟鉦: 'device wimax' 鉦鉦舟鉦 '%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦."
-#: ../cli/src/devices.c:2621
+#: ../clients/cli/devices.c:2820
#, c-format
msgid "Error: 'dev' command '%s' is not valid."
msgstr "鉦舟鉦: '%s' 鉦鉦鉦 'dev' 鉦鉦舟鉦嗣盔鈳 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦."
-#: ../cli/src/network-manager.c:37
+#: ../clients/cli/network-manager.c:35
msgid "RUNNING"
msgstr "RUNNING"
-#: ../cli/src/network-manager.c:38
+#. 0
+#: ../clients/cli/network-manager.c:36
msgid "VERSION"
msgstr "VERSION"
-#: ../cli/src/network-manager.c:40
+#. 2
+#: ../clients/cli/network-manager.c:38
msgid "STARTUP"
msgstr "鉦鉦啤鉦"
-#: ../cli/src/network-manager.c:41
+#. 3
+#: ../clients/cli/network-manager.c:39
msgid "CONNECTIVITY"
msgstr "鉦詮鉦芹盒鈳鉦"
-#: ../cli/src/network-manager.c:42
+#. 4
+#: ../clients/cli/network-manager.c:40
msgid "NETWORKING"
msgstr "NETWORKING"
-#: ../cli/src/network-manager.c:43
+#. 5
+#: ../clients/cli/network-manager.c:41
msgid "WIFI-HW"
msgstr "WIFI-HW"
-#: ../cli/src/network-manager.c:44
+#. 6
+#: ../clients/cli/network-manager.c:42
msgid "WIFI"
msgstr "WIFI"
-#: ../cli/src/network-manager.c:45
+#. 7
+#: ../clients/cli/network-manager.c:43
msgid "WWAN-HW"
msgstr "WWAN-HW"
-#: ../cli/src/network-manager.c:46
+#. 8
+#: ../clients/cli/network-manager.c:44
msgid "WWAN"
msgstr "WWAN"
-#: ../cli/src/network-manager.c:47
+#. 9
+#: ../clients/cli/network-manager.c:45
msgid "WIMAX-HW"
msgstr "WIMAX-HW"
-#: ../cli/src/network-manager.c:48
+#. 10
+#: ../clients/cli/network-manager.c:46
msgid "WIMAX"
msgstr "WIMAX"
-#: ../cli/src/network-manager.c:70
+#: ../clients/cli/network-manager.c:68
msgid "PERMISSION"
msgstr "PERMISSION"
-#: ../cli/src/network-manager.c:71
+#. 0
+#: ../clients/cli/network-manager.c:69
msgid "VALUE"
msgstr "VALUE"
-#: ../cli/src/network-manager.c:79
+#: ../clients/cli/network-manager.c:77
msgid "LEVEL"
msgstr "LEVEL"
-#: ../cli/src/network-manager.c:80
+#. 0
+#: ../clients/cli/network-manager.c:78
msgid "DOMAINS"
msgstr "DOMAINS"
-#: ../cli/src/network-manager.c:95
+#: ../clients/cli/network-manager.c:93
#, c-format
msgid ""
"Usage: nmcli general { COMMAND | help }\n"
@@ -3546,7 +4122,7 @@ msgstr ""
" logging [level <log level>] [domains <log domains>]\n"
"\n"
-#: ../cli/src/network-manager.c:107
+#: ../clients/cli/network-manager.c:105
#, c-format
msgid ""
"Usage: nmcli general status { help }\n"
@@ -3560,10 +4136,11 @@ msgstr ""
"\n"
"NetworkManager 鉦 鉦鉦鈳鉦鉦擒盒鈳 鉦詮鉦丞窒鉦戈窒鉦能疏鈳鉦兒 鉦戈鉦啤窒鉦詮鉦戈鉦戈畢鈳.\n"
"'status' 鉦鉦兒鉦兒鉦菽鉦舟 鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略 鉦鈳鉦啤窒鉦能鉦能移鉦鉦賴盒鈳鉦戈鉦戈畢鈳, 鉦鉦舟盒鉦啤鉦 'nmcli gen' "
-"鉦鉦兒鉦兒鉦菽鉦舟 'nmcli gen status' 鉦能疏鈳鉦兒 鉦鉦耜移鉦能窒鉦詮鉦戈鉦戈畢鈳 鉦鉦鉦舟\n"
+"鉦鉦兒鉦兒鉦菽鉦舟 "
+"'nmcli gen status' 鉦能疏鈳鉦兒 鉦鉦耜移鉦能窒鉦詮鉦戈鉦戈畢鈳 鉦鉦鉦舟\n"
"\n"
-#: ../cli/src/network-manager.c:117
+#: ../clients/cli/network-manager.c:115
#, c-format
msgid ""
"Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3572,8 +4149,8 @@ msgid ""
"\n"
"Get or change persistent system hostname.\n"
"With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system hostname."
-"\n"
+"a hostname, NetworkManager will set it as the new persistent system "
+"hostname.\n"
"\n"
msgstr ""
"鉦眇眾鉦鈳: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3582,12 +4159,13 @@ msgstr ""
"\n"
"鉦詮鉦丞窒鉦 鉦菽鉦能眶鉦詮鉦丞 鉦鉦戈窒鉦丞鉦能硃鈳鉦詮盒鉦兒鉦兒 鉦芹瓷鈳鉦能窒鉦啤窒 鉦鉦丞眶 鉦眇畢鉦耜移鉦能窒鉦詮窒.\n"
"鉦能移鉦菽鉦舟 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦耜鉦耜畢鈳, 鉦鉦舟 鉦芹鉦啤硫鉦鈳鉦 鉦詮鉦啤鉦賴硫鉦耜移鉦 鉦鉦戈窒鉦丞鉦能畢 鉦嫩鉦詮盒鉦兒鉦兒 "
-"鉦戈鉦啤窒鉦詮鉦戈鉦戈畢鈳. 鉦兒鉦菽 鉦鉦戈窒鉦丞鉦能畢\n"
+"鉦戈鉦啤窒鉦詮鉦戈鉦戈畢鈳. "
+"鉦兒鉦菽 鉦鉦戈窒鉦丞鉦能畢\n"
"鉦嫩鉦詮盒鉦兒鉦兒 鉦兒鉦﹤窒鉦舟眷鈳鉦耜窒, NetworkManager 鉦鉦舟疏鈳鉦兒 鉦嫩鉦 鉦詮鉦丞窒鉦 鉦菽鉦能眶鉦詮鉦丞 鉦鉦戈窒鉦丞鉦能硃鈳鉦詮盒鉦賴鈳 "
"鉦嫩鉦鉦舟窒鉦詮鉦戈鉦戈畢鈳.\n"
"\n"
-#: ../cli/src/network-manager.c:130
+#: ../clients/cli/network-manager.c:128
#, c-format
msgid ""
"Usage: nmcli general permissions { help }\n"
@@ -3600,7 +4178,7 @@ msgstr ""
"鉦舟鉦R鉦鉦啤窒鉦詮眷鉦擒畢 鉦鉦擒盒鈳鉦能移鉦鉦啤產鈳鉦鉦喪窒鉦鉦擒鉦 鉦鉦擒眷鉦啤 鉦鉦兒鉦桌略鉦賴鉦喪疏鈳鉦兒 鉦戈鉦啤窒鉦詮.\n"
"\n"
-#: ../cli/src/network-manager.c:139
+#: ../clients/cli/network-manager.c:137
#, c-format
msgid ""
"Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3622,12 +4200,12 @@ msgstr ""
"NetworkManager 鉦耜移鉦鉦賴鉦鈳 鉦桌鈳鉦 鉦桌略鈳鉦戈 鉦﹤鉦桌鉦兒鉦鉦喪疏鈳鉦兒 鉦芹瓷鈳鉦舟鉦鈳 鉦鉦丞眶 鉦眇畢鉦耜移鉦能窒鉦詮.\n"
"鉦能移鉦菽鉦舟 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦耜鉦耜畢鈳 鉦鉦舟鉦舟盒鈳 鉦芹鉦啤硫鉦鈳鉦 鉦耜移鉦鉦賴鉦鈳 鉦桌鈳鉦 鉦桌略鈳鉦戈 鉦﹤鉦桌鉦兒鉦鉦喪疏鈳鉦兒 "
"鉦戈鉦啤窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳. 鉦耜移鉦鉦賴鉦鈳 \n"
-"鉦詮鉦丞窒鉦戈窒鉦能疏鈳鉦兒 鉦眇畢鉦耜移鉦能窒鉦詮眷鈳, 鉦桌鈳鉦 鉦桌略鈳鉦戈/鉦鉦丞眶 鉦﹤鉦桌鉦兒 鉦鉦兒鉦兒 鉦鉦舟鉦賴硫鉦. 鉦詮移鉦抉鉦能眶鉦賴盒鈳鉦 "
-"鉦耜移鉦鉦賴鉦鈳 鉦﹤鉦桌鉦兒鉦鉦 \n"
+"鉦詮鉦丞窒鉦戈窒鉦能疏鈳鉦兒 鉦眇畢鉦耜移鉦能窒鉦詮眷鈳, 鉦桌鈳鉦 鉦桌略鈳鉦戈/鉦鉦丞眶 鉦﹤鉦桌鉦兒 鉦鉦兒鉦兒 鉦鉦舟鉦賴硫鉦. 鉦詮移鉦抉鉦能眶鉦賴盒鈳鉦 鉦耜移鉦鉦賴鉦鈳 "
+"鉦﹤鉦桌鉦兒鉦鉦 \n"
"鉦芹鈳鉦鉦賴鉦擒鉦 鉦舟盔鉦菽窒鉦鈳鉦鈳 鉦桌移鉦嫩窒鉦戈窒 (鉦桌鉦能移鉦兒) 鉦芹鉦鉦鈳鉦鈳 鉦冢鉦鉦 鉦鈳鉦﹤窒.\n"
"\n"
-#: ../cli/src/network-manager.c:153
+#: ../clients/cli/network-manager.c:151
#, c-format
msgid ""
"Usage: nmcli networking { COMMAND | help }\n"
@@ -3652,9 +4230,10 @@ msgstr ""
" connectivity [check]\n"
"\n"
-#: ../cli/src/network-manager.c:164
+#: ../clients/cli/network-manager.c:162
#, c-format
-msgid "Usage: nmcli networking on { help }\n"
+msgid ""
+"Usage: nmcli networking on { help }\n"
"\n"
"Switch networking on.\n"
"\n"
@@ -3664,9 +4243,10 @@ msgstr ""
"鉦鉦擒眷鉦眇鉦抉眶鉦兒鉦兒 鉦詮鈳鉦啤窒鉦 鉦詮鉦丞窒鉦戈窒鉦鈳 鉦眇畢鉦耜移鉦能窒鉦詮.\n"
"\n"
-#: ../cli/src/network-manager.c:173
+#: ../clients/cli/network-manager.c:171
#, c-format
-msgid "Usage: nmcli networking off { help }\n"
+msgid ""
+"Usage: nmcli networking off { help }\n"
"\n"
"Switch networking off.\n"
"\n"
@@ -3676,7 +4256,7 @@ msgstr ""
"鉦鉦擒眷鉦眇鉦抉眶鉦兒鉦兒 鉦兒窒鉦獅鉦鈳鉦啤窒鉦 鉦詮鉦丞窒鉦戈窒鉦鈳 鉦眇畢鉦耜移鉦能窒鉦詮.|\n"
"\n"
-#: ../cli/src/network-manager.c:182
+#: ../clients/cli/network-manager.c:180
#, c-format
msgid ""
"Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3684,8 +4264,8 @@ msgid ""
"ARGUMENTS := [check]\n"
"\n"
"Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the connectivity."
-"\n"
+"The optional 'check' argument makes NetworkManager re-check the "
+"connectivity.\n"
"\n"
msgstr ""
"鉦眇眾鉦鈳: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3693,11 +4273,11 @@ msgstr ""
"ARGUMENTS := [check]\n"
"\n"
"鉦鉦擒眷鉦眇鉦 鉦詮鉦芹盒鈳鉦鉦 鉦詮鉦丞窒鉦戈窒鉦能疏鈳鉦兒 鉦芹瓷鈳鉦舟鉦鈳.\n"
-"鉦鉦鈳鉦鉦賴 'check' 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦兒窒鉦鉦舟移鉦鉦 NetworkManager 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦桌盒鉦喪窒-"
-"鉦芹盒鉦賴眸鈳鉦耜窒鉦詮鉦戈鉦戈畢鈳.\n"
+"鉦鉦鈳鉦鉦賴 'check' 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦兒窒鉦鉦舟移鉦鉦 NetworkManager 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 "
+"鉦桌盒鉦喪窒-鉦芹盒鉦賴眸鈳鉦耜窒鉦詮鉦戈鉦戈畢鈳.\n"
"\n"
-#: ../cli/src/network-manager.c:195
+#: ../clients/cli/network-manager.c:193
#, c-format
msgid ""
"Usage: nmcli radio { COMMAND | help }\n"
@@ -3722,7 +4302,7 @@ msgstr ""
" all | wifi | wwan [ on | off ]\n"
"\n"
-#: ../cli/src/network-manager.c:210
+#: ../clients/cli/network-manager.c:208
#, c-format
msgid ""
"Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3736,11 +4316,11 @@ msgstr ""
"\n"
"ARGUMENTS := [on | off]\n"
"\n"
-"鉦鉦耜鉦耜移 鉦啤鉦﹤窒鉦能 鉦詮鉦菽窒鉦鈳鉦鉦 鉦詮鉦丞窒鉦戈窒鉦能疏鈳鉦兒 鉦芹瓷鈳鉦舟鉦鈳, 鉦鉦丞眶 鉦鉦菽鉦鉦喪疏鈳鉦兒 鉦詮鈳鉦啤窒鉦/"
-"鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮.\n"
+"鉦鉦耜鉦耜移 鉦啤鉦﹤窒鉦能 鉦詮鉦菽窒鉦鈳鉦鉦 鉦詮鉦丞窒鉦戈窒鉦能疏鈳鉦兒 鉦芹瓷鈳鉦舟鉦鈳, 鉦鉦丞眶 鉦鉦菽鉦鉦喪疏鈳鉦兒 "
+"鉦詮鈳鉦啤窒鉦/鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮.\n"
"\n"
-#: ../cli/src/network-manager.c:221
+#: ../clients/cli/network-manager.c:219
#, c-format
msgid ""
"Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3758,7 +4338,7 @@ msgstr ""
"鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮.\n"
"\n"
-#: ../cli/src/network-manager.c:232
+#: ../clients/cli/network-manager.c:230
#, c-format
msgid ""
"Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3773,10 +4353,11 @@ msgstr ""
"ARGUMENTS := [on | off]\n"
"\n"
"鉦鉦耜鉦耜移 鉦桌鉦眇鉦耜 鉦眇鉦啤移鉦﹤鉦眇鉦能移鉦鉦﹤ 鉦啤鉦﹤窒鉦能 鉦詮鉦菽窒鉦鈳鉦鉦 鉦詮鉦丞窒鉦戈窒鉦能疏鈳鉦兒 鉦芹瓷鈳鉦舟鉦鈳, 鉦鉦丞眶 "
-"鉦鉦菽鉦鉦喪疏鈳鉦兒 鉦詮鈳鉦啤窒鉦/鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮.\n"
+"鉦鉦菽鉦鉦喪疏鈳鉦兒 鉦詮鈳鉦啤窒鉦/"
+"鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮.\n"
"\n"
-#: ../cli/src/network-manager.c:244
+#: ../clients/cli/network-manager.c:242
#, c-format
msgid ""
"Usage: nmcli radio wimax { ARGUMENTS | help }\n"
@@ -3794,171 +4375,173 @@ msgstr ""
"鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮.\n"
"\n"
-#: ../cli/src/network-manager.c:264
+#: ../clients/cli/network-manager.c:262
msgid "asleep"
msgstr "鉦兒窒鉦舟鉦啤窒鉦詮鉦"
-#: ../cli/src/network-manager.c:266
+#: ../clients/cli/network-manager.c:264
msgid "connecting"
msgstr "鉦詮鉦芹盒鈳鉦 鉦鉦耜鉦芹窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟"
-#: ../cli/src/network-manager.c:268
+#: ../clients/cli/network-manager.c:266
msgid "connected (local only)"
msgstr "鉦詮鉦芹盒鈳鉦鉦賴略鉦鈳鉦鉦﹤窒鉦舟 (鉦詮鉦丞眾鈳鉦 鉦桌移鉦戈鉦)"
-#: ../cli/src/network-manager.c:270
+#: ../clients/cli/network-manager.c:268
msgid "connected (site only)"
msgstr "鉦詮鉦芹盒鈳鉦鉦賴略鉦鈳鉦鉦﹤窒鉦舟 (鉦戈移鉦 鉦桌移鉦戈鉦)"
-#: ../cli/src/network-manager.c:274
+#: ../clients/cli/network-manager.c:272
msgid "disconnecting"
msgstr "鉦詮鉦芹盒鈳鉦 鉦戈痕鈳鉦芹窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟"
-#: ../cli/src/network-manager.c:290
+#: ../clients/cli/network-manager.c:288
msgid "portal"
msgstr "鉦芹鉦啤鉦鉦耜"
-#: ../cli/src/network-manager.c:292
+#: ../clients/cli/network-manager.c:290
msgid "limited"
msgstr "鉦詮鉦桌窒鉦"
-#: ../cli/src/network-manager.c:294
+#: ../clients/cli/network-manager.c:292
msgid "full"
msgstr "鉦詮鉦芹鉦啤鉦"
-#: ../cli/src/network-manager.c:332
+#: ../clients/cli/network-manager.c:330
#, c-format
msgid "Error: only these fields are allowed: %s"
msgstr "鉦舟鉦: 鉦鈳鉦菽眷 鉦 鉦詮鉦丞眾鉦鉦喪窒鉦鈳 鉦桌移鉦戈鉦 鉦鉦兒鉦桌略鉦 鉦鉦舟: %s"
-#: ../cli/src/network-manager.c:348 ../cli/src/network-manager.c:349
-#: ../cli/src/network-manager.c:350 ../cli/src/network-manager.c:351
-#: ../cli/src/network-manager.c:352 ../cli/src/network-manager.c:354
-#: ../cli/src/network-manager.c:355
+#: ../clients/cli/network-manager.c:346 ../clients/cli/network-manager.c:347
+#: ../clients/cli/network-manager.c:348 ../clients/cli/network-manager.c:349
+#: ../clients/cli/network-manager.c:350 ../clients/cli/network-manager.c:352
+#: ../clients/cli/network-manager.c:353
msgid "enabled"
msgstr "鉦詮鈳鉦啤窒鉦能鈳鉦鉦"
-#: ../cli/src/network-manager.c:348 ../cli/src/network-manager.c:349
-#: ../cli/src/network-manager.c:350 ../cli/src/network-manager.c:351
-#: ../cli/src/network-manager.c:352 ../cli/src/network-manager.c:354
-#: ../cli/src/network-manager.c:355
+#: ../clients/cli/network-manager.c:346 ../clients/cli/network-manager.c:347
+#: ../clients/cli/network-manager.c:348 ../clients/cli/network-manager.c:349
+#: ../clients/cli/network-manager.c:350 ../clients/cli/network-manager.c:352
+#: ../clients/cli/network-manager.c:353
msgid "disabled"
msgstr "鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦鉦"
-#: ../cli/src/network-manager.c:367
+#: ../clients/cli/network-manager.c:365
msgid "NetworkManager status"
msgstr "NetworkManager 鉦詮鉦丞窒鉦戈窒"
-#: ../cli/src/network-manager.c:372
+#: ../clients/cli/network-manager.c:370
msgid "running"
msgstr "鉦鉦擒眷鉦兒鉦能眷鈳鉦耜窒鉦舟"
-#: ../cli/src/network-manager.c:372
+#: ../clients/cli/network-manager.c:370
msgid "not running"
msgstr "鉦鉦擒眷鉦兒鉦能眷鈳鉦耜窒鉦耜鉦"
-#: ../cli/src/network-manager.c:375
+#: ../clients/cli/network-manager.c:373
msgid "starting"
msgstr "鉦鉦啤鉦冢窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟"
-#: ../cli/src/network-manager.c:375
+#: ../clients/cli/network-manager.c:373
msgid "started"
msgstr "鉦芹鉦啤移鉦啤鉦冢鈳鉦鉦﹤窒鉦舟"
-#: ../cli/src/network-manager.c:446
+#: ../clients/cli/network-manager.c:444
msgid "auth"
msgstr "鉦舟鉦R鉦鉦啤產"
-#: ../cli/src/network-manager.c:475
+#: ../clients/cli/network-manager.c:473
#, c-format
msgid "Error: 'general permissions': %s"
msgstr "鉦舟鉦: 'general permissions': %s"
-#: ../cli/src/network-manager.c:489
+#: ../clients/cli/network-manager.c:487
msgid "NetworkManager permissions"
msgstr "NetworkManager 鉦鉦兒鉦桌略鉦賴鉦喪"
-#: ../cli/src/network-manager.c:530
+#: ../clients/cli/network-manager.c:528
#, c-format
msgid "Error: 'general logging': %s"
msgstr "鉦舟鉦: 'general logging': %s"
-#: ../cli/src/network-manager.c:545
+#: ../clients/cli/network-manager.c:543
msgid "NetworkManager logging"
msgstr "NetworkManager 鉦耜移鉦鉦賴鉦鈳"
-#: ../cli/src/network-manager.c:565
+#: ../clients/cli/network-manager.c:563
#, c-format
msgid "Error: failed to set hostname: (%d) %s"
msgstr "鉦舟鉦: 鉦鉦戈窒鉦丞鉦 鉦嫩鉦詮盒鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: (%d) %s"
-#: ../cli/src/network-manager.c:682
+#: ../clients/cli/network-manager.c:681
#, c-format
msgid "Error: access denied to set logging; %s"
msgstr "鉦舟鉦: 鉦耜移鉦鉦賴鉦鈳 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮眷鈳 鉦芹鉦啤眶鈳鉦嗣移鉦抉窒鉦鉦擒盒鉦菽疏鈳鉦兒 鉦兒窒鉦啤移鉦鉦啤窒鉦詮眷鉦擒鉦賴畢鈳; %s"
-#: ../cli/src/network-manager.c:684
+#: ../clients/cli/network-manager.c:683
#, c-format
msgid "Error: %s"
msgstr "鉦舟鉦: %s"
-#: ../cli/src/network-manager.c:692
+#: ../clients/cli/network-manager.c:691
#, c-format
msgid "Error: 'general' command '%s' is not valid."
msgstr "鉦舟鉦: '%s' 鉦鉦鉦 'general' 鉦鉦舟鉦嗣眶鈳 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦."
-#: ../cli/src/network-manager.c:710
+#: ../clients/cli/network-manager.c:709
#, c-format
msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
msgstr ""
-"鉦舟鉦: '--fields' '%s' 鉦鉦鉦 鉦桌鉦耜鉦能眶鈳 鉦鉦耜鉦耜窒 鉦詮盒鉦賴盔鉦擒畢鈳鉦舟眷鈳鉦 (鉦鉦兒鉦桌略鉦 鉦鉦啤鉦 鉦鈳鉦獅鉦戈鉦: "
-"%s)"
+"鉦舟鉦: '--fields' '%s' 鉦鉦鉦 鉦桌鉦耜鉦能眶鈳 鉦鉦耜鉦耜窒 鉦詮盒鉦賴盔鉦擒畢鈳鉦舟眷鈳鉦 (鉦鉦兒鉦桌略鉦 鉦鉦啤鉦 鉦鈳鉦獅鉦戈鉦: %s)"
-#: ../cli/src/network-manager.c:735
+#: ../clients/cli/network-manager.c:734
#, c-format
msgid "Error: invalid '%s' argument: '%s' (use on/off)."
msgstr "鉦舟鉦: 鉦鉦桌移鉦兒鉦能眶鉦擒畢 '%s' 鉦兒窒鉦能略鉦擒鉦: '%s' (鉦鉦兒/鉦鉦徇 鉦鉦兒鉦兒 鉦眇眾鉦詮窒)."
-#: ../cli/src/network-manager.c:746
+#: ../clients/cli/network-manager.c:745
msgid "Connectivity"
msgstr "鉦詮鉦芹盒鈳鉦"
-#: ../cli/src/network-manager.c:758
+#: ../clients/cli/network-manager.c:757
msgid "Networking"
msgstr "鉦鉦擒眷鉦眇鉦"
-#: ../cli/src/network-manager.c:783
+#: ../clients/cli/network-manager.c:782
#, c-format
msgid "Error: 'networking connectivity' command '%s' is not valid."
msgstr "鉦舟鉦: '%s' 鉦鉦鉦 'networking connectivity' 鉦鉦舟鉦嗣眶鈳 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦."
-#: ../cli/src/network-manager.c:799
+#: ../clients/cli/network-manager.c:798
#, c-format
msgid "Error: 'networking' command '%s' is not valid."
msgstr "鉦舟鉦: '%s' 鉦鉦鉦 'networking' 鉦鉦舟鉦嗣眶鈳 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦."
-#: ../cli/src/network-manager.c:825 ../cli/src/network-manager.c:845
+#: ../clients/cli/network-manager.c:824 ../clients/cli/network-manager.c:844
msgid "Radio switches"
msgstr "鉦啤鉦﹤窒鉦能 鉦詮鉦菽窒鉦鈳鉦鉦喪"
-#: ../cli/src/network-manager.c:863
+#. no argument, show current WiFi state
+#: ../clients/cli/network-manager.c:862
msgid "Wi-Fi radio switch"
msgstr "Wi-Fi 鉦啤鉦﹤窒鉦能 鉦詮鉦菽窒鉦鈳"
-#: ../cli/src/network-manager.c:879
+#. no argument, show current WWAN (mobile broadband) state
+#: ../clients/cli/network-manager.c:878
msgid "WWAN radio switch"
msgstr "WWAN 鉦啤鉦﹤窒鉦能 鉦詮鉦菽窒鉦鈳"
-#: ../cli/src/network-manager.c:896
+#. no argument, show current WiMAX state
+#: ../clients/cli/network-manager.c:895
msgid "WiMAX radio switch"
msgstr "WiMAX 鉦啤鉦﹤窒鉦能 鉦詮鉦菽窒鉦鈳"
-#: ../cli/src/network-manager.c:908
+#: ../clients/cli/network-manager.c:907
#, c-format
msgid "Error: 'radio' command '%s' is not valid."
msgstr "鉦舟鉦: '%s' 鉦鉦鉦 'radio' 鉦鉦舟鉦嗣眶鈳 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦."
-#: ../cli/src/nmcli.c:78
+#: ../clients/cli/nmcli.c:82
#, c-format
msgid ""
"Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -3994,7 +4577,8 @@ msgstr ""
" -m[ode] tabular|multiline 鉦鉦鈳鉦芹鉦鈳 鉦詮鉦丞窒鉦戈窒\n"
" -f[ields] <field1,field2,...>|all|common 鉦鉦鈳鉦芹鉦鈳 鉦桌移鉦﹤眷鈳 鉦鉦擒鉦鉦喪疏鈳鉦兒 鉦詮鉦鉦賴硫鈳\n"
" -e[scape] yes|no 鉦桌鉦耜鉦能鉦喪眷鈳鉦耜窒鉦啤鉦 鉦鉦詮鉦鈳鉦芹 "
-"鉦鉦舟鉦舟硫鉦擒眷鈳鉦鉦 鉦菽窒鉦冢鉦鉦鉦喪\n"
+"鉦鉦舟鉦舟硫鉦擒眷鈳鉦鉦 "
+"鉦菽窒鉦冢鉦鉦鉦喪\n"
" -v[ersion] 鉦芹鉦啤鉦鈳鉦啤移鉦桌窒鉦 鉦鉦菽鉦戈鉦戈窒鉦能疏鈳鉦兒 鉦戈鉦啤窒鉦詮\n"
" -h[elp] 鉦兒鉦啤眶鉦兒鉦兒 鉦桌鉦舟鉦啤窒鉦詮\n"
"\n"
@@ -4004,356 +4588,389 @@ msgstr ""
" dev NetworkManager 鉦鉦鉦 鉦兒鉦﹤窒鉦鈳鉦喪鉦喪眷鉦擒鈳鉦 鉦詮移鉦抉疏鉦鉦喪\n"
"\n"
-#: ../cli/src/nmcli.c:132
+#: ../clients/cli/nmcli.c:136
#, c-format
msgid "Error: Object '%s' is unknown, try 'nmcli help'."
-msgstr ""
-"鉦舟鉦: '%s' 鉦鉦鉦 鉦菽硫鈳鉦戈鉦菽窒鉦 鉦眇鈳鉦鈳 鉦戈窒鉦喪窒鉦舟窒鉦耜鉦, 'nmcli help' 鉦鉦兒鉦兒 鉦芹鉦啤盔鉦戈鉦兒窒鉦詮窒."
+msgstr "鉦舟鉦: '%s' 鉦鉦鉦 鉦菽硫鈳鉦戈鉦菽窒鉦 鉦眇鈳鉦鈳 鉦戈窒鉦喪窒鉦舟窒鉦耜鉦, 'nmcli help' 鉦鉦兒鉦兒 鉦芹鉦啤盔鉦戈鉦兒窒鉦詮窒."
-#: ../cli/src/nmcli.c:162
+#: ../clients/cli/nmcli.c:166
#, c-format
msgid "Error: Option '--terse' is specified the second time."
msgstr "鉦舟鉦: '--terse' 鉦鉦鉦 鉦鉦能鉦鈳鉦能疏鈳鉦兒 鉦鉦啤瓷鉦兒 鉦眇移鉦啤窒鉦鈳 鉦詮鉦鉦賴硫鉦耜移鉦鉦賴畢鈳."
-#: ../cli/src/nmcli.c:167
+#: ../clients/cli/nmcli.c:171
#, c-format
msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
msgstr "鉦舟鉦: '--terse' 鉦鉦鉦眇鉦舟 '--pretty' 鉦能鉦鉦舟窒鉦鈳 鉦芹盒鉦詮鉦芹盒 鉦桌鉦詮眷鉦擒鉦賴畢鈳."
-#: ../cli/src/nmcli.c:175
+#: ../clients/cli/nmcli.c:179
#, c-format
msgid "Error: Option '--pretty' is specified the second time."
msgstr "鉦舟鉦: '--pretty' 鉦鉦鉦 鉦鉦能鉦鈳鉦能疏鈳鉦兒 鉦鉦啤瓷鉦兒 鉦眇移鉦啤窒鉦鈳 鉦詮鉦鉦賴硫鉦耜移鉦鉦賴畢鈳."
-#: ../cli/src/nmcli.c:180
+#: ../clients/cli/nmcli.c:184
#, c-format
msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
msgstr "鉦舟鉦: '--pretty' 鉦鉦鉦眇鉦舟 '--terse' 鉦能鉦鉦舟窒鉦鈳 鉦芹盒鉦詮鉦芹盒 鉦桌鉦詮眷鉦擒鉦賴畢鈳."
-#: ../cli/src/nmcli.c:190 ../cli/src/nmcli.c:206 ../cli/src/nmcli.c:235
+#: ../clients/cli/nmcli.c:194 ../clients/cli/nmcli.c:210
+#: ../clients/cli/nmcli.c:239
#, c-format
msgid "Error: missing argument for '%s' option."
msgstr "鉦舟鉦: '%s' 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦"
-#: ../cli/src/nmcli.c:199 ../cli/src/nmcli.c:215
+#: ../clients/cli/nmcli.c:203 ../clients/cli/nmcli.c:219
#, c-format
msgid "Error: '%s' is not valid argument for '%s' option."
msgstr "鉦舟鉦: '%s' 鉦鉦兒鉦兒鉦菽鉦舟 '%s' 鉦鉦鉦 鉦鉦能鉦鈳鉦鈳 鉦詮盒鉦賴盔鉦擒畢 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦鉦賴眷鈳鉦."
-#: ../cli/src/nmcli.c:222
+#: ../clients/cli/nmcli.c:226
#, c-format
msgid "Error: fields for '%s' options are missing."
msgstr "鉦舟鉦: '%s' 鉦鉦鉦 鉦鉦能鉦鈳鉦 鉦鈳鉦獅鉦戈鉦啤鉦喪 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦."
-#: ../cli/src/nmcli.c:240
+#: ../clients/cli/nmcli.c:244
#, c-format
msgid "Error: '%s' is not a valid timeout for '%s' option."
msgstr "鉦舟鉦: '%s' 鉦鉦兒鉦兒鉦菽鉦舟 '%s' 鉦鉦鉦 鉦鉦能鉦鈳鉦鈳 鉦詮盒鉦賴盔鉦擒畢 鉦鉦擒眷鉦擒眶鉦抉窒 鉦戈鉦啤窒鉦鈳鉦能眷鈳鉦."
-#: ../cli/src/nmcli.c:247
+#: ../clients/cli/nmcli.c:251
#, c-format
msgid "nmcli tool, version %s\n"
msgstr "nmcli 鉦鉦芹鉦啤產, 鉦鉦菽鉦戈鉦戈窒 %s\n"
-#: ../cli/src/nmcli.c:253
+#: ../clients/cli/nmcli.c:257
#, c-format
msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
msgstr "鉦舟鉦: '%s' 鉦鉦鉦 鉦鉦能鉦鈳鉦 鉦眇鈳鉦鈳 鉦戈窒鉦喪窒鉦舟窒鉦耜鉦, 'nmcli -help' 鉦鉦兒鉦兒 鉦芹鉦啤盔鉦戈鉦兒窒鉦詮窒."
-#: ../cli/src/nmcli.c:288
+#: ../clients/cli/nmcli.c:337 ../clients/cli/nmcli.c:346
#, c-format
-msgid "\n"
-"Error: nmcli terminated by signal %d."
-msgstr "\n"
-"鉦舟鉦: %d 鉦詮鉦鈳鉦戈畢鈳鉦鉦舟窒鉦鈳 鉦鉦鉦戈鉦能鈳鉦鉦﹤窒鉦舟."
+#| msgid ""
+#| "\n"
+#| "Error: nmcli terminated by signal %d."
+msgid ""
+"\n"
+"Error: nmcli terminated by signal %s (%d)\n"
+msgstr ""
+"\n"
+"鉦舟鉦: %s (%d) 鉦詮鉦鈳鉦戈畢鈳鉦鉦舟窒鉦鈳 鉦鉦鉦戈鉦能鈳鉦鉦﹤窒鉦舟 \n"
-#: ../cli/src/nmcli.c:318 ../src/main.c:130
+#: ../clients/cli/nmcli.c:377
#, c-format
-msgid "Failed to set signal mask: %d"
-msgstr "鉦詮鉦鈳鉦鈳 鉦桌鉦詮鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %d"
+#| msgid "Failed to set signal mask: %d"
+msgid "Failed to set signal mask: %d\n"
+msgstr "鉦詮鉦鈳鉦戈畢 鉦桌鉦詮鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %d\n"
-#: ../cli/src/nmcli.c:325 ../src/main.c:139
+#: ../clients/cli/nmcli.c:384
#, c-format
-msgid "Failed to create signal handling thread: %d"
-msgstr "鉦詮鉦鈳鉦鈳 鉦兒窒鉦冢移鉦能窒鉦詮鉦 鉦鉦喪鉦能疏鈳鉦兒 鉦兒窒鉦啤鉦桌窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦菽移鉦鉦賴畢鈳 :%d"
+#| msgid "Failed to create signal handling thread: %d"
+msgid "Failed to create signal handling thread: %d\n"
+msgstr "鉦詮鉦鈳鉦 鉦兒窒鉦冢移鉦能窒鉦詮鉦 鉦鉦喪鉦能疏鈳鉦兒 鉦兒窒鉦啤鉦桌窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦菽移鉦鉦賴畢鈳 :%d\n"
-#: ../cli/src/nmcli.c:338 ../test/nm-online.c:149
+#: ../clients/cli/nmcli.c:481 ../clients/nm-online.c:197
#, c-format
-msgid "Error: Could not create NMClient object."
-msgstr "鉦舟鉦: NMClient 鉦菽硫鈳鉦戈鉦菽疏鈳鉦兒 鉦啤鉦賴硫鉦耜 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦."
+#| msgid "Error: Could not create NMClient object."
+msgid "Error: Could not create NMClient object: %s."
+msgstr "鉦舟鉦: NMClient 鉦菽硫鈳鉦戈鉦菽疏鈳鉦兒 鉦啤鉦賴硫鉦耜 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦:%s."
-#: ../cli/src/nmcli.c:354
+#: ../clients/cli/nmcli.c:498
msgid "Success"
msgstr "鉦能眸鉦詮鉦菽窒鉦能移鉦鉦賴畢鈳"
-#: ../cli/src/settings.c:666
+#: ../clients/cli/settings.c:656
#, c-format
-msgid "%d (hex-ascii-key)"
-msgstr "%d (hex-ascii-key)"
+#| msgid "%d (hex-ascii-key)"
+msgid "%d (key)"
+msgstr "%d (key)"
-#: ../cli/src/settings.c:668
+#: ../clients/cli/settings.c:658
#, c-format
-msgid "%d (104/128-bit passphrase)"
-msgstr "%d (104/128-鉦眇窒鉦鈳 鉦鈳鉦芹鉦戈眶鉦擒鈳鉦能移鉦鉦)"
+#| msgid "%d (104/128-bit passphrase)"
+msgid "%d (passphrase)"
+msgstr "%d (鉦鈳鉦芹鉦戈眶鉦擒鈳鉦能移鉦鉦)"
-#: ../cli/src/settings.c:671 ../cli/src/settings.c:799
+#: ../clients/cli/settings.c:661 ../clients/cli/settings.c:742
#, c-format
msgid "%d (unknown)"
msgstr "%d (鉦鈳鉦戈鉦戈窒鉦啤畢)"
-#: ../cli/src/settings.c:697
-msgid "0 (unknown)"
-msgstr "0 (鉦鈳鉦戈鉦戈窒鉦啤畢)"
-
-#: ../cli/src/settings.c:703
-msgid "any, "
-msgstr "鉦能移鉦菽鉦舟移鉦舟盒鈳, "
-
-#: ../cli/src/settings.c:705
-msgid "900 MHz, "
-msgstr "900 MHz, "
-
-#: ../cli/src/settings.c:707
-msgid "1800 MHz, "
-msgstr "1800 MHz, "
-
-#: ../cli/src/settings.c:709
-msgid "1900 MHz, "
-msgstr "1900 MHz, "
-
-#: ../cli/src/settings.c:711
-msgid "850 MHz, "
-msgstr "850 MHz, "
-
-#: ../cli/src/settings.c:713
-msgid "WCDMA 3GPP UMTS 2100 MHz, "
-msgstr "WCDMA 3GPP UMTS 2100 MHz, "
-
-#: ../cli/src/settings.c:715
-msgid "WCDMA 3GPP UMTS 1800 MHz, "
-msgstr "WCDMA 3GPP UMTS 1800 MHz, "
-
-#: ../cli/src/settings.c:717
-msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
-msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
-
-#: ../cli/src/settings.c:719
-msgid "WCDMA 3GPP UMTS 800 MHz, "
-msgstr "WCDMA 3GPP UMTS 800 MHz, "
-
-#: ../cli/src/settings.c:721
-msgid "WCDMA 3GPP UMTS 850 MHz, "
-msgstr "WCDMA 3GPP UMTS 850 MHz, "
-
-#: ../cli/src/settings.c:723
-msgid "WCDMA 3GPP UMTS 900 MHz, "
-msgstr "WCDMA 3GPP UMTS 900 MHz, "
-
-#: ../cli/src/settings.c:725
-msgid "WCDMA 3GPP UMTS 1700 MHz, "
-msgstr "WCDMA 3GPP UMTS 1700 MHz, "
-
-#: ../cli/src/settings.c:727
-msgid "WCDMA 3GPP UMTS 1900 MHz, "
-msgstr "WCDMA 3GPP UMTS 1900 MHz, "
-
-#: ../cli/src/settings.c:729
-msgid "WCDMA 3GPP UMTS 2600 MHz, "
-msgstr "WCDMA 3GPP UMTS 2600 MHz, "
-
-#: ../cli/src/settings.c:747
+#: ../clients/cli/settings.c:690
msgid "0 (NONE)"
msgstr "0 (NONE)"
-#: ../cli/src/settings.c:753
+#: ../clients/cli/settings.c:696
msgid "REORDER_HEADERS, "
msgstr "REORDER_HEADERS, "
-#: ../cli/src/settings.c:755
+#: ../clients/cli/settings.c:698
msgid "GVRP, "
msgstr "GVRP, "
-#: ../cli/src/settings.c:757
+#: ../clients/cli/settings.c:700
msgid "LOOSE_BINDING, "
msgstr "LOOSE_BINDING, "
-#: ../cli/src/settings.c:793
+#: ../clients/cli/settings.c:736
#, c-format
msgid "%d (disabled)"
msgstr "%d (鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦鉦)"
-#: ../cli/src/settings.c:795
+#: ../clients/cli/settings.c:738
#, c-format
msgid "%d (enabled, prefer public IP)"
msgstr "%d (鉦詮鈳鉦啤窒鉦能鈳鉦鉦﹤窒鉦舟, 鉦詮移鉦啤鉦菽鉦兒窒鉦 IP 鉦鈳 鉦鉦舟鉦能略鈳 鉦兒鉦﹤)"
-#: ../cli/src/settings.c:797
+#: ../clients/cli/settings.c:740
#, c-format
msgid "%d (enabled, prefer temporary IP)"
msgstr "%d (鉦詮鈳鉦啤窒鉦能鈳鉦鉦﹤窒鉦舟, 鉦戈移鉦戈鉦鉦擒眷鉦賴 IP 鉦鈳 鉦鉦舟鉦能略鈳 鉦兒鉦﹤)"
-#: ../cli/src/settings.c:809
+#: ../clients/cli/settings.c:752
msgid "0 (none)"
msgstr "0 (鉦能移鉦菽鉦舟 鉦鉦耜鉦)"
-#: ../cli/src/settings.c:815
+#: ../clients/cli/settings.c:758
msgid "agent-owned, "
msgstr "鉦桌異鈳鉦能眶鉦啤鉦戈窒-鉦嫩鉦鉦舟窒鉦,"
-#: ../cli/src/settings.c:817
+#: ../clients/cli/settings.c:760
msgid "not saved, "
msgstr "鉦鉦喪窒鉦詮畢鈳 鉦鉦啤鉦"
-#: ../cli/src/settings.c:819
+#: ../clients/cli/settings.c:762
msgid "not required, "
msgstr "鉦鉦鉦戈鉦能眶鉦賴盒鉦,"
-#: ../cli/src/settings.c:1124
+#: ../clients/cli/settings.c:1044
msgid "0 (disabled)"
msgstr "0 (鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦鉦)"
-#: ../cli/src/settings.c:1130
+#: ../clients/cli/settings.c:1050
msgid "enabled, "
msgstr "鉦詮鈳鉦啤窒鉦能鈳鉦鉦, "
-#: ../cli/src/settings.c:1132
+#: ../clients/cli/settings.c:1052
msgid "advertise, "
msgstr "鉦鉦擒硃鉦賴盒鉦擒略鈳 鉦桌移鉦﹤,"
-#: ../cli/src/settings.c:1134
+#: ../clients/cli/settings.c:1054
msgid "willing, "
msgstr "鉦詮皎鈳鉦桌略鉦賴硫鉦賴畢,"
-#: ../cli/src/settings.c:1162
+#: ../clients/cli/settings.c:1082
msgid "-1 (unset)"
msgstr "-1 (鉦嫩鉦鉦舟窒鉦詮窒鉦耜鉦)"
-#: ../cli/src/settings.c:1270 ../cli/src/settings.c:1453
-#: ../cli/src/settings.c:1493
+#: ../clients/cli/settings.c:1179 ../clients/cli/settings.c:1511
+#: ../clients/cli/settings.c:1553
msgid "auto"
msgstr "鉦詮鉦菽盔鉦鉦鉦擒眷鉦賴略"
-#: ../cli/src/settings.c:1283
+#: ../clients/cli/settings.c:1192
msgid "default"
msgstr "鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略"
-#: ../cli/src/settings.c:1614
+#: ../clients/cli/settings.c:1681
#, c-format
msgid "Do you also want to set '%s' to '%s'? [yes]: "
msgstr "鉦兒鉦菽 '%s' 鉦鉦兒鉦兒 '%s' 鉦鈳 鉦嫩鉦鉦舟窒鉦詮眷鈳 鉦眇盔鉦詮鉦菽窒鉦啤移? [yes]: "
-#: ../cli/src/settings.c:1616
+#: ../clients/cli/settings.c:1683
#, c-format
msgid "Do you also want to clear '%s'? [yes]: "
msgstr "鉦兒鉦菽 '%s' 鉦鉦兒鉦兒 鉦鉦喪窒鉦詮眷鈳 鉦眇盔鉦詮鉦菽窒鉦啤移? [yes]: "
-#: ../cli/src/settings.c:1814 ../cli/src/settings.c:2069
-#: ../cli/src/settings.c:3673
+#: ../clients/cli/settings.c:1844
+#, c-format
+msgid ""
+"Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
+msgstr ""
+"鉦鉦鈳鉦鉦啤窒鉦鈳: %s.%s 鉦鉦兒鉦兒 '%s' 鉦鈳 鉦嫩鉦鉦舟窒鉦詮眷鉦擒鉦賴畢鈳, 鉦鉦舟盒鈳 鉦鉦舟疏鈳鉦兒 鉦詮鉦芹疏鈳鉦桌鉦 鉦鈳鉦啤皎鉦舟眷鈳鉦耜窒 "
+"鉦鉦﹤鉦鉦鉦賴硫鈳鉦 鉦詮移鉦抉鉦能略鈳 鉦鉦舟\n"
+
+#: ../clients/cli/settings.c:1926 ../clients/cli/settings.c:2186
+#: ../clients/cli/settings.c:4262
#, c-format
msgid "'%s' is not valid"
msgstr "'%s\" 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒鉦賴眷鈳鉦"
-#: ../cli/src/settings.c:1837
+#: ../clients/cli/settings.c:1949
#, c-format
msgid "'%d' is not valid; use <%d-%d>"
msgstr "'%d' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦; <%d-%d> 鉦鉦兒鉦兒 鉦眇眾鉦詮窒"
-#: ../cli/src/settings.c:1859
+#: ../clients/cli/settings.c:1971
#, c-format
msgid "'%u' is not valid; use <%d-%d>"
msgstr "'%u' 鉦鉦兒鉦兒鉦菽鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦; <%d-%d> 鉦鉦兒鉦兒 鉦眇眾鉦詮窒"
-#: ../cli/src/settings.c:1925
+#: ../clients/cli/settings.c:2037
#, c-format
msgid "'%s' is not valid; use <option>=<value>"
msgstr "'%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦; <option>=<value> 鉦鉦兒鉦兒 鉦眇眾鉦詮窒"
-#: ../cli/src/settings.c:1959
+#: ../clients/cli/settings.c:2071
#, c-format
msgid "index '%s' is not valid"
msgstr "'%s' 鉦詮鉦鉦賴盔鈳 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦"
-#: ../cli/src/settings.c:1964
+#: ../clients/cli/settings.c:2076 ../clients/cli/settings.c:2101
msgid "no item to remove"
msgstr "鉦戈鉦鈳鉦舟鉦嫩移鉦鉦耜 鉦能移鉦菽鉦舟 鉦鉦鉦嗣眶鉦賴眷鈳鉦"
-#: ../cli/src/settings.c:1968
+#: ../clients/cli/settings.c:2080 ../clients/cli/settings.c:2105
#, c-format
msgid "index '%d' is not in range <0-%d>"
msgstr "'%d' 鉦詮鉦鉦賴盔鈳 <0-%d> 鉦菽鉦能移鉦芹鉦戈窒鉦 鉦嫩鉦啤鉦賴畢鈳"
-#: ../cli/src/settings.c:1983
+#: ../clients/cli/settings.c:2120
#, c-format
msgid "invalid option '%s'"
msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦能鉦鈳 '%s'"
-#: ../cli/src/settings.c:1985
+#: ../clients/cli/settings.c:2122
msgid "missing option"
msgstr "鉦鉦能鉦鈳 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦"
-#: ../cli/src/settings.c:2015 ../cli/src/settings.c:2035
+#: ../clients/cli/settings.c:2152
#, c-format
msgid "'%s' is not a valid number (or out of range)"
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦鈳鉦能鉦能移鉦鉦賴眷鈳鉦 (鉦鉦丞眶 鉦菽鉦能移鉦芹鉦戈窒鉦 鉦嫩鉦啤鉦賴畢鈳)"
-#: ../cli/src/settings.c:2089
+#: ../clients/cli/settings.c:2203
#, c-format
msgid "'%s' is not a valid Ethernet MAC"
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 MAC 鉦鉦耜鉦"
-#: ../cli/src/settings.c:2115 ../libnm-util/nm-setting-bridge.c:277
-#: ../libnm-util/nm-setting-connection.c:752
-#: ../libnm-util/nm-setting-vlan.c:475
+#: ../clients/cli/settings.c:2228 ../libnm-core/nm-setting-connection.c:795
+#: ../libnm-core/nm-setting-infiniband.c:272
+#: ../libnm-util/nm-setting-connection.c:833
+#: ../libnm-util/nm-setting-infiniband.c:268
#, c-format
msgid "'%s' is not a valid interface name"
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦 鉦嫩鉦詮盒鉦耜鉦"
-#: ../cli/src/settings.c:2133 ../cli/src/settings.c:3212
-#: ../libnm-util/nm-setting-gsm.c:375
+#: ../clients/cli/settings.c:2246 ../clients/cli/settings.c:3651
+#: ../libnm-core/nm-setting-gsm.c:332 ../libnm-util/nm-setting-gsm.c:372
#, c-format
msgid "'%s' is not a number"
msgstr "'%s' 鉦鉦鉦舟 鉦詮鉦鈳鉦能鉦能移鉦鉦賴眷鈳鉦"
-#: ../cli/src/settings.c:2185
+#: ../clients/cli/settings.c:2298
#, c-format
msgid "'%s' is not a valid hex character"
msgstr "'%s\" 鉦能 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦嫩鉦鈳鉦詮 鉦鉦鈳鉦獅盒 鉦鉦鉦賴眷鈳鉦"
-#: ../cli/src/settings.c:2215
+#: ../clients/cli/settings.c:2328
#, c-format
msgid "'%s' is not a valid MAC"
msgstr "'%s' 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 MAC 鉦鉦耜鉦"
-#: ../cli/src/settings.c:2252 ../libnm-util/nm-setting-connection.c:715
+#: ../clients/cli/settings.c:2365 ../libnm-core/nm-setting-connection.c:784
+#: ../libnm-util/nm-setting-connection.c:790
#, c-format
msgid "'%s' is not a valid UUID"
msgstr "'%s\" 鉦能 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 UUID 鉦鉦鉦賴眷鈳鉦"
-#: ../cli/src/settings.c:2317
+#: ../clients/cli/settings.c:2432
+#, c-format
+msgid "the property doesn't contain permission '%s'"
+msgstr "鉦鈳鉦鉦菽 '%s' 鉦鉦兒鉦桌略鉦賴盔鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦耜鉦"
+
+#: ../clients/cli/settings.c:2444
msgid ""
-"Enter a list of user permissions. This is a list of user names formatted as:\n"
+"Enter a list of user permissions. This is a list of user names formatted "
+"as:\n"
" [user:]<user name 1>, [user:]<user name 2>,...\n"
"The items can be separated by commas or spaces.\n"
"\n"
"Example: alice bob charlie\n"
msgstr ""
"鉦眇眾鉦鈳鉦舟移鉦 鉦鉦兒鉦桌略鉦賴鉦 鉦鉦鉦舟 鉦芹鈳鉦鉦賴盔鉦兒鉦兒 鉦兒皎鈳鉦舟窒鉦詮窒. 鉦 鉦芹鈳鉦鉦賴盔鈳 鉦 鉦鈳鉦喪鉦賴疏鉦鉦戈 "
-"鉦菽窒鉦兒鉦能移鉦詮鈳鉦喪窒鉦詮眷鉦擒畢 鉦眇眾鉦鈳鉦舟移鉦 鉦芹鈳鉦鉦賴盔鉦擒鉦賴畢鈳:\n"
+"鉦菽窒鉦兒鉦能移鉦詮鈳鉦喪窒鉦詮眷鉦擒畢 "
+"鉦眇眾鉦鈳鉦舟移鉦 鉦芹鈳鉦鉦賴盔鉦擒鉦賴畢鈳:\n"
" [user:]<user name 1>, [user:]<user name 2>,... \n"
"鉦鉦鉦嗣鉦喪疏鈳鉦兒 鉦菽窒鉦啤移鉦桌鉦賴硃鈳鉦兒鉦鉦喪 鉦鉦丞眶 鉦鉦擒眷鉦賴鉦擒鉦鉦喪窒鉦鉦 (鉦詮鉦芹鉦詮) 鉦芹鉦啤略鈳鉦能鉦鉦賴硫鉦眇硃鈳鉦舟.\n"
"\n"
"鉦鉦舟移鉦嫩盒鉦鈳鉦鈳: alice bob charlie\n"
-#: ../cli/src/settings.c:2332
+#: ../clients/cli/settings.c:2463
#, c-format
msgid "'%s' is not valid master; use ifname or connection UUID"
msgstr "'%s' 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦桌移鉦詮鉦鉦啤 鉦鉦鉦賴眷鈳鉦; ifname 鉦鉦丞眶 鉦詮鉦芹盒鈳鉦 UUID 鉦鉦兒鉦兒 鉦眇眾鉦詮窒"
-#: ../cli/src/settings.c:2453
+#: ../clients/cli/settings.c:2507
+#, c-format
+msgid "Warning: %s is not an UUID of any existing connection profile\n"
+msgstr ""
+"鉦鉦鈳鉦鉦啤窒鉦鈳: %s 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦賴盒鈳鉦 鉦詮鉦芹盒鈳鉦鉦 鉦芹鉦啤鉦徇鉦耜鉦兒眷鈳鉦耜窒鉦 鉦鉦鉦舟 UUID 鉦鉦鉦賴眷鈳鉦淚n"
+
+#: ../clients/cli/settings.c:2511 ../clients/cli/settings.c:2527
+#, c-format
+#| msgid "Error: '%s' is not a valid connection type."
+msgid "'%s' is not a VPN connection profile"
+msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 VPN 鉦詮鉦芹盒鈳鉦 鉦芹鉦啤鉦徇鉦耜 鉦眇鈳鉦能移鉦鉦賴眷鈳鉦"
+
+#: ../clients/cli/settings.c:2520
+#, c-format
+#| msgid "'%s' is not a valid team configuration or file name."
+msgid "'%s' is not a name of any exiting profile"
+msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦能移鉦菽鉦舟 鉦鉦鉦賴盒鈳鉦 鉦芹鉦啤鉦徇鉦耜鉦 鉦嫩鉦詮盒鈳 鉦鉦鉦賴眷鈳鉦."
+
+#: ../clients/cli/settings.c:2554
+#, c-format
+#| msgid "'%s' is not a valid UUID"
+msgid "the value '%s' is not a valid UUID"
+msgstr "'%s' 鉦桌鉦耜鉦能眶鈳 鉦鉦鉦舟 鉦詮盒鉦賴盔鉦擒畢 UUID 鉦鉦鉦賴眷鈳鉦"
+
+#: ../clients/cli/settings.c:2561
+#, c-format
+msgid "the property doesn't contain UUID '%s'"
+msgstr "鉦鈳鉦鉦菽 UUID '%s' 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦耜鉦"
+
+#: ../clients/cli/settings.c:2573
+msgid ""
+"Enter secondary connections that should be activated when this connection "
+"is\n"
+"activated. Connections can be specified either by UUID or ID (name). nmcli\n"
+"transparently translates names to UUIDs. Note that NetworkManager only "
+"supports\n"
+"VPNs as secondary connections at the moment.\n"
+"The items can be separated by commas or spaces.\n"
+"\n"
+"Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
+msgstr ""
+"鉦 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮窒鉦舟移鉦 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮痊鈳鉦鉦賴盒鈳鉦 鉦鉦啤瓷鉦兒鉦 鉦詮鉦芹盒鈳鉦鉦鉦喪疏鈳鉦兒 "
+"鉦兒皎鈳鉦舟窒鉦詮窒.\n"
+"鉦詮鉦芹盒鈳鉦鉦鉦喪疏鈳鉦兒 UUID 鉦鉦丞眶 ID 鉦 (鉦嫩鉦詮盒鈳) 鉦桌鉦耜 鉦詮鉦鉦賴硫鉦眇硃鈳鉦舟. nmcli 鉦芹移鉦啤畢鉦啤鉦嗣鉦菽移鉦鉦璞n"
+"鉦嫩鉦詮盒鈳鉦鉦喪疏鈳鉦兒 UUID鉦鉦喪窒鉦鈳 鉦鉦兒鉦菽移鉦舟窒鉦戈鈳鉦喪窒鉦詮鉦戈鉦戈畢鈳. NetworkManager 鉦詮畢鈳鉦能鈳鉦鈳 鉦鈳鉦菽眷 \n"
+"VPN鉦鉦喪疏鈳鉦兒 鉦桌移鉦戈鉦 鉦鉦啤瓷鉦兒鉦 鉦詮鉦芹盒鈳鉦鉦鉦喪移鉦鉦 鉦眇鉦鉦眇眷鉦賴硫鈳鉦戈鉦戈畢鈳.\n"
+"鉦鉦鉦嗣鉦喪疏鈳鉦兒 鉦菽窒鉦啤移鉦桌鉦賴硃鈳鉦兒鉦鉦喪 鉦鉦丞眶 鉦鉦擒眷鉦賴硫鈳鉦丞眾鉦鉦喪窒鉦鉦 鉦芹鉦啤略鈳鉦能鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈畢鈳.\n"
+"\n"
+"鉦鉦舟移鉦嫩盒鉦鈳鉦鈳: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
+
+#: ../clients/cli/settings.c:2650
msgid "private key password not provided"
msgstr "鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒 鉦鈳鉦芹鉦戈痕鉦舟眶鉦兒鉦兒 鉦鉦舟鉦賴硫鉦耜移鉦鉦賴眷鈳鉦"
-#: ../cli/src/settings.c:2513
+#: ../clients/cli/settings.c:2677
+#, c-format
+#| msgid "the property can't be changed"
+msgid "the property doesn't contain EAP method '%s'"
+msgstr "鉦鈳鉦鉦菽 EAP 鉦菽窒鉦抉移鉦 '%s' 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦耜鉦"
+
+#: ../clients/cli/settings.c:2702
+#, c-format
+msgid "the property doesn't contain alternative subject match '%s'"
+msgstr "鉦鈳鉦鉦菽 鉦芹盒鈳鉦能移鉦 鉦菽硫鈳鉦戈 鉦嫩鉦鉦舟移鉦鉦賴鈳 '%s' 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦耜鉦"
+
+#: ../clients/cli/settings.c:2731
+#, c-format
+msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
+msgstr "鉦鈳鉦鉦菽 \"phase2\" 鉦芹盒鈳鉦能移鉦 鉦菽硫鈳鉦戈 鉦嫩鉦鉦舟移鉦鉦賴鈳 '%s' 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦耜鉦"
+
+#: ../clients/cli/settings.c:2757
msgid ""
"Enter path to a private key and the key password (if not set yet):\n"
" <file path> [<password>]\n"
@@ -4364,11 +4981,12 @@ msgstr ""
" <file path> [<password>]\n"
"鉦鉦舟移鉦嫩盒鉦鈳鉦鈳: /home/cimrman/jara-priv-key Dardanely\n"
-#: ../cli/src/settings.c:2583
+#: ../clients/cli/settings.c:2827
msgid ""
"Enter bytes as a list of hexadecimal values.\n"
"Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one "
+"byte\n"
"(b) space-separated list of bytes written as hexadecimal digits (with "
"optional 0x/0X prefix, and optional leading 0).\n"
"\n"
@@ -4378,14 +4996,16 @@ msgstr ""
"鉦眇鉦鈳鉦鉦喪疏鈳鉦兒 鉦嫩鉦鈳鉦詮移鉦﹤鉦詮窒鉦桌眷鈳 鉦桌鉦耜鉦能鉦 鉦鉦鉦舟 鉦芹鈳鉦鉦賴盔 鉦啤鉦芹畢鉦耜鉦耜窒 鉦兒皎鈳鉦舟窒鉦詮窒.\n"
"鉦鉦啤瓷鈳 鉦菽窒鉦兒鉦能移鉦詮鉦喪窒鉦鈳 鉦鉦兒鉦桌略鉦 鉦鉦舟:\n"
"(a) 鉦嫩鉦鈳鉦詮移鉦﹤鉦詮窒鉦桌眷鈳 鉦鉦鉦鉦賴鉦 鉦鉦鉦舟 鉦菽移鉦鈳鉦能移鉦鉦, 鉦鉦耜鉦耜窒 鉦芹鉦啤略鉦 鉦鉦啤瓷鈳 鉦鉦鉦鉦賴鉦喪 鉦鉦鉦舟 鉦眇鉦鈳 "
-"鉦鉦兒鉦兒 鉦芹鉦啤略鉦賴疏鉦賴異鉦賴硫鈳鉦戈鉦戈眶鈳\n"
-"(b) 鉦嫩鉦鈳鉦詮移鉦﹤鉦詮窒鉦桌眷鈳 鉦鉦鉦鉦賴鉦喪眷鈳鉦耜窒 鉦眇盒鈳鉦能眷鉦擒畢 鉦鉦擒眷鉦賴鉦擒鉦鉦喪窒鉦鉦 鉦芹鉦啤略鈳鉦能鉦鉦賴硫鉦耜移鉦 鉦芹鈳鉦鉦 "
-"(鉦鉦鈳鉦鉦賴 0x/0X 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮, 鉦桌略鈳鉦戈 鉦鉦舟鉦啤窒鉦鈳 鉦兒皎鈳鉦舟窒鉦詮眷鉦擒畢 鉦鉦鈳鉦鉦賴 0 鉦能鉦鉦舟窒鉦鈳).\n"
+"鉦鉦兒鉦兒 "
+"鉦芹鉦啤略鉦賴疏鉦賴異鉦賴硫鈳鉦戈鉦戈眶鈳\n"
+"(b) 鉦嫩鉦鈳鉦詮移鉦﹤鉦詮窒鉦桌眷鈳 鉦鉦鉦鉦賴鉦喪眷鈳鉦耜窒 鉦眇盒鈳鉦能眷鉦擒畢 鉦鉦擒眷鉦賴鉦擒鉦鉦喪窒鉦鉦 鉦芹鉦啤略鈳鉦能鉦鉦賴硫鉦耜移鉦 鉦芹鈳鉦鉦 (鉦鉦鈳鉦鉦賴 "
+"0x/0X "
+"鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮, 鉦桌略鈳鉦戈 鉦鉦舟鉦啤窒鉦鈳 鉦兒皎鈳鉦舟窒鉦詮眷鉦擒畢 鉦鉦鈳鉦鉦賴 0 鉦能鉦鉦舟窒鉦鈳).\n"
"\n"
"鉦鉦舟移鉦嫩盒鉦鈳鉦鉦喪: ab0455a6ea3a74C2\n"
" ab 4 55 0xa6 ea 3a 74 C2\n"
-#: ../cli/src/settings.c:2686
+#: ../clients/cli/settings.c:2930
#, c-format
msgid ""
"Enter a list of bonding options formatted as:\n"
@@ -4416,17 +5036,22 @@ msgstr ""
"\n"
"鉦鉦舟移鉦嫩盒鉦鈳: mode=2,miimon=120\n"
-#: ../cli/src/settings.c:2727
+#: ../clients/cli/settings.c:2968
#, c-format
msgid "'%s' is not a valid InfiniBand MAC"
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 InfiniBand MAC 鉦鉦耜鉦"
-#: ../cli/src/settings.c:2765
+#: ../clients/cli/settings.c:3005
#, c-format
msgid "'%s' is not a valid IBoIP P_Key"
msgstr "'%s\" 鉦能 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 IBoIP P_Key 鉦鉦鉦賴眷鈳鉦"
-#: ../cli/src/settings.c:2825
+#: ../clients/cli/settings.c:3074 ../clients/cli/settings.c:3420
+#, c-format
+msgid "the property doesn't contain DNS server '%s'"
+msgstr "鉦鈳鉦鉦菽 DNS 鉦芹鉦啤鉦鈳鉦鉦鉦 '%s' 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦耜鉦"
+
+#: ../clients/cli/settings.c:3086
msgid ""
"Enter a list of IPv4 addresses of DNS servers.\n"
"\n"
@@ -4436,12 +5061,22 @@ msgstr ""
"\n"
"鉦鉦舟移鉦嫩盒鉦鈳: 8.8.8.8, 8.8.4.4\n"
-#: ../cli/src/settings.c:2871 ../cli/src/settings.c:3123
+#: ../clients/cli/settings.c:3122 ../clients/cli/settings.c:3474
+#, c-format
+msgid "the property doesn't contain DNS search domain '%s'"
+msgstr "鉦鈳鉦鉦菽 DNS 鉦嫩鉦﹤鉦鈳 鉦﹤鉦桌鉦兒 '%s' 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦耜鉦"
+
+#: ../clients/cli/settings.c:3142 ../clients/cli/settings.c:3494
#, c-format
msgid "'%s' is not valid (use ip[/prefix] [gateway])"
msgstr "'%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦 (ip[/prefix] [gateway] 鉦鉦兒鉦兒 鉦眇眾鉦詮窒)"
-#: ../cli/src/settings.c:2897
+#: ../clients/cli/settings.c:3191 ../clients/cli/settings.c:3542
+#, c-format
+msgid "the property doesn't contain IP address '%s'"
+msgstr "鉦鈳鉦鉦菽 IP 鉦菽窒鉦喪移鉦 '%s' 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦耜鉦"
+
+#: ../clients/cli/settings.c:3204
msgid ""
"Enter a list of IPv4 addresses formatted as:\n"
" ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
@@ -4455,28 +5090,50 @@ msgstr ""
"鉦鉦耜鉦耜畢鈳 鉦鉦啤鉦 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮疏鈳鉦兒 32 鉦 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮 鉦鉦鉦舟 鉦芹盒鉦賴鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈畢鈳.\n"
"鉦鉦舟移鉦嫩盒鉦鈳: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
-#: ../cli/src/settings.c:2954
+#: ../clients/cli/settings.c:3257 ../clients/cli/settings.c:3573
#, c-format
-msgid "'%s' is not valid (use ip/[prefix] next-hop [metric])"
-msgstr "'%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦 (ip/[prefix] next-hop [metric] 鉦鉦兒鉦兒 鉦眇眾鉦詮窒)"
+#| msgid "'%s' is not valid (use ip/[prefix] next-hop [metric])"
+msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
+msgstr ""
+"'%s' 鉦詮盒鉦賴盔鉦擒畢鈳鉦舟眷鈳鉦 (鉦菽窒鉦兒鉦能移鉦詮眶鈳 鉦嫩鉦鉦賴盒鈳鉦戈鉦戈畢鈳: ip/[prefix] [next-hop] [metric])"
-#: ../cli/src/settings.c:2980
+#: ../clients/cli/settings.c:3305 ../clients/cli/settings.c:3621
+#, c-format
+#| msgid "the property can't be changed"
+msgid "the property doesn't contain route '%s'"
+msgstr "鉦鈳鉦鉦菽 '%s' 鉦啤鉦鈳 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦啤鉦菽鉦舟窒鉦耜鉦"
+
+#: ../clients/cli/settings.c:3318
+#| msgid ""
+#| "Enter a list of IPv4 routes formatted as:\n"
+#| " ip/[prefix] next-hop [metric],...\n"
+#| "Missing prefix is regarded as a prefix of 32.\n"
+#| "Missing metric is regarded as a metric of 0.\n"
+#| "\n"
+#| "Example: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
msgid ""
"Enter a list of IPv4 routes formatted as:\n"
-" ip/[prefix] next-hop [metric],...\n"
+" ip[/prefix] [next-hop] [metric],...\n"
+"\n"
"Missing prefix is regarded as a prefix of 32.\n"
-"Missing metric is regarded as a metric of 0.\n"
+"Missing next-hop is regarded as 0.0.0.0.\n"
+"Missing metric or 0 means a default metric (NM/kernel will set a default "
+"value).\n"
"\n"
-"Example: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+"Examples: 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"
msgstr ""
"鉦嫩鉦鈳 鉦菽窒鉦兒鉦能移鉦詮鈳鉦喪窒鉦詮眷鉦擒畢 IPv4 鉦啤鉦鈳鉦鉦 鉦芹鈳鉦鉦賴盔鉦兒鉦兒 鉦兒皎鈳鉦舟窒鉦詮窒:\n"
" ip/[prefix] next-hop [metric],... \n"
-"鉦鉦耜鉦耜畢鈳 鉦鉦啤鉦 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮疏鈳鉦兒 32 鉦 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮 鉦鉦鉦舟 鉦芹盒鉦賴鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈畢鈳.\n"
-"鉦鉦耜鉦耜畢鈳 鉦鉦啤鉦 鉦桌鉦鈳鉦啤窒鉦鈳 鉦鉦兒鉦兒 0 鉦 鉦桌鉦鈳鉦啤窒鉦鈳 鉦鉦鉦 鉦芹盒鉦賴鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈畢鈳.\n"
+"鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮 鉦鉦耜鉦耜畢鈳 鉦鉦舟鉦舟眷鈳鉦耜窒 鉦鉦舟疏鈳鉦兒 32 鉦 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮 鉦鉦鉦舟 鉦芹盒鉦賴鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈畢鈳.\n"
+"鉦桌鉦鉦舟窒鉦 鉦嫩移鉦芹 鉦鉦耜鉦耜畢鈳 鉦鉦舟鉦舟眷鈳鉦耜窒 鉦鉦舟疏鈳鉦兒 0.0.0.0 鉦鉦鉦舟 鉦芹盒鉦賴鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈畢鈳.\n"
+"鉦桌鉦鈳鉦啤窒鉦鈳 鉦鉦耜鉦耜畢鈳 鉦鉦舟鉦舟眷鈳鉦耜窒 鉦鉦丞眶 0 鉦鉦鉦賴畢鈳鉦舟眷鈳鉦耜窒 鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略 鉦桌鉦鈳鉦啤窒鉦鈳 鉦鉦鉦舟盒鈳鉦 "
+"(NM/鉦鉦啤鉦兒眷鈳 鉦鉦鉦舟 鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮鉦戈鉦戈畢鈳).\n"
"\n"
"鉦鉦舟移鉦嫩盒鉦鈳: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+" 10.1.2.0/24\n"
-#: ../cli/src/settings.c:3071
+#: ../clients/cli/settings.c:3432
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 "
@@ -4489,21 +5146,22 @@ msgid ""
msgstr ""
"DNS 鉦芹鉦啤鉦鈳鉦鉦鉦鉦鉦 IPv6 鉦菽窒鉦喪移鉦詮鉦喪疏鈳鉦兒 鉦兒皎鈳鉦舟窒鉦詮窒. IPv6 鉦詮鉦啤鉦兒鉦 鉦菽窒鉦抉移鉦兒眶鈳 'auto' "
"鉦鉦鉦賴畢鈳鉦舟眷鈳鉦耜窒 鉦 DNS 鉦芹鉦啤鉦鈳鉦鉦鉦鉦鉦喪窒鉦鈳 鉦詮鉦菽盔鉦鉦鉦擒眷鉦賴略 鉦詮鉦啤鉦兒鉦能窒鉦鉦 鉦舟鉦啤鉦 鉦桌鉦耜鉦能鉦喪疏鈳鉦兒 "
-"鉦詮鉦啤窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳 (鉦能移鉦菽鉦舟移鉦舟盒鈳 鉦鉦舟鉦舟眷鈳鉦耜窒). DNS 鉦芹鉦啤鉦鈳鉦鉦鉦鉦鉦喪疏鈳鉦兒 'shared' 鉦鉦丞眶 "
-"'link-local' IPv6 鉦詮鉦啤鉦兒移 鉦菽窒鉦抉移鉦兒鉦喪鉦﹤疏鈳 鉦眇眾鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦賴盒鈳鉦菽鉦舟窒鉦耜鉦, 鉦鉦鈳鉦鉦舟盒鈳 鉦能移鉦菽鉦舟 "
-"鉦鉦芹鉦詮鉦鈳鉦啤鉦桌 鉦鉦擒眷鉦眇鉦抉眶鈳 鉦鉦啤鉦菽鉦舟窒鉦耜鉦. 鉦桌窒鉦鈳鉦鈳鉦喪窒鉦 鉦鉦耜鉦耜移 IPv6 鉦詮鉦啤鉦兒移 鉦菽窒鉦抉移鉦兒鉦喪眷鈳鉦耜窒, 鉦 "
-"DNS 鉦芹鉦啤鉦鈳鉦鉦鉦鉦鉦喪疏鈳鉦兒 鉦 鉦詮鉦芹盒鈳鉦鉦鈳鉦鈳 鉦桌移鉦戈鉦啤眶鉦擒畢 DNS 鉦芹鉦啤鉦鈳鉦鉦鉦鉦鉦喪移鉦鉦 鉦眇眾鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
+"鉦詮鉦啤窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳 (鉦能移鉦菽鉦舟移鉦舟盒鈳 鉦鉦舟鉦舟眷鈳鉦耜窒). DNS 鉦芹鉦啤鉦鈳鉦鉦鉦鉦鉦喪疏鈳鉦兒 'shared' 鉦鉦丞眶 'link-"
+"local' IPv6 鉦詮鉦啤鉦兒移 鉦菽窒鉦抉移鉦兒鉦喪鉦﹤疏鈳 鉦眇眾鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦賴盒鈳鉦菽鉦舟窒鉦耜鉦, 鉦鉦鈳鉦鉦舟盒鈳 鉦能移鉦菽鉦舟 "
+"鉦鉦芹鉦詮鉦鈳鉦啤鉦桌 "
+"鉦鉦擒眷鉦眇鉦抉眶鈳 鉦鉦啤鉦菽鉦舟窒鉦耜鉦. 鉦桌窒鉦鈳鉦鈳鉦喪窒鉦 鉦鉦耜鉦耜移 IPv6 鉦詮鉦啤鉦兒移 鉦菽窒鉦抉移鉦兒鉦喪眷鈳鉦耜窒, 鉦 DNS "
+"鉦芹鉦啤鉦鈳鉦鉦鉦鉦鉦喪疏鈳鉦兒 鉦 鉦詮鉦芹盒鈳鉦鉦鈳鉦鈳 鉦桌移鉦戈鉦啤眶鉦擒畢 DNS 鉦芹鉦啤鉦鈳鉦鉦鉦鉦鉦喪移鉦鉦 鉦眇眾鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
"\n"
"鉦鉦舟移鉦嫩盒鉦鈳: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
-#: ../cli/src/settings.c:3149
+#: ../clients/cli/settings.c:3555
msgid ""
"Enter a list of IPv6 addresses formatted as:\n"
" ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
"Missing prefix is regarded as prefix of 128.\n"
"\n"
-"Example: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, 1050:0:0:0:5:600:300c:"
-"326b\n"
+"Example: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, "
+"1050:0:0:0:5:600:300c:326b\n"
msgstr ""
"鉦嫩鉦鈳 鉦菽窒鉦兒鉦能移鉦詮鈳鉦喪窒鉦詮眷鉦擒畢 IPv6 鉦菽窒鉦喪移鉦詮鉦 鉦鉦鉦舟 鉦芹鈳鉦鉦賴盔鉦兒鉦兒 鉦兒皎鈳鉦舟窒鉦詮窒:\n"
" ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
@@ -4511,45 +5169,55 @@ msgstr ""
"鉦鉦耜鉦耜畢鈳 鉦鉦啤鉦 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮疏鈳鉦兒 32 鉦 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮 鉦鉦鉦舟 鉦芹盒鉦賴鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈畢鈳.\n"
"鉦鉦舟移鉦嫩盒鉦鈳: / 26, 0/\n"
-#: ../cli/src/settings.c:3171
-#, c-format
-msgid "'%s' is not valid (use <dest IP>/prefix <next-hop IP> [metric])"
-msgstr ""
-"'%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦 (<dest IP>/prefix <next-hop IP> [metric] 鉦鉦兒鉦兒 鉦眇眾鉦詮窒)"
-
-#: ../cli/src/settings.c:3197
+#: ../clients/cli/settings.c:3634
+#| msgid ""
+#| "Enter a list of IPv6 routes formatted as:\n"
+#| " ip/[prefix] next-hop [metric],...\n"
+#| "Missing prefix is regarded as a prefix of 128.\n"
+#| "Missing metric is regarded as a metric of 0.\n"
+#| "\n"
+#| "Example: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
+#| "db8:beef::3 2\n"
msgid ""
"Enter a list of IPv6 routes formatted as:\n"
-" ip/[prefix] next-hop [metric],...\n"
+" ip[/prefix] [next-hop] [metric],...\n"
+"\n"
"Missing prefix is regarded as a prefix of 128.\n"
-"Missing metric is regarded as a metric of 0.\n"
+"Missing next-hop is regarded as \"::\".\n"
+"Missing metric or 0 means a default metric (NM/kernel will set a default "
+"value).\n"
"\n"
-"Example: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
+"Examples: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
"db8:beef::3 2\n"
+" abbe::/64 55\n"
msgstr ""
-"鉦嫩鉦鈳 鉦菽窒鉦兒鉦能移鉦詮鈳鉦喪窒鉦詮眷鉦擒畢 IPv6 鉦啤鉦鈳鉦鉦 鉦芹鈳鉦鉦賴盔鉦兒鉦兒 鉦兒皎鈳鉦舟窒鉦詮窒:\n"
+"鉦嫩鉦鈳 鉦菽窒鉦兒鉦能移鉦詮鈳鉦喪窒鉦詮眷鉦擒畢 IPv4 鉦啤鉦鈳鉦鉦 鉦芹鈳鉦鉦賴盔鉦兒鉦兒 鉦兒皎鈳鉦舟窒鉦詮窒:\n"
" ip/[prefix] next-hop [metric],... \n"
-"鉦鉦耜鉦耜畢鈳 鉦鉦啤鉦 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮疏鈳鉦兒 32 鉦 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮 鉦鉦鉦舟 鉦芹盒鉦賴鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈畢鈳.\n"
-"鉦鉦耜鉦耜畢鈳 鉦鉦啤鉦 鉦桌鉦鈳鉦啤窒鉦鈳 鉦鉦兒鉦兒 0 鉦 鉦桌鉦鈳鉦啤窒鉦鈳 鉦鉦鉦 鉦芹盒鉦賴鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈畢鈳.\n"
"\n"
-"鉦鉦舟移鉦嫩盒鉦鈳: / 2 , 00/ 1\n"
+"鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮 鉦鉦耜鉦耜畢鈳 鉦鉦舟鉦舟眷鈳鉦耜窒 鉦鉦舟疏鈳鉦兒 128 鉦 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮 鉦鉦鉦舟 鉦芹盒鉦賴鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈畢鈳.\n"
+"鉦桌鉦鉦舟窒鉦 鉦嫩移鉦芹 鉦鉦耜鉦耜畢鈳 鉦鉦舟鉦舟眷鈳鉦耜窒 鉦鉦舟疏鈳鉦兒 \"::\" 鉦鉦鉦舟 鉦芹盒鉦賴鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈畢鈳.\n"
+"鉦桌鉦鈳鉦啤窒鉦鈳 鉦鉦耜鉦耜畢鈳 鉦鉦舟鉦舟眷鈳鉦耜窒 鉦鉦丞眶 0 鉦鉦鉦賴畢鈳鉦舟眷鈳鉦耜窒 鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略 鉦桌鉦鈳鉦啤窒鉦鈳 鉦鉦鉦舟盒鈳鉦 "
+"(NM/鉦鉦啤鉦兒眷鈳 鉦鉦鉦舟 鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮鉦戈鉦戈畢鈳).\n"
+"\n"
+"鉦鉦舟移鉦嫩盒鉦鈳:2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
+"db8:beef::3 2\n"
-#: ../cli/src/settings.c:3219
+#: ../clients/cli/settings.c:3658
#, c-format
msgid "'%s' is not valid; use 0, 1, or 2"
msgstr "'%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦; [0, 1 鉦鉦丞眶 2] 鉦鉦兒鉦兒 鉦眇眾鉦詮窒"
-#: ../cli/src/settings.c:3236
+#: ../clients/cli/settings.c:3675
#, c-format
msgid "'%s' is not a valid channel; use <1-13>"
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦擒疏鉦耜 鉦鉦耜鉦; <1-13> 鉦鉦兒鉦兒 鉦眇眾鉦詮窒"
-#: ../cli/src/settings.c:3257
+#: ../clients/cli/settings.c:3696
#, c-format
msgid "'%s' is not valid; use [e, o, n]"
msgstr "'%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦; [e, o, n] 鉦鉦兒鉦兒 鉦眇眾鉦詮窒"
-#: ../cli/src/settings.c:3285
+#: ../clients/cli/settings.c:3724
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 "
@@ -4561,27 +5229,58 @@ msgid ""
msgstr ""
"nmcli 鉦能 鉦兒鉦啤眶鉦擒畢 JSON 鉦詮鉦啤鉦兒移 鉦舟略鈳鉦戈移鉦鉦 鉦桌略鈳鉦戈 鉦詮鉦啤鉦兒鉦能疏鈳鉦兒 鉦嫩鉦鉦舟窒鉦啤鉦 鉦鉦﹤略鉦 鉦嫩鉦詮盒鈳 "
"鉦鉦啤瓷鉦兒鉦兒 鉦詮硃 鉦鉦鉦鈳鉦鉦啤窒鉦詮鉦戈鉦戈畢鈳. 鉦鉦啤瓷鉦兒鉦 鉦詮鉦舟盒鈳鉦冢畢鉦耜鉦耜窒, 鉦鉦﹤略鉦菽疏鈳鉦兒 鉦鉦舟窒 鉦兒鉦戈盒 "
-"鉦鉦舟盒鉦耜鉦耜窒鉦啤鉦菽鉦舟疏鈳鉦兒 鉦 鉦鈳鉦鉦鈳鉦鈳 鉦詮鉦啤窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
+"鉦鉦舟盒鉦耜鉦耜窒鉦啤鉦菽鉦舟疏鈳鉦兒 鉦 "
+"鉦鈳鉦鉦鈳鉦鈳 鉦詮鉦啤窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
"\n"
"鉦鉦舟移鉦嫩盒鉦鈳鉦鈳: set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
"\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
" set team.config /etc/my-team.conf\n"
-#: ../cli/src/settings.c:3325
+#: ../clients/cli/settings.c:3764
msgid "no priority to remove"
msgstr "鉦戈鉦鈳鉦舟鉦嫩移鉦鉦耜 鉦能移鉦菽鉦舟 鉦鉦舟鉦能略鈳 鉦鉦耜鉦"
-#: ../cli/src/settings.c:3329
+#: ../clients/cli/settings.c:3768
#, c-format
msgid "index '%d' is not in the range of <0-%d>"
msgstr "'%d' 鉦詮鉦鉦賴盔鈳 <0-%d> 鉦菽鉦能移鉦芹鉦戈窒鉦 鉦嫩鉦啤鉦賴畢鈳"
-#: ../cli/src/settings.c:3444
+#: ../clients/cli/settings.c:3807
+#, c-format
+msgid ""
+"Warning: only one mapping at a time is supported; taking the first one (%s)\n"
+msgstr ""
+"鉦鉦鈳鉦鉦啤窒鉦鈳: 鉦鉦鉦舟 鉦眇移鉦啤窒鉦鈳 鉦鈳鉦菽眷 鉦鉦鉦舟 鉦桌鉦能移鉦芹窒鉦鉦鈳 鉦鉦兒鉦兒 鉦桌移鉦戈鉦 鉦眇鉦鉦眇眷鉦賴硫鉦耜移鉦鈳鉦戈鉦戈畢鈳; "
+"鉦桌鉦舟眷鉦兒鉦能畢鉦兒鉦兒 鉦戈鉦鈳鉦舟鉦鈳鉦喪鉦喪眷鉦擒鈳鉦戈鉦戈窒鉦舟 (%s)\n"
+
+#: ../clients/cli/settings.c:3814
+#, c-format
+#| msgid "the property can't be changed"
+msgid "the property doesn't contain mapping '%s'"
+msgstr "鉦鈳鉦鉦菽 '%s' 鉦桌鉦能移鉦芹窒鉦鉦鈳 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦啤鉦菽鉦舟窒鉦耜鉦"
+
+#: ../clients/cli/settings.c:3923 ../clients/cli/settings.c:4091
+#: ../libnm-core/nm-setting-wired.c:624
+#: ../libnm-core/nm-setting-wireless.c:801
+#: ../libnm-core/nm-setting-wireless.c:813
+#: ../libnm-util/nm-setting-wired.c:648
+#: ../libnm-util/nm-setting-wireless.c:840
+#: ../libnm-util/nm-setting-wireless.c:854
+#, c-format
+msgid "'%s' is not a valid MAC address"
+msgstr "'%s' 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 MAC 鉦菽窒鉦喪移鉦詮眶鉦耜鉦"
+
+#: ../clients/cli/settings.c:3929 ../clients/cli/settings.c:4097
+#, c-format
+msgid "the property doesn't contain MAC address '%s'"
+msgstr "鉦鈳鉦鉦菽 MAC 鉦菽窒鉦喪移鉦 '%s' 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦啤鉦菽鉦舟窒鉦耜鉦"
+
+#: ../clients/cli/settings.c:3948
#, c-format
msgid "'%s' is not valid; 3 strings should be provided"
msgstr "'%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦; 3 鉦菽移鉦鈳鉦能移鉦鉦嗣鉦喪疏鈳鉦兒 鉦鉦舟鉦賴硫鉦眇鉦鈳"
-#: ../cli/src/settings.c:3463
+#: ../clients/cli/settings.c:3967
msgid ""
"Enter a list of three channels (comma or space separated).\n"
"\n"
@@ -4592,7 +5291,7 @@ msgstr ""
"\n"
"鉦鉦舟移鉦嫩盒鉦鈳: 0.0.0e20 0.0.0e21 0.0.0e22\n"
-#: ../cli/src/settings.c:3513
+#: ../clients/cli/settings.c:4017
#, c-format
msgid ""
"Enter a list of S/390 options formatted as:\n"
@@ -4603,158 +5302,202 @@ msgstr ""
" option = <value>, option = <value>,... \n"
"鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦能鉦鈳鉦鉦喪鉦鉦舟盒鈳: %s\n"
-#: ../cli/src/settings.c:3559
+#: ../clients/cli/settings.c:4063
#, c-format
msgid "'%s' is not a valid channel"
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦擒疏鉦耜 鉦鉦耜鉦"
-#: ../cli/src/settings.c:3565
+#: ../clients/cli/settings.c:4069
#, c-format
msgid "'%ld' is not a valid channel"
msgstr "'%ld' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦擒疏鉦耜 鉦鉦耜鉦"
-#: ../cli/src/settings.c:3668 ../cli/src/settings.c:3671
+#: ../clients/cli/settings.c:4156 ../clients/cli/settings.c:4194
+#: ../clients/cli/settings.c:4232
+#, c-format
+msgid "the property doesn't contain protocol '%s'"
+msgstr "'%s' 鉦芹鉦啤鉦鈳鉦鉦擒眷鈳 鉦鈳鉦鉦菽疏鈳鉦兒 鉦嫩鉦鉦舟窒鉦啤鉦菽鉦舟窒鉦耜鉦"
+
+#: ../clients/cli/settings.c:4271
+#, 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/cli/settings.c:4279
#, c-format
msgid "WEP key is guessed to be of '%s'\n"
msgstr "WEP 鉦鈳鉦耜窒鉦能疏鈳鉦兒 '%s' 鉦鉦鉦舟 鉦鉦嫩窒鉦詮眷鉦擒鉦賴畢鈳\n"
-#: ../cli/src/settings.c:3695
+#: ../clients/cli/settings.c:4281
+#, c-format
+#| msgid "WEP key is guessed to be of '%s'\n"
+msgid "WEP key index set to '%d'\n"
+msgstr "WEP 鉦鈳鉦耜窒鉦能疏鈳鉦兒 '%d' 鉦鉦鉦舟 鉦嫩鉦鉦舟窒鉦詮眷鉦擒鉦賴畢鈳\n"
+
+#: ../clients/cli/settings.c:4304
#, c-format
msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
msgstr ""
"'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦菽鉦鉦喪眷鈳鉦耜窒 鉦鉦鉦舟 鉦鉦鉦賴眷鈳鉦 [0 (unknown), 1 (key), 2 (passphrase)]"
-#: ../cli/src/settings.c:3715
+#: ../clients/cli/settings.c:4320 ../clients/cli/settings.c:4323
+#: ../clients/cli/settings.c:4326 ../clients/cli/settings.c:4329
+#, c-format
+msgid ""
+"Warning: '%s' is not compatible with '%s' type, please change or delete the "
+"key.\n"
+msgstr ""
+"鉦鉦鈳鉦鉦啤窒鉦鈳: '%s' 鉦鉦兒鉦兒鉦菽鉦舟 '%s' 鉦眇鈳鉦能鉦鉦舟窒鉦鈳 鉦嫩鉦鉦舟窒鉦鈳鉦能移鉦鈳鉦菽鉦舟窒鉦耜鉦, 鉦舟盔鉦菽窒鉦鈳鉦鈳 "
+"鉦鈳鉦耜窒鉦能疏鈳鉦兒 鉦眇畢鉦耜移鉦能窒鉦詮窒 鉦鉦丞眶 鉦鉦喪窒鉦詮窒.\n"
+
+#: ../clients/cli/settings.c:4342
#, c-format
msgid ""
"Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
"and 2 or passphrase.\n"
msgstr ""
-"WEP 鉦鈳鉦耜窒鉦鉦 鉦眇鈳鉦能疏鈳鉦兒 鉦兒皎鈳鉦舟窒鉦詮窒. 鉦鉦鉦鈳鉦鉦啤窒鉦詮眷鉦擒鈳鉦 鉦桌鉦耜鉦能鉦喪鉦鉦舟盒鈳: 0 鉦鉦丞眶 unknown, 1 "
-"鉦鉦丞眶 key, 鉦桌略鈳鉦戈 2 鉦鉦丞眶 passphrase.\n"
+"WEP 鉦鈳鉦耜窒鉦鉦 鉦眇鈳鉦能疏鈳鉦兒 鉦兒皎鈳鉦舟窒鉦詮窒. 鉦鉦鉦鈳鉦鉦啤窒鉦詮眷鉦擒鈳鉦 鉦桌鉦耜鉦能鉦喪鉦鉦舟盒鈳: 0 鉦鉦丞眶 unknown, 1 鉦鉦丞眶 "
+"key, 鉦桌略鈳鉦戈 2 鉦鉦丞眶 passphrase.\n"
-#: ../cli/src/settings.c:3728
+#: ../clients/cli/settings.c:4355
#, c-format
msgid "'%s' is not a valid PSK"
msgstr "'%s' 鉦能 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 PSK 鉦鉦鉦賴眷鈳鉦"
-#: ../cli/src/settings.c:3772
+#: ../clients/cli/settings.c:4399
#, c-format
msgid "'%s' is not a valid DCB flag"
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 DCB 鉦徇鉦耜鉦能移鉦鈳 鉦鉦鉦賴眷鈳鉦"
-#: ../cli/src/settings.c:3795
+#: ../clients/cli/settings.c:4422
#, c-format
msgid "'%s' is not a DCB app priority"
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 DCB app 鉦鉦舟鉦能略鈳 鉦鉦鉦賴眷鈳鉦"
-#: ../cli/src/settings.c:3821
+#: ../clients/cli/settings.c:4448
msgid "must contain 8 comma-separated numbers"
msgstr "8 鉦菽窒鉦啤移鉦桌鉦賴硃鈳鉦兒鉦鉦喪窒鉦鉦 鉦芹鉦啤略鈳鉦能鉦鉦賴硫鉦耜移鉦 鉦詮鉦鈳鉦能鉦鉦喪疏鈳鉦兒 鉦嫩鉦鉦舟窒鉦啤痊鈳鉦鈳"
-#: ../cli/src/settings.c:3838
+#: ../clients/cli/settings.c:4465
#, c-format
msgid "'%s' not a number between 0 and %u (inclusive) or %u"
msgstr ""
"'%s' 鉦鉦兒鉦兒鉦菽鉦舟 0 鉦桌略鈳鉦戈 %u (鉦鉦舟 鉦詮鉦啤窒鉦舟鉦戈) 鉦鉦丞眶 %u 鉦兒瓷鈳鉦菽窒鉦 鉦鉦鉦舟 鉦詮鉦鈳鉦能鉦能移鉦鉦賴眷鈳鉦"
-#: ../cli/src/settings.c:3841
+#: ../clients/cli/settings.c:4468
#, c-format
msgid "'%s' not a number between 0 and %u (inclusive)"
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 0 鉦桌略鈳鉦戈 %u (鉦鉦舟 鉦詮鉦啤窒鉦舟鉦戈) 鉦兒瓷鈳鉦菽窒鉦 鉦鉦鉦舟 鉦詮鉦鈳鉦能鉦能移鉦鉦賴眷鈳鉦"
-#: ../cli/src/settings.c:3863
+#: ../clients/cli/settings.c:4490
#, c-format
-msgid "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
+msgid ""
+"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
"\n"
msgstr ""
-"鉦鉦鈳鉦鉦啤窒鉦鈳: '%s' 鉦鉦兒鉦兒鉦菽鉦舟 1 (鉦詮鈳鉦啤窒鉦能鈳鉦鉦) 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦啤鉦菽眶鉦啤鉦鈳 鉦眇畢鉦耜移鉦菽產鈳鉦鉦喪 "
-"鉦能移鉦菽鉦舟 鉦芹盒鉦賴產鉦擒皎 鉦眇鉦啤鉦菽鉦舟窒鉦耜鉦淚n"
+"鉦鉦鈳鉦鉦啤窒鉦鈳: '%s' 鉦鉦兒鉦兒鉦菽鉦舟 1 (鉦詮鈳鉦啤窒鉦能鈳鉦鉦) 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦啤鉦菽眶鉦啤鉦鈳 鉦眇畢鉦耜移鉦菽產鈳鉦鉦喪 鉦能移鉦菽鉦舟 "
+"鉦芹盒鉦賴產鉦擒皎 鉦眇鉦啤鉦菽鉦舟窒鉦耜鉦淚n"
"\n"
-#: ../cli/src/settings.c:3916
+#: ../clients/cli/settings.c:4543
#, c-format
msgid "bandwidth percentages must total 100%%"
msgstr "鉦眇鉦能移鉦鉦﹤鉦菽窒鉦﹤鉦戈 鉦芹鉦啤略鉦賴眸鉦戈鉦喪 鉦鉦鈳鉦鈳 100%% 鉦鉦鉦賴盒鉦眇鉦鈳"
-#: ../cli/src/settings.c:5594
+#: ../clients/cli/settings.c:6186
msgid "don't know how to get the property value"
msgstr "鉦鈳鉦鉦 鉦桌鉦耜鉦能鈳鉦鈳 鉦嫩鉦鈳 鉦嫩鉦鉦眇鉦鈳 鉦鉦鉦舟 鉦戈窒鉦喪窒鉦舟窒鉦耜鉦"
-#: ../cli/src/settings.c:5647 ../cli/src/settings.c:5687
+#: ../clients/cli/settings.c:6239 ../clients/cli/settings.c:6279
msgid "the property can't be changed"
msgstr "鉦鈳鉦鉦菽疏鈳鉦兒 鉦眇畢鉦耜移鉦能窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦賴眷鈳鉦"
-#: ../cli/src/settings.c:5791
+#: ../clients/cli/settings.c:6362
+#| msgid "unavailable"
+msgid "(not available)"
+msgstr "(鉦耜痍鈳鉦能眶鉦賴眷鈳鉦)"
+
+#: ../clients/cli/settings.c:6387
msgid "[NM property description]"
msgstr "[NM 鉦鈳鉦鉦 鉦菽窒鉦菽盒鉦鈳]"
-#: ../cli/src/settings.c:5797
+#: ../clients/cli/settings.c:6392
msgid "[nmcli specific description]"
msgstr "[nmcli 鉦兒窒鉦嗣鉦鉦賴略 鉦菽窒鉦菽盒鉦鈳]"
-#: ../cli/src/utils.c:111
+#: ../clients/cli/utils.c:127
#, c-format
msgid "Error: value for '%s' argument is required."
msgstr "鉦舟鉦: '%s' 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦 鉦桌鉦耜鉦能畢 鉦鉦鉦戈鉦能眶鉦賴畢鈳."
-#: ../cli/src/utils.c:136
+#: ../clients/cli/utils.c:152
#, c-format
msgid "Error: Argument '%s' was expected, but '%s' provided."
msgstr "鉦舟鉦: '%s' 鉦鉦兒鉦兒 鉦兒窒鉦啤鉦鈳鉦獅窒鉦詮眷鉦擒鉦賴略鈳鉦戈, 鉦鉦舟盒鈳 '%s' 鉦鉦兒鉦兒 鉦兒鉦﹤眷鉦擒鉦賴畢鈳."
-#: ../cli/src/utils.c:139
+#: ../clients/cli/utils.c:155
#, c-format
msgid "Error: Unexpected argument '%s'"
msgstr "鉦舟鉦: 鉦鉦兒窒鉦啤鉦鈳鉦獅窒鉦 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 '%s'"
-#: ../cli/src/utils.c:189
+#: ../clients/cli/utils.c:205
#, c-format
msgid "Error converting IP4 address '0x%X' to text form"
msgstr "鉦鉦舟盒鉦賴鉦 IP4 鉦菽窒鉦喪移鉦 '0x%X' 鉦鉦兒鉦兒 鉦芹鈳鉦能眶鉦擒鉦 鉦芹盒鉦賴眶鉦啤鉦戈窒鉦詮鉦菽眷鈳鉦耜窒 鉦舟鉦"
-#: ../cli/src/utils.c:217
+#: ../clients/cli/utils.c:233
#, c-format
msgid "Error converting IP6 address '%s' to text form"
msgstr "鉦鉦舟盒鉦賴鉦 IP6 鉦菽窒鉦喪移鉦 '%s' 鉦鉦兒鉦兒 鉦芹鈳鉦能眶鉦擒鉦 鉦芹盒鉦賴眶鉦啤鉦戈窒鉦詮鉦菽眷鈳鉦耜窒 鉦舟鉦"
-#: ../cli/src/utils.c:393
+#: ../clients/cli/utils.c:407
+#, c-format
+#| msgid "'%s' is ambiguous (%s x %s)"
+msgid "'%s' is ambiguous (on x off)"
+msgstr "'%s' 鉦鉦鉦眇鉦舟 鉦鉦詮鉦芹眺鈳鉦鉦菽移鉦鉦賴畢鈳 (鉦鉦兒 x 鉦鉦徇)"
+
+#: ../clients/cli/utils.c:417
#, c-format
msgid "'%s' is not valid; use [%s] or [%s]"
msgstr "'%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦; [%s] 鉦鉦丞眶 [%s] 鉦鉦兒鉦兒 鉦眇眾鉦詮窒"
-#: ../cli/src/utils.c:475
+#: ../clients/cli/utils.c:499
#, c-format
msgid "'%s' is ambiguous (%s x %s)"
msgstr "'%s' 鉦鉦鉦眇鉦舟 鉦鉦詮鉦芹眺鈳鉦鉦菽移鉦鉦賴畢鈳 (%s x %s)"
-#: ../cli/src/utils.c:487
+#: ../clients/cli/utils.c:511
#, c-format
msgid "missing name, try one of [%s]"
msgstr "鉦嫩鉦詮盒鈳 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦, [%s] 鉦兒眷鈳鉦耜窒 鉦鉦鉦舟疏鈳鉦兒 鉦芹鉦啤盔鉦戈鉦兒窒鉦詮窒"
-#: ../cli/src/utils.c:718
+#: ../clients/cli/utils.c:728
#, c-format
msgid "field '%s' has to be alone"
msgstr "'%s' 鉦鉦鉦 鉦鈳鉦獅鉦戈鉦啤眶鈳 鉦鉦鉦鉦賴盔鉦擒鉦賴盔鈳 鉦鉦啤痊鈳鉦鈳"
-#: ../cli/src/utils.c:720
+#: ../clients/cli/utils.c:731
#, c-format
msgid "invalid field '%s'; allowed fields: %s"
msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦丞眾 '%s'; 鉦鉦兒鉦桌略鉦 鉦鉦啤鉦 鉦詮鉦丞眾鉦鉦喪: %s"
-#: ../cli/src/utils.c:747
+#: ../clients/cli/utils.c:788
msgid "Option '--terse' requires specifying '--fields'"
msgstr "'--terse' 鉦鉦鉦 鉦鉦能鉦鈳鉦鈳 '--fields' 鉦鉦兒鉦兒 鉦詮鉦鉦賴硫鉦眇鉦鉦擒鈳鉦戈鉦戈畢鈳"
-#: ../cli/src/utils.c:751
+#: ../clients/cli/utils.c:792
#, c-format
msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
msgstr ""
"'--terse' 鉦鉦鉦 鉦鉦能鉦鈳鉦鈳 鉦兒窒鉦嗣鉦鉦賴略鉦菽移鉦 '--fields' 鉦鉦能鉦鈳鉦 鉦桌鉦耜鉦能畢 鉦鉦鉦戈鉦能眶鉦賴盒鈳鉦戈鉦戈畢鈳鉦能 "
-"鉦嫩鉦啤略鈳, '%s' 鉦鉦鉦眇鉦舟眷鈳鉦"
+"鉦嫩鉦啤略鈳, "
+"'%s' 鉦鉦鉦眇鉦舟眷鈳鉦"
-#: ../cli/src/utils.c:1070
+#: ../clients/cli/utils.c:1111
#, c-format
msgid ""
"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
@@ -4763,7 +5506,7 @@ msgstr ""
"鉦鉦鈳鉦鉦啤窒鉦鈳: nmcli (%s) 鉦桌略鈳鉦戈 NetworkManager (%s) 鉦鉦菽鉦戈鉦戈窒鉦鉦喪 鉦戈移鉦喪鉦能移鉦鈳鉦戈鉦戈窒鉦耜鉦. "
"鉦鉦鈳鉦鉦啤窒鉦鈳鉦能疏鈳鉦兒 鉦桌盒鈳鉦桌移鉦鉦耜 --nocheck 鉦眇眾鉦詮.\n"
-#: ../cli/src/utils.c:1079
+#: ../clients/cli/utils.c:1120
#, c-format
msgid ""
"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
@@ -4774,698 +5517,1883 @@ msgstr ""
"鉦鉦兒窒鉦啤鉦鈳鉦獅窒鉦戈眶鉦擒鉦賴盒鈳鉦戈鉦戈眶鈳.\n"
"."
-#: ../libnm-util/crypto.c:133
+#: ../clients/nm-online.c:96
+#, c-format
+msgid "\rConnecting"
+msgstr "\r鉦詮鉦芹盒鈳鉦 鉦鉦耜鉦芹窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟"
+
+#: ../clients/nm-online.c:149
+msgid ""
+"Time to wait for a connection, in seconds (without the option, default value "
+"is 30)"
+msgstr ""
+"鉦鉦鉦舟 鉦詮鉦芹盒鈳鉦鉦鈳鉦鈳 鉦鉦擒盔鉦眇鉦鉦賴盒鈳鉦 鉦詮皎鉦 (鉦 鉦鉦能鉦鈳 鉦鉦耜鉦耜畢鈳, 鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略鉦菽 鉦桌鉦耜鉦能眶鈳 30 "
+"鉦鉦鉦賴盒鈳鉦戈鉦戈畢鈳)"
+
+#: ../clients/nm-online.c:150
+#| msgid "Exit immediately if NetworkManager is not running"
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr ""
+"NetworkManager 鉦詮鉦芹盒鈳鉦鉦賴略鉦鈳鉦喪鉦喪畢鈳 鉦鉦舟鉦舟眷鈳鉦耜窒 鉦鉦丞眶 鉦鉦耜移鉦能窒鉦戈鈳鉦喪鉦喪畢鈳 鉦鉦舟鉦舟眷鈳鉦耜窒 鉦戈鈳鉦獅產鉦菽 "
+"鉦兒窒鉦啤鉦鉦桌窒鉦詮"
+
+#: ../clients/nm-online.c:151
+msgid "Don't print anything"
+msgstr "鉦鉦兒疏鈳鉦兒 鉦桌鉦舟鉦啤窒鉦詮痊鈳鉦"
+
+#: ../clients/nm-online.c:152
+#| msgid ""
+#| "Waits for NetworkManager to finish activating startup network connections."
+msgid "Wait for NetworkManager startup instead of a connection"
+msgstr "鉦鉦鉦舟 鉦詮鉦芹盒鈳鉦鉦 鉦眇畢鉦耜窒鉦鈳 NetworkManager 鉦鉦啤鉦冢鈳鉦喪鉦喪眷鈳 鉦鉦擒盔鉦耜移鉦鈳鉦戈鉦戈畢鈳"
+
+#: ../clients/nm-online.c:173
+msgid ""
+"Waits for NetworkManager to finish activating startup network connections."
+msgstr ""
+"鉦鉦啤鉦冢窒鉦 鉦鉦擒眷鉦眇鉦 鉦詮鉦芹盒鈳鉦鉦鉦喪疏鈳鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮鉦菽鉦戈 NetworkManager 鉦鈳 鉦鉦擒盔鉦耜移鉦鈳鉦戈鉦戈畢鈳."
+
+#: ../clients/nm-online.c:180 ../clients/nm-online.c:186
+msgid "Invalid option. Please use --help to see a list of valid options."
+msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦能鉦鈳. 鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦能鉦鈳鉦鉦喪窒鉦鉦擒鉦 鉦舟盔鉦菽窒鉦鈳鉦鈳 --help 鉦鉦兒鉦兒 鉦兒鉦﹤窒."
+
+#: ../clients/tui/newt/nmt-newt-utils.c:180 ../clients/tui/nmt-editor.c:240
+#: ../clients/tui/nmt-password-dialog.c:175
+#: ../clients/tui/nmt-route-editor.c:135 ../clients/tui/nmtui-hostname.c:71
+#: ../clients/tui/nmtui.c:118
+msgid "OK"
+msgstr "鉦詮盒鉦"
+
+#: ../clients/tui/newt/nmt-newt-utils.c:328
+#: ../clients/tui/newt/nmt-newt-utils.c:360
+#, c-format
+msgid "Could not create temporary file: %s"
+msgstr "鉦戈移鉦戈鉦鉦擒眷鉦賴 鉦鉦﹤略鉦菽疏鈳鉦兒 鉦啤鉦賴硫鉦耜移鉦鉦賴眷鈳鉦: %s"
+
+#: ../clients/tui/newt/nmt-newt-utils.c:368
+#, c-format
+msgid "Editor failed: %s"
+msgstr "鉦詮鉦芹移鉦舟鉦菽 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s"
+
+#: ../clients/tui/newt/nmt-newt-utils.c:376
+#, c-format
+#| msgid "Editor failed: %s"
+msgid "Editor failed with status %d"
+msgstr "鉦詮鉦芹移鉦舟鉦菽 %d 鉦詮鉦丞窒鉦戈窒鉦能鉦鉦舟窒鉦鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
+
+#: ../clients/tui/newt/nmt-newt-utils.c:378
+#, c-format
+#| msgid "Editor failed: %s"
+msgid "Editor failed with signal %d"
+msgstr "鉦詮鉦芹移鉦舟鉦菽 %d 鉦詮鉦鈳鉦戈畢鈳鉦鉦舟窒鉦鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
+
+#: ../clients/tui/newt/nmt-newt-utils.c:382
+#, c-format
+msgid "Could not re-read file: %s"
+msgstr "鉦鉦﹤略鉦菽疏鈳鉦兒 鉦芹鉦兒-鉦鉦舟眷鉦擒鉦賴眷鈳鉦: %s"
+
+#: ../clients/tui/nm-editor-utils.c:151
+#, c-format
+msgid "Ethernet connection %d"
+msgstr "鉦鉦戈盒鈳鉦兒鉦鈳 鉦詮鉦芹盒鈳鉦 %d"
+
+#: ../clients/tui/nm-editor-utils.c:159
+#, c-format
+msgid "Wi-Fi connection %d"
+msgstr "鉦菽-鉦徇 鉦詮鉦芹盒鈳鉦 %d"
+
+#: ../clients/tui/nm-editor-utils.c:168
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "InfiniBand 鉦詮鉦芹盒鈳鉦 %d"
+
+#: ../clients/tui/nm-editor-utils.c:173 ../libnm-glib/nm-device.c:1798
+msgid "Mobile Broadband"
+msgstr "鉦桌鉦眇鉦耜 鉦眇鉦啤移鉦﹤鉦眇鉦能移鉦鉦﹤"
+
+#: ../clients/tui/nm-editor-utils.c:176
+#, c-format
+msgid "Mobile broadband connection %d"
+msgstr "鉦桌鉦眇鉦耜 鉦眇鉦啤移鉦﹤鉦眇鉦能移鉦鉦﹤ 鉦詮鉦芹盒鈳鉦 %d"
+
+#: ../clients/tui/nm-editor-utils.c:182 ../clients/tui/nmt-page-dsl.c:39
+msgid "DSL"
+msgstr "DSL"
+
+#: ../clients/tui/nm-editor-utils.c:186
+#, c-format
+msgid "DSL connection %d"
+msgstr "DSL 鉦詮鉦芹盒鈳鉦 %d"
+
+#: ../clients/tui/nm-editor-utils.c:191 ../libnm-core/nm-connection.c:1503
+#: ../libnm-glib/nm-device.c:1802 ../libnm-util/nm-connection.c:1606
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3931
+msgid "Bond"
+msgstr "鉦眇移鉦鉦﹤"
+
+#: ../clients/tui/nm-editor-utils.c:195
+#, c-format
+msgid "Bond connection %d"
+msgstr "鉦眇移鉦鉦﹤ 鉦詮鉦芹盒鈳鉦 %d"
+
+#: ../clients/tui/nm-editor-utils.c:200 ../libnm-core/nm-connection.c:1507
+#: ../libnm-glib/nm-device.c:1806 ../libnm-util/nm-connection.c:1610
+#: ../src/settings/plugins/ifcfg-rh/reader.c:4219
+msgid "Bridge"
+msgstr "鉦眇鉦啤窒鉦﹤鉦鈳"
+
+#: ../clients/tui/nm-editor-utils.c:205
+#, c-format
+msgid "Bridge connection %d"
+msgstr "鉦眇鉦啤窒鉦﹤鉦鈳 鉦詮鉦芹盒鈳鉦 %d"
+
+#: ../clients/tui/nm-editor-utils.c:209 ../libnm-core/nm-connection.c:1505
+#: ../libnm-glib/nm-device.c:1804 ../libnm-util/nm-connection.c:1608
+#: ../src/settings/plugins/ifcfg-rh/reader.c:4035
+msgid "Team"
+msgstr "鉦戈鉦"
+
+#: ../clients/tui/nm-editor-utils.c:214
+#, c-format
+msgid "Team connection %d"
+msgstr "鉦戈鉦﹤畢 鉦詮鉦芹盒鈳鉦 %d"
+
+#: ../clients/tui/nm-editor-utils.c:222
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN 鉦詮鉦芹盒鈳鉦 %d"
+
+#: ../clients/tui/nm-editor-utils.c:237
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN 鉦詮鉦芹盒鈳鉦 %d"
+
+#: ../clients/tui/nmt-device-entry.c:371
+msgid "Select..."
+msgstr "鉦鉦啤窒鉦詮..."
+
+#: ../clients/tui/nmt-edit-connection-list.c:129
+msgid "Add"
+msgstr "鉦詮鉦啤窒鉦詮"
+
+#: ../clients/tui/nmt-edit-connection-list.c:132
+#: ../clients/tui/nmt-page-ip4.c:175 ../clients/tui/nmt-page-ip6.c:173
+#: ../clients/tui/nmt-page-team-port.c:110 ../clients/tui/nmt-page-team.c:174
+msgid "Edit..."
+msgstr "鉦詮鉦芹移鉦舟窒鉦詮..."
+
+#: ../clients/tui/nmt-edit-connection-list.c:135
+#: ../clients/tui/nmtui-edit.c:471
+msgid "Delete"
+msgstr "鉦鉦喪窒鉦詮"
+
+#: ../clients/tui/nmt-editor.c:81
+#, c-format
+msgid "Could not create editor for connection '%s' of type '%s'."
+msgstr "'%s' 鉦詮鉦芹盒鈳鉦鉦鈳鉦鉦擒鉦 ('%s' 鉦眇鈳) 鉦詮鉦芹移鉦舟鉦菽疏鈳鉦兒 鉦啤鉦賴硫鉦耜移鉦鉦賴眷鈳鉦."
+
+#: ../clients/tui/nmt-editor.c:85
+#, c-format
+msgid "Could not create editor for invalid connection '%s'."
+msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 '%s' 鉦詮鉦芹盒鈳鉦鉦鈳鉦鉦擒鉦 鉦詮鉦芹移鉦舟鉦菽疏鈳鉦兒 鉦啤鉦賴硫鉦耜移鉦鉦賴眷鈳鉦."
+
+#: ../clients/tui/nmt-editor.c:95
+#| msgid "Edit connection"
+msgid "Edit Connection"
+msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鉦芹移鉦舟窒鉦詮窒"
+
+#: ../clients/tui/nmt-editor.c:139
+#, c-format
+msgid "Unable to save connection: %s"
+msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
+
+#: ../clients/tui/nmt-editor.c:153
+#, c-format
+msgid "Unable to add new connection: %s"
+msgstr "鉦嫩鉦 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鉦啤窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
+
+#: ../clients/tui/nmt-editor.c:237 ../clients/tui/nmt-password-dialog.c:172
+#: ../clients/tui/nmt-route-editor.c:128 ../clients/tui/nmtui-edit.c:192
+#: ../clients/tui/nmtui-edit.c:470 ../clients/tui/nmtui-hostname.c:69
+msgid "Cancel"
+msgstr "鉦啤畢鈳鉦舟鉦鈳鉦喪窒鉦詮"
+
+#: ../clients/tui/nmt-mtu-entry.c:86
+msgid "(default)"
+msgstr "(鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略)"
+
+#: ../clients/tui/nmt-mtu-entry.c:88 ../clients/tui/nmt-mtu-entry.c:119
+msgid "bytes"
+msgstr "鉦眇鉦鈳鉦鉦喪"
+
+#: ../clients/tui/nmt-page-bond.c:88
+msgid "Round-robin"
+msgstr "鉦啤鉦鉦﹤-鉦啤移鉦眇窒鉦兒"
+
+#: ../clients/tui/nmt-page-bond.c:89
+msgid "Active Backup"
+msgstr "鉦詮鈳鉦啤窒鉦 鉦眇鉦能移鉦鈳鉦鉦芹"
+
+#: ../clients/tui/nmt-page-bond.c:90
+msgid "XOR"
+msgstr "XOR"
+
+#: ../clients/tui/nmt-page-bond.c:91
+msgid "Broadcast"
+msgstr "鉦芹鉦啤硫鉦擒盒鉦鈳"
+
+#: ../clients/tui/nmt-page-bond.c:92
+msgid "802.3ad"
+msgstr "802.3ad"
+
+#: ../clients/tui/nmt-page-bond.c:93
+msgid "Adaptive Transmit Load Balancing (tlb)"
+msgstr "鉦鉦﹤移鉦芹鉦鈳鉦菽 鉦鈳鉦啤移鉦兒鉦詮鉦桌窒鉦鈳 鉦耜鉦﹤ 鉦眇鉦能移鉦耜鉦兒鉦詮窒鉦鉦鈳 (tlb)"
+
+#: ../clients/tui/nmt-page-bond.c:94
+msgid "Adaptive Load Balancing (alb)"
+msgstr "鉦鉦﹤移鉦芹鉦鈳鉦菽 鉦耜鉦﹤ 鉦眇鉦能移鉦耜鉦兒鉦詮窒鉦鉦鈳 (alb)"
+
+#: ../clients/tui/nmt-page-bond.c:100
+msgid "MII (recommended)"
+msgstr "MII (鉦詮眷鉦嫩 鉦桌移鉦﹤眷鉦擒鈳鉦)"
+
+#: ../clients/tui/nmt-page-bond.c:101
+msgid "ARP"
+msgstr "ARP"
+
+#: ../clients/tui/nmt-page-bond.c:353 ../clients/tui/nmt-page-bridge.c:80
+#: ../clients/tui/nmt-page-team.c:153
+msgid "Slaves"
+msgstr "鉦詮鉦耜鉦菽鉦鉦喪"
+
+#: ../clients/tui/nmt-page-bond.c:365 ../clients/tui/nmt-page-wifi.c:226
+msgid "Mode"
+msgstr "鉦鈳鉦啤皎"
+
+#: ../clients/tui/nmt-page-bond.c:371
+msgid "Primary"
+msgstr "鉦芹鉦啤移鉦丞皎鉦賴"
+
+#: ../clients/tui/nmt-page-bond.c:377
+msgid "Link monitoring"
+msgstr "鉦鈳鉦鉦﹤窒鉦 鉦桌鉦耜鉦菽窒鉦鉦擒盒鉦鈳"
+
+#: ../clients/tui/nmt-page-bond.c:383 ../clients/tui/nmt-page-bond.c:390
+#: ../clients/tui/nmt-page-bond.c:397 ../clients/tui/nmt-page-bond.c:404
+msgctxt "milliseconds"
+msgid "ms"
+msgstr "ms"
+
+#: ../clients/tui/nmt-page-bond.c:384 ../clients/tui/nmt-page-bond.c:405
+msgid "Monitoring frequency"
+msgstr "鉦徇鉦啤鉦鈳鉦菽鉦兒鉦詮窒 鉦桌鉦耜鉦菽窒鉦鉦擒盒鉦鈳"
+
+#: ../clients/tui/nmt-page-bond.c:391
+msgid "Link up delay"
+msgstr "鉦鈳鉦鉦﹤窒 鉦詮鈳鉦啤窒鉦能畢 鉦菽窒鉦喪鉦"
+
+#: ../clients/tui/nmt-page-bond.c:398
+msgid "Link down delay"
+msgstr "鉦鈳鉦鉦﹤窒 鉦兒窒鉦獅鉦鈳鉦啤窒鉦能畢 鉦菽窒鉦喪鉦"
+
+#: ../clients/tui/nmt-page-bond.c:411
+msgid "ARP targets"
+msgstr "ARP 鉦鈳鉦啤窒鉦鉦喪"
+
+#: ../clients/tui/nmt-page-bridge-port.c:38
+msgid "BRIDGE PORT"
+msgstr "BRIDGE PORT"
+
+#: ../clients/tui/nmt-page-bridge-port.c:69
+#: ../clients/tui/nmt-page-bridge.c:106
+msgid "Priority"
+msgstr "鉦鉦舟鉦能略鈳"
+
+#: ../clients/tui/nmt-page-bridge-port.c:75
+msgid "Path cost"
+msgstr "鉦桌移鉦啤鉦鉦 鉦舟盒"
+
+#: ../clients/tui/nmt-page-bridge-port.c:77
+msgid "Hairpin mode"
+msgstr "鉦嫩鉦啤鉦芹窒鉦兒 鉦鈳鉦啤皎"
+
+#: ../clients/tui/nmt-page-bridge.c:42
+msgid "BRIDGE"
+msgstr "BRIDGE"
+
+#: ../clients/tui/nmt-page-bridge.c:90 ../clients/tui/nmt-page-bridge.c:115
+#: ../clients/tui/nmt-page-bridge.c:125 ../clients/tui/nmt-page-bridge.c:135
+msgid "seconds"
+msgstr "鉦詮鉦鈳鉦鉦﹤鉦鉦喪"
+
+#: ../clients/tui/nmt-page-bridge.c:91
+msgid "Aging time"
+msgstr "鉦嫩眾鈳鉦能畢鉦擒鈳鉦戈鉦戈窒鉦啤鉦 鉦詮皎鉦"
+
+#: ../clients/tui/nmt-page-bridge.c:93
+msgid "Enable STP (Spanning Tree Protocol)"
+msgstr "STP 鉦鉦兒鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮 (鉦詮鉦芹移鉦兒窒鉦鉦鈳 鉦鈳鉦啤 鉦芹鉦啤鉦鈳鉦鉦擒眷鈳)"
+
+#: ../clients/tui/nmt-page-bridge.c:116
+msgid "Forward delay"
+msgstr "鉦徇移鉦啤鉦菽移鉦啤鉦﹤ 鉦菽窒鉦喪鉦"
+
+#: ../clients/tui/nmt-page-bridge.c:126
+msgid "Hello time"
+msgstr "鉦嫩鉦耜 鉦鈳鉦桌"
+
+#: ../clients/tui/nmt-page-bridge.c:136
+msgid "Max age"
+msgstr "鉦鉦啤窒鉦獅鉦 鉦鉦擒眷鉦擒眶鉦抉窒"
+
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. * is not visible here since we only care about phase2 authentication
+#. * (and don't even care of which one)
+#.
+#: ../clients/tui/nmt-page-dsl.c:67 ../clients/tui/nmt-page-wifi.c:328
+#: ../clients/tui/nmt-secret-agent.c:206 ../clients/tui/nmt-secret-agent.c:301
+msgid "Username"
+msgstr "鉦眇眾鉦鈳鉦舟移鉦啤硃鈳鉦詮盒鈳"
+
+#: ../clients/tui/nmt-page-dsl.c:76 ../clients/tui/nmt-page-wifi.c:273
+#: ../clients/tui/nmt-page-wifi.c:304 ../clients/tui/nmt-page-wifi.c:334
+#: ../clients/tui/nmt-secret-agent.c:211 ../clients/tui/nmt-secret-agent.c:248
+#: ../clients/tui/nmt-secret-agent.c:278 ../clients/tui/nmt-secret-agent.c:311
+#: ../clients/tui/nmt-secret-agent.c:380 ../clients/tui/nmt-secret-agent.c:393
+#: ../clients/tui/nmt-secret-agent.c:409
+msgid "Password"
+msgstr "鉦鈳鉦芹鉦戈痕鉦"
+
+#: ../clients/tui/nmt-page-dsl.c:79 ../clients/tui/nmt-secret-agent.c:306
+msgid "Service"
+msgstr "鉦詮鉦菽"
+
+#: ../clients/tui/nmt-page-ethernet.c:41
+msgid "ETHERNET"
+msgstr "ETHERNET"
+
+#: ../clients/tui/nmt-page-ethernet.c:80 ../clients/tui/nmt-page-vlan.c:124
+#: ../clients/tui/nmt-page-wifi.c:357
+msgid "Cloned MAC address"
+msgstr "鉦戈畢鈳鉦啤鉦芹鉦鈳鉦喪窒鉦詮眷鉦擒畢 MAC 鉦菽窒鉦喪移鉦"
+
+#: ../clients/tui/nmt-page-infiniband.c:40
+msgid "INFINIBAND"
+msgstr "INFINIBAND"
+
+#: ../clients/tui/nmt-page-infiniband.c:51
+msgid "Datagram"
+msgstr "鉦﹤鉦鉦擒鈳鉦啤移鉦桌"
+
+#: ../clients/tui/nmt-page-infiniband.c:52
+msgid "Connected"
+msgstr "鉦詮鉦芹盒鈳鉦鉦賴略鉦鈳鉦鉦﹤窒鉦舟"
+
+#: ../clients/tui/nmt-page-infiniband.c:90
+msgid "Transport mode"
+msgstr "鉦菽盒鈳鉦鉦擒眶鉦鈳 鉦鈳鉦啤皎"
+
+#: ../clients/tui/nmt-page-ip4.c:41
+msgid "Disabled"
+msgstr "鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦鉦"
+
+#: ../clients/tui/nmt-page-ip4.c:42 ../clients/tui/nmt-page-ip6.c:42
+msgid "Automatic"
+msgstr "鉦詮鉦菽盔鉦鉦鉦擒眷鉦賴略"
+
+#: ../clients/tui/nmt-page-ip4.c:43 ../clients/tui/nmt-page-ip6.c:44
+msgid "Link-Local"
+msgstr "鉦詮鉦丞眾鈳鉦-鉦鈳鉦鉦﹤窒"
+
+#: ../clients/tui/nmt-page-ip4.c:44 ../clients/tui/nmt-page-ip6.c:45
+msgid "Manual"
+msgstr "鉦鈳鉦能移鉦啤"
+
+#: ../clients/tui/nmt-page-ip4.c:45
+msgid "Shared"
+msgstr "鉦嫩鉦鉦耜移鉦"
+
+#: ../clients/tui/nmt-page-ip4.c:54
+msgid "IPv4 CONFIGURATION"
+msgstr "IPv4 CONFIGURATION"
+
+#: ../clients/tui/nmt-page-ip4.c:100 ../clients/tui/nmt-page-ip6.c:100
+msgid "(No custom routes)"
+msgstr "(鉦能移鉦菽鉦舟 鉦鉦鉦戈鉦能移鉦兒鉦鈳鉦 鉦啤鉦鈳鉦鉦喪窒鉦耜鉦)"
+
+#: ../clients/tui/nmt-page-ip4.c:103 ../clients/tui/nmt-page-ip6.c:103
+#, c-format
+msgid "One custom route"
+msgid_plural "%d custom routes"
+msgstr[0] "鉦鉦鉦舟 鉦鉦鉦戈鉦能移鉦兒鉦鈳鉦 鉦啤鉦鈳"
+msgstr[1] "%d 鉦鉦鉦戈鉦能移鉦兒鉦鈳鉦 鉦啤鉦鈳鉦鉦喪"
+
+#: ../clients/tui/nmt-page-ip4.c:144 ../clients/tui/nmt-page-ip6.c:144
+msgid "Addresses"
+msgstr "鉦菽窒鉦喪移鉦詮鉦喪"
+
+#: ../clients/tui/nmt-page-ip4.c:150 ../clients/tui/nmt-page-ip6.c:150
+msgid "Gateway"
+msgstr "鉦鈳鉦鈳鉦菽"
+
+#: ../clients/tui/nmt-page-ip4.c:156 ../clients/tui/nmt-page-ip6.c:156
+msgid "DNS servers"
+msgstr "DNS 鉦芹鉦啤鉦鈳鉦鉦鉦鉦鉦喪"
+
+#: ../clients/tui/nmt-page-ip4.c:162 ../clients/tui/nmt-page-ip6.c:162
+msgid "Search domains"
+msgstr "鉦嫩鉦﹤鉦鈳 鉦﹤鉦桌鉦兒鉦鉦喪"
+
+#: ../clients/tui/nmt-page-ip4.c:177 ../clients/tui/nmt-page-ip6.c:175
+msgid "Routing"
+msgstr "鉦啤鉦鈳 鉦桌移鉦﹤鉦菽窒鉦鈳"
+
+#: ../clients/tui/nmt-page-ip4.c:179 ../clients/tui/nmt-page-ip6.c:177
+msgid "Never use this network for default route"
+msgstr "鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略 鉦啤鉦鈳鉦鉦擒鉦 鉦鉦鉦舟窒鉦鈳 鉦 鉦鉦擒眷鉦眇鉦抉眶鉦兒鉦兒 鉦眇眾鉦詮痊鈳鉦"
+
+#: ../clients/tui/nmt-page-ip4.c:187
+msgid "Require IPv4 addressing for this connection"
+msgstr "鉦 鉦詮鉦芹盒鈳鉦鉦鈳鉦鉦擒鉦 IPv4 鉦菽窒鉦喪移鉦 鉦兒鉦﹤窒鉦鈳鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳"
+
+#: ../clients/tui/nmt-page-ip6.c:41
+msgid "Ignore"
+msgstr "鉦鉦﹤鉦鉦鉦賴硫鈳"
+
+#: ../clients/tui/nmt-page-ip6.c:43
+msgid "Automatic (DHCP-only)"
+msgstr "鉦詮鉦菽盔鉦鉦鉦擒眷鉦賴略 (DHCP 鉦桌移鉦戈鉦)"
+
+#: ../clients/tui/nmt-page-ip6.c:54
+msgid "IPv6 CONFIGURATION"
+msgstr "IPv6 鉦詮鉦啤鉦兒"
+
+#: ../clients/tui/nmt-page-ip6.c:185
+msgid "Require IPv6 addressing for this connection"
+msgstr "鉦 鉦詮鉦芹盒鈳鉦鉦鈳鉦鉦擒鉦 IPv6 鉦菽窒鉦喪移鉦 鉦兒鉦﹤窒鉦鈳鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳"
+
+#: ../clients/tui/nmt-page-main.c:139
+msgid "Hide"
+msgstr "鉦鉦﹤鉦賴硫鈳"
+
+#: ../clients/tui/nmt-page-main.c:139
+msgid "Show"
+msgstr "鉦戈鉦啤窒鉦詮"
+
+#: ../clients/tui/nmt-page-main.c:187
+msgid "Profile name"
+msgstr "鉦芹鉦啤鉦徇鉦耜窒鉦 鉦嫩鉦詮盒鈳"
+
+#: ../clients/tui/nmt-page-main.c:194
+msgid "Device"
+msgstr "鉦詮移鉦抉疏"
+
+#: ../clients/tui/nmt-page-main.c:243
+msgid "Automatically connect"
+msgstr "鉦詮鉦菽盔鉦鉦鉦擒眷鉦賴略鉦菽移鉦鉦 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉窒鉦詮"
+
+#: ../clients/tui/nmt-page-main.c:249
+msgid "Available to all users"
+msgstr "鉦鉦耜鉦耜移 鉦眇眾鉦鈳鉦舟移鉦啤盒鉦賴鈳 鉦耜痍鈳鉦能眶鉦賴盒鈳鉦戈鉦戈畢鈳"
+
+#: ../clients/tui/nmt-page-ppp.c:49
+#| msgid "IPv4 CONFIGURATION"
+msgid "PPP CONFIGURATION"
+msgstr "PPP CONFIGURATION"
+
+#: ../clients/tui/nmt-page-ppp.c:142
+#| msgid "Authentication"
+msgid "Allowed authentication methods:"
+msgstr "鉦鉦兒鉦桌略鉦賴硫鉦耜移鉦鈳鉦 鉦舟鉦R鉦鉦啤產鉦 鉦菽窒鉦抉移鉦兒鉦喪:"
+
+#: ../clients/tui/nmt-page-ppp.c:149
+#| msgid "LEAP"
+msgid "EAP"
+msgstr "EAP"
+
+#: ../clients/tui/nmt-page-ppp.c:157
+#| msgid "AP"
+msgid "PAP"
+msgstr "PAP"
+
+#: ../clients/tui/nmt-page-ppp.c:165
+msgid "CHAP"
+msgstr "CHAP"
+
+#: ../clients/tui/nmt-page-ppp.c:173
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: ../clients/tui/nmt-page-ppp.c:181
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#: ../clients/tui/nmt-page-ppp.c:197
+msgid "Use point-to-point encryption (MPPE)"
+msgstr "鉦芹移鉦能窒鉦鉦鈳-鉦鈳-鉦芹移鉦能窒鉦鉦鈳 鉦鈳鉦R眷鉦賴痕鈳鉦鉦啤產鉦菽疏鈳鉦兒 (MPPE) 鉦眇眾鉦詮"
+
+#: ../clients/tui/nmt-page-ppp.c:209
+msgid "Require 128-bit encryption"
+msgstr "128-鉦眇窒鉦鈳 鉦鈳鉦R眷鉦賴痕鈳鉦鉦啤產鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳"
+
+#: ../clients/tui/nmt-page-ppp.c:219
+msgid "Use stateful MPPE"
+msgstr "鉦詮鉦鈳鉦鈳鉦徇鉦耜 MPPE 鉦鉦兒鉦兒 鉦眇眾鉦詮"
+
+#: ../clients/tui/nmt-page-ppp.c:231
+msgid "Allow BSD data compression"
+msgstr "BSD 鉦舟略鈳鉦戈移鉦鉦 鉦詮鉦鈳鉦鉦兒鉦能疏鈳鉦兒 鉦鉦兒鉦桌略鉦賴硫鈳"
+
+#: ../clients/tui/nmt-page-ppp.c:239
+msgid "Allow Deflate data compression"
+msgstr "鉦舟略鈳鉦戈移鉦鉦 鉦詮鉦鈳鉦鉦兒鉦能疏鈳鉦兒 鉦﹤窒鉦徇鉦耜鉦鈳 鉦桌移鉦﹤眷鈳 鉦鉦菽鉦擒眸 鉦兒鉦﹤"
+
+#: ../clients/tui/nmt-page-ppp.c:247
+msgid "Use TCP header compression"
+msgstr "TCP 鉦嫩鉦﹤盒鈳 鉦詮鉦鈳鉦鉦兒眶鉦兒鉦兒 鉦眇眾鉦詮"
+
+#: ../clients/tui/nmt-page-ppp.c:257
+msgid "Send PPP echo packets"
+msgstr "PPP 鉦芹鉦啤略鉦賴異鈳鉦菽疏鉦 鉦芹鉦能移鉦鈳鉦鈳鉦鉦喪 鉦鉦喪鉦嫩窒鉦詮"
+
+#: ../clients/tui/nmt-page-team-port.c:45
+msgid "TEAM PORT"
+msgstr "鉦鈳鉦桌 鉦詮鉦芹盒鈳鉦鉦詮鉦丞移鉦"
+
+#: ../clients/tui/nmt-page-team-port.c:100 ../clients/tui/nmt-page-team.c:164
+msgid "JSON configuration"
+msgstr "JSON 鉦詮鉦啤鉦兒"
+
+#: ../clients/tui/nmt-page-team.c:51
+msgid "TEAM"
+msgstr "鉦鈳鉦桌"
+
+#: ../clients/tui/nmt-page-vlan.c:101
+msgid "Parent"
+msgstr "鉦芹鉦獅"
+
+#: ../clients/tui/nmt-page-vlan.c:116
+msgid "VLAN id"
+msgstr "VLAN id"
+
+#: ../clients/tui/nmt-page-wifi.c:57
+msgid "WI-FI"
+msgstr "鉦菽-鉦徇"
+
+#: ../clients/tui/nmt-page-wifi.c:68
+msgctxt "Wi-Fi"
+msgid "Client"
+msgstr "鉦鈳鉦耜鉦鉦鈳"
+
+#: ../clients/tui/nmt-page-wifi.c:69
+msgid "Access Point"
+msgstr "鉦兒窒鉦耜鉦鈳 鉦眇窒鉦鉦舟"
+
+#: ../clients/tui/nmt-page-wifi.c:70
+msgid "Ad-Hoc Network"
+msgstr "鉦戈移鉦戈鉦芹鉦啤鉦戈窒鉦 鉦鉦擒眷鉦眇鉦"
+
+#: ../clients/tui/nmt-page-wifi.c:75
+msgctxt "Wi-Fi"
+msgid "Automatic"
+msgstr "鉦詮鉦菽盔鉦鉦鉦擒眷鉦賴略"
+
+#. 802.11a Wi-Fi network
+#: ../clients/tui/nmt-page-wifi.c:77
+msgid "A (5 GHz)"
+msgstr "A (5 GHz)"
+
+#. 802.11b / 802.11g Wi-Fi network
+#: ../clients/tui/nmt-page-wifi.c:79
+msgid "B/G (2.4 GHz)"
+msgstr "B/G (2.4 GHz)"
+
+#: ../clients/tui/nmt-page-wifi.c:84
+msgctxt "Wi-Fi security"
+msgid "None"
+msgstr "鉦鉦兒 鉦鉦耜鉦"
+
+#: ../clients/tui/nmt-page-wifi.c:85
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 鉦菽鉦能鈳鉦戈窒鉦"
+
+#: ../clients/tui/nmt-page-wifi.c:86
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA & WPA2 鉦鉦鉦鉦啤鉦芹鉦啤鉦詮"
+
+#: ../clients/tui/nmt-page-wifi.c:87
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr "WEP 40/128-鉦眇窒鉦鈳 鉦鈳鉦耜窒 (鉦嫩鉦鈳鉦詮 鉦鉦丞眶 ASCII)"
+
+#: ../clients/tui/nmt-page-wifi.c:88
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128-bit 鉦鈳鉦芹鉦戈眶鉦擒鈳鉦"
+
+#: ../clients/tui/nmt-page-wifi.c:89
+msgid "Dynamic WEP (802.1x)"
+msgstr "鉦﹤鉦兒皎鉦賴鈳 WEP (802.1x)"
+
+#: ../clients/tui/nmt-page-wifi.c:90
+msgid "LEAP"
+msgstr "LEAP"
+
+#: ../clients/tui/nmt-page-wifi.c:95
+msgctxt "WEP key index"
+msgid "1 (Default)"
+msgstr "1 (鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略)"
+
+#: ../clients/tui/nmt-page-wifi.c:96
+msgctxt "WEP key index"
+msgid "2"
+msgstr "2"
+
+#: ../clients/tui/nmt-page-wifi.c:97
+msgctxt "WEP key index"
+msgid "3"
+msgstr "3"
+
+#: ../clients/tui/nmt-page-wifi.c:98
+msgctxt "WEP key index"
+msgid "4"
+msgstr "4"
+
+#: ../clients/tui/nmt-page-wifi.c:103
+msgid "Open System"
+msgstr "鉦桌鉦鈳鉦 鉦菽鉦能眶鉦詮鉦丞"
+
+#: ../clients/tui/nmt-page-wifi.c:104
+msgid "Shared Key"
+msgstr "鉦嫩鉦鉦耜移鉦 鉦鈳鉦耜窒"
+
+#: ../clients/tui/nmt-page-wifi.c:252
+msgid "Channel"
+msgstr "鉦鉦擒疏鉦耜"
+
+#: ../clients/tui/nmt-page-wifi.c:257
+msgid "Security"
+msgstr "鉦詮鉦啤鈳鉦獅略鈳"
+
+#. "wpa-enterprise"
+#. FIXME
+#: ../clients/tui/nmt-page-wifi.c:278
+msgid "(No support for wpa-enterprise yet...)"
+msgstr "(wpa-鉦鉦鉦鉦啤鉦芹鉦啤鉦詮鉦鉦擒鉦 鉦鉦兒鉦兒 鉦詮硃 鉦眇鉦鉦眇眷鉦菽窒鉦耜鉦...)"
+
+#: ../clients/tui/nmt-page-wifi.c:285 ../clients/tui/nmt-secret-agent.c:262
+msgid "Key"
+msgstr "鉦鈳鉦耜窒"
+
+#: ../clients/tui/nmt-page-wifi.c:288 ../clients/tui/nmt-page-wifi.c:307
+msgid "WEP index"
+msgstr "WEP 鉦詮鉦鉦"
+
+#: ../clients/tui/nmt-page-wifi.c:296 ../clients/tui/nmt-page-wifi.c:315
+msgid "Authentication"
+msgstr "鉦舟鉦R鉦鉦啤產"
+
+#. "dynamic-wep"
+#. FIXME
+#: ../clients/tui/nmt-page-wifi.c:321
+msgid "(No support for dynamic-wep yet...)"
+msgstr "(鉦﹤鉦兒皎鉦賴鈳-wep 鉦鉦擒鉦 鉦鉦兒鉦兒 鉦詮硃 鉦眇鉦鉦眇眷鉦菽窒鉦耜鉦...)"
+
+#: ../clients/tui/nmt-password-fields.c:130
+msgid "Ask for this password every time"
+msgstr "鉦芹鉦啤略鉦 鉦眇移鉦啤窒鉦能 鉦 鉦鈳鉦芹鉦戈痕鉦舟鈳鉦鉦擒鉦 鉦鈳鉦喪"
+
+#: ../clients/tui/nmt-password-fields.c:131
+msgid "Show password"
+msgstr "鉦鈳鉦芹鉦戈痕鉦舟眶鉦兒鉦兒 鉦戈鉦啤窒鉦詮"
+
+#: ../clients/tui/nmt-route-table.c:217
+msgid "Destination"
+msgstr "鉦鈳鉦啤窒"
+
+#: ../clients/tui/nmt-route-table.c:217
+msgid "Prefix"
+msgstr "鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮"
+
+#: ../clients/tui/nmt-route-table.c:226
+msgid "Next Hop"
+msgstr "鉦桌鉦鉦舟窒鉦 鉦鉦賴鉦賴略"
+
+#: ../clients/tui/nmt-route-table.c:234
+msgid "Metric"
+msgstr "鉦桌鉦鈳鉦啤窒鉦鈳"
+
+#: ../clients/tui/nmt-route-table.c:254
+msgid "No custom routes are defined."
+msgstr "鉦能移鉦菽鉦舟 鉦鉦鉦戈鉦能移鉦兒鉦鈳鉦 鉦啤鉦鈳鉦鉦喪疏鈳鉦兒 鉦菽窒鉦菽盒鉦賴硫鉦耜移鉦鉦賴眷鈳鉦"
+
+#: ../clients/tui/nmt-secret-agent.c:220
+msgid "Identity"
+msgstr "鉦鈳鉦啤鉦戈"
+
+#: ../clients/tui/nmt-secret-agent.c:225
+msgid "Private key password"
+msgstr "鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒 鉦鈳鉦芹鉦戈痕鉦"
+
+#: ../clients/tui/nmt-secret-agent.c:340
+msgid "Authentication required by wireless network"
+msgstr "鉦菽鉦啤鉦耜鉦詮 鉦鉦擒眷鉦眇鉦抉鈳鉦鉦擒鉦 鉦舟鉦R鉦鉦啤產鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳"
+
+#: ../clients/tui/nmt-secret-agent.c:341
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the wireless network "
+"'%s'."
+msgstr ""
+"鉦菽鉦啤鉦耜鉦詮 鉦鉦擒眷鉦眇鉦 '%s' 鉦鉦兒鉦兒 鉦兒窒鉦耜鉦鉦賴硫鉦賴鈳鉦喪鉦喪眷鈳 鉦鈳鉦芹鉦戈痕鉦 鉦鉦丞眶 鉦鈳鉦R眷鉦賴痕鈳鉦鉦啤產 鉦鈳鉦耜窒鉦 "
+"鉦鉦鉦戈鉦能眶鉦賴盒鈳鉦戈鉦戈畢鈳."
+
+#: ../clients/tui/nmt-secret-agent.c:349
+msgid "Wired 802.1X authentication"
+msgstr "鉦戈鉦戈窒鉦詮硃鉦賴略 802.1X 鉦舟鉦R鉦鉦啤產"
+
+#: ../clients/tui/nmt-secret-agent.c:352
+msgid "Network name"
+msgstr "鉦鉦擒眷鉦眇鉦抉畢 鉦嫩鉦詮盒鈳"
+
+#: ../clients/tui/nmt-secret-agent.c:359
+msgid "DSL authentication"
+msgstr "DSL 鉦舟鉦R鉦鉦啤產"
+
+#: ../clients/tui/nmt-secret-agent.c:367
+msgid "PIN code required"
+msgstr "PIN 鉦鈳鉦﹤鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳"
+
+#: ../clients/tui/nmt-secret-agent.c:368
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "鉦桌鉦眇鉦耜 鉦眇鉦啤移鉦﹤鉦眇鉦能移鉦鉦﹤ 鉦詮移鉦抉疏鉦鈳鉦鉦擒鉦 PIN 鉦鈳鉦﹤鉦 鉦鉦鉦戈鉦能眶鉦賴盒鈳鉦戈鉦戈畢鈳"
+
+#: ../clients/tui/nmt-secret-agent.c:370
+msgid "PIN"
+msgstr "PIN"
+
+#: ../clients/tui/nmt-secret-agent.c:376 ../clients/tui/nmt-secret-agent.c:389
+#: ../clients/tui/nmt-secret-agent.c:405
+msgid "Mobile broadband network password"
+msgstr "鉦桌鉦眇鉦耜 鉦眇鉦啤移鉦﹤鉦眇鉦能移鉦鉦﹤ 鉦鉦擒眷鉦眇鉦抉畢 鉦鈳鉦芹鉦戈痕鉦"
+
+#: ../clients/tui/nmt-secret-agent.c:377 ../clients/tui/nmt-secret-agent.c:390
+#: ../clients/tui/nmt-secret-agent.c:406
+#, c-format
+msgid "A password is required to connect to '%s'."
+msgstr "'%s' 鉦兒鉦鉦舟窒鉦鈳 鉦詮鉦芹盒鈳鉦鉦嫩鉦鉦舟眷鈳 鉦鉦鉦戈鉦能眶鉦賴盒鈳鉦 鉦鈳鉦芹鉦戈痕鉦."
+
+#: ../clients/tui/nmt-slave-list.c:137
+msgid "Select the type of slave connection you wish to add."
+msgstr "鉦兒鉦菽 鉦詮鉦啤窒鉦詮眷鈳 鉦眇盔鉦詮鉦 鉦詮鉦耜鉦 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦能鉦鈳 鉦桌移鉦﹤窒."
+
+#: ../clients/tui/nmt-widget-list.c:141
+msgid "Add..."
+msgstr "鉦詮鉦啤窒鉦詮..."
+
+#: ../clients/tui/nmt-widget-list.c:204
+msgid "Remove"
+msgstr "鉦戈鉦鈳鉦舟 鉦嫩移鉦鈳"
+
+#: ../clients/tui/nmtui-connect.c:90
+msgid "Activation failed"
+msgstr "鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦鈳鉦能 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
+
+#: ../clients/tui/nmtui-connect.c:138
+msgid "Connecting..."
+msgstr "鉦詮鉦芹盒鈳鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈窒鉦舟..."
+
+#: ../clients/tui/nmtui-connect.c:167 ../clients/tui/nmtui-connect.c:190
+#, c-format
+msgid "Could not activate connection: %s"
+msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮眷鉦擒鉦賴眷鈳鉦: %s"
+
+#: ../clients/tui/nmtui-connect.c:250 ../clients/tui/nmtui-connect.c:299
+msgid "Activate"
+msgstr "鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮"
+
+#: ../clients/tui/nmtui-connect.c:252
+msgid "Deactivate"
+msgstr "鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮"
+
+#: ../clients/tui/nmtui-connect.c:304 ../clients/tui/nmtui-edit.c:95
+#: ../clients/tui/nmtui.c:112
+msgid "Quit"
+msgstr "鉦戈鉦能鉦賴硫鈳"
+
+#: ../clients/tui/nmtui-connect.c:327
+#, c-format
+msgid "No such connection '%s'"
+msgstr "鉦鉦鉦戈硃 鉦能移鉦菽鉦舟 鉦詮鉦芹盒鈳鉦 '%s' 鉦鉦耜鉦"
+
+#: ../clients/tui/nmtui-connect.c:329
+msgid "Connection is already active"
+msgstr "鉦詮鉦芹盒鈳鉦鉦菽 鉦鉦鉦擒鉦耜 鉦詮鈳鉦啤窒鉦能眶鉦擒鉦賴畢鈳"
+
+#: ../clients/tui/nmtui-edit.c:200
+msgid "Create"
+msgstr "鉦啤鉦賴硫鈳"
+
+#: ../clients/tui/nmtui-edit.c:342
+msgid "Select the type of connection you wish to create."
+msgstr "鉦兒鉦菽 鉦啤鉦賴硫鉦耜 鉦眇盔鉦詮鉦 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦能疏鈳鉦兒 鉦鉦啤窒鉦詮窒."
+
+#: ../clients/tui/nmtui-edit.c:350
+msgid ""
+"If you are creating a VPN, and the VPN connection you wish to create does "
+"not appear in the list, you may not have the correct VPN plugin installed."
+msgstr ""
+"鉦兒鉦菽 鉦鉦鉦舟 VPN 鉦鉦兒鉦兒 鉦啤鉦賴硫鈳鉦戈鉦戈窒鉦舟鉦舟眷鈳鉦耜窒, 鉦桌略鈳鉦戈 鉦兒鉦菽 鉦啤鉦賴硫鉦耜 鉦眇盔鉦詮鉦戈鉦戈鉦啤鉦 VPN "
+"鉦詮鉦芹盒鈳鉦鉦菽 "
+"鉦芹鈳鉦鉦賴盔鉦耜鉦耜窒 鉦鉦擒產鉦賴硫鉦舟 鉦鉦舟鉦舟盒鈳, 鉦兒鉦菽 鉦詮盒鉦賴盔鉦擒畢 VPN 鉦芹鉦耜鈳鉦鉦兒 鉦鉦兒鉦兒 鉦鉦兒鉦詮鉦丞移鉦芹窒鉦詮窒鉦舟 "
+"鉦鉦啤痊鉦嫩鉦舟 "
+"鉦鉦鉦舟盒鈳鉦."
+
+#: ../clients/tui/nmtui-edit.c:386 ../clients/tui/nmtui-edit.c:402
+msgid "New Connection"
+msgstr "鉦嫩鉦 鉦詮鉦芹盒鈳鉦"
+
+#: ../clients/tui/nmtui-edit.c:440
+#, c-format
+msgid "Unable to delete connection: %s"
+msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
+
+#: ../clients/tui/nmtui-edit.c:472
+#, c-format
+msgid "Are you sure you want to delete the connection '%s'?"
+msgstr "鉦兒鉦菽 鉦兒窒鉦鉦菽移鉦鉦耜 鉦詮鉦芹盒鈳鉦 '%s 鉦鉦兒鉦兒 鉦鉦喪窒鉦詮眷鈳 鉦眇盔鉦詮鉦戈鉦戈鉦啤?"
+
+#: ../clients/tui/nmtui-edit.c:486
+#, c-format
+msgid "Could not delete connection: %s"
+msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
+
+#: ../clients/tui/nmtui-hostname.c:47
+msgid "Set Hostname"
+msgstr "鉦鉦戈窒鉦丞鉦能畢 鉦嫩鉦詮盒鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮"
+
+#: ../clients/tui/nmtui-hostname.c:55
+msgid "Hostname"
+msgstr "鉦鉦戈窒鉦丞鉦能畢 鉦嫩鉦詮盒鈳"
+
+#. Translators: this indicates the result. ie, "I have set the hostname to ..."
+#: ../clients/tui/nmtui-hostname.c:114
+#, c-format
+msgid "Set hostname to '%s'"
+msgstr "鉦鉦戈窒鉦丞鉦能畢 鉦嫩鉦詮盒鉦兒鉦兒 '%s' 鉦鈳 鉦嫩鉦鉦舟窒鉦詮"
+
+#: ../clients/tui/nmtui-hostname.c:116
+#, c-format
+msgid "Unable to set hostname: %s"
+msgstr "鉦鉦戈窒鉦丞鉦能畢 鉦嫩鉦詮盒鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
+
+#: ../clients/tui/nmtui.c:57 ../clients/tui/nmtui.c:60
+msgid "connection"
+msgstr "鉦詮鉦芹盒鈳鉦"
+
+#: ../clients/tui/nmtui.c:58
+msgid "Edit a connection"
+msgstr "鉦鉦鉦舟 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鉦芹移鉦舟窒鉦詮"
+
+#: ../clients/tui/nmtui.c:61
+msgid "Activate a connection"
+msgstr "鉦鉦鉦舟 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮"
+
+#: ../clients/tui/nmtui.c:63
+msgid "new hostname"
+msgstr "鉦嫩鉦 鉦鉦戈窒鉦丞鉦能畢 鉦嫩鉦詮盒鈳"
+
+#: ../clients/tui/nmtui.c:64
+msgid "Set system hostname"
+msgstr "鉦菽鉦能眶鉦詮鉦丞鉦 鉦嫩鉦詮盒鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮"
+
+#: ../clients/tui/nmtui.c:87
+msgid "NetworkManager TUI"
+msgstr "NetworkManager TUI"
+
+#: ../clients/tui/nmtui.c:95
+msgid "Please select an option"
+msgstr "鉦舟盔鉦菽窒鉦鈳鉦鈳 鉦鉦鉦舟 鉦鉦能鉦鈳鉦能疏鈳鉦兒 鉦鉦啤窒鉦詮窒"
+
+#: ../clients/tui/nmtui.c:147
+msgid "Usage"
+msgstr "鉦眇眾鉦鈳"
+
+#: ../clients/tui/nmtui.c:228
+msgid "Could not parse arguments"
+msgstr "鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪疏鈳鉦兒 鉦芹移鉦啤鉦詮 鉦桌移鉦﹤眷鉦擒鉦賴眷鈳鉦"
+
+#: ../clients/tui/nmtui.c:238 ../clients/tui/nmtui.c:249
+#, c-format
+#| msgid "Could not activate connection: %s"
+msgid "Could not contact NetworkManager: %s.\n"
+msgstr "NetworkManager 鉦鉦兒鉦兒 鉦詮鉦芹盒鈳鉦鉦賴硫鉦耜移鉦鉦賴眷鈳鉦: %s.\n"
+
+#: ../clients/tui/nmtui.c:243
+msgid "NetworkManager is not running."
+msgstr "NetworkManager 鉦鉦擒眷鉦兒鉦能眷鈳鉦耜窒鉦耜鉦."
+
+#: ../libnm-core/crypto.c:135 ../libnm-util/crypto.c:133
#, c-format
msgid "PEM key file had no end tag '%s'."
msgstr "PEM 鉦鈳鉦耜窒 鉦鉦﹤略鉦菽 鉦能移鉦菽鉦舟 鉦鉦鉦戈鉦 鉦鈳鉦能移鉦鈳 '%s' 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦耜鉦."
-#: ../libnm-util/crypto.c:146
+#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:146
#, c-format
msgid "Doesn't look like a PEM private key file."
msgstr "鉦鉦鉦舟 PEM 鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒 鉦鉦﹤略鉦舟鉦戈 鉦戈鉦啤鉦戈鉦戈窒鉦耜鉦."
-#: ../libnm-util/crypto.c:163
+#: ../libnm-core/crypto.c:165 ../libnm-util/crypto.c:163
#, c-format
msgid "Malformed PEM file: Proc-Type was not first tag."
msgstr "鉦戈痕鈳鉦芹移鉦鉦賴盒鈳鉦 PEM 鉦鉦﹤略: Proc-鉦眇鈳鉦能 鉦桌鉦舟眷鉦賴疏 鉦鈳鉦能移鉦鈳 鉦鉦鉦賴眷鈳鉦."
-#: ../libnm-util/crypto.c:171
+#: ../libnm-core/crypto.c:173 ../libnm-util/crypto.c:171
#, c-format
msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
msgstr "鉦戈痕鈳鉦芹移鉦鉦賴盒鈳鉦 PEM 鉦鉦﹤略: 鉦鈳鉦戈鉦戈窒鉦啤畢 Proc-鉦眇鈳鉦 鉦鈳鉦能移鉦鈳 '%s'."
-#: ../libnm-util/crypto.c:181
+#: ../libnm-core/crypto.c:183 ../libnm-util/crypto.c:181
#, c-format
msgid "Malformed PEM file: DEK-Info was not the second tag."
msgstr "鉦戈痕鈳鉦芹移鉦鉦賴盒鈳鉦 PEM 鉦鉦﹤略: DEK-Info 鉦能 鉦鉦啤瓷鉦兒 鉦鈳鉦能移鉦鈳 鉦鉦鉦賴眷鈳鉦."
-#: ../libnm-util/crypto.c:192
+#: ../libnm-core/crypto.c:194 ../libnm-util/crypto.c:192
#, c-format
msgid "Malformed PEM file: no IV found in DEK-Info tag."
msgstr "鉦戈痕鈳鉦芹移鉦鉦賴盒鈳鉦 PEM 鉦鉦﹤略: DEK-Info 鉦鈳鉦能移鉦鈳鉦兒眷鈳鉦耜窒 鉦能移鉦菽鉦舟 IV 鉦鉦鉦﹤鉦眇鉦舟窒鉦耜鉦."
-#: ../libnm-util/crypto.c:199
+#: ../libnm-core/crypto.c:201 ../libnm-util/crypto.c:199
#, c-format
msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
msgstr "鉦戈痕鈳鉦芹移鉦鉦賴盒鈳鉦 PEM 鉦鉦﹤略: DEK-Info 鉦鈳鉦能移鉦鈳鉦兒眷鈳鉦耜窒 IV 鉦 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦菽窒鉦兒鉦能移鉦."
-#: ../libnm-util/crypto.c:212
+#: ../libnm-core/crypto.c:216 ../libnm-util/crypto.c:214
#, c-format
msgid "Malformed PEM file: unknown private key cipher '%s'."
msgstr "鉦戈痕鈳鉦芹移鉦鉦賴盒鈳鉦 PEM 鉦鉦﹤略: 鉦鈳鉦戈鉦戈窒鉦啤畢 鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒 鉦詮窒鉦徇盒鈳 '%s'."
-#: ../libnm-util/crypto.c:231
+#: ../libnm-core/crypto.c:235 ../libnm-util/crypto.c:233
#, c-format
msgid "Could not decode private key."
msgstr "鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒鉦能疏鈳鉦兒 鉦﹤鉦鈳鉦﹤ 鉦桌移鉦﹤眷鉦擒鉦耜窒鉦耜鉦."
-#: ../libnm-util/crypto.c:283
+#: ../libnm-core/crypto.c:288 ../libnm-util/crypto.c:285
msgid "Failed to find expected PKCS#8 start tag."
msgstr "鉦兒窒鉦啤鉦鈳鉦獅窒鉦 PKCS#8 鉦鉦啤鉦冢窒鉦 鉦鈳鉦能移鉦鈳 鉦鉦兒鉦兒 鉦芹略鈳鉦戈 鉦桌移鉦﹤眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟."
-#: ../libnm-util/crypto.c:291
+#: ../libnm-core/crypto.c:296 ../libnm-util/crypto.c:293
#, c-format
msgid "Failed to find expected PKCS#8 end tag '%s'."
msgstr "鉦兒窒鉦啤鉦鈳鉦獅窒鉦 PKCS#8 鉦鉦鉦戈鉦 鉦鈳鉦能移鉦鈳 '%s' 鉦鉦兒鉦兒 鉦芹略鈳鉦戈 鉦桌移鉦﹤眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟."
-#: ../libnm-util/crypto.c:310
+#: ../libnm-core/crypto.c:315 ../libnm-util/crypto.c:312
msgid "Failed to decode PKCS#8 private key."
msgstr "PKCS#8 鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒鉦能疏鈳鉦兒 鉦﹤鉦鈳鉦﹤ 鉦桌移鉦﹤鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟."
-#: ../libnm-util/crypto.c:352
+#: ../libnm-core/crypto.c:357 ../libnm-util/crypto.c:354
#, c-format
msgid "IV must be an even number of bytes in length."
msgstr "IV 鉦 鉦鉦舟鉦舟眶鈳 鉦詮盒鉦 鉦詮鉦鈳鉦能鉦 鉦眇鉦鈳鉦鉦喪鉦 鉦鉦鉦賴盒鉦眇鉦鈳."
-#: ../libnm-util/crypto.c:366
+#: ../libnm-core/crypto.c:371 ../libnm-util/crypto.c:368
#, c-format
msgid "IV contains non-hexadecimal digits."
msgstr "IV 鉦能 鉦嫩鉦鈳鉦詮移-鉦舟眸鉦桌移鉦鉦 鉦鉦耜鉦耜畢 鉦鉦鉦鈳鉦鉦喪疏鈳鉦兒 鉦嫩鉦鉦舟窒鉦舟."
-#: ../libnm-util/crypto.c:404 ../libnm-util/crypto_gnutls.c:147
-#: ../libnm-util/crypto_gnutls.c:259 ../libnm-util/crypto_nss.c:167
-#: ../libnm-util/crypto_nss.c:326
+#: ../libnm-core/crypto.c:411 ../libnm-core/crypto_gnutls.c:151
+#: ../libnm-core/crypto_gnutls.c:269 ../libnm-core/crypto_nss.c:171
+#: ../libnm-core/crypto_nss.c:333 ../libnm-util/crypto.c:408
+#: ../libnm-util/crypto_gnutls.c:150 ../libnm-util/crypto_gnutls.c:267
+#: ../libnm-util/crypto_nss.c:170 ../libnm-util/crypto_nss.c:331
#, c-format
msgid "Private key cipher '%s' was unknown."
msgstr "鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒 鉦詮窒鉦徇盒鈳 '%s' 鉦戈窒鉦喪窒鉦舟窒鉦耜鉦."
-#: ../libnm-util/crypto.c:511
+#: ../libnm-core/crypto.c:523 ../libnm-util/crypto.c:518
#, c-format
msgid "Unable to determine private key type."
msgstr "鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒鉦 鉦眇鈳鉦能疏鈳鉦兒 鉦兒窒鉦啤鉦抉盒鉦賴硫鉦耜 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦."
-#: ../libnm-util/crypto.c:566
+#: ../libnm-core/crypto.c:580 ../libnm-util/crypto.c:573
#, c-format
msgid "PEM certificate had no start tag '%s'."
msgstr "PEM 鉦芹鉦啤皎鉦擒產鉦芹略鈳鉦啤眶鈳 鉦能移鉦菽鉦舟 鉦鉦啤鉦冢畢 鉦鈳鉦能移鉦鈳 '%s' 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦耜鉦."
-#: ../libnm-util/crypto.c:575
+#: ../libnm-core/crypto.c:589 ../libnm-util/crypto.c:582
#, c-format
msgid "PEM certificate had no end tag '%s'."
msgstr "PEM 鉦芹鉦啤皎鉦擒產鉦芹略鈳鉦啤眶鈳 鉦能移鉦菽鉦舟 鉦鉦鉦戈鉦能畢 鉦鈳鉦能移鉦鈳 '%s' 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦耜鉦."
-#: ../libnm-util/crypto.c:593
+#: ../libnm-core/crypto.c:607 ../libnm-util/crypto.c:600
#, c-format
msgid "Failed to decode certificate."
msgstr "鉦芹鉦啤皎鉦擒產鉦芹略鈳鉦啤眶鉦兒鉦兒 鉦﹤鉦鈳鉦﹤ 鉦桌移鉦﹤眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟."
-#: ../libnm-util/crypto_gnutls.c:50
+#: ../libnm-core/crypto_gnutls.c:50 ../libnm-util/crypto_gnutls.c:50
msgid "Failed to initialize the crypto engine."
msgstr "鉦鈳鉦啤窒鉦芹鉦鈳 鉦鉦鉦鉦賴疏鈳 鉦鉦兒鉦兒 鉦鉦啤鉦冢窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟."
-#: ../libnm-util/crypto_gnutls.c:92
+#: ../libnm-core/crypto_gnutls.c:92 ../libnm-util/crypto_gnutls.c:92
#, c-format
msgid "Failed to initialize the MD5 engine: %s / %s."
msgstr "MD5 鉦鉦鉦鉦賴疏鈳 鉦鉦兒鉦兒 鉦鉦啤鉦冢窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s / %s."
-#: ../libnm-util/crypto_gnutls.c:155
+#: ../libnm-core/crypto_gnutls.c:159 ../libnm-util/crypto_gnutls.c:158
#, c-format
msgid "Invalid IV length (must be at least %zd)."
msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 IV 鉦鉦擒略鈳鉦 (鉦鉦兒窒鉦獅鉦 %zd 鉦鉦啤痊鈳鉦鈳)."
-#: ../libnm-util/crypto_gnutls.c:166
+#: ../libnm-core/crypto_gnutls.c:170 ../libnm-util/crypto_gnutls.c:169
#, c-format
msgid "Failed to initialize the decryption cipher context: %s / %s."
msgstr ""
"鉦﹤鉦鈳鉦啤窒鉦芹鉦詮 鉦桌移鉦﹤鉦 鉦詮窒鉦徇盒鈳 鉦詮鉦舟盒鈳鉦冢眶鉦兒鉦兒 鉦鉦啤鉦冢鈳鉦喪窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s / %s."
-#: ../libnm-util/crypto_gnutls.c:175
+#: ../libnm-core/crypto_gnutls.c:179 ../libnm-util/crypto_gnutls.c:178
#, c-format
msgid "Failed to set symmetric key for decryption: %s / %s."
msgstr "鉦﹤鉦鈳鉦啤窒鉦芹鉦鈳 鉦桌移鉦﹤眷鈳 鉦詮窒鉦桌窒鉦鈳鉦啤窒鉦鈳 鉦鈳鉦耜窒鉦能疏鈳鉦兒 鉦嫩鉦鉦舟窒鉦詮眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s / %s."
-#: ../libnm-util/crypto_gnutls.c:184
+#: ../libnm-core/crypto_gnutls.c:188 ../libnm-util/crypto_gnutls.c:187
#, c-format
msgid "Failed to set IV for decryption: %s / %s."
msgstr "鉦﹤鉦鈳鉦啤窒鉦芹鉦鈳 鉦桌移鉦﹤眷鈳 IV 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s / %s."
-#: ../libnm-util/crypto_gnutls.c:193
+#: ../libnm-core/crypto_gnutls.c:197 ../libnm-util/crypto_gnutls.c:196
#, c-format
msgid "Failed to decrypt the private key: %s / %s."
msgstr "鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒鉦能疏鈳鉦兒 鉦﹤鉦鈳鉦啤窒鉦芹鉦鈳 鉦桌移鉦﹤鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s / %s."
-#: ../libnm-util/crypto_gnutls.c:203 ../libnm-util/crypto_nss.c:257
+#: ../libnm-core/crypto_gnutls.c:207 ../libnm-core/crypto_nss.c:261
+#: ../libnm-util/crypto_gnutls.c:206 ../libnm-util/crypto_nss.c:260
#, c-format
msgid "Failed to decrypt the private key: unexpected padding length."
msgstr ""
"鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒鉦能疏鈳鉦兒 鉦﹤鉦鈳鉦啤窒鉦芹鉦鈳 鉦桌移鉦﹤鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: 鉦鉦兒窒鉦啤鉦鈳鉦獅窒鉦戈眶鉦擒畢 鉦芹鉦能移鉦﹤窒鉦鉦鈳 "
"鉦鉦擒略鈳鉦"
-#: ../libnm-util/crypto_gnutls.c:214 ../libnm-util/crypto_nss.c:268
+#: ../libnm-core/crypto_gnutls.c:218 ../libnm-core/crypto_nss.c:272
+#: ../libnm-util/crypto_gnutls.c:217 ../libnm-util/crypto_nss.c:271
#, c-format
msgid "Failed to decrypt the private key."
msgstr "鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒鉦能疏鈳鉦兒 鉦﹤鉦鈳鉦啤窒鉦芹鉦鈳 鉦桌移鉦﹤鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟."
-#: ../libnm-util/crypto_gnutls.c:281
+#: ../libnm-core/crypto_gnutls.c:291 ../libnm-util/crypto_gnutls.c:289
#, c-format
msgid "Failed to initialize the encryption cipher context: %s / %s."
msgstr "鉦鈳鉦R眷鉦賴痕鈳鉦鉦啤產 鉦詮窒鉦徇盒鈳 鉦詮鉦舟盒鈳鉦冢眶鉦兒鉦兒 鉦鉦啤鉦冢鈳鉦喪窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s / %s."
-#: ../libnm-util/crypto_gnutls.c:290
+#: ../libnm-core/crypto_gnutls.c:300 ../libnm-util/crypto_gnutls.c:298
#, c-format
msgid "Failed to set symmetric key for encryption: %s / %s."
msgstr "鉦鈳鉦R眷鉦賴痕鈳鉦鉦啤窒鉦詮眷鈳 鉦詮窒鉦桌窒鉦鈳鉦啤窒鉦鈳 鉦鈳鉦耜窒鉦能疏鈳鉦兒 鉦嫩鉦鉦舟窒鉦詮眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s / %s."
-#: ../libnm-util/crypto_gnutls.c:300
+#: ../libnm-core/crypto_gnutls.c:310 ../libnm-util/crypto_gnutls.c:308
#, c-format
msgid "Failed to set IV for encryption: %s / %s."
msgstr "鉦鈳鉦R眷鉦賴痕鈳鉦鉦啤窒鉦詮眷鈳 IV 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s / %s."
-#: ../libnm-util/crypto_gnutls.c:309
+#: ../libnm-core/crypto_gnutls.c:319 ../libnm-util/crypto_gnutls.c:317
#, c-format
msgid "Failed to encrypt the data: %s / %s."
msgstr "鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒鉦能疏鈳鉦兒 鉦鈳鉦R眷鉦賴痕鈳鉦鉦啤窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s / %s."
-#: ../libnm-util/crypto_gnutls.c:349
+#: ../libnm-core/crypto_gnutls.c:359 ../libnm-util/crypto_gnutls.c:357
#, c-format
msgid "Error initializing certificate data: %s"
msgstr "鉦芹鉦啤皎鉦擒產鉦芹略鈳鉦 鉦舟略鈳鉦戈移鉦鉦嗣眶鉦兒鉦兒 鉦鉦啤鉦冢窒鉦詮鉦菽眷鈳鉦耜窒 鉦舟鉦 鉦鉦鉦鉦擒鉦賴畢鈳: %s"
-#: ../libnm-util/crypto_gnutls.c:371
+#: ../libnm-core/crypto_gnutls.c:381 ../libnm-util/crypto_gnutls.c:379
#, c-format
msgid "Couldn't decode certificate: %s"
msgstr "鉦芹鉦啤皎鉦擒產鉦芹略鈳鉦啤眶鉦兒鉦兒 鉦﹤鉦鈳鉦﹤ 鉦桌移鉦﹤眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
-#: ../libnm-util/crypto_gnutls.c:395
+#: ../libnm-core/crypto_gnutls.c:406 ../libnm-util/crypto_gnutls.c:403
#, c-format
msgid "Couldn't initialize PKCS#12 decoder: %s"
msgstr "PKCS#12 鉦﹤鉦鈳鉦﹤盒鈳 鉦鉦兒鉦兒 鉦鉦啤鉦冢窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-core/crypto_gnutls.c:419 ../libnm-util/crypto_gnutls.c:416
#, c-format
msgid "Couldn't decode PKCS#12 file: %s"
msgstr "PKCS#12 鉦鉦﹤略鉦菽疏鈳鉦兒 鉦﹤鉦鈳鉦﹤ 鉦桌移鉦﹤眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
-#: ../libnm-util/crypto_gnutls.c:420
+#: ../libnm-core/crypto_gnutls.c:431 ../libnm-util/crypto_gnutls.c:428
#, c-format
msgid "Couldn't verify PKCS#12 file: %s"
msgstr "PKCS#12 鉦鉦﹤略鉦菽疏鈳鉦兒 鉦芹盒鉦賴眸鈳鉦耜窒鉦詮眷鉦擒鉦賴眷鈳鉦: %s"
-#: ../libnm-util/crypto_gnutls.c:448
+#: ../libnm-core/crypto_gnutls.c:460 ../libnm-util/crypto_gnutls.c:456
#, c-format
msgid "Couldn't initialize PKCS#8 decoder: %s"
msgstr "PKCS#8 鉦﹤鉦鈳鉦﹤盒鈳 鉦鉦兒鉦兒 鉦鉦啤鉦冢窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
-#: ../libnm-util/crypto_gnutls.c:471
+#: ../libnm-core/crypto_gnutls.c:483 ../libnm-util/crypto_gnutls.c:479
#, c-format
msgid "Couldn't decode PKCS#8 file: %s"
msgstr "PKCS#8 鉦鉦﹤略鉦菽疏鈳鉦兒 鉦﹤鉦鈳鉦﹤ 鉦桌移鉦﹤眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
-#: ../libnm-util/crypto_nss.c:56
+#: ../libnm-core/crypto_nss.c:56 ../libnm-util/crypto_nss.c:56
#, c-format
msgid "Failed to initialize the crypto engine: %d."
msgstr "鉦鈳鉦啤窒鉦芹鉦鈳 鉦鉦鉦鉦賴疏鈳 鉦鉦兒鉦兒 鉦鉦啤鉦冢窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %d."
-#: ../libnm-util/crypto_nss.c:107
+#: ../libnm-core/crypto_nss.c:107 ../libnm-util/crypto_nss.c:107
#, c-format
msgid "Failed to initialize the MD5 context: %d."
msgstr "MD5 鉦詮鉦舟盒鈳鉦冢眶鉦兒鉦兒 鉦鉦啤鉦冢窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %d."
-#: ../libnm-util/crypto_nss.c:175
+#: ../libnm-core/crypto_nss.c:179 ../libnm-util/crypto_nss.c:178
#, c-format
msgid "Invalid IV length (must be at least %d)."
msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 IV 鉦鉦擒略鈳鉦 (鉦鉦兒窒鉦獅鉦 %d 鉦鉦啤痊鈳鉦鈳)."
-#: ../libnm-util/crypto_nss.c:186
+#: ../libnm-core/crypto_nss.c:190 ../libnm-util/crypto_nss.c:189
#, c-format
msgid "Failed to initialize the decryption cipher slot."
msgstr "鉦﹤鉦鈳鉦啤痕鈳鉦鈳 鉦桌移鉦﹤眷鉦擒鈳鉦 鉦詮窒鉦徇盒鈳 鉦鉦擒鉦菽疏鈳鉦兒 鉦鉦啤鉦冢窒鉦詮眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟."
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-core/crypto_nss.c:200 ../libnm-util/crypto_nss.c:199
#, c-format
msgid "Failed to set symmetric key for decryption."
msgstr "鉦﹤鉦鈳鉦啤窒鉦芹鉦鈳 鉦桌移鉦﹤眷鈳 鉦詮窒鉦桌窒鉦鈳鉦啤窒鉦鈳 鉦鈳鉦耜窒鉦能疏鈳鉦兒 鉦嫩鉦鉦舟窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟."
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-core/crypto_nss.c:210 ../libnm-util/crypto_nss.c:209
#, c-format
msgid "Failed to set IV for decryption."
msgstr "鉦﹤鉦鈳鉦啤窒鉦芹鉦鈳 鉦桌移鉦﹤眷鈳 IV 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟."
-#: ../libnm-util/crypto_nss.c:214
+#: ../libnm-core/crypto_nss.c:218 ../libnm-util/crypto_nss.c:217
#, c-format
msgid "Failed to initialize the decryption context."
msgstr "鉦﹤鉦鈳鉦啤窒鉦芹鉦鈳 鉦桌移鉦﹤鉦 鉦詮疏鈳鉦兒窒鉦菽鉦嗣眶鉦兒鉦兒 鉦鉦啤鉦冢窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟."
-#: ../libnm-util/crypto_nss.c:227
+#: ../libnm-core/crypto_nss.c:231 ../libnm-util/crypto_nss.c:230
#, c-format
msgid "Failed to decrypt the private key: %d."
msgstr "鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒鉦能疏鈳鉦兒 鉦﹤鉦鈳鉦啤窒鉦芹鉦鈳 鉦桌移鉦﹤鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %d."
-#: ../libnm-util/crypto_nss.c:235
+#: ../libnm-core/crypto_nss.c:239 ../libnm-util/crypto_nss.c:238
#, c-format
msgid "Failed to decrypt the private key: decrypted data too large."
msgstr ""
"鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒鉦能疏鈳鉦兒 鉦﹤鉦鈳鉦啤窒鉦芹鉦鈳 鉦桌移鉦﹤鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: 鉦﹤鉦鈳鉦啤窒鉦芹鉦鈳 鉦桌移鉦﹤眷鉦擒畢 鉦舟略鈳鉦戈移鉦鉦嗣畢 "
-"鉦鉦擒略鈳鉦啤眶鈳 鉦眇硃鉦 鉦舟鉦﹤鉦﹤畢鉦擒鉦賴畢鈳."
+"鉦鉦擒略鈳鉦啤眶鈳 "
+"鉦眇硃鉦 鉦舟鉦﹤鉦﹤畢鉦擒鉦賴畢鈳."
-#: ../libnm-util/crypto_nss.c:246
+#: ../libnm-core/crypto_nss.c:250 ../libnm-util/crypto_nss.c:249
#, c-format
msgid "Failed to finalize decryption of the private key: %d."
msgstr ""
"鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒鉦能疏鈳鉦兒 鉦﹤鉦鈳鉦啤窒鉦芹鉦鈳 鉦桌移鉦﹤鉦菽窒鉦鈳鉦能疏鈳鉦兒 鉦芹鉦啤鉦鉦鈳鉦喪窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %d."
-#: ../libnm-util/crypto_nss.c:348
+#: ../libnm-core/crypto_nss.c:355 ../libnm-util/crypto_nss.c:353
#, c-format
msgid "Failed to initialize the encryption cipher slot."
msgstr "鉦鈳鉦R眷鉦賴痕鈳鉦鉦啤窒鉦詮眷鉦擒鈳鉦 鉦詮窒鉦徇盒鈳 鉦鉦擒鉦菽疏鈳鉦兒 鉦鉦啤鉦冢窒鉦詮眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟."
-#: ../libnm-util/crypto_nss.c:356
+#: ../libnm-core/crypto_nss.c:363 ../libnm-util/crypto_nss.c:361
#, c-format
msgid "Failed to set symmetric key for encryption."
msgstr "鉦鈳鉦R眷鉦賴痕鈳鉦鉦啤窒鉦詮眷鈳 鉦詮窒鉦桌窒鉦鈳鉦啤窒鉦鈳 鉦鈳鉦耜窒鉦能疏鈳鉦兒 鉦嫩鉦鉦舟窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟."
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-core/crypto_nss.c:371 ../libnm-util/crypto_nss.c:369
#, c-format
msgid "Failed to set IV for encryption."
msgstr "鉦鈳鉦R眷鉦賴痕鈳鉦鉦啤窒鉦詮眷鈳 IV 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟."
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-core/crypto_nss.c:379 ../libnm-util/crypto_nss.c:377
#, c-format
msgid "Failed to initialize the encryption context."
msgstr "鉦鈳鉦R眷鉦賴痕鈳鉦鉦啤窒鉦詮鉦 鉦詮疏鈳鉦兒窒鉦菽鉦嗣眶鉦兒鉦兒 鉦鉦啤鉦冢窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟."
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-core/crypto_nss.c:387 ../libnm-util/crypto_nss.c:385
#, c-format
msgid "Failed to encrypt: %d."
msgstr "鉦鈳鉦R眷鉦賴痕鈳鉦鉦啤窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %d."
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-core/crypto_nss.c:395 ../libnm-util/crypto_nss.c:393
#, c-format
msgid "Unexpected amount of data after encrypting."
msgstr "鉦鈳鉦R眷鉦賴痕鈳鉦鉦啤窒鉦詮眷鈳 鉦鉦兒窒鉦啤鉦鈳鉦獅窒鉦戈眶鉦擒畢 鉦舟略鈳鉦戈移鉦鉦嗣畢 鉦桌鉦戈鉦."
-#: ../libnm-util/crypto_nss.c:431
+#: ../libnm-core/crypto_nss.c:435 ../libnm-util/crypto_nss.c:433
#, c-format
msgid "Couldn't decode certificate: %d"
msgstr "鉦芹鉦啤皎鉦擒產鉦芹略鈳鉦啤眶鉦兒鉦兒 鉦﹤鉦鈳鉦﹤ 鉦桌移鉦﹤眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦耜窒鉦耜鉦: %d"
-#: ../libnm-util/crypto_nss.c:466
+#: ../libnm-core/crypto_nss.c:471 ../libnm-util/crypto_nss.c:468
#, c-format
msgid "Couldn't convert password to UCS2: %d"
msgstr "鉦鈳鉦芹鉦戈痕鉦舟眶鉦兒鉦兒 UCS2 鉦鈳 鉦眇畢鉦耜移鉦能窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %d"
-#: ../libnm-util/crypto_nss.c:494
+#: ../libnm-core/crypto_nss.c:499 ../libnm-util/crypto_nss.c:496
#, c-format
msgid "Couldn't initialize PKCS#12 decoder: %d"
msgstr "PKCS#12 鉦﹤鉦鈳鉦﹤盒鈳 鉦鉦兒鉦兒 鉦鉦啤鉦冢窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %d"
-#: ../libnm-util/crypto_nss.c:503
+#: ../libnm-core/crypto_nss.c:508 ../libnm-util/crypto_nss.c:505
#, c-format
msgid "Couldn't decode PKCS#12 file: %d"
msgstr "PKCS#12 鉦鉦﹤略鉦菽疏鈳鉦兒 鉦﹤鉦鈳鉦﹤ 鉦桌移鉦﹤眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %d"
-#: ../libnm-util/crypto_nss.c:512
+#: ../libnm-core/crypto_nss.c:517 ../libnm-util/crypto_nss.c:514
#, c-format
msgid "Couldn't verify PKCS#12 file: %d"
msgstr "PKCS#12 鉦鉦﹤略鉦菽疏鈳鉦兒 鉦鉦鉦賴略鉦芹瓷鉦賴硫鉦耜 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %d"
-#: ../libnm-util/crypto_nss.c:556
+#: ../libnm-core/crypto_nss.c:562 ../libnm-util/crypto_nss.c:558
msgid "Could not generate random data."
msgstr "鉦桌疏鉦詮鉦詮窒鉦鈳 鉦眇鉦 鉦舟略鈳鉦戈移鉦鉦嗣眶鉦兒鉦兒 鉦鉦戈鉦芹移鉦舟窒鉦詮眷鉦擒鉦耜窒鉦耜鉦."
-#: ../libnm-util/nm-setting-8021x.c:2170 ../libnm-util/nm-setting-8021x.c:2187
-#: ../libnm-util/nm-setting-8021x.c:2228 ../libnm-util/nm-setting-8021x.c:2245
-#: ../libnm-util/nm-setting-8021x.c:2297 ../libnm-util/nm-setting-8021x.c:2309
-#: ../libnm-util/nm-setting-8021x.c:2327 ../libnm-util/nm-setting-8021x.c:2339
-#: ../libnm-util/nm-setting-8021x.c:2363 ../libnm-util/nm-setting-8021x.c:2539
-#: ../libnm-util/nm-setting-adsl.c:212
-#: ../libnm-util/nm-setting-bluetooth.c:144
-#: ../libnm-util/nm-setting-bluetooth.c:162
-#: ../libnm-util/nm-setting-bond.c:498 ../libnm-util/nm-setting-bridge.c:268
-#: ../libnm-util/nm-setting-cdma.c:163
-#: ../libnm-util/nm-setting-connection.c:692
-#: ../libnm-util/nm-setting-connection.c:708
-#: ../libnm-util/nm-setting-connection.c:763
-#: ../libnm-util/nm-setting-ip4-config.c:705
-#: ../libnm-util/nm-setting-ip4-config.c:715
-#: ../libnm-util/nm-setting-ip6-config.c:687
-#: ../libnm-util/nm-setting-ip6-config.c:697
-#: ../libnm-util/nm-setting-ip6-config.c:750
-#: ../libnm-util/nm-setting-olpc-mesh.c:127
-#: ../libnm-util/nm-setting-pppoe.c:165 ../libnm-util/nm-setting-team.c:131
-#: ../libnm-util/nm-setting-vpn.c:405 ../libnm-util/nm-setting-wimax.c:137
-#: ../libnm-util/nm-setting-wireless-security.c:795
-#: ../libnm-util/nm-setting-wireless.c:697
+#: ../libnm-core/nm-connection.c:885
+#| msgid "Unable to delete connection: %s"
+msgid "Unexpected failure to verify the connection"
+msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦芹盒鉦賴眸鈳鉦耜窒鉦詮鉦菽眷鈳鉦耜窒 鉦鉦兒窒鉦啤鉦鈳鉦獅窒鉦 鉦菽窒鉦徇眷鉦戈"
+
+#: ../libnm-core/nm-connection.c:916
+#| msgid "Unable to delete connection: %s"
+msgid "Unexpected failure to normalize the connection"
+msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮移鉦桌移鉦兒鉦能鈳鉦喪窒鉦詮鉦菽眷鈳鉦耜窒 鉦鉦兒窒鉦啤鉦鈳鉦獅窒鉦 鉦菽窒鉦徇眷鉦戈"
+
+#: ../libnm-core/nm-setting-8021x.c:595 ../libnm-util/nm-setting-8021x.c:596
+msgid "CA certificate must be in X.509 format"
+msgstr "CA 鉦芹鉦啤皎鉦擒產鉦芹略鈳鉦啤眶鈳 X.509 鉦菽窒鉦兒鉦能移鉦詮畢鉦耜鉦耜窒 鉦鉦啤痊鈳鉦鈳"
+
+#: ../libnm-core/nm-setting-8021x.c:910 ../libnm-core/nm-setting-8021x.c:1174
+#: ../libnm-core/nm-setting-8021x.c:1494 ../libnm-util/nm-setting-8021x.c:914
+#: ../libnm-util/nm-setting-8021x.c:1177 ../libnm-util/nm-setting-8021x.c:1500
+#| msgid "Error initializing certificate data: %s"
+msgid "invalid certificate format"
+msgstr "鉦戈痕鈳鉦芹移鉦 鉦芹鉦啤皎鉦擒產鉦芹略鈳鉦啤畢 鉦菽窒鉦兒鉦能移鉦"
+
+#: ../libnm-core/nm-setting-8021x.c:1776 ../libnm-util/nm-setting-8021x.c:1769
+#| msgid "invalid gateway '%s'"
+msgid "invalid private key"
+msgstr "鉦戈痕鈳鉦芹移鉦 鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒"
+
+#: ../libnm-core/nm-setting-8021x.c:2086 ../libnm-util/nm-setting-8021x.c:2080
+#| msgid "Failed to decrypt the private key."
+msgid "invalid phase2 private key"
+msgstr "鉦戈痕鈳鉦芹移鉦 phase2 鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒"
+
+#: ../libnm-core/nm-setting-8021x.c:2288 ../libnm-core/nm-setting-8021x.c:2305
+#: ../libnm-core/nm-setting-8021x.c:2335 ../libnm-core/nm-setting-8021x.c:2352
+#: ../libnm-core/nm-setting-8021x.c:2393 ../libnm-core/nm-setting-8021x.c:2405
+#: ../libnm-core/nm-setting-8021x.c:2423 ../libnm-core/nm-setting-8021x.c:2435
+#: ../libnm-core/nm-setting-8021x.c:2459 ../libnm-core/nm-setting-8021x.c:2641
+#: ../libnm-core/nm-setting-adsl.c:204
+#: ../libnm-core/nm-setting-bluetooth.c:137
+#: ../libnm-core/nm-setting-bluetooth.c:155
+#: ../libnm-core/nm-setting-cdma.c:157
+#: ../libnm-core/nm-setting-connection.c:761
+#: ../libnm-core/nm-setting-connection.c:777
+#: ../libnm-core/nm-setting-connection.c:807
+#: ../libnm-core/nm-setting-ip4-config.c:899
+#: ../libnm-core/nm-setting-ip6-config.c:817
+#: ../libnm-core/nm-setting-ip6-config.c:881
+#: ../libnm-core/nm-setting-olpc-mesh.c:118
+#: ../libnm-core/nm-setting-pppoe.c:158 ../libnm-core/nm-setting-vpn.c:398
+#: ../libnm-core/nm-setting-wimax.c:134
+#: ../libnm-core/nm-setting-wireless-security.c:878
+#: ../libnm-core/nm-setting-wireless.c:712 ../libnm-core/nm-setting.c:1702
+#: ../libnm-util/nm-setting.c:1279 ../libnm-util/nm-setting.c:1298
+#: ../libnm-util/nm-setting.c:1316 ../libnm-util/nm-setting-8021x.c:2282
+#: ../libnm-util/nm-setting-8021x.c:2299 ../libnm-util/nm-setting-8021x.c:2340
+#: ../libnm-util/nm-setting-8021x.c:2357 ../libnm-util/nm-setting-8021x.c:2409
+#: ../libnm-util/nm-setting-8021x.c:2421 ../libnm-util/nm-setting-8021x.c:2439
+#: ../libnm-util/nm-setting-8021x.c:2451 ../libnm-util/nm-setting-8021x.c:2475
+#: ../libnm-util/nm-setting-8021x.c:2653 ../libnm-util/nm-setting-adsl.c:208
+#: ../libnm-util/nm-setting-bluetooth.c:140
+#: ../libnm-util/nm-setting-bluetooth.c:158
+#: ../libnm-util/nm-setting-cdma.c:161
+#: ../libnm-util/nm-setting-connection.c:767
+#: ../libnm-util/nm-setting-connection.c:783
+#: ../libnm-util/nm-setting-connection.c:844
+#: ../libnm-util/nm-setting-ip4-config.c:828
+#: ../libnm-util/nm-setting-ip6-config.c:809
+#: ../libnm-util/nm-setting-ip6-config.c:873
+#: ../libnm-util/nm-setting-olpc-mesh.c:122
+#: ../libnm-util/nm-setting-pppoe.c:162 ../libnm-util/nm-setting-vpn.c:402
+#: ../libnm-util/nm-setting-wimax.c:137
+#: ../libnm-util/nm-setting-wireless-security.c:891
+#: ../libnm-util/nm-setting-wireless.c:750
msgid "property is missing"
msgstr "鉦鈳鉦鉦菽 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦"
-#: ../libnm-util/nm-setting-8021x.c:2177 ../libnm-util/nm-setting-8021x.c:2194
-#: ../libnm-util/nm-setting-8021x.c:2235 ../libnm-util/nm-setting-8021x.c:2252
-#: ../libnm-util/nm-setting-8021x.c:2303 ../libnm-util/nm-setting-8021x.c:2315
-#: ../libnm-util/nm-setting-8021x.c:2333 ../libnm-util/nm-setting-8021x.c:2345
-#: ../libnm-util/nm-setting-8021x.c:2369 ../libnm-util/nm-setting-adsl.c:219
-#: ../libnm-util/nm-setting-adsl.c:228 ../libnm-util/nm-setting-cdma.c:179
-#: ../libnm-util/nm-setting-cdma.c:188
-#: ../libnm-util/nm-setting-connection.c:699
-#: ../libnm-util/nm-setting-connection.c:770
-#: ../libnm-util/nm-setting-gsm.c:284 ../libnm-util/nm-setting-gsm.c:341
-#: ../libnm-util/nm-setting-gsm.c:350
-#: ../libnm-util/nm-setting-ip4-config.c:766
-#: ../libnm-util/nm-setting-ip4-config.c:775
-#: ../libnm-util/nm-setting-pppoe.c:172 ../libnm-util/nm-setting-pppoe.c:181
-#: ../libnm-util/nm-setting-vpn.c:414 ../libnm-util/nm-setting-vpn.c:424
+#: ../libnm-core/nm-setting-8021x.c:2295 ../libnm-core/nm-setting-8021x.c:2312
+#: ../libnm-core/nm-setting-8021x.c:2342 ../libnm-core/nm-setting-8021x.c:2359
+#: ../libnm-core/nm-setting-8021x.c:2399 ../libnm-core/nm-setting-8021x.c:2411
+#: ../libnm-core/nm-setting-8021x.c:2429 ../libnm-core/nm-setting-8021x.c:2441
+#: ../libnm-core/nm-setting-8021x.c:2466 ../libnm-core/nm-setting-adsl.c:211
+#: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-cdma.c:173
+#: ../libnm-core/nm-setting-cdma.c:182
+#: ../libnm-core/nm-setting-connection.c:768
+#: ../libnm-core/nm-setting-connection.c:818
+#: ../libnm-core/nm-setting-gsm.c:241 ../libnm-core/nm-setting-gsm.c:298
+#: ../libnm-core/nm-setting-gsm.c:307
+#: ../libnm-core/nm-setting-ip4-config.c:964
+#: ../libnm-core/nm-setting-ip4-config.c:973
+#: ../libnm-core/nm-setting-pppoe.c:165 ../libnm-core/nm-setting-pppoe.c:174
+#: ../libnm-core/nm-setting-vpn.c:407 ../libnm-core/nm-setting-vpn.c:417
+#: ../libnm-core/nm-setting-wimax.c:143
+#: ../libnm-core/nm-setting-wireless-security.c:908
+#: ../libnm-core/nm-setting-wireless-security.c:916
+#: ../libnm-core/nm-setting-wireless-security.c:940
+#: ../libnm-util/nm-setting-8021x.c:2289 ../libnm-util/nm-setting-8021x.c:2306
+#: ../libnm-util/nm-setting-8021x.c:2347 ../libnm-util/nm-setting-8021x.c:2364
+#: ../libnm-util/nm-setting-8021x.c:2415 ../libnm-util/nm-setting-8021x.c:2427
+#: ../libnm-util/nm-setting-8021x.c:2445 ../libnm-util/nm-setting-8021x.c:2457
+#: ../libnm-util/nm-setting-8021x.c:2482 ../libnm-util/nm-setting-adsl.c:215
+#: ../libnm-util/nm-setting-adsl.c:224 ../libnm-util/nm-setting-cdma.c:177
+#: ../libnm-util/nm-setting-cdma.c:186
+#: ../libnm-util/nm-setting-connection.c:774
+#: ../libnm-util/nm-setting-connection.c:851
+#: ../libnm-util/nm-setting-gsm.c:281 ../libnm-util/nm-setting-gsm.c:338
+#: ../libnm-util/nm-setting-gsm.c:347
+#: ../libnm-util/nm-setting-ip4-config.c:893
+#: ../libnm-util/nm-setting-ip4-config.c:902
+#: ../libnm-util/nm-setting-pppoe.c:169 ../libnm-util/nm-setting-pppoe.c:178
+#: ../libnm-util/nm-setting-vpn.c:411 ../libnm-util/nm-setting-vpn.c:421
#: ../libnm-util/nm-setting-wimax.c:146
-#: ../libnm-util/nm-setting-wireless-security.c:825
-#: ../libnm-util/nm-setting-wireless-security.c:833
-#: ../libnm-util/nm-setting-wireless-security.c:857
+#: ../libnm-util/nm-setting-wireless-security.c:921
+#: ../libnm-util/nm-setting-wireless-security.c:929
+#: ../libnm-util/nm-setting-wireless-security.c:953
msgid "property is empty"
msgstr "鉦鈳鉦鉦菽 鉦鉦擒眷鉦 鉦鉦舟"
-#: ../libnm-util/nm-setting-8021x.c:2205 ../libnm-util/nm-setting-8021x.c:2217
-#: ../libnm-util/nm-setting-8021x.c:2263 ../libnm-util/nm-setting-8021x.c:2275
+#: ../libnm-core/nm-setting-8021x.c:2324 ../libnm-core/nm-setting-8021x.c:2371
+#: ../libnm-util/nm-setting-8021x.c:2317 ../libnm-util/nm-setting-8021x.c:2329
+#: ../libnm-util/nm-setting-8021x.c:2375 ../libnm-util/nm-setting-8021x.c:2387
#, c-format
msgid "has to match '%s' property for PKCS#12"
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 PKCS#12 鉦鉦擒鉦賴疏 鉦鈳鉦鉦舟鉦鉦舟窒鉦鈳 鉦嫩鉦鉦舟窒鉦鈳鉦能移鉦鉦眇鉦鈳"
-#: ../libnm-util/nm-setting-8021x.c:2514 ../libnm-util/nm-setting-8021x.c:2548
-#: ../libnm-util/nm-setting-bluetooth.c:153
-#: ../libnm-util/nm-setting-bond.c:507
-#: ../libnm-util/nm-setting-infiniband.c:203
-#: ../libnm-util/nm-setting-infiniband.c:218
-#: ../libnm-util/nm-setting-ip4-config.c:757
-#: ../libnm-util/nm-setting-ip6-config.c:741
-#: ../libnm-util/nm-setting-olpc-mesh.c:155
-#: ../libnm-util/nm-setting-team.c:140 ../libnm-util/nm-setting-wimax.c:155
-#: ../libnm-util/nm-setting-wired.c:607 ../libnm-util/nm-setting-wired.c:616
-#: ../libnm-util/nm-setting-wireless-security.c:876
-#: ../libnm-util/nm-setting-wireless-security.c:885
-#: ../libnm-util/nm-setting-wireless-security.c:893
-#: ../libnm-util/nm-setting-wireless-security.c:901
-#: ../libnm-util/nm-setting-wireless-security.c:909
-#: ../libnm-util/nm-setting-wireless-security.c:918
-#: ../libnm-util/nm-setting-wireless-security.c:927
-#: ../libnm-util/nm-setting-wireless-security.c:936
+#: ../libnm-core/nm-setting-8021x.c:2616 ../libnm-core/nm-setting-8021x.c:2650
+#: ../libnm-core/nm-setting-bluetooth.c:146
+#: ../libnm-core/nm-setting-infiniband.c:209
+#: ../libnm-core/nm-setting-infiniband.c:224
+#: ../libnm-core/nm-setting-ip4-config.c:955
+#: ../libnm-core/nm-setting-ip6-config.c:872
+#: ../libnm-core/nm-setting-olpc-mesh.c:147
+#: ../libnm-core/nm-setting-wimax.c:152 ../libnm-core/nm-setting-wired.c:638
+#: ../libnm-core/nm-setting-wired.c:648
+#: ../libnm-core/nm-setting-wireless-security.c:959
+#: ../libnm-core/nm-setting-wireless-security.c:968
+#: ../libnm-core/nm-setting-wireless-security.c:976
+#: ../libnm-core/nm-setting-wireless-security.c:984
+#: ../libnm-core/nm-setting-wireless-security.c:992
+#: ../libnm-core/nm-setting-wireless-security.c:1001
+#: ../libnm-core/nm-setting-wireless-security.c:1010
+#: ../libnm-core/nm-setting-wireless-security.c:1019
+#: ../libnm-core/nm-setting-wireless-security.c:1055
+#: ../libnm-core/nm-setting-wireless-security.c:1065
+#: ../libnm-core/nm-setting-wireless.c:773
+#: ../libnm-core/nm-setting-wireless.c:782
+#: ../libnm-core/nm-setting-wireless.c:791 ../libnm-util/nm-setting.c:1289
+#: ../libnm-util/nm-setting.c:1307 ../libnm-util/nm-setting.c:1326
+#: ../libnm-util/nm-setting-8021x.c:2628 ../libnm-util/nm-setting-8021x.c:2662
+#: ../libnm-util/nm-setting-bluetooth.c:149
+#: ../libnm-util/nm-setting-infiniband.c:204
+#: ../libnm-util/nm-setting-infiniband.c:220
+#: ../libnm-util/nm-setting-ip4-config.c:884
+#: ../libnm-util/nm-setting-ip6-config.c:864
+#: ../libnm-util/nm-setting-olpc-mesh.c:150
+#: ../libnm-util/nm-setting-wimax.c:155 ../libnm-util/nm-setting-wired.c:660
+#: ../libnm-util/nm-setting-wired.c:669
#: ../libnm-util/nm-setting-wireless-security.c:972
-#: ../libnm-util/nm-setting-wireless-security.c:982
-#: ../libnm-util/nm-setting-wireless.c:757
-#: ../libnm-util/nm-setting-wireless.c:766
-#: ../libnm-util/nm-setting-wireless.c:775
+#: ../libnm-util/nm-setting-wireless-security.c:981
+#: ../libnm-util/nm-setting-wireless-security.c:989
+#: ../libnm-util/nm-setting-wireless-security.c:997
+#: ../libnm-util/nm-setting-wireless-security.c:1005
+#: ../libnm-util/nm-setting-wireless-security.c:1014
+#: ../libnm-util/nm-setting-wireless-security.c:1023
+#: ../libnm-util/nm-setting-wireless-security.c:1032
+#: ../libnm-util/nm-setting-wireless-security.c:1068
+#: ../libnm-util/nm-setting-wireless-security.c:1078
+#: ../libnm-util/nm-setting-wireless.c:810
+#: ../libnm-util/nm-setting-wireless.c:819
+#: ../libnm-util/nm-setting-wireless.c:828
msgid "property is invalid"
msgstr "鉦鈳鉦鉦菽 鉦鉦桌移鉦兒鉦能眶鉦擒鉦賴畢鈳"
-#: ../libnm-util/nm-setting-8021x.c:2573 ../libnm-util/nm-setting-8021x.c:2583
-#: ../libnm-util/nm-setting-8021x.c:2593 ../libnm-util/nm-setting-8021x.c:2603
-#: ../libnm-util/nm-setting-8021x.c:2613 ../libnm-util/nm-setting-adsl.c:239
-#: ../libnm-util/nm-setting-adsl.c:250
-#: ../libnm-util/nm-setting-bluetooth.c:170
-#: ../libnm-util/nm-setting-wireless-security.c:804
+#: ../libnm-core/nm-setting-8021x.c:2675 ../libnm-core/nm-setting-8021x.c:2685
+#: ../libnm-core/nm-setting-8021x.c:2695 ../libnm-core/nm-setting-8021x.c:2705
+#: ../libnm-core/nm-setting-8021x.c:2715 ../libnm-core/nm-setting-adsl.c:232
+#: ../libnm-core/nm-setting-adsl.c:244
+#: ../libnm-core/nm-setting-bluetooth.c:163
+#: ../libnm-core/nm-setting-wireless-security.c:887
+#: ../libnm-util/nm-setting-8021x.c:2687 ../libnm-util/nm-setting-8021x.c:2697
+#: ../libnm-util/nm-setting-8021x.c:2707 ../libnm-util/nm-setting-8021x.c:2717
+#: ../libnm-util/nm-setting-8021x.c:2727 ../libnm-util/nm-setting-adsl.c:236
+#: ../libnm-util/nm-setting-adsl.c:248
+#: ../libnm-util/nm-setting-bluetooth.c:166
+#: ../libnm-util/nm-setting-wireless-security.c:900
#, c-format
msgid "'%s' is not a valid value for the property"
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鈳鉦鉦 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦桌鉦耜鉦能眶鉦耜鉦"
-#: ../libnm-util/nm-setting-bluetooth.c:188
+#: ../libnm-core/nm-setting-bluetooth.c:181
+#: ../libnm-util/nm-setting-bluetooth.c:184
#, c-format
msgid "requires '%s' or '%s' setting"
msgstr "'%s' 鉦鉦丞眶 '%s' 鉦詮窒鉦舟鉦抉略鈳鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳"
-#: ../libnm-util/nm-setting-bond.c:518
+#: ../libnm-core/nm-setting-bond.c:475 ../libnm-util/nm-setting-bond.c:498
#, c-format
msgid "invalid option '%s' or its value '%s'"
msgstr "鉦鉦能鉦鈳 '%s' 鉦鉦丞眶 鉦鉦舟盒 鉦桌鉦耜鉦 '%s' 鉦鉦桌移鉦兒鉦能眶鉦擒鉦賴畢鈳"
-#: ../libnm-util/nm-setting-bond.c:537
+#: ../libnm-core/nm-setting-bond.c:494 ../libnm-util/nm-setting-bond.c:517
#, c-format
msgid "only one of '%s' and '%s' can be set"
msgstr "'%s' 鉦桌略鈳鉦戈 '%s' 鉦啤眷鈳鉦耜窒 鉦鈳鉦菽眷 鉦鉦鉦舟疏鈳鉦兒 鉦桌移鉦戈鉦 鉦詮鉦鉦賴硫鉦眇硃鈳鉦舟移鉦鉦賴畢鈳"
-#: ../libnm-util/nm-setting-bond.c:548
+#: ../libnm-core/nm-setting-bond.c:505 ../libnm-util/nm-setting-bond.c:528
#, c-format
msgid "mandatory option '%s' is missing"
msgstr "鉦鉦﹤鉦﹤移鉦 鉦鉦能鉦鈳 '%s' 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦"
-#: ../libnm-util/nm-setting-bond.c:557
+#: ../libnm-core/nm-setting-bond.c:514 ../libnm-util/nm-setting-bond.c:537
#, c-format
msgid "'%s' is not a valid value for '%s'"
msgstr "'%s\" 鉦鉦兒鉦兒鉦菽鉦舟 '%s' 鉦鉦擒鉦賴疏 鉦鉦鉦舟 鉦桌移鉦兒鉦 鉦桌鉦耜鉦能眶鉦耜鉦"
-#: ../libnm-util/nm-setting-bond.c:570
+#: ../libnm-core/nm-setting-bond.c:527 ../libnm-util/nm-setting-bond.c:550
#, c-format
msgid "'%s=%s' is incompatible with '%s > 0'"
msgstr "'%s=%s' 鉦鉦兒鉦兒鉦菽鉦舟 '%s > 0' 鉦兒鉦鉦舟窒鉦鈳 鉦嫩鉦鉦舟窒鉦鈳鉦喪鉦喪鉦戈鉦戈窒鉦耜鉦"
-#: ../libnm-util/nm-setting-bond.c:583
+#: ../libnm-core/nm-setting-bond.c:540 ../libnm-util/nm-setting-bond.c:563
#, c-format
msgid "'%s' is not a valid interface name for '%s' option"
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 '%s' 鉦鉦擒鉦賴疏 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦 鉦嫩鉦詮盒鉦耜鉦"
-#: ../libnm-util/nm-setting-bond.c:593
+#: ../libnm-core/nm-setting-bond.c:550 ../libnm-util/nm-setting-bond.c:573
#, c-format
msgid "'%s' option is only valid for '%s=%s'"
msgstr "'%s' 鉦鉦能鉦鈳鉦能 鉦鈳鉦菽眷 '%s=%s' 鉦鈳鉦鈳 鉦桌移鉦戈鉦 鉦桌移鉦兒鉦能眶鉦擒鉦賴盒鈳鉦戈鉦戈畢鈳"
-#: ../libnm-util/nm-setting-bond.c:606
+#: ../libnm-core/nm-setting-bond.c:563 ../libnm-util/nm-setting-bond.c:586
#, c-format
msgid "'%s=%s' is not a valid configuration for '%s'"
msgstr "'%s=%s' 鉦鉦兒鉦兒鉦菽鉦舟 '%s' 鉦鉦擒鉦賴疏 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦啤鉦兒鉦能眷鈳鉦"
-#: ../libnm-util/nm-setting-bond.c:619 ../libnm-util/nm-setting-bond.c:628
-#: ../libnm-util/nm-setting-bond.c:648 ../libnm-util/nm-setting-bond.c:684
+#: ../libnm-core/nm-setting-bond.c:576 ../libnm-core/nm-setting-bond.c:585
+#: ../libnm-core/nm-setting-bond.c:605 ../libnm-core/nm-setting-bond.c:641
+#: ../libnm-util/nm-setting-bond.c:599 ../libnm-util/nm-setting-bond.c:608
+#: ../libnm-util/nm-setting-bond.c:628 ../libnm-util/nm-setting-bond.c:664
#, c-format
msgid "'%s' option requires '%s' option to be set"
msgstr "'%s' 鉦鉦能鉦鈳鉦鉦擒鉦 '%s' 鉦鉦能鉦鈳鉦能疏鈳鉦兒 鉦詮窒鉦舟鉦抉鈳鉦喪窒鉦詮鉦 鉦鉦鉦戈鉦能眶鉦賴盒鈳鉦戈鉦戈畢鈳"
-#: ../libnm-util/nm-setting-bond.c:659
+#: ../libnm-core/nm-setting-bond.c:616 ../libnm-util/nm-setting-bond.c:639
#, c-format
msgid "'%s' option is empty"
msgstr "'%s' 鉦鉦能鉦鈳鉦能 鉦鉦擒眷鉦 鉦鉦舟"
-#: ../libnm-util/nm-setting-bond.c:671
+#: ../libnm-core/nm-setting-bond.c:628 ../libnm-util/nm-setting-bond.c:651
#, c-format
msgid "'%s' is not a valid IPv4 address for '%s' option"
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 '%s' 鉦鉦能鉦鈳鉦鉦擒鉦賴疏 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 IPv4 鉦菽窒鉦喪移鉦詮眶鉦耜鉦"
-#: ../libnm-util/nm-setting-bridge-port.c:155
-#: ../libnm-util/nm-setting-bridge-port.c:167
+#: ../libnm-core/nm-setting-bridge-port.c:139
+#: ../libnm-core/nm-setting-bridge-port.c:151
+#: ../libnm-util/nm-setting-bridge-port.c:153
+#: ../libnm-util/nm-setting-bridge-port.c:165
#, c-format
msgid "'%d' is not a valid value for the property (should be <= %d)"
msgstr "'%d' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鈳鉦鉦 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦桌鉦耜鉦能眶鉦耜鉦 (鉦鉦舟 <= %d 鉦鉦鉦賴盒鉦眇鉦鈳)"
-#: ../libnm-util/nm-setting-bridge.c:251
+#: ../libnm-core/nm-setting-bridge-port.c:176
+#: ../libnm-core/nm-setting-team-port.c:119
+#, c-format
+msgid ""
+"A connection with a '%s' setting must have the slave-type set to '%s'. "
+"Instead it is '%s'"
+msgstr ""
+"'%s' 鉦詮窒鉦舟鉦抉略鈳鉦能疏鈳鉦兒 鉦嫩鉦鉦舟窒鉦啤鉦 鉦鉦鉦舟 鉦詮鉦芹盒鈳鉦鉦舟眷鈳鉦耜窒 鉦詮鉦耜鉦菽-鉦眇鈳鉦能疏鈳鉦兒 '%s' 鉦鈳 "
+"鉦嫩鉦鉦舟窒鉦詮窒鉦啤痊鈳鉦鈳. 鉦眇畢鉦耜窒鉦鈳 '%s' 鉦鉦鉦賴畢鈳"
+
+#: ../libnm-core/nm-setting-bridge.c:223 ../libnm-util/nm-setting-bridge.c:268
#, c-format
msgid "value '%d' is out of range <%d-%d>"
msgstr "'%d' 鉦桌鉦耜鉦能眶鈳 <%d-%d> 鉦菽鉦能移鉦芹鉦戈窒鉦 鉦嫩鉦啤鉦賴畢鈳"
-#: ../libnm-util/nm-setting-cdma.c:170
+#: ../libnm-core/nm-setting-bridge.c:240 ../libnm-core/nm-setting-wired.c:613
+#: ../libnm-core/nm-setting-wired.c:672 ../libnm-util/nm-setting-bridge.c:285
+#: ../libnm-util/nm-setting-wired.c:635 ../libnm-util/nm-setting-wired.c:693
+msgid "is not a valid MAC address"
+msgstr "鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 MAC 鉦菽窒鉦喪移鉦詮眶鉦耜鉦"
+
+#: ../libnm-core/nm-setting-cdma.c:164 ../libnm-util/nm-setting-cdma.c:168
msgid "property is empty'"
msgstr "鉦鈳鉦鉦菽 鉦鉦擒眷鉦 鉦鉦舟'"
-#: ../libnm-util/nm-setting-connection.c:734
-#, c-format
-msgid "'%s' doesn't match the virtual interface name '%s'"
-msgstr ""
-"'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦菽盒鈳鉦鈳鉦菽眷鈳 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦 鉦嫩鉦詮盒鉦擒畢 '%s' 鉦鈳鉦鈳 鉦嫩鉦鉦舟窒鉦鈳鉦能移鉦鈳鉦戈鉦戈窒鉦耜鉦"
-
-#: ../libnm-util/nm-setting-connection.c:780
+#: ../libnm-core/nm-setting-connection.c:740
+#: ../libnm-util/nm-setting-connection.c:861
#, c-format
msgid "requires presence of '%s' setting in the connection"
msgstr "鉦鉦舟鈳鉦鉦擒鉦 鉦詮鉦芹盒鈳鉦鉦舟眷鈳鉦耜窒 '%s' 鉦詮窒鉦舟鉦抉略鈳鉦 鉦鉦鉦戈鉦能眶鉦賴盒鈳鉦戈鉦戈畢鈳"
-#: ../libnm-util/nm-setting-connection.c:802
-msgid "IPv4 configuration is not allowed for slave"
-msgstr "鉦詮鉦耜鉦菽鉦鉦擒鉦 IPv4 鉦詮鉦啤鉦兒鉦鈳 鉦鉦兒鉦桌略鉦 鉦鉦啤鉦菽鉦舟窒鉦耜鉦"
+#: ../libnm-core/nm-setting-connection.c:828
+#, c-format
+#| msgid "index '%s' is not valid"
+msgid "connection type '%s' is not valid"
+msgstr "鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳 '%s' 鉦鉦鉦眇鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦眇鈳鉦能移鉦鉦賴眷鈳鉦"
-#: ../libnm-util/nm-setting-connection.c:815
-msgid "IPv6 configuration is not allowed for slave"
-msgstr "鉦詮鉦耜鉦菽鉦鉦擒鉦 IPv6 鉦詮鉦啤鉦兒鉦鈳 鉦鉦兒鉦桌略鉦 鉦鉦啤鉦菽鉦舟窒鉦耜鉦"
+#: ../libnm-core/nm-setting-connection.c:838
+#, c-format
+#| msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
+msgid "connection type '%s' is not a valid base type"
+msgstr "鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳 '%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦桌鉦 鉦眇鈳鉦能眷鈳鉦"
-#: ../libnm-util/nm-setting-dcb.c:595
+#: ../libnm-core/nm-setting-connection.c:873
+#: ../libnm-util/nm-setting-connection.c:876
+#, c-format
+#| msgid "Unknown log level '%s'"
+msgid "Unknown slave type '%s'"
+msgstr "鉦鈳鉦戈鉦戈窒鉦啤畢 鉦詮鉦耜鉦菽 鉦眇鈳 '%s'"
+
+#: ../libnm-core/nm-setting-connection.c:883
+#: ../libnm-util/nm-setting-connection.c:886
+#| msgid "Shared connection service failed"
+msgid "Slave connections need a valid '"
+msgstr "鉦詮鉦耜鉦菽 鉦詮鉦芹盒鈳鉦鉦鉦喪窒鉦鈳 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 ' 鉦鉦鉦戈鉦能眶鉦賴盒鈳鉦戈鉦戈畢鈳"
+
+#: ../libnm-core/nm-setting-connection.c:904
+#: ../libnm-util/nm-setting-connection.c:895
+#| msgid "not saved, "
+msgid "Cannot set '"
+msgstr "' 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮眷鉦擒鉦賴眷鈳鉦"
+
+#: ../libnm-core/nm-setting-connection.c:917
+#, c-format
+msgid "property type should be set to '%s'"
+msgstr "鉦鈳鉦鉦 鉦眇鈳鉦能疏鈳鉦兒 '%s' 鉦鈳 鉦嫩鉦鉦舟窒鉦詮痊鈳鉦鈳"
+
+#: ../libnm-core/nm-setting-connection.c:932
+#, c-format
+#| msgid "requires presence of '%s' setting in the connection"
+msgid "slave-type '%s' requires a '%s' setting in the connection"
+msgstr "鉦詮鉦耜鉦菽-鉦眇鈳 '%s' 鉦鉦擒鉦 鉦詮鉦芹盒鈳鉦鉦舟眷鈳鉦耜窒 '%s' 鉦詮窒鉦舟鉦抉略鈳鉦 鉦鉦鉦戈鉦能眶鉦賴盒鈳鉦戈鉦戈畢鈳"
+
+#: ../libnm-core/nm-setting-connection.c:942
+#, c-format
+#| msgid "Select the type of slave connection you wish to add."
+msgid "Detect a slave connection with '"
+msgstr "' 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦啤鉦 鉦詮鉦耜鉦菽 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦芹略鈳鉦戈 鉦桌移鉦﹤窒"
+
+#: ../libnm-core/nm-setting-dcb.c:540 ../libnm-util/nm-setting-dcb.c:593
msgid "flags invalid"
msgstr "鉦徇鉦耜鉦能移鉦鈳鉦鉦喪 鉦鉦桌移鉦兒鉦能眶鉦擒鉦賴眶鈳"
-#: ../libnm-util/nm-setting-dcb.c:604
+#: ../libnm-core/nm-setting-dcb.c:549 ../libnm-util/nm-setting-dcb.c:602
msgid "flags invalid - disabled"
msgstr "鉦徇鉦耜鉦能移鉦鈳鉦鉦喪 鉦鉦桌移鉦兒鉦能眶鉦擒鉦賴眶鈳 - 鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟"
-#: ../libnm-util/nm-setting-dcb.c:630 ../libnm-util/nm-setting-dcb.c:679
+#: ../libnm-core/nm-setting-dcb.c:575 ../libnm-core/nm-setting-dcb.c:624
+#: ../libnm-util/nm-setting-dcb.c:628 ../libnm-util/nm-setting-dcb.c:677
msgid "property invalid (not enabled)"
msgstr "鉦鈳鉦鉦菽 鉦鉦桌移鉦兒鉦能眶鉦擒鉦賴畢鈳 (鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮眷鉦擒鉦賴眷鈳鉦)"
-#: ../libnm-util/nm-setting-dcb.c:639
+#: ../libnm-core/nm-setting-dcb.c:584 ../libnm-util/nm-setting-dcb.c:637
msgid "element invalid"
msgstr "鉦鉦鉦鉦菽 鉦鉦桌移鉦兒鉦能眶鉦擒鉦賴畢鈳"
-#: ../libnm-util/nm-setting-dcb.c:654
+#: ../libnm-core/nm-setting-dcb.c:599 ../libnm-util/nm-setting-dcb.c:652
msgid "sum not 100%"
msgstr "鉦桌鉦戈鉦戈眶鈳 100% 鉦鉦鉦賴眷鈳鉦"
-#: ../libnm-util/nm-setting-dcb.c:688 ../libnm-util/nm-setting-dcb.c:720
+#: ../libnm-core/nm-setting-dcb.c:633 ../libnm-core/nm-setting-dcb.c:665
+#: ../libnm-util/nm-setting-dcb.c:686 ../libnm-util/nm-setting-dcb.c:718
msgid "property invalid"
msgstr "鉦鈳鉦鉦菽 鉦鉦桌移鉦兒鉦能眶鉦擒鉦賴畢鈳"
-#: ../libnm-util/nm-setting-dcb.c:710
+#: ../libnm-core/nm-setting-dcb.c:655 ../libnm-util/nm-setting-dcb.c:708
msgid "property missing"
msgstr "鉦鈳鉦鉦菽 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦"
-#: ../libnm-util/nm-setting-gsm.c:297
+#: ../libnm-core/nm-setting-gsm.c:254 ../libnm-util/nm-setting-gsm.c:294
#, c-format
msgid "property value '%s' is empty or too long (>64)"
msgstr "'%s' 鉦鈳鉦鉦 鉦桌鉦耜鉦能眶鈳 鉦鉦擒眷鉦 鉦鉦舟 鉦鉦丞眶 鉦眇硃鉦 鉦鉦舟鉦舟眶鉦擒鉦賴畢鈳 (>64)"
-#: ../libnm-util/nm-setting-gsm.c:329
+#: ../libnm-core/nm-setting-gsm.c:286 ../libnm-util/nm-setting-gsm.c:326
#, c-format
msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
msgstr ""
-"'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦鈳鉦獅盒鉦菽疏鈳鉦兒(鉦鉦喪疏鈳鉦兒) 鉦嫩鉦鉦舟窒鉦舟 ( [A-Za-z._-] 鉦鉦兒鉦兒 "
-"鉦眇眾鉦詮)"
+"'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦鈳鉦獅盒鉦菽疏鈳鉦兒(鉦鉦喪疏鈳鉦兒) 鉦嫩鉦鉦舟窒鉦舟 ( [A-Za-z._-] 鉦鉦兒鉦兒 鉦眇眾鉦詮)"
-#: ../libnm-util/nm-setting-gsm.c:364
+#: ../libnm-core/nm-setting-gsm.c:321 ../libnm-util/nm-setting-gsm.c:361
#, c-format
msgid "'%s' length is invalid (should be 5 or 6 digits)"
msgstr "'%s' 鉦鉦舟鉦舟眶鈳 鉦鉦桌移鉦兒鉦能眶鉦擒鉦賴畢鈳 (5 鉦鉦丞眶 6 鉦鉦鉦鉦賴鉦喪眺鈳鉦鉦賴盒鉦眇鉦鈳)"
-#: ../libnm-util/nm-setting-infiniband.c:228
+#: ../libnm-core/nm-setting-infiniband.c:234
+#: ../libnm-util/nm-setting-infiniband.c:230
msgid "not a valid interface name"
msgstr "鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦 鉦嫩鉦詮盒鉦耜鉦"
-#: ../libnm-util/nm-setting-infiniband.c:236
+#: ../libnm-core/nm-setting-infiniband.c:242
+#: ../libnm-util/nm-setting-infiniband.c:238
msgid "Must specify a P_Key if specifying parent"
msgstr "鉦桌鉦耜眶鉦兒鉦兒 (鉦芹鉦啤鉦鉦鈳) 鉦詮鉦鉦賴硫鈳鉦菽移鉦 P_Key 鉦鉦兒鉦兒 鉦詮鉦鉦賴硫鈳鉦菽鉦舟 鉦鉦戈鉦能鉦戈鉦"
-#: ../libnm-util/nm-setting-infiniband.c:246
+#: ../libnm-core/nm-setting-infiniband.c:252
+#: ../libnm-util/nm-setting-infiniband.c:248
msgid "InfiniBand P_Key connection did not specify parent interface name"
msgstr "InfiniBand P_Key 鉦詮鉦芹盒鈳鉦鉦菽 鉦桌鉦 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦 鉦嫩鉦詮盒鉦兒鉦兒 鉦詮鉦鉦賴硫鉦賴眷鈳鉦"
-#: ../libnm-util/nm-setting-ip4-config.c:726
-#: ../libnm-util/nm-setting-ip4-config.c:736
-#: ../libnm-util/nm-setting-ip4-config.c:746
-#: ../libnm-util/nm-setting-ip6-config.c:709
-#: ../libnm-util/nm-setting-ip6-config.c:719
-#: ../libnm-util/nm-setting-ip6-config.c:729
+#: ../libnm-core/nm-setting-infiniband.c:288
+#: ../libnm-util/nm-setting-infiniband.c:284
+#, c-format
+msgid ""
+"interface name of software infiniband device must be '%s' or unset (instead "
+"it is '%s')"
+msgstr ""
+"鉦戈鉦戈鉦啤移鉦鉦 鉦鉦兒鉦徇窒鉦兒窒鉦眇鉦能移鉦鉦﹤ 鉦詮移鉦抉疏鉦 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦 鉦嫩鉦詮盒鈳 '%s' 鉦鉦鉦賴盒鉦眇鉦鈳 鉦鉦丞眶 "
+"鉦詮鉦鉦賴硫鉦賴盒鉦眇移鉦啤畢鈳 (鉦眇畢鉦耜窒鉦鈳 鉦鉦舟 '%s' 鉦鉦鉦賴畢鈳)"
+
+#: ../libnm-core/nm-setting-infiniband.c:303
+#, c-format
+msgid "mtu for transport mode '%s' can be at most %d but it is %d"
+msgstr "鉦菽盒鈳鉦鉦擒眶鉦鈳 鉦鈳鉦啤皎 '%s' 鉦鉦擒鉦賴疏 mtu 鉦能 %d 鉦鉦啤窒鉦獅鉦 鉦鉦鉦賴盒鉦眇硃鈳鉦舟 鉦鉦舟盒鈳 %d 鉦鉦鉦賴畢鈳"
+
+#: ../libnm-core/nm-setting-ip4-config.c:909
+#: ../libnm-core/nm-setting-ip6-config.c:827
+#: ../libnm-util/nm-setting-ip4-config.c:838
+#: ../libnm-util/nm-setting-ip6-config.c:819
+#, c-format
+#| msgid "this property is not allowed for '%s=%s'"
+msgid "this property cannot be empty for '%s=%s'"
+msgstr "鉦 鉦鈳鉦鉦菽 '%s=%s' 鉦鉦擒鉦 鉦鉦擒眷鉦 鉦鉦啤鉦菽鉦戈窒鉦耜鉦"
+
+#: ../libnm-core/nm-setting-ip4-config.c:921
+#: ../libnm-core/nm-setting-ip4-config.c:931
+#: ../libnm-core/nm-setting-ip4-config.c:943
+#: ../libnm-core/nm-setting-ip6-config.c:840
+#: ../libnm-core/nm-setting-ip6-config.c:850
+#: ../libnm-core/nm-setting-ip6-config.c:860
+#: ../libnm-util/nm-setting-ip4-config.c:850
+#: ../libnm-util/nm-setting-ip4-config.c:860
+#: ../libnm-util/nm-setting-ip4-config.c:872
+#: ../libnm-util/nm-setting-ip6-config.c:832
+#: ../libnm-util/nm-setting-ip6-config.c:842
+#: ../libnm-util/nm-setting-ip6-config.c:852
#, c-format
msgid "this property is not allowed for '%s=%s'"
msgstr "鉦 鉦鈳鉦鉦菽 '%s=%s' 鉦鉦擒鉦 鉦鉦兒鉦桌略鉦 鉦鉦耜鉦"
-#: ../libnm-util/nm-setting-ip4-config.c:789
+#: ../libnm-core/nm-setting-ip4-config.c:990
+#: ../libnm-util/nm-setting-ip4-config.c:916
#, c-format
msgid "%d. IPv4 address is invalid"
msgstr "%d. IPv4 鉦菽窒鉦喪移鉦詮眶鈳 鉦鉦桌移鉦兒鉦能眶鉦擒鉦賴畢鈳"
-#: ../libnm-util/nm-setting-ip4-config.c:799
+#: ../libnm-core/nm-setting-ip4-config.c:1000
+#: ../libnm-util/nm-setting-ip4-config.c:926
#, c-format
msgid "%d. IPv4 address has invalid prefix"
msgstr "%d. IPv4 鉦菽窒鉦喪移鉦詮眶鈳 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮疏鈳鉦兒 鉦嫩鉦鉦舟窒鉦舟"
-#: ../libnm-util/nm-setting-ip4-config.c:815
+#: ../libnm-core/nm-setting-ip4-config.c:1010
+#, c-format
+#| msgid "%d. IPv4 address has invalid prefix"
+msgid "%d. IPv4 address has invalid label '%s'"
+msgstr "%d. IPv4 鉦菽窒鉦喪移鉦詮眶鈳 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦耜鉦眇眷鈳 '%s' 鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦舟"
+
+#: ../libnm-core/nm-setting-ip4-config.c:1021
+#, c-format
+msgid "IPv4 address / label count mismatch (%d vs %d)"
+msgstr "IPv4 鉦菽窒鉦喪移鉦 / 鉦耜鉦眇眷鈳 鉦鉦鉦賴鈳 鉦嫩鉦鉦舟窒鉦鈳鉦能移鉦鈳鉦戈鉦戈窒鉦耜鉦 (%d vs %d)"
+
+#: ../libnm-core/nm-setting-ip4-config.c:1037
+#: ../libnm-util/nm-setting-ip4-config.c:942
#, c-format
msgid "%d. route is invalid"
msgstr "%d. 鉦啤鉦鈳 鉦鉦桌移鉦兒鉦能眶鉦擒鉦賴畢鈳"
-#: ../libnm-util/nm-setting-ip4-config.c:825
+#: ../libnm-core/nm-setting-ip4-config.c:1047
+#: ../libnm-util/nm-setting-ip4-config.c:952
#, c-format
msgid "%d. route has invalid prefix"
msgstr "%d. 鉦啤鉦鈳 鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮疏鈳鉦兒 鉦嫩鉦鉦舟窒鉦舟"
-#: ../libnm-util/nm-setting-ip6-config.c:708
+#: ../libnm-core/nm-setting-ip4-config.c:1063
+#: ../libnm-core/nm-setting-ip6-config.c:894
+#, c-format
+#| msgid "%d. IPv4 address is invalid"
+msgid "%d. DNS server address is invalid"
+msgstr "%d. DNS 鉦芹鉦啤鉦鈳鉦鉦鉦 鉦菽窒鉦喪移鉦詮眶鈳 鉦鉦桌移鉦兒鉦能眶鉦擒鉦賴畢鈳"
+
+#: ../libnm-core/nm-setting-ip6-config.c:839
+#: ../libnm-util/nm-setting-ip6-config.c:831
#, c-format
msgid "'%s' not allowed for %s=%s"
msgstr "'%s' 鉦能 %s=%s 鉦鉦擒鉦 鉦鉦兒鉦桌略鉦 鉦鉦耜鉦"
-#: ../libnm-util/nm-setting-olpc-mesh.c:136
-#: ../libnm-util/nm-setting-wireless.c:706
+#: ../libnm-core/nm-setting-olpc-mesh.c:128
+#: ../libnm-core/nm-setting-wireless.c:722
+#: ../libnm-util/nm-setting-olpc-mesh.c:131
+#: ../libnm-util/nm-setting-wireless.c:759
msgid "SSID length is out of range <1-32> bytes"
msgstr "SSID 鉦鉦舟鉦舟眶鈳 <1-32> 鉦眇鉦鈳鉦鉦 鉦菽鉦能移鉦芹鉦戈窒鉦 鉦嫩鉦啤鉦賴畢鈳"
-#: ../libnm-util/nm-setting-olpc-mesh.c:145
-#: ../libnm-util/nm-setting-wireless.c:746
+#: ../libnm-core/nm-setting-olpc-mesh.c:137
+#: ../libnm-core/nm-setting-wireless.c:762
+#: ../libnm-util/nm-setting-olpc-mesh.c:140
+#: ../libnm-util/nm-setting-wireless.c:799
#, c-format
msgid "'%d' is not a valid channel"
msgstr "'%d' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦擒疏鉦耜 鉦鉦耜鉦"
-#: ../libnm-util/nm-setting-ppp.c:390
+#: ../libnm-core/nm-setting-ppp.c:383 ../libnm-util/nm-setting-ppp.c:387
#, c-format
msgid "'%d' is out of valid range <128-16384>"
msgstr "'%d' 鉦鉦兒鉦兒鉦菽鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 <128-16384> 鉦菽鉦能移鉦芹鉦戈窒鉦 鉦嫩鉦啤鉦賴畢鈳"
-#: ../libnm-util/nm-setting-ppp.c:403
+#: ../libnm-core/nm-setting-ppp.c:396 ../libnm-util/nm-setting-ppp.c:400
#, c-format
msgid "setting this property requires non-zero '%s' property"
msgstr "鉦 鉦鈳鉦鉦菽疏鈳鉦兒 鉦嫩鉦鉦舟窒鉦詮眷鈳 鉦嗣鉦兒鉦能眶鉦耜鉦耜畢 '%s' 鉦鈳鉦鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳"
-#: ../libnm-util/nm-setting-vlan.c:497
+#: ../libnm-core/nm-setting-vlan.c:528 ../libnm-util/nm-setting-vlan.c:554
#, c-format
msgid "'%s' value doesn't match '%s=%s'"
msgstr "'%s' 鉦桌鉦耜鉦能眶鈳 '%s=%s' 鉦鈳 鉦嫩鉦鉦舟窒鉦鈳鉦能移鉦鈳鉦菽鉦舟窒鉦耜鉦"
-#: ../libnm-util/nm-setting-vlan.c:508
+#: ../libnm-core/nm-setting-vlan.c:539 ../libnm-util/nm-setting-vlan.c:565
#, c-format
msgid "'%s' is neither an UUID nor an interface name"
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 UUID 鉦鉦丞眶 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦 鉦嫩鉦詮盒鉦擒鉦賴眷鈳鉦"
-#: ../libnm-util/nm-setting-vlan.c:521
+#: ../libnm-core/nm-setting-vlan.c:553 ../libnm-util/nm-setting-vlan.c:578
#, c-format
msgid "property is not specified and neither is '%s:%s'"
msgstr "鉦鈳鉦鉦菽疏鈳鉦兒 鉦詮鉦鉦賴硫鉦耜移鉦鉦賴眷鈳鉦 鉦桌略鈳鉦戈 '%s:%s' 鉦鉦鉦賴眷鈳鉦"
-#: ../libnm-util/nm-setting-vlan.c:534
+#: ../libnm-core/nm-setting-vlan.c:566 ../libnm-util/nm-setting-vlan.c:591
msgid "flags are invalid"
msgstr "鉦徇鉦耜鉦能移鉦鈳鉦鉦喪 鉦鉦桌移鉦兒鉦能眶鉦擒鉦賴畢鈳"
-#: ../libnm-util/nm-setting-wired.c:562
+#: ../libnm-core/nm-setting-wired.c:593 ../libnm-util/nm-setting-wired.c:615
#, c-format
-msgid "'%s' is not a valid ethernet port value"
-msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦戈盒鈳鉦兒鉦鈳 鉦詮鉦芹盒鈳鉦鉦詮鉦丞移鉦 鉦桌鉦耜鉦能眶鉦耜鉦"
+#| msgid "'%s' is not a valid ethernet port value"
+msgid "'%s' is not a valid Ethernet port value"
+msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦戈盒鈳鉦兒鉦鈳 鉦詮鉦芹盒鈳鉦鉦詮鉦丞移鉦 鉦桌鉦耜鉦能眶鉦耜鉦"
-#: ../libnm-util/nm-setting-wired.c:572
+#: ../libnm-core/nm-setting-wired.c:603 ../libnm-util/nm-setting-wired.c:625
#, c-format
msgid "'%s' is not a valid duplex value"
msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦﹤鉦能鉦芹鉦耜鉦鈳鉦詮 鉦桌鉦耜鉦能眶鉦耜鉦"
-#: ../libnm-util/nm-setting-wired.c:582 ../libnm-util/nm-setting-wired.c:640
-msgid "is not a valid MAC address"
-msgstr "鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 MAC 鉦菽窒鉦喪移鉦詮眶鉦耜鉦"
-
-#: ../libnm-util/nm-setting-wired.c:595
-#: ../libnm-util/nm-setting-wireless.c:787
-#: ../libnm-util/nm-setting-wireless.c:801
-#, c-format
-msgid "'%s' is not a valid MAC address"
-msgstr "'%s' 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 MAC 鉦菽窒鉦喪移鉦詮眶鉦耜鉦"
-
-#: ../libnm-util/nm-setting-wired.c:629
+#: ../libnm-core/nm-setting-wired.c:661 ../libnm-util/nm-setting-wired.c:682
#, c-format
msgid "invalid '%s' or its value '%s'"
msgstr "'%s' 鉦鉦丞眶 鉦鉦舟盒 鉦桌鉦耜鉦能眶鈳 '%s' 鉦鉦桌移鉦兒鉦能眶鉦擒鉦賴畢鈳"
-#: ../libnm-util/nm-setting-wireless-security.c:816
+#: ../libnm-core/nm-setting-wireless-security.c:899
+#: ../libnm-util/nm-setting-wireless-security.c:912
#, c-format
msgid "'%s' security requires '%s=%s'"
msgstr "'%s' 鉦詮鉦啤鈳鉦獅略鈳鉦鉦擒鉦 '%s=%s' 鉦鉦鉦戈鉦能眶鉦賴盒鈳鉦戈鉦戈畢鈳"
-#: ../libnm-util/nm-setting-wireless-security.c:845
+#: ../libnm-core/nm-setting-wireless-security.c:928
+#: ../libnm-util/nm-setting-wireless-security.c:941
#, c-format
msgid "'%s' security requires '%s' setting presence"
msgstr "'%s' 鉦詮鉦啤鈳鉦獅略鈳鉦鉦擒鉦 '%s' 鉦詮窒鉦舟鉦抉略鈳鉦能 鉦鉦啤鉦 鉦鉦鉦戈鉦能眶鉦賴盒鈳鉦戈鉦戈畢鈳"
-#: ../libnm-util/nm-setting-wireless-security.c:866
+#: ../libnm-core/nm-setting-wireless-security.c:949
+#: ../libnm-util/nm-setting-wireless-security.c:962
#, c-format
msgid "'%d' value is out of range <0-3>"
msgstr "'%d' 鉦桌鉦耜鉦能眶鈳 <0-3> 鉦菽鉦能移鉦芹鉦戈窒鉦 鉦嫩鉦啤鉦賴畢鈳"
-#: ../libnm-util/nm-setting-wireless-security.c:963
+#: ../libnm-core/nm-setting-wireless-security.c:1046
+#: ../libnm-util/nm-setting-wireless-security.c:1059
#, c-format
msgid "'%s' connections require '%s' in this property"
msgstr "鉦 鉦鈳鉦鉦舟眷鈳鉦耜窒 '%s' 鉦詮鉦芹盒鈳鉦鉦鉦喪窒鉦鉦擒鉦 '%s' 鉦鉦鉦戈鉦能眶鉦賴畢鈳"
-#: ../libnm-util/nm-setting-wireless-security.c:993
+#: ../libnm-core/nm-setting-wireless-security.c:1076
+#: ../libnm-util/nm-setting-wireless-security.c:1089
#, c-format
msgid "'%s' can only be used with '%s=%s' (WEP)"
msgstr "'%s' 鉦鉦兒鉦兒 鉦鈳鉦菽眷 '%s=%s' 鉦鉦兒鉦兒鉦菽鉦舟盒鈳鉦鉦舟窒鉦鈳 鉦桌移鉦戈鉦 鉦眇眾鉦詮痊鉦嫩鉦舟 (WEP)"
-#: ../libnm-util/nm-setting-wireless.c:715
+#: ../libnm-core/nm-setting-wireless.c:731
+#: ../libnm-util/nm-setting-wireless.c:768
#, c-format
msgid "'%s' is not a valid Wi-Fi mode"
msgstr "'%s' 鉦鉦鉦眇鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦菽-鉦徇 鉦詮移鉦抉疏鉦菽移鉦鉦賴眷鈳鉦."
-#: ../libnm-util/nm-setting-wireless.c:725
+#: ../libnm-core/nm-setting-wireless.c:741
+#: ../libnm-util/nm-setting-wireless.c:778
#, c-format
msgid "'%s' is not a valid band"
msgstr "'%s\" 鉦鉦兒鉦兒鉦菽鉦舟 鉦鉦鉦舟 鉦桌移鉦兒鉦能眶鉦擒畢 鉦眇鉦能移鉦鉦﹤ 鉦鉦耜鉦"
-#: ../libnm-util/nm-setting-wireless.c:735
+#: ../libnm-core/nm-setting-wireless.c:751
+#: ../libnm-util/nm-setting-wireless.c:788
#, c-format
msgid "requires setting '%s' property"
msgstr "'%s' 鉦鈳鉦鉦菽疏鈳鉦兒 鉦嫩鉦鉦舟窒鉦詮鉦 鉦鉦鉦戈鉦能眶鉦賴盒鈳鉦戈鉦戈畢鈳"
+#: ../libnm-core/nm-setting.c:1681
+#, c-format
+#| msgid "requires '%s' or '%s' setting"
+msgid "Missing '%s' setting"
+msgstr "'%s' 鉦詮窒鉦舟鉦抉略鈳鉦 鉦鉦擒產鉦賴硫鈳鉦戈鉦戈窒鉦耜鉦"
+
+#: ../libnm-glib/nm-device.c:1792
+msgid "Bluetooth"
+msgstr "鉦眇鉦耜鉦鈳鉦戈"
+
+#: ../libnm-glib/nm-device.c:1810
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../libnm-glib/nm-device.c:1838
+msgid "Wired"
+msgstr "鉦戈鉦戈窒鉦能鉦鈳鉦"
+
+#: ../libnm-glib/nm-device.c:1869
+msgid "PCI"
+msgstr "PCI"
+
+#: ../libnm-glib/nm-device.c:1871
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: ../libnm-glib/nm-device.c:1967 ../libnm-glib/nm-device.c:1986
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../libnm-glib/nm-remote-connection.c:149
+#: ../libnm/nm-remote-connection.c:112
+#| msgid "disconnected"
+msgid "Disconnected by D-Bus"
+msgstr "D-Bus 鉦兒窒鉦鉦 鉦詮鉦芹盒鈳鉦鉦鉦﹤窒鉦舟 鉦嫩鉦鉦賴畢鈳"
+
+#: ../libnm/nm-object.c:148
+msgid "Caller did not specify D-Bus path for object"
+msgstr "鉦鉦眇鉦鈳鉦鈳鉦鈳鉦鉦擒鉦 鉦鉦擒眷鉦啤 鉦能移鉦菽鉦舟 D-Bus 鉦桌移鉦啤鉦鉦菽疏鈳鉦兒 鉦詮鉦鉦賴硫鉦賴眷鈳鉦"
+
+#: ../libnm/nm-vpn-plugin.c:750
+#| msgid "Error: No interface specified."
+msgid "No service name specified"
+msgstr "鉦能移鉦菽鉦舟 鉦詮鉦菽鉦 鉦嫩鉦詮盒鉦兒鉦兒 鉦詮鉦鉦賴硫鉦耜移鉦鉦賴眷鈳鉦"
+
#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
msgid "Enable or disable system networking"
msgstr "鉦菽鉦能眶鉦詮鉦丞鉦 鉦鉦擒眷鉦眇鉦抉眶鉦兒鉦兒 鉦嗣鈳鉦戈鈳鉦喪窒鉦詮窒 鉦鉦丞眶 鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮窒"
@@ -5482,13 +7410,15 @@ msgid ""
"power management)"
msgstr ""
"NetworkManager 鉦鉦兒鉦兒 鉦兒窒鉦舟鉦啤移鉦詮鉦丞窒鉦戈窒鉦鈳 鉦鉦丞眶 鉦鉦鈳鉦鉦啤硫鈳鉦丞窒鉦戈窒鉦鈳 鉦鉦喪鉦嫩窒鉦詮窒 (鉦鉦舟疏鈳鉦兒 鉦鈳鉦菽眷 "
-"鉦菽鉦能眶鉦詮鉦丞鉦 鉦菽窒鉦舟鉦能鉦鈳鉦鉦鈳鉦戈窒 鉦兒窒鉦啤鉦菽硃鉦鈳鉦能窒鉦鉦 鉦桌移鉦戈鉦 鉦眇眾鉦詮痊鈳鉦鈳)"
+"鉦菽鉦能眶鉦詮鉦丞鉦 "
+"鉦菽窒鉦舟鉦能鉦鈳鉦鉦鈳鉦戈窒 鉦兒窒鉦啤鉦菽硃鉦鈳鉦能窒鉦鉦 鉦桌移鉦戈鉦 鉦眇眾鉦詮痊鈳鉦鈳)"
#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
msgid "System policy prevents putting NetworkManager to sleep or waking it up"
msgstr ""
"NetworkManager 鉦鉦兒鉦兒 鉦兒窒鉦舟鉦啤移鉦詮鉦丞窒鉦戈窒鉦鈳 鉦鉦丞眶 鉦鉦鈳鉦鉦啤硫鈳鉦丞窒鉦戈窒鉦鈳 鉦鉦喪鉦嫩窒鉦詮鉦菽鉦舟疏鈳鉦兒 "
-"鉦菽鉦能眶鉦詮鉦丞鉦 鉦兒窒鉦能皎鉦菽 鉦戈瓷鈳鉦能鉦戈鉦戈窒鉦舟"
+"鉦菽鉦能眶鉦詮鉦丞鉦 "
+"鉦兒窒鉦能皎鉦菽 鉦戈瓷鈳鉦能鉦戈鉦戈窒鉦舟"
#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
msgid "Enable or disable WiFi devices"
@@ -5511,15 +7441,15 @@ msgstr ""
#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
msgid "Enable or disable WiMAX mobile broadband devices"
-msgstr ""
-"WiMAX 鉦桌鉦眇鉦耜 鉦眇鉦啤移鉦﹤鉦眇鉦能移鉦鉦﹤ 鉦詮移鉦抉疏鉦鉦喪疏鈳鉦兒 鉦嗣鈳鉦戈鈳鉦喪窒鉦詮窒 鉦鉦丞眶 鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮窒"
+msgstr "WiMAX 鉦桌鉦眇鉦耜 鉦眇鉦啤移鉦﹤鉦眇鉦能移鉦鉦﹤ 鉦詮移鉦抉疏鉦鉦喪疏鈳鉦兒 鉦嗣鈳鉦戈鈳鉦喪窒鉦詮窒 鉦鉦丞眶 鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮窒"
#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
msgid ""
"System policy prevents enabling or disabling WiMAX mobile broadband devices"
msgstr ""
-"WiMAX 鉦桌鉦眇鉦耜 鉦眇鉦啤移鉦﹤鉦眇鉦能移鉦鉦﹤ 鉦詮移鉦抉疏鉦鉦喪疏鈳鉦兒 鉦嗣鈳鉦 鉦鉦丞眶 鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮畢鉦鉦戈 "
-"鉦菽鉦能眶鉦詮鉦丞鉦 鉦兒窒鉦能皎鉦鉦喪 鉦戈瓷鈳鉦能鉦戈鉦戈窒鉦菽"
+"WiMAX 鉦桌鉦眇鉦耜 鉦眇鉦啤移鉦﹤鉦眇鉦能移鉦鉦﹤ 鉦詮移鉦抉疏鉦鉦喪疏鈳鉦兒 鉦嗣鈳鉦 鉦鉦丞眶 鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮畢鉦鉦戈 鉦菽鉦能眶鉦詮鉦丞鉦 "
+"鉦兒窒鉦能皎鉦鉦喪 "
+"鉦戈瓷鈳鉦能鉦戈鉦戈窒鉦菽"
#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
msgid "Allow control of network connections"
@@ -5534,8 +7464,7 @@ msgid "Connection sharing via a protected WiFi network"
msgstr "鉦鉦鉦舟 鉦詮鉦啤鈳鉦獅窒鉦戈眶鉦擒畢 WiFi 鉦鉦擒眷鉦眇鉦抉畢 鉦桌鉦耜 鉦詮鉦芹盒鈳鉦 鉦詮移鉦抉窒鉦詮鉦菽窒鉦鈳"
#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
-msgid ""
-"System policy prevents sharing connections via a protected WiFi network"
+msgid "System policy prevents sharing connections via a protected WiFi network"
msgstr ""
"鉦鉦鉦舟 鉦詮鉦啤鈳鉦獅窒鉦戈眶鉦擒畢 WiFi 鉦鉦擒眷鉦眇鉦抉畢 鉦桌鉦耜 鉦詮鉦芹盒鈳鉦 鉦詮移鉦抉窒鉦詮畢鉦鉦戈 鉦菽鉦能眶鉦詮鉦丞鉦 鉦兒窒鉦能皎鉦鉦喪 "
"鉦戈瓷鈳鉦能鉦戈鉦戈眶鈳"
@@ -5547,8 +7476,7 @@ msgstr "鉦鉦鉦舟 鉦桌鉦鈳鉦戈眶鉦擒畢 WiFi 鉦鉦擒眷鉦眇鉦抉畢 鉦桌
#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
msgid "System policy prevents sharing connections via an open WiFi network"
msgstr ""
-"鉦鉦鉦舟 鉦桌鉦鈳鉦戈眶鉦擒畢 WiFi 鉦鉦擒眷鉦眇鉦抉畢 鉦桌鉦耜 鉦詮鉦芹盒鈳鉦 鉦詮移鉦抉窒鉦詮畢鉦鉦戈 鉦菽鉦能眶鉦詮鉦丞鉦 鉦兒窒鉦能皎鉦鉦喪 "
-"鉦戈瓷鈳鉦能鉦戈鉦戈眶鈳"
+"鉦鉦鉦舟 鉦桌鉦鈳鉦戈眶鉦擒畢 WiFi 鉦鉦擒眷鉦眇鉦抉畢 鉦桌鉦耜 鉦詮鉦芹盒鈳鉦 鉦詮移鉦抉窒鉦詮畢鉦鉦戈 鉦菽鉦能眶鉦詮鉦丞鉦 鉦兒窒鉦能皎鉦鉦喪 鉦戈瓷鈳鉦能鉦戈鉦戈眶鈳"
#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
msgid "Modify personal network connections"
@@ -5578,6 +7506,28 @@ msgid "System policy prevents modification of the persistent system hostname"
msgstr ""
"鉦詮鉦丞窒鉦 鉦菽鉦能眶鉦詮鉦丞鉦 鉦鉦戈窒鉦丞鉦 鉦嫩鉦詮盒鉦兒鉦兒 鉦桌移鉦啤鉦芹瓷鉦賴硫鉦舟鉦戈 鉦菽鉦能眶鉦詮鉦丞鉦 鉦兒窒鉦能皎鉦鉦喪 鉦戈瓷鈳鉦能鉦戈鉦戈眶鈳"
+#. Translators: the first %s is a prefix for the connection id, such
+#. * as "Wired Connection" or "VPN Connection". The %d is a number
+#. * that is combined with the first argument to create a unique
+#. * connection id.
+#: ../src/NetworkManagerUtils.c:952
+#, c-format
+#| msgctxt "long device name"
+#| msgid "%s %s"
+msgctxt "connection id fallback"
+msgid "%s %d"
+msgstr "%s %d"
+
+#: ../src/main.c:130
+#, c-format
+msgid "Failed to set signal mask: %d"
+msgstr "鉦詮鉦鈳鉦鈳 鉦桌鉦詮鉦鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %d"
+
+#: ../src/main.c:139
+#, c-format
+msgid "Failed to create signal handling thread: %d"
+msgstr "鉦詮鉦鈳鉦鈳 鉦兒窒鉦冢移鉦能窒鉦詮鉦 鉦鉦喪鉦能疏鈳鉦兒 鉦兒窒鉦啤鉦桌窒鉦詮鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦菽移鉦鉦賴畢鈳 :%d"
+
#: ../src/main.c:154
#, c-format
msgid "Opening %s failed: %s\n"
@@ -5598,60 +7548,60 @@ msgstr "%s 鉦鉦兒鉦兒 鉦桌鉦鈳鉦鈳鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳
msgid "NetworkManager is already running (pid %ld)\n"
msgstr "NetworkManager 鉦鉦鉦擒鉦耜 鉦鉦擒眷鉦兒鉦能眷鈳鉦耜窒鉦舟 (pid %ld)\n"
-#: ../src/main.c:329
+#: ../src/main.c:361
msgid "Print NetworkManager version and exit"
msgstr "NetworkManager 鉦鉦菽鉦戈鉦戈窒鉦能疏鈳鉦兒 鉦桌鉦舟鉦啤窒鉦詮窒 鉦兒窒鉦啤鉦鉦桌窒鉦詮"
-#: ../src/main.c:330
+#: ../src/main.c:362
msgid "Don't become a daemon"
msgstr "鉦鉦鉦舟 鉦﹤鉦桌疏鈳 鉦鉦鉦眇鉦"
-#: ../src/main.c:331
+#: ../src/main.c:363
msgid "Don't become a daemon, and log to stderr"
msgstr "鉦鉦鉦舟 鉦﹤鉦桌疏鈳 鉦鉦鉦眇鉦, 鉦桌略鈳鉦戈 stderr 鉦鈳 鉦耜移鉦鈳 鉦桌移鉦﹤"
-#: ../src/main.c:332
+#: ../src/main.c:364
#, c-format
msgid "Log level: one of [%s]"
msgstr "鉦耜移鉦鈳 鉦嫩鉦: [%s] 鉦舟眷鈳鉦耜窒 鉦鉦鉦舟"
-#: ../src/main.c:334
+#: ../src/main.c:366
#, c-format
msgid "Log domains separated by ',': any combination of [%s]"
msgstr ""
"鉦耜移鉦鈳 鉦﹤鉦桌鉦兒鉦鉦喪疏鈳鉦兒 ',' 鉦鉦鉦 鉦芹鉦啤略鈳鉦能鉦鉦賴硫鉦耜移鉦鉦賴盒鈳鉦戈鉦戈畢鈳: [%s] 鉦 鉦能移鉦菽鉦舟 鉦詮鉦能鉦鉦兒"
-#: ../src/main.c:336
+#: ../src/main.c:368
msgid "Make all warnings fatal"
msgstr "鉦鉦耜鉦耜移 鉦鉦鈳鉦鉦啤窒鉦鈳鉦鉦喪疏鈳鉦兒 鉦桌移鉦啤鉦菽移鉦鉦賴硫鈳"
-#: ../src/main.c:337
+#: ../src/main.c:369
msgid "Specify the location of a PID file"
msgstr "鉦鉦鉦舟 PID 鉦鉦﹤略鉦菽疏鈳鉦兒 鉦詮鉦鉦賴硫鉦"
-#: ../src/main.c:337
+#: ../src/main.c:369
msgid "filename"
msgstr "鉦鉦﹤略鉦舟硃鈳鉦詮盒鈳"
-#: ../src/main.c:338
+#: ../src/main.c:370
msgid "State file location"
msgstr "鉦詮鉦丞窒鉦戈窒 鉦鉦﹤略鉦菽 鉦鉦啤鉦 鉦詮鉦丞眾"
-#: ../src/main.c:338
+#: ../src/main.c:370
msgid "/path/to/state.file"
msgstr "/path/to/state.file"
-#: ../src/main.c:364
+#: ../src/main.c:396
#, c-format
msgid "GModules are not supported on your platform!\n"
msgstr "GModules 鉦兒窒鉦桌鉦 鉦芹鉦耜移鉦鈳鉦徇移鉦啤鉦桌窒鉦兒眷鈳鉦耜窒 鉦眇鉦鉦眇眷鉦賴略鉦菽移鉦鉦賴眷鈳鉦!\n"
-#: ../src/main.c:369
+#: ../src/main.c:401
#, c-format
msgid "You must be root to run NetworkManager!\n"
msgstr "NetworkManager 鉦鉦兒鉦兒 鉦鉦耜移鉦能窒鉦詮眷鈳 鉦兒鉦菽 鉦兒窒鉦啤鉦菽移鉦嫩鉦啤移鉦鉦賴盒鉦眇鉦鈳!\n"
-#: ../src/main.c:392
+#: ../src/main.c:424
msgid ""
"NetworkManager monitors all network connections and automatically\n"
"chooses the best connection to use. It also allows the user to\n"
@@ -5665,1068 +7615,525 @@ msgstr ""
"鉦眇眾鉦鈳鉦舟移鉦啤盒鈳\n"
"鉦兒窒鉦啤鉦抉盒鉦賴硫鉦耜 鉦詮硃鉦擒盔 鉦桌移鉦﹤鉦戈鉦戈畢鈳."
-#: ../src/main.c:398
-#, c-format
-msgid "Invalid option. Please use --help to see a list of valid options.\n"
-msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦能鉦鈳. 鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦能鉦鈳鉦鉦喪窒鉦鉦擒鉦 鉦舟盔鉦菽窒鉦鈳鉦鈳 --help 鉦鉦兒鉦兒 鉦兒鉦﹤窒.\n"
-
-#: ../src/main.c:412
+#: ../src/main.c:430 ../src/main.c:446
#, c-format
msgid "%s. Please use --help to see a list of valid options.\n"
msgstr "%s. 鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦能鉦鈳鉦鉦喪窒鉦鉦擒鉦 鉦舟盔鉦菽窒鉦鈳鉦鈳 --help 鉦鉦兒鉦兒 鉦兒鉦﹤窒.\n"
-#: ../src/main.c:417
+#: ../src/main.c:451
#, c-format
msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
msgstr ""
"鉦鉦舟鉦 鉦詮移鉦耜窒鉦鈳 鉦鉦喪鉦嫩窒鉦詮眷鉦擒畢 鉦鈳鉦啤鉦戈窒鉦詮眷鉦擒鉦舟 鉦鉦啤鉦 鉦耜移鉦鈳 鉦﹤鉦桌鉦兒(鉦鉦喪) '%s' 鉦鉦兒鉦兒 "
"鉦鉦﹤鉦鉦鉦賴硫鉦耜移鉦鉦賴畢鈳.\n"
-#: ../src/main.c:468
+#: ../src/main.c:502
#, c-format
msgid "Failed to read configuration: (%d) %s\n"
msgstr "鉦詮鉦啤鉦兒鉦能疏鈳鉦兒 鉦鉦舟鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: (%d) %s\n"
-#: ../src/main.c:482
+#: ../src/main.c:516
#, c-format
msgid "Error in configuration file: %s.\n"
msgstr "鉦詮鉦啤鉦兒移 鉦鉦﹤略鉦舟眷鈳鉦耜窒 鉦舟鉦: %s.\n"
-#: ../src/main.c:487
+#: ../src/main.c:521
#, c-format
msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
msgstr ""
"鉦鈳鉦啤鉦戈窒鉦詮眷鉦擒鉦舟 鉦鉦啤鉦 鉦耜移鉦鈳 鉦﹤鉦桌鉦兒(鉦鉦喪) '%s' 鉦鉦兒鉦兒 鉦詮鉦啤鉦兒移 鉦鉦﹤略鉦鉦喪窒鉦鉦 "
"鉦鉦﹤鉦鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈窒鉦舟.\n"
-#: ../src/main.c:495
+#: ../src/main.c:529
#, c-format
msgid "State file %s parsing failed: (%d) %s\n"
msgstr "鉦詮鉦丞窒鉦戈窒 鉦鉦﹤略 %s 鉦鉦兒鉦兒 鉦芹移鉦啤鉦詮 鉦桌移鉦﹤鉦菽眷鈳鉦耜窒 鉦菽窒鉦徇眷鉦戈: (%d) %s\n"
-#: ../src/main.c:508
+#: ../src/main.c:542
#, c-format
msgid "Could not daemonize: %s [error %u]\n"
msgstr "鉦﹤鉦桌疏鈳 鉦桌移鉦﹤眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s [鉦舟鉦 %u]\n"
-#: ../src/bluez-manager/nm-bluez-device.c:198
-#, c-format
-msgid "%s Network"
-msgstr "%s 鉦鉦擒眷鉦眇鉦"
-
#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:143
msgid "# Created by NetworkManager\n"
msgstr "# NetworkManager 鉦兒窒鉦鉦 鉦兒窒鉦啤鉦桌窒鉦詮眷鉦擒鉦賴畢鈳\n"
#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:150
#, c-format
-msgid "# Merged from %s\n"
+msgid ""
+"# Merged from %s\n"
"\n"
-msgstr "# %s 鉦鉦鉦 鉦鉦鈳鉦鈳鉦﹤窒鉦詮眷鉦擒鉦賴畢鈳\n"
+msgstr ""
+"# %s 鉦鉦鉦 鉦鉦鈳鉦鈳鉦﹤窒鉦詮眷鉦擒鉦賴畢鈳\n"
"\n"
-#: ../src/dhcp-manager/nm-dhcp-manager.c:313
+#: ../src/dhcp-manager/nm-dhcp-manager.c:302
msgid "no usable DHCP client could be found."
msgstr "鉦眇眾鉦詮痊鉦嫩鉦舟移鉦 鉦能移鉦菽鉦舟 DHCP 鉦鈳鉦耜鉦鉦鈳 鉦鉦鉦﹤鉦眇鉦舟窒鉦耜鉦."
-#: ../src/dhcp-manager/nm-dhcp-manager.c:322
-msgid "'dhclient' could be found."
-msgstr "'dhclient' 鉦鉦鉦﹤ 鉦眇鉦舟窒鉦舟."
+#: ../src/dhcp-manager/nm-dhcp-manager.c:311
+#| msgid "'dhclient' could be found."
+msgid "'dhclient' could not be found or was disabled."
+msgstr "'dhclient' 鉦鉦鉦﹤ 鉦眇鉦舟窒鉦耜鉦 鉦鉦丞眶 鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦鉦﹤窒鉦舟."
-#: ../src/dhcp-manager/nm-dhcp-manager.c:332
-msgid "'dhcpcd' could be found."
-msgstr "'dhcpcd' 鉦鉦鉦﹤ 鉦眇鉦舟窒鉦舟."
+#: ../src/dhcp-manager/nm-dhcp-manager.c:321
+#| msgid "'dhcpcd' could be found."
+msgid "'dhcpcd' could not be found or was disabled."
+msgstr "'dhcpcd' 鉦鉦鉦﹤ 鉦眇鉦舟窒鉦耜鉦 鉦鉦丞眶 鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦鉦﹤窒鉦舟."
-#: ../src/dhcp-manager/nm-dhcp-manager.c:340
+#: ../src/dhcp-manager/nm-dhcp-manager.c:329
#, c-format
msgid "unsupported DHCP client '%s'"
msgstr "鉦眇鉦鉦眇眷鉦菽窒鉦啤畢 DHCP 鉦鈳鉦耜鉦鉦鈳 '%s'"
-#: ../src/dns-manager/nm-dns-manager.c:401
+#: ../src/dns-manager/nm-dns-manager.c:374
msgid "NOTE: the libc resolver may not support more than 3 nameservers."
msgstr ""
"鉦詮鉦鉦兒: libc 鉦芹盒鉦賴硃鉦擒盒鉦鉦菽(鉦啤窒鉦詮移鉦耜鉦菽盒鈳) 3 鉦兒鉦桌鉦詮盒鈳鉦菽盒鈳鉦鉦喪窒鉦鉦賴鉦 鉦嫩鉦鈳鉦鉦賴疏鉦菽鉦鉦喪疏鈳鉦兒 "
"鉦眇鉦鉦眇眷鉦賴硫鈳鉦菽鉦舟窒鉦耜鉦."
-#: ../src/dns-manager/nm-dns-manager.c:403
+#: ../src/dns-manager/nm-dns-manager.c:376
msgid "The nameservers listed below may not be recognized."
msgstr "鉦 鉦鈳鉦喪鈳 鉦詮鉦鉦賴硫鉦耜移鉦 鉦兒鉦桌鉦詮盒鈳鉦菽盒鈳鉦鉦喪疏鈳鉦兒 鉦鈳鉦啤鉦戈窒鉦詮眷鉦擒鉦賴眷鈳鉦."
-#: ../src/logging/nm-logging.c:149
+#: ../src/devices/adsl/nm-device-adsl.c:127
+#| msgid "ADSL connection %d"
+msgid "ADSL connection"
+msgstr "ADSL 鉦詮鉦芹盒鈳鉦"
+
+#: ../src/devices/bluetooth/nm-bluez-device.c:190
#, c-format
-msgid "Unknown log level '%s'"
-msgstr "鉦鈳鉦戈鉦戈窒鉦啤畢 鉦舟移鉦鉦耜 鉦桌鈳鉦 '%s'"
+msgid "%s Network"
+msgstr "%s 鉦鉦擒眷鉦眇鉦"
-#: ../src/logging/nm-logging.c:226
+#: ../src/devices/bluetooth/nm-device-bt.c:274
+#| msgid "PAN connection %d"
+msgid "PAN connection"
+msgstr "PAN 鉦詮鉦芹盒鈳鉦"
+
+#: ../src/devices/bluetooth/nm-device-bt.c:299
+#: ../src/devices/wwan/nm-modem-broadband.c:483
+#| msgid "GSM connection %d"
+msgid "GSM connection"
+msgstr "GSM 鉦詮鉦芹盒鈳鉦"
+
+#: ../src/devices/bluetooth/nm-device-bt.c:303
+#: ../src/devices/wwan/nm-modem-broadband.c:506
+#| msgid "CDMA connection %d"
+msgid "CDMA connection"
+msgstr "CDMA 鉦詮鉦芹盒鈳鉦"
+
+#: ../src/devices/bluetooth/nm-device-bt.c:307
+#| msgid "DUN connection %d"
+msgid "DUN connection"
+msgstr "DUN 鉦詮鉦芹盒鈳鉦"
+
+#: ../src/devices/nm-device-bond.c:137
+#| msgid "Bond connection %d"
+msgid "Bond connection"
+msgstr "鉦眇移鉦鉦﹤ 鉦詮鉦芹盒鈳鉦"
+
+#: ../src/devices/nm-device-bridge.c:144
+#| msgid "Bridge connection %d"
+msgid "Bridge connection"
+msgstr "鉦眇鉦啤窒鉦﹤鉦鈳 鉦詮鉦芹盒鈳鉦"
+
+#: ../src/devices/nm-device-ethernet.c:1437
+#| msgid "PPPoE connection %d"
+msgid "PPPoE connection"
+msgstr "PPPoE 鉦詮鉦芹盒鈳鉦"
+
+#: ../src/devices/nm-device-ethernet.c:1437
+#| msgid "Wired connection %d"
+msgid "Wired connection"
+msgstr "鉦菽鉦啤鉦﹤ 鉦詮鉦芹盒鈳鉦"
+
+#: ../src/devices/nm-device-ethernet-utils.c:38
#, c-format
-msgid "Unknown log domain '%s'"
-msgstr "鉦鈳鉦戈鉦戈窒鉦啤畢 鉦舟移鉦鉦耜 鉦﹤鉦桌鉦兒 '%s'"
+msgid "Wired connection %d"
+msgstr "鉦戈鉦戈窒鉦能鉦鈳鉦 鉦詮鉦芹盒鈳鉦 %d"
+
+#: ../src/devices/nm-device-infiniband.c:189
+#| msgid "InfiniBand connection %d"
+msgid "InfiniBand connection"
+msgstr "InfiniBand 鉦詮鉦芹盒鈳鉦"
+
+#: ../src/devices/nm-device-vlan.c:229
+#| msgid "VLAN connection %d"
+msgid "VLAN connection"
+msgstr "VLAN 鉦詮鉦芹盒鈳鉦"
-#: ../src/config/nm-config.c:271
+#: ../src/devices/team/nm-device-team.c:147
+#| msgid "Team connection %d"
+msgid "Team connection"
+msgstr "鉦鈳鉦桌 鉦詮鉦芹盒鈳鉦"
+
+#: ../src/devices/wifi/nm-device-olpc-mesh.c:163
+#| msgid "Mesh %d"
+msgid "Mesh"
+msgstr "鉦桌鉦嗣"
+
+#: ../src/nm-config.c:303
msgid "Config file location"
msgstr "Config 鉦鉦﹤略鉦菽 鉦鉦啤鉦 鉦詮鉦丞眾"
-#: ../src/config/nm-config.c:271
+#: ../src/nm-config.c:303
msgid "/path/to/config.file"
msgstr "/path/to/config.file"
-#: ../src/config/nm-config.c:272
+#: ../src/nm-config.c:304
msgid "Config directory location"
msgstr "鉦詮鉦啤鉦兒移 鉦鉦﹤略鉦鈳鉦嗣眶鈳 鉦鉦啤鉦 鉦詮鉦丞眾"
-#: ../src/config/nm-config.c:272
+#: ../src/nm-config.c:304
msgid "/path/to/config/dir"
msgstr "/path/to/config/dira"
-#: ../src/config/nm-config.c:274
+#: ../src/nm-config.c:306
msgid "List of plugins separated by ','"
msgstr "',' 鉦鉦鉦 鉦芹鉦啤略鈳鉦能鉦鉦賴硫鉦耜移鉦 鉦芹鉦耜鈳鉦鉦兒鉦鉦 鉦芹鈳鉦鉦"
-#: ../src/config/nm-config.c:274
+#: ../src/nm-config.c:306
msgid "plugin1,plugin2"
msgstr "plugin1,plugin2"
-#: ../src/config/nm-config.c:277
+#. These three are hidden for now, and should eventually just go away.
+#: ../src/nm-config.c:309
msgid "An http(s) address for checking internet connectivity"
msgstr "鉦鉦鉦戈盒鉦鉦擒眷 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦芹盒鉦賴眸鈳鉦耜窒鉦詮眷鈳 鉦鉦鉦舟 http(s) 鉦菽窒鉦喪移鉦"
-#: ../src/config/nm-config.c:278
+#: ../src/nm-config.c:310
msgid "The interval between connectivity checks (in seconds)"
msgstr "鉦詮鉦芹盒鈳鉦鉦 鉦芹盒鉦賴眸鈳鉦耜疏鈳鉦 鉦兒瓷鈳鉦菽窒鉦 鉦鉦擒眷鉦擒眶鉦抉窒 (鉦詮鉦鈳鉦鉦﹤鉦鉦喪眷鈳鉦耜窒)"
-#: ../src/config/nm-config.c:279
+#: ../src/nm-config.c:311
msgid "The expected start of the response"
msgstr "鉦芹鉦啤略鉦賴鈳鉦啤窒鉦能鉦 鉦兒窒鉦啤鉦鈳鉦獅窒鉦 鉦鉦啤鉦"
-#: ../src/config/nm-config.c:279
+#: ../src/nm-config.c:311
msgid "Bingo!"
msgstr "鉦眇窒鉦鉦鈳!"
-#: ../src/modem-manager/nm-modem-broadband.c:459
-#: ../src/modem-manager/nm-modem-old.c:864 ../src/devices/nm-device-bt.c:333
-#, c-format
-msgid "GSM connection %d"
-msgstr "GSM 鉦詮鉦芹盒鈳鉦 %d"
-
-#: ../src/modem-manager/nm-modem-broadband.c:481
-#: ../src/modem-manager/nm-modem-old.c:891 ../src/devices/nm-device-bt.c:337
-#, c-format
-msgid "CDMA connection %d"
-msgstr "CDMA 鉦詮鉦芹盒鈳鉦 %d"
-
-#: ../src/devices/nm-device-bond.c:146 ../tui/nm-editor-utils.c:204
+#: ../src/nm-logging.c:159
#, c-format
-msgid "Bond connection %d"
-msgstr "鉦眇移鉦鉦﹤ 鉦詮鉦芹盒鈳鉦 %d"
-
-#: ../src/devices/nm-device-adsl.c:150
-#, c-format
-msgid "ADSL connection %d"
-msgstr "ADSL 鉦詮鉦芹盒鈳鉦 %d"
-
-#: ../src/devices/nm-device-bridge.c:143 ../tui/nm-editor-utils.c:214
-#, c-format
-msgid "Bridge connection %d"
-msgstr "鉦眇鉦啤窒鉦﹤鉦鈳 鉦詮鉦芹盒鈳鉦 %d"
-
-#: ../src/devices/nm-device-bt.c:308
-#, c-format
-msgid "PAN connection %d"
-msgstr "PAN 鉦詮鉦芹盒鈳鉦 %d"
-
-#: ../src/devices/nm-device-bt.c:341
-#, c-format
-msgid "DUN connection %d"
-msgstr "DUN 鉦詮鉦芹盒鈳鉦 %d"
-
-#: ../src/devices/nm-device-ethernet.c:1254
-#, c-format
-msgid "PPPoE connection %d"
-msgstr "PPPoE 鉦詮鉦芹盒鈳鉦 %d"
-
-#: ../src/devices/nm-device-ethernet.c:1254
-#: ../src/settings/nm-settings-utils.c:50
-#, c-format
-msgid "Wired connection %d"
-msgstr "鉦戈鉦戈窒鉦能鉦鈳鉦 鉦詮鉦芹盒鈳鉦 %d"
-
-#: ../src/devices/nm-device-infiniband.c:270 ../tui/nm-editor-utils.c:177
-#, c-format
-msgid "InfiniBand connection %d"
-msgstr "InfiniBand 鉦詮鉦芹盒鈳鉦 %d"
-
-#: ../src/devices/nm-device-olpc-mesh.c:242
-#, c-format
-msgid "Mesh %d"
-msgstr "鉦鉦擒眷鉦啤窒 %d"
-
-#: ../src/devices/nm-device-team.c:158 ../tui/nm-editor-utils.c:223
-#, c-format
-msgid "Team connection %d"
-msgstr "鉦戈鉦﹤畢 鉦詮鉦芹盒鈳鉦 %d"
-
-#: ../src/devices/nm-device-vlan.c:255 ../tui/nm-editor-utils.c:231
-#, c-format
-msgid "VLAN connection %d"
-msgstr "VLAN 鉦詮鉦芹盒鈳鉦 %d"
-
-#: ../src/nm-manager.c:3420 ../tui/nm-editor-utils.c:246
-#, c-format
-msgid "VPN connection %d"
-msgstr "VPN 鉦詮鉦芹盒鈳鉦 %d"
-
-#: ../src/nm-netlink-monitor.c:219
-msgid "error occurred while waiting for data on socket"
-msgstr "鉦詮移鉦鈳鉦鈳鉦兒眷鈳鉦耜窒 鉦舟略鈳鉦戈移鉦鉦嗣鈳鉦鉦擒鉦 鉦鉦擒盔鈳鉦菽移鉦 鉦舟鉦獅眶鈳 鉦鉦舟鉦啤移鉦鉦賴畢鈳"
-
-#: ../src/nm-netlink-monitor.c:240
-#, c-format
-msgid "error processing netlink message: %s"
-msgstr "鉦兒鉦鈳鉦耜窒鉦鉦鈳 鉦詮鉦舟鉦嗣眶鉦兒鉦兒 鉦詮鉦詮鉦鉦啤窒鉦詮鉦菽眷鈳鉦耜窒 鉦舟鉦 鉦鉦鉦鉦擒鉦賴畢鈳: %s"
-
-#: ../src/nm-netlink-monitor.c:264
-#, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr ""
-"鉦鈳鉦鉦﹤窒鉦 鉦詮鉦丞窒鉦戈窒鉦能疏鈳鉦兒 鉦桌鉦耜鉦菽窒鉦鉦擒盒鉦鈳 鉦兒瓷鈳鉦詮眷鈳 鉦兒鉦鈳鉦耜窒鉦鉦鈳鉦兒鉦鉦舟窒鉦鈳 鉦詮鉦芹盒鈳鉦 鉦鈳鉦﹤窒鉦詮眷鈳 "
-"鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
-
-#: ../src/nm-netlink-monitor.c:275
-#, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr ""
-"鉦兒鉦鈳鉦耜窒鉦鉦鈳 鉦嫩鉦能移鉦鉦﹤眷鈳 鉦鈳鉦啤鉦﹤鉦兒鉦嗣窒鉦能眷鈳 鉦芹移鉦詮窒鉦鉦鈳 鉦鉦兒鉦兒 鉦嗣鈳鉦戈鈳鉦喪窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
+msgid "Unknown log level '%s'"
+msgstr "鉦鈳鉦戈鉦戈窒鉦啤畢 鉦舟移鉦鉦耜 鉦桌鈳鉦 '%s'"
-#: ../src/nm-netlink-monitor.c:319 ../src/nm-netlink-monitor.c:381
+#: ../src/nm-logging.c:241
#, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr ""
-"鉦鈳鉦鉦﹤窒鉦 鉦詮鉦丞窒鉦戈窒鉦能疏鈳鉦兒 鉦桌鉦耜鉦菽窒鉦鉦擒盒鉦鈳 鉦兒瓷鈳鉦詮眷鈳 鉦兒鉦鈳鉦耜窒鉦鉦鈳 鉦嫩鉦能移鉦鉦﹤眷鈳 鉦鉦兒鉦兒 鉦兒窒鉦能鉦鉦賴硫鉦耜 "
-"鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
+msgid "Unknown log domain '%s'"
+msgstr "鉦鈳鉦戈鉦戈窒鉦啤畢 鉦舟移鉦鉦耜 鉦﹤鉦桌鉦兒 '%s'"
-#: ../src/nm-netlink-monitor.c:469
-#, c-format
-msgid "unable to join netlink group: %s"
-msgstr "鉦兒鉦鈳鉦耜窒鉦鉦鈳 鉦鈳鉦鉦芹疏鈳鉦兒 鉦詮鉦啤眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
+#: ../src/nm-manager.c:3334
+#| msgid "VPN connecting"
+msgid "VPN connection"
+msgstr "VPN 鉦詮鉦芹盒鈳鉦"
-#: ../src/nm-sleep-monitor-systemd.c:116
+#: ../src/nm-sleep-monitor-systemd.c:114
msgid "NetworkManager needs to turn off networks"
msgstr "鉦鉦擒眷鉦眇鉦抉鉦喪疏鈳鉦兒 鉦詮鉦丞鉦賴略鉦鈳鉦喪窒鉦詮痊鈳鉦鈳 鉦鉦鉦舟 NetworkManager 鉦眇盔鉦詮鉦戈鉦戈畢鈳"
-#: ../src/settings/plugins/ifcfg-rh/reader.c:115
-msgid "System"
-msgstr "鉦菽鉦能眶鉦詮鉦丞"
-
-#: ../src/settings/plugins/ifcfg-rh/reader.c:4158 ../tui/nm-editor-utils.c:200
-#: ../tui/nm-ui-utils.c:349 ../tui/nm-ui-utils.c:574
-msgid "Bond"
-msgstr "鉦眇移鉦鉦﹤"
-
-#: ../src/settings/plugins/ifcfg-rh/reader.c:4240 ../tui/nm-editor-utils.c:218
-#: ../tui/nm-ui-utils.c:351 ../tui/nm-ui-utils.c:576
-msgid "Team"
-msgstr "鉦戈鉦"
-
-#: ../src/settings/plugins/ifcfg-rh/reader.c:4424 ../tui/nm-editor-utils.c:209
-#: ../tui/nm-ui-utils.c:353 ../tui/nm-ui-utils.c:578
-msgid "Bridge"
-msgstr "鉦眇鉦啤窒鉦﹤鉦鈳"
-
-#: ../test/nm-online.c:73
-#, c-format
-msgid "\rConnecting"
-msgstr "\r鉦詮鉦芹盒鈳鉦 鉦鉦耜鉦芹窒鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟"
-
-#: ../test/nm-online.c:104
-msgid ""
-"Time to wait for a connection, in seconds (without the option, default value "
-"is 30)"
-msgstr ""
-"鉦鉦鉦舟 鉦詮鉦芹盒鈳鉦鉦鈳鉦鈳 鉦鉦擒盔鉦眇鉦鉦賴盒鈳鉦 鉦詮皎鉦 (鉦 鉦鉦能鉦鈳 鉦鉦耜鉦耜畢鈳, 鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略鉦菽 鉦桌鉦耜鉦能眶鈳 30 "
-"鉦鉦鉦賴盒鈳鉦戈鉦戈畢鈳)"
-
-#: ../test/nm-online.c:105
-msgid "Exit immediately if NetworkManager is not running"
-msgstr "NetworkManager 鉦詮鉦芹盒鈳鉦鉦賴略鉦鈳鉦喪鉦喪畢鈳 鉦鉦舟鉦舟眷鈳鉦耜窒 鉦戈鈳鉦獅產鉦菽 鉦兒窒鉦啤鉦鉦桌窒鉦詮"
-
-#: ../test/nm-online.c:106
-msgid "Don't print anything"
-msgstr "鉦鉦兒疏鈳鉦兒 鉦桌鉦舟鉦啤窒鉦詮痊鈳鉦"
-
-#: ../test/nm-online.c:124
-msgid ""
-"Waits for NetworkManager to finish activating startup network connections."
-msgstr ""
-"鉦鉦啤鉦冢窒鉦 鉦鉦擒眷鉦眇鉦 鉦詮鉦芹盒鈳鉦鉦鉦喪疏鈳鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮鉦菽鉦戈 NetworkManager 鉦鈳 鉦鉦擒盔鉦耜移鉦鈳鉦戈鉦戈畢鈳."
-
-#: ../test/nm-online.c:131 ../test/nm-online.c:141
-msgid "Invalid option. Please use --help to see a list of valid options."
-msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦能鉦鈳. 鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦能鉦鈳鉦鉦喪窒鉦鉦擒鉦 鉦舟盔鉦菽窒鉦鈳鉦鈳 --help 鉦鉦兒鉦兒 鉦兒鉦﹤窒."
-
-#: ../tui/newt/nmt-newt-utils.c:168 ../tui/nmt-editor.c:231
-#: ../tui/nmt-password-dialog.c:175 ../tui/nmt-route-editor.c:135
-#: ../tui/nmtui-hostname.c:71 ../tui/nmtui.c:120
-msgid "OK"
-msgstr "鉦詮盒鉦"
-
-#: ../tui/newt/nmt-newt-utils.c:316 ../tui/newt/nmt-newt-utils.c:348
+#: ../src/settings/plugins/ibft/plugin.c:67
#, c-format
-msgid "Could not create temporary file: %s"
-msgstr "鉦戈移鉦戈鉦鉦擒眷鉦賴 鉦鉦﹤略鉦菽疏鈳鉦兒 鉦啤鉦賴硫鉦耜移鉦鉦賴眷鈳鉦: %s"
-
-#: ../tui/newt/nmt-newt-utils.c:354
-#, c-format
-msgid "Editor failed: %s"
-msgstr "鉦詮鉦芹移鉦舟鉦菽 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s"
-
-#: ../tui/newt/nmt-newt-utils.c:360
-#, c-format
-msgid "Could not re-read file: %s"
-msgstr "鉦鉦﹤略鉦菽疏鈳鉦兒 鉦芹鉦兒-鉦鉦舟眷鉦擒鉦賴眷鈳鉦: %s"
-
-#: ../tui/nm-editor-utils.c:160
-#, c-format
-msgid "Ethernet connection %d"
-msgstr "鉦鉦戈盒鈳鉦兒鉦鈳 鉦詮鉦芹盒鈳鉦 %d"
-
-#: ../tui/nm-editor-utils.c:168
-#, c-format
-msgid "Wi-Fi connection %d"
-msgstr "鉦菽-鉦徇 鉦詮鉦芹盒鈳鉦 %d"
+msgid "ibft: failed to read iscsiadm records: %s"
+msgstr "ibft: iscsiadm 鉦舟移鉦鉦耜鉦鉦喪疏鈳鉦兒 鉦鉦舟眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s"
-#: ../tui/nm-editor-utils.c:182 ../tui/nm-ui-utils.c:345
-msgid "Mobile Broadband"
-msgstr "鉦桌鉦眇鉦耜 鉦眇鉦啤移鉦﹤鉦眇鉦能移鉦鉦﹤"
-
-#: ../tui/nm-editor-utils.c:185
+#: ../src/settings/plugins/ibft/plugin.c:75
#, c-format
-msgid "Mobile broadband connection %d"
-msgstr "鉦桌鉦眇鉦耜 鉦眇鉦啤移鉦﹤鉦眇鉦能移鉦鉦﹤ 鉦詮鉦芹盒鈳鉦 %d"
-
-#: ../tui/nm-editor-utils.c:190
-msgid "DSL"
-msgstr "DSL"
+#| msgid "Wired connection %d"
+msgid "ibft: read connection '%s'"
+msgstr "ibft: '%s' 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦舟"
-#: ../tui/nm-editor-utils.c:194
+#: ../src/settings/plugins/ibft/plugin.c:81
#, c-format
-msgid "DSL connection %d"
-msgstr "DSL 鉦詮鉦芹盒鈳鉦 %d"
-
-#: ../tui/nm-ui-utils.c:316 ../tui/nm-ui-utils.c:385
-msgid "Wired"
-msgstr "鉦戈鉦戈窒鉦能鉦鈳鉦"
-
-#: ../tui/nm-ui-utils.c:339
-msgid "Bluetooth"
-msgstr "鉦眇鉦耜鉦鈳鉦戈"
-
-#: ../tui/nm-ui-utils.c:341
-msgid "OLPC Mesh"
-msgstr "OLPC 鉦桌鉦嗣"
-
-#: ../tui/nm-ui-utils.c:343
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#: ../tui/nm-ui-utils.c:357
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../tui/nm-ui-utils.c:420
-msgid "PCI"
-msgstr "PCI"
-
-#: ../tui/nm-ui-utils.c:422
-msgid "USB"
-msgstr "USB"
-
-#: ../tui/nm-ui-utils.c:498 ../tui/nm-ui-utils.c:518
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
-
-#: ../tui/nmt-device-entry.c:391
-msgid "Select..."
-msgstr "鉦鉦啤窒鉦詮..."
-
-#: ../tui/nmt-edit-connection-list.c:129
-msgid "Add"
-msgstr "鉦詮鉦啤窒鉦詮"
-
-#: ../tui/nmt-edit-connection-list.c:132 ../tui/nmt-page-ip4.c:172
-#: ../tui/nmt-page-ip6.c:170 ../tui/nmt-page-team-port.c:110
-#: ../tui/nmt-page-team.c:180
-msgid "Edit..."
-msgstr "鉦詮鉦芹移鉦舟窒鉦詮..."
-
-#: ../tui/nmt-edit-connection-list.c:135 ../tui/nmtui-edit.c:471
-msgid "Delete"
-msgstr "鉦鉦喪窒鉦詮"
-
-#: ../tui/nmt-editor.c:81
-#, c-format
-msgid "Could not create editor for connection '%s' of type '%s'."
-msgstr "'%s' 鉦詮鉦芹盒鈳鉦鉦鈳鉦鉦擒鉦 ('%s' 鉦眇鈳) 鉦詮鉦芹移鉦舟鉦菽疏鈳鉦兒 鉦啤鉦賴硫鉦耜移鉦鉦賴眷鈳鉦."
-
-#: ../tui/nmt-editor.c:85
-#, c-format
-msgid "Could not create editor for invalid connection '%s'."
-msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 '%s' 鉦詮鉦芹盒鈳鉦鉦鈳鉦鉦擒鉦 鉦詮鉦芹移鉦舟鉦菽疏鈳鉦兒 鉦啤鉦賴硫鉦耜移鉦鉦賴眷鈳鉦."
-
-#: ../tui/nmt-editor.c:95
-msgid "Edit connection"
-msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鉦芹移鉦舟窒鉦詮窒"
-
-#: ../tui/nmt-editor.c:134
-#, c-format
-msgid "Error saving connection: %s"
-msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮鉦菽眷鈳鉦耜窒 鉦舟鉦: %s"
-
-#: ../tui/nmt-editor.c:144
-#, c-format
-msgid "Unable to save connection: %s"
-msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
-
-#: ../tui/nmt-editor.c:158
-#, c-format
-msgid "Unable to add new connection: %s"
-msgstr "鉦嫩鉦 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鉦啤窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
-
-#: ../tui/nmt-editor.c:228 ../tui/nmt-password-dialog.c:172
-#: ../tui/nmt-route-editor.c:128 ../tui/nmtui-edit.c:201
-#: ../tui/nmtui-edit.c:470 ../tui/nmtui-hostname.c:69
-msgid "Cancel"
-msgstr "鉦啤畢鈳鉦舟鉦鈳鉦喪窒鉦詮"
-
-#: ../tui/nmt-mtu-entry.c:86
-msgid "(default)"
-msgstr "(鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略)"
-
-#: ../tui/nmt-mtu-entry.c:88 ../tui/nmt-mtu-entry.c:119
-msgid "bytes"
-msgstr "鉦眇鉦鈳鉦鉦喪"
-
-#: ../tui/nmt-page-bond.c:88
-msgid "Round-robin"
-msgstr "鉦啤鉦鉦﹤-鉦啤移鉦眇窒鉦兒"
+msgid "ibft: failed to read iscsiadm record: %s"
+msgstr "ibft: iscsiadm 鉦啤鉦鉦擒盒鈳鉦﹤ 鉦鉦兒鉦兒 鉦鉦舟眷鈳 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟: %s"
-#: ../tui/nmt-page-bond.c:89
-msgid "Active Backup"
-msgstr "鉦詮鈳鉦啤窒鉦 鉦眇鉦能移鉦鈳鉦鉦芹"
-
-#: ../tui/nmt-page-bond.c:90
-msgid "XOR"
-msgstr "XOR"
-
-#: ../tui/nmt-page-bond.c:91
-msgid "Broadcast"
-msgstr "鉦芹鉦啤硫鉦擒盒鉦鈳"
-
-#: ../tui/nmt-page-bond.c:92
-msgid "802.3ad"
-msgstr "802.3ad"
-
-#: ../tui/nmt-page-bond.c:93
-msgid "Adaptive Transmit Load Balancing (tlb)"
-msgstr "鉦鉦﹤移鉦芹鉦鈳鉦菽 鉦鈳鉦啤移鉦兒鉦詮鉦桌窒鉦鈳 鉦耜鉦﹤ 鉦眇鉦能移鉦耜鉦兒鉦詮窒鉦鉦鈳 (tlb)"
-
-#: ../tui/nmt-page-bond.c:94
-msgid "Adaptive Load Balancing (alb)"
-msgstr "鉦鉦﹤移鉦芹鉦鈳鉦菽 鉦耜鉦﹤ 鉦眇鉦能移鉦耜鉦兒鉦詮窒鉦鉦鈳 (alb)"
-
-#: ../tui/nmt-page-bond.c:100
-msgid "MII (recommended)"
-msgstr "MII (鉦詮眷鉦嫩 鉦桌移鉦﹤眷鉦擒鈳鉦)"
-
-#: ../tui/nmt-page-bond.c:101
-msgid "ARP"
-msgstr "ARP"
-
-#: ../tui/nmt-page-bond.c:359 ../tui/nmt-page-bridge.c:86
-#: ../tui/nmt-page-team.c:159
-msgid "Slaves"
-msgstr "鉦詮鉦耜鉦菽鉦鉦喪"
-
-#: ../tui/nmt-page-bond.c:371 ../tui/nmt-page-wifi.c:227
-msgid "Mode"
-msgstr "鉦鈳鉦啤皎"
-
-#: ../tui/nmt-page-bond.c:377
-msgid "Primary"
-msgstr "鉦芹鉦啤移鉦丞皎鉦賴"
-
-#: ../tui/nmt-page-bond.c:383
-msgid "Link monitoring"
-msgstr "鉦鈳鉦鉦﹤窒鉦 鉦桌鉦耜鉦菽窒鉦鉦擒盒鉦鈳"
-
-#: ../tui/nmt-page-bond.c:389 ../tui/nmt-page-bond.c:396
-#: ../tui/nmt-page-bond.c:403 ../tui/nmt-page-bond.c:410
-msgctxt "milliseconds"
-msgid "ms"
-msgstr "ms"
-
-#: ../tui/nmt-page-bond.c:390 ../tui/nmt-page-bond.c:411
-msgid "Monitoring frequency"
-msgstr "鉦徇鉦啤鉦鈳鉦菽鉦兒鉦詮窒 鉦桌鉦耜鉦菽窒鉦鉦擒盒鉦鈳"
-
-#: ../tui/nmt-page-bond.c:397
-msgid "Link up delay"
-msgstr "鉦鈳鉦鉦﹤窒 鉦詮鈳鉦啤窒鉦能畢 鉦菽窒鉦喪鉦"
-
-#: ../tui/nmt-page-bond.c:404
-msgid "Link down delay"
-msgstr "鉦鈳鉦鉦﹤窒 鉦兒窒鉦獅鉦鈳鉦啤窒鉦能畢 鉦菽窒鉦喪鉦"
-
-#: ../tui/nmt-page-bond.c:417
-msgid "ARP targets"
-msgstr "ARP 鉦鈳鉦啤窒鉦鉦喪"
-
-#: ../tui/nmt-page-bridge-port.c:38
-msgid "BRIDGE PORT"
-msgstr "BRIDGE PORT"
-
-#: ../tui/nmt-page-bridge-port.c:69 ../tui/nmt-page-bridge.c:112
-msgid "Priority"
-msgstr "鉦鉦舟鉦能略鈳"
-
-#: ../tui/nmt-page-bridge-port.c:75
-msgid "Path cost"
-msgstr "鉦桌移鉦啤鉦鉦 鉦舟盒"
-
-#: ../tui/nmt-page-bridge-port.c:77
-msgid "Hairpin mode"
-msgstr "鉦嫩鉦啤鉦芹窒鉦兒 鉦鈳鉦啤皎"
-
-#: ../tui/nmt-page-bridge.c:42
-msgid "BRIDGE"
-msgstr "BRIDGE"
-
-#: ../tui/nmt-page-bridge.c:96 ../tui/nmt-page-bridge.c:121
-#: ../tui/nmt-page-bridge.c:131 ../tui/nmt-page-bridge.c:141
-msgid "seconds"
-msgstr "鉦詮鉦鈳鉦鉦﹤鉦鉦喪"
-
-#: ../tui/nmt-page-bridge.c:97
-msgid "Aging time"
-msgstr "鉦嫩眾鈳鉦能畢鉦擒鈳鉦戈鉦戈窒鉦啤鉦 鉦詮皎鉦"
-
-#: ../tui/nmt-page-bridge.c:99
-msgid "Enable STP (Spanning Tree Protocol)"
-msgstr "STP 鉦鉦兒鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮 (鉦詮鉦芹移鉦兒窒鉦鉦鈳 鉦鈳鉦啤 鉦芹鉦啤鉦鈳鉦鉦擒眷鈳)"
-
-#: ../tui/nmt-page-bridge.c:122
-msgid "Forward delay"
-msgstr "鉦徇移鉦啤鉦菽移鉦啤鉦﹤ 鉦菽窒鉦喪鉦"
-
-#: ../tui/nmt-page-bridge.c:132
-msgid "Hello time"
-msgstr "鉦嫩鉦耜 鉦鈳鉦桌"
-
-#: ../tui/nmt-page-bridge.c:142
-msgid "Max age"
-msgstr "鉦鉦啤窒鉦獅鉦 鉦鉦擒眷鉦擒眶鉦抉窒"
-
-#: ../tui/nmt-page-ethernet.c:41
-msgid "ETHERNET"
-msgstr "ETHERNET"
-
-#: ../tui/nmt-page-ethernet.c:80 ../tui/nmt-page-vlan.c:132
-#: ../tui/nmt-page-wifi.c:358
-msgid "Cloned MAC address"
-msgstr "鉦戈畢鈳鉦啤鉦芹鉦鈳鉦喪窒鉦詮眷鉦擒畢 MAC 鉦菽窒鉦喪移鉦"
-
-#: ../tui/nmt-page-infiniband.c:40
-msgid "INFINIBAND"
-msgstr "INFINIBAND"
-
-#: ../tui/nmt-page-infiniband.c:51
-msgid "Datagram"
-msgstr "鉦﹤鉦鉦擒鈳鉦啤移鉦桌"
-
-#: ../tui/nmt-page-infiniband.c:52
-msgid "Connected"
-msgstr "鉦詮鉦芹盒鈳鉦鉦賴略鉦鈳鉦鉦﹤窒鉦舟"
-
-#: ../tui/nmt-page-infiniband.c:84
-msgid "Transport mode"
-msgstr "鉦菽盒鈳鉦鉦擒眶鉦鈳 鉦鈳鉦啤皎"
-
-#: ../tui/nmt-page-ip4.c:41
-msgid "Disabled"
-msgstr "鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦鉦"
-
-#: ../tui/nmt-page-ip4.c:42 ../tui/nmt-page-ip6.c:42
-msgid "Automatic"
-msgstr "鉦詮鉦菽盔鉦鉦鉦擒眷鉦賴略"
-
-#: ../tui/nmt-page-ip4.c:43 ../tui/nmt-page-ip6.c:44
-msgid "Link-Local"
-msgstr "鉦詮鉦丞眾鈳鉦-鉦鈳鉦鉦﹤窒"
-
-#: ../tui/nmt-page-ip4.c:44 ../tui/nmt-page-ip6.c:45
-msgid "Manual"
-msgstr "鉦鈳鉦能移鉦啤"
-
-#: ../tui/nmt-page-ip4.c:45
-msgid "Shared"
-msgstr "鉦嫩鉦鉦耜移鉦"
-
-#: ../tui/nmt-page-ip4.c:54
-msgid "IPv4 CONFIGURATION"
-msgstr "IPv4 CONFIGURATION"
-
-#: ../tui/nmt-page-ip4.c:100 ../tui/nmt-page-ip6.c:100
-msgid "(No custom routes)"
-msgstr "(鉦能移鉦菽鉦舟 鉦鉦鉦戈鉦能移鉦兒鉦鈳鉦 鉦啤鉦鈳鉦鉦喪窒鉦耜鉦)"
-
-#: ../tui/nmt-page-ip4.c:103 ../tui/nmt-page-ip6.c:103
-#, c-format
-msgid "One custom route"
-msgid_plural "%d custom routes"
-msgstr[0] "鉦鉦鉦舟 鉦鉦鉦戈鉦能移鉦兒鉦鈳鉦 鉦啤鉦鈳"
-msgstr[1] "%d 鉦鉦鉦戈鉦能移鉦兒鉦鈳鉦 鉦啤鉦鈳鉦鉦喪"
-
-#: ../tui/nmt-page-ip4.c:141 ../tui/nmt-page-ip6.c:141
-msgid "Addresses"
-msgstr "鉦菽窒鉦喪移鉦詮鉦喪"
-
-#: ../tui/nmt-page-ip4.c:147 ../tui/nmt-page-ip6.c:147
-msgid "Gateway"
-msgstr "鉦鈳鉦鈳鉦菽"
-
-#: ../tui/nmt-page-ip4.c:153 ../tui/nmt-page-ip6.c:153
-msgid "DNS servers"
-msgstr "DNS 鉦芹鉦啤鉦鈳鉦鉦鉦鉦鉦喪"
-
-#: ../tui/nmt-page-ip4.c:159 ../tui/nmt-page-ip6.c:159
-msgid "Search domains"
-msgstr "鉦嫩鉦﹤鉦鈳 鉦﹤鉦桌鉦兒鉦鉦喪"
-
-#: ../tui/nmt-page-ip4.c:174 ../tui/nmt-page-ip6.c:172
-msgid "Routing"
-msgstr "鉦啤鉦鈳 鉦桌移鉦﹤鉦菽窒鉦鈳"
-
-#: ../tui/nmt-page-ip4.c:176 ../tui/nmt-page-ip6.c:174
-msgid "Never use this network for default route"
-msgstr "鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略 鉦啤鉦鈳鉦鉦擒鉦 鉦鉦鉦舟窒鉦鈳 鉦 鉦鉦擒眷鉦眇鉦抉眶鉦兒鉦兒 鉦眇眾鉦詮痊鈳鉦"
-
-#: ../tui/nmt-page-ip4.c:184
-msgid "Require IPv4 addressing for this connection"
-msgstr "鉦 鉦詮鉦芹盒鈳鉦鉦鈳鉦鉦擒鉦 IPv4 鉦菽窒鉦喪移鉦 鉦兒鉦﹤窒鉦鈳鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳"
-
-#: ../tui/nmt-page-ip6.c:41
-msgid "Ignore"
-msgstr "鉦鉦﹤鉦鉦鉦賴硫鈳"
-
-#: ../tui/nmt-page-ip6.c:43
-msgid "Automatic (DHCP-only)"
-msgstr "鉦詮鉦菽盔鉦鉦鉦擒眷鉦賴略 (DHCP 鉦桌移鉦戈鉦)"
-
-#: ../tui/nmt-page-ip6.c:54
-msgid "IPv6 CONFIGURATION"
-msgstr "IPv6 鉦詮鉦啤鉦兒"
-
-#: ../tui/nmt-page-ip6.c:182
-msgid "Require IPv6 addressing for this connection"
-msgstr "鉦 鉦詮鉦芹盒鈳鉦鉦鈳鉦鉦擒鉦 IPv6 鉦菽窒鉦喪移鉦 鉦兒鉦﹤窒鉦鈳鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳"
-
-#: ../tui/nmt-page-main.c:134
-msgid "Hide"
-msgstr "鉦鉦﹤鉦賴硫鈳"
-
-#: ../tui/nmt-page-main.c:134
-msgid "Show"
-msgstr "鉦戈鉦啤窒鉦詮"
-
-#: ../tui/nmt-page-main.c:181
-msgid "Profile name"
-msgstr "鉦芹鉦啤鉦徇鉦耜窒鉦 鉦嫩鉦詮盒鈳"
-
-#: ../tui/nmt-page-main.c:188
-msgid "Device"
-msgstr "鉦詮移鉦抉疏"
-
-#: ../tui/nmt-page-main.c:252
-msgid "Automatically connect"
-msgstr "鉦詮鉦菽盔鉦鉦鉦擒眷鉦賴略鉦菽移鉦鉦 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉窒鉦詮"
-
-#: ../tui/nmt-page-main.c:258
-msgid "Available to all users"
-msgstr "鉦鉦耜鉦耜移 鉦眇眾鉦鈳鉦舟移鉦啤盒鉦賴鈳 鉦耜痍鈳鉦能眶鉦賴盒鈳鉦戈鉦戈畢鈳"
-
-#: ../tui/nmt-page-team-port.c:45
-msgid "TEAM PORT"
-msgstr "鉦鈳鉦桌 鉦詮鉦芹盒鈳鉦鉦詮鉦丞移鉦"
-
-#: ../tui/nmt-page-team-port.c:100 ../tui/nmt-page-team.c:170
-msgid "JSON configuration"
-msgstr "JSON 鉦詮鉦啤鉦兒"
-
-#: ../tui/nmt-page-team.c:51
-msgid "TEAM"
-msgstr "鉦鈳鉦桌"
-
-#: ../tui/nmt-page-vlan.c:109
-msgid "Parent"
-msgstr "鉦芹鉦獅"
-
-#: ../tui/nmt-page-vlan.c:124
-msgid "VLAN id"
-msgstr "VLAN id"
-
-#: ../tui/nmt-page-wifi.c:58
-msgid "WI-FI"
-msgstr "鉦菽-鉦徇"
-
-#: ../tui/nmt-page-wifi.c:69
-msgctxt "Wi-Fi"
-msgid "Client"
-msgstr "鉦鈳鉦耜鉦鉦鈳"
-
-#: ../tui/nmt-page-wifi.c:70
-msgid "Access Point"
-msgstr "鉦兒窒鉦耜鉦鈳 鉦眇窒鉦鉦舟"
-
-#: ../tui/nmt-page-wifi.c:71
-msgid "Ad-Hoc Network"
-msgstr "鉦戈移鉦戈鉦芹鉦啤鉦戈窒鉦 鉦鉦擒眷鉦眇鉦"
-
-#: ../tui/nmt-page-wifi.c:76
-msgctxt "Wi-Fi"
-msgid "Automatic"
-msgstr "鉦詮鉦菽盔鉦鉦鉦擒眷鉦賴略"
-
-#: ../tui/nmt-page-wifi.c:78
-msgid "A (5 GHz)"
-msgstr "A (5 GHz)"
-
-#: ../tui/nmt-page-wifi.c:80
-msgid "B/G (2.4 GHz)"
-msgstr "B/G (2.4 GHz)"
-
-#: ../tui/nmt-page-wifi.c:85
-msgctxt "Wi-Fi security"
-msgid "None"
-msgstr "鉦鉦兒 鉦鉦耜鉦"
-
-#: ../tui/nmt-page-wifi.c:86
-msgid "WPA & WPA2 Personal"
-msgstr "WPA & WPA2 鉦菽鉦能鈳鉦戈窒鉦"
-
-#: ../tui/nmt-page-wifi.c:87
-msgid "WPA & WPA2 Enterprise"
-msgstr "WPA & WPA2 鉦鉦鉦鉦啤鉦芹鉦啤鉦詮"
-
-#: ../tui/nmt-page-wifi.c:88
-msgid "WEP 40/128-bit Key (Hex or ASCII)"
-msgstr "WEP 40/128-鉦眇窒鉦鈳 鉦鈳鉦耜窒 (鉦嫩鉦鈳鉦詮 鉦鉦丞眶 ASCII)"
-
-#: ../tui/nmt-page-wifi.c:89
-msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128-bit 鉦鈳鉦芹鉦戈眶鉦擒鈳鉦"
-
-#: ../tui/nmt-page-wifi.c:90
-msgid "Dynamic WEP (802.1x)"
-msgstr "鉦﹤鉦兒皎鉦賴鈳 WEP (802.1x)"
-
-#: ../tui/nmt-page-wifi.c:91
-msgid "LEAP"
-msgstr "LEAP"
-
-#: ../tui/nmt-page-wifi.c:96
-msgctxt "WEP key index"
-msgid "1 (Default)"
-msgstr "1 (鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略)"
-
-#: ../tui/nmt-page-wifi.c:97
-msgctxt "WEP key index"
-msgid "2"
-msgstr "2"
-
-#: ../tui/nmt-page-wifi.c:98
-msgctxt "WEP key index"
-msgid "3"
-msgstr "3"
-
-#: ../tui/nmt-page-wifi.c:99
-msgctxt "WEP key index"
-msgid "4"
-msgstr "4"
-
-#: ../tui/nmt-page-wifi.c:104
-msgid "Open System"
-msgstr "鉦桌鉦鈳鉦 鉦菽鉦能眶鉦詮鉦丞"
-
-#: ../tui/nmt-page-wifi.c:105
-msgid "Shared Key"
-msgstr "鉦嫩鉦鉦耜移鉦 鉦鈳鉦耜窒"
-
-#: ../tui/nmt-page-wifi.c:253
-msgid "Channel"
-msgstr "鉦鉦擒疏鉦耜"
-
-#: ../tui/nmt-page-wifi.c:258
-msgid "Security"
-msgstr "鉦詮鉦啤鈳鉦獅略鈳"
-
-#: ../tui/nmt-page-wifi.c:274 ../tui/nmt-page-wifi.c:305
-#: ../tui/nmt-page-wifi.c:335 ../tui/nmt-secret-agent.c:214
-#: ../tui/nmt-secret-agent.c:251 ../tui/nmt-secret-agent.c:281
-#: ../tui/nmt-secret-agent.c:314 ../tui/nmt-secret-agent.c:380
-#: ../tui/nmt-secret-agent.c:393 ../tui/nmt-secret-agent.c:409
-msgid "Password"
-msgstr "鉦鈳鉦芹鉦戈痕鉦"
-
-#: ../tui/nmt-page-wifi.c:279
-msgid "(No support for wpa-enterprise yet...)"
-msgstr "(wpa-鉦鉦鉦鉦啤鉦芹鉦啤鉦詮鉦鉦擒鉦 鉦鉦兒鉦兒 鉦詮硃 鉦眇鉦鉦眇眷鉦菽窒鉦耜鉦...)"
-
-#: ../tui/nmt-page-wifi.c:286 ../tui/nmt-secret-agent.c:265
-msgid "Key"
-msgstr "鉦鈳鉦耜窒"
-
-#: ../tui/nmt-page-wifi.c:289 ../tui/nmt-page-wifi.c:308
-msgid "WEP index"
-msgstr "WEP 鉦詮鉦鉦"
-
-#: ../tui/nmt-page-wifi.c:297 ../tui/nmt-page-wifi.c:316
-msgid "Authentication"
-msgstr "鉦舟鉦R鉦鉦啤產"
-
-#: ../tui/nmt-page-wifi.c:322
-msgid "(No support for dynamic-wep yet...)"
-msgstr "(鉦﹤鉦兒皎鉦賴鈳-wep 鉦鉦擒鉦 鉦鉦兒鉦兒 鉦詮硃 鉦眇鉦鉦眇眷鉦菽窒鉦耜鉦...)"
-
-#: ../tui/nmt-page-wifi.c:329 ../tui/nmt-secret-agent.c:209
-#: ../tui/nmt-secret-agent.c:304
-msgid "Username"
-msgstr "鉦眇眾鉦鈳鉦舟移鉦啤硃鈳鉦詮盒鈳"
-
-#: ../tui/nmt-password-fields.c:130
-msgid "Ask for this password every time"
-msgstr "鉦芹鉦啤略鉦 鉦眇移鉦啤窒鉦能 鉦 鉦鈳鉦芹鉦戈痕鉦舟鈳鉦鉦擒鉦 鉦鈳鉦喪"
-
-#: ../tui/nmt-password-fields.c:131
-msgid "Show password"
-msgstr "鉦鈳鉦芹鉦戈痕鉦舟眶鉦兒鉦兒 鉦戈鉦啤窒鉦詮"
-
-#: ../tui/nmt-route-table.c:219
-msgid "Destination"
-msgstr "鉦鈳鉦啤窒"
-
-#: ../tui/nmt-route-table.c:219
-msgid "Prefix"
-msgstr "鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮"
-
-#: ../tui/nmt-route-table.c:228
-msgid "Next Hop"
-msgstr "鉦桌鉦鉦舟窒鉦 鉦鉦賴鉦賴略"
-
-#: ../tui/nmt-route-table.c:236
-msgid "Metric"
-msgstr "鉦桌鉦鈳鉦啤窒鉦鈳"
-
-#: ../tui/nmt-route-table.c:256
-msgid "No custom routes are defined."
-msgstr "鉦能移鉦菽鉦舟 鉦鉦鉦戈鉦能移鉦兒鉦鈳鉦 鉦啤鉦鈳鉦鉦喪疏鈳鉦兒 鉦菽窒鉦菽盒鉦賴硫鉦耜移鉦鉦賴眷鈳鉦"
-
-#: ../tui/nmt-secret-agent.c:223
-msgid "Identity"
-msgstr "鉦鈳鉦啤鉦戈"
-
-#: ../tui/nmt-secret-agent.c:228
-msgid "Private key password"
-msgstr "鉦鉦擒硫鉦鉦 鉦鈳鉦耜窒 鉦鈳鉦芹鉦戈痕鉦"
-
-#: ../tui/nmt-secret-agent.c:309
-msgid "Service"
-msgstr "鉦詮鉦菽"
-
-#: ../tui/nmt-secret-agent.c:340
-msgid "Authentication required by wireless network"
-msgstr "鉦菽鉦啤鉦耜鉦詮 鉦鉦擒眷鉦眇鉦抉鈳鉦鉦擒鉦 鉦舟鉦R鉦鉦啤產鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳"
+#: ../src/settings/plugins/ifcfg-rh/reader.c:112
+msgid "System"
+msgstr "鉦菽鉦能眶鉦詮鉦丞"
-#: ../tui/nmt-secret-agent.c:341
-#, c-format
-msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
-msgstr ""
-"鉦菽鉦啤鉦耜鉦詮 鉦鉦擒眷鉦眇鉦 '%s' 鉦鉦兒鉦兒 鉦兒窒鉦耜鉦鉦賴硫鉦賴鈳鉦喪鉦喪眷鈳 鉦鈳鉦芹鉦戈痕鉦 鉦鉦丞眶 鉦鈳鉦R眷鉦賴痕鈳鉦鉦啤產 鉦鈳鉦耜窒鉦 "
-"鉦鉦鉦戈鉦能眶鉦賴盒鈳鉦戈鉦戈畢鈳."
+#~ msgid "invalid IPv4 route '%s'"
+#~ msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 IPv4 鉦啤鉦鈳 '%s'"
+
+#~ msgid "invalid prefix '%s'; <0-32> allowed"
+#~ msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮 '%s'; <0-32> 鉦鉦兒鉦桌略鉦賴硫鉦耜移鉦鉦賴畢鈳"
+
+#~ msgid "invalid IPv6 route '%s'"
+#~ msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 IPv6 鉦啤鉦鈳 '%s'"
+
+#~ msgid "invalid prefix '%s'; <0-128> allowed"
+#~ msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦芹鉦啤窒鉦徇窒鉦鈳鉦詮 '%s'; <0-128> 鉦鉦兒鉦桌略鉦賴硫鉦耜移鉦鉦賴畢鈳"
+
+#~ msgid ""
+#~ "Usage: nmcli connection show { ARGUMENTS | help }\n"
+#~ "\n"
+#~ "ARGUMENTS := active [[id | uuid | path | apath] <ID>]\n"
+#~ "\n"
+#~ "Show connections which are currently used by a device to connect to a "
+#~ "network.\n"
+#~ "Without a parameter, all active connections are listed. When <ID> is "
+#~ "provided,\n"
+#~ "the connection details are displayed instead.\n"
+#~ "\n"
+#~ "ARGUMENTS := configured [[id | uuid | path] <ID>]\n"
+#~ "\n"
+#~ "Show in-memory and on-disk connections, some of which may also be active "
+#~ "if\n"
+#~ "a device is using that connection profile. Without a parameter, all "
+#~ "profiles\n"
+#~ "are listed. When <ID> is provided, the profile details are displayed "
+#~ "instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "鉦眇眾鉦鈳: nmcli connection show { ARGUMENTS | help }\n"
+#~ "\n"
+#~ "ARGUMENTS := active [[id | uuid | path | apath] <ID>]\n"
+#~ "\n"
+#~ "鉦鉦鉦舟 鉦鉦擒眷鉦眇鉦抉鈳鉦鈳 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉窒鉦詮眷鈳 鉦鉦鉦舟 鉦詮移鉦抉疏鉦舟窒鉦鉦 鉦芹鉦啤硫鉦鈳鉦 鉦眇眾鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦啤鉦 鉦詮鉦芹盒鈳鉦鉦鉦喪疏鈳鉦兒 "
+#~ "鉦戈鉦啤窒鉦詮.\n"
+#~ "鉦鉦鉦舟 鉦兒窒鉦能略鉦擒鉦鉦菽窒鉦耜鉦耜畢鈳, 鉦鉦耜鉦耜移 鉦詮鈳鉦啤窒鉦 鉦詮鉦芹盒鈳鉦鉦鉦 鉦芹鈳鉦鉦賴盔鉦兒鉦兒 鉦戈鉦啤窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳. <ID> 鉦鉦兒鉦兒 "
+#~ "鉦鉦舟鉦賴硫鉦賴畢鉦擒,\n"
+#~ "鉦眇畢鉦耜窒鉦鈳 鉦詮鉦芹盒鈳鉦鉦 鉦菽窒鉦菽盒鉦鉦喪疏鈳鉦兒 鉦戈鉦啤窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
+#~ "\n"
+#~ "ARGUMENTS := configured [[id | uuid | path] <ID>]\n"
+#~ "\n"
+#~ "Show in-memory and on-disk connections, some of 鉦桌鉦桌鉦啤窒鉦能眷鈳鉦耜窒鉦 鉦桌略鈳鉦戈 "
+#~ "鉦﹤窒鉦詮鉦鉦賴疏鉦耜鉦耜窒鉦 鉦詮鉦芹盒鈳鉦鉦鉦喪疏鈳鉦兒 鉦戈鉦啤窒鉦詮, 鉦 鉦詮鉦芹盒鈳鉦鉦 鉦芹鉦啤鉦徇鉦耜 鉦鉦兒鉦兒 鉦鉦鉦舟 鉦詮移鉦抉疏鉦菽\n"
+#~ "鉦眇眾鉦詮眷鉦擒鈳鉦戈鉦戈窒鉦舟鉦舟眷鈳鉦耜窒 鉦鉦菽鉦鉦喪眷鈳鉦耜窒 鉦鈳鉦耜眶鈳 鉦詮鈳鉦啤窒鉦能眶鉦擒鉦賴盒鉦眇硃鈳鉦舟. 鉦鉦鉦舟 鉦兒窒鉦能略鉦擒鉦鉦菽窒鉦耜鉦耜畢鈳, "
+#~ "鉦鉦耜鉦耜移 \n"
+#~ "鉦詮鈳鉦啤窒鉦 鉦詮鉦芹盒鈳鉦鉦鉦 鉦芹鈳鉦鉦賴盔鉦兒鉦兒 鉦戈鉦啤窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳. <ID> 鉦鉦兒鉦兒 鉦鉦舟鉦賴硫鉦賴畢鉦擒,\n"
+#~ "鉦眇畢鉦耜窒鉦鈳 鉦詮鉦芹盒鈳鉦鉦 鉦菽窒鉦菽盒鉦鉦喪疏鈳鉦兒 鉦戈鉦啤窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
+
+#~ msgid ""
+#~ "Usage: nmcli connection modify { ARGUMENTS | help }\n"
+#~ "\n"
+#~ "ARGUMENTS := [id | uuid | path] <ID> <setting name>.<property name> "
+#~ "[<value>]\n"
+#~ "\n"
+#~ "Modify a single property in the connection profile.\n"
+#~ "The profile is identified by its name, UUID or D-Bus path.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "鉦眇眾鉦鈳: nmcli connection modify { ARGUMENTS | help }\n"
+#~ "\n"
+#~ "ARGUMENTS := [id | uuid | path] <ID> <setting name>.<property name> "
+#~ "[<value>]\n"
+#~ "\n"
+#~ "鉦詮鉦芹盒鈳鉦鉦 鉦芹鉦啤鉦徇鉦耜窒鉦兒眷鈳鉦耜窒 鉦鉦鉦舟 鉦鈳鉦鉦菽疏鈳鉦兒 鉦桌移鉦啤鉦芹瓷鉦賴硫鉦.\n"
+#~ "鉦芹鉦啤鉦徇鉦耜 鉦鉦兒鉦兒 鉦鉦舟盒 鉦嫩鉦詮盒鈳, UUID 鉦鉦丞眶 D-Bus 鉦桌移鉦啤鉦鉦舟窒鉦鉦 鉦鈳鉦啤鉦戈窒鉦詮眷鉦擒鈳鉦戈鉦戈畢鈳.\n"
+#~ "\n"
+
+#~ msgid "Error: 'list configured': %s"
+#~ msgstr "鉦舟鉦: 'list configured': %s"
+
+#~ msgid "List of configured connections"
+#~ msgstr "鉦詮鉦啤鉦賴略鉦鈳鉦鉦 鉦詮鉦芹盒鈳鉦鉦鉦 鉦芹鈳鉦鉦"
+
+#~ msgid "Error: 'show configured': %s"
+#~ msgstr "鉦舟鉦: 'show configured': %s"
+
+#~ msgid "Error: 'list active': %s"
+#~ msgstr "鉦舟鉦: ''list active': %s"
+
+#~ msgid "List of active connections"
+#~ msgstr "鉦詮鈳鉦啤窒鉦 鉦詮鉦芹盒鈳鉦鉦鉦 鉦芹鈳鉦鉦"
+
+#~ msgid "Error: 'show active': %s"
+#~ msgstr "鉦舟鉦: 'show active': %s"
+
+#~ msgid ""
+#~ "Error: Device '%s' is waiting for slaves before proceeding with "
+#~ "activation."
+#~ msgstr ""
+#~ "鉦舟鉦: 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦鈳鉦能鉦鉦舟窒鉦鈳 鉦桌鉦鉦舟鉦菽盒鈳鉦能鉦 鉦桌鉦舟眷鈳 '%s' 鉦詮移鉦抉疏鉦菽 鉦鉦芹痕鈳鉦啤鈳鉦啤窒鉦能鉦鉦喪窒鉦鉦擒鉦 "
+#~ "鉦鉦擒盔鈳鉦戈鉦戈窒鉦舟."
+
+#~ msgid "There are 3 optional arguments for '%s' connection type.\n"
+#~ msgstr "'%s' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 3 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
+
+#~ msgid "Do you want to provide them? (yes/no) [yes] "
+#~ msgstr "鉦兒鉦菽 鉦鉦舟疏鈳鉦兒 鉦鉦舟鉦賴硫鉦耜 鉦眇盔鉦詮鉦戈鉦戈鉦啤移? (鉦嫩鉦舟/鉦鉦耜鉦) [鉦嫩鉦舟]"
+
+#~ msgid "There are 5 optional arguments for 'InfiniBand' connection type.\n"
+#~ msgstr "'InfiniBand' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 5 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
+
+#~ msgid "Transport mode (datagram or connected) [datagram]: "
+#~ msgstr "鉦菽盒鈳鉦鉦擒眶鉦鈳 鉦鈳鉦啤皎鉦菽眷鈳鉦 [鉦﹤鉦鉦擒鈳鉦啤移鉦桌, 鉦詮鉦芹盒鈳鉦鉦賴略鉦鈳鉦鉦﹤窒鉦舟] [datagram]:"
+
+#~ msgid "There is 1 optional argument for 'WiMax' connection type.\n"
+#~ msgstr "'WiMax' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鉦擒鉦 1 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦舟.\n"
+
+#~ msgid "There are 4 optional arguments for 'PPPoE' connection type.\n"
+#~ msgstr "'PPPoE' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 4 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
+
+#~ msgid ""
+#~ "There are 2 optional arguments for 'mobile broadband' connection type.\n"
+#~ msgstr "'mobile broadband' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 2 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
+
+#~ msgid "There is 1 optional argument for 'bluetooth' connection type.\n"
+#~ msgstr "'bluetooth' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鉦擒鉦 1 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦舟.\n"
+
+#~ msgid "Bluetooth type (panu, dun-gsm or dun-cdma) [panu]: "
+#~ msgstr "鉦眇鉦耜鉦鈳鉦戈 鉦眇鈳 (panu, dun-gsm 鉦鉦 dun-cdma) [panu]: "
+
+#~ msgid "There are 4 optional arguments for 'VLAN' connection type.\n"
+#~ msgstr "'VLAN' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 4 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
+
+#~ msgid "There are optional arguments for 'bond' connection type.\n"
+#~ msgstr "'bond' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 3 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
+
+#~ msgid "Bonding monitoring mode (miimon or arp) [miimon]: "
+#~ msgstr "鉦眇移鉦鉦﹤窒鉦鉦鈳 鉦桌鉦耜鉦菽窒鉦鉦擒盒鉦鉦 鉦詮鉦丞窒鉦戈窒 (miimon 鉦鉦丞眶 arp) [miimon]: "
+
+#~ msgid "There are 6 optional arguments for 'bridge' connection type.\n"
+#~ msgstr "'bridge' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 6 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
+
+#~ msgid "Error: 'stp': '%s'.\n"
+#~ msgstr "鉦舟鉦: 'stp': '%s'.\n"
+
+#~ msgid "There are 3 optional arguments for 'bridge-slave' connection type.\n"
+#~ msgstr "'bridge-slave' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 3 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
+
+#~ msgid "Hairpin (yes/no) [yes]: "
+#~ msgstr "鉦嫩鉦啤鉦芹窒鉦兒 (yes/no) [yes]: "
+
+#~ msgid "Error: 'hairpin': '%s'.\n"
+#~ msgstr "鉦舟鉦: 'hairpin': '%s'.\n"
-#: ../tui/nmt-secret-agent.c:349
-msgid "Wired 802.1X authentication"
-msgstr "鉦戈鉦戈窒鉦詮硃鉦賴略 802.1X 鉦舟鉦R鉦鉦啤產"
+#~ msgid "There is 1 optional argument for 'VPN' connection type.\n"
+#~ msgstr "'VPN' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鉦擒鉦 1 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳 鉦鉦舟.\n"
-#: ../tui/nmt-secret-agent.c:352
-msgid "Network name"
-msgstr "鉦鉦擒眷鉦眇鉦抉畢 鉦嫩鉦詮盒鈳"
+#~ msgid "There are 2 optional arguments for 'OLPC Mesh' connection type.\n"
+#~ msgstr "'OLPC Mesh' 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦鈳 2 鉦鉦鈳鉦鉦賴 鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪窒鉦菽.\n"
-#: ../tui/nmt-secret-agent.c:359
-msgid "DSL authentication"
-msgstr "DSL 鉦舟鉦R鉦鉦啤產"
+#~ msgid "Error: 'master': '%s' is not valid UUID nor interface."
+#~ msgstr "鉦舟鉦: 'master': '%s' 鉦鉦兒鉦兒鉦菽鉦舟 UUID 鉦鉦丞眶 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦菽移鉦鉦賴眷鈳鉦."
-#: ../tui/nmt-secret-agent.c:367
-msgid "PIN code required"
-msgstr "PIN 鉦鈳鉦﹤鉦 鉦鉦鉦戈鉦能眶鉦賴畢鈳"
+#~ msgid ""
+#~ "save :: save the connection\n"
+#~ "\n"
+#~ "Sends the connection to NetworkManager that will save it.\n"
+#~ msgstr ""
+#~ "save :: 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮\n"
+#~ "\n"
+#~ "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 NetworkManager 鉦鈳 鉦鉦喪鉦嫩窒鉦詮鉦戈鉦戈畢鈳 鉦鉦舟 鉦鉦喪窒鉦詮鉦戈鉦戈畢鈳.\n"
-#: ../tui/nmt-secret-agent.c:368
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "鉦桌鉦眇鉦耜 鉦眇鉦啤移鉦﹤鉦眇鉦能移鉦鉦﹤ 鉦詮移鉦抉疏鉦鈳鉦鉦擒鉦 PIN 鉦鈳鉦﹤鉦 鉦鉦鉦戈鉦能眶鉦賴盒鈳鉦戈鉦戈畢鈳"
+#~ msgid ""
+#~ "remove [<index>|<option>] :: delete the value\n"
+#~ "\n"
+#~ "Removes the property value (sets it to default).\n"
+#~ msgstr ""
+#~ "remove [<index>|<option>] :: 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦鉦喪窒鉦詮\n"
+#~ "\n"
+#~ "鉦鈳鉦鉦 鉦桌鉦耜鉦能眶鉦兒鉦兒 鉦戈鉦鈳鉦舟鉦嫩移鉦鈳鉦戈鉦戈畢鈳 (鉦鉦舟疏鈳鉦兒 鉦芹鉦啤鉦菽疏鉦賴盔鈳鉦鉦賴略鉦鈳鉦鈳 鉦嫩鉦鉦舟窒鉦詮鉦戈鉦戈畢鈳).\n"
-#: ../tui/nmt-secret-agent.c:370
-msgid "PIN"
-msgstr "PIN"
+#~ msgid "Error: '%s' setting not present\n"
+#~ msgstr "鉦舟鉦: '%s' 鉦詮窒鉦舟鉦抉略鈳鉦能 鉦鉦詮鉦戈窒鉦戈鉦菽畢鉦耜鉦耜窒鉦耜鉦淚n"
-#: ../tui/nmt-secret-agent.c:376 ../tui/nmt-secret-agent.c:389
-#: ../tui/nmt-secret-agent.c:405
-msgid "Mobile broadband network password"
-msgstr "鉦桌鉦眇鉦耜 鉦眇鉦啤移鉦﹤鉦眇鉦能移鉦鉦﹤ 鉦鉦擒眷鉦眇鉦抉畢 鉦鈳鉦芹鉦戈痕鉦"
+#~ msgid ""
+#~ ">>> Command-line editing is not available. Consider installing a line "
+#~ "editing library to enable the feature. <<<\n"
+#~ "Supported libraries are:\n"
+#~ " - GNU Readline (libreadline) http://cnswww.cns.cwru.edu/php/chet/"
+#~ "readline/rltop.html\n"
+#~ " - NetBSD Editline (libedit) http://www.thrysoee.dk/editline/\n"
+#~ msgstr ""
+#~ ">>> 鉦鉦舟鉦-鉦詮移鉦耜窒鉦 鉦詮鉦芹移鉦舟疏鈳 鉦耜痍鈳鉦能眶鉦賴眷鈳鉦. 鉦 鉦詮鉦耜痍鈳鉦能眶鉦兒鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮眷鈳 鉦鉦鉦舟 鉦詮移鉦耜疏鈳鉦兒 "
+#~ "鉦詮鉦芹移鉦舟窒鉦詮眷鈳 鉦耜鉦眇鉦啤盒鉦賴盔鉦兒鉦兒 鉦兒鉦菽 鉦鉦兒鉦詮鉦丞移鉦芹窒鉦詮痊鉦嫩鉦舟. <<<\n"
+#~ "鉦眇鉦鉦眇眷鉦菽窒鉦啤鉦 鉦耜鉦眇鉦啤盒鉦賴鉦喪鉦鉦舟盒鈳:\n"
+#~ " - GNU Readline (libreadline) http://cnswww.cns.cwru.edu/php/chet/"
+#~ "readline/rltop.html\n"
+#~ " - NetBSD Editline (libedit) http://www.thrysoee.dk/editline/\n"
-#: ../tui/nmt-secret-agent.c:377 ../tui/nmt-secret-agent.c:390
-#: ../tui/nmt-secret-agent.c:406
-#, c-format
-msgid "A password is required to connect to '%s'."
-msgstr "'%s' 鉦兒鉦鉦舟窒鉦鈳 鉦詮鉦芹盒鈳鉦鉦嫩鉦鉦舟眷鈳 鉦鉦鉦戈鉦能眶鉦賴盒鈳鉦 鉦鈳鉦芹鉦戈痕鉦."
+#~ msgid ""
+#~ "Error: 'configured' or 'active' command is expected for 'connection show'."
+#~ msgstr ""
+#~ "鉦舟鉦: 'connection show' 鉦鉦擒鉦 'configured' 鉦鉦丞眶 'active' 鉦鉦舟鉦嗣盔鉦兒鉦兒 "
+#~ "鉦兒窒鉦啤鉦鈳鉦獅窒鉦詮眷鉦擒鉦賴畢鈳."
-#: ../tui/nmt-slave-list.c:138
-msgid "Select the type of slave connection you wish to add."
-msgstr "鉦兒鉦菽 鉦詮鉦啤窒鉦詮眷鈳 鉦眇盔鉦詮鉦 鉦詮鉦耜鉦 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦能鉦鈳 鉦桌移鉦﹤窒."
-
-#: ../tui/nmt-widget-list.c:142
-msgid "Add..."
-msgstr "鉦詮鉦啤窒鉦詮..."
-
-#: ../tui/nmt-widget-list.c:205
-msgid "Remove"
-msgstr "鉦戈鉦鈳鉦舟 鉦嫩移鉦鈳"
-
-#: ../tui/nmtui-connect.c:82
-msgid "Activation failed"
-msgstr "鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦鈳鉦能 鉦菽窒鉦徇眷鉦鈳鉦鉦﹤窒鉦舟"
-
-#: ../tui/nmtui-connect.c:134
-msgid "Connecting..."
-msgstr "鉦詮鉦芹盒鈳鉦鉦賴硫鉦耜移鉦鈳鉦戈鉦戈窒鉦舟..."
+#~ msgid "0 (unknown)"
+#~ msgstr "0 (鉦鈳鉦戈鉦戈窒鉦啤畢)"
-#: ../tui/nmtui-connect.c:159
-#, c-format
-msgid "Could not activate connection: %s"
-msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮眷鉦擒鉦賴眷鈳鉦: %s"
+#~ msgid "any, "
+#~ msgstr "鉦能移鉦菽鉦舟移鉦舟盒鈳, "
-#: ../tui/nmtui-connect.c:218 ../tui/nmtui-connect.c:274
-msgid "Activate"
-msgstr "鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮"
+#~ msgid "900 MHz, "
+#~ msgstr "900 MHz, "
-#: ../tui/nmtui-connect.c:220
-msgid "Deactivate"
-msgstr "鉦兒窒鉦獅鉦鈳鉦啤窒鉦能鈳鉦喪窒鉦詮"
-
-#: ../tui/nmtui-connect.c:279 ../tui/nmtui-edit.c:102 ../tui/nmtui.c:114
-msgid "Quit"
-msgstr "鉦戈鉦能鉦賴硫鈳"
+#~ msgid "1800 MHz, "
+#~ msgstr "1800 MHz, "
-#: ../tui/nmtui-connect.c:304
-#, c-format
-msgid "No such connection '%s'"
-msgstr "鉦鉦鉦戈硃 鉦能移鉦菽鉦舟 鉦詮鉦芹盒鈳鉦 '%s' 鉦鉦耜鉦"
+#~ msgid "1900 MHz, "
+#~ msgstr "1900 MHz, "
-#: ../tui/nmtui-connect.c:306
-msgid "Connection is already active"
-msgstr "鉦詮鉦芹盒鈳鉦鉦菽 鉦鉦鉦擒鉦耜 鉦詮鈳鉦啤窒鉦能眶鉦擒鉦賴畢鈳"
+#~ msgid "850 MHz, "
+#~ msgstr "850 MHz, "
-#: ../tui/nmtui-edit.c:209
-msgid "Create"
-msgstr "鉦啤鉦賴硫鈳"
+#~ msgid "WCDMA 3GPP UMTS 2100 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 2100 MHz, "
-#: ../tui/nmtui-edit.c:350
-msgid "Select the type of connection you wish to create."
-msgstr "鉦兒鉦菽 鉦啤鉦賴硫鉦耜 鉦眇盔鉦詮鉦 鉦詮鉦芹盒鈳鉦鉦 鉦眇鈳鉦能疏鈳鉦兒 鉦鉦啤窒鉦詮窒."
+#~ msgid "WCDMA 3GPP UMTS 1800 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 1800 MHz, "
-#: ../tui/nmtui-edit.c:357
-msgid ""
-"If you are creating a VPN, and the VPN connection you wish to create does "
-"not appear in the list, you may not have the correct VPN plugin installed."
-msgstr ""
-"鉦兒鉦菽 鉦鉦鉦舟 VPN 鉦鉦兒鉦兒 鉦啤鉦賴硫鈳鉦戈鉦戈窒鉦舟鉦舟眷鈳鉦耜窒, 鉦桌略鈳鉦戈 鉦兒鉦菽 鉦啤鉦賴硫鉦耜 鉦眇盔鉦詮鉦戈鉦戈鉦啤鉦 VPN "
-"鉦詮鉦芹盒鈳鉦鉦菽 鉦芹鈳鉦鉦賴盔鉦耜鉦耜窒 鉦鉦擒產鉦賴硫鉦舟 鉦鉦舟鉦舟盒鈳, 鉦兒鉦菽 鉦詮盒鉦賴盔鉦擒畢 VPN 鉦芹鉦耜鈳鉦鉦兒 鉦鉦兒鉦兒 "
-"鉦鉦兒鉦詮鉦丞移鉦芹窒鉦詮窒鉦舟 鉦鉦啤痊鉦嫩鉦舟 鉦鉦鉦舟盒鈳鉦."
+#~ msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
-#: ../tui/nmtui-edit.c:390 ../tui/nmtui-edit.c:406
-msgid "New Connection"
-msgstr "鉦嫩鉦 鉦詮鉦芹盒鈳鉦"
+#~ msgid "WCDMA 3GPP UMTS 800 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 800 MHz, "
-#: ../tui/nmtui-edit.c:443
-#, c-format
-msgid "Unable to delete connection: %s"
-msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
+#~ msgid "WCDMA 3GPP UMTS 850 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 850 MHz, "
-#: ../tui/nmtui-edit.c:472
-#, c-format
-msgid "Are you sure you want to delete the connection '%s'?"
-msgstr "鉦兒鉦菽 鉦兒窒鉦鉦菽移鉦鉦耜 鉦詮鉦芹盒鈳鉦 '%s 鉦鉦兒鉦兒 鉦鉦喪窒鉦詮眷鈳 鉦眇盔鉦詮鉦戈鉦戈鉦啤?"
+#~ msgid "WCDMA 3GPP UMTS 900 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 900 MHz, "
-#: ../tui/nmtui-edit.c:486
-#, c-format
-msgid "Could not delete connection: %s"
-msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
+#~ msgid "WCDMA 3GPP UMTS 1700 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 1700 MHz, "
-#: ../tui/nmtui-hostname.c:47
-msgid "Set Hostname"
-msgstr "鉦鉦戈窒鉦丞鉦能畢 鉦嫩鉦詮盒鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮"
+#~ msgid "WCDMA 3GPP UMTS 1900 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 1900 MHz, "
-#: ../tui/nmtui-hostname.c:55
-msgid "Hostname"
-msgstr "鉦鉦戈窒鉦丞鉦能畢 鉦嫩鉦詮盒鈳"
+#~ msgid "WCDMA 3GPP UMTS 2600 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 2600 MHz, "
-#: ../tui/nmtui-hostname.c:114
-#, c-format
-msgid "Set hostname to '%s'"
-msgstr "鉦鉦戈窒鉦丞鉦能畢 鉦嫩鉦詮盒鉦兒鉦兒 '%s' 鉦鈳 鉦嫩鉦鉦舟窒鉦詮"
+#~ msgid "'%s' is not valid (use <dest IP>/prefix <next-hop IP> [metric])"
+#~ msgstr ""
+#~ "'%s' 鉦桌移鉦兒鉦能眶鉦擒畢鈳鉦舟眷鈳鉦 (<dest IP>/prefix <next-hop IP> [metric] 鉦鉦兒鉦兒 鉦眇眾鉦詮窒)"
-#: ../tui/nmtui-hostname.c:116
-#, c-format
-msgid "Unable to set hostname: %s"
-msgstr "鉦鉦戈窒鉦丞鉦能畢 鉦嫩鉦詮盒鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
+#~ msgid "'%s' doesn't match the virtual interface name '%s'"
+#~ msgstr "'%s' 鉦鉦兒鉦兒鉦菽鉦舟 鉦菽盒鈳鉦鈳鉦菽眷鈳 鉦詮鉦芹盒鈳鉦鉦詮移鉦抉疏鉦 鉦嫩鉦詮盒鉦擒畢 '%s' 鉦鈳鉦鈳 鉦嫩鉦鉦舟窒鉦鈳鉦能移鉦鈳鉦戈鉦戈窒鉦耜鉦"
-#: ../tui/nmtui.c:59 ../tui/nmtui.c:62
-msgid "connection"
-msgstr "鉦詮鉦芹盒鈳鉦"
+#~ msgid "IPv4 configuration is not allowed for slave"
+#~ msgstr "鉦詮鉦耜鉦菽鉦鉦擒鉦 IPv4 鉦詮鉦啤鉦兒鉦鈳 鉦鉦兒鉦桌略鉦 鉦鉦啤鉦菽鉦舟窒鉦耜鉦"
-#: ../tui/nmtui.c:60
-msgid "Edit a connection"
-msgstr "鉦鉦鉦舟 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鉦芹移鉦舟窒鉦詮"
+#~ msgid "IPv6 configuration is not allowed for slave"
+#~ msgstr "鉦詮鉦耜鉦菽鉦鉦擒鉦 IPv6 鉦詮鉦啤鉦兒鉦鈳 鉦鉦兒鉦桌略鉦 鉦鉦啤鉦菽鉦舟窒鉦耜鉦"
-#: ../tui/nmtui.c:63
-msgid "Activate a connection"
-msgstr "鉦鉦鉦舟 鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦詮鈳鉦啤窒鉦能鈳鉦喪窒鉦詮"
+#~ msgid "Invalid option. Please use --help to see a list of valid options.\n"
+#~ msgstr "鉦鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦能鉦鈳. 鉦桌移鉦兒鉦能眶鉦擒畢 鉦鉦能鉦鈳鉦鉦喪窒鉦鉦擒鉦 鉦舟盔鉦菽窒鉦鈳鉦鈳 --help 鉦鉦兒鉦兒 鉦兒鉦﹤窒.\n"
-#: ../tui/nmtui.c:65
-msgid "new hostname"
-msgstr "鉦嫩鉦 鉦鉦戈窒鉦丞鉦能畢 鉦嫩鉦詮盒鈳"
+#~ msgid "error occurred while waiting for data on socket"
+#~ msgstr "鉦詮移鉦鈳鉦鈳鉦兒眷鈳鉦耜窒 鉦舟略鈳鉦戈移鉦鉦嗣鈳鉦鉦擒鉦 鉦鉦擒盔鈳鉦菽移鉦 鉦舟鉦獅眶鈳 鉦鉦舟鉦啤移鉦鉦賴畢鈳"
-#: ../tui/nmtui.c:66
-msgid "Set system hostname"
-msgstr "鉦菽鉦能眶鉦詮鉦丞鉦 鉦嫩鉦詮盒鉦兒鉦兒 鉦嫩鉦鉦舟窒鉦詮"
+#~ msgid "error processing netlink message: %s"
+#~ msgstr "鉦兒鉦鈳鉦耜窒鉦鉦鈳 鉦詮鉦舟鉦嗣眶鉦兒鉦兒 鉦詮鉦詮鉦鉦啤窒鉦詮鉦菽眷鈳鉦耜窒 鉦舟鉦 鉦鉦鉦鉦擒鉦賴畢鈳: %s"
-#: ../tui/nmtui.c:89
-msgid "NetworkManager TUI"
-msgstr "NetworkManager TUI"
+#~ msgid "unable to connect to netlink for monitoring link status: %s"
+#~ msgstr ""
+#~ "鉦鈳鉦鉦﹤窒鉦 鉦詮鉦丞窒鉦戈窒鉦能疏鈳鉦兒 鉦桌鉦耜鉦菽窒鉦鉦擒盒鉦鈳 鉦兒瓷鈳鉦詮眷鈳 鉦兒鉦鈳鉦耜窒鉦鉦鈳鉦兒鉦鉦舟窒鉦鈳 鉦詮鉦芹盒鈳鉦 鉦鈳鉦﹤窒鉦詮眷鈳 "
+#~ "鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
-#: ../tui/nmtui.c:97
-msgid "Please select an option"
-msgstr "鉦舟盔鉦菽窒鉦鈳鉦鈳 鉦鉦鉦舟 鉦鉦能鉦鈳鉦能疏鈳鉦兒 鉦鉦啤窒鉦詮窒"
+#~ msgid "unable to enable netlink handle credential passing: %s"
+#~ msgstr "鉦兒鉦鈳鉦耜窒鉦鉦鈳 鉦嫩鉦能移鉦鉦﹤眷鈳 鉦鈳鉦啤鉦﹤鉦兒鉦嗣窒鉦能眷鈳 鉦芹移鉦詮窒鉦鉦鈳 鉦鉦兒鉦兒 鉦嗣鈳鉦戈鈳鉦喪窒鉦詮眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
-#: ../tui/nmtui.c:154
-msgid "Usage"
-msgstr "鉦眇眾鉦鈳"
+#~ msgid "unable to allocate netlink handle for monitoring link status: %s"
+#~ msgstr ""
+#~ "鉦鈳鉦鉦﹤窒鉦 鉦詮鉦丞窒鉦戈窒鉦能疏鈳鉦兒 鉦桌鉦耜鉦菽窒鉦鉦擒盒鉦鈳 鉦兒瓷鈳鉦詮眷鈳 鉦兒鉦鈳鉦耜窒鉦鉦鈳 鉦嫩鉦能移鉦鉦﹤眷鈳 鉦鉦兒鉦兒 鉦兒窒鉦能鉦鉦賴硫鉦耜 "
+#~ "鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
-#: ../tui/nmtui.c:221
-msgid "Could not parse arguments"
-msgstr "鉦鉦啤鉦鈳鉦能鉦桌鉦鉦鈳鉦鉦喪疏鈳鉦兒 鉦芹移鉦啤鉦詮 鉦桌移鉦﹤眷鉦擒鉦賴眷鈳鉦"
+#~ msgid "unable to join netlink group: %s"
+#~ msgstr "鉦兒鉦鈳鉦耜窒鉦鉦鈳 鉦鈳鉦鉦芹疏鈳鉦兒 鉦詮鉦啤眷鈳 鉦詮移鉦抉鉦能眶鉦擒鉦賴眷鈳鉦: %s"
-#: ../tui/nmtui.c:229
-msgid "NetworkManager is not running."
-msgstr "NetworkManager 鉦鉦擒眷鉦兒鉦能眷鈳鉦耜窒鉦耜鉦."
+#~ msgid "Error saving connection: %s"
+#~ msgstr "鉦詮鉦芹盒鈳鉦鉦菽疏鈳鉦兒 鉦鉦喪窒鉦詮鉦菽眷鈳鉦耜窒 鉦舟鉦: %s"